From 0428ccd6ba484b612576fbbbeac4b8cdcfcd5b2e Mon Sep 17 00:00:00 2001
From: Matej Novotny <manovotn@redhat.com>
Date: Sat, 9 Dec 2023 21:23:04 +0100
Subject: [PATCH] Apply formatting rules to the codebase

---
 .../java/jakarta/decorator/Decorator.java     |  12 +-
 .../main/java/jakarta/decorator/Delegate.java |  48 ++---
 .../java/jakarta/decorator/package-info.java  | 149 ++++++++------
 .../enterprise/context/ApplicationScoped.java |  25 +--
 .../enterprise/context/BeforeDestroyed.java   |  13 +-
 .../context/BusyConversationException.java    |  12 +-
 .../enterprise/context/ContextException.java  |   4 +-
 .../context/ContextNotActiveException.java    |   6 +-
 .../enterprise/context/Conversation.java      |  32 +--
 .../context/ConversationScoped.java           |  30 ++-
 .../jakarta/enterprise/context/Dependent.java |  11 +-
 .../jakarta/enterprise/context/Destroyed.java |   1 +
 .../enterprise/context/Initialized.java       |  11 +-
 .../NonexistentConversationException.java     |  12 +-
 .../enterprise/context/NormalScope.java       |  10 +-
 .../enterprise/context/RequestScoped.java     |  12 +-
 .../enterprise/context/SessionScoped.java     |  13 +-
 .../control/ActivateRequestContext.java       |  13 +-
 .../control/RequestContextController.java     |  51 ++---
 .../enterprise/context/package-info.java      | 179 +++++++++--------
 .../context/spi/AlterableContext.java         |  12 +-
 .../enterprise/context/spi/Context.java       |  22 +--
 .../enterprise/context/spi/Contextual.java    |  10 +-
 .../context/spi/CreationalContext.java        |   6 +-
 .../enterprise/context/spi/package-info.java  |  31 +--
 .../java/jakarta/enterprise/event/Event.java  |  68 ++++---
 .../event/ImmutableNotificationOptions.java   |   4 +-
 .../enterprise/event/NotificationOptions.java |  16 +-
 .../enterprise/event/ObserverException.java   |   4 +-
 .../jakarta/enterprise/event/Observes.java    |  30 +--
 .../enterprise/event/ObservesAsync.java       |  30 +--
 .../jakarta/enterprise/event/Reception.java   |   8 +-
 .../enterprise/event/TransactionPhase.java    |  13 +-
 .../enterprise/event/package-info.java        | 173 +++++++++-------
 .../enterprise/inject/Alternative.java        |   3 +-
 .../inject/AmbiguousResolutionException.java  |   4 +-
 .../enterprise/inject/CreationException.java  |   4 +-
 .../jakarta/enterprise/inject/Decorated.java  |  14 +-
 .../jakarta/enterprise/inject/Disposes.java   |  40 ++--
 .../inject/IllegalProductException.java       |   2 +-
 .../enterprise/inject/InjectionException.java |   4 +-
 .../jakarta/enterprise/inject/Instance.java   |  86 ++++----
 .../enterprise/inject/Intercepted.java        |  14 +-
 .../java/jakarta/enterprise/inject/Model.java |   4 +-
 .../jakarta/enterprise/inject/Produces.java   |  48 ++---
 .../inject/ResolutionException.java           |   4 +-
 .../enterprise/inject/Specializes.java        |  36 ++--
 .../jakarta/enterprise/inject/Stereotype.java |  39 ++--
 .../enterprise/inject/TransientReference.java |  17 +-
 .../java/jakarta/enterprise/inject/Typed.java |   2 +-
 .../UnproxyableResolutionException.java       |   4 +-
 .../UnsatisfiedResolutionException.java       |   4 +-
 .../jakarta/enterprise/inject/Vetoed.java     |  10 +-
 .../compatible/spi/AnnotationBuilder.java     |   6 +-
 .../spi/AnnotationBuilderFactory.java         |   4 +-
 .../inject/build/compatible/spi/BeanInfo.java |   3 +-
 .../build/compatible/spi/ClassConfig.java     |   6 +-
 .../compatible/spi/DeclarationConfig.java     |   6 +-
 .../build/compatible/spi/FieldConfig.java     |   6 +-
 .../compatible/spi/InjectionPointInfo.java    |   3 +-
 .../build/compatible/spi/InterceptorInfo.java |   4 +-
 .../build/compatible/spi/MetaAnnotations.java |  10 +-
 .../build/compatible/spi/MethodConfig.java    |   6 +-
 .../build/compatible/spi/ObserverInfo.java    |   7 +-
 .../build/compatible/spi/ParameterConfig.java |   6 +-
 .../build/compatible/spi/Parameters.java      |   6 +-
 .../build/compatible/spi/ScannedClasses.java  |   2 +-
 .../build/compatible/spi/SecurityActions.java |   3 +-
 .../spi/SkipIfPortableExtensionPresent.java   |   4 +-
 .../build/compatible/spi/StereotypeInfo.java  |   5 +-
 .../compatible/spi/SyntheticBeanBuilder.java  |   4 +-
 .../compatible/spi/SyntheticComponents.java   |   1 +
 .../spi/SyntheticObserverBuilder.java         |   4 +-
 .../inject/build/compatible/spi/Types.java    |  11 +-
 .../build/compatible/spi/package-info.java    |   4 +-
 .../enterprise/inject/se/SeContainer.java     |  12 +-
 .../inject/se/SeContainerInitializer.java     |  64 +++---
 .../inject/spi/AfterBeanDiscovery.java        |  25 +--
 .../inject/spi/AfterDeploymentValidation.java |   8 +-
 .../inject/spi/AfterTypeDiscovery.java        |  24 ++-
 .../enterprise/inject/spi/Annotated.java      |  21 +-
 .../inject/spi/AnnotatedCallable.java         |   8 +-
 .../inject/spi/AnnotatedConstructor.java      |  15 +-
 .../enterprise/inject/spi/AnnotatedField.java |  15 +-
 .../inject/spi/AnnotatedMember.java           |  12 +-
 .../inject/spi/AnnotatedMethod.java           |  15 +-
 .../inject/spi/AnnotatedParameter.java        |  17 +-
 .../enterprise/inject/spi/AnnotatedType.java  |  21 +-
 .../jakarta/enterprise/inject/spi/Bean.java   |   9 +-
 .../enterprise/inject/spi/BeanAttributes.java |  14 +-
 .../enterprise/inject/spi/BeanContainer.java  |  73 +++----
 .../enterprise/inject/spi/BeanManager.java    | 123 ++++++------
 .../inject/spi/BeforeBeanDiscovery.java       |  59 +++---
 .../enterprise/inject/spi/BeforeShutdown.java |   6 +-
 .../jakarta/enterprise/inject/spi/CDI.java    |  12 +-
 .../enterprise/inject/spi/CDIProvider.java    |   7 +-
 .../enterprise/inject/spi/Decorator.java      |  14 +-
 .../inject/spi/DefinitionException.java       |  10 +-
 .../inject/spi/DeploymentException.java       |  12 +-
 .../enterprise/inject/spi/EventContext.java   |   8 +-
 .../enterprise/inject/spi/EventMetadata.java  |  10 +-
 .../enterprise/inject/spi/Extension.java      |  16 +-
 .../enterprise/inject/spi/InjectionPoint.java |  36 ++--
 .../inject/spi/InjectionTarget.java           |  22 ++-
 .../inject/spi/InjectionTargetFactory.java    |  29 +--
 .../inject/spi/InterceptionFactory.java       |   8 +-
 .../inject/spi/InterceptionType.java          |   6 +-
 .../enterprise/inject/spi/Interceptor.java    |  12 +-
 .../enterprise/inject/spi/ObserverMethod.java |  39 ++--
 .../inject/spi/PassivationCapable.java        |  12 +-
 .../enterprise/inject/spi/Prioritized.java    |   2 +-
 .../inject/spi/ProcessAnnotatedType.java      |  19 +-
 .../enterprise/inject/spi/ProcessBean.java    |  19 +-
 .../inject/spi/ProcessBeanAttributes.java     |  28 ++-
 .../inject/spi/ProcessInjectionPoint.java     |  16 +-
 .../inject/spi/ProcessInjectionTarget.java    |  16 +-
 .../inject/spi/ProcessManagedBean.java        |   8 +-
 .../inject/spi/ProcessObserverMethod.java     |  28 +--
 .../inject/spi/ProcessProducer.java           |  22 ++-
 .../inject/spi/ProcessProducerField.java      |  12 +-
 .../inject/spi/ProcessProducerMethod.java     |  10 +-
 .../inject/spi/ProcessSessionBean.java        |  16 +-
 .../spi/ProcessSyntheticAnnotatedType.java    |  10 +-
 .../inject/spi/ProcessSyntheticBean.java      |   8 +-
 .../spi/ProcessSyntheticObserverMethod.java   |  11 +-
 .../enterprise/inject/spi/Producer.java       |  20 +-
 .../inject/spi/ProducerFactory.java           |  16 +-
 .../inject/spi/SecurityActions.java           |   3 +-
 .../inject/spi/SessionBeanType.java           |   6 +-
 .../enterprise/inject/spi/Unmanaged.java      |  27 +--
 .../inject/spi/WithAnnotations.java           |  14 +-
 .../AnnotatedConstructorConfigurator.java     |  26 +--
 .../AnnotatedFieldConfigurator.java           |  26 +--
 .../AnnotatedMethodConfigurator.java          |  24 +--
 .../AnnotatedParameterConfigurator.java       |  28 +--
 .../AnnotatedTypeConfigurator.java            |  32 +--
 .../BeanAttributesConfigurator.java           |  11 +-
 .../spi/configurator/BeanConfigurator.java    |   4 +-
 .../InjectionPointConfigurator.java           |   9 +-
 .../ObserverMethodConfigurator.java           |  12 +-
 .../configurator/ProducerConfigurator.java    |  11 +-
 .../enterprise/inject/spi/package-info.java   | 187 ++++++++++--------
 .../jakarta/enterprise/invoke/Invoker.java    |   8 +-
 .../enterprise/invoke/InvokerBuilder.java     |  19 +-
 .../enterprise/util/AnnotationLiteral.java    |  14 +-
 .../jakarta/enterprise/util/Nonbinding.java   |   3 +-
 .../enterprise/util/SecurityActions.java      |   7 +-
 .../jakarta/enterprise/util/TypeLiteral.java  |  14 +-
 .../jakarta/enterprise/util/package-info.java |   2 +-
 .../cdi/api/test/AnnotationLiteralTest.java   |  12 +-
 .../java/org/jboss/cdi/api/test/CDITest.java  |  21 +-
 .../cdi/api/test/ClosableCDIProvider.java     |   8 +-
 .../jboss/cdi/api/test/DummyCDIProvider.java  |   3 +-
 .../jboss/cdi/api/test/DummyCDIProvider2.java |   4 +-
 .../test/annotated/AbstractAnnotatedTest.java |  17 +-
 .../annotated/AnnotatedCallableHolder.java    |  36 ++--
 .../annotated/AnnotatedConstructorHolder.java |   6 +-
 .../annotated/AnnotatedConstructorTest.java   |  20 +-
 .../test/annotated/AnnotatedFieldHolder.java  |   6 +-
 .../test/annotated/AnnotatedFieldTest.java    |  19 +-
 .../test/annotated/AnnotatedMemberHolder.java |  29 ++-
 .../test/annotated/AnnotatedMethodHolder.java |   8 +-
 .../test/annotated/AnnotatedMethodTest.java   |  21 +-
 .../annotated/AnnotatedParameterHolder.java   |  26 ++-
 .../annotated/AnnotatedParameterTest.java     |  18 +-
 .../test/annotated/AnnotatedTypeHolder.java   |  34 ++--
 .../api/test/annotated/AnnotatedTypeTest.java |  14 +-
 .../cdi/api/test/annotated/RepeatBean.java    |   1 +
 .../cdi/api/test/annotated/Repeater.java      |   2 +-
 .../cdi/api/test/annotated/Repeaters.java     |   2 +-
 .../parameter/AnnotatedParameterTest.java     |   6 +-
 .../test/event/NotificationOptionsTest.java   |   2 +-
 .../test/privileged/CDIPrivilegedTest.java    |   1 -
 .../api/test/privileged/FakeCDIProvider.java  |   4 +-
 .../annotation/AnnotationLiteralTest.java     |   1 +
 .../privileged/annotation/MyAnnotation.java   |   2 +-
 .../annotation/MyAnnotationLiteral.java       |   1 -
 .../test/se/DummySeContainerInitializer.java  |   9 +-
 .../test/se/DummySeContainerInitializer2.java |   8 +-
 .../test/se/SeContainerInitializerTest.java   |  14 +-
 .../inject/spi/el/ELAwareBeanManager.java     |   3 +-
 .../enterprise/lang/model/AnnotationInfo.java |   7 +-
 .../lang/model/AnnotationMember.java          |   4 +-
 .../lang/model/AnnotationTarget.java          |   9 +-
 .../lang/model/declarations/ClassInfo.java    |   6 +-
 .../lang/model/declarations/MethodInfo.java   |   5 +-
 .../lang/model/types/ParameterizedType.java   |   3 +-
 .../enterprise/lang/model/types/Type.java     |   3 +-
 188 files changed, 1935 insertions(+), 1523 deletions(-)

diff --git a/api/src/main/java/jakarta/decorator/Decorator.java b/api/src/main/java/jakarta/decorator/Decorator.java
index 3b3578ac5..e7497f711 100644
--- a/api/src/main/java/jakarta/decorator/Decorator.java
+++ b/api/src/main/java/jakarta/decorator/Decorator.java
@@ -8,7 +8,7 @@
  * You may obtain a copy of the License at
  * http://www.apache.org/licenses/LICENSE-2.0
  * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,  
+ * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
@@ -29,19 +29,21 @@
  * <p>
  * Specifies that a class is a decorator. May be applied to a managed bean class.
  * </p>
- * 
+ *
  * <pre>
- * &#064;Decorator 
+ * &#064;Decorator
  * class TimestampLogger implements Logger { ... }
  * </pre>
- * 
+ *
  * <p>
  * Decorators of a session bean must comply with the bean provider programming restrictions defined by the EJB specification.
  * Decorators of a stateful session bean must comply with the rules for instance passivation and conversational state defined by
  * the EJB specification.
  * </p>
  *
- * <p>CDI Lite implementations are not required to provide support for decorators.</p>
+ * <p>
+ * CDI Lite implementations are not required to provide support for decorators.
+ * </p>
  *
  * @see Delegate &#064;Delegate identifies the delegate injection point of a decorator.
  *
diff --git a/api/src/main/java/jakarta/decorator/Delegate.java b/api/src/main/java/jakarta/decorator/Delegate.java
index 23e331a77..4e7573897 100644
--- a/api/src/main/java/jakarta/decorator/Delegate.java
+++ b/api/src/main/java/jakarta/decorator/Delegate.java
@@ -8,7 +8,7 @@
  * You may obtain a copy of the License at
  * http://www.apache.org/licenses/LICENSE-2.0
  * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,  
+ * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
@@ -29,45 +29,45 @@
  * Identifies the delegate injection point of a decorator. May be applied to a field, bean constructor parameter or initializer
  * method parameter of a decorator bean class.
  * </p>
- * 
+ *
  * <pre>
- * &#064;Decorator 
- * class TimestampLogger implements Logger { 
- *    &#064;Inject &#064;Delegate &#064;Any Logger logger; 
- *    ... 
+ * &#064;Decorator
+ * class TimestampLogger implements Logger {
+ *    &#064;Inject &#064;Delegate &#064;Any Logger logger;
+ *    ...
  * }
  * </pre>
- * 
+ *
  * <pre>
- * &#064;Decorator 
- * class TimestampLogger implements Logger { 
+ * &#064;Decorator
+ * class TimestampLogger implements Logger {
  *    private Logger logger;
- *    
+ *
  *    &#064;Inject
- *    public TimestampLogger(&#064;Delegate &#064;Debug Logger logger) { 
- *       this.logger=logger; 
- *    } 
- *    ... 
+ *    public TimestampLogger(&#064;Delegate &#064;Debug Logger logger) {
+ *       this.logger=logger;
+ *    }
+ *    ...
  * }
  * </pre>
- * 
+ *
  * <p>
  * A decorator must have exactly one delegate injection point. The delegate injection point must be an injected field,
  * initializer method parameter or bean constructor method parameter.
  * </p>
- * 
+ *
  * <p>
  * The container injects a delegate object to the delegate injection point. The delegate object implements the delegate type and
  * delegates method invocations along the decorator stack. When the container calls a decorator during business method
  * interception, the decorator may invoke any method of the delegate object. If a decorator invokes the delegate object at any
  * other time, the invoked method throws an {@link java.lang.IllegalStateException}.
  * </p>
- * 
+ *
  * <pre>
- * &#064;Decorator 
- * class TimestampLogger implements Logger { 
- *    &#064;Inject &#064;Delegate &#064;Any Logger logger; 
- *    
+ * &#064;Decorator
+ * class TimestampLogger implements Logger {
+ *    &#064;Inject &#064;Delegate &#064;Any Logger logger;
+ *
  *    void log(String message) {
  *       logger.log( timestamp() + ": " + message );
  *    }
@@ -75,10 +75,12 @@
  * }
  * </pre>
  *
- * <p>CDI Lite implementations are not required to provide support for decorators.</p>
+ * <p>
+ * CDI Lite implementations are not required to provide support for decorators.
+ * </p>
  *
  * @see Decorator &#064;Decorator specifies that a class is a decorator.
- * 
+ *
  * @author Gavin King
  * @author Pete Muir
  */
diff --git a/api/src/main/java/jakarta/decorator/package-info.java b/api/src/main/java/jakarta/decorator/package-info.java
index 4610ed955..14bf3a78a 100644
--- a/api/src/main/java/jakarta/decorator/package-info.java
+++ b/api/src/main/java/jakarta/decorator/package-info.java
@@ -8,89 +8,114 @@
  * You may obtain a copy of the License at
  * http://www.apache.org/licenses/LICENSE-2.0
  * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,  
+ * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
 /**
- * <p>Annotations relating to decorators.</p>
- * 
- * <p>A decorator implements one or more bean types and 
- * intercepts business method invocations of 
- * {@linkplain jakarta.enterprise.inject beans} which 
- * implement those bean types. These bean types are called 
- * decorated types.</p>
- * 
- * <p>A decorator is a managed bean annotated {@link 
- * jakarta.decorator.Decorator &#064;Decorator}.</p>
- * 
- * <p>Decorators are superficially similar to interceptors, 
- * but because they directly implement operations with business 
- * semantics, they are able to implement business logic and, 
- * conversely, unable to implement the cross-cutting concerns 
- * for which interceptors are optimized. Decorators are called 
- * after interceptors.</p>
- * 
+ * <p>
+ * Annotations relating to decorators.
+ * </p>
+ *
+ * <p>
+ * A decorator implements one or more bean types and
+ * intercepts business method invocations of
+ * {@linkplain jakarta.enterprise.inject beans} which
+ * implement those bean types. These bean types are called
+ * decorated types.
+ * </p>
+ *
+ * <p>
+ * A decorator is a managed bean annotated {@link
+ * jakarta.decorator.Decorator &#064;Decorator}.
+ * </p>
+ *
+ * <p>
+ * Decorators are superficially similar to interceptors,
+ * but because they directly implement operations with business
+ * semantics, they are able to implement business logic and,
+ * conversely, unable to implement the cross-cutting concerns
+ * for which interceptors are optimized. Decorators are called
+ * after interceptors.
+ * </p>
+ *
  * <h2>Decorated types</h2>
- * 
- * <p>The set of decorated types of a decorator includes all 
- * bean types of the managed bean that are Java interfaces, 
- * except for {@link java.io.Serializable}. The decorator bean 
- * class and its superclasses are not decorated types of the 
- * decorator. The decorator class may be abstract.</p>
- * 
- * <p>A decorator intercepts every method:</p>
+ *
+ * <p>
+ * The set of decorated types of a decorator includes all
+ * bean types of the managed bean that are Java interfaces,
+ * except for {@link java.io.Serializable}. The decorator bean
+ * class and its superclasses are not decorated types of the
+ * decorator. The decorator class may be abstract.
+ * </p>
+ *
+ * <p>
+ * A decorator intercepts every method:
+ * </p>
  * <ul>
  * <li>declared by a decorated type of the decorator</li>
  * <li>that is implemented by the bean class of the decorator.</li>
  * </ul>
- * 
- * <p>A decorator may be an abstract class, and is not required to 
- * implement every method of every decorated type.</p>
- * 
+ *
+ * <p>
+ * A decorator may be an abstract class, and is not required to
+ * implement every method of every decorated type.
+ * </p>
+ *
  * <h2>Delegate injection points</h2>
- * 
- * <p>All decorators have a 
- * {@linkplain jakarta.decorator.Delegate delegate injection point}.  
- * A delegate injection point is an injection point of the bean 
- * class annotated {@link jakarta.decorator.Delegate &#064;Delegate}.</p>
- * 
- * <p>The type of the delegate injection point must implement or 
- * extend every decorated type. A decorator is not required to 
- * implement the type of the delegate injection point.</p>
- * 
+ *
+ * <p>
+ * All decorators have a
+ * {@linkplain jakarta.decorator.Delegate delegate injection point}.
+ * A delegate injection point is an injection point of the bean
+ * class annotated {@link jakarta.decorator.Delegate &#064;Delegate}.
+ * </p>
+ *
+ * <p>
+ * The type of the delegate injection point must implement or
+ * extend every decorated type. A decorator is not required to
+ * implement the type of the delegate injection point.
+ * </p>
+ *
  * <h2>Enabled decorators</h2>
- *  
- * <p>By default, a bean archive has no enabled decorators. A 
- * decorator must be explicitly enabled by listing its bean class 
+ *
+ * <p>
+ * By default, a bean archive has no enabled decorators. A
+ * decorator must be explicitly enabled by listing its bean class
  * under the <code>&lt;decorators&gt;</code> element of the
  * <code>beans.xml</code> file of the bean archive. The order of the
- * decorator declarations determines the decorator ordering. 
- * Decorators which occur earlier in the list are called first.</p>
- * 
- * <p>A decorator is bound to a bean if:</p>
- * 
+ * decorator declarations determines the decorator ordering.
+ * Decorators which occur earlier in the list are called first.
+ * </p>
+ *
+ * <p>
+ * A decorator is bound to a bean if:
+ * </p>
+ *
  * <ul>
- * <li>The bean is {@linkplain jakarta.enterprise.inject eligible for injection} 
+ * <li>The bean is {@linkplain jakarta.enterprise.inject eligible for injection}
  * to the delegate injection point of the decorator.</li>
  * <li>The decorator is enabled in the bean archive of the bean.</li>
  * </ul>
- * 
- * <p>If a managed bean class is declared final, it may not have
- * decorators. If a managed bean has a non-static, non-private, 
+ *
+ * <p>
+ * If a managed bean class is declared final, it may not have
+ * decorators. If a managed bean has a non-static, non-private,
  * final method, it may not have any decorator which implements
- * that method.</p>
- * 
- * <p>A decorator instance is a 
- * {@linkplain jakarta.enterprise.context.Dependent dependent object} 
- * of the object it decorates.</p>
- * 
+ * that method.
+ * </p>
+ *
+ * <p>
+ * A decorator instance is a
+ * {@linkplain jakarta.enterprise.context.Dependent dependent object}
+ * of the object it decorates.
+ * </p>
+ *
  * @see jakarta.enterprise.inject
- * 
+ *
  * @see jakarta.decorator.Decorator
  * @see jakarta.decorator.Delegate
- * 
+ *
  */
 package jakarta.decorator;
-
diff --git a/api/src/main/java/jakarta/enterprise/context/ApplicationScoped.java b/api/src/main/java/jakarta/enterprise/context/ApplicationScoped.java
index a9ede12e3..e4e113de6 100644
--- a/api/src/main/java/jakarta/enterprise/context/ApplicationScoped.java
+++ b/api/src/main/java/jakarta/enterprise/context/ApplicationScoped.java
@@ -35,7 +35,8 @@
  * <p>
  * While <code>ApplicationScoped</code> must be associated with the built-in application context required by the specification,
  * third-party extensions are
- * allowed to also associate it with their own context. Behavior described below is only related to the built-in application context.
+ * allowed to also associate it with their own context. Behavior described below is only related to the built-in application
+ * context.
  * </p>
  *
  * <p>
@@ -43,7 +44,8 @@
  * </p>
  *
  * <ul>
- * <li>during the <code>service()</code> method of any servlet in the web application, during the <code>doFilter()</code> method of any
+ * <li>during the <code>service()</code> method of any servlet in the web application, during the <code>doFilter()</code> method
+ * of any
  * servlet filter and when the container calls any <code>ServletContextListener</code>, <code>HttpSessionListener</code>,
  * <code>AsyncListener</code> or <code>ServletRequestListener</code>,</li>
  * <li>during any Java EE web service invocation,</li>
@@ -64,15 +66,16 @@
  * </p>
  *
  * <p>
-  * An event with qualifier <code>@Initialized(ApplicationScoped.class)</code> is fired when the application context is initialized
-  * and an event with qualifier <code>@Destroyed(ApplicationScoped.class)</code> when the application context is destroyed.
-  * The event payload is:
-  * </p>
-  *
-  * <ul>
-  * <li>the <code>ServletContext</code> if the application is a web application deployed to a Servlet container, or</li>
-  * <li>any <code>java.lang.Object</code> for other types of application.</li>
-  * </ul>
+ * An event with qualifier <code>@Initialized(ApplicationScoped.class)</code> is fired when the application context is
+ * initialized
+ * and an event with qualifier <code>@Destroyed(ApplicationScoped.class)</code> when the application context is destroyed.
+ * The event payload is:
+ * </p>
+ *
+ * <ul>
+ * <li>the <code>ServletContext</code> if the application is a web application deployed to a Servlet container, or</li>
+ * <li>any <code>java.lang.Object</code> for other types of application.</li>
+ * </ul>
  *
  * @author Gavin King
  * @author Pete Muir
diff --git a/api/src/main/java/jakarta/enterprise/context/BeforeDestroyed.java b/api/src/main/java/jakarta/enterprise/context/BeforeDestroyed.java
index 8390ecd05..b8c476123 100644
--- a/api/src/main/java/jakarta/enterprise/context/BeforeDestroyed.java
+++ b/api/src/main/java/jakarta/enterprise/context/BeforeDestroyed.java
@@ -31,7 +31,7 @@
 import jakarta.inject.Qualifier;
 
 /**
- * An event with this qualifier is fired when a context is about to be destroyed, i.e. before the actual destruction. 
+ * An event with this qualifier is fired when a context is about to be destroyed, i.e. before the actual destruction.
  *
  * @author Pete Muir
  * @author Martin Kouba
@@ -47,6 +47,7 @@
 
     /**
      * The scope for which to observe destruction
+     *
      * @return the scope type class
      */
     Class<? extends Annotation> value();
@@ -56,14 +57,14 @@
      */
     public final static class Literal extends AnnotationLiteral<BeforeDestroyed> implements BeforeDestroyed {
 
-        public static final Literal REQUEST = of(RequestScoped.class); 
-        
+        public static final Literal REQUEST = of(RequestScoped.class);
+
         public static final Literal CONVERSATION = of(ConversationScoped.class);
-        
+
         public static final Literal SESSION = of(SessionScoped.class);
-        
+
         public static final Literal APPLICATION = of(ApplicationScoped.class);
-        
+
         private static final long serialVersionUID = 1L;
 
         private final Class<? extends Annotation> value;
diff --git a/api/src/main/java/jakarta/enterprise/context/BusyConversationException.java b/api/src/main/java/jakarta/enterprise/context/BusyConversationException.java
index 32611730c..4fd40c4d1 100644
--- a/api/src/main/java/jakarta/enterprise/context/BusyConversationException.java
+++ b/api/src/main/java/jakarta/enterprise/context/BusyConversationException.java
@@ -8,7 +8,7 @@
  * You may obtain a copy of the License at
  * http://www.apache.org/licenses/LICENSE-2.0
  * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,  
+ * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
@@ -21,7 +21,7 @@
  * Indicates that the container has rejected a request because a concurrent request is associated with the same conversation
  * context.
  * </p>
- * 
+ *
  * <p>
  * The container ensures that a long-running conversation may be associated with at most one request at a time, by blocking or
  * rejecting concurrent requests. If the container rejects a request, it must associate the request with a new transient
@@ -29,10 +29,12 @@
  * lifecycle.
  * </p>
  *
- * <p>CDI Lite implementations are not required to provide support for conversations.</p>
- * 
+ * <p>
+ * CDI Lite implementations are not required to provide support for conversations.
+ * </p>
+ *
  * @see ConversationScoped
- * 
+ *
  * @author Pete Muir
  * @author Gavin King
  */
diff --git a/api/src/main/java/jakarta/enterprise/context/ContextException.java b/api/src/main/java/jakarta/enterprise/context/ContextException.java
index 220a17279..3371d84f2 100644
--- a/api/src/main/java/jakarta/enterprise/context/ContextException.java
+++ b/api/src/main/java/jakarta/enterprise/context/ContextException.java
@@ -8,7 +8,7 @@
  * You may obtain a copy of the License at
  * http://www.apache.org/licenses/LICENSE-2.0
  * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,  
+ * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
@@ -20,7 +20,7 @@
  * <p>
  * Indicates a problem relating to context management.
  * </p>
- * 
+ *
  * @author Pete Muir
  * @author Shane Bryzak
  */
diff --git a/api/src/main/java/jakarta/enterprise/context/ContextNotActiveException.java b/api/src/main/java/jakarta/enterprise/context/ContextNotActiveException.java
index 8ef814004..7153f2e28 100644
--- a/api/src/main/java/jakarta/enterprise/context/ContextNotActiveException.java
+++ b/api/src/main/java/jakarta/enterprise/context/ContextNotActiveException.java
@@ -8,7 +8,7 @@
  * You may obtain a copy of the License at
  * http://www.apache.org/licenses/LICENSE-2.0
  * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,  
+ * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
@@ -22,9 +22,9 @@
  * <p>
  * Indicates that a context is not active.
  * </p>
- * 
+ *
  * @see Context
- * 
+ *
  * @author Pete Muir
  * @author Shane Bryzak
  * @author Gavin King
diff --git a/api/src/main/java/jakarta/enterprise/context/Conversation.java b/api/src/main/java/jakarta/enterprise/context/Conversation.java
index 4d5b7ebfd..77b950894 100644
--- a/api/src/main/java/jakarta/enterprise/context/Conversation.java
+++ b/api/src/main/java/jakarta/enterprise/context/Conversation.java
@@ -8,7 +8,7 @@
  * You may obtain a copy of the License at
  * http://www.apache.org/licenses/LICENSE-2.0
  * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,  
+ * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
@@ -21,28 +21,30 @@
  * the current conversation as transient or long-running, specifying a conversation identifier, or setting the conversation
  * timeout.
  * </p>
- * 
+ *
  * <p>
  * An instance may be injected:
  * </p>
- * 
+ *
  * <pre>
  * &#064;Inject
  * Conversation conversation;
  * </pre>
- * 
+ *
  * <p>
  * The conversation timeout is a hint to the container that a conversation should not be destroyed if it has been active within
  * the last given interval in milliseconds.
  * </p>
  *
- * <p>CDI Lite implementations are not required to provide support for conversations.</p>
- * 
+ * <p>
+ * CDI Lite implementations are not required to provide support for conversations.
+ * </p>
+ *
  * @see ConversationScoped &#064;ConversationScoped
- * 
+ *
  * @author Pete Muir
  * @author Gavin King
- * 
+ *
  */
 public interface Conversation {
 
@@ -50,7 +52,7 @@ public interface Conversation {
      * <p>
      * Mark the current transient conversation long-running. A conversation identifier is generated by the container.
      * </p>
-     * 
+     *
      * @throws IllegalStateException if the current conversation is already marked long-running.
      */
     public void begin();
@@ -59,7 +61,7 @@ public interface Conversation {
      * <p>
      * Mark the current transient conversation long-running, with a specified identifier.
      * </p>
-     * 
+     *
      * @param id conversation id
      * @throws IllegalStateException if the current conversation is already marked long-running.
      * @throws IllegalArgumentException if a conversation with the specified identifier already exists.
@@ -70,7 +72,7 @@ public interface Conversation {
      * <p>
      * Marks the current long-running conversation transient.
      * </p>
-     * 
+     *
      * @throws IllegalStateException if the current conversation is already marked transient.
      */
     public void end();
@@ -79,7 +81,7 @@ public interface Conversation {
      * <p>
      * Get the identifier of the current long-running conversation.
      * </p>
-     * 
+     *
      * @return the identifier of the current long-running conversation, or a null value if the current conversation is
      *         transient.
      */
@@ -89,7 +91,7 @@ public interface Conversation {
      * <p>
      * Get the timeout of the current conversation.
      * </p>
-     * 
+     *
      * @return the current timeout in milliseconds.
      */
     public long getTimeout();
@@ -98,7 +100,7 @@ public interface Conversation {
      * <p>
      * Set the timeout of the current conversation.
      * </p>
-     * 
+     *
      * @param milliseconds the new timeout in milliseconds.
      */
     public void setTimeout(long milliseconds);
@@ -107,7 +109,7 @@ public interface Conversation {
      * <p>
      * Determine if the conversation is marked transient or long-running.
      * </p>
-     * 
+     *
      * @return <code>true</code> if the conversation is marked transient, or <code>false</code>if it is marked long-running.
      */
     public boolean isTransient();
diff --git a/api/src/main/java/jakarta/enterprise/context/ConversationScoped.java b/api/src/main/java/jakarta/enterprise/context/ConversationScoped.java
index a3c30e2e9..6770be1d4 100644
--- a/api/src/main/java/jakarta/enterprise/context/ConversationScoped.java
+++ b/api/src/main/java/jakarta/enterprise/context/ConversationScoped.java
@@ -32,10 +32,12 @@
  * <p>
  * Specifies that a bean is conversation scoped.
  * </p>
- *  <p>
- * While <code>ConversationScoped</code> must be associated with the built-in conversation context required by the specification,
+ * <p>
+ * While <code>ConversationScoped</code> must be associated with the built-in conversation context required by the
+ * specification,
  * third-party extensions are
- * allowed to also associate it with their own context. Behavior described below is only related to the built-in conversation context.
+ * allowed to also associate it with their own context. Behavior described below is only related to the built-in conversation
+ * context.
  * </p>
  * <p>
  * The conversation scope is active:
@@ -44,12 +46,14 @@
  * <li>during all Servlet requests.</li>
  * </ul>
  * <p>
- * An event with qualifier <code>@Initialized(ConversationScoped.class)</code> is fired when the conversation context is initialized
+ * An event with qualifier <code>@Initialized(ConversationScoped.class)</code> is fired when the conversation context is
+ * initialized
  * and an event with qualifier <code>@Destroyed(ConversationScoped.class)</code> is fired when the conversation is destroyed.
  * The event payload is:
  * </p>
  * <ul>
- * <li>the conversation id if the conversation context is destroyed and is not associated with a current Servlet request, or</li>
+ * <li>the conversation id if the conversation context is destroyed and is not associated with a current Servlet request,
+ * or</li>
  * <li>the <code>ServletRequest</code> if the application is a web application deployed to a Servlet container, or</li>
  * <li>any <code>java.lang.Object</code> for other types of application.</li>
  * </ul>
@@ -63,8 +67,10 @@
  * <li>Any Servlet request has exactly one associated conversation.</li>
  * <li>The container provides a filter with the name "CDI Conversation Filter", which may be mapped in <code>web.xml</code>,
  * allowing the user alter when the conversation is associated with the servlet request. If this filter is not mapped in any
- * <code>web.xml</code> in the application, the conversation associated with a Servlet request is determined at the beginning of the
- * request before calling any <code>service()</code> method of any servlet in the web application, calling the <code>doFilter()</code>
+ * <code>web.xml</code> in the application, the conversation associated with a Servlet request is determined at the beginning of
+ * the
+ * request before calling any <code>service()</code> method of any servlet in the web application, calling the
+ * <code>doFilter()</code>
  * method of any servlet filter in the web application and before the container calls any <code>ServletRequestListener</code> or
  * <code>AsyncListener</code> in the web application.</li>
  * </ul>
@@ -106,13 +112,15 @@
  * <li>The long-running conversation context associated with a request that renders a JSF view is automatically propagated to
  * any faces request (JSF form submission) that originates from that rendered page.</li>
  * <li>The long-running conversation context associated with a request that results in a JSF redirect (a redirect resulting from
- * a navigation rule or JSF <code>NavigationHandler</code>) is automatically propagated to the resulting non-faces request, and to any other
+ * a navigation rule or JSF <code>NavigationHandler</code>) is automatically propagated to the resulting non-faces request, and
+ * to any other
  * subsequent request to the same URL. This is accomplished via use of a request parameter named <code>cid</code> containing the
  * unique identifier of the conversation.</li>
  * </ul>
  *
  * <p>
- * When no conversation is propagated to a Servlet request, or if a request parameter named <code>conversationPropagation</code> has
+ * When no conversation is propagated to a Servlet request, or if a request parameter named <code>conversationPropagation</code>
+ * has
  * the value <code>none</code> the request is associated with a new transient conversation.
  * All long-running conversations are scoped to a particular HTTP servlet session and may not cross session boundaries.
  * In the following cases, a propagated long-running conversation cannot be restored and re-associated with the request:
@@ -125,7 +133,9 @@
  * Servlet request, in order to conserve resources.</li>
  * </ul>
  *
- * <p>CDI Lite implementations are not required to provide support for conversations.</p>
+ * <p>
+ * CDI Lite implementations are not required to provide support for conversations.
+ * </p>
  *
  * @see Conversation
  * @see NonexistentConversationException
diff --git a/api/src/main/java/jakarta/enterprise/context/Dependent.java b/api/src/main/java/jakarta/enterprise/context/Dependent.java
index 02583b17e..20c3c285a 100644
--- a/api/src/main/java/jakarta/enterprise/context/Dependent.java
+++ b/api/src/main/java/jakarta/enterprise/context/Dependent.java
@@ -26,14 +26,13 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
+import jakarta.enterprise.context.spi.Context;
 import jakarta.enterprise.context.spi.Contextual;
 import jakarta.enterprise.context.spi.CreationalContext;
+import jakarta.enterprise.inject.Instance;
 import jakarta.enterprise.util.AnnotationLiteral;
 import jakarta.inject.Scope;
 
-import jakarta.enterprise.context.spi.Context;
-import jakarta.enterprise.inject.Instance;
-
 /**
  * <p>
  * Specifies that a bean belongs to the dependent pseudo-scope.
@@ -73,13 +72,15 @@
  * </p>
  *
  * <p>
- * Many instances of beans with scope <code>@Dependent</code> belong to some other bean or Java EE component class instance and are
+ * Many instances of beans with scope <code>@Dependent</code> belong to some other bean or Java EE component class instance and
+ * are
  * called dependent objects.
  * </p>
  *
  * <ul>
  * <li>Instances of decorators and interceptors are dependent objects of the bean instance they decorate.</li>
- * <li>An instance of a bean with scope <code>@Dependent</code> injected into a field, bean constructor or initializer method is a
+ * <li>An instance of a bean with scope <code>@Dependent</code> injected into a field, bean constructor or initializer method is
+ * a
  * dependent object of the bean or Java EE component class instance into which it was injected.</li>
  * <li>An instance of a bean with scope <code>@Dependent</code> injected into a producer method is a dependent object of the
  * producer method bean instance that is being produced.</li>
diff --git a/api/src/main/java/jakarta/enterprise/context/Destroyed.java b/api/src/main/java/jakarta/enterprise/context/Destroyed.java
index 760c878c8..8d733786d 100644
--- a/api/src/main/java/jakarta/enterprise/context/Destroyed.java
+++ b/api/src/main/java/jakarta/enterprise/context/Destroyed.java
@@ -46,6 +46,7 @@
 
     /**
      * The scope for which to observe destruction
+     *
      * @return the scope type class
      */
     Class<? extends Annotation> value();
diff --git a/api/src/main/java/jakarta/enterprise/context/Initialized.java b/api/src/main/java/jakarta/enterprise/context/Initialized.java
index 49b2035e7..9e8549c5f 100644
--- a/api/src/main/java/jakarta/enterprise/context/Initialized.java
+++ b/api/src/main/java/jakarta/enterprise/context/Initialized.java
@@ -46,6 +46,7 @@
 
     /**
      * The scope for which to observe initialization
+     *
      * @return the scope type class
      */
     Class<? extends Annotation> value();
@@ -56,13 +57,13 @@
      * @author Martin Kouba
      */
     public final static class Literal extends AnnotationLiteral<Initialized> implements Initialized {
-        
-        public static final Literal REQUEST = of(RequestScoped.class); 
-        
+
+        public static final Literal REQUEST = of(RequestScoped.class);
+
         public static final Literal CONVERSATION = of(ConversationScoped.class);
-        
+
         public static final Literal SESSION = of(SessionScoped.class);
-        
+
         public static final Literal APPLICATION = of(ApplicationScoped.class);
 
         private static final long serialVersionUID = 1L;
diff --git a/api/src/main/java/jakarta/enterprise/context/NonexistentConversationException.java b/api/src/main/java/jakarta/enterprise/context/NonexistentConversationException.java
index 9c4b7c140..7a8bf2d8a 100644
--- a/api/src/main/java/jakarta/enterprise/context/NonexistentConversationException.java
+++ b/api/src/main/java/jakarta/enterprise/context/NonexistentConversationException.java
@@ -8,7 +8,7 @@
  * You may obtain a copy of the License at
  * http://www.apache.org/licenses/LICENSE-2.0
  * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,  
+ * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
@@ -20,16 +20,18 @@
  * <p>
  * Indicates that the conversation context could not be restored.
  * </p>
- * 
+ *
  * <p>
  * If the propagated conversation cannot be restored, the container must associate the request with a new transient conversation
  * and throw an exception of type <code>NonexistentConversationException</code>.
  * </p>
  *
- * <p>CDI Lite implementations are not required to provide support for conversations.</p>
- * 
+ * <p>
+ * CDI Lite implementations are not required to provide support for conversations.
+ * </p>
+ *
  * @see ConversationScoped
- * 
+ *
  * @author Pete Muir
  * @author Gavin King
  */
diff --git a/api/src/main/java/jakarta/enterprise/context/NormalScope.java b/api/src/main/java/jakarta/enterprise/context/NormalScope.java
index fae6ceb68..484d04daa 100644
--- a/api/src/main/java/jakarta/enterprise/context/NormalScope.java
+++ b/api/src/main/java/jakarta/enterprise/context/NormalScope.java
@@ -8,7 +8,7 @@
  * You may obtain a copy of the License at
  * http://www.apache.org/licenses/LICENSE-2.0
  * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,  
+ * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
@@ -27,10 +27,10 @@
  * <p>
  * Specifies that an annotation type is a normal scope type.
  * </p>
- * 
+ *
  * @author Gavin King
  * @author Pete Muir
- * 
+ *
  * @see jakarta.inject.Scope &#064;Scope is used to declare pseudo-scopes.
  */
 @Target(ANNOTATION_TYPE)
@@ -42,12 +42,12 @@
      * <p>
      * Determines whether the normal scope type is a passivating scope.
      * </p>
-     * 
+     *
      * <p>
      * A bean is called passivation capable if the container is able to temporarily transfer the state of any idle instance to
      * secondary storage. A passivating scope requires that beans with the scope are passivation capable.
      * </p>
-     * 
+     *
      * @return <code>true</code> if the scope type is a passivating scope type
      */
     boolean passivating() default false;
diff --git a/api/src/main/java/jakarta/enterprise/context/RequestScoped.java b/api/src/main/java/jakarta/enterprise/context/RequestScoped.java
index c6af80f85..0b3aac648 100644
--- a/api/src/main/java/jakarta/enterprise/context/RequestScoped.java
+++ b/api/src/main/java/jakarta/enterprise/context/RequestScoped.java
@@ -35,7 +35,8 @@
  * <p>
  * While <code>RequestScoped</code> must be associated with the built-in request context required by the specification,
  * third-party extensions are
- * allowed to also associate it with their own context. Behavior described below is only related to the built-in request context.
+ * allowed to also associate it with their own context. Behavior described below is only related to the built-in request
+ * context.
  * </p>
  *
  * <p>
@@ -43,7 +44,8 @@
  * </p>
  *
  * <ul>
- * <li>during the <code>service()</code> method of any servlet in the web application, during the <code>doFilter()</code> method of any
+ * <li>during the <code>service()</code> method of any servlet in the web application, during the <code>doFilter()</code> method
+ * of any
  * servlet filter and when the container calls any <code>ServletRequestListener</code> or <code>AsyncListener</code>,</li>
  * <li>during any Java EE web service invocation,</li>
  * <li>during any remote method invocation of any EJB, during any asynchronous method invocation of any EJB, during any call to
@@ -61,12 +63,14 @@
  * <li>after the web service invocation completes,</li>
  * <li>after the EJB remote method invocation, asynchronous method invocation, timeout or message delivery completes if it
  * did not already exist when the invocation occurred, or</li>
- * <li>after the <code>@PostConstruct</code> callback completes, if it did not already exist when the <code>@PostConstruct</code>
+ * <li>after the <code>@PostConstruct</code> callback completes, if it did not already exist when the
+ * <code>@PostConstruct</code>
  * callback occurred.</li>
  * </ul>
  *
  * <p>
- * An event with qualifier <code>@Initialized(RequestScoped.class)</code> is fired when the request context is initialized and an
+ * An event with qualifier <code>@Initialized(RequestScoped.class)</code> is fired when the request context is initialized and
+ * an
  * event
  * with qualifier <code>@Destroyed(RequestScoped.class)</code> when the request context is destroyed. The event payload is:
  * </p>
diff --git a/api/src/main/java/jakarta/enterprise/context/SessionScoped.java b/api/src/main/java/jakarta/enterprise/context/SessionScoped.java
index f18309927..2364ea97d 100644
--- a/api/src/main/java/jakarta/enterprise/context/SessionScoped.java
+++ b/api/src/main/java/jakarta/enterprise/context/SessionScoped.java
@@ -35,7 +35,8 @@
  * <p>
  * While <code>SessionScoped</code> must be associated with the built-in session context required by the specification,
  * third-party extensions are
- * allowed to also associate it with their own context. Behavior described below is only related to the built-in session context.
+ * allowed to also associate it with their own context. Behavior described below is only related to the built-in session
+ * context.
  * </p>
  * <p>
  * The session scope is active:
@@ -58,17 +59,21 @@
  * <ul>
  * <li>when the HTTPSession times out, after all <code>HttpSessionListeners</code> have been called, or</li>
  * <li>at the very end of
- * any request in which <code>invalidate()</code> was called, after all filters and <code>ServletRequestListeners</code> have been
+ * any request in which <code>invalidate()</code> was called, after all filters and <code>ServletRequestListeners</code> have
+ * been
  * called.</Li>
  * </ul>
  *
  * <p>
- * An event with qualifier <code>@Initialized(SessionScoped.class)</code> is fired when the session context is initialized and an
+ * An event with qualifier <code>@Initialized(SessionScoped.class)</code> is fired when the session context is initialized and
+ * an
  * event
  * with qualifier <code>@Destroyed(SessionScoped.class)</code> when the session context is destroyed. The event payload is
  * the <code>HttpSession</code>
  *
- * <p>CDI Lite implementations are not required to provide support for the session scope.</p>
+ * <p>
+ * CDI Lite implementations are not required to provide support for the session scope.
+ * </p>
  *
  * @author Gavin King
  * @author Pete Muir
diff --git a/api/src/main/java/jakarta/enterprise/context/control/ActivateRequestContext.java b/api/src/main/java/jakarta/enterprise/context/control/ActivateRequestContext.java
index 4227019de..6e291fe75 100644
--- a/api/src/main/java/jakarta/enterprise/context/control/ActivateRequestContext.java
+++ b/api/src/main/java/jakarta/enterprise/context/control/ActivateRequestContext.java
@@ -16,28 +16,29 @@
 
 package jakarta.enterprise.context.control;
 
-import jakarta.interceptor.InterceptorBinding;
+import static java.lang.annotation.ElementType.METHOD;
+import static java.lang.annotation.ElementType.TYPE;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
 import java.lang.annotation.Documented;
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
-import static java.lang.annotation.ElementType.METHOD;
-import static java.lang.annotation.ElementType.TYPE;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
+import jakarta.interceptor.InterceptorBinding;
 
 /**
  * The container provides a built in interceptor that may be used to annotate classes and methods to indicate
  * that a request context should be activated when this method is invoked.
  *
  * The request context will be activated before the method is called, and deactivated when the method invocation is
- * complete (regardless of any exceptions being thrown).  If the context is already active, it is ignored, neither
+ * complete (regardless of any exceptions being thrown). If the context is already active, it is ignored, neither
  * activated nor deactivated.
  *
  * @since 2.0
  * @author John D. Ament
  */
 @InterceptorBinding
-@Target({METHOD, TYPE})
+@Target({ METHOD, TYPE })
 @Retention(RUNTIME)
 @Documented
 public @interface ActivateRequestContext {
diff --git a/api/src/main/java/jakarta/enterprise/context/control/RequestContextController.java b/api/src/main/java/jakarta/enterprise/context/control/RequestContextController.java
index da269fcec..0a6b3772b 100644
--- a/api/src/main/java/jakarta/enterprise/context/control/RequestContextController.java
+++ b/api/src/main/java/jakarta/enterprise/context/control/RequestContextController.java
@@ -20,21 +20,21 @@
 
 /**
  * The CDI container provides a built in instance of RequestContextController that is dependent scoped for the purposes
- * of activating and deactivating.  For example:
+ * of activating and deactivating. For example:
  *
  * <pre>
- *    &#064;Inject
- *    private RequestContextController requestContextController;
+ * &#064;Inject
+ * private RequestContextController requestContextController;
  *
- *    public void doRequest(String body) {
- *       // activate request context
- *       requestContextController.activate();
+ * public void doRequest(String body) {
+ *     // activate request context
+ *     requestContextController.activate();
  *
- *       // do work in a request context.
+ *     // do work in a request context.
  *
- *       // deactivate the request context
- *       requestContextController.deactivate();
- *    }
+ *     // deactivate the request context
+ *     requestContextController.deactivate();
+ * }
  * </pre>
  *
  * Once the request context has been deactivated, you may activate it once again, creating a brand new request context.
@@ -46,20 +46,21 @@
  */
 public interface RequestContextController {
 
-   /**
-    * Activates a RequestContext for the current thread if one is not already active.
-    * @return true if the context was activated by this invocation, false if not.
-    */
-   boolean activate();
+    /**
+     * Activates a RequestContext for the current thread if one is not already active.
+     *
+     * @return true if the context was activated by this invocation, false if not.
+     */
+    boolean activate();
 
-   /**
-    * Deactivates the current Request Context if it was activated by this context controller.  If the context is active
-    * but was not activated by this controller, then it may not be deactivated by this controller,
-    * meaning this method will do nothing.
-    *
-    * If the context is not active, a {@linkplain ContextNotActiveException} is thrown.
-    *
-    * @throws ContextNotActiveException if the context is not active
-    */
-   void deactivate() throws ContextNotActiveException;
+    /**
+     * Deactivates the current Request Context if it was activated by this context controller. If the context is active
+     * but was not activated by this controller, then it may not be deactivated by this controller,
+     * meaning this method will do nothing.
+     *
+     * If the context is not active, a {@linkplain ContextNotActiveException} is thrown.
+     *
+     * @throws ContextNotActiveException if the context is not active
+     */
+    void deactivate() throws ContextNotActiveException;
 }
diff --git a/api/src/main/java/jakarta/enterprise/context/package-info.java b/api/src/main/java/jakarta/enterprise/context/package-info.java
index 86e701e49..2cf1d32f7 100644
--- a/api/src/main/java/jakarta/enterprise/context/package-info.java
+++ b/api/src/main/java/jakarta/enterprise/context/package-info.java
@@ -8,122 +8,147 @@
  * You may obtain a copy of the License at
  * http://www.apache.org/licenses/LICENSE-2.0
  * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,  
+ * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
 /**
- * <p>Annotations and interfaces relating to scopes and contexts.</p>
- * 
- * <p>A scope type is a Java annotation annotated 
- * {@link jakarta.inject.Scope &#064;Scope} or 
+ * <p>
+ * Annotations and interfaces relating to scopes and contexts.
+ * </p>
+ *
+ * <p>
+ * A scope type is a Java annotation annotated
+ * {@link jakarta.inject.Scope &#064;Scope} or
  * {@link jakarta.enterprise.context.NormalScope &#064;NormalScope}.
  * The scope of a bean determines the lifecycle and visibility of
- * its instances. In particular, the scope determines:</p>
- * 
+ * its instances. In particular, the scope determines:
+ * </p>
+ *
  * <ul>
  * <li>When a new instance of the bean is created</li>
  * <li>When an existing instance of the bean is destroyed</li>
  * <li>Which injected references refer to any instance of the
  * bean</li>
  * </ul>
- * 
+ *
  * <h2>Built-in scopes</h2>
- * 
- * <p>The following built-in scopes are provided:
+ *
+ * <p>
+ * The following built-in scopes are provided:
  * {@link jakarta.enterprise.context.Dependent &#064;Dependent},
  * {@link jakarta.enterprise.context.RequestScoped &#064;RequestScoped},
  * {@link jakarta.enterprise.context.ConversationScoped &#064;ConversationScoped},
  * {@link jakarta.enterprise.context.SessionScoped &#064;SessionScoped},
  * {@link jakarta.enterprise.context.ApplicationScoped &#064;ApplicationScoped},
- * {@link jakarta.inject.Singleton &#064;Singleton}.</p>
- * 
- * <p>The container provides an implementation of the <code>Context</code>
- * interface for each of the built-in scopes. The built-in request, 
- * session, and application contexts support servlet, web service 
+ * {@link jakarta.inject.Singleton &#064;Singleton}.
+ * </p>
+ *
+ * <p>
+ * The container provides an implementation of the <code>Context</code>
+ * interface for each of the built-in scopes. The built-in request,
+ * session, and application contexts support servlet, web service
  * and EJB invocations. The built-in conversation context supports
- * JSF requests.</p>
- * 
- * <p>For other kinds of invocations, a portable extension may define a 
- * custom {@linkplain jakarta.enterprise.context.spi.Context context object} 
- * for any or all of the built-in scopes. For example, a third-party web 
- * application framework might provide a conversation context object for 
- * the built-in conversation scope.</p>
- * 
- * <p>The context associated with a built-in scope propagates across 
- * local, synchronous Java method calls, including invocation of EJB 
- * local business methods. The context does not propagate across remote 
- * method invocations or to asynchronous processes such as JMS message 
- * listeners or EJB timer service timeouts.</p>
- * 
+ * JSF requests.
+ * </p>
+ *
+ * <p>
+ * For other kinds of invocations, a portable extension may define a
+ * custom {@linkplain jakarta.enterprise.context.spi.Context context object}
+ * for any or all of the built-in scopes. For example, a third-party web
+ * application framework might provide a conversation context object for
+ * the built-in conversation scope.
+ * </p>
+ *
+ * <p>
+ * The context associated with a built-in scope propagates across
+ * local, synchronous Java method calls, including invocation of EJB
+ * local business methods. The context does not propagate across remote
+ * method invocations or to asynchronous processes such as JMS message
+ * listeners or EJB timer service timeouts.
+ * </p>
+ *
  * <h2>Normal scopes and pseudo-scopes</h2>
- * 
- * <p>Most scopes are <em>normal scopes</em>. Normal scopes are declared 
- * using {@link jakarta.enterprise.context.NormalScope &#064;NormalScope}. 
- * If a bean has a normal scope, every client executing in a certain 
- * thread sees the same contextual instance of the bean. This instance is 
- * called the <em>current instance</em> of the bean. The operation 
+ *
+ * <p>
+ * Most scopes are <em>normal scopes</em>. Normal scopes are declared
+ * using {@link jakarta.enterprise.context.NormalScope &#064;NormalScope}.
+ * If a bean has a normal scope, every client executing in a certain
+ * thread sees the same contextual instance of the bean. This instance is
+ * called the <em>current instance</em> of the bean. The operation
  * {@link jakarta.enterprise.context.spi.Context#get(Contextual)} of the
- * context object for a normal scope type always returns the current 
- * instance of the given bean.</p> 
+ * context object for a normal scope type always returns the current
+ * instance of the given bean.
+ * </p>
  *
- * <p>Any scope that is not a normal scope is called a <em>pseudo-scope</em>.
- * Pseudo-scopes are declared using {@link jakarta.inject.Scope &#064;Scope}. 
- * The concept of a current instance is not well-defined in the case of 
+ * <p>
+ * Any scope that is not a normal scope is called a <em>pseudo-scope</em>.
+ * Pseudo-scopes are declared using {@link jakarta.inject.Scope &#064;Scope}.
+ * The concept of a current instance is not well-defined in the case of
  * a pseudo-scope. Different clients executing in the same thread may
  * see different instances of the bean. In the extreme case of the
  * {@link jakarta.enterprise.context.Dependent &#064;Dependent} pseudo-scope,
- * every client has its own private instance of the bean.</p> 
- * 
- * <p>All built-in scopes are normal scopes, except for the 
+ * every client has its own private instance of the bean.
+ * </p>
+ *
+ * <p>
+ * All built-in scopes are normal scopes, except for the
  * {@link jakarta.enterprise.context.Dependent &#064;Dependent} and
- * {@link jakarta.inject.Singleton &#064;Singleton} pseudo-scopes.</p>
- * 
+ * {@link jakarta.inject.Singleton &#064;Singleton} pseudo-scopes.
+ * </p>
+ *
  * <h2>Contextual and injected reference validity</h2>
- * 
- * <p>A reference to a bean obtained from the container via {@linkplain 
- * jakarta.enterprise.inject.Instance programmatic lookup} is called a 
- * contextual reference. A contextual reference for a bean with a normal 
- * scope refers to the current instance of the bean. A contextual 
- * reference for a bean are valid only for a certain period of time. The 
- * application should not invoke a method of an invalid reference.</p>
- * 
- * <p>The validity of a contextual reference for a bean depends upon 
- * whether the scope of the bean is a normal scope or a pseudo-scope:</p>
- * 
+ *
+ * <p>
+ * A reference to a bean obtained from the container via {@linkplain
+ * jakarta.enterprise.inject.Instance programmatic lookup} is called a
+ * contextual reference. A contextual reference for a bean with a normal
+ * scope refers to the current instance of the bean. A contextual
+ * reference for a bean are valid only for a certain period of time. The
+ * application should not invoke a method of an invalid reference.
+ * </p>
+ *
+ * <p>
+ * The validity of a contextual reference for a bean depends upon
+ * whether the scope of the bean is a normal scope or a pseudo-scope:
+ * </p>
+ *
  * <ul>
- * <li>Any reference to a bean with a normal scope is valid as long as 
- * the application maintains a hard reference to it. However, it may 
- * only be invoked when the context associated with the normal scope is 
- * active. If it is invoked when the context is inactive, a 
- * {@link jakarta.enterprise.context.ContextNotActiveException} is thrown 
+ * <li>Any reference to a bean with a normal scope is valid as long as
+ * the application maintains a hard reference to it. However, it may
+ * only be invoked when the context associated with the normal scope is
+ * active. If it is invoked when the context is inactive, a
+ * {@link jakarta.enterprise.context.ContextNotActiveException} is thrown
  * by the container.</li>
- * <li>Any reference to a bean with a pseudo-scope is valid until the 
- * bean instance to which it refers is destroyed. It may be invoked 
- * even if the context associated with the pseudo-scope is not active. 
- * If the application invokes a method of a reference to an instance 
+ * <li>Any reference to a bean with a pseudo-scope is valid until the
+ * bean instance to which it refers is destroyed. It may be invoked
+ * even if the context associated with the pseudo-scope is not active.
+ * If the application invokes a method of a reference to an instance
  * that has already been destroyed, the behavior is undefined.</li>
  * </ul>
- * 
- * <p>A reference to a bean obtained from the container via {@linkplain 
+ *
+ * <p>
+ * A reference to a bean obtained from the container via {@linkplain
  * jakarta.inject.Inject dependency injection} is a special kind of
  * contextual reference, called an injected reference. Additional
- * restrictions apply to the validity of an injected reference:</p>
- * 
+ * restrictions apply to the validity of an injected reference:
+ * </p>
+ *
  * <ul>
- * <li>A reference to a bean injected into a field, bean constructor or 
- * initializer method is only valid until the object into which it was 
+ * <li>A reference to a bean injected into a field, bean constructor or
+ * initializer method is only valid until the object into which it was
  * injected is destroyed.</li>
- * <li>A reference to a bean injected into a producer method is only 
- * valid until the producer method bean instance that is being produced 
- * is destroyed.<li>
- * <li>A reference to a bean injected into a disposer method or observer 
+ * <li>A reference to a bean injected into a producer method is only
+ * valid until the producer method bean instance that is being produced
+ * is destroyed.
+ * <li>
+ * <li>A reference to a bean injected into a disposer method or observer
  * method is only valid until the invocation of the method completes.</li>
  * </ul>
- * 
+ *
  * @see jakarta.enterprise.inject
- * 
+ *
  */
 package jakarta.enterprise.context;
 
diff --git a/api/src/main/java/jakarta/enterprise/context/spi/AlterableContext.java b/api/src/main/java/jakarta/enterprise/context/spi/AlterableContext.java
index 02e162574..e92d331a5 100644
--- a/api/src/main/java/jakarta/enterprise/context/spi/AlterableContext.java
+++ b/api/src/main/java/jakarta/enterprise/context/spi/AlterableContext.java
@@ -8,7 +8,7 @@
  * You may obtain a copy of the License at
  * http://www.apache.org/licenses/LICENSE-2.0
  * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,  
+ * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
@@ -24,12 +24,12 @@
  * Provides an operation for obtaining and destroying contextual instances with a particular scope of any contextual type. Any
  * instance of {@code Context} is called a context object.
  * </p>
- * 
+ *
  * <p>
  * {@link AlterableContext} was introduced in CDI 1.1 to allow bean instances to be destroyed by the application. Extensions
  * should implement {@link AlterableContext} instead of {@link Context}.
  * </p>
- * 
+ *
  * <p>
  * The context object is responsible for creating and destroying contextual instances by calling operations of
  * {@link Contextual}. In particular, the context object is responsible for destroying any
@@ -39,12 +39,12 @@
  * {@link CreationalContext} to {@code Contextual.destroy()} that it passed to
  * {@code Contextual.create()} when it created the instance.
  * </p>
- * 
+ *
  * <p>
  * A custom context object may be registered with the container using
  * {@link AfterBeanDiscovery#addContext(Context)}.
  * </p>
- * 
+ *
  * @author Pete Muir
  * @since 1.1
  */
@@ -54,7 +54,7 @@ public interface AlterableContext extends Context {
      * <p>
      * Destroy the existing contextual instance. If there is no existing instance, no action is taken.
      * </p>
-     * 
+     *
      * @param contextual the contextual type
      * @throws ContextNotActiveException if the context is not active
      */
diff --git a/api/src/main/java/jakarta/enterprise/context/spi/Context.java b/api/src/main/java/jakarta/enterprise/context/spi/Context.java
index 5e996d8c7..a1154c8a0 100644
--- a/api/src/main/java/jakarta/enterprise/context/spi/Context.java
+++ b/api/src/main/java/jakarta/enterprise/context/spi/Context.java
@@ -8,7 +8,7 @@
  * You may obtain a copy of the License at
  * http://www.apache.org/licenses/LICENSE-2.0
  * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,  
+ * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
@@ -26,12 +26,12 @@
  * Provides an operation for obtaining contextual instances with a particular scope of any contextual type. Any instance of
  * {@code Context} is called a context object.
  * </p>
- * 
+ *
  * <p>
  * {@link AlterableContext} was introduced in CDI 1.1 to allow bean instances to be destroyed by the application. Extensions
  * should implement {@link AlterableContext} instead of {@link Context}.
  * </p>
- * 
+ *
  * <p>
  * The context object is responsible for creating and destroying contextual instances by calling operations of
  * {@link Contextual}. In particular, the context object is responsible for destroying any
@@ -41,12 +41,12 @@
  * {@link CreationalContext} to {@code Contextual.destroy()} that it passed to
  * {@code Contextual.create()} when it created the instance.
  * </p>
- * 
+ *
  * <p>
  * A custom context object may be registered with the container using
  * {@link AfterBeanDiscovery#addContext(Context)}.
  * </p>
- * 
+ *
  * @author Gavin King
  * @author Pete Muir
  */
@@ -55,7 +55,7 @@ public interface Context {
 
     /**
      * Get the scope type of the context object.
-     * 
+     *
      * @return the scope
      */
     public Class<? extends Annotation> getScope();
@@ -63,30 +63,30 @@ public interface Context {
     /**
      * Return an existing instance of certain contextual type or create a new instance by calling
      * {@link Contextual#create(CreationalContext)} and return the new instance.
-     * 
+     *
      * @param <T> the type of contextual type
      * @param contextual the contextual type
      * @param creationalContext the context in which the new instance will be created
      * @return the contextual instance
-     * 
+     *
      * @throws ContextNotActiveException if the context is not active
      */
     public <T> T get(Contextual<T> contextual, CreationalContext<T> creationalContext);
 
     /**
      * Return an existing instance of a certain contextual type or a null value.
-     * 
+     *
      * @param <T> the type of the contextual type
      * @param contextual the contextual type
      * @return the contextual instance, or a null value
-     * 
+     *
      * @throws ContextNotActiveException if the context is not active
      */
     public <T> T get(Contextual<T> contextual);
 
     /**
      * Determines if the context object is active.
-     * 
+     *
      * @return <code>true</code> if the context is active, or <code>false</code> otherwise.
      */
     public boolean isActive();
diff --git a/api/src/main/java/jakarta/enterprise/context/spi/Contextual.java b/api/src/main/java/jakarta/enterprise/context/spi/Contextual.java
index 96eda8834..022f96c4e 100644
--- a/api/src/main/java/jakarta/enterprise/context/spi/Contextual.java
+++ b/api/src/main/java/jakarta/enterprise/context/spi/Contextual.java
@@ -8,7 +8,7 @@
  * You may obtain a copy of the License at
  * http://www.apache.org/licenses/LICENSE-2.0
  * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,  
+ * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
@@ -24,9 +24,9 @@
  * Defines operations to create and destroy contextual instances of a certain type. Any implementation of {@code Contextual} is
  * called a contextual type. In particular, all beans are contextual types.
  * </p>
- * 
+ *
  * @see Bean
- * 
+ *
  * @author Gavin King
  * @author Nicklas Karlsson
  * @author Pete Muir
@@ -39,7 +39,7 @@ public interface Contextual<T> {
      * that any dependent objects are associated with the contextual instance that is being created. An implementation may call
      * {@link CreationalContext#push(Object)} between instantiation and injection to help the
      * container minimize the use of client proxy objects.
-     * 
+     *
      * @param creationalContext the context in which this instance is being created
      * @return the contextual instance
      * @throws CreationException if a checked exception occurs while creating the instance
@@ -50,7 +50,7 @@ public interface Contextual<T> {
      * Destroy an instance of the contextual type. Implementations should call
      * {@link CreationalContext#release()} to allow the container to destroy dependent objects of
      * the contextual instance.
-     * 
+     *
      * @param instance the contextual instance to destroy
      * @param creationalContext the context in which this instance was created
      */
diff --git a/api/src/main/java/jakarta/enterprise/context/spi/CreationalContext.java b/api/src/main/java/jakarta/enterprise/context/spi/CreationalContext.java
index 9b73ae788..51d8672e3 100644
--- a/api/src/main/java/jakarta/enterprise/context/spi/CreationalContext.java
+++ b/api/src/main/java/jakarta/enterprise/context/spi/CreationalContext.java
@@ -8,7 +8,7 @@
  * You may obtain a copy of the License at
  * http://www.apache.org/licenses/LICENSE-2.0
  * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,  
+ * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
@@ -20,7 +20,7 @@
  * Provides operations that are used by the {@link Contextual} implementation during instance
  * creation and destruction.
  * </p>
- * 
+ *
  * @author Gavin King
  * @author Pete Muir
  *
@@ -32,7 +32,7 @@ public interface CreationalContext<T> {
      * Registers an incompletely initialized contextual instance the with the container. A contextual instance is considered
      * incompletely initialized until it is returned by
      * {@link Contextual#create(CreationalContext)} .
-     * 
+     *
      * @param incompleteInstance the incompletely initialized instance
      */
     public void push(T incompleteInstance);
diff --git a/api/src/main/java/jakarta/enterprise/context/spi/package-info.java b/api/src/main/java/jakarta/enterprise/context/spi/package-info.java
index 4d385b66e..dd97f21a6 100644
--- a/api/src/main/java/jakarta/enterprise/context/spi/package-info.java
+++ b/api/src/main/java/jakarta/enterprise/context/spi/package-info.java
@@ -8,26 +8,31 @@
  * You may obtain a copy of the License at
  * http://www.apache.org/licenses/LICENSE-2.0
  * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,  
+ * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
 /**
- * <p>The custom context SPI.</p>
- * 
- * <p>Associated with every 
- * {@linkplain jakarta.enterprise.context scope type} is a 
+ * <p>
+ * The custom context SPI.
+ * </p>
+ *
+ * <p>
+ * Associated with every
+ * {@linkplain jakarta.enterprise.context scope type} is a
  * {@linkplain jakarta.enterprise.context.spi.Context context object}.
- * The context object implements the semantics of the scope type.</p>
- * 
- * <p>The context implementation collaborates with the container via 
- * the {@link jakarta.enterprise.context.spi.Context Context} and 
- * {@link jakarta.enterprise.context.spi.Contextual Contextual} 
- * interfaces to create and destroy contextual instances.</p>
- * 
+ * The context object implements the semantics of the scope type.
+ * </p>
+ *
+ * <p>
+ * The context implementation collaborates with the container via
+ * the {@link jakarta.enterprise.context.spi.Context Context} and
+ * {@link jakarta.enterprise.context.spi.Contextual Contextual}
+ * interfaces to create and destroy contextual instances.
+ * </p>
+ *
  * @see jakarta.enterprise.context
  * @see jakarta.enterprise.inject.spi
  */
 package jakarta.enterprise.context.spi;
-
diff --git a/api/src/main/java/jakarta/enterprise/event/Event.java b/api/src/main/java/jakarta/enterprise/event/Event.java
index a5abbe720..69be79a31 100644
--- a/api/src/main/java/jakarta/enterprise/event/Event.java
+++ b/api/src/main/java/jakarta/enterprise/event/Event.java
@@ -8,7 +8,7 @@
  * You may obtain a copy of the License at
  * http://www.apache.org/licenses/LICENSE-2.0
  * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,  
+ * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
@@ -20,74 +20,75 @@
 import java.util.concurrent.CompletionStage;
 import java.util.concurrent.Executor;
 
-import jakarta.enterprise.util.TypeLiteral;
 import jakarta.enterprise.inject.Any;
+import jakarta.enterprise.util.TypeLiteral;
 
 /**
  * <p>
  * Allows the application to fire events of a particular type.
  * </p>
- * 
+ *
  * <p>
  * Beans fire events via an instance of the <code>Event</code> interface, which may be injected:
  * </p>
- * 
+ *
  * <pre>
  * &#064;Inject
  * &#064;Any
  * Event&lt;LoggedInEvent&gt; loggedInEvent;
  * </pre>
- * 
+ *
  * <p>
  * The <code>fire()</code> method accepts an event object:
  * </p>
- * 
+ *
  * <pre>
- * public void login() { 
+ * public void login() {
  *    ...
  *    loggedInEvent.fire( new LoggedInEvent(user) );
  * }
  * </pre>
- * 
+ *
  * <p>
  * Any combination of qualifiers may be specified at the injection point:
  * </p>
- * 
+ *
  * <pre>
  * &#064;Inject
  * &#064;Admin
  * Event&lt;LoggedInEvent&gt; adminLoggedInEvent;
  * </pre>
- * 
+ *
  * <p>
  * Or, the {@link Any &#064;Any} qualifier may be used, allowing the application to specify qualifiers
  * dynamically:
  * </p>
- * 
+ *
  * <pre>
  * &#064;Inject
  * &#064;Any
  * Event&lt;LoggedInEvent&gt; loggedInEvent;
  * </pre>
- * 
+ *
  * <p>
  * For an injected <code>Event</code>:
  * </p>
- * 
+ *
  * <ul>
  * <li>the <em>specified type</em> is the type parameter specified at the injection point, and</li>
  * <li>the <em>specified qualifiers</em> are the qualifiers specified at the injection point.</li>
  * </ul>
- * 
+ *
  * <p>
- * Events may also be fired asynchronously with {@link #fireAsync(Object)} and {@link #fireAsync(Object, NotificationOptions)} methods
+ * Events may also be fired asynchronously with {@link #fireAsync(Object)} and {@link #fireAsync(Object, NotificationOptions)}
+ * methods
  * </p>
- * 
+ *
  * @author Gavin King
  * @author Pete Muir
  * @author David Allen
  * @author Antoine Sabot-Durand
- * 
+ *
  * @param <T> the type of the event object
  */
 
@@ -97,7 +98,7 @@ public interface Event<T> {
      * <p>
      * Fires an event with the specified qualifiers and notifies observers.
      * </p>
-     * 
+     *
      * @param event the event object
      * @throws IllegalArgumentException if the runtime type of the event object contains a type variable
      * @throws ObserverException if a notified observer throws a checked exception, it will be wrapped and rethrown as an
@@ -115,9 +116,11 @@ public interface Event<T> {
      * @return a {@link CompletionStage} allowing further pipeline composition on the asynchronous operation.
      *         Default asynchronous execution facility is container specific.
      *         If any observer notified by this event throws an exception
-     *         then the resulting CompletionStage is completed exceptionally with {@link java.util.concurrent.CompletionException}
+     *         then the resulting CompletionStage is completed exceptionally with
+     *         {@link java.util.concurrent.CompletionException}
      *         that wraps all the exceptions raised by observers as suppressed exception.
-     *         If no exception is thrown by observers then the resulting CompletionStage is completed normally with the event payload.
+     *         If no exception is thrown by observers then the resulting CompletionStage is completed normally with the event
+     *         payload.
      * @throws IllegalArgumentException if the runtime type of the event object contains a type variable
      *
      * @since 2.0
@@ -127,7 +130,7 @@ public interface Event<T> {
     /**
      * <p>
      * Fires an event asynchronously with the specified qualifiers and notifies asynchronous observers.
-     * A custom {@link Executor} will be used to make asynchronous calls 
+     * A custom {@link Executor} will be used to make asynchronous calls
      * </p>
      *
      * @param <U> event type
@@ -136,23 +139,26 @@ public interface Event<T> {
      * @return a {@link CompletionStage} allowing further pipeline composition on the asynchronous operation.
      *         Default asynchronous execution facility is container specific.
      *         If any observer notified by this event throws an exception
-     *         then the resulting CompletionStage is completed exceptionally with {@link java.util.concurrent.CompletionException}
+     *         then the resulting CompletionStage is completed exceptionally with
+     *         {@link java.util.concurrent.CompletionException}
      *         that wraps all the exceptions raised by observers as suppressed exception.
-     *         If no exception is thrown by observers then the resulting CompletionStage is completed normally with the event payload.
+     *         If no exception is thrown by observers then the resulting CompletionStage is completed normally with the event
+     *         payload.
      * @throws IllegalArgumentException if the runtime type of the event object contains a type variable
      *
      * @since 2.0
      */
-    public <U extends T> CompletionStage<U>  fireAsync(U event, NotificationOptions options);
+    public <U extends T> CompletionStage<U> fireAsync(U event, NotificationOptions options);
 
     /**
      * <p>
      * Obtains a child <code>Event</code> for the given additional required qualifiers.
      * </p>
-     * 
+     *
      * @param qualifiers the additional specified qualifiers
      * @return the child <code>Event</code>
-     * @throws IllegalArgumentException if passed two instances of the same non repeating qualifier type, or an instance of an annotation that
+     * @throws IllegalArgumentException if passed two instances of the same non repeating qualifier type, or an instance of an
+     *         annotation that
      *         is not a qualifier type
      */
     public Event<T> select(Annotation... qualifiers);
@@ -161,12 +167,13 @@ public interface Event<T> {
      * <p>
      * Obtains a child <code>Event</code> for the given required type and additional required qualifiers.
      * </p>
-     * 
+     *
      * @param <U> the specified type
      * @param subtype a {@link java.lang.Class} representing the specified type
      * @param qualifiers the additional specified qualifiers
      * @return the child <code>Event</code>
-     * @throws IllegalArgumentException if passed two instances of the same non repeating qualifier type, or an instance of an annotation that
+     * @throws IllegalArgumentException if passed two instances of the same non repeating qualifier type, or an instance of an
+     *         annotation that
      *         is not a qualifier type
      */
     public <U extends T> Event<U> select(Class<U> subtype, Annotation... qualifiers);
@@ -175,12 +182,13 @@ public interface Event<T> {
      * <p>
      * Obtains a child <code>Event</code> for the given required type and additional required qualifiers.
      * </p>
-     * 
+     *
      * @param <U> the specified type
      * @param subtype a {@link TypeLiteral} representing the specified type
      * @param qualifiers the additional specified qualifiers
      * @return the child <code>Event</code>
-     * @throws IllegalArgumentException if passed two instances of the same non repeating qualifier type, or an instance of an annotation that
+     * @throws IllegalArgumentException if passed two instances of the same non repeating qualifier type, or an instance of an
+     *         annotation that
      *         is not a qualifier type
      */
     public <U extends T> Event<U> select(TypeLiteral<U> subtype, Annotation... qualifiers);
diff --git a/api/src/main/java/jakarta/enterprise/event/ImmutableNotificationOptions.java b/api/src/main/java/jakarta/enterprise/event/ImmutableNotificationOptions.java
index 4e23a10c5..0a6819627 100644
--- a/api/src/main/java/jakarta/enterprise/event/ImmutableNotificationOptions.java
+++ b/api/src/main/java/jakarta/enterprise/event/ImmutableNotificationOptions.java
@@ -8,7 +8,7 @@
  * You may obtain a copy of the License at
  * http://www.apache.org/licenses/LICENSE-2.0
  * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,  
+ * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
@@ -21,7 +21,7 @@
 
 /**
  * The immutable implementation of {@link NotificationOptions}.
- * 
+ *
  * @author Martin Kouba
  *
  */
diff --git a/api/src/main/java/jakarta/enterprise/event/NotificationOptions.java b/api/src/main/java/jakarta/enterprise/event/NotificationOptions.java
index 8621779d5..df63794c6 100644
--- a/api/src/main/java/jakarta/enterprise/event/NotificationOptions.java
+++ b/api/src/main/java/jakarta/enterprise/event/NotificationOptions.java
@@ -8,7 +8,7 @@
  * You may obtain a copy of the License at
  * http://www.apache.org/licenses/LICENSE-2.0
  * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,  
+ * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
@@ -19,7 +19,7 @@
 
 /**
  * Notification options are used to configure observer notification.
- * 
+ *
  * @author Martin Kouba
  * @see Event#fireAsync(Object, NotificationOptions)
  * @since 2.0
@@ -27,20 +27,20 @@
 public interface NotificationOptions {
 
     /**
-     * 
+     *
      * @return the executor used to execute an asynchronous event
      */
     Executor getExecutor();
 
     /**
-     * 
+     *
      * @param optionName name of the option to get value of
      * @return the value of an option or <code>null</code> if no option for the given name exists
      */
     Object get(String optionName);
 
     /**
-     * 
+     *
      * @param executor a specific {@link Executor} to handle observer notification
      * @return an immutable holder of an executor
      */
@@ -49,7 +49,7 @@ static NotificationOptions ofExecutor(Executor executor) {
     }
 
     /**
-     * 
+     *
      * @param optionName name of the option to set
      * @param optionValue value for the option
      * @return an immutable holder of a single option
@@ -59,7 +59,7 @@ static NotificationOptions of(String optionName, Object optionValue) {
     }
 
     /**
-     * 
+     *
      * @return the options builder
      */
     static Builder builder() {
@@ -68,7 +68,7 @@ static Builder builder() {
 
     /**
      * Notification options builder.
-     * 
+     *
      * @author Martin Kouba
      * @since 2.0
      */
diff --git a/api/src/main/java/jakarta/enterprise/event/ObserverException.java b/api/src/main/java/jakarta/enterprise/event/ObserverException.java
index a491ba4c3..d6ec19f50 100644
--- a/api/src/main/java/jakarta/enterprise/event/ObserverException.java
+++ b/api/src/main/java/jakarta/enterprise/event/ObserverException.java
@@ -8,7 +8,7 @@
  * You may obtain a copy of the License at
  * http://www.apache.org/licenses/LICENSE-2.0
  * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,  
+ * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
@@ -20,7 +20,7 @@
  * <p>
  * Indicates that a checked exception was thrown by an observer method during event notification.
  * </p>
- * 
+ *
  * @author Pete Muir
  * @author Gavin King
  */
diff --git a/api/src/main/java/jakarta/enterprise/event/Observes.java b/api/src/main/java/jakarta/enterprise/event/Observes.java
index c1d9ea4c5..a297007d0 100644
--- a/api/src/main/java/jakarta/enterprise/event/Observes.java
+++ b/api/src/main/java/jakarta/enterprise/event/Observes.java
@@ -8,7 +8,7 @@
  * You may obtain a copy of the License at
  * http://www.apache.org/licenses/LICENSE-2.0
  * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,  
+ * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
@@ -30,52 +30,52 @@
  * Identifies the event parameter of an observer method. May be applied to a parameter of a method of a bean class or
  * {@linkplain Extension extension}.
  * </p>
- * 
+ *
  * <pre>
  * public void afterLogin(&#064;Observes LoggedInEvent event) { ... }
  * </pre>
- * 
+ *
  * <p>
  * An observer method is a non-abstract method of a managed bean class or session bean class (or of an extension). An observer
  * method may be either static or non-static. If the bean is a session bean, the observer method must be either a business
  * method of the EJB or a static method of the bean class.
  * </p>
- * 
+ *
  * <p>
  * Each observer method must have exactly one event parameter, of the same type as the event type it observes. Event qualifiers
  * may be declared by annotating the event parameter. When searching for observer methods for an event, the container considers
  * the type and qualifiers of the event parameter.
  * </p>
- * 
+ *
  * <p>
  * If the event parameter does not explicitly declare any qualifier, the observer method observes events with no qualifier.
  * </p>
- * 
+ *
  * <p>
  * The event parameter type may contain a type variable or wildcard.
  * </p>
- * 
+ *
  * <p>
  * In addition to the event parameter, observer methods may declare additional parameters, which may declare qualifiers. These
  * additional parameters are injection points.
  * </p>
- * 
+ *
  * <pre>
  * public void afterLogin(&#064;Observes LoggedInEvent event, &#064;Manager User user, Logger log) { ... }
  * </pre>
- * 
+ *
  * <p>
  * A bean (or extension) may declare multiple observer methods.
  * </p>
- * 
+ *
  * <p>
  * Observer methods are inherited by bean subclasses.
  * </p>
- * 
+ *
  * <p>
  * Interceptors and decorators may not declare observer methods.
  * </p>
- * 
+ *
  * @author Gavin King
  * @author Pete Muir
  * @author David Allen
@@ -89,11 +89,12 @@
      * <p>
      * Specifies {@linkplain Reception under what conditions the observer method is notified}.
      * </p>
-     * 
+     *
      * <p>
      * By default, the observer method is notified even if no instance of the bean that defines the observer method already
      * exists in the current context.
      * </p>
+     *
      * @return conditional observer type
      */
     public Reception notifyObserver() default Reception.ALWAYS;
@@ -102,10 +103,11 @@
      * <p>
      * Specifies {@linkplain Reception at what time the observer method is notified}.
      * </p>
-     * 
+     *
      * <p>
      * By default, the observer method is notified when the event is fired.
      * </p>
+     *
      * @return phase of the transaction
      */
     public TransactionPhase during() default TransactionPhase.IN_PROGRESS;
diff --git a/api/src/main/java/jakarta/enterprise/event/ObservesAsync.java b/api/src/main/java/jakarta/enterprise/event/ObservesAsync.java
index 00a7e6e35..17cb3033a 100644
--- a/api/src/main/java/jakarta/enterprise/event/ObservesAsync.java
+++ b/api/src/main/java/jakarta/enterprise/event/ObservesAsync.java
@@ -8,7 +8,7 @@
  * You may obtain a copy of the License at
  * http://www.apache.org/licenses/LICENSE-2.0
  * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,  
+ * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
@@ -25,54 +25,54 @@
 
 /**
  * <p>
- * Identifies the event parameter of an asynchronous observer method. May be applied to a parameter of a method of a bean class 
+ * Identifies the event parameter of an asynchronous observer method. May be applied to a parameter of a method of a bean class
  * </p>
- * 
+ *
  * <pre>
  * public void afterLogin(&#064;ObservesAsync LoggedInEvent event) { ... }
  * </pre>
- * 
+ *
  * <p>
  * An observer method is a non-abstract method of a managed bean class or session bean class (or of an extension). An observer
  * method may be either static or non-static. If the bean is a session bean, the observer method must be either a business
  * method of the EJB or a static method of the bean class.
  * </p>
- * 
+ *
  * <p>
  * Each observer method must have exactly one event parameter, of the same type as the event type it observes. Event qualifiers
  * may be declared by annotating the event parameter. When searching for observer methods for an event, the container considers
  * the type and qualifiers of the event parameter.
  * </p>
- * 
+ *
  * <p>
  * If the event parameter does not explicitly declare any qualifier, the observer method observes events with no qualifier.
  * </p>
- * 
+ *
  * <p>
  * The event parameter type may contain a type variable or wildcard.
  * </p>
- * 
+ *
  * <p>
  * In addition to the event parameter, observer methods may declare additional parameters, which may declare qualifiers. These
  * additional parameters are injection points.
  * </p>
- * 
+ *
  * <pre>
  * public void afterLogin(&#064;ObservesAsync LoggedInEvent event, &#064;Manager User user, Logger log) { ... }
  * </pre>
- * 
+ *
  * <p>
  * A bean (or extension) may declare multiple observer methods.
  * </p>
- * 
+ *
  * <p>
  * Observer methods are inherited by bean subclasses.
  * </p>
- * 
+ *
  * <p>
  * Interceptors and decorators may not declare observer methods.
  * </p>
- * 
+ *
  * @author Gavin King
  * @author Pete Muir
  * @author David Allen
@@ -86,14 +86,14 @@
      * <p>
      * Specifies {@linkplain Reception under what conditions the observer method is notified}.
      * </p>
-     * 
+     *
      * <p>
      * By default, the observer method is notified even if no instance of the bean that defines the observer method already
      * exists in the current context.
      * </p>
+     *
      * @return conditional observer type
      */
     public Reception notifyObserver() default Reception.ALWAYS;
 
-    
 }
diff --git a/api/src/main/java/jakarta/enterprise/event/Reception.java b/api/src/main/java/jakarta/enterprise/event/Reception.java
index 7a277406e..eccc89cf6 100644
--- a/api/src/main/java/jakarta/enterprise/event/Reception.java
+++ b/api/src/main/java/jakarta/enterprise/event/Reception.java
@@ -8,7 +8,7 @@
  * You may obtain a copy of the License at
  * http://www.apache.org/licenses/LICENSE-2.0
  * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,  
+ * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
@@ -22,16 +22,16 @@
  * Distinguishes conditional {@linkplain Observes observer methods} from observer methods which are
  * always notified.
  * </p>
- * 
+ *
  * <p>
  * A conditional observer method is an observer method which is notified of an event only if an instance of the bean that
  * defines the observer method already exists in the current context.
  * </p>
- * 
+ *
  * <p>
  * Beans with scope {@link Dependent &#064;Dependent} may not have conditional observer methods.
  * </p>
- * 
+ *
  * @author Gavin King
  * @author Dan Allen
  * @author David Allen
diff --git a/api/src/main/java/jakarta/enterprise/event/TransactionPhase.java b/api/src/main/java/jakarta/enterprise/event/TransactionPhase.java
index c6ca1c81d..da993ee50 100644
--- a/api/src/main/java/jakarta/enterprise/event/TransactionPhase.java
+++ b/api/src/main/java/jakarta/enterprise/event/TransactionPhase.java
@@ -8,7 +8,7 @@
  * You may obtain a copy of the License at
  * http://www.apache.org/licenses/LICENSE-2.0
  * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,  
+ * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
@@ -24,15 +24,17 @@
  * Transactional observer methods are observer methods which receive event notifications during the before or after completion
  * phase of the transaction in which the event was fired. If no transaction is in progress when the event is fired, they are
  * notified at the same time as other observers.
- * If the transaction is in progress, but {@code jakarta.transaction.Synchronization} callback cannot be registered due to the transaction being already
- * marked for rollback or in state where {@code jakarta.transaction.Synchronization} callbacks cannot be registered, the {@link #BEFORE_COMPLETION},
+ * If the transaction is in progress, but {@code jakarta.transaction.Synchronization} callback cannot be registered due to the
+ * transaction being already
+ * marked for rollback or in state where {@code jakarta.transaction.Synchronization} callbacks cannot be registered, the
+ * {@link #BEFORE_COMPLETION},
  * {@link #AFTER_COMPLETION} and {@link #AFTER_FAILURE} observer methods are notified at the same time as other observers,
  * but {@link #AFTER_SUCCESS} observer methods get skipped.
  * </p>
  *
  * @author Pete Muir
  * @author Gavin King
- * 
+ *
  */
 @SuppressWarnings("ALL")
 public enum TransactionPhase {
@@ -74,7 +76,8 @@ public enum TransactionPhase {
      * transaction fails.
      * </p>
      * <p>
-     * Transactional observer will be notified will also get invoked if there is no transaction in progress, or the transaction is in progress,
+     * Transactional observer will be notified will also get invoked if there is no transaction in progress, or the transaction
+     * is in progress,
      * but {@code jakarta.transaction.Synchronization} callback cannot be registered due to the transaction being already
      * marked for rollback or in state where {@code jakarta.transaction.Synchronization} callbacks cannot be registered.
      * </p>
diff --git a/api/src/main/java/jakarta/enterprise/event/package-info.java b/api/src/main/java/jakarta/enterprise/event/package-info.java
index 1f0f9450e..dfa2955e9 100644
--- a/api/src/main/java/jakarta/enterprise/event/package-info.java
+++ b/api/src/main/java/jakarta/enterprise/event/package-info.java
@@ -8,110 +8,141 @@
  * You may obtain a copy of the License at
  * http://www.apache.org/licenses/LICENSE-2.0
  * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,  
+ * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
 /**
- * <p>Annotations and interfaces relating to events.</p>
- * 
- * <p>{@linkplain jakarta.enterprise.inject Beans} may produce and 
- * consume events. Events allows beans to interact in a completely 
- * decoupled fashion, with no compile-time dependency between the 
- * interacting beans. Most importantly, it allows stateful beans 
- * in one architectural tier of the application to synchronize 
- * their internal state with state changes that occur in a 
- * different tier.</p>
- * 
- * <p>Events may be fired synchronously or asynchronously.</p>
- * 
- * <p>An event comprises:</p>
- * 
+ * <p>
+ * Annotations and interfaces relating to events.
+ * </p>
+ *
+ * <p>
+ * {@linkplain jakarta.enterprise.inject Beans} may produce and
+ * consume events. Events allows beans to interact in a completely
+ * decoupled fashion, with no compile-time dependency between the
+ * interacting beans. Most importantly, it allows stateful beans
+ * in one architectural tier of the application to synchronize
+ * their internal state with state changes that occur in a
+ * different tier.
+ * </p>
+ *
+ * <p>
+ * Events may be fired synchronously or asynchronously.
+ * </p>
+ *
+ * <p>
+ * An event comprises:
+ * </p>
+ *
  * <ul>
  * <li>A Java object, called the event object</li>
- * <li>A (possibly empty) set of instances of qualifier types, called 
+ * <li>A (possibly empty) set of instances of qualifier types, called
  * the event qualifiers</li>
  * </ul>
- * 
- * <p>The {@link jakarta.enterprise.event.Event} interface is used to 
- * fire events.</p>
- * 
+ *
+ * <p>
+ * The {@link jakarta.enterprise.event.Event} interface is used to
+ * fire events.
+ * </p>
+ *
  * <h2>Event objects and event types</h2>
- * 
- * <p>The event object acts as a payload, to propagate state from 
- * producer to consumer. An event object is an instance of a concrete 
- * Java class with no type variables.</p> 
- * 
- * <p>The event types of the event include all superclasses and 
- * interfaces of the runtime class of the event object. An event type 
- * may not contain a type variable.</p>
- * 
+ *
+ * <p>
+ * The event object acts as a payload, to propagate state from
+ * producer to consumer. An event object is an instance of a concrete
+ * Java class with no type variables.
+ * </p>
+ *
+ * <p>
+ * The event types of the event include all superclasses and
+ * interfaces of the runtime class of the event object. An event type
+ * may not contain a type variable.
+ * </p>
+ *
  * <h2>Event qualifiers</h2>
- * 
- * <p>The event qualifiers act as topic selectors, allowing the consumer 
+ *
+ * <p>
+ * The event qualifiers act as topic selectors, allowing the consumer
  * to narrow the set of events it observes. An event qualifier may be an
- * instance of any {@linkplain jakarta.inject.Qualifier qualifier type}.</p>
- * 
+ * instance of any {@linkplain jakarta.inject.Qualifier qualifier type}.
+ * </p>
+ *
  * <h2>Observer methods</h2>
- * 
- * <p>An {@linkplain jakarta.enterprise.event.Observes observer method} 
+ *
+ * <p>
+ * An {@linkplain jakarta.enterprise.event.Observes observer method}
  * allows the application to receive and respond synchronously to event notifications.
- * And an {@linkplain jakarta.enterprise.event.ObservesAsync async observer method} 
+ * And an {@linkplain jakarta.enterprise.event.ObservesAsync async observer method}
  * allows the application to receive and respond asynchronously to event notifications.
  * they both act as event consumers, observing events of a specific type, with a
- * specific set of qualifiers. Any Java type may be observed by an 
- * observer method.</p>
- * 
- * <p>An observer method is a method of a bean class or 
- * {@linkplain jakarta.enterprise.inject.spi.Extension extension} with a 
+ * specific set of qualifiers. Any Java type may be observed by an
+ * observer method.
+ * </p>
+ *
+ * <p>
+ * An observer method is a method of a bean class or
+ * {@linkplain jakarta.enterprise.inject.spi.Extension extension} with a
  * parameter annotated {@link jakarta.enterprise.event.Observes &#064;Observes}
- * or {@link jakarta.enterprise.event.ObservesAsync &#064;ObservesAsync}.</p>
- * 
- * <p>An observer method will be notified of an event if:</p> 
- * 
+ * or {@link jakarta.enterprise.event.ObservesAsync &#064;ObservesAsync}.
+ * </p>
+ *
+ * <p>
+ * An observer method will be notified of an event if:
+ * </p>
+ *
  * <ul>
- * <li>the event object is assignable to the type observed by the observer 
+ * <li>the event object is assignable to the type observed by the observer
  * method,</li>
  * <li>the observer method has all the event qualifiers of the event, and</li>
- * <li>either the event is not a 
- * {@linkplain jakarta.enterprise.inject.spi container lifecycle event}, or 
- * the observer method belongs to an 
+ * <li>either the event is not a
+ * {@linkplain jakarta.enterprise.inject.spi container lifecycle event}, or
+ * the observer method belongs to an
  * {@linkplain jakarta.enterprise.inject.spi.Extension extension}.
  * </ul>
- * 
- * <p>If a synchronous observer method is a 
- * {@linkplain jakarta.enterprise.event.TransactionPhase transactional 
+ *
+ * <p>
+ * If a synchronous observer method is a
+ * {@linkplain jakarta.enterprise.event.TransactionPhase transactional
  * observer method} and there is a JTA transaction in progress when the
- * event is fired, the observer method is notified during the appropriate 
- * transaction completion phase. Otherwise, the observer is notified when 
- * the event is fired.</p>
- * 
- * <p>The order in which observer methods are called depends on the value of
- * the &#064;{@linkplain jakarta.annotation.Priority Priority} applied to the observer.</p>
- * <p>If no priority is defined on a observer, its priority is jakarta.interceptor.Interceptor.Priority.APPLICATION+500.</p>
- * <p>If two observer have the same priority their relative order is undefined.</p>
- * 
- * <p>Observer methods may throw exceptions:</p>
- * 
+ * event is fired, the observer method is notified during the appropriate
+ * transaction completion phase. Otherwise, the observer is notified when
+ * the event is fired.
+ * </p>
+ *
+ * <p>
+ * The order in which observer methods are called depends on the value of
+ * the &#064;{@linkplain jakarta.annotation.Priority Priority} applied to the observer.
+ * </p>
+ * <p>
+ * If no priority is defined on a observer, its priority is jakarta.interceptor.Interceptor.Priority.APPLICATION+500.
+ * </p>
+ * <p>
+ * If two observer have the same priority their relative order is undefined.
+ * </p>
+ *
+ * <p>
+ * Observer methods may throw exceptions:
+ * </p>
+ *
  * <ul>
- * <li>If the observer method is a 
- * {@linkplain jakarta.enterprise.event.TransactionPhase transactional 
+ * <li>If the observer method is a
+ * {@linkplain jakarta.enterprise.event.TransactionPhase transactional
  * observer method}, any exception is caught and logged by the container.</li>
  * <li>If the observer method is asynchronous, any exception is caught by the container and added as a suppressed exception
  * to a {@link java.util.concurrent.CompletionException} that could be handle by the application</li>
  * <li>Otherwise, the exception aborts processing of the event.
- * No other observer methods of that event will be called. The 
- * exception is rethrown. If the exception is a checked exception, 
- * it is wrapped and rethrown as an (unchecked) 
+ * No other observer methods of that event will be called. The
+ * exception is rethrown. If the exception is a checked exception,
+ * it is wrapped and rethrown as an (unchecked)
  * {@link jakarta.enterprise.event.ObserverException}.</li>
  * </ul>
- * 
+ *
  * @see jakarta.enterprise.inject
- * 
+ *
  * @see jakarta.enterprise.event.Observes
  * @see jakarta.enterprise.event.Event
  * @see jakarta.inject.Qualifier
  */
 package jakarta.enterprise.event;
-
diff --git a/api/src/main/java/jakarta/enterprise/inject/Alternative.java b/api/src/main/java/jakarta/enterprise/inject/Alternative.java
index ff58a5b61..394d80aa7 100644
--- a/api/src/main/java/jakarta/enterprise/inject/Alternative.java
+++ b/api/src/main/java/jakarta/enterprise/inject/Alternative.java
@@ -46,7 +46,8 @@
  *
  * <p>
  * By default, a bean archive has no selected alternatives. An alternative must be explicitly declared using the
- * <code>&lt;alternatives&gt;</code> element of the <code>beans.xml</code> file of the bean archive. The <code>&lt;alternatives&gt;</code>
+ * <code>&lt;alternatives&gt;</code> element of the <code>beans.xml</code> file of the bean archive. The
+ * <code>&lt;alternatives&gt;</code>
  * element contains a list of bean classes and stereotypes. An alternative is selected for the bean archive if either:
  * </p>
  *
diff --git a/api/src/main/java/jakarta/enterprise/inject/AmbiguousResolutionException.java b/api/src/main/java/jakarta/enterprise/inject/AmbiguousResolutionException.java
index 50fc54e39..50e9dd47b 100644
--- a/api/src/main/java/jakarta/enterprise/inject/AmbiguousResolutionException.java
+++ b/api/src/main/java/jakarta/enterprise/inject/AmbiguousResolutionException.java
@@ -8,7 +8,7 @@
  * You may obtain a copy of the License at
  * http://www.apache.org/licenses/LICENSE-2.0
  * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,  
+ * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
@@ -20,7 +20,7 @@
  * Indicates that multiple beans match a certain combination of required type and required qualifiers and are eligible for
  * injection into a certain class.
  * </p>
- * 
+ *
  * @author Pete Muir
  * @author Gavin King
  */
diff --git a/api/src/main/java/jakarta/enterprise/inject/CreationException.java b/api/src/main/java/jakarta/enterprise/inject/CreationException.java
index f1aab30f8..f58a9b7c8 100644
--- a/api/src/main/java/jakarta/enterprise/inject/CreationException.java
+++ b/api/src/main/java/jakarta/enterprise/inject/CreationException.java
@@ -8,7 +8,7 @@
  * You may obtain a copy of the License at
  * http://www.apache.org/licenses/LICENSE-2.0
  * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,  
+ * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
@@ -20,7 +20,7 @@
  * <p>
  * Indicates that a checked exception was thrown during creation of a bean.
  * </p>
- * 
+ *
  * @author Pete Muir
  * @author Gavin King
  */
diff --git a/api/src/main/java/jakarta/enterprise/inject/Decorated.java b/api/src/main/java/jakarta/enterprise/inject/Decorated.java
index 0eb9cfee9..6cce0b0d8 100644
--- a/api/src/main/java/jakarta/enterprise/inject/Decorated.java
+++ b/api/src/main/java/jakarta/enterprise/inject/Decorated.java
@@ -8,7 +8,7 @@
  * You may obtain a copy of the License at
  * http://www.apache.org/licenses/LICENSE-2.0
  * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,  
+ * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
@@ -30,7 +30,7 @@
  * <p>
  * A decorator may inject metadata about the bean it is decorating
  * </p>
- * 
+ *
  * <pre>
  * &#064;Decorator
  * class TimestampLogger implements Logger {
@@ -38,19 +38,21 @@
  *     &#064;Delegate
  *     &#064;Any
  *     Logger logger;
- * 
+ *
  *     &#064;Inject
  *     &#064;Decorated
  *     Bean&lt;Logger&gt; bean;
- * 
+ *
  *     void log(String message) {
  *       ...
  *    }
  * }
  * </pre>
  *
- * <p>CDI Lite implementations are not required to provide support for decorators.</p>
- * 
+ * <p>
+ * CDI Lite implementations are not required to provide support for decorators.
+ * </p>
+ *
  * @author Pete Muir
  * @since 1.1
  */
diff --git a/api/src/main/java/jakarta/enterprise/inject/Disposes.java b/api/src/main/java/jakarta/enterprise/inject/Disposes.java
index 726903006..a0a1bc3de 100644
--- a/api/src/main/java/jakarta/enterprise/inject/Disposes.java
+++ b/api/src/main/java/jakarta/enterprise/inject/Disposes.java
@@ -8,7 +8,7 @@
  * You may obtain a copy of the License at
  * http://www.apache.org/licenses/LICENSE-2.0
  * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,  
+ * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
@@ -27,54 +27,54 @@
  * <p>
  * Identifies the disposed parameter of a disposer method. May be applied to a parameter of a method of a bean class.
  * </p>
- * 
+ *
  * <pre>
  * public class UserDatabaseEntityManager {
- * 
+ *
  *     &#064;Produces
  *     &#064;ConversationScoped
  *     &#064;UserDatabase
  *     public EntityManager create(EntityManagerFactory emf) {
  *         return emf.createEntityManager();
  *     }
- * 
+ *
  *     public void close(@Disposes @UserDatabase EntityManager em) {
  *         em.close();
  *     }
- * 
+ *
  * }
  * </pre>
- * 
+ *
  * <pre>
  * public class Resources {
- * 
+ *
  *     &#064;PersistenceContext
  *     &#064;Produces
  *     &#064;UserDatabase
  *     private EntityManager em;
- * 
+ *
  *     public void close(@Disposes @UserDatabase EntityManager em) {
  *         em.close();
  *     }
- * 
+ *
  * }
  * </pre>
- * 
+ *
  * <p>
  * A disposer method allows the application to perform customized cleanup of an object returned by a
  * {@linkplain Produces producer method or producer field}.
  * </p>
- * 
+ *
  * <p>
  * A disposer method must be a non-abstract method of a managed bean class or session bean class. A disposer method may be
  * either static or non-static. If the bean is a session bean, the disposer method must be a business method of the EJB or a
  * static method of the bean class.
  * </p>
- * 
+ *
  * <p>
  * A bean may declare multiple disposer methods.
  * </p>
- * 
+ *
  * <p>
  * Each disposer method must have exactly one disposed parameter, of the same type as the corresponding producer method or
  * producer field return type. When searching for disposer methods for a producer method or producer field, the container
@@ -82,31 +82,31 @@
  * producer field declared by the same bean class, the container must call this method when destroying any instance returned by
  * that producer method or producer field.
  * </p>
- * 
+ *
  * <p>
  * In addition to the disposed parameter, a disposer method may declare additional parameters, which may also specify
  * qualifiers. These additional parameters are injection points.
  * </p>
- * 
+ *
  * <pre>
  * public void close(&#064;Disposes &#064;UserDatabase EntityManager em, Logger log) { ... }
  * </pre>
- * 
+ *
  * <p>
  * A disposer method may resolve to multiple producer methods or producer fields declared by the bean class, in which case the
  * container must call it when destroying any instance returned by any of these producer methods or producer fields.
  * </p>
- * 
+ *
  * <p>
  * Disposer methods are not inherited by bean subclasses.
  * </p>
- * 
+ *
  * <p>
  * Interceptors and decorators may not declare disposer methods.
  * </p>
- * 
+ *
  * @see Produces &#064;Produces
- * 
+ *
  * @author Gavin King
  * @author Pete Muir
  */
diff --git a/api/src/main/java/jakarta/enterprise/inject/IllegalProductException.java b/api/src/main/java/jakarta/enterprise/inject/IllegalProductException.java
index d58c23115..0b485152e 100644
--- a/api/src/main/java/jakarta/enterprise/inject/IllegalProductException.java
+++ b/api/src/main/java/jakarta/enterprise/inject/IllegalProductException.java
@@ -8,7 +8,7 @@
  * You may obtain a copy of the License at
  * http://www.apache.org/licenses/LICENSE-2.0
  * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,  
+ * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
diff --git a/api/src/main/java/jakarta/enterprise/inject/InjectionException.java b/api/src/main/java/jakarta/enterprise/inject/InjectionException.java
index 16de0936f..f75c0c50d 100644
--- a/api/src/main/java/jakarta/enterprise/inject/InjectionException.java
+++ b/api/src/main/java/jakarta/enterprise/inject/InjectionException.java
@@ -8,7 +8,7 @@
  * You may obtain a copy of the License at
  * http://www.apache.org/licenses/LICENSE-2.0
  * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,  
+ * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
@@ -18,7 +18,7 @@
 
 /**
  * Indicates a problem relating to dependency injection.
- * 
+ *
  * @author Pete Muir
  */
 public class InjectionException extends RuntimeException {
diff --git a/api/src/main/java/jakarta/enterprise/inject/Instance.java b/api/src/main/java/jakarta/enterprise/inject/Instance.java
index a29746caa..21f7ebe81 100644
--- a/api/src/main/java/jakarta/enterprise/inject/Instance.java
+++ b/api/src/main/java/jakarta/enterprise/inject/Instance.java
@@ -8,7 +8,7 @@
  * You may obtain a copy of the License at
  * http://www.apache.org/licenses/LICENSE-2.0
  * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,  
+ * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
@@ -29,88 +29,90 @@
  * <p>
  * Allows the application to dynamically obtain instances of beans with a specified combination of required type and qualifiers.
  * </p>
- * 
+ *
  * <p>
  * In certain situations, injection is not the most convenient way to obtain a contextual reference. For example, it may not be
  * used when:
  * </p>
- * 
+ *
  * <ul>
  * <li>the bean type or qualifiers vary dynamically at runtime, or</li>
  * <li>depending upon the deployment, there may be no bean which satisfies the type and qualifiers, or</li>
  * <li>we would like to iterate over all beans of a certain type.</li>
  * </ul>
- * 
+ *
  * <p>
  * In these situations, an instance of the <code>Instance</code> may be injected:
  * </p>
- * 
+ *
  * <pre>
  * &#064;Inject
  * Instance&lt;PaymentProcessor&gt; paymentProcessor;
  * </pre>
- * 
+ *
  * <p>
  * Any combination of qualifiers may be specified at the injection point:
  * </p>
- * 
+ *
  * <pre>
  * &#064;Inject
  * &#064;PayBy(CHEQUE)
  * Instance&lt;PaymentProcessor&gt; chequePaymentProcessor;
  * </pre>
- * 
+ *
  * <p>
  * Or, the {@link Any &#064;Any} qualifier may be used, allowing the application to specify qualifiers
  * dynamically:
  * </p>
- * 
+ *
  * <pre>
  * &#064;Inject
  * &#064;Any
  * Instance&lt;PaymentProcessor&gt; anyPaymentProcessor;
  * </pre>
- * 
+ *
  * <p>
  * For an injected <code>Instance</code>:
  * </p>
- * 
+ *
  * <ul>
  * <li>the <em>required type</em> is the type parameter specified at the injection point, and</li>
  * <li>the <em>required qualifiers</em> are the qualifiers specified at the injection point.</li>
  * </ul>
- * 
+ *
  * <p>
- * The inherited {@link jakarta.inject.Provider#get()} method returns a contextual references for the unique bean that matches the
- * required type and required qualifiers and is eligible for injection into the class into which the parent <code>Instance</code>
+ * The inherited {@link jakarta.inject.Provider#get()} method returns a contextual references for the unique bean that matches
+ * the
+ * required type and required qualifiers and is eligible for injection into the class into which the parent
+ * <code>Instance</code>
  * was injected, or throws an {@link UnsatisfiedResolutionException} or
  * {@link AmbiguousResolutionException}.
  * </p>
- * 
+ *
  * <pre>
  * PaymentProcessor pp = chequePaymentProcessor.get();
  * </pre>
- * 
+ *
  * <p>
  * The inherited {@link java.lang.Iterable#iterator()} method returns an iterator over contextual references for beans that
  * match the required type and required qualifiers and are eligible for injection into the class into which the parent
  * <code>Instance</code> was injected.
  * </p>
- * 
+ *
  * <pre>
  * for (PaymentProcessor pp : anyPaymentProcessor)
  *     pp.test();
  * </pre>
- * 
+ *
  * @see jakarta.inject.Provider#get()
  * @see java.lang.Iterable#iterator()
  * @see AnnotationLiteral
  * @see TypeLiteral
- * 
+ *
  * @author Gavin King
  * @author John Ament
  * @author Martin Kouba
- * 
+ *
  * @param <T> the required bean type
  */
 
@@ -120,10 +122,11 @@ public interface Instance<T> extends Iterable<T>, Provider<T> {
      * <p>
      * Obtains a child <code>Instance</code> for the given additional required qualifiers.
      * </p>
-     * 
+     *
      * @param qualifiers the additional required qualifiers
      * @return the child <code>Instance</code>
-     * @throws IllegalArgumentException if passed two instances of the same non repeating qualifier type, or an instance of an annotation that
+     * @throws IllegalArgumentException if passed two instances of the same non repeating qualifier type, or an instance of an
+     *         annotation that
      *         is not a qualifier type
      * @throws IllegalStateException if the container is already shutdown
      */
@@ -133,12 +136,13 @@ public interface Instance<T> extends Iterable<T>, Provider<T> {
      * <p>
      * Obtains a child <code>Instance</code> for the given required type and additional required qualifiers.
      * </p>
-     * 
+     *
      * @param <U> the required type
      * @param subtype a {@link java.lang.Class} representing the required type
      * @param qualifiers the additional required qualifiers
      * @return the child <code>Instance</code>
-     * @throws IllegalArgumentException if passed two instances of the same non repeating qualifier type, or an instance of an annotation that
+     * @throws IllegalArgumentException if passed two instances of the same non repeating qualifier type, or an instance of an
+     *         annotation that
      *         is not a qualifier type
      * @throws IllegalStateException if the container is already shutdown
      */
@@ -148,12 +152,13 @@ public interface Instance<T> extends Iterable<T>, Provider<T> {
      * <p>
      * Obtains a child <code>Instance</code> for the given required type and additional required qualifiers.
      * </p>
-     * 
+     *
      * @param <U> the required type
      * @param subtype a {@link TypeLiteral} representing the required type
      * @param qualifiers the additional required qualifiers
      * @return the child <code>Instance</code>
-     * @throws IllegalArgumentException if passed two instances of the same non repeating qualifier type, or an instance of an annotation that
+     * @throws IllegalArgumentException if passed two instances of the same non repeating qualifier type, or an instance of an
+     *         annotation that
      *         is not a qualifier type
      * @throws IllegalStateException if the container is already shutdown
      */
@@ -177,7 +182,7 @@ default Stream<T> stream() {
      * Determines if there is no bean that matches the required type and qualifiers and is eligible for injection into the class
      * into which the parent <code>Instance</code> was injected.
      * </p>
-     * 
+     *
      * @return <code>true</code> if there is no bean that matches the required type and qualifiers and is eligible for injection
      *         into the class into which the parent <code>Instance</code> was injected, or <code>false</code> otherwise.
      */
@@ -188,9 +193,11 @@ default Stream<T> stream() {
      * Determines if there is more than one bean that matches the required type and qualifiers and is eligible for injection
      * into the class into which the parent <code>Instance</code> was injected.
      * </p>
-     * 
-     * @return <code>true</code> if there is more than one bean that matches the required type and qualifiers and is eligible for
-     *         injection into the class into which the parent <code>Instance</code> was injected, or <code>false</code> otherwise.
+     *
+     * @return <code>true</code> if there is more than one bean that matches the required type and qualifiers and is eligible
+     *         for
+     *         injection into the class into which the parent <code>Instance</code> was injected, or <code>false</code>
+     *         otherwise.
      */
     boolean isAmbiguous();
 
@@ -202,7 +209,8 @@ default Stream<T> stream() {
      *
      * @since 2.0
      * @return <code>true</code> if there is exactly one bean that matches the required type and qualifiers and is eligible for
-     *         injection into the class into which the parent <code>Instance</code> was injected, or <code>false</code> otherwise.
+     *         injection into the class into which the parent <code>Instance</code> was injected, or <code>false</code>
+     *         otherwise.
      */
     default boolean isResolvable() {
         return !isUnsatisfied() && !isAmbiguous();
@@ -213,13 +221,13 @@ default boolean isResolvable() {
      * When called, the container destroys the instance if the active context object for the scope type of the bean supports
      * destroying bean instances. All normal scoped built-in contexts support destroying bean instances.
      * </p>
-     * 
+     *
      * <p>
      * The instance passed should either be a dependent scoped bean instance obtained from the same {@link Instance} object, or
      * the client proxy for a normal scoped bean instance.
      * </p>
-     * 
-     * 
+     *
+     *
      * @since 1.1
      * @param instance the instance to destroy
      * @throws UnsupportedOperationException if the active context object for the scope type of the bean does not support
@@ -242,11 +250,13 @@ default boolean isResolvable() {
     Handle<T> getHandle();
 
     /**
-     * Allows iterating over contextual reference handles for all beans that have the required type and required qualifiers and are eligible
+     * Allows iterating over contextual reference handles for all beans that have the required type and required qualifiers and
+     * are eligible
      * for injection.
      *
      * <p>
-     * Note that the returned {@link Iterable} is stateless. Therefore, each {@link Iterable#iterator()} produces a new set of handles.
+     * Note that the returned {@link Iterable} is stateless. Therefore, each {@link Iterable#iterator()} produces a new set of
+     * handles.
      * </p>
      *
      * @return a new iterable
@@ -254,7 +264,7 @@ default boolean isResolvable() {
     Iterable<? extends Handle<T>> handles();
 
     /**
-     *  Returns stream of {@link Handle} objects.
+     * Returns stream of {@link Handle} objects.
      *
      * @return a new stream of contextual reference handles
      */
@@ -281,7 +291,7 @@ interface Handle<T> extends AutoCloseable {
          * @see Instance#get()
          * @throws IllegalStateException If the producing {@link Instance} does not exist
          * @throws IllegalStateException If invoked on {@link Handle} that previously successfully destroyed its
-         * underlying contextual reference
+         *         underlying contextual reference
          */
         T get();
 
diff --git a/api/src/main/java/jakarta/enterprise/inject/Intercepted.java b/api/src/main/java/jakarta/enterprise/inject/Intercepted.java
index 17c90e325..5a7b0cb3d 100644
--- a/api/src/main/java/jakarta/enterprise/inject/Intercepted.java
+++ b/api/src/main/java/jakarta/enterprise/inject/Intercepted.java
@@ -8,7 +8,7 @@
  * You may obtain a copy of the License at
  * http://www.apache.org/licenses/LICENSE-2.0
  * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,  
+ * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
@@ -30,19 +30,19 @@
  * <p>
  * An interceptor may inject metadata about the bean it is intercepting.
  * </p>
- * 
+ *
  * <pre>
  * &#064;Transactional &#064;Interceptor
  * public class TransactionInterceptor {
- * 
+ *
  *    &#064;Inject &#064;Intercepted Bean&lt;?&gt; bean;
- * 
- *    &#064;AroundInvoke 
+ *
+ *    &#064;AroundInvoke
  *    public Object manageTransaction(InvocationContext ctx) throws Exception { ... }
- * 
+ *
  * }
  * </pre>
- * 
+ *
  * @author Pete Muir
  * @since 1.1
  */
diff --git a/api/src/main/java/jakarta/enterprise/inject/Model.java b/api/src/main/java/jakarta/enterprise/inject/Model.java
index fcd74c571..0eedb4e30 100644
--- a/api/src/main/java/jakarta/enterprise/inject/Model.java
+++ b/api/src/main/java/jakarta/enterprise/inject/Model.java
@@ -8,7 +8,7 @@
  * You may obtain a copy of the License at
  * http://www.apache.org/licenses/LICENSE-2.0
  * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,  
+ * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
@@ -32,7 +32,7 @@
  * The built-in stereotype intended for use with beans that define the model layer of an MVC web application architecture such
  * as JSF.
  * </p>
- * 
+ *
  * @see Stereotype
  * @author Gavin King
  */
diff --git a/api/src/main/java/jakarta/enterprise/inject/Produces.java b/api/src/main/java/jakarta/enterprise/inject/Produces.java
index 666c84d58..a91b58782 100644
--- a/api/src/main/java/jakarta/enterprise/inject/Produces.java
+++ b/api/src/main/java/jakarta/enterprise/inject/Produces.java
@@ -8,7 +8,7 @@
  * You may obtain a copy of the License at
  * http://www.apache.org/licenses/LICENSE-2.0
  * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,  
+ * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
@@ -27,90 +27,90 @@
 import jakarta.enterprise.context.Dependent;
 
 /**
- * 
+ *
  * <p>
  * Identifies a producer method or field. May be applied to a method or field of a bean class.
  * </p>
- * 
+ *
  * <p>
  * A producer method must be a non-abstract method of a managed bean class or session bean class. A producer method may be
  * either static or non-static. If the bean is a session bean, the producer method must be either a business method of the EJB
  * or a static method of the bean class.
  * </p>
- * 
+ *
  * <pre>
  * public class Shop {
- *    &#064;Produces &#064;ApplicationScoped 
- *    &#064;Catalog &#064;Named("catalog") 
+ *    &#064;Produces &#064;ApplicationScoped
+ *    &#064;Catalog &#064;Named("catalog")
  *    List&lt;Product&gt; getProducts() { ... }
  *    ...
  * }
  * </pre>
- * 
+ *
  * <p>
  * A producer field must be a field of a managed bean class or session bean class. A producer field may be either static or
  * non-static. If the bean is a session bean, the producer field must be a static field of the bean class.
  * </p>
- * 
+ *
  * <pre>
- * public class Shop { 
- *    &#064;Produces &#064;ApplicationScoped 
- *    &#064;Catalog &#064;Named("catalog") 
+ * public class Shop {
+ *    &#064;Produces &#064;ApplicationScoped
+ *    &#064;Catalog &#064;Named("catalog")
  *    List&lt;Product&gt; products = ...;
  *    ...
  * }
  * </pre>
- * 
+ *
  * <p>
  * If a producer method sometimes returns a null value, or if a producer field sometimes contains a null value when accessed,
  * then the producer method or field must have scope {@link Dependent &#064;Dependent}.
  * </p>
- * 
+ *
  * <p>
  * A producer method return type or producer field type may not be a type variable.
  * </p>
- * 
+ *
  * <p>
  * If the producer method return type or producer field type is a parameterized type, it must specify an actual type parameter
  * or type variable for each type parameter.
  * </p>
- * 
+ *
  * <p>
  * If the producer method return type or producer field type is a parameterized type with a type variable, it must have scope
  * {@link Dependent &#064;Dependent}.
  * </p>
- * 
+ *
  * <p>
  * A producer method may have any number of parameters. All producer method parameters are injection points.
  * </p>
- * 
+ *
  * <pre>
  * public class OrderFactory {
- * 
+ *
  *     &#064;Produces
  *     &#064;ConversationScoped
  *     public Order createCurrentOrder(Shop shop, @Selected Product product) {
  *         Order order = new Order(product, shop);
  *         return order;
  *     }
- * 
+ *
  * }
  * </pre>
- * 
+ *
  * <p>
  * A bean may declare multiple producer methods or fields.
  * </p>
- * 
+ *
  * <p>
  * Producer methods and fields are not inherited by bean subclasses.
  * </p>
- * 
+ *
  * <p>
  * Interceptors and decorators may not declare producer methods or fields.
  * </p>
- * 
+ *
  * @see Disposes &#064;Disposes
- * 
+ *
  * @author Gavin King
  * @author Pete Muir
  */
diff --git a/api/src/main/java/jakarta/enterprise/inject/ResolutionException.java b/api/src/main/java/jakarta/enterprise/inject/ResolutionException.java
index 8755260dc..81a644f76 100644
--- a/api/src/main/java/jakarta/enterprise/inject/ResolutionException.java
+++ b/api/src/main/java/jakarta/enterprise/inject/ResolutionException.java
@@ -8,7 +8,7 @@
  * You may obtain a copy of the License at
  * http://www.apache.org/licenses/LICENSE-2.0
  * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,  
+ * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
@@ -17,7 +17,7 @@
 
 /**
  * Indicates a problem relating to typesafe resolution.
- * 
+ *
  * @author Gavin King
  */
 public class ResolutionException extends InjectionException {
diff --git a/api/src/main/java/jakarta/enterprise/inject/Specializes.java b/api/src/main/java/jakarta/enterprise/inject/Specializes.java
index e64735373..60230e899 100644
--- a/api/src/main/java/jakarta/enterprise/inject/Specializes.java
+++ b/api/src/main/java/jakarta/enterprise/inject/Specializes.java
@@ -8,7 +8,7 @@
  * You may obtain a copy of the License at
  * http://www.apache.org/licenses/LICENSE-2.0
  * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,  
+ * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
@@ -31,38 +31,44 @@
  * <p>
  * Indicates that a bean directly specializes another bean. May be applied to a bean class or producer method.
  * </p>
- * 
+ *
  * <p>
  * If a bean directly specializes a second bean, it inherits:
  * </p>
- * 
+ *
  * <ul>
  * <li>all qualifiers of the second bean, and</li>
  * <li>the name, if any, of the second bean.</li>
  * </ul>
- * 
+ *
  * <p>
- * If the second bean has a name, the bean may not declare a name using {@link jakarta.inject.Named &#064;Named}. Furthermore, the
+ * If the second bean has a name, the bean may not declare a name using {@link jakarta.inject.Named &#064;Named}. Furthermore,
+ * the
  * bean must have all the bean types of the second bean.
  * </p>
- * 
+ *
  * <ul>
- * <li>If a bean class of a managed bean is annotated <code>&#064;Specializes</code> , then the bean class must directly extend the
+ * <li>If a bean class of a managed bean is annotated <code>&#064;Specializes</code> , then the bean class must directly extend
+ * the
  * bean class of a second managed bean. Then the first managed bean directly specializes the second managed bean.</li>
- * 
- * <li>If a bean class of a session bean is annotated <code>&#064;Specializes</code> , then the bean class must directly extend the
+ *
+ * <li>If a bean class of a session bean is annotated <code>&#064;Specializes</code> , then the bean class must directly extend
+ * the
  * bean class of a second session bean. Then the first session bean directly specializes the second session bean.</li>
- * 
- * <li>If a producer method is annotated <code>&#064;Specializes</code>, then it must be non-static and directly override another
+ *
+ * <li>If a producer method is annotated <code>&#064;Specializes</code>, then it must be non-static and directly override
+ * another
  * producer method. Then the first producer method directly specializes the second producer method.</li>
  * </ul>
- * 
+ *
  * <p>
  * If a bean is specialized by any enabled bean, the first bean is disabled.
  * </p>
  *
- * <p>CDI Lite implementations are not required to provide support for specialization.</p>
- * 
+ * <p>
+ * CDI Lite implementations are not required to provide support for specialization.
+ * </p>
+ *
  * @author Gavin King
  * @author Pete Muir
  */
@@ -71,7 +77,7 @@
 @Retention(RUNTIME)
 @Documented
 public @interface Specializes {
-    
+
     /**
      * Supports inline instantiation of the {@link Specializes} annotation.
      *
diff --git a/api/src/main/java/jakarta/enterprise/inject/Stereotype.java b/api/src/main/java/jakarta/enterprise/inject/Stereotype.java
index 49b266449..4c57f6c31 100644
--- a/api/src/main/java/jakarta/enterprise/inject/Stereotype.java
+++ b/api/src/main/java/jakarta/enterprise/inject/Stereotype.java
@@ -8,7 +8,7 @@
  * You may obtain a copy of the License at
  * http://www.apache.org/licenses/LICENSE-2.0
  * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,  
+ * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
@@ -27,31 +27,31 @@
  * <p>
  * Specifies that an annotation type is a stereotype.
  * </p>
- * 
+ *
  * <p>
  * In many systems, use of architectural patterns produces a set of recurring bean roles. A stereotype allows a framework
  * developer to identify such a role and declare some common metadata for beans with that role in a central place.
  * </p>
- * 
+ *
  * <p>
  * A bean may declare zero, one or multiple stereotypes, by applying the stereotype annotation to the bean class or producer
  * method or field.
  * </p>
- * 
+ *
  * <p>
  * A stereotype encapsulates any combination of:
  * </p>
- * 
+ *
  * <ul>
  * <li>a default scope, and</li>
  * <li>a set of interceptor bindings.</li>
  * </ul>
- * 
+ *
  * <p>
  * The default scope of a stereotype is defined by annotating the stereotype with a scope type. A stereotype may declare at most
  * one scope. If a bean explicitly declares a scope, any default scopes declared by its stereotypes are ignored.
  * </p>
- * 
+ *
  * <pre>
  * &#064;RequestScoped
  * &#064;Stereotype
@@ -60,13 +60,13 @@
  * public @interface Action {
  * }
  * </pre>
- * 
+ *
  * <p>
  * The interceptor bindings of a stereotype are defined by annotating the stereotype with the interceptor binding types. A
  * stereotype may declare zero, one or multiple interceptor bindings. An interceptor binding declared by a stereotype is
  * inherited by any bean that declares that stereotype.
  * </p>
- * 
+ *
  * <pre>
  * &#064;RequestScoped
  * &#064;Secure
@@ -77,22 +77,23 @@
  * public @interface Action {
  * }
  * </pre>
- * 
+ *
  * <p>
  * A stereotype may also specify that:
  * </p>
- * 
+ *
  * <ul>
  * <li>all beans with the stereotype have defaulted bean EL names, or that</li>
  * <li>all beans with the stereotype are alternatives, or that</li>
  * <li>all beans with the stereotype have predefined {@code @Priority}.</li>
  * </ul>
- * 
+ *
  * <p>
- * A stereotype may declare an empty {@link jakarta.inject.Named &#064;Named} annotation, which specifies that every bean with the
+ * A stereotype may declare an empty {@link jakarta.inject.Named &#064;Named} annotation, which specifies that every bean with
+ * the
  * stereotype has a defaulted name when a name is not explicitly specified by the bean.
  * </p>
- * 
+ *
  * <pre>
  * &#064;RequestScoped
  * &#064;Named
@@ -104,12 +105,12 @@
  * public @interface Action {
  * }
  * </pre>
- * 
+ *
  * <p>
  * A stereotype may declare an {@link Alternative &#064;Alternative} annotation, which specifies that
  * every bean with the stereotype is an alternative.
  * </p>
- * 
+ *
  * <pre>
  * &#064;Alternative
  * &#064;Stereotype
@@ -118,7 +119,7 @@
  * public @interface Mock {
  * }
  * </pre>
- * 
+ *
  * <p>
  * A stereotype may declare a {@link jakarta.annotation.Priority &#064;Priority} annotation, which specifies that
  * every bean with the stereotype is enabled and has given priority.
@@ -138,9 +139,9 @@
  * A stereotype may declare other stereotypes. Stereotype declarations are transitive. A stereotype declared by a second
  * stereotype is inherited by all beans and other stereotypes that declare the second stereotype.
  * </p>
- * 
+ *
  * @see Model the built-in stereotype <code>&#064;Model</code>
- * 
+ *
  * @author Pete Muir
  * @author Gavin King
  */
diff --git a/api/src/main/java/jakarta/enterprise/inject/TransientReference.java b/api/src/main/java/jakarta/enterprise/inject/TransientReference.java
index aaf93bfc1..373aec5da 100644
--- a/api/src/main/java/jakarta/enterprise/inject/TransientReference.java
+++ b/api/src/main/java/jakarta/enterprise/inject/TransientReference.java
@@ -8,7 +8,7 @@
  * You may obtain a copy of the License at
  * http://www.apache.org/licenses/LICENSE-2.0
  * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,  
+ * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
@@ -28,21 +28,22 @@
 
 /**
  * <p>
- * If a parameter annotated with <code>&#064;TransientReference</code> resolves to a dependent scoped bean, then the bean will be
+ * If a parameter annotated with <code>&#064;TransientReference</code> resolves to a dependent scoped bean, then the bean will
+ * be
  * destroyed after the invocation completes.
  * </p>
- * 
+ *
  * <pre>
  * public class OrderManager {
- * 
- *     &#064;Inject 
+ *
+ *     &#064;Inject
  *     public OrderManager(@TransientReference Order order) {
  *        ...
- *    
+ *
  *     }
  * }
  * </pre>
- * 
+ *
  * @author Pete Muir
  * @since 1.1
  */
@@ -51,7 +52,7 @@
 @Retention(RUNTIME)
 @Documented
 public @interface TransientReference {
-    
+
     /**
      * Supports inline instantiation of the {@link TransientReference} annotation.
      *
diff --git a/api/src/main/java/jakarta/enterprise/inject/Typed.java b/api/src/main/java/jakarta/enterprise/inject/Typed.java
index 95174bcc7..8b8a7b504 100644
--- a/api/src/main/java/jakarta/enterprise/inject/Typed.java
+++ b/api/src/main/java/jakarta/enterprise/inject/Typed.java
@@ -72,7 +72,7 @@
      */
     public final static class Literal extends AnnotationLiteral<Typed> implements Typed {
 
-        public static final Literal INSTANCE = of(new Class<?>[]{});
+        public static final Literal INSTANCE = of(new Class<?>[] {});
 
         private static final long serialVersionUID = 1L;
 
diff --git a/api/src/main/java/jakarta/enterprise/inject/UnproxyableResolutionException.java b/api/src/main/java/jakarta/enterprise/inject/UnproxyableResolutionException.java
index d7dcac236..7c54d241e 100644
--- a/api/src/main/java/jakarta/enterprise/inject/UnproxyableResolutionException.java
+++ b/api/src/main/java/jakarta/enterprise/inject/UnproxyableResolutionException.java
@@ -8,7 +8,7 @@
  * You may obtain a copy of the License at
  * http://www.apache.org/licenses/LICENSE-2.0
  * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,  
+ * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
@@ -21,7 +21,7 @@
  * Indicates that a contextual reference for a bean with a normal scope and a certain bean type cannot be obtained because the
  * bean type cannot be proxied by the container.
  * </p>
- * 
+ *
  * @author Pete Muir
  * @author Gavin King
  */
diff --git a/api/src/main/java/jakarta/enterprise/inject/UnsatisfiedResolutionException.java b/api/src/main/java/jakarta/enterprise/inject/UnsatisfiedResolutionException.java
index e9a067b6b..0752a749f 100644
--- a/api/src/main/java/jakarta/enterprise/inject/UnsatisfiedResolutionException.java
+++ b/api/src/main/java/jakarta/enterprise/inject/UnsatisfiedResolutionException.java
@@ -8,7 +8,7 @@
  * You may obtain a copy of the License at
  * http://www.apache.org/licenses/LICENSE-2.0
  * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,  
+ * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
@@ -20,7 +20,7 @@
  * Indicates that no bean matches a certain combination of required type and required qualifiers and is eligible for injection
  * into a certain class.
  * </p>
- * 
+ *
  * @author Pete Muir
  * @author Gavin King
  */
diff --git a/api/src/main/java/jakarta/enterprise/inject/Vetoed.java b/api/src/main/java/jakarta/enterprise/inject/Vetoed.java
index a4a4de0de..0c3466606 100644
--- a/api/src/main/java/jakarta/enterprise/inject/Vetoed.java
+++ b/api/src/main/java/jakarta/enterprise/inject/Vetoed.java
@@ -8,7 +8,7 @@
  * You may obtain a copy of the License at
  * http://www.apache.org/licenses/LICENSE-2.0
  * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,  
+ * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
@@ -29,20 +29,20 @@
  * <p>
  * Veto the processing of the class. Any beans or observer methods defined by this class will not be installed.
  * </p>
- * 
+ *
  * <p>
  * When placed on package, all beans in the package are prevented from being installed. If packages are split across jars,
  * non-portable behavior results. An application can prevent packages being split across jars by sealing the package.
  * </p>
- * 
+ *
  * <p>
  * No container lifecycle events are fired for classes annotated {@link Vetoed}.
  * </p>
- * 
+ *
  * @author Stuart Douglas
  * @since 1.1
  * @see <a href="https://docs.oracle.com/javase/8/docs/technotes/guides/jar/jar.html#sealing">JAR File Specification</a>
- * 
+ *
  */
 @Target({ ElementType.TYPE, ElementType.PACKAGE })
 @Retention(RetentionPolicy.RUNTIME)
diff --git a/api/src/main/java/jakarta/enterprise/inject/build/compatible/spi/AnnotationBuilder.java b/api/src/main/java/jakarta/enterprise/inject/build/compatible/spi/AnnotationBuilder.java
index a89ec8520..a7c3d174d 100644
--- a/api/src/main/java/jakarta/enterprise/inject/build/compatible/spi/AnnotationBuilder.java
+++ b/api/src/main/java/jakarta/enterprise/inject/build/compatible/spi/AnnotationBuilder.java
@@ -10,13 +10,13 @@
 
 package jakarta.enterprise.inject.build.compatible.spi;
 
+import java.lang.annotation.Annotation;
+
 import jakarta.enterprise.lang.model.AnnotationInfo;
 import jakarta.enterprise.lang.model.AnnotationMember;
 import jakarta.enterprise.lang.model.declarations.ClassInfo;
 import jakarta.enterprise.lang.model.types.Type;
 
-import java.lang.annotation.Annotation;
-
 /**
  * Builder for annotations of given type.
  * Expected usage is:
@@ -780,7 +780,7 @@ default AnnotationBuilder value(Annotation[] values) {
      *
      * @return the built {@link AnnotationInfo}, never {@code null}
      * @throws IllegalStateException if a value of some annotation member was not set, and that member
-     * does not declare a default value
+     *         does not declare a default value
      */
     AnnotationInfo build();
 }
diff --git a/api/src/main/java/jakarta/enterprise/inject/build/compatible/spi/AnnotationBuilderFactory.java b/api/src/main/java/jakarta/enterprise/inject/build/compatible/spi/AnnotationBuilderFactory.java
index 36258e3c6..51f9e60b2 100644
--- a/api/src/main/java/jakarta/enterprise/inject/build/compatible/spi/AnnotationBuilderFactory.java
+++ b/api/src/main/java/jakarta/enterprise/inject/build/compatible/spi/AnnotationBuilderFactory.java
@@ -10,10 +10,10 @@
 
 package jakarta.enterprise.inject.build.compatible.spi;
 
-import jakarta.enterprise.lang.model.declarations.ClassInfo;
-
 import java.lang.annotation.Annotation;
 
+import jakarta.enterprise.lang.model.declarations.ClassInfo;
+
 /**
  * Supports instantiating {@link AnnotationBuilder}.
  * Should not be called directly by users; the static methods on {@link AnnotationBuilder} are preferred.
diff --git a/api/src/main/java/jakarta/enterprise/inject/build/compatible/spi/BeanInfo.java b/api/src/main/java/jakarta/enterprise/inject/build/compatible/spi/BeanInfo.java
index df54baab3..2b482764a 100644
--- a/api/src/main/java/jakarta/enterprise/inject/build/compatible/spi/BeanInfo.java
+++ b/api/src/main/java/jakarta/enterprise/inject/build/compatible/spi/BeanInfo.java
@@ -10,13 +10,14 @@
 
 package jakarta.enterprise.inject.build.compatible.spi;
 
+import java.util.Collection;
+
 import jakarta.enterprise.invoke.InvokerBuilder;
 import jakarta.enterprise.lang.model.AnnotationInfo;
 import jakarta.enterprise.lang.model.declarations.ClassInfo;
 import jakarta.enterprise.lang.model.declarations.FieldInfo;
 import jakarta.enterprise.lang.model.declarations.MethodInfo;
 import jakarta.enterprise.lang.model.types.Type;
-import java.util.Collection;
 
 /**
  * Beans are:
diff --git a/api/src/main/java/jakarta/enterprise/inject/build/compatible/spi/ClassConfig.java b/api/src/main/java/jakarta/enterprise/inject/build/compatible/spi/ClassConfig.java
index a3dd06625..dfc7cca82 100644
--- a/api/src/main/java/jakarta/enterprise/inject/build/compatible/spi/ClassConfig.java
+++ b/api/src/main/java/jakarta/enterprise/inject/build/compatible/spi/ClassConfig.java
@@ -10,13 +10,13 @@
 
 package jakarta.enterprise.inject.build.compatible.spi;
 
-import jakarta.enterprise.lang.model.AnnotationInfo;
-import jakarta.enterprise.lang.model.declarations.ClassInfo;
-
 import java.lang.annotation.Annotation;
 import java.util.Collection;
 import java.util.function.Predicate;
 
+import jakarta.enterprise.lang.model.AnnotationInfo;
+import jakarta.enterprise.lang.model.declarations.ClassInfo;
+
 /**
  * Allows adding annotations to and removing annotations from a class.
  * Note that the class is not physically altered, the modifications
diff --git a/api/src/main/java/jakarta/enterprise/inject/build/compatible/spi/DeclarationConfig.java b/api/src/main/java/jakarta/enterprise/inject/build/compatible/spi/DeclarationConfig.java
index ec6027afc..7877dae1c 100644
--- a/api/src/main/java/jakarta/enterprise/inject/build/compatible/spi/DeclarationConfig.java
+++ b/api/src/main/java/jakarta/enterprise/inject/build/compatible/spi/DeclarationConfig.java
@@ -10,12 +10,12 @@
 
 package jakarta.enterprise.inject.build.compatible.spi;
 
-import jakarta.enterprise.lang.model.AnnotationInfo;
-import jakarta.enterprise.lang.model.declarations.DeclarationInfo;
-
 import java.lang.annotation.Annotation;
 import java.util.function.Predicate;
 
+import jakarta.enterprise.lang.model.AnnotationInfo;
+import jakarta.enterprise.lang.model.declarations.DeclarationInfo;
+
 /**
  * Allows adding annotations to and removing annotations from a declaration.
  * Note that the declaration is not physically altered, the modifications
diff --git a/api/src/main/java/jakarta/enterprise/inject/build/compatible/spi/FieldConfig.java b/api/src/main/java/jakarta/enterprise/inject/build/compatible/spi/FieldConfig.java
index 445b37b65..41809f346 100644
--- a/api/src/main/java/jakarta/enterprise/inject/build/compatible/spi/FieldConfig.java
+++ b/api/src/main/java/jakarta/enterprise/inject/build/compatible/spi/FieldConfig.java
@@ -10,12 +10,12 @@
 
 package jakarta.enterprise.inject.build.compatible.spi;
 
-import jakarta.enterprise.lang.model.AnnotationInfo;
-import jakarta.enterprise.lang.model.declarations.FieldInfo;
-
 import java.lang.annotation.Annotation;
 import java.util.function.Predicate;
 
+import jakarta.enterprise.lang.model.AnnotationInfo;
+import jakarta.enterprise.lang.model.declarations.FieldInfo;
+
 /**
  * Allows adding annotations to and removing annotations from a field.
  * Note that the field is not physically altered, the modifications
diff --git a/api/src/main/java/jakarta/enterprise/inject/build/compatible/spi/InjectionPointInfo.java b/api/src/main/java/jakarta/enterprise/inject/build/compatible/spi/InjectionPointInfo.java
index 9f45d90ef..6d4a73430 100644
--- a/api/src/main/java/jakarta/enterprise/inject/build/compatible/spi/InjectionPointInfo.java
+++ b/api/src/main/java/jakarta/enterprise/inject/build/compatible/spi/InjectionPointInfo.java
@@ -10,10 +10,11 @@
 
 package jakarta.enterprise.inject.build.compatible.spi;
 
+import java.util.Collection;
+
 import jakarta.enterprise.lang.model.AnnotationInfo;
 import jakarta.enterprise.lang.model.declarations.DeclarationInfo;
 import jakarta.enterprise.lang.model.types.Type;
-import java.util.Collection;
 
 /**
  * An injection point defined on some bean. Injection points may be fields
diff --git a/api/src/main/java/jakarta/enterprise/inject/build/compatible/spi/InterceptorInfo.java b/api/src/main/java/jakarta/enterprise/inject/build/compatible/spi/InterceptorInfo.java
index 63647af47..438238168 100644
--- a/api/src/main/java/jakarta/enterprise/inject/build/compatible/spi/InterceptorInfo.java
+++ b/api/src/main/java/jakarta/enterprise/inject/build/compatible/spi/InterceptorInfo.java
@@ -10,11 +10,11 @@
 
 package jakarta.enterprise.inject.build.compatible.spi;
 
+import java.util.Collection;
+
 import jakarta.enterprise.inject.spi.InterceptionType;
 import jakarta.enterprise.lang.model.AnnotationInfo;
 
-import java.util.Collection;
-
 /**
  * Interceptors are managed beans annotated {@link jakarta.interceptor.Interceptor @Interceptor}.
  * An interceptor declares a set of {@linkplain jakarta.interceptor.InterceptorBinding interceptor binding annotations},
diff --git a/api/src/main/java/jakarta/enterprise/inject/build/compatible/spi/MetaAnnotations.java b/api/src/main/java/jakarta/enterprise/inject/build/compatible/spi/MetaAnnotations.java
index ce1d2c96e..35f982b46 100644
--- a/api/src/main/java/jakarta/enterprise/inject/build/compatible/spi/MetaAnnotations.java
+++ b/api/src/main/java/jakarta/enterprise/inject/build/compatible/spi/MetaAnnotations.java
@@ -10,10 +10,9 @@
 
 package jakarta.enterprise.inject.build.compatible.spi;
 
-import jakarta.enterprise.context.spi.AlterableContext;
-
 import java.lang.annotation.Annotation;
-import java.util.function.Consumer;
+
+import jakarta.enterprise.context.spi.AlterableContext;
 
 /**
  * Allows registering custom CDI meta-annotations: qualifiers, interceptor bindings,
@@ -72,7 +71,7 @@ public interface MetaAnnotations {
      * @param scopeAnnotation the scope annotation type, must not be {@code null}
      * @param contextClass the context class, must not be {@code null}
      * @throws IllegalArgumentException if the {@code scopeAnnotation} is not meta-annotated {@code @NormalScope}
-     * or {@code @Scope}
+     *         or {@code @Scope}
      */
     void addContext(Class<? extends Annotation> scopeAnnotation, Class<? extends AlterableContext> contextClass);
 
@@ -88,5 +87,6 @@ public interface MetaAnnotations {
      * @param isNormal whether the scope is normal
      * @param contextClass the context class, must not be {@code null}
      */
-    void addContext(Class<? extends Annotation> scopeAnnotation, boolean isNormal, Class<? extends AlterableContext> contextClass);
+    void addContext(Class<? extends Annotation> scopeAnnotation, boolean isNormal,
+            Class<? extends AlterableContext> contextClass);
 }
diff --git a/api/src/main/java/jakarta/enterprise/inject/build/compatible/spi/MethodConfig.java b/api/src/main/java/jakarta/enterprise/inject/build/compatible/spi/MethodConfig.java
index 7ece8a60f..aee868a1e 100644
--- a/api/src/main/java/jakarta/enterprise/inject/build/compatible/spi/MethodConfig.java
+++ b/api/src/main/java/jakarta/enterprise/inject/build/compatible/spi/MethodConfig.java
@@ -10,13 +10,13 @@
 
 package jakarta.enterprise.inject.build.compatible.spi;
 
-import jakarta.enterprise.lang.model.AnnotationInfo;
-import jakarta.enterprise.lang.model.declarations.MethodInfo;
-
 import java.lang.annotation.Annotation;
 import java.util.List;
 import java.util.function.Predicate;
 
+import jakarta.enterprise.lang.model.AnnotationInfo;
+import jakarta.enterprise.lang.model.declarations.MethodInfo;
+
 /**
  * Allows adding annotations to and removing annotations from a method.
  * Note that the method is not physically altered, the modifications
diff --git a/api/src/main/java/jakarta/enterprise/inject/build/compatible/spi/ObserverInfo.java b/api/src/main/java/jakarta/enterprise/inject/build/compatible/spi/ObserverInfo.java
index 52f66eac5..215105508 100644
--- a/api/src/main/java/jakarta/enterprise/inject/build/compatible/spi/ObserverInfo.java
+++ b/api/src/main/java/jakarta/enterprise/inject/build/compatible/spi/ObserverInfo.java
@@ -10,14 +10,15 @@
 
 package jakarta.enterprise.inject.build.compatible.spi;
 
+import java.util.Collection;
+
+import jakarta.enterprise.event.Reception;
+import jakarta.enterprise.event.TransactionPhase;
 import jakarta.enterprise.lang.model.AnnotationInfo;
 import jakarta.enterprise.lang.model.declarations.ClassInfo;
 import jakarta.enterprise.lang.model.declarations.MethodInfo;
 import jakarta.enterprise.lang.model.declarations.ParameterInfo;
 import jakarta.enterprise.lang.model.types.Type;
-import java.util.Collection;
-import jakarta.enterprise.event.Reception;
-import jakarta.enterprise.event.TransactionPhase;
 
 /**
  * Observers are:
diff --git a/api/src/main/java/jakarta/enterprise/inject/build/compatible/spi/ParameterConfig.java b/api/src/main/java/jakarta/enterprise/inject/build/compatible/spi/ParameterConfig.java
index 05407decf..17e14ac93 100644
--- a/api/src/main/java/jakarta/enterprise/inject/build/compatible/spi/ParameterConfig.java
+++ b/api/src/main/java/jakarta/enterprise/inject/build/compatible/spi/ParameterConfig.java
@@ -10,12 +10,12 @@
 
 package jakarta.enterprise.inject.build.compatible.spi;
 
-import jakarta.enterprise.lang.model.AnnotationInfo;
-import jakarta.enterprise.lang.model.declarations.ParameterInfo;
-
 import java.lang.annotation.Annotation;
 import java.util.function.Predicate;
 
+import jakarta.enterprise.lang.model.AnnotationInfo;
+import jakarta.enterprise.lang.model.declarations.ParameterInfo;
+
 /**
  * Allows adding annotations to and removing annotations from a method parameter.
  * Note that the method parameter is not physically altered, the modifications
diff --git a/api/src/main/java/jakarta/enterprise/inject/build/compatible/spi/Parameters.java b/api/src/main/java/jakarta/enterprise/inject/build/compatible/spi/Parameters.java
index 96b28dc7f..6cef3a40a 100644
--- a/api/src/main/java/jakarta/enterprise/inject/build/compatible/spi/Parameters.java
+++ b/api/src/main/java/jakarta/enterprise/inject/build/compatible/spi/Parameters.java
@@ -20,10 +20,10 @@
  *
  * <ul>
  * <li>a synthetic bean {@linkplain SyntheticBeanCreator creation} and
- *   {@linkplain SyntheticBeanDisposer destruction} function, defined by
- *   {@link SyntheticBeanBuilder};</li>
+ * {@linkplain SyntheticBeanDisposer destruction} function, defined by
+ * {@link SyntheticBeanBuilder};</li>
  * <li>a synthetic observer {@linkplain SyntheticObserver notification}
- *   function, defined by {@link SyntheticObserverBuilder}.</li>
+ * function, defined by {@link SyntheticObserverBuilder}.</li>
  * </ul>
  *
  * Parameter values are transferred from the builder to the {@code Parameters}-accepting
diff --git a/api/src/main/java/jakarta/enterprise/inject/build/compatible/spi/ScannedClasses.java b/api/src/main/java/jakarta/enterprise/inject/build/compatible/spi/ScannedClasses.java
index fcf769594..3c44069e8 100644
--- a/api/src/main/java/jakarta/enterprise/inject/build/compatible/spi/ScannedClasses.java
+++ b/api/src/main/java/jakarta/enterprise/inject/build/compatible/spi/ScannedClasses.java
@@ -26,7 +26,7 @@ public interface ScannedClasses {
      * by the container, leads to non-portable behavior.
      *
      * @param className binary name of the class, as defined by <cite>The Java&trade; Language Specification</cite>;
-     * in other words, the class name as returned by {@link Class#getName()}
+     *        in other words, the class name as returned by {@link Class#getName()}
      */
     void add(String className);
 }
diff --git a/api/src/main/java/jakarta/enterprise/inject/build/compatible/spi/SecurityActions.java b/api/src/main/java/jakarta/enterprise/inject/build/compatible/spi/SecurityActions.java
index a3edbeba5..550c8fcc0 100644
--- a/api/src/main/java/jakarta/enterprise/inject/build/compatible/spi/SecurityActions.java
+++ b/api/src/main/java/jakarta/enterprise/inject/build/compatible/spi/SecurityActions.java
@@ -26,7 +26,6 @@ private SecurityActions() {
 
     static <T> ServiceLoader<T> loadService(Class<T> service, ClassLoader classLoader) {
         return AccessController.doPrivileged(
-                (PrivilegedAction<ServiceLoader<T>>) () -> ServiceLoader.load(service, classLoader)
-        );
+                (PrivilegedAction<ServiceLoader<T>>) () -> ServiceLoader.load(service, classLoader));
     }
 }
diff --git a/api/src/main/java/jakarta/enterprise/inject/build/compatible/spi/SkipIfPortableExtensionPresent.java b/api/src/main/java/jakarta/enterprise/inject/build/compatible/spi/SkipIfPortableExtensionPresent.java
index e3207071b..10ad684fd 100644
--- a/api/src/main/java/jakarta/enterprise/inject/build/compatible/spi/SkipIfPortableExtensionPresent.java
+++ b/api/src/main/java/jakarta/enterprise/inject/build/compatible/spi/SkipIfPortableExtensionPresent.java
@@ -10,13 +10,13 @@
 
 package jakarta.enterprise.inject.build.compatible.spi;
 
-import jakarta.enterprise.inject.spi.Extension;
-
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
+import jakarta.enterprise.inject.spi.Extension;
+
 /**
  * If a {@linkplain BuildCompatibleExtension build compatible extension} is annotated
  * {@code @SkipIfPortableExtensionPresent}, it is ignored when the CDI container
diff --git a/api/src/main/java/jakarta/enterprise/inject/build/compatible/spi/StereotypeInfo.java b/api/src/main/java/jakarta/enterprise/inject/build/compatible/spi/StereotypeInfo.java
index f6c7d2166..8f923d5c1 100644
--- a/api/src/main/java/jakarta/enterprise/inject/build/compatible/spi/StereotypeInfo.java
+++ b/api/src/main/java/jakarta/enterprise/inject/build/compatible/spi/StereotypeInfo.java
@@ -10,9 +10,10 @@
 
 package jakarta.enterprise.inject.build.compatible.spi;
 
-import jakarta.enterprise.lang.model.AnnotationInfo;
 import java.util.Collection;
 
+import jakarta.enterprise.lang.model.AnnotationInfo;
+
 /**
  * A stereotype. May define {@linkplain #defaultScope() default scope},
  * a set of {@linkplain #interceptorBindings() interceptor bindings},
@@ -55,7 +56,7 @@ public interface StereotypeInfo {
      * Returns {@code null} if this stereotype is not meta-annotated {@code @Priority}.
      *
      * @return the {@link jakarta.annotation.Priority @Priority} value declared by this stereotype, or {@code null}
-     * if this stereotype is not meta-annotated {@code @Priority}
+     *         if this stereotype is not meta-annotated {@code @Priority}
      */
     Integer priority();
 
diff --git a/api/src/main/java/jakarta/enterprise/inject/build/compatible/spi/SyntheticBeanBuilder.java b/api/src/main/java/jakarta/enterprise/inject/build/compatible/spi/SyntheticBeanBuilder.java
index 8a74e44f5..74d768813 100644
--- a/api/src/main/java/jakarta/enterprise/inject/build/compatible/spi/SyntheticBeanBuilder.java
+++ b/api/src/main/java/jakarta/enterprise/inject/build/compatible/spi/SyntheticBeanBuilder.java
@@ -10,12 +10,12 @@
 
 package jakarta.enterprise.inject.build.compatible.spi;
 
+import java.lang.annotation.Annotation;
+
 import jakarta.enterprise.lang.model.AnnotationInfo;
 import jakarta.enterprise.lang.model.declarations.ClassInfo;
 import jakarta.enterprise.lang.model.types.Type;
 
-import java.lang.annotation.Annotation;
-
 /**
  * Builder for synthetic beans.
  * Instances are not reusable. For each synthetic bean, new instance
diff --git a/api/src/main/java/jakarta/enterprise/inject/build/compatible/spi/SyntheticComponents.java b/api/src/main/java/jakarta/enterprise/inject/build/compatible/spi/SyntheticComponents.java
index d6ecc44a9..3e83ab0d4 100644
--- a/api/src/main/java/jakarta/enterprise/inject/build/compatible/spi/SyntheticComponents.java
+++ b/api/src/main/java/jakarta/enterprise/inject/build/compatible/spi/SyntheticComponents.java
@@ -47,6 +47,7 @@ public interface SyntheticComponents {
      * <p>
      * This method is supposed to be called with explicitly provided type arguments. For example,
      * to define a synthetic observer of event type {@code List<String>}, one would call:
+     *
      * <pre>{@code
      * // types is of type Types
      * // syntheticComponents is of type SyntheticComponents
diff --git a/api/src/main/java/jakarta/enterprise/inject/build/compatible/spi/SyntheticObserverBuilder.java b/api/src/main/java/jakarta/enterprise/inject/build/compatible/spi/SyntheticObserverBuilder.java
index 4e2b102c6..dc7b9ce32 100644
--- a/api/src/main/java/jakarta/enterprise/inject/build/compatible/spi/SyntheticObserverBuilder.java
+++ b/api/src/main/java/jakarta/enterprise/inject/build/compatible/spi/SyntheticObserverBuilder.java
@@ -10,13 +10,13 @@
 
 package jakarta.enterprise.inject.build.compatible.spi;
 
+import java.lang.annotation.Annotation;
+
 import jakarta.enterprise.event.TransactionPhase;
 import jakarta.enterprise.lang.model.AnnotationInfo;
 import jakarta.enterprise.lang.model.declarations.ClassInfo;
 import jakarta.enterprise.lang.model.types.Type;
 
-import java.lang.annotation.Annotation;
-
 /**
  * Builder for synthetic observers.
  * Instances are not reusable. For each synthetic observer, new instance
diff --git a/api/src/main/java/jakarta/enterprise/inject/build/compatible/spi/Types.java b/api/src/main/java/jakarta/enterprise/inject/build/compatible/spi/Types.java
index c7fa26490..c497fe016 100644
--- a/api/src/main/java/jakarta/enterprise/inject/build/compatible/spi/Types.java
+++ b/api/src/main/java/jakarta/enterprise/inject/build/compatible/spi/Types.java
@@ -31,7 +31,8 @@ public interface Types {
      * For example:
      * <ul>
      * <li>{@code of(void.class)}: same as {@link #ofVoid() ofVoid}{@code ()}</li>
-     * <li>{@code of(int.class)}: same as {@link #ofPrimitive(PrimitiveType.PrimitiveKind) ofPrimitive}{@code (PrimitiveKind.INT)}</li>
+     * <li>{@code of(int.class)}: same as {@link #ofPrimitive(PrimitiveType.PrimitiveKind)
+     * ofPrimitive}{@code (PrimitiveKind.INT)}</li>
      * <li>{@code of(String.class)}: same as {@link #ofClass(ClassInfo) ofClass}{@code (... ClassInfo for String ...)}</li>
      * <li>{@code of(int[].class)}: same as {@link #ofArray(Type, int) ofArray}{@code (ofPrimitive(PrimitiveKind.INT), 1)}</li>
      * <li>{@code of(String[][].class)}: same as {@code ofArray(ofClass(... ClassInfo for String ...), 2)}</li>
@@ -100,7 +101,7 @@ public interface Types {
      * @param typeArguments one or more type arguments
      * @return the parameterized type, never {@code null}
      * @throws IllegalArgumentException if given {@code genericType} is not generic or if the number of type arguments
-     * does not match the number of type parameters declared by {@code genericType}
+     *         does not match the number of type parameters declared by {@code genericType}
      */
     ParameterizedType parameterized(Class<?> genericType, Class<?>... typeArguments);
 
@@ -113,12 +114,12 @@ public interface Types {
      * @param typeArguments one or more type arguments
      * @return the parameterized type, never {@code null}
      * @throws IllegalArgumentException if given {@code genericType} is not generic or if the number of type arguments
-     * does not match the number of type parameters declared by {@code genericType}
+     *         does not match the number of type parameters declared by {@code genericType}
      */
     ParameterizedType parameterized(Class<?> genericType, Type... typeArguments);
 
     /**
-     * Returns a  {@link ParameterizedType} for the given generic type and type arguments.
+     * Returns a {@link ParameterizedType} for the given generic type and type arguments.
      * The array of type arguments must have the same shape as the generic type's
      * list of type parameters.
      *
@@ -126,7 +127,7 @@ public interface Types {
      * @param typeArguments one or more type arguments
      * @return the parameterized type, never {@code null}
      * @throws IllegalArgumentException if given {@code genericType} is not generic or if the number of type arguments
-     * does not match the number of type parameters declared by {@code genericType}
+     *         does not match the number of type parameters declared by {@code genericType}
      */
     ParameterizedType parameterized(ClassType genericType, Type... typeArguments);
 
diff --git a/api/src/main/java/jakarta/enterprise/inject/build/compatible/spi/package-info.java b/api/src/main/java/jakarta/enterprise/inject/build/compatible/spi/package-info.java
index e6222925a..852da0990 100644
--- a/api/src/main/java/jakarta/enterprise/inject/build/compatible/spi/package-info.java
+++ b/api/src/main/java/jakarta/enterprise/inject/build/compatible/spi/package-info.java
@@ -9,7 +9,9 @@
  */
 
 /**
- * <p>The build compatible extension SPI. See:</p>
+ * <p>
+ * The build compatible extension SPI. See:
+ * </p>
  *
  * <ul>
  * <li>{@link jakarta.enterprise.inject.build.compatible.spi.BuildCompatibleExtension}</li>
diff --git a/api/src/main/java/jakarta/enterprise/inject/se/SeContainer.java b/api/src/main/java/jakarta/enterprise/inject/se/SeContainer.java
index faf9f70d6..7a16c019e 100644
--- a/api/src/main/java/jakarta/enterprise/inject/se/SeContainer.java
+++ b/api/src/main/java/jakarta/enterprise/inject/se/SeContainer.java
@@ -28,20 +28,22 @@
  * If no qualifier is passed to {@link #select} method, the <code>@Default</code> qualifier is assumed.
  * </p>
  *
- * <p>CDI Lite implementations are not required to provide support for CDI in Java SE.</p>
+ * <p>
+ * CDI Lite implementations are not required to provide support for CDI in Java SE.
+ * </p>
  *
  * @author Antoine Sabot-Durand
  * @author John D. Ament
  * @author Graeme Rocher
  * @since 2.0
  */
-public interface SeContainer extends Instance<Object>,AutoCloseable {
-
+public interface SeContainer extends Instance<Object>, AutoCloseable {
 
     /**
      * <p>
      * Shuts down this SeContainer instance when it is no longer in scope. Implemented from {@link AutoCloseable},
      * </p>
+     *
      * @throws IllegalStateException if the container is already shutdown
      */
     @Override
@@ -53,7 +55,7 @@ public interface SeContainer extends Instance<Object>,AutoCloseable {
      *
      * @return true if called before container shutdown
      */
-     boolean isRunning();
+    boolean isRunning();
 
     /**
      * Get the CDI BeanManager for this container
@@ -61,7 +63,7 @@ public interface SeContainer extends Instance<Object>,AutoCloseable {
      * @return the BeanManager
      * @throws IllegalStateException if called when the container is already shutdown
      */
-     BeanManager getBeanManager();
+    BeanManager getBeanManager();
 
     /**
      * Get the CDI {@link BeanContainer} for this container.
diff --git a/api/src/main/java/jakarta/enterprise/inject/se/SeContainerInitializer.java b/api/src/main/java/jakarta/enterprise/inject/se/SeContainerInitializer.java
index 2765cb499..9dbc27121 100644
--- a/api/src/main/java/jakarta/enterprise/inject/se/SeContainerInitializer.java
+++ b/api/src/main/java/jakarta/enterprise/inject/se/SeContainerInitializer.java
@@ -30,45 +30,45 @@
  * <p>
  * Typical usage looks like this:
  * </p>
- * 
+ *
  * <pre>
  * SeContainer container = SeContainerInitializer.newInstance().initialize();
  * container.select(Foo.class).get();
  * container.close();
  * </pre>
- * 
+ *
  * <p>
  * Since {@link SeContainer} interface implements AutoCloseable:
  * </p>
- * 
+ *
  * <pre>
  * try (SeContainer container = SeContainerInitializer.newInstance().initialize()) {
  *     container.select(Foo.class).get();
  * }
  * </pre>
- * 
+ *
  * <p>
  * 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:
  * </p>
-
+ *
  * <pre>
  * SeContainer container = SeContainerInitializer.newInstance().addBeanClasses(Foo.class, Bar.class).selectAlternatives(Bar.class).initialize());
  * </pre>
- * 
+ *
  * <p>
  * Moreover, it's also possible to disable the discovery completely so that only the "synthetic" bean archive is considered:
  * </p>
- * 
+ *
  * <pre>
  * SeContainer container = SeContainerInitializer.newInstance().disableDiscovery().addBeanClasses(Foo.class, Bar.class).initialize());
  * </pre>
-
+ *
  * <p>
  * In the same manner, it is possible to explicitly declare interceptors, decorators, extensions and implementation specific
  * options using the builder.
  * </p>
- * 
+ *
  * <pre>
  * SeContainerInitializer containerInitializer = SeContainerInitializer.newInstance()
  *         .disableDiscovery()
@@ -78,7 +78,9 @@
  * SeContainer container = container.initialize();
  * </pre>
  *
- * <p>CDI Lite implementations are not required to provide support for CDI in Java SE.</p>
+ * <p>
+ * CDI Lite implementations are not required to provide support for CDI in Java SE.
+ * </p>
  *
  * @author Antoine Sabot-Durand
  * @author Martin Kouba
@@ -101,7 +103,8 @@ public static SeContainerInitializer newInstance() {
     private static SeContainerInitializer findSeContainerInitializer() {
 
         SeContainerInitializer result;
-        Iterator<SeContainerInitializer> iterator = ServiceLoader.load(SeContainerInitializer.class, SeContainerInitializer.class.getClassLoader()).iterator();
+        Iterator<SeContainerInitializer> iterator = ServiceLoader
+                .load(SeContainerInitializer.class, SeContainerInitializer.class.getClassLoader()).iterator();
 
         if (!iterator.hasNext()) {
             throw new IllegalStateException("No valid CDI implementation found");
@@ -124,11 +127,12 @@ private static SeContainerInitializer findSeContainerInitializer() {
      */
     public abstract SeContainerInitializer 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.
      * <p>
-     * 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.
      * </p>
      * <p>
      * Scanning may also have negative impact on SE performance.
@@ -140,25 +144,27 @@ private static SeContainerInitializer findSeContainerInitializer() {
     public abstract SeContainerInitializer addPackages(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.*
      * <p>
-     * 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.
      * </p>
      * <p>
      * Scanning may also have negative impact on SE performance.
      * </p>
      *
      * @param scanRecursively should subpackages be scanned or not
-     * @param packageClasses  classes whose packages will be scanned
+     * @param packageClasses classes whose packages will be scanned
      * @return self
      */
     public abstract SeContainerInitializer addPackages(boolean scanRecursively, Class<?>... packageClasses);
 
-
     /**
      * All classes from the specified packages will be added to the set of bean classes for the synthetic bean archive.
      * <p>
-     * 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.
      * </p>
      * <p>
      * Scanning may also have negative impact on SE performance.
@@ -172,14 +178,15 @@ private static SeContainerInitializer findSeContainerInitializer() {
     /**
      * All classes from the specified packages will be added to the set of bean classes for the synthetic bean archive.
      * <p>
-     * 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.
      * </p>
      * <p>
      * Scanning may also have negative impact on SE performance.
      * </p>
      *
      * @param scanRecursively should subpackages be scanned or not
-     * @param packages        packages that will be added to the synthetic bean archive
+     * @param packages packages that will be added to the synthetic bean archive
      * @return self
      */
     public abstract SeContainerInitializer addPackages(boolean scanRecursively, Package... packages);
@@ -206,6 +213,7 @@ private static SeContainerInitializer findSeContainerInitializer() {
      * <p>
      * This method does not add any class to the set of bean classes of the synthetic bean archive.
      * </p>
+     *
      * @param interceptorClasses classes of the interceptors to enable.
      * @return self
      */
@@ -216,6 +224,7 @@ private static SeContainerInitializer findSeContainerInitializer() {
      * <p>
      * This method does not add any class to the set of bean classes of the synthetic bean archive.
      * </p>
+     *
      * @param decoratorClasses classes of the decorators to enable.
      * @return self
      */
@@ -226,6 +235,7 @@ private static SeContainerInitializer findSeContainerInitializer() {
      * <p>
      * This method does not add any class to the set of bean classes of the synthetic bean archive.
      * </p>
+     *
      * @param alternativeClasses classes of the alternatives to select
      * @return self
      */
@@ -236,16 +246,18 @@ private static SeContainerInitializer findSeContainerInitializer() {
      * <p>
      * This method does not add any class to the set of bean classes of the synthetic bean archive.
      * </p>
+     *
      * @param alternativeStereotypeClasses alternatives stereotypes to select
      * @return self
      */
     @SuppressWarnings("unchecked")
-    public abstract SeContainerInitializer selectAlternativeStereotypes(Class<? extends Annotation>... alternativeStereotypeClasses);
+    public abstract SeContainerInitializer selectAlternativeStereotypes(
+            Class<? extends Annotation>... alternativeStereotypeClasses);
 
     /**
      * Add a configuration property to the container
      *
-     * @param key   property name
+     * @param key property name
      * @param value property value
      * @return self
      */
@@ -261,14 +273,16 @@ private static SeContainerInitializer findSeContainerInitializer() {
     public abstract SeContainerInitializer setProperties(Map<String, Object> properties);
 
     /**
-     * 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
      */
     public abstract SeContainerInitializer disableDiscovery();
 
     /**
-     * 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 the class loader to use
      * @return self
diff --git a/api/src/main/java/jakarta/enterprise/inject/spi/AfterBeanDiscovery.java b/api/src/main/java/jakarta/enterprise/inject/spi/AfterBeanDiscovery.java
index c128669f9..1a94a28fb 100644
--- a/api/src/main/java/jakarta/enterprise/inject/spi/AfterBeanDiscovery.java
+++ b/api/src/main/java/jakarta/enterprise/inject/spi/AfterBeanDiscovery.java
@@ -8,7 +8,7 @@
  * You may obtain a copy of the License at
  * http://www.apache.org/licenses/LICENSE-2.0
  * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,  
+ * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
@@ -34,7 +34,7 @@
  * {@linkplain Observes observer methods} and {@linkplain jakarta.enterprise.context custom context}
  * objects with the container.
  * </p>
- * 
+ *
  * <pre>
  *     void afterBeanDiscovery(@Observes AfterBeanDiscovery event, BeanManager manager) { ... }
  * </pre>
@@ -43,8 +43,10 @@
  * error by the container.
  * </p>
  *
- * <p>CDI Lite implementations are not required to provide support for Portable Extensions.</p>
- * 
+ * <p>
+ * CDI Lite implementations are not required to provide support for Portable Extensions.
+ * </p>
+ *
  * @author David Allen
  * @author Antoine Sabot-Durand
  */
@@ -52,7 +54,7 @@ public interface AfterBeanDiscovery {
     /**
      * Registers a definition error with the container, causing the container to abort deployment after all observers have been
      * notified.
-     * 
+     *
      * @param t The definition error as a {@link java.lang.Throwable}
      * @throws IllegalStateException if called outside of the observer method invocation
      */
@@ -90,14 +92,15 @@ public interface AfterBeanDiscovery {
      * {@link ObserverMethod} and then registers the
      * {@link ObserverMethod} with the container, thereby making it available for event
      * notifications.
-     * 
+     *
      * @param observerMethod The custom observer method to add to the deployment
      * @throws IllegalStateException if called outside of the observer method invocation
      */
     public void addObserverMethod(ObserverMethod<?> observerMethod);
 
     /**
-     * obtains a new {@link ObserverMethodConfigurator} to configure a new {@link ObserverMethod} and add it at the end of the observer invocation.
+     * obtains a new {@link ObserverMethodConfigurator} to configure a new {@link ObserverMethod} and add it at the end of the
+     * observer invocation.
      * It will then fire an event of type {@link ProcessObserverMethod} containing the built
      * {@link ObserverMethod} from this configuration and then registers the
      * {@link ObserverMethod} with the container, thereby making it available for event
@@ -114,16 +117,16 @@ public interface AfterBeanDiscovery {
 
     /**
      * Registers a custom {@link Context} object with the container.
-     * 
+     *
      * @param context The custom context to add to the deployment
-     * @throws IllegalStateException if called outside of the observer method invocation                
+     * @throws IllegalStateException if called outside of the observer method invocation
      */
     public void addContext(Context context);
 
     /**
      * Obtain the {@link AnnotatedType} that may be used to read the annotations of the given class or interface as defined
      * during container initialization.
-     * 
+     *
      * @param <T> the class or interface
      * @param type the {@link java.lang.Class} object
      * @param id the type identifier. If null, the fully qualifier class name of type is used
@@ -136,7 +139,7 @@ public interface AfterBeanDiscovery {
     /**
      * Obtain the {@link AnnotatedType}s that may be used to read the annotations of the given class or interface as defined
      * during container initialization.
-     * 
+     *
      * @param <T> the class or interface
      * @param type the {@link java.lang.Class} object
      * @return the {@link AnnotatedType}s
diff --git a/api/src/main/java/jakarta/enterprise/inject/spi/AfterDeploymentValidation.java b/api/src/main/java/jakarta/enterprise/inject/spi/AfterDeploymentValidation.java
index c877457ed..9f2a56c8a 100644
--- a/api/src/main/java/jakarta/enterprise/inject/spi/AfterDeploymentValidation.java
+++ b/api/src/main/java/jakarta/enterprise/inject/spi/AfterDeploymentValidation.java
@@ -8,7 +8,7 @@
  * You may obtain a copy of the License at
  * http://www.apache.org/licenses/LICENSE-2.0
  * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,  
+ * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
@@ -25,7 +25,9 @@
  * No requests will be processed by the deployment until all observers of this event return.
  * </p>
  *
- * <p>CDI Lite implementations are not required to provide support for Portable Extensions.</p>
+ * <p>
+ * CDI Lite implementations are not required to provide support for Portable Extensions.
+ * </p>
  *
  * @author David Allen
  */
@@ -34,7 +36,7 @@ public interface AfterDeploymentValidation {
     /**
      * Registers a deployment problem with the container, causing the container to abort deployment after all observers have
      * been notified.
-     * 
+     *
      * @param t The deployment problem as a {@link java.lang.Throwable}
      * @throws IllegalStateException if called outside of the observer method invocation
      */
diff --git a/api/src/main/java/jakarta/enterprise/inject/spi/AfterTypeDiscovery.java b/api/src/main/java/jakarta/enterprise/inject/spi/AfterTypeDiscovery.java
index 4079dd21d..a74cae6c7 100644
--- a/api/src/main/java/jakarta/enterprise/inject/spi/AfterTypeDiscovery.java
+++ b/api/src/main/java/jakarta/enterprise/inject/spi/AfterTypeDiscovery.java
@@ -8,7 +8,7 @@
  * You may obtain a copy of the License at
  * http://www.apache.org/licenses/LICENSE-2.0
  * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,  
+ * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
@@ -16,9 +16,10 @@
 
 package jakarta.enterprise.inject.spi;
 
-import jakarta.enterprise.inject.spi.configurator.AnnotatedTypeConfigurator;
 import java.util.List;
 
+import jakarta.enterprise.inject.spi.configurator.AnnotatedTypeConfigurator;
+
 /**
  * <p>
  * This event type is thrown by the container after type discovery is complete. If any observer method of the
@@ -31,7 +32,9 @@
  * Changes made to these lists after the invocation of the last observer method of the {@code AfterTypeDiscovery} are ignored.
  * </p>
  *
- * <p>CDI Lite implementations are not required to provide support for Portable Extensions.</p>
+ * <p>
+ * CDI Lite implementations are not required to provide support for Portable Extensions.
+ * </p>
  *
  * @author Pete Muir
  * @author Antoine Sabot-Durand
@@ -40,19 +43,22 @@
 public interface AfterTypeDiscovery {
 
     /**
-     * @return the list of enabled alternatives for the application, sorted by priority in ascending order. Alternatives enabled for a bean archive are not included.
+     * @return the list of enabled alternatives for the application, sorted by priority in ascending order. Alternatives enabled
+     *         for a bean archive are not included.
      * @throws IllegalStateException if called outside of the observer method invocation
      */
     public List<Class<?>> getAlternatives();
 
     /**
-     * @return the list of enabled interceptors for the application, sorted by priority in ascending order. Interceptors enabled for a bean archive are not included.
+     * @return the list of enabled interceptors for the application, sorted by priority in ascending order. Interceptors enabled
+     *         for a bean archive are not included.
      * @throws IllegalStateException if called outside of the observer method invocation
      */
     public List<Class<?>> getInterceptors();
 
     /**
-     * @return the list of enabled decorators for the application, sorted by priority in ascending order. Decorators enabled for a bean archive are not included.
+     * @return the list of enabled decorators for the application, sorted by priority in ascending order. Decorators enabled for
+     *         a bean archive are not included.
      * @throws IllegalStateException if called outside of the observer method invocation
      */
     public List<Class<?>> getDecorators();
@@ -64,7 +70,8 @@ public interface AfterTypeDiscovery {
      * </p>
      *
      * <p>
-     * Thanks to the id parameter, this method allows multiple annotated types, based on the same underlying type, to be defined. {@link AnnotatedType}s
+     * Thanks to the id parameter, this method allows multiple annotated types, based on the same underlying type, to be
+     * defined. {@link AnnotatedType}s
      * discovered by the container use the fully qualified class name of {@link AnnotatedType#getJavaClass()} to identify the
      * type.
      * </p>
@@ -88,7 +95,8 @@ public interface AfterTypeDiscovery {
      * </p>
      *
      * <p>
-     * Thanks to the id parameter, this method allows multiple annotated types, based on the same underlying type, to be defined. {@link AnnotatedType}s
+     * Thanks to the id parameter, this method allows multiple annotated types, based on the same underlying type, to be
+     * defined. {@link AnnotatedType}s
      * discovered by the container use the fully qualified class name of {@link AnnotatedType#getJavaClass()} to identify the
      * type.
      * </p>
diff --git a/api/src/main/java/jakarta/enterprise/inject/spi/Annotated.java b/api/src/main/java/jakarta/enterprise/inject/spi/Annotated.java
index e0d51d70b..6fcb076f4 100644
--- a/api/src/main/java/jakarta/enterprise/inject/spi/Annotated.java
+++ b/api/src/main/java/jakarta/enterprise/inject/spi/Annotated.java
@@ -8,7 +8,7 @@
  * You may obtain a copy of the License at
  * http://www.apache.org/licenses/LICENSE-2.0
  * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,  
+ * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
@@ -25,14 +25,14 @@
  * <p>
  * Represents a Java program element that can be annotated.
  * <p>
- * 
+ *
  * @see java.lang.reflect.AnnotatedElement
- * 
+ *
  * @author Gavin King
  * @author Pete Muir
  * @author Clint Popetz
  * @author John D. Ament
- * 
+ *
  */
 public interface Annotated {
 
@@ -40,7 +40,7 @@ public interface Annotated {
      * <p>
      * Get the type of the annotated program element.
      * </p>
-     * 
+     *
      * @return the type of the annotated program element
      */
     Type getBaseType();
@@ -49,7 +49,7 @@ public interface Annotated {
      * <p>
      * Get all types to which the base type should be considered assignable.
      * </p>
-     * 
+     *
      * @return a set of all types to which the base type should be considered assignable
      */
     Set<Type> getTypeClosure();
@@ -60,7 +60,7 @@ public interface Annotated {
      *
      * The behavior of this method is intended to be the same behavior as {@link AnnotatedElement#getAnnotation(Class)},
      * where repeatable annotations are not supported.
-     *</p>
+     * </p>
      *
      * @param <T> the type of the annotation
      * @param annotationType the class of the annotation type
@@ -78,7 +78,7 @@ public interface Annotated {
      * where repeatable annotations are supported.
      * </p>
      *
-     * @param <T>            the type of the annotation
+     * @param <T> the type of the annotation
      * @param annotationType the class of the annotation type
      * @return the program element annotations of the given annotation type, or an empty collection
      */
@@ -88,7 +88,7 @@ public interface Annotated {
      * <p>
      * Get all annotations of the program element.
      * </p>
-     * 
+     *
      * @return all annotations of the program element, or an empty set if no annotations are present
      */
     Set<Annotation> getAnnotations();
@@ -101,7 +101,8 @@ public interface Annotated {
      * program element.
      *
      * @param annotationType the annotation type to check for
-     * @return <code>true</code> if the program element has an annotation of the given annotation type, or <code>false</code> otherwise
+     * @return <code>true</code> if the program element has an annotation of the given annotation type, or <code>false</code>
+     *         otherwise
      */
     boolean isAnnotationPresent(Class<? extends Annotation> annotationType);
 }
diff --git a/api/src/main/java/jakarta/enterprise/inject/spi/AnnotatedCallable.java b/api/src/main/java/jakarta/enterprise/inject/spi/AnnotatedCallable.java
index 5b5f07547..c460c37c0 100644
--- a/api/src/main/java/jakarta/enterprise/inject/spi/AnnotatedCallable.java
+++ b/api/src/main/java/jakarta/enterprise/inject/spi/AnnotatedCallable.java
@@ -8,7 +8,7 @@
  * You may obtain a copy of the License at
  * http://www.apache.org/licenses/LICENSE-2.0
  * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,  
+ * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
@@ -21,10 +21,10 @@
  * <p>
  * Represents a callable member of a Java type.
  * </p>
- * 
+ *
  * @author Gavin King
  * @author Pete Muir
- * 
+ *
  * @param <X> the declaring type
  */
 public interface AnnotatedCallable<X> extends AnnotatedMember<X> {
@@ -33,7 +33,7 @@ public interface AnnotatedCallable<X> extends AnnotatedMember<X> {
      * <p>
      * Get the parameters of the callable member.
      * </p>
-     * 
+     *
      * @return the parameters
      */
     public List<AnnotatedParameter<X>> getParameters();
diff --git a/api/src/main/java/jakarta/enterprise/inject/spi/AnnotatedConstructor.java b/api/src/main/java/jakarta/enterprise/inject/spi/AnnotatedConstructor.java
index 9d9ae5fc1..c30cf0904 100644
--- a/api/src/main/java/jakarta/enterprise/inject/spi/AnnotatedConstructor.java
+++ b/api/src/main/java/jakarta/enterprise/inject/spi/AnnotatedConstructor.java
@@ -8,7 +8,7 @@
  * You may obtain a copy of the License at
  * http://www.apache.org/licenses/LICENSE-2.0
  * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,  
+ * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
@@ -16,21 +16,21 @@
 
 package jakarta.enterprise.inject.spi;
 
+import static java.util.Arrays.asList;
+
 import java.lang.annotation.Annotation;
 import java.lang.reflect.Constructor;
 import java.util.LinkedHashSet;
 import java.util.Set;
 
-import static java.util.Arrays.asList;
-
 /**
  * <p>
  * Represents a constructor of a Java class.
  * </p>
- * 
+ *
  * @author Gavin King
  * @author Pete Muir
- * 
+ *
  * @param <X> the declaring class
  * @see Constructor
  */
@@ -40,12 +40,13 @@ public interface AnnotatedConstructor<X> extends AnnotatedCallable<X> {
      * <p>
      * Get the underlying {@link Constructor}.
      * </p>
-     * 
+     *
      * @return the constructor
      */
     public Constructor<X> getJavaMember();
 
-    @Override default <T extends Annotation> Set<T> getAnnotations(Class<T> annotationType) {
+    @Override
+    default <T extends Annotation> Set<T> getAnnotations(Class<T> annotationType) {
         T[] annotationsByType = getJavaMember().getAnnotationsByType(annotationType);
         return new LinkedHashSet<>(asList(annotationsByType));
     }
diff --git a/api/src/main/java/jakarta/enterprise/inject/spi/AnnotatedField.java b/api/src/main/java/jakarta/enterprise/inject/spi/AnnotatedField.java
index 41f1e7b2a..2287d24aa 100644
--- a/api/src/main/java/jakarta/enterprise/inject/spi/AnnotatedField.java
+++ b/api/src/main/java/jakarta/enterprise/inject/spi/AnnotatedField.java
@@ -8,28 +8,28 @@
  * You may obtain a copy of the License at
  * http://www.apache.org/licenses/LICENSE-2.0
  * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,  
+ * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
 package jakarta.enterprise.inject.spi;
 
+import static java.util.Arrays.asList;
+
 import java.lang.annotation.Annotation;
 import java.lang.reflect.Field;
 import java.util.LinkedHashSet;
 import java.util.Set;
 
-import static java.util.Arrays.asList;
-
 /**
  * <p>
  * Represents a field of a Java class.
  * </p>
- * 
+ *
  * @author Gavin King
  * @author Pete Muir
- * 
+ *
  * @param <X> the declaring type
  * @see Field
  */
@@ -39,12 +39,13 @@ public interface AnnotatedField<X> extends AnnotatedMember<X> {
      * <p>
      * Get the underlying {@link Field}.
      * </p>
-     * 
+     *
      * @return the {@link Field}
      */
     public Field getJavaMember();
 
-    @Override default <T extends Annotation> Set<T> getAnnotations(Class<T> annotationType) {
+    @Override
+    default <T extends Annotation> Set<T> getAnnotations(Class<T> annotationType) {
         T[] annotationsByType = getJavaMember().getAnnotationsByType(annotationType);
         return new LinkedHashSet<>(asList(annotationsByType));
     }
diff --git a/api/src/main/java/jakarta/enterprise/inject/spi/AnnotatedMember.java b/api/src/main/java/jakarta/enterprise/inject/spi/AnnotatedMember.java
index ceffb59bd..4e15e5aef 100644
--- a/api/src/main/java/jakarta/enterprise/inject/spi/AnnotatedMember.java
+++ b/api/src/main/java/jakarta/enterprise/inject/spi/AnnotatedMember.java
@@ -8,7 +8,7 @@
  * You may obtain a copy of the License at
  * http://www.apache.org/licenses/LICENSE-2.0
  * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,  
+ * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
@@ -22,10 +22,10 @@
  * <p>
  * Represents a member of a Java type.
  * </p>
- * 
+ *
  * @author Gavin King
  * @author Pete Muir
- * 
+ *
  * @param <X> the declaring type
  * @see Member
  */
@@ -34,7 +34,7 @@ public interface AnnotatedMember<X> extends Annotated {
      * <p>
      * Get the underlying {@link Member}.
      * </p>
-     * 
+     *
      * @return the {@link Member}
      */
     public Member getJavaMember();
@@ -43,7 +43,7 @@ public interface AnnotatedMember<X> extends Annotated {
      * <p>
      * Determines if the member is static.
      * </p>
-     * 
+     *
      * @return <code>true</code> if the member is static
      */
     public boolean isStatic();
@@ -52,7 +52,7 @@ public interface AnnotatedMember<X> extends Annotated {
      * <p>
      * Get the {@linkplain AnnotatedType type} which defines this member.
      * </p>
-     * 
+     *
      * @return the type which defines this member
      */
     public AnnotatedType<X> getDeclaringType();
diff --git a/api/src/main/java/jakarta/enterprise/inject/spi/AnnotatedMethod.java b/api/src/main/java/jakarta/enterprise/inject/spi/AnnotatedMethod.java
index 38f5f104c..9d6a9167c 100644
--- a/api/src/main/java/jakarta/enterprise/inject/spi/AnnotatedMethod.java
+++ b/api/src/main/java/jakarta/enterprise/inject/spi/AnnotatedMethod.java
@@ -8,28 +8,28 @@
  * You may obtain a copy of the License at
  * http://www.apache.org/licenses/LICENSE-2.0
  * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,  
+ * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
 package jakarta.enterprise.inject.spi;
 
+import static java.util.Arrays.asList;
+
 import java.lang.annotation.Annotation;
 import java.lang.reflect.Method;
 import java.util.LinkedHashSet;
 import java.util.Set;
 
-import static java.util.Arrays.asList;
-
 /**
  * <p>
  * Represents a method of a Java type.
  * </p>
- * 
+ *
  * @author Gavin King
  * @author Pete Muir
- * 
+ *
  * @param <X> the declaring type
  * @see Method
  */
@@ -39,12 +39,13 @@ public interface AnnotatedMethod<X> extends AnnotatedCallable<X> {
      * <p>
      * Get the underlying {@link Method}.
      * </p>
-     * 
+     *
      * @return the {@link Method}
      */
     public Method getJavaMember();
 
-    @Override default <T extends Annotation> Set<T> getAnnotations(Class<T> annotationType) {
+    @Override
+    default <T extends Annotation> Set<T> getAnnotations(Class<T> annotationType) {
         T[] annotationsByType = getJavaMember().getAnnotationsByType(annotationType);
         return new LinkedHashSet<>(asList(annotationsByType));
     }
diff --git a/api/src/main/java/jakarta/enterprise/inject/spi/AnnotatedParameter.java b/api/src/main/java/jakarta/enterprise/inject/spi/AnnotatedParameter.java
index 71a517a50..faab95478 100644
--- a/api/src/main/java/jakarta/enterprise/inject/spi/AnnotatedParameter.java
+++ b/api/src/main/java/jakarta/enterprise/inject/spi/AnnotatedParameter.java
@@ -8,7 +8,7 @@
  * You may obtain a copy of the License at
  * http://www.apache.org/licenses/LICENSE-2.0
  * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,  
+ * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
@@ -16,6 +16,8 @@
 
 package jakarta.enterprise.inject.spi;
 
+import static java.util.Arrays.asList;
+
 import java.lang.annotation.Annotation;
 import java.lang.reflect.Executable;
 import java.lang.reflect.Member;
@@ -23,17 +25,15 @@
 import java.util.LinkedHashSet;
 import java.util.Set;
 
-import static java.util.Arrays.asList;
-
 /**
  * <p>
  * Represents a parameter of a method or constructor.
  * </p>
- * 
+ *
  * @author Gavin King
  * @author Pete Muir
  * @author Jozef Hartinger
- * 
+ *
  * @param <X> the type that declares the method or constructor
  */
 public interface AnnotatedParameter<X> extends Annotated {
@@ -42,7 +42,7 @@ public interface AnnotatedParameter<X> extends Annotated {
      * <p>
      * Get the position of the parameter in the method or constructor argument list.
      * </p>
-     * 
+     *
      * @return the position of the parameter
      */
     public int getPosition();
@@ -51,7 +51,7 @@ public interface AnnotatedParameter<X> extends Annotated {
      * <p>
      * Get the declaring {@linkplain AnnotatedCallable method or constructor}.
      * </p>
-     * 
+     *
      * @return the declaring callable
      */
     public AnnotatedCallable<X> getDeclaringCallable();
@@ -70,7 +70,8 @@ default Parameter getJavaParameter() {
         return executable.getParameters()[getPosition()];
     }
 
-    @Override default <T extends Annotation> Set<T> getAnnotations(Class<T> annotationType) {
+    @Override
+    default <T extends Annotation> Set<T> getAnnotations(Class<T> annotationType) {
         T[] annotationsByType = getJavaParameter().getAnnotationsByType(annotationType);
         return new LinkedHashSet<>(asList(annotationsByType));
     }
diff --git a/api/src/main/java/jakarta/enterprise/inject/spi/AnnotatedType.java b/api/src/main/java/jakarta/enterprise/inject/spi/AnnotatedType.java
index a77023497..e41b8fd15 100644
--- a/api/src/main/java/jakarta/enterprise/inject/spi/AnnotatedType.java
+++ b/api/src/main/java/jakarta/enterprise/inject/spi/AnnotatedType.java
@@ -8,7 +8,7 @@
  * You may obtain a copy of the License at
  * http://www.apache.org/licenses/LICENSE-2.0
  * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,  
+ * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
@@ -16,20 +16,20 @@
 
 package jakarta.enterprise.inject.spi;
 
+import static java.util.Arrays.asList;
+
 import java.lang.annotation.Annotation;
 import java.util.LinkedHashSet;
 import java.util.Set;
 
-import static java.util.Arrays.asList;
-
 /**
  * <p>
  * Represents a Java class or interface.
  * </p>
- * 
+ *
  * @author Gavin King
  * @author Pete Muir
- * 
+ *
  * @param <X> the type
  * @see java.lang.Class
  */
@@ -39,7 +39,7 @@ public interface AnnotatedType<X> extends Annotated {
      * <p>
      * Get the underlying {@link java.lang.Class}.
      * </p>
-     * 
+     *
      * @return the {@link java.lang.Class}
      */
     public Class<X> getJavaClass();
@@ -49,7 +49,7 @@ public interface AnnotatedType<X> extends Annotated {
      * Get the {@linkplain AnnotatedConstructor constructors} of the type. If an empty set is returned, a default constructor
      * with no parameters will be assumed.
      * </p>
-     * 
+     *
      * @return the constructors, or an empty set if none are defined
      */
     public Set<AnnotatedConstructor<X>> getConstructors();
@@ -58,7 +58,7 @@ public interface AnnotatedType<X> extends Annotated {
      * <p>
      * Get the {@linkplain AnnotatedMethod methods} of the type.
      * </p>
-     * 
+     *
      * @return the methods, or an empty set if none are defined
      */
     public Set<AnnotatedMethod<? super X>> getMethods();
@@ -67,12 +67,13 @@ public interface AnnotatedType<X> extends Annotated {
      * <p>
      * Get the {@linkplain AnnotatedField fields} of the type.
      * <p>
-     * 
+     *
      * @return the fields, or an empty set if none are defined
      */
     public Set<AnnotatedField<? super X>> getFields();
 
-    @Override default <T extends Annotation> Set<T> getAnnotations(Class<T> annotationType) {
+    @Override
+    default <T extends Annotation> Set<T> getAnnotations(Class<T> annotationType) {
         T[] annotationsByType = getJavaClass().getAnnotationsByType(annotationType);
         return new LinkedHashSet<>(asList(annotationsByType));
     }
diff --git a/api/src/main/java/jakarta/enterprise/inject/spi/Bean.java b/api/src/main/java/jakarta/enterprise/inject/spi/Bean.java
index e400ee75f..59bca2ef9 100644
--- a/api/src/main/java/jakarta/enterprise/inject/spi/Bean.java
+++ b/api/src/main/java/jakarta/enterprise/inject/spi/Bean.java
@@ -8,7 +8,7 @@
  * You may obtain a copy of the License at
  * http://www.apache.org/licenses/LICENSE-2.0
  * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,  
+ * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
@@ -19,14 +19,13 @@
 import java.util.Set;
 
 import jakarta.enterprise.context.spi.Contextual;
-import jakarta.enterprise.context.spi.CreationalContext;
 
 /**
  * <p>
  * Represents an {@linkplain jakarta.enterprise.inject enabled bean}. This interface defines everything the container needs to
  * manage instances of the bean.
  * </p>
- * 
+ *
  * @author Gavin King
  * @author David Allen
  * @param <T> the class of the bean instance
@@ -36,7 +35,7 @@ public interface Bean<T> extends Contextual<T>, BeanAttributes<T> {
     /**
      * The bean {@linkplain Class class} of the managed bean or session bean or of the bean that declares the producer method or
      * field.
-     * 
+     *
      * @return the bean {@linkplain Class class}
      */
     public Class<?> getBeanClass();
@@ -44,7 +43,7 @@ public interface Bean<T> extends Contextual<T>, BeanAttributes<T> {
     /**
      * Obtains the {@link InjectionPoint} objects representing injection points of the bean, that
      * will be validated by the container at initialization time.
-     * 
+     *
      * @return the set of {@linkplain InjectionPoint injection points} of the bean
      */
     public Set<InjectionPoint> getInjectionPoints();
diff --git a/api/src/main/java/jakarta/enterprise/inject/spi/BeanAttributes.java b/api/src/main/java/jakarta/enterprise/inject/spi/BeanAttributes.java
index 318c2addb..cfd06ce0c 100644
--- a/api/src/main/java/jakarta/enterprise/inject/spi/BeanAttributes.java
+++ b/api/src/main/java/jakarta/enterprise/inject/spi/BeanAttributes.java
@@ -8,7 +8,7 @@
  * You may obtain a copy of the License at
  * http://www.apache.org/licenses/LICENSE-2.0
  * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,  
+ * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
@@ -25,7 +25,7 @@
 
 /**
  * The BeanAttributes interface exposes the basic attributes of a bean.
- * 
+ *
  * @author Pete Muir
  * @since 1.1
  * @param <T> the class of the bean instance
@@ -34,35 +34,35 @@ public interface BeanAttributes<T> {
 
     /**
      * Obtains the {@linkplain jakarta.enterprise.inject bean types} of the bean.
-     * 
+     *
      * @return the {@linkplain jakarta.enterprise.inject bean types}
      */
     public Set<Type> getTypes();
 
     /**
      * Obtains the {@linkplain jakarta.inject.Qualifier qualifiers} of the bean.
-     * 
+     *
      * @return the {@linkplain jakarta.inject.Qualifier qualifiers}
      */
     public Set<Annotation> getQualifiers();
 
     /**
      * Obtains the {@linkplain jakarta.enterprise.context scope} of the bean.
-     * 
+     *
      * @return the {@linkplain jakarta.enterprise.context scope}
      */
     public Class<? extends Annotation> getScope();
 
     /**
      * Obtains the {@linkplain jakarta.enterprise.inject EL name} of a bean, if it has one.
-     * 
+     *
      * @return the {@linkplain jakarta.enterprise.inject EL name}
      */
     public String getName();
 
     /**
      * Obtains the {@linkplain Stereotype stereotypes} of the bean.
-     * 
+     *
      * @return the set of {@linkplain Stereotype stereotypes}
      */
     public Set<Class<? extends Annotation>> getStereotypes();
diff --git a/api/src/main/java/jakarta/enterprise/inject/spi/BeanContainer.java b/api/src/main/java/jakarta/enterprise/inject/spi/BeanContainer.java
index cf6b0bdc3..869a2017a 100644
--- a/api/src/main/java/jakarta/enterprise/inject/spi/BeanContainer.java
+++ b/api/src/main/java/jakarta/enterprise/inject/spi/BeanContainer.java
@@ -1,5 +1,11 @@
 package jakarta.enterprise.inject.spi;
 
+import java.lang.annotation.Annotation;
+import java.lang.reflect.Type;
+import java.util.Collection;
+import java.util.List;
+import java.util.Set;
+
 import jakarta.enterprise.context.ContextNotActiveException;
 import jakarta.enterprise.context.Dependent;
 import jakarta.enterprise.context.spi.Context;
@@ -11,12 +17,6 @@
 import jakarta.enterprise.inject.Instance;
 import jakarta.enterprise.inject.Stereotype;
 
-import java.lang.annotation.Annotation;
-import java.lang.reflect.Type;
-import java.util.Collection;
-import java.util.List;
-import java.util.Set;
-
 /**
  * <p>
  * {@code BeanContainer} is a superclass of {@link BeanManager} containing capabilities that are portable across
@@ -47,14 +47,14 @@ public interface BeanContainer {
      * Obtains a contextual reference for a certain {@linkplain Bean bean} and a certain bean type of the bean.
      * </p>
      *
-     * @param bean     the {@link Bean} object representing the bean
+     * @param bean the {@link Bean} object representing the bean
      * @param beanType a bean type that must be implemented by any client proxy that is returned
-     * @param ctx      a {@link CreationalContext} that may be used to destroy any object with scope
-     *                 {@link Dependent} that is created
+     * @param ctx a {@link CreationalContext} that may be used to destroy any object with scope
+     *        {@link Dependent} that is created
      * @return a contextual reference representing the bean
      * @throws IllegalArgumentException if the given type is not a bean type of the given bean
-     * @throws IllegalStateException    if called during application initialization, before the {@link AfterDeploymentValidation}
-     *                                  event is fired.
+     * @throws IllegalStateException if called during application initialization, before the {@link AfterDeploymentValidation}
+     *         event is fired.
      */
     Object getReference(Bean<?> bean, Type beanType, CreationalContext<?> ctx);
 
@@ -62,9 +62,9 @@ public interface BeanContainer {
      * Obtain an instance of a {@link CreationalContext} for the given
      * {@linkplain Contextual contextual type}, or for a non-contextual object.
      *
-     * @param <T>        type of the instance
+     * @param <T> type of the instance
      * @param contextual the {@link Contextual}, or a null value in the case of a non-contextual
-     *                   object
+     *        object
      * @return the new {@link CreationalContext}
      */
     <T> CreationalContext<T> createCreationalContext(Contextual<T> contextual);
@@ -79,14 +79,14 @@ public interface BeanContainer {
      * Note that when called during invocation of an {@link AfterBeanDiscovery} event observer,
      * this method will only return beans discovered by the container before the {@link AfterBeanDiscovery} event is fired.
      *
-     * @param beanType   the required bean type
+     * @param beanType the required bean type
      * @param qualifiers the required qualifiers
      * @return the resulting set of {@linkplain Bean beans}
      * @throws IllegalArgumentException if the given type represents a type variable
      * @throws IllegalArgumentException if two instances of the same non repeating qualifier type are given
      * @throws IllegalArgumentException if an instance of an annotation that is not a qualifier type is given
-     * @throws IllegalStateException    if called during application initialization, before the {@link AfterBeanDiscovery}
-     *                                  event is fired.
+     * @throws IllegalStateException if called during application initialization, before the {@link AfterBeanDiscovery}
+     *         event is fired.
      */
     Set<Bean<?>> getBeans(Type beanType, Annotation... qualifiers);
 
@@ -102,7 +102,7 @@ public interface BeanContainer {
      * @param name the EL name
      * @return the resulting set of {@linkplain Bean beans}
      * @throws IllegalStateException if called during application initialization, before the {@link AfterBeanDiscovery}
-     *                               event is fired.
+     *         event is fired.
      */
     Set<Bean<?>> getBeans(String name);
 
@@ -112,12 +112,12 @@ public interface BeanContainer {
      * Note that when called during invocation of an {@link AfterBeanDiscovery} event observer,
      * this method will only return beans discovered by the container before the {@link AfterBeanDiscovery} event is fired.
      *
-     * @param <X>   a common type of the beans
+     * @param <X> a common type of the beans
      * @param beans a set of {@linkplain Bean beans} of the given type
      * @return the resolved bean, or null if null or an empty set is passed
      * @throws AmbiguousResolutionException if the ambiguous dependency resolution rules fail
-     * @throws IllegalStateException        if called during application initialization, before the {@link AfterBeanDiscovery}
-     *                                      event is fired.
+     * @throws IllegalStateException if called during application initialization, before the {@link AfterBeanDiscovery}
+     *         event is fired.
      */
     <X> Bean<? extends X> resolve(Set<Bean<? extends X>> beans);
 
@@ -127,15 +127,15 @@ public interface BeanContainer {
      * Note that when called during invocation of an {@link AfterBeanDiscovery} event observer,
      * this method will only return observers discovered by the container before the {@link AfterBeanDiscovery} event is fired.
      *
-     * @param <T>        the type of the event
-     * @param event      the event object
+     * @param <T> the type of the event
+     * @param event the event object
      * @param qualifiers the event qualifiers
      * @return the resulting set of {@linkplain ObserverMethod observer methods}
      * @throws IllegalArgumentException if the runtime type of the event object contains a type variable
      * @throws IllegalArgumentException if two instances of the same non repeating qualifier type are given
      * @throws IllegalArgumentException if an instance of an annotation that is not a qualifier type is given
-     * @throws IllegalStateException    if called during application initialization, before the {@link AfterBeanDiscovery}
-     *                                  event is fired.
+     * @throws IllegalStateException if called during application initialization, before the {@link AfterBeanDiscovery}
+     *         event is fired.
      */
     <T> Set<ObserverMethod<? super T>> resolveObserverMethods(T event, Annotation... qualifiers);
 
@@ -150,14 +150,14 @@ public interface BeanContainer {
      * this method will only return interceptors discovered by the container before the {@link AfterBeanDiscovery} event is
      * fired.
      *
-     * @param type                the type of the interception
+     * @param type the type of the interception
      * @param interceptorBindings the interceptor bindings
      * @return the resulting set of {@linkplain Interceptor interceptors}
      * @throws IllegalArgumentException if no interceptor binding type is given
      * @throws IllegalArgumentException if two instances of the same interceptor binding type are given
      * @throws IllegalArgumentException if an instance of an annotation that is not an interceptor binding type is given
-     * @throws IllegalStateException    if called during application initialization, before the {@link AfterBeanDiscovery}
-     *                                  event is fired.
+     * @throws IllegalStateException if called during application initialization, before the {@link AfterBeanDiscovery}
+     *         event is fired.
      */
     List<Interceptor<?>> resolveInterceptors(InterceptionType type, Annotation... interceptorBindings);
 
@@ -198,8 +198,9 @@ public interface BeanContainer {
      * binding type} .
      *
      * @param annotationType the annotation to test
-     * @return <code>true</code> if the annotation type is a {@linkplain jakarta.interceptor.InterceptorBinding interceptor binding
-     * type}
+     * @return <code>true</code> if the annotation type is a {@linkplain jakarta.interceptor.InterceptorBinding interceptor
+     *         binding
+     *         type}
      */
     boolean isInterceptorBinding(Class<? extends Annotation> annotationType);
 
@@ -210,7 +211,7 @@ public interface BeanContainer {
      * @param scopeType the {@linkplain jakarta.enterprise.context scope}
      * @return the {@linkplain Context context object}
      * @throws ContextNotActiveException if there is no active context object for the given scope
-     * @throws IllegalArgumentException  if there is more than one active context object for the given scope
+     * @throws IllegalArgumentException if there is more than one active context object for the given scope
      */
     Context getContext(Class<? extends Annotation> scopeType);
 
@@ -224,7 +225,8 @@ public interface BeanContainer {
     Collection<Context> getContexts(Class<? extends Annotation> scopeType);
 
     /**
-     * Returns an instance of Event with specified type <code>java.lang.Object</code> and specified qualifier <code>@Default</code>
+     * Returns an instance of Event with specified type <code>java.lang.Object</code> and specified qualifier
+     * <code>@Default</code>
      * It allows typesafe synchronous or asynchronous event firing without injection of {@link Event} built-in bean requirement.
      *
      * @return a new {@link Event} object whose event type is <code>Object</code> and qualifier <code>@Default</code>
@@ -232,22 +234,23 @@ public interface BeanContainer {
      */
     Event<Object> getEvent();
 
-
     /**
      * Obtains an {@link Instance} object to access to beans instances.
      * <p>
-     * The returned <code>Instance</code> object can only access instances of  beans that are available for injection in the module
+     * The returned <code>Instance</code> object can only access instances of beans that are available for injection in the
+     * module
      * or library containing the class into which the <code>BeanManager</code>/<code>BeanContainer</code> was injected
      * or, in the Jakarta EE environment, the Jakarta EE component from whose JNDI environment namespace the
      * <code>BeanContainer</code> was obtained, according to the rules of typesafe resolution.
      * <p>
-     * Instances of dependent scoped beans obtained with this <code>Instance</code> must be explicitly destroyed by calling {@link Instance#destroy(Object)}
+     * Instances of dependent scoped beans obtained with this <code>Instance</code> must be explicitly destroyed by calling
+     * {@link Instance#destroy(Object)}
      * <p>
      * If no qualifier is passed to {@link Instance#select} method, the <code>@Default</code> qualifier is assumed.
      *
      * @return an {@link Instance} object to request beans instances
      * @throws IllegalStateException if called during application initialization, before the {@link AfterDeploymentValidation}
-     *                               event is fired.
+     *         event is fired.
      * @since 2.0
      */
     Instance<Object> createInstance();
diff --git a/api/src/main/java/jakarta/enterprise/inject/spi/BeanManager.java b/api/src/main/java/jakarta/enterprise/inject/spi/BeanManager.java
index 47abcabcd..c4e2aff54 100644
--- a/api/src/main/java/jakarta/enterprise/inject/spi/BeanManager.java
+++ b/api/src/main/java/jakarta/enterprise/inject/spi/BeanManager.java
@@ -8,7 +8,7 @@
  * You may obtain a copy of the License at
  * http://www.apache.org/licenses/LICENSE-2.0
  * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,  
+ * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
@@ -16,20 +16,20 @@
 
 package jakarta.enterprise.inject.spi;
 
+import java.lang.annotation.Annotation;
+import java.lang.reflect.Type;
+import java.util.List;
+import java.util.Set;
+
 import jakarta.el.ELResolver;
 import jakarta.el.ExpressionFactory;
 import jakarta.enterprise.context.Dependent;
 import jakarta.enterprise.context.spi.CreationalContext;
 import jakarta.enterprise.inject.AmbiguousResolutionException;
 import jakarta.enterprise.inject.InjectionException;
+import jakarta.enterprise.inject.Stereotype;
 import jakarta.enterprise.inject.UnsatisfiedResolutionException;
 import jakarta.enterprise.util.Nonbinding;
-import java.lang.annotation.Annotation;
-import java.lang.reflect.Type;
-import java.util.List;
-import java.util.Set;
-
-import jakarta.enterprise.inject.Stereotype;
 
 /**
  * <p>
@@ -41,49 +41,50 @@
  * In CDI Lite environment, applications may obtain a {@code BeanManager}, but invoking methods that are not inherited
  * from {@link BeanContainer} results in non-portable behavior.
  * </p>
- * 
+ *
  * <p>
  * Any bean may obtain an instance of <code>BeanManager</code> by injecting it:
  * </p>
- * 
+ *
  * <pre>
  * &#064;Inject
  * BeanManager manager;
  * </pre>
- * 
+ *
  * <p>
- * Java EE components may obtain an instance of <code>BeanManager</code> from {@linkplain javax.naming JNDI} by looking up the name
+ * Java EE components may obtain an instance of <code>BeanManager</code> from {@linkplain javax.naming JNDI} by looking up the
+ * name
  * {@code java:comp/BeanManager}.
  * </p>
- * 
+ *
  * <p>
  * Most operations of BeanManager may be called at any time during the execution of the application.
  * </p>
- * <p>    
- * However, the following  operations must not be called before the {@link AfterBeanDiscovery} event is fired:
+ * <p>
+ * However, the following operations must not be called before the {@link AfterBeanDiscovery} event is fired:
  * </p>
  * <ul>
- *     <li>{@link #getBeans(String)},</li>
- *     <li>{@link #getBeans(java.lang.reflect.Type, java.lang.annotation.Annotation...)},</li>
- *     <li>{@link #getPassivationCapableBean(String)},</li>
- *     <li>{@link #resolve(java.util.Set)},</li>
- *     <li>{@link #resolveDecorators(java.util.Set, java.lang.annotation.Annotation...)},</li>
- *     <li>{@link #resolveInterceptors(InterceptionType, java.lang.annotation.Annotation...)},</li>
- *     <li>{@link #resolveObserverMethods(Object, java.lang.annotation.Annotation...)},</li>
- *     <li>{@link #validate(InjectionPoint)},</li>
+ * <li>{@link #getBeans(String)},</li>
+ * <li>{@link #getBeans(java.lang.reflect.Type, java.lang.annotation.Annotation...)},</li>
+ * <li>{@link #getPassivationCapableBean(String)},</li>
+ * <li>{@link #resolve(java.util.Set)},</li>
+ * <li>{@link #resolveDecorators(java.util.Set, java.lang.annotation.Annotation...)},</li>
+ * <li>{@link #resolveInterceptors(InterceptionType, java.lang.annotation.Annotation...)},</li>
+ * <li>{@link #resolveObserverMethods(Object, java.lang.annotation.Annotation...)},</li>
+ * <li>{@link #validate(InjectionPoint)},</li>
  * </ul>
  * <p>
  * and the following operations must not be called before the {@link AfterDeploymentValidation} event is fired:
  * </p>
  * <ul>
- *     <li>{@link #createInstance()}</li>
- *     <li>{@link #getReference(Bean, java.lang.reflect.Type, CreationalContext)},</li>
- *     <li>{@link #getInjectableReference(InjectionPoint, CreationalContext)},</li>
+ * <li>{@link #createInstance()}</li>
+ * <li>{@link #getReference(Bean, java.lang.reflect.Type, CreationalContext)},</li>
+ * <li>{@link #getInjectableReference(InjectionPoint, CreationalContext)},</li>
  * </ul>
  * <p>
  * or the container will throw an Exception.
  * </p>
- * 
+ *
  * @author Gavin King
  * @author Pete Muir
  * @author Clint Popetz
@@ -97,23 +98,23 @@ public interface BeanManager extends BeanContainer {
      * Obtains an injectable reference for a certain {@linkplain InjectionPoint injection point}.
      * </p>
      *
-     * @param ij  the target injection point
+     * @param ij the target injection point
      * @param ctx a {@link CreationalContext} that may be used to destroy any object with scope
-     *            {@link Dependent} that is created
+     *        {@link Dependent} that is created
      * @return the injectable reference
      * @throws UnsatisfiedResolutionException if typesafe resolution results in an unsatisfied dependency
-     * @throws AmbiguousResolutionException   typesafe resolution results in an unresolvable ambiguous dependency
-     * @throws IllegalStateException          if called during application initialization, before the {@link AfterDeploymentValidation}
-     *                                        event is fired.
+     * @throws AmbiguousResolutionException typesafe resolution results in an unresolvable ambiguous dependency
+     * @throws IllegalStateException if called during application initialization, before the {@link AfterDeploymentValidation}
+     *         event is fired.
      */
     Object getInjectableReference(InjectionPoint ij, CreationalContext<?> ctx);
 
     /**
      * Returns the {@link PassivationCapable} bean with the given identifier.
      *
-     * Note that when called during invocation of an {@link AfterBeanDiscovery} event observer, 
+     * Note that when called during invocation of an {@link AfterBeanDiscovery} event observer,
      * this method will only return beans discovered by the container before the {@link AfterBeanDiscovery} event is fired.
-     * 
+     *
      * @param id the identifier
      * @return a {@link Bean} that implements {@link PassivationCapable} and has the given
      *         identifier, or a null value if there is no such bean
@@ -126,9 +127,9 @@ public interface BeanManager extends BeanContainer {
      * Validate a certain {@linkplain InjectionPoint injection point}.
      *
      * Note that when called during invocation of an {@link AfterBeanDiscovery} event observer,
-     * this method will only validate injection points discovered by the container before the {@link AfterBeanDiscovery} 
+     * this method will only validate injection points discovered by the container before the {@link AfterBeanDiscovery}
      * event is fired.
-     * 
+     *
      * @param injectionPoint the {@linkplain InjectionPoint injection point} to validate
      * @throws InjectionException if there is a deployment problem (for example, an unsatisfied or unresolvable ambiguous
      *         dependency) associated with the injection point
@@ -144,7 +145,7 @@ public interface BeanManager extends BeanContainer {
      *
      * Note that when called during invocation of an {@link AfterBeanDiscovery} event observer,
      * this method will only return decorators discovered by the container before the {@link AfterBeanDiscovery} event is fired.
-     * 
+     *
      * @param types the set of bean types of the decorated bean
      * @param qualifiers the qualifiers declared by the decorated bean
      * @return the resulting set of {@linkplain Decorator decorators}
@@ -158,7 +159,7 @@ public interface BeanManager extends BeanContainer {
 
     /**
      * Test the given annotation type to determine if it is a passivating {@linkplain jakarta.enterprise.context scope type}.
-     * 
+     *
      * @param annotationType the annotation type
      * @return <code>true</code> if the annotation type is a passivating scope type
      */
@@ -167,7 +168,7 @@ public interface BeanManager extends BeanContainer {
     /**
      * Obtains the set of meta-annotations for a certain {@linkplain jakarta.interceptor.InterceptorBinding interceptor binding
      * type} .
-     * 
+     *
      * @param bindingType the {@linkplain jakarta.interceptor.InterceptorBinding interceptor binding type}
      * @return the set of meta-annotations
      */
@@ -175,7 +176,7 @@ public interface BeanManager extends BeanContainer {
 
     /**
      * Obtains meta-annotations for a certain {@linkplain Stereotype stereotype}.
-     * 
+     *
      * @param stereotype the {@linkplain Stereotype stereotype}
      * @return the set of meta-annotations
      */
@@ -184,7 +185,7 @@ public interface BeanManager extends BeanContainer {
     /**
      * Determine if two qualifiers are considered equivalent for the purposes of typesafe resolution, taking into account any
      * members annotated with {@link Nonbinding}.
-     * 
+     *
      * @param qualifier1 a qualifier to check
      * @param qualifier2 a qualifier to check
      * @return true if the two qualifiers are equivalent, otherwise false
@@ -195,7 +196,7 @@ public interface BeanManager extends BeanContainer {
     /**
      * Determine if two interceptor bindings are considered equivalent for the purposes of typesafe resolution, taking into
      * account any members annotated with {@link Nonbinding}.
-     * 
+     *
      * @param interceptorBinding1 an interceptor binding to check
      * @param interceptorBinding2 an interceptor binding to check
      * @return true if the two interceptor bindings are equivalent, otherwise false
@@ -206,7 +207,7 @@ public interface BeanManager extends BeanContainer {
     /**
      * Determine the hash code of a qualifier, using the JDK algorithm for determining an annotation hash code, ignoring any
      * members annotated with {@link Nonbinding}.
-     * 
+     *
      * @param qualifier the qualifier to consider
      * @return the hashCode for the qualifier
      * @since 1.1
@@ -216,7 +217,7 @@ public interface BeanManager extends BeanContainer {
     /**
      * Determine the hash code of an interceptor binding, using the JDK algorithm for determining an annotation hash code,
      * ignoring any members annotated with {@link Nonbinding}.
-     * 
+     *
      * @param interceptorBinding the interceptor binding to consider
      * @return the hashCode for the interceptor binding
      * @since 1.1
@@ -234,11 +235,12 @@ public interface BeanManager extends BeanContainer {
 
     /**
      * Returns a wrapper {@link jakarta.el.ExpressionFactory} that delegates {@link jakarta.el.MethodExpression} and
-     * {@link jakarta.el.ValueExpression} creation to the given {@link jakarta.el.ExpressionFactory}. When a Unified EL expression
+     * {@link jakarta.el.ValueExpression} creation to the given {@link jakarta.el.ExpressionFactory}. When a Unified EL
+     * expression
      * is evaluated using a {@link jakarta.el.MethodExpression} or {@link jakarta.el.ValueExpression} returned by the wrapper
      * {@link jakarta.el.ExpressionFactory}, the container handles destruction of objects with scope
      * {@link Dependent}.
-     * 
+     *
      * @deprecated use {@code ELAwareBeanManager}, this method will be removed in CDI 5.0
      * @param expressionFactory the {@link jakarta.el.ExpressionFactory} to wrap
      * @return the wrapped {@link jakarta.el.ExpressionFactory}
@@ -248,7 +250,7 @@ public interface BeanManager extends BeanContainer {
 
     /**
      * Obtain an {@link AnnotatedType} that may be used to read the annotations of the given class or interface.
-     * 
+     *
      * @param <T> the class or interface
      * @param type the {@link java.lang.Class} object
      * @return the {@link AnnotatedType}
@@ -259,7 +261,7 @@ public interface BeanManager extends BeanContainer {
      * <p>
      * An implementation of {@link InjectionTargetFactory} that provides container created {@link InjectionTarget} instances.
      * </p>
-     * 
+     *
      * <p>
      * This factory can be wrapped to add behavior to container created injection targets.
      * </p>
@@ -276,7 +278,7 @@ public interface BeanManager extends BeanContainer {
      * An implementation of {@link ProducerFactory} that provides container created {@link Producer} instances for the given
      * field.
      * </p>
-     * 
+     *
      * <p>
      * This factory can be wrapped to add behavior to container created producers.
      * </p>
@@ -295,7 +297,7 @@ public interface BeanManager extends BeanContainer {
      * An implementation of {@link ProducerFactory} that provides container created {@link Producer} instances for the given
      * method.
      * </p>
-     * 
+     *
      * <p>
      * This factory can be wrapped to add behavior to container created producers.
      * </p>
@@ -313,7 +315,7 @@ public interface BeanManager extends BeanContainer {
      * Obtains a {@link BeanAttributes} for the given {@link AnnotatedType}. The container ignores the annotations and types
      * declared by the elements of the actual Java class and uses the metadata provided via the {@link Annotated} interface
      * instead.
-     * 
+     *
      * @param <T> the type
      * @param type the {@link AnnotatedType}
      * @return a container provided implementation of {@link InjectionTarget}
@@ -325,7 +327,7 @@ public interface BeanManager extends BeanContainer {
      * Obtains a {@link BeanAttributes} for the given {@link AnnotatedType}. The container ignores the annotations and types
      * declared by the elements of the actual Java class and uses the metadata provided via the {@link Annotated} interface
      * instead.
-     * 
+     *
      * @param type the {@link AnnotatedType}
      * @return a container provided implementation of {@link InjectionTarget}
      * @since 1.1
@@ -336,14 +338,15 @@ public interface BeanManager extends BeanContainer {
      * <p>
      * Obtains a {@link Bean} for the given {@link BeanAttributes}, bean class and {@link InjectionTarget}.
      * </p>
-     * 
+     *
      * <p>
      * The {@link InjectionTarget} creates and destroys instances of the bean, performs dependency injection and lifecycle
      * callbacks, and determines the return value of {@link Bean#getInjectionPoints()}. The {@link InjectionTarget} is obtained
-     * from the {@link InjectionTargetFactory}. {@link #getInjectionTargetFactory(AnnotatedType)} allows use of a container created
+     * from the {@link InjectionTargetFactory}. {@link #getInjectionTargetFactory(AnnotatedType)} allows use of a container
+     * created
      * {@link InjectionTarget}.
      * </p>
-     * 
+     *
      * @param <T> the type
      * @param attributes a {@link BeanAttributes} which determines the bean types, qualifiers, scope, name and stereotypes of
      *        the returned {@link Bean}, and the return value of {@link Bean#isAlternative()}
@@ -359,14 +362,14 @@ public <T> Bean<T> createBean(BeanAttributes<T> attributes, Class<T> beanClass,
      * <p>
      * Obtains a {@link Bean} for the given {@link BeanAttributes}, bean class and {@link Producer}.
      * </p>
-     * 
+     *
      * <p>
      * The {@link Producer} creates and destroys instances of the decorator, and determines the return value of
      * {@link Bean#getInjectionPoints()}. The {@link Producer} is obtained from the {@link ProducerFactory}.
-     * {@link #getProducerFactory(AnnotatedMethod, Bean)} or {@link #getProducerFactory(AnnotatedField, Bean)} allows use of a 
+     * {@link #getProducerFactory(AnnotatedMethod, Bean)} or {@link #getProducerFactory(AnnotatedField, Bean)} allows use of a
      * container created {@link Producer}.
      * </p>
-     * 
+     *
      * @param <T> the type
      * @param <X> the type of the declaring bean
      * @param attributes a {@link BeanAttributes} which determines the bean types, qualifiers, scope, name and stereotypes of
@@ -380,7 +383,7 @@ public <T> Bean<T> createBean(BeanAttributes<T> attributes, Class<T> beanClass,
 
     /**
      * Obtains a container provided implementation of {@link InjectionPoint} for the given {@link AnnotatedField}.
-     * 
+     *
      * @param field the {@link AnnotatedField} defining the injection point
      * @return the container provided {@link InjectionPoint}
      * @throws IllegalArgumentException if there is a definition error associated with the injection point
@@ -390,7 +393,7 @@ public <T> Bean<T> createBean(BeanAttributes<T> attributes, Class<T> beanClass,
 
     /**
      * Obtains a container provided implementation of {@link InjectionPoint} for the given {@link AnnotatedParameter}.
-     * 
+     *
      * @param parameter the {@link AnnotatedParameter} defining the injection point
      * @return the container provided {@link InjectionPoint}
      * @throws IllegalArgumentException if there is a definition error associated with the injection point
@@ -400,7 +403,7 @@ public <T> Bean<T> createBean(BeanAttributes<T> attributes, Class<T> beanClass,
 
     /**
      * Obtains the container's instance of an Extension class declared in <code>META-INF/services</code>.
-     * 
+     *
      * @param <T> the type of the extension
      * @param extensionClass the type of the extension class
      * @return the extension instance
diff --git a/api/src/main/java/jakarta/enterprise/inject/spi/BeforeBeanDiscovery.java b/api/src/main/java/jakarta/enterprise/inject/spi/BeforeBeanDiscovery.java
index cccf0209f..13b134a51 100644
--- a/api/src/main/java/jakarta/enterprise/inject/spi/BeforeBeanDiscovery.java
+++ b/api/src/main/java/jakarta/enterprise/inject/spi/BeforeBeanDiscovery.java
@@ -8,23 +8,23 @@
  * You may obtain a copy of the License at
  * http://www.apache.org/licenses/LICENSE-2.0
  * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,  
+ * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
 package jakarta.enterprise.inject.spi;
 
+import java.lang.annotation.Annotation;
+
 import jakarta.enterprise.context.NormalScope;
+import jakarta.enterprise.context.spi.Context;
 import jakarta.enterprise.inject.Stereotype;
 import jakarta.enterprise.inject.spi.configurator.AnnotatedTypeConfigurator;
+import jakarta.enterprise.util.Nonbinding;
 import jakarta.inject.Qualifier;
 import jakarta.inject.Scope;
 import jakarta.interceptor.InterceptorBinding;
-import java.lang.annotation.Annotation;
-
-import jakarta.enterprise.context.spi.Context;
-import jakarta.enterprise.util.Nonbinding;
 
 /**
  * <p>
@@ -32,7 +32,9 @@
  * {@code BeforeBeanDiscovery} event throws an exception, the exception is treated as a definition error by the container.
  * </p>
  *
- * <p>CDI Lite implementations are not required to provide support for Portable Extensions.</p>
+ * <p>
+ * CDI Lite implementations are not required to provide support for Portable Extensions.
+ * </p>
  *
  * @author Pete Muir
  * @author David Allen
@@ -43,11 +45,11 @@ public interface BeforeBeanDiscovery {
      * <p>
      * Declares an annotation type as a {@linkplain jakarta.inject.Qualifier} qualifier type.
      * </p>
-     * 
+     *
      * <p>
      * This is only required if you wish to make an annotation a qualifier without adding {@link Qualifier} to it.
      * </p>
-     * 
+     *
      * @param qualifier The annotation to treat as a qualifier
      * @throws IllegalStateException if called outside of the observer method invocation
      */
@@ -57,11 +59,11 @@ public interface BeforeBeanDiscovery {
      * <p>
      * Declares an annotation type as a {@linkplain jakarta.inject.Qualifier} qualifier type.
      * </p>
-     * 
+     *
      * <p>
      * This is only required if you wish to make an annotation a qualifier without adding {@link Qualifier} to it.
      * </p>
-     * 
+     *
      * @param qualifier The annotation to treat as a qualifier
      * @throws IllegalStateException if called outside of the observer method invocation
      * @since 1.1
@@ -72,14 +74,14 @@ public interface BeforeBeanDiscovery {
      * <p>
      * Declares an annotation type as a {@linkplain jakarta.enterprise.context scope type}.
      * </p>
-     * 
+     *
      * <p>
      * This is only required if you wish to make an annotation a scope type without adding the {@link NormalScope} or
      * {@link Scope} annotations to it. You can also use this method to override an existing normal scope definition.
      * </p>
-     * 
+     *
      * @see AfterBeanDiscovery#addContext(Context)
-     * 
+     *
      * @param scopeType The annotation type to treat as a {@linkplain jakarta.enterprise.context scope type}
      * @param normal Indicates if the scope is normal
      * @param passivating Indicates if the scope is {@linkplain PassivationCapable passivation
@@ -93,12 +95,12 @@ public interface BeforeBeanDiscovery {
      * Declares an annotation type as a {@linkplain Stereotype stereotype}, and specifies its
      * meta-annotations.
      * </p>
-     * 
+     *
      * <p>
      * This is only required if you wish to make an annotation a stereotype without adding {@link Stereotype} to it. You can
      * also use this method to override an existing stereotype definition.
      * </p>
-     * 
+     *
      * @param stereotype The annotation type to treat as a {@linkplain Stereotype stereotype}
      * @param stereotypeDef An optional list of annotations defining the {@linkplain Stereotype
      *        stereotype}
@@ -110,12 +112,12 @@ public interface BeforeBeanDiscovery {
      * <p>
      * Declares an annotation type as an {@linkplain Interceptor interceptor} binding type.
      * </p>
-     * 
+     *
      * <p>
      * This is only required if you wish to make an annotation an interceptor binding type without adding
      * {@link InterceptorBinding} to it.
      * </p>
-     * 
+     *
      * @param bindingType The annotation type to treat as an interceptor binding type
      * @throws IllegalStateException if called outside of the observer method invocation
      */
@@ -125,12 +127,12 @@ public interface BeforeBeanDiscovery {
      * <p>
      * Declares an annotation type as an {@linkplain Interceptor interceptor} binding type, and specifies its meta-annotations.
      * </p>
-     * 
+     *
      * <p>
      * This is only required if you wish to make an annotation an interceptor binding type without adding
      * {@link InterceptorBinding} to it.
      * </p>
-     * 
+     *
      * @param bindingType The annotation type to treat as an interceptor binding type
      * @param bindingTypeDef An optional list of annotations defining the {@linkplain Interceptor interceptor}
      * @throws IllegalStateException if called outside of the observer method invocation
@@ -143,18 +145,19 @@ public interface BeforeBeanDiscovery {
      * Adds a given {@link AnnotatedType} to the set of types which will be scanned during bean
      * discovery.
      * </p>
-     * 
+     *
      * <p>
-     * Thanks to the id parameter, this method allows multiple annotated types, based on the same underlying type, to be defined. {@link AnnotatedType}s
+     * Thanks to the id parameter, this method allows multiple annotated types, based on the same underlying type, to be
+     * defined. {@link AnnotatedType}s
      * discovered by the container use the fully qualified class name of {@link AnnotatedType#getJavaClass()} to identify the
      * type.
      * </p>
-     * 
+     *
      * <p>
      * {@link AfterBeanDiscovery#getAnnotatedType(Class, String)} and {@link AfterBeanDiscovery#getAnnotatedTypes(Class)} allows
      * annotated types to be obtained by identifier.
      * </p>
-     * 
+     *
      * @param type The {@link AnnotatedType} to add for later scanning
      * @param id the identifier used to distinguish this AnnotatedType from an other one based on the same underlying type
      * @throws IllegalStateException if called outside of the observer method invocation
@@ -169,7 +172,8 @@ public interface BeforeBeanDiscovery {
      * </p>
      *
      * <p>
-     * Thanks to the id parameter, this method allows multiple annotated types, based on the same underlying type, to be defined with a builder.
+     * Thanks to the id parameter, this method allows multiple annotated types, based on the same underlying type, to be defined
+     * with a builder.
      * {@link AnnotatedType}s discovered by the container use the fully qualified class name of
      * {@link AnnotatedType#getJavaClass()} to identify the type.
      * </p>
@@ -191,7 +195,6 @@ public interface BeforeBeanDiscovery {
      */
     public <T> AnnotatedTypeConfigurator<T> addAnnotatedType(Class<T> type, String id);
 
-
     /**
      *
      * <p>
@@ -210,8 +213,7 @@ public interface BeforeBeanDiscovery {
      * @return a non reusable {@link AnnotatedTypeConfigurator} to configure the qualifier
      * @since 2.0
      */
-     <T extends Annotation> AnnotatedTypeConfigurator<T> configureQualifier(Class<T> qualifier);
-
+    <T extends Annotation> AnnotatedTypeConfigurator<T> configureQualifier(Class<T> qualifier);
 
     /**
      *
@@ -232,7 +234,6 @@ public interface BeforeBeanDiscovery {
      * @return a non reusable {@link AnnotatedTypeConfigurator} to configure the interceptor binding
      * @since 2.0
      */
-     <T extends Annotation> AnnotatedTypeConfigurator<T> configureInterceptorBinding(Class<T> bindingType);
-
+    <T extends Annotation> AnnotatedTypeConfigurator<T> configureInterceptorBinding(Class<T> bindingType);
 
 }
diff --git a/api/src/main/java/jakarta/enterprise/inject/spi/BeforeShutdown.java b/api/src/main/java/jakarta/enterprise/inject/spi/BeforeShutdown.java
index 9af0fc8ea..7549e7de3 100644
--- a/api/src/main/java/jakarta/enterprise/inject/spi/BeforeShutdown.java
+++ b/api/src/main/java/jakarta/enterprise/inject/spi/BeforeShutdown.java
@@ -8,7 +8,7 @@
  * You may obtain a copy of the License at
  * http://www.apache.org/licenses/LICENSE-2.0
  * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,  
+ * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
@@ -21,7 +21,9 @@
  * observer method of the {@code BeforeShutdown} event throws an exception, the exception is ignored by the container.
  * </p>
  *
- * <p>CDI Lite implementations are not required to provide support for Portable Extensions.</p>
+ * <p>
+ * CDI Lite implementations are not required to provide support for Portable Extensions.
+ * </p>
  *
  * @author David Allen
  */
diff --git a/api/src/main/java/jakarta/enterprise/inject/spi/CDI.java b/api/src/main/java/jakarta/enterprise/inject/spi/CDI.java
index 0a80f4060..93bc953dd 100644
--- a/api/src/main/java/jakarta/enterprise/inject/spi/CDI.java
+++ b/api/src/main/java/jakarta/enterprise/inject/spi/CDI.java
@@ -8,7 +8,7 @@
  * You may obtain a copy of the License at
  * http://www.apache.org/licenses/LICENSE-2.0
  * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,  
+ * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
@@ -16,8 +16,6 @@
 
 package jakarta.enterprise.inject.spi;
 
-import jakarta.enterprise.inject.Instance;
-
 import java.util.Collections;
 import java.util.Comparator;
 import java.util.ServiceConfigurationError;
@@ -25,6 +23,8 @@
 import java.util.Set;
 import java.util.TreeSet;
 
+import jakarta.enterprise.inject.Instance;
+
 /**
  * Provides access to the current container.
  *
@@ -51,12 +51,12 @@ public abstract class CDI<T> implements Instance<T> {
      * <p>
      * Get the CDI instance that provides access to the current container.
      * </p>
-     * 
+     *
      * <p>
      * If there are no providers available, an {@link IllegalStateException} is thrown, otherwise the first provider which can
      * access the container is used.
      * </p>
-     * 
+     *
      * @throws IllegalStateException if no {@link CDIProvider} is available
      * @return the CDI instance
      */
@@ -133,7 +133,7 @@ private static void findAllProviders() {
 
         providerLoader = SecurityActions.loadService(CDIProvider.class, CDI.class.getClassLoader());
 
-        if(! providerLoader.iterator().hasNext()) {
+        if (!providerLoader.iterator().hasNext()) {
             throw new IllegalStateException("Unable to locate CDIProvider");
         }
 
diff --git a/api/src/main/java/jakarta/enterprise/inject/spi/CDIProvider.java b/api/src/main/java/jakarta/enterprise/inject/spi/CDIProvider.java
index a87521bac..cbbeb737b 100644
--- a/api/src/main/java/jakarta/enterprise/inject/spi/CDIProvider.java
+++ b/api/src/main/java/jakarta/enterprise/inject/spi/CDIProvider.java
@@ -8,7 +8,7 @@
  * You may obtain a copy of the License at
  * http://www.apache.org/licenses/LICENSE-2.0
  * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,  
+ * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
@@ -18,7 +18,7 @@
 
 /**
  * Interface implemented by a CDI provider to provide access to the current container
- * 
+ *
  * @author Pete Muir
  * @since 1.1
  */
@@ -28,13 +28,12 @@ public interface CDIProvider extends Prioritized {
 
     /**
      * Provides access to the current container
-     * 
+     *
      * @return the CDI instance for the current container
      * @throws IllegalStateException if no CDI container is available
      */
     CDI<Object> getCDI();
 
-
     @Override
     default int getPriority() {
         return DEFAULT_CDI_PROVIDER_PRIORITY;
diff --git a/api/src/main/java/jakarta/enterprise/inject/spi/Decorator.java b/api/src/main/java/jakarta/enterprise/inject/spi/Decorator.java
index 7581ba2c4..cc33914a6 100644
--- a/api/src/main/java/jakarta/enterprise/inject/spi/Decorator.java
+++ b/api/src/main/java/jakarta/enterprise/inject/spi/Decorator.java
@@ -8,7 +8,7 @@
  * You may obtain a copy of the License at
  * http://www.apache.org/licenses/LICENSE-2.0
  * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,  
+ * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
@@ -31,11 +31,13 @@
  * given priority value for entire application.
  * </p>
  *
- * <p>CDI Lite implementations are not required to provide support for decorators.</p>
+ * <p>
+ * CDI Lite implementations are not required to provide support for decorators.
+ * </p>
  *
  * @author Gavin King
  * @author Pete Muir
- * 
+ *
  * @param <T> the decorator bean class
  */
 public interface Decorator<T> extends Bean<T> {
@@ -44,7 +46,7 @@ public interface Decorator<T> extends Bean<T> {
      * <p>
      * Obtains the {@linkplain Type type} of the {@linkplain Delegate delegate injection point}.
      * </p>
-     * 
+     *
      * @return the delegate {@linkplain Type type}
      */
     public Type getDelegateType();
@@ -54,7 +56,7 @@ public interface Decorator<T> extends Bean<T> {
      * Obtains the {@linkplain jakarta.inject.Qualifier qualifiers} of the {@linkplain Delegate delegate injection
      * point}.
      * </p>
-     * 
+     *
      * @return the delegate {@linkplain jakarta.inject.Qualifier qualifiers}
      */
     public Set<Annotation> getDelegateQualifiers();
@@ -63,7 +65,7 @@ public interface Decorator<T> extends Bean<T> {
      * <p>
      * Obtains the {@linkplain jakarta.decorator decorated types}.
      * </p>
-     * 
+     *
      * @return the set of decorated {@linkplain Type types}
      */
     public Set<Type> getDecoratedTypes();
diff --git a/api/src/main/java/jakarta/enterprise/inject/spi/DefinitionException.java b/api/src/main/java/jakarta/enterprise/inject/spi/DefinitionException.java
index adac4209d..f7f7471a2 100644
--- a/api/src/main/java/jakarta/enterprise/inject/spi/DefinitionException.java
+++ b/api/src/main/java/jakarta/enterprise/inject/spi/DefinitionException.java
@@ -8,7 +8,7 @@
  * You may obtain a copy of the License at
  * http://www.apache.org/licenses/LICENSE-2.0
  * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,  
+ * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
@@ -20,22 +20,22 @@
  * <p>
  * Thrown when a definition error occurs.
  * </p>
- * 
+ *
  * <p>
  * Definition errors are developer errors. They may be detected by tooling at development time, and are also detected by the
  * container at initialization time. If a definition error exists in a deployment, initialization will be aborted by the
  * container.
  * </p>
- * 
+ *
  * <p>
  * The container is permitted to define a non-portable mode, for use at development time, in which some definition errors do not
  * cause application initialization to abort.
  * </p>
- * 
+ *
  * <p>
  * An implementation is permitted to throw a subclass of {@link DefinitionException} for any definition error which exists.
  * </p>
- * 
+ *
  * @author Pete Muir
  * @since 1.1
  */
diff --git a/api/src/main/java/jakarta/enterprise/inject/spi/DeploymentException.java b/api/src/main/java/jakarta/enterprise/inject/spi/DeploymentException.java
index 5b94d3f33..622bc8cd4 100644
--- a/api/src/main/java/jakarta/enterprise/inject/spi/DeploymentException.java
+++ b/api/src/main/java/jakarta/enterprise/inject/spi/DeploymentException.java
@@ -8,7 +8,7 @@
  * You may obtain a copy of the License at
  * http://www.apache.org/licenses/LICENSE-2.0
  * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,  
+ * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
@@ -20,24 +20,24 @@
  * <p>
  * Thrown when a deployment problem occurs.
  * </p>
- * 
+ *
  * <p>
  * Deployment problems are detected by the container at initialization time. If a deployment problem exists in a deployment,
  * initialization will be aborted by the container.
  * </p>
- * 
+ *
  * <p>
  * The container is permitted to define a non-portable mode, for use at development time, in which some deployment problems do
  * not cause application initialization to abort.
  * </p>
- * 
+ *
  * <p>
  * An implementation is permitted to throw a subclass of {@link DeploymentException} for any deployment problem.
  * </p>
- * 
+ *
  * @author Pete Muir
  * @since 1.1
- * 
+ *
  */
 public class DeploymentException extends RuntimeException {
 
diff --git a/api/src/main/java/jakarta/enterprise/inject/spi/EventContext.java b/api/src/main/java/jakarta/enterprise/inject/spi/EventContext.java
index 71f3a6140..e3ed860c6 100644
--- a/api/src/main/java/jakarta/enterprise/inject/spi/EventContext.java
+++ b/api/src/main/java/jakarta/enterprise/inject/spi/EventContext.java
@@ -8,7 +8,7 @@
  * You may obtain a copy of the License at
  * http://www.apache.org/licenses/LICENSE-2.0
  * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,  
+ * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
@@ -18,7 +18,7 @@
 
 /**
  * Represents a context of a fired event. Provides access to an event object and corresponding metadata.
- * 
+ *
  * @author Martin Kouba
  * @see ObserverMethod#notify(EventContext)
  * @see EventMetadata
@@ -28,13 +28,13 @@
 public interface EventContext<T> {
 
     /**
-     * 
+     *
      * @return the event object, aka the payload
      */
     T getEvent();
 
     /**
-     * 
+     *
      * @return the event metadata
      */
     EventMetadata getMetadata();
diff --git a/api/src/main/java/jakarta/enterprise/inject/spi/EventMetadata.java b/api/src/main/java/jakarta/enterprise/inject/spi/EventMetadata.java
index 8889e9622..e97341122 100644
--- a/api/src/main/java/jakarta/enterprise/inject/spi/EventMetadata.java
+++ b/api/src/main/java/jakarta/enterprise/inject/spi/EventMetadata.java
@@ -8,7 +8,7 @@
  * You may obtain a copy of the License at
  * http://www.apache.org/licenses/LICENSE-2.0
  * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,  
+ * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
@@ -30,13 +30,13 @@
  * <p>
  * {@link EventMetadata} may only be injected into an observer method. For example:
  * </p>
- * 
+ *
  * <pre>
  * public void afterLogin(&#064;Observes LoggedInEvent event, EventMetadata eventMetadata) { ... }
  * </pre>
- * 
+ *
  * @see Observes
- * 
+ *
  * @author Lincoln Baxter, III
  * @author Pete Muir
  * @author Antoine Sabot-Durand
@@ -62,5 +62,5 @@ public interface EventMetadata {
      * @return the runtime type of the event object
      */
     public Type getType();
-    
+
 }
diff --git a/api/src/main/java/jakarta/enterprise/inject/spi/Extension.java b/api/src/main/java/jakarta/enterprise/inject/spi/Extension.java
index f5afeab33..fe98692cf 100644
--- a/api/src/main/java/jakarta/enterprise/inject/spi/Extension.java
+++ b/api/src/main/java/jakarta/enterprise/inject/spi/Extension.java
@@ -8,7 +8,7 @@
  * You may obtain a copy of the License at
  * http://www.apache.org/licenses/LICENSE-2.0
  * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,  
+ * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
@@ -23,29 +23,31 @@
  * <p>
  * Service interface implemented by extensions. An extension is a service provider declared in <code>META-INF/services</code>.
  * </p>
- * 
+ *
  * <p>
  * Service providers may have {@linkplain Observes observer methods}, which may observe any event,
  * including any {@linkplain jakarta.enterprise.inject.spi container lifecycle event}, and obtain an injected
  * {@link BeanManager}.
  * </p>
- * 
+ *
  * <p>
  * The container instantiates a single instance of each extension at the beginning of the application initialization process and
  * maintains a reference to it until the application shuts down. The container delivers event notifications to this instance by
  * calling its observer methods.
  * </p>
- * 
+ *
  * <p>
  * Service providers are made available for injection as beans with the qualifier {@link Default
  * &#064;Default}.
  * </p>
  *
- * <p>CDI Lite implementations are not required to provide support for Portable Extensions.</p>
- * 
+ * <p>
+ * CDI Lite implementations are not required to provide support for Portable Extensions.
+ * </p>
+ *
  * @author Gavin King
  * @author Pete Muir
- * 
+ *
  */
 public interface Extension {
 }
\ No newline at end of file
diff --git a/api/src/main/java/jakarta/enterprise/inject/spi/InjectionPoint.java b/api/src/main/java/jakarta/enterprise/inject/spi/InjectionPoint.java
index de146e942..3c27246d8 100644
--- a/api/src/main/java/jakarta/enterprise/inject/spi/InjectionPoint.java
+++ b/api/src/main/java/jakarta/enterprise/inject/spi/InjectionPoint.java
@@ -8,7 +8,7 @@
  * You may obtain a copy of the License at
  * http://www.apache.org/licenses/LICENSE-2.0
  * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,  
+ * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
@@ -21,10 +21,10 @@
 import java.lang.reflect.Type;
 import java.util.Set;
 
+import jakarta.enterprise.context.Dependent;
 import jakarta.enterprise.event.Observes;
 import jakarta.enterprise.inject.Disposes;
 import jakarta.enterprise.inject.Instance;
-import jakarta.enterprise.context.Dependent;
 import jakarta.enterprise.inject.Produces;
 
 /**
@@ -34,36 +34,37 @@
  * {@linkplain Produces producer method}, {@linkplain Disposes disposer method}
  * or {@linkplain Observes observer method}.
  * </p>
- * 
+ *
  * <p>
  * If the injection point is a dynamically selected reference obtained then the metadata obtain reflects the injection point of
  * the {@link Instance}, with the required type and any additional required qualifiers defined by {@linkplain Instance
  * Instance.select()}.
  * </p>
- * 
+ *
  * <p>
  * Occasionally, a bean with scope {@link Dependent &#064;Dependent} needs to access metadata relating
  * to the object to which it belongs. The bean may inject an {@code InjectionPoint} representing the injection point into which
  * the bean was injected.
  * </p>
- * 
+ *
  * <p>
- * For example, the following producer method creates injectable <code>Logger</code> s. The log category of a <code>Logger</code>
+ * For example, the following producer method creates injectable <code>Logger</code> s. The log category of a
+ * <code>Logger</code>
  * depends upon the class of the object into which it is injected.
  * </p>
- * 
+ *
  * <pre>
  * &#064;Produces
  * Logger createLogger(InjectionPoint injectionPoint) {
  *     return Logger.getLogger(injectionPoint.getMember().getDeclaringClass().getName());
  * }
  * </pre>
- * 
+ *
  * <p>
  * Only {@linkplain Dependent dependent} objects, may obtain information about the injection point to
  * which they belong.
  * </p>
- * 
+ *
  * @author Gavin King
  * @author Pete Muir
  */
@@ -71,14 +72,14 @@ public interface InjectionPoint {
 
     /**
      * Get the required type of injection point.
-     * 
+     *
      * @return the required type
      */
     public Type getType();
 
     /**
      * Get the required qualifiers of the injection point.
-     * 
+     *
      * @return the required qualifiers
      */
     public Set<Annotation> getQualifiers();
@@ -86,7 +87,7 @@ public interface InjectionPoint {
     /**
      * Get the {@link Bean} object representing the bean that defines the injection point. If the
      * injection point does not belong to a bean, return a null value.
-     * 
+     *
      * @return the {@link Bean} object representing bean that defines the injection point, of null
      *         if the injection point does not belong to a bean
      */
@@ -96,7 +97,7 @@ public interface InjectionPoint {
      * Get the {@link java.lang.reflect.Field} object in the case of field injection, the {@link java.lang.reflect.Method}
      * object in the case of method parameter injection or the {@link java.lang.reflect.Constructor} object in the case of
      * constructor parameter injection.
-     * 
+     *
      * @return the member
      */
     public Member getMember();
@@ -105,21 +106,22 @@ public interface InjectionPoint {
      * Obtain an instance of {@link AnnotatedField} or
      * {@link AnnotatedParameter}, depending upon whether the injection point is an injected field
      * or a constructor/method parameter.
-     * 
+     *
      * @return an {@code AnnotatedField} or {@code AnnotatedParameter}
      */
     public Annotated getAnnotated();
 
     /**
      * Determines if the injection point is a decorator delegate injection point.
-     * 
-     * @return <code>true</code> if the injection point is a decorator delegate injection point, and <code>false</code> otherwise
+     *
+     * @return <code>true</code> if the injection point is a decorator delegate injection point, and <code>false</code>
+     *         otherwise
      */
     public boolean isDelegate();
 
     /**
      * Determines if the injection is a transient field.
-     * 
+     *
      * @return <code>true</code> if the injection point is a transient field, and <code>false</code> otherwise
      */
     public boolean isTransient();
diff --git a/api/src/main/java/jakarta/enterprise/inject/spi/InjectionTarget.java b/api/src/main/java/jakarta/enterprise/inject/spi/InjectionTarget.java
index 11ce7e1f7..a371c9f95 100644
--- a/api/src/main/java/jakarta/enterprise/inject/spi/InjectionTarget.java
+++ b/api/src/main/java/jakarta/enterprise/inject/spi/InjectionTarget.java
@@ -8,7 +8,7 @@
  * You may obtain a copy of the License at
  * http://www.apache.org/licenses/LICENSE-2.0
  * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,  
+ * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
@@ -23,11 +23,13 @@
  * instance of a type.
  * </p>
  *
- * <p>CDI Lite implementations are not required to provide support for {@code InjectionTarget}.</p>
- * 
+ * <p>
+ * CDI Lite implementations are not required to provide support for {@code InjectionTarget}.
+ * </p>
+ *
  * @see jakarta.annotation.PostConstruct
  * @see jakarta.annotation.PreDestroy
- * 
+ *
  * @author Pete Muir
  * @author David Allen
  * @param <T> The class of the instance
@@ -39,7 +41,7 @@ public interface InjectionTarget<T> extends Producer<T> {
      * Performs dependency injection upon the given object. Performs Java EE component environment injection, sets the value of
      * all injected fields, and calls all initializer methods.
      * </p>
-     * 
+     *
      * @param instance The instance upon which to perform injection
      * @param ctx The {@link CreationalContext} to use for creating new instances
      */
@@ -47,20 +49,22 @@ public interface InjectionTarget<T> extends Producer<T> {
 
     /**
      * <p>
-     * Calls the {@link jakarta.annotation.PostConstruct} callback, if it exists, according to the semantics required by the Java
+     * Calls the {@link jakarta.annotation.PostConstruct} callback, if it exists, according to the semantics required by the
+     * Java
      * EE platform specification.
      * </p>
-     * 
+     *
      * @param instance The instance on which to invoke the {@link jakarta.annotation.PostConstruct} method
      */
     public void postConstruct(T instance);
 
     /**
      * <p>
-     * Calls the {@link jakarta.annotation.PreDestroy} callback, if it exists, according to the semantics required by the Java EE
+     * Calls the {@link jakarta.annotation.PreDestroy} callback, if it exists, according to the semantics required by the Java
+     * EE
      * platform specification.
      * </p>
-     * 
+     *
      * @param instance The instance on which to invoke the {@link jakarta.annotation.PreDestroy} method
      */
     public void preDestroy(T instance);
diff --git a/api/src/main/java/jakarta/enterprise/inject/spi/InjectionTargetFactory.java b/api/src/main/java/jakarta/enterprise/inject/spi/InjectionTargetFactory.java
index 31c22402e..a4a08d0a3 100644
--- a/api/src/main/java/jakarta/enterprise/inject/spi/InjectionTargetFactory.java
+++ b/api/src/main/java/jakarta/enterprise/inject/spi/InjectionTargetFactory.java
@@ -8,7 +8,7 @@
  * You may obtain a copy of the License at
  * http://www.apache.org/licenses/LICENSE-2.0
  * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,  
+ * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
@@ -22,29 +22,33 @@
  * <p>
  * An {@link InjectionTargetFactory} can create an {@link InjectionTarget} for a given bean.
  * </p>
- * 
+ *
  * <p>
- * The {@link InjectionTargetFactory} obtained from {@link BeanManager#getInjectionTargetFactory(AnnotatedType)} is capable of providing
+ * The {@link InjectionTargetFactory} obtained from {@link BeanManager#getInjectionTargetFactory(AnnotatedType)} is capable of
+ * providing
  * container created injection targets. This factory can be wrapped to add behavior to container created injection targets.
  * </p>
- * 
+ *
  * <p>
  * For example:
  * </p>
- * 
+ *
  * <pre>
  * BeanAttributes&lt;MyBean&gt; myBeanAttributes = beanManager.createBeanAttributes(myBeanAnnotatedType);
  * beanManager.createBean(myBeanAttributes, MyBean.class, new InjectionTargetFactory() {
- * 
+ *
  *     public &lt;T&gt; InjectionTarget&lt;T&gt; createInjectionTarget(Bean&lt;T&gt; bean) {
- *         return new WrappingInjectionTarget&lt;T&gt;(beanManager.getInjectionTargetFactory(myBeanAnnotatedType).createInjectionTarget(
- *                 bean));
+ *         return new WrappingInjectionTarget&lt;T&gt;(
+ *                 beanManager.getInjectionTargetFactory(myBeanAnnotatedType).createInjectionTarget(
+ *                         bean));
  *     }
  * });
  * </pre>
  *
- * <p>CDI Lite implementations are not required to provide support for {@code InjectionTargetFactory}.</p>
- * 
+ * <p>
+ * CDI Lite implementations are not required to provide support for {@code InjectionTargetFactory}.
+ * </p>
+ *
  * @author Pete Muir
  * @author Antoine Sabot-Durand
  * @since 1.1
@@ -55,7 +59,7 @@ public interface InjectionTargetFactory<T> {
 
     /**
      * Create a new injection target for a bean.
-     * 
+     *
      * @param bean the bean to create the injection target for, or null if creating a non-contextual object
      * @return the injection target
      */
@@ -63,7 +67,8 @@ public interface InjectionTargetFactory<T> {
 
     /**
      *
-     * Returns an {@link AnnotatedTypeConfigurator} to to configure the {@link AnnotatedType} used to create the {@link InjectionTarget}.
+     * Returns an {@link AnnotatedTypeConfigurator} to to configure the {@link AnnotatedType} used to create the
+     * {@link InjectionTarget}.
      *
      * Each call returns the same AnnotatedTypeConfigurator.
      *
diff --git a/api/src/main/java/jakarta/enterprise/inject/spi/InterceptionFactory.java b/api/src/main/java/jakarta/enterprise/inject/spi/InterceptionFactory.java
index b981f3752..50baef835 100644
--- a/api/src/main/java/jakarta/enterprise/inject/spi/InterceptionFactory.java
+++ b/api/src/main/java/jakarta/enterprise/inject/spi/InterceptionFactory.java
@@ -37,8 +37,8 @@
  *
  *     BeanManager bm;
  *
- *     public MyBean(BeanManager bm) {
- *        this.bm = bm;
+ *     public MyBean(BeanManager bm){
+ *     this.bm=bm;
  *     }
  *
  *     public MyClass create(CreationalContext&lt;MyClass&gt; creationalContext) {
@@ -73,7 +73,9 @@
  * Instances of this class are neither reusable nor suitable for sharing between threads.
  * </p>
  *
- * <p>CDI Lite implementations are not required to provide support for {@code InterceptionFactory}.</p>
+ * <p>
+ * CDI Lite implementations are not required to provide support for {@code InterceptionFactory}.
+ * </p>
  *
  * @author Antoine Sabot-Durand
  * @since 2.0
diff --git a/api/src/main/java/jakarta/enterprise/inject/spi/InterceptionType.java b/api/src/main/java/jakarta/enterprise/inject/spi/InterceptionType.java
index 93481957f..1cf10cd4f 100644
--- a/api/src/main/java/jakarta/enterprise/inject/spi/InterceptionType.java
+++ b/api/src/main/java/jakarta/enterprise/inject/spi/InterceptionType.java
@@ -8,7 +8,7 @@
  * You may obtain a copy of the License at
  * http://www.apache.org/licenses/LICENSE-2.0
  * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,  
+ * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
@@ -20,10 +20,10 @@
  * <p>
  * Identifies the kind of lifecycle callback, EJB timeout method or business method interception.
  * </p>
- * 
+ *
  * @author Gavin King
  * @author Pete Muir
- * 
+ *
  */
 public enum InterceptionType {
 
diff --git a/api/src/main/java/jakarta/enterprise/inject/spi/Interceptor.java b/api/src/main/java/jakarta/enterprise/inject/spi/Interceptor.java
index ed2a3ac80..e4b9dea15 100644
--- a/api/src/main/java/jakarta/enterprise/inject/spi/Interceptor.java
+++ b/api/src/main/java/jakarta/enterprise/inject/spi/Interceptor.java
@@ -8,7 +8,7 @@
  * You may obtain a copy of the License at
  * http://www.apache.org/licenses/LICENSE-2.0
  * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,  
+ * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
@@ -29,11 +29,11 @@
  * Since CDI 2.0, an implementation of this interface may implement {@link Prioritized} in order to enable the interceptor with
  * given priority value for entire application.
  * </p>
- * 
+ *
  * @author Gavin King
  * @author Pete Muir
  * @author David Allen
- * 
+ *
  * @param <T> the interceptor bean class
  */
 public interface Interceptor<T> extends Bean<T> {
@@ -42,7 +42,7 @@ public interface Interceptor<T> extends Bean<T> {
      * <p>
      * Obtains the {@linkplain jakarta.interceptor.InterceptorBinding interceptor bindings} of the interceptor.
      * </p>
-     * 
+     *
      * @return the set of {@linkplain jakarta.interceptor.InterceptorBinding interceptor bindings}
      */
     public Set<Annotation> getInterceptorBindings();
@@ -52,7 +52,7 @@ public interface Interceptor<T> extends Bean<T> {
      * Determines if the interceptor intercepts the specified {@linkplain InterceptionType kind of lifecycle callback or method
      * invocation}.
      * </p>
-     * 
+     *
      * @param type the {@linkplain InterceptionType kind of interception}
      * @return returns <code>true</code> if the interceptor intercepts callbacks or business methods of the given type, and
      *         <code>false</code> otherwise.
@@ -64,7 +64,7 @@ public interface Interceptor<T> extends Bean<T> {
      * Invokes the specified {@linkplain InterceptionType kind of lifecycle callback or method invocation interception} upon the
      * given interceptor instance.
      * </p>
-     * 
+     *
      * @param type the {@linkplain InterceptionType kind of interception}
      * @param instance the interceptor instance to invoke
      * @param ctx the context for the invocation
diff --git a/api/src/main/java/jakarta/enterprise/inject/spi/ObserverMethod.java b/api/src/main/java/jakarta/enterprise/inject/spi/ObserverMethod.java
index ad57cbde7..d69e18618 100644
--- a/api/src/main/java/jakarta/enterprise/inject/spi/ObserverMethod.java
+++ b/api/src/main/java/jakarta/enterprise/inject/spi/ObserverMethod.java
@@ -8,7 +8,7 @@
  * You may obtain a copy of the License at
  * http://www.apache.org/licenses/LICENSE-2.0
  * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,  
+ * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
@@ -19,22 +19,22 @@
 import java.lang.reflect.Type;
 import java.util.Set;
 
+import jakarta.enterprise.event.Observes;
 import jakarta.enterprise.event.ObservesAsync;
 import jakarta.enterprise.event.Reception;
 import jakarta.enterprise.event.TransactionPhase;
-import jakarta.enterprise.event.Observes;
 
 /**
  * <p>
  * Represents an {@linkplain Observes observer method} of an {@linkplain jakarta.enterprise.inject enabled
  * bean}. Defines everything the container needs to know about an observer method.
  * </p>
- * 
+ *
  * <p>
  * If a custom implementation of this interface does not override either {@link #notify(Object)} or
  * {@link #notify(EventContext)}, the container automatically detects the problem and treats it as a definition error.
  * </p>
- * 
+ *
  * @author Gavin King
  * @author David Allen
  * @author Mark Paluch
@@ -42,14 +42,14 @@
  * @param <T> the event type
  */
 public interface ObserverMethod<T> extends Prioritized {
-    
+
     public static final int DEFAULT_PRIORITY = jakarta.interceptor.Interceptor.Priority.APPLICATION + 500;
-    
+
     /**
      * <p>
      * Obtains the {@linkplain Class class} of the type that declares the observer method.
      * </p>
-     * 
+     *
      * @return the defining {@linkplain Class class}
      */
     public Class<?> getBeanClass();
@@ -74,28 +74,28 @@ default Bean<?> getDeclaringBean() {
 
     /**
      * Obtains the {@linkplain jakarta.enterprise.event observed event type}.
-     * 
+     *
      * @return the observed event {@linkplain Type type}
      */
     public Type getObservedType();
 
     /**
      * Obtains the set of {@linkplain jakarta.enterprise.event observed event qualifiers}.
-     * 
+     *
      * @return the observed event {@linkplain jakarta.inject.Qualifier qualifiers}
      */
     public Set<Annotation> getObservedQualifiers();
 
     /**
      * Obtains the specified {@link Reception} for the observer method. This indicates if the observer is conditional or not.
-     * 
+     *
      * @return the {@link Reception}
      */
     public Reception getReception();
 
     /**
      * Obtains the specified {@link TransactionPhase} for the observer method.
-     * 
+     *
      * @return the {@link TransactionPhase}
      */
     public TransactionPhase getTransactionPhase();
@@ -117,17 +117,17 @@ public default int getPriority() {
      * <p>
      * Calls the observer method, passing the given event object.
      * </p>
-     * 
+     *
      * <p>
      * The implementation of this method for a custom observer method is responsible for deciding whether to call
      * the method if the {@link #getReception()} returns {@link Reception#IF_EXISTS}.
      * </p>
-     * 
+     *
      * @param event the event object
      */
     public default void notify(T event) {
     }
-    
+
     /**
      * Calls the observer method, passing the given event context.
      * <p>
@@ -135,7 +135,7 @@ public default void notify(T event) {
      * <p>
      * The implementation of this method for a custom observer method is responsible for deciding whether to call the method if
      * the {@link #getReception()} returns {@link Reception#IF_EXISTS}.
-     * 
+     *
      * @param eventContext {@link EventContext} used to notify observers
      */
     public default void notify(EventContext<T> eventContext) {
@@ -144,12 +144,13 @@ public default void notify(EventContext<T> eventContext) {
 
     /**
      * <p>
-     * Determines if this observer method is asynchronous 
+     * Determines if this observer method is asynchronous
      * </p>
-     * 
-     * @return returns <code>true</code> if the method is an asynchronous observer method (i.e. defined with {@link ObservesAsync}),
+     *
+     * @return returns <code>true</code> if the method is an asynchronous observer method (i.e. defined with
+     *         {@link ObservesAsync}),
      *         otherwise returns <code>false</code>
-     * 
+     *
      */
     public default boolean isAsync() {
         return false;
diff --git a/api/src/main/java/jakarta/enterprise/inject/spi/PassivationCapable.java b/api/src/main/java/jakarta/enterprise/inject/spi/PassivationCapable.java
index 10b2fd894..e44afe8d3 100644
--- a/api/src/main/java/jakarta/enterprise/inject/spi/PassivationCapable.java
+++ b/api/src/main/java/jakarta/enterprise/inject/spi/PassivationCapable.java
@@ -8,7 +8,7 @@
  * You may obtain a copy of the License at
  * http://www.apache.org/licenses/LICENSE-2.0
  * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,  
+ * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
@@ -22,18 +22,20 @@
  * Indicates that a custom implementation of {@link Bean} or
  * {@link Contextual} is passivation capable.
  *
- * <p>CDI Lite implementations are not required to provide support for passivation.</p>
- * 
+ * <p>
+ * CDI Lite implementations are not required to provide support for passivation.
+ * </p>
+ *
  * @author Gavin King
  * @author David Allen
- * 
+ *
  */
 public interface PassivationCapable {
     /**
      * A string that uniquely identifies the instance of {@link Bean} or
      * {@link Contextual}. It is recommended that the string contain the package name of the class
      * that implements {@code Bean} or {@code Contextual}.
-     * 
+     *
      * @return a unique identifier for the {@link Bean} or
      *         {@link Contextual}
      */
diff --git a/api/src/main/java/jakarta/enterprise/inject/spi/Prioritized.java b/api/src/main/java/jakarta/enterprise/inject/spi/Prioritized.java
index 3fbfe479d..43fc9b25c 100644
--- a/api/src/main/java/jakarta/enterprise/inject/spi/Prioritized.java
+++ b/api/src/main/java/jakarta/enterprise/inject/spi/Prioritized.java
@@ -8,7 +8,7 @@
  * You may obtain a copy of the License at
  * http://www.apache.org/licenses/LICENSE-2.0
  * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,  
+ * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
diff --git a/api/src/main/java/jakarta/enterprise/inject/spi/ProcessAnnotatedType.java b/api/src/main/java/jakarta/enterprise/inject/spi/ProcessAnnotatedType.java
index 9de807d2e..19b0ef856 100644
--- a/api/src/main/java/jakarta/enterprise/inject/spi/ProcessAnnotatedType.java
+++ b/api/src/main/java/jakarta/enterprise/inject/spi/ProcessAnnotatedType.java
@@ -8,7 +8,7 @@
  * You may obtain a copy of the License at
  * http://www.apache.org/licenses/LICENSE-2.0
  * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,  
+ * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
@@ -23,15 +23,17 @@
  * the declared annotations.
  * </p>
  * <p>
- * Any observer of this event is permitted to wrap and/or replace the {@link AnnotatedType} by calling either {@link #setAnnotatedType(AnnotatedType)} or {@link #configureAnnotatedType()}.
+ * Any observer of this event is permitted to wrap and/or replace the {@link AnnotatedType} by calling either
+ * {@link #setAnnotatedType(AnnotatedType)} or {@link #configureAnnotatedType()}.
  * If both methods are called within an observer notification an {@link IllegalStateException} is thrown.
- * The container must use the final value of this property, after all observers have been called, to discover the types and read the annotations of the program elements.
+ * The container must use the final value of this property, after all observers have been called, to discover the types and read
+ * the annotations of the program elements.
  * </p>
  * <p>
  * For example, the following observer decorates the {@link AnnotatedType} for every class that is
  * discovered by the container.
  * </p>
- * 
+ *
  * <pre>
  * public &lt;T&gt; void decorateAnnotatedType(@Observes ProcessAnnotatedType&lt;T&gt; pat) {
  *     pat.setAnnotatedType(decorate(pat.getAnnotatedType()));
@@ -42,7 +44,9 @@
  * error by the container.
  * </p>
  *
- * <p>CDI Lite implementations are not required to provide support for Portable Extensions.</p>
+ * <p>
+ * CDI Lite implementations are not required to provide support for Portable Extensions.
+ * </p>
  *
  * @author David Allen
  * @author Antoine Sabot-Durand
@@ -53,7 +57,7 @@ public interface ProcessAnnotatedType<X> {
     /**
      * Returns the {@link AnnotatedType} object that will be used by the container to read the
      * declared annotations.
-     * 
+     *
      * @return the {@code AnnotatedType} object
      * @throws IllegalStateException if called outside of the observer method invocation
      */
@@ -61,7 +65,7 @@ public interface ProcessAnnotatedType<X> {
 
     /**
      * Replaces the {@link AnnotatedType}.
-     * 
+     *
      * @param type the new {@link AnnotatedType} object to use
      * @throws IllegalStateException if called outside of the observer method invocation
      */
@@ -81,6 +85,7 @@ public interface ProcessAnnotatedType<X> {
 
     /**
      * Forces the container to ignore this type.
+     *
      * @throws IllegalStateException if called outside of the observer method invocation
      */
     public void veto();
diff --git a/api/src/main/java/jakarta/enterprise/inject/spi/ProcessBean.java b/api/src/main/java/jakarta/enterprise/inject/spi/ProcessBean.java
index ca4aa4b4c..125437e32 100644
--- a/api/src/main/java/jakarta/enterprise/inject/spi/ProcessBean.java
+++ b/api/src/main/java/jakarta/enterprise/inject/spi/ProcessBean.java
@@ -8,7 +8,7 @@
  * You may obtain a copy of the License at
  * http://www.apache.org/licenses/LICENSE-2.0
  * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,  
+ * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
@@ -44,7 +44,9 @@
  * the container.
  * </p>
  *
- * <p>CDI Lite implementations are not required to provide support for Portable Extensions.</p>
+ * <p>
+ * CDI Lite implementations are not required to provide support for Portable Extensions.
+ * </p>
  *
  * @see Bean
  * @author David Allen
@@ -56,11 +58,12 @@ public interface ProcessBean<X> {
      * Returns the {@link AnnotatedType} representing the bean class, the
      * {@link AnnotatedMethod} representing the producer method, or the
      * {@link AnnotatedField} representing the producer field.
-     * 
+     *
      * <p>
-     * If invoked upon a {@link ProcessSyntheticBean} event, non-portable behavior results and the returned value should be ignored.
+     * If invoked upon a {@link ProcessSyntheticBean} event, non-portable behavior results and the returned value should be
+     * ignored.
      * </p>
-     * 
+     *
      * @return the {@link Annotated} for the bean being registered
      * @throws IllegalStateException if called outside of the observer method invocation
      */
@@ -70,16 +73,16 @@ public interface ProcessBean<X> {
      * Returns the {@link Bean} object that is about to be registered. The
      * {@link Bean} may implement {@link Interceptor} or
      * {@link Decorator}.
-     * 
+     *
      * @return the {@link Bean} object about to be registered
-     * @throws IllegalStateException if called outside of the observer method invocation 
+     * @throws IllegalStateException if called outside of the observer method invocation
      */
     public Bean<X> getBean();
 
     /**
      * Registers a definition error with the container, causing the container to abort deployment after bean discovery is
      * complete.
-     * 
+     *
      * @param t The definition error to register as a {@link java.lang.Throwable}
      * @throws IllegalStateException if called outside of the observer method invocation
      */
diff --git a/api/src/main/java/jakarta/enterprise/inject/spi/ProcessBeanAttributes.java b/api/src/main/java/jakarta/enterprise/inject/spi/ProcessBeanAttributes.java
index f07665710..df503414f 100644
--- a/api/src/main/java/jakarta/enterprise/inject/spi/ProcessBeanAttributes.java
+++ b/api/src/main/java/jakarta/enterprise/inject/spi/ProcessBeanAttributes.java
@@ -8,7 +8,7 @@
  * You may obtain a copy of the License at
  * http://www.apache.org/licenses/LICENSE-2.0
  * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,  
+ * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
@@ -24,16 +24,20 @@
  * registering the {@link Bean} object.
  * </p>
  * <p>
- * Any observer of this event is permitted to wrap and/or replace the {@link BeanAttributes} by calling either {@link #setBeanAttributes(BeanAttributes)} or {@link #configureBeanAttributes()}.
+ * Any observer of this event is permitted to wrap and/or replace the {@link BeanAttributes} by calling either
+ * {@link #setBeanAttributes(BeanAttributes)} or {@link #configureBeanAttributes()}.
  * If both methods are called within an observer notification an {@link IllegalStateException} is thrown.
- * The container must use the final value of this property, after all observers have been called, to manage instances of the bean.
+ * The container must use the final value of this property, after all observers have been called, to manage instances of the
+ * bean.
  * </p>
  * <p>
  * If any observer method of a {@code ProcessBeanAttributes} event throws an exception, the exception is treated as a definition
  * error by the container.
  * </p>
  *
- * <p>CDI Lite implementations are not required to provide support for Portable Extensions.</p>
+ * <p>
+ * CDI Lite implementations are not required to provide support for Portable Extensions.
+ * </p>
  *
  * @author Pete Muir
  * @author Antoine Sabot-Durand
@@ -57,7 +61,7 @@ public interface ProcessBeanAttributes<T> {
 
     /**
      * Replaces the {@link BeanAttributes}.
-     * 
+     *
      * @param beanAttributes the new {@link BeanAttributes} to use
      * @throws IllegalStateException if called outside of the observer method invocation
      */
@@ -78,7 +82,7 @@ public interface ProcessBeanAttributes<T> {
     /**
      * Registers a definition error with the container, causing the container to abort deployment after bean discovery is
      * complete.
-     * 
+     *
      * @param t the error to add
      * @throws IllegalStateException if called outside of the observer method invocation
      */
@@ -86,16 +90,20 @@ public interface ProcessBeanAttributes<T> {
 
     /**
      * Forces the container to ignore the bean.
+     *
      * @throws IllegalStateException if called outside of the observer method invocation
      */
     public void veto();
 
-
     /**
-     * <p>Instructs the container to ignore all non-static, final methods with public, protected or default visibility
-     * declared on any bean type of the specific bean during validation of injection points that require proxyable bean type.</p>
+     * <p>
+     * Instructs the container to ignore all non-static, final methods with public, protected or default visibility
+     * declared on any bean type of the specific bean during validation of injection points that require proxyable bean type.
+     * </p>
      *
-     * <p>These method should never be invoked upon bean instances. Otherwise, unpredictable behavior results.</p>
+     * <p>
+     * These method should never be invoked upon bean instances. Otherwise, unpredictable behavior results.
+     * </p>
      *
      *
      * @throws IllegalStateException if called outside of the observer method invocation
diff --git a/api/src/main/java/jakarta/enterprise/inject/spi/ProcessInjectionPoint.java b/api/src/main/java/jakarta/enterprise/inject/spi/ProcessInjectionPoint.java
index b919de6b2..1da627ad0 100644
--- a/api/src/main/java/jakarta/enterprise/inject/spi/ProcessInjectionPoint.java
+++ b/api/src/main/java/jakarta/enterprise/inject/spi/ProcessInjectionPoint.java
@@ -8,7 +8,7 @@
  * You may obtain a copy of the License at
  * http://www.apache.org/licenses/LICENSE-2.0
  * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,  
+ * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
@@ -26,9 +26,11 @@
  * decorator.
  * </p>
  * <p>
- * Any observer of this event is permitted to wrap and/or replace the {@link InjectionPoint} by calling either {@link #setInjectionPoint(InjectionPoint)} or {@link #configureInjectionPoint()}.
+ * Any observer of this event is permitted to wrap and/or replace the {@link InjectionPoint} by calling either
+ * {@link #setInjectionPoint(InjectionPoint)} or {@link #configureInjectionPoint()}.
  * If both methods are called within an observer notification an {@link IllegalStateException} is thrown.
- * The container must use the final value of this property, after all observers have been called, he container must use the final
+ * The container must use the final value of this property, after all observers have been called, he container must use the
+ * final
  * value of this property, after all observers have been called, whenever it performs injection upon the injection point.
  * </p>
  * <p>
@@ -36,7 +38,9 @@
  * error by the container.
  * </p>
  *
- * <p>CDI Lite implementations are not required to provide support for Portable Extensions.</p>
+ * <p>
+ * CDI Lite implementations are not required to provide support for Portable Extensions.
+ * </p>
  *
  * @see InjectionPoint
  * @author Pete Muir
@@ -54,7 +58,7 @@ public interface ProcessInjectionPoint<T, X> {
 
     /**
      * Replaces the InjectionPoint.
-     * 
+     *
      * @param injectionPoint the new injection point
      * @throws IllegalStateException if called outside of the observer method invocation
      */
@@ -75,7 +79,7 @@ public interface ProcessInjectionPoint<T, X> {
     /**
      * Registers a definition error with the container, causing the container to abort deployment after bean discovery is
      * complete.
-     * 
+     *
      * @param t the definition error
      * @throws IllegalStateException if called outside of the observer method invocation
      */
diff --git a/api/src/main/java/jakarta/enterprise/inject/spi/ProcessInjectionTarget.java b/api/src/main/java/jakarta/enterprise/inject/spi/ProcessInjectionTarget.java
index 7be1e8b28..39d489e18 100644
--- a/api/src/main/java/jakarta/enterprise/inject/spi/ProcessInjectionTarget.java
+++ b/api/src/main/java/jakarta/enterprise/inject/spi/ProcessInjectionTarget.java
@@ -8,7 +8,7 @@
  * You may obtain a copy of the License at
  * http://www.apache.org/licenses/LICENSE-2.0
  * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,  
+ * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
@@ -29,7 +29,7 @@
  * <p>
  * For example, this observer decorates the {@code InjectionTarget} for all servlets.
  * </p>
- * 
+ *
  * <pre>
  * public &lt;T extends Servlet&gt; void decorateServlet(@Observes ProcessInjectionTarget&lt;T&gt; pit) {
  *     pit.setInjectionTarget(decorate(pit.getInjectionTarget()));
@@ -40,7 +40,9 @@
  * definition error by the container.
  * </p>
  *
- * <p>CDI Lite implementations are not required to provide support for Portable Extensions.</p>
+ * <p>
+ * CDI Lite implementations are not required to provide support for Portable Extensions.
+ * </p>
  *
  * @see InjectionTarget
  * @author David Allen
@@ -50,7 +52,7 @@ public interface ProcessInjectionTarget<X> {
     /**
      * Returns the {@link AnnotatedType} representing the managed bean class, session bean class or
      * other Java EE component class supporting injection.
-     * 
+     *
      * @return the {@link AnnotatedType} of the bean with an injection target
      * @throws IllegalStateException if called outside of the observer method invocation
      */
@@ -59,7 +61,7 @@ public interface ProcessInjectionTarget<X> {
     /**
      * Returns the {@link InjectionTarget} object that will be used by the container to perform
      * injection.
-     * 
+     *
      * @return the {@link InjectionTarget} object which performs the injection
      * @throws IllegalStateException if called outside of the observer method invocation
      */
@@ -67,7 +69,7 @@ public interface ProcessInjectionTarget<X> {
 
     /**
      * Replaces the {@link InjectionTarget} which performs injection for this target.
-     * 
+     *
      * @param injectionTarget The new {@link InjectionTarget} to use
      * @throws IllegalStateException if called outside of the observer method invocation
      */
@@ -76,7 +78,7 @@ public interface ProcessInjectionTarget<X> {
     /**
      * Registers a definition error with the container, causing the container to abort deployment after bean discovery is
      * complete.
-     * 
+     *
      * @param t A {@link java.lang.Throwable} representing the definition error
      * @throws IllegalStateException if called outside of the observer method invocation
      */
diff --git a/api/src/main/java/jakarta/enterprise/inject/spi/ProcessManagedBean.java b/api/src/main/java/jakarta/enterprise/inject/spi/ProcessManagedBean.java
index 9b10bd861..3fe223e26 100644
--- a/api/src/main/java/jakarta/enterprise/inject/spi/ProcessManagedBean.java
+++ b/api/src/main/java/jakarta/enterprise/inject/spi/ProcessManagedBean.java
@@ -8,7 +8,7 @@
  * You may obtain a copy of the License at
  * http://www.apache.org/licenses/LICENSE-2.0
  * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,  
+ * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
@@ -28,7 +28,9 @@
  * error by the container.
  * </p>
  *
- * <p>CDI Lite implementations are not required to provide support for Portable Extensions.</p>
+ * <p>
+ * CDI Lite implementations are not required to provide support for Portable Extensions.
+ * </p>
  *
  * @author David Allen
  * @param <X> The class of the bean
@@ -36,7 +38,7 @@
 public interface ProcessManagedBean<X> extends ProcessBean<X> {
     /**
      * Returns the {@link AnnotatedType} representing the bean class.
-     * 
+     *
      * @return the {@link AnnotatedType} for the bean being registered
      * @throws IllegalStateException if called outside of the observer method invocation
      */
diff --git a/api/src/main/java/jakarta/enterprise/inject/spi/ProcessObserverMethod.java b/api/src/main/java/jakarta/enterprise/inject/spi/ProcessObserverMethod.java
index b3c6589a6..bc49c7104 100644
--- a/api/src/main/java/jakarta/enterprise/inject/spi/ProcessObserverMethod.java
+++ b/api/src/main/java/jakarta/enterprise/inject/spi/ProcessObserverMethod.java
@@ -8,7 +8,7 @@
  * You may obtain a copy of the License at
  * http://www.apache.org/licenses/LICENSE-2.0
  * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,  
+ * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
@@ -25,12 +25,15 @@
  * enabled bean, before registering the {@link ObserverMethod} object.
  * </p>
  * <p>
- * For a custom implementation of {@link ObserverMethod}, the container must raise an event of type {@link ProcessSyntheticObserverMethod}.
+ * For a custom implementation of {@link ObserverMethod}, the container must raise an event of type
+ * {@link ProcessSyntheticObserverMethod}.
  * </p>
  * <p>
- * Any observer of this event is permitted to wrap and/or replace the {@link ObserverMethod} by calling either {@link #setObserverMethod(ObserverMethod)} or {@link #configureObserverMethod()}.
+ * Any observer of this event is permitted to wrap and/or replace the {@link ObserverMethod} by calling either
+ * {@link #setObserverMethod(ObserverMethod)} or {@link #configureObserverMethod()}.
  * If both methods are called within an observer notification an {@link IllegalStateException} is thrown.
- * The container must use the final value of this property, after all observers have been called, he container must use the final
+ * The container must use the final value of this property, after all observers have been called, he container must use the
+ * final
  * value of this property, after all observers have been called, whenever it performs observer resolution.
  * </p>
  * <p>
@@ -38,22 +41,25 @@
  * error by the container.
  * </p>
  *
- * <p>CDI Lite implementations are not required to provide support for Portable Extensions.</p>
+ * <p>
+ * CDI Lite implementations are not required to provide support for Portable Extensions.
+ * </p>
  *
  * @see ObserverMethod
  * @author Gavin King
  * @author David Allen
- * @author  Antoine Sabot-Durand
+ * @author Antoine Sabot-Durand
  * @param <T> The type of the event being observed
  * @param <X> The bean type containing the observer method
  */
 public interface ProcessObserverMethod<T, X> {
-    
+
     /**
      * The {@link AnnotatedMethod} representing the observer method.
-     * 
+     *
      * <p>
-     * If invoked upon a {@link ProcessSyntheticObserverMethod} event, non-portable behavior results and the returned value should be ignored.
+     * If invoked upon a {@link ProcessSyntheticObserverMethod} event, non-portable behavior results and the returned value
+     * should be ignored.
      * </p>
      *
      * @return the {@link AnnotatedMethod} representing the observer method
@@ -74,7 +80,7 @@ public interface ProcessObserverMethod<T, X> {
     /**
      * Registers a definition error with the container, causing the container to abort deployment after bean discovery is
      * complete.
-     * 
+     *
      * @param t A {@link java.lang.Throwable} representing the definition error
      * @throws IllegalStateException if called outside of the observer method invocation
      */
@@ -104,7 +110,7 @@ public interface ProcessObserverMethod<T, X> {
 
     /**
      * Forces the container to ignore the observer method.
-     * 
+     *
      * @throws IllegalStateException if called outside of the observer method invocation
      * @since 2.0
      */
diff --git a/api/src/main/java/jakarta/enterprise/inject/spi/ProcessProducer.java b/api/src/main/java/jakarta/enterprise/inject/spi/ProcessProducer.java
index 3475d27eb..167cff500 100644
--- a/api/src/main/java/jakarta/enterprise/inject/spi/ProcessProducer.java
+++ b/api/src/main/java/jakarta/enterprise/inject/spi/ProcessProducer.java
@@ -8,7 +8,7 @@
  * You may obtain a copy of the License at
  * http://www.apache.org/licenses/LICENSE-2.0
  * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,  
+ * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
@@ -34,7 +34,7 @@
  * For example, this observer decorates the {@code Producer} for the all producer methods and field of type
  * {@code EntityManager}.
  * </p>
- * 
+ *
  * <pre>
  * void decorateEntityManager(@Observes ProcessProducer&lt;?, EntityManager&gt; pp) {
  *     pit.setProducer(decorate(pp.getProducer()));
@@ -45,7 +45,9 @@
  * by the container.
  * </p>
  *
- * <p>CDI Lite implementations are not required to provide support for Portable Extensions.</p>
+ * <p>
+ * CDI Lite implementations are not required to provide support for Portable Extensions.
+ * </p>
  *
  * @see Producer
  * @author David Allen
@@ -56,7 +58,7 @@ public interface ProcessProducer<T, X> {
     /**
      * Returns the {@link AnnotatedField} representing the producer field or the
      * {@link AnnotatedMethod} representing the producer method.
-     * 
+     *
      * @return the {@link AnnotatedMember} representing the producer
      * @throws IllegalStateException if called outside of the observer method invocation
      */
@@ -65,7 +67,7 @@ public interface ProcessProducer<T, X> {
     /**
      * Returns the {@link Producer} object that will be used by the container to call the producer
      * method or read the producer field.
-     * 
+     *
      * @return the {@link Producer} invoker object used by the container
      * @throws IllegalStateException if called outside of the observer method invocation
      */
@@ -74,20 +76,20 @@ public interface ProcessProducer<T, X> {
     /**
      * Replaces the {@link Producer} object that will be used by the container to call the producer
      * method or read the producer field.
-     * 
+     *
      * @param producer the new {@link Producer} object to use
      * @throws IllegalStateException if called outside of the observer method invocation
      */
     public void setProducer(Producer<X> producer);
-    
+
     /**
      * Returns a {@link ProducerConfigurator} initialized with the {@link Producer} processed by this event, to configure a new
      * {@link Producer} that will replace the original one at the end of the observer invocation.
-     * 
+     *
      * <p>
      * Each call returns the same configurator instance within an observer notification.
      * </p>
-     * 
+     *
      * @return a non reusable {@link ProducerConfigurator} to configure the original
      *         {@link Producer}.
      * @throws IllegalStateException if called outside of the observer method invocation
@@ -98,7 +100,7 @@ public interface ProcessProducer<T, X> {
     /**
      * Registers a definition error with the container, causing the container to abort deployment after bean discovery is
      * complete.
-     * 
+     *
      * @param t The definition error to register as a {@link java.lang.Throwable}
      * @throws IllegalStateException if called outside of the observer method invocation
      */
diff --git a/api/src/main/java/jakarta/enterprise/inject/spi/ProcessProducerField.java b/api/src/main/java/jakarta/enterprise/inject/spi/ProcessProducerField.java
index 5d103f5f3..11a172ea8 100644
--- a/api/src/main/java/jakarta/enterprise/inject/spi/ProcessProducerField.java
+++ b/api/src/main/java/jakarta/enterprise/inject/spi/ProcessProducerField.java
@@ -8,7 +8,7 @@
  * You may obtain a copy of the License at
  * http://www.apache.org/licenses/LICENSE-2.0
  * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,  
+ * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
@@ -25,17 +25,19 @@
  * error by the container.
  * </p>
  *
- * <p>CDI Lite implementations are not required to provide support for Portable Extensions.</p>
+ * <p>
+ * CDI Lite implementations are not required to provide support for Portable Extensions.
+ * </p>
  *
  * @author David Allen
  * @param <T> The type of the producer field
  * @param <X> The class of the bean declaring the producer field
- * 
+ *
  */
 public interface ProcessProducerField<T, X> extends ProcessBean<X> {
     /**
      * Returns the {@link AnnotatedField} representing the producer field.
-     * 
+     *
      * @return the {@link AnnotatedField} for the producer field being registered
      * @throws IllegalStateException if called outside of the observer method invocation
      */
@@ -44,7 +46,7 @@ public interface ProcessProducerField<T, X> extends ProcessBean<X> {
     /**
      * Returns the {@link AnnotatedParameter} for any matching injection point of the same type as
      * the producer field return type found on a disposal method.
-     * 
+     *
      * @return the disposal method's {@link AnnotatedParameter}
      * @throws IllegalStateException if called outside of the observer method invocation
      * @since 1.1
diff --git a/api/src/main/java/jakarta/enterprise/inject/spi/ProcessProducerMethod.java b/api/src/main/java/jakarta/enterprise/inject/spi/ProcessProducerMethod.java
index 2fcade8d7..1d0cd2877 100644
--- a/api/src/main/java/jakarta/enterprise/inject/spi/ProcessProducerMethod.java
+++ b/api/src/main/java/jakarta/enterprise/inject/spi/ProcessProducerMethod.java
@@ -8,7 +8,7 @@
  * You may obtain a copy of the License at
  * http://www.apache.org/licenses/LICENSE-2.0
  * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,  
+ * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
@@ -25,7 +25,9 @@
  * error by the container.
  * </p>
  *
- * <p>CDI Lite implementations are not required to provide support for Portable Extensions.</p>
+ * <p>
+ * CDI Lite implementations are not required to provide support for Portable Extensions.
+ * </p>
  *
  * @author David Allen
  * @param <T> The return type of the producer method
@@ -34,7 +36,7 @@
 public interface ProcessProducerMethod<T, X> extends ProcessBean<X> {
     /**
      * Returns the {@link AnnotatedMethod} representing the producer method.
-     * 
+     *
      * @return the {@link AnnotatedMethod} for the producer method being registered
      * @throws IllegalStateException if called outside of the observer method invocation
      */
@@ -43,7 +45,7 @@ public interface ProcessProducerMethod<T, X> extends ProcessBean<X> {
     /**
      * Returns the {@link AnnotatedParameter} for any matching injection point of the same type as
      * the producer method return type found on a disposal method.
-     * 
+     *
      * @return the disposal method's {@link AnnotatedParameter}
      * @throws IllegalStateException if called outside of the observer method invocation
      */
diff --git a/api/src/main/java/jakarta/enterprise/inject/spi/ProcessSessionBean.java b/api/src/main/java/jakarta/enterprise/inject/spi/ProcessSessionBean.java
index 531f18462..7f1a93aaa 100644
--- a/api/src/main/java/jakarta/enterprise/inject/spi/ProcessSessionBean.java
+++ b/api/src/main/java/jakarta/enterprise/inject/spi/ProcessSessionBean.java
@@ -8,7 +8,7 @@
  * You may obtain a copy of the License at
  * http://www.apache.org/licenses/LICENSE-2.0
  * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,  
+ * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
@@ -21,27 +21,29 @@
  * The container fires an event of this type for each enabled session bean, before registering the
  * {@link Bean} object.
  * </p>
- * 
+ *
  * <p>
  * If any observer method of a {@code ProcessSessionBean} event throws an exception, the exception is treated as a definition
  * error by the container.
  * </p>
- * 
+ *
  * <p>
  * Note that the type parameter of the super-interface of {@link ProcessSessionBean} is {@link Object} as {@link ProcessBean}
  * allows you access to the {@link Bean}, which in turn allows you to instantiate an instance, which, for interface-view EJBs
  * will not be an instance of X.
  * </p>
  *
- * <p>CDI Lite implementations are not required to provide support for Portable Extensions.</p>
- * 
+ * <p>
+ * CDI Lite implementations are not required to provide support for Portable Extensions.
+ * </p>
+ *
  * @author David Allen
  * @param <X> session bean type
  */
 public interface ProcessSessionBean<X> extends ProcessManagedBean<Object> {
     /**
      * Returns the EJB name of the session bean.
-     * 
+     *
      * @return the name of the EJB
      * @throws IllegalStateException if called outside of the observer method invocation
      */
@@ -49,7 +51,7 @@ public interface ProcessSessionBean<X> extends ProcessManagedBean<Object> {
 
     /**
      * Returns a {@link SessionBeanType} representing the kind of session bean.
-     * 
+     *
      * @return the {@link SessionBeanType}
      * @throws IllegalStateException if called outside of the observer method invocation
      */
diff --git a/api/src/main/java/jakarta/enterprise/inject/spi/ProcessSyntheticAnnotatedType.java b/api/src/main/java/jakarta/enterprise/inject/spi/ProcessSyntheticAnnotatedType.java
index 02b071f51..b9fa05809 100644
--- a/api/src/main/java/jakarta/enterprise/inject/spi/ProcessSyntheticAnnotatedType.java
+++ b/api/src/main/java/jakarta/enterprise/inject/spi/ProcessSyntheticAnnotatedType.java
@@ -8,7 +8,7 @@
  * You may obtain a copy of the License at
  * http://www.apache.org/licenses/LICENSE-2.0
  * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,  
+ * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
@@ -31,7 +31,7 @@
  * For example, the following observer decorates the {@link AnnotatedType} for every class that is
  * added by {@link BeforeBeanDiscovery#addAnnotatedType(AnnotatedType, String)}.
  * </p>
- * 
+ *
  * <pre>
  * public &lt;T&gt; void decorateAnnotatedType(@Observes ProcessSyntheticAnnotatedType&lt;T&gt; pat) {
  *     pat.setAnnotatedType(decorate(pat.getAnnotatedType()));
@@ -42,7 +42,9 @@
  * definition error by the container.
  * </p>
  *
- * <p>CDI Lite implementations are not required to provide support for Portable Extensions.</p>
+ * <p>
+ * CDI Lite implementations are not required to provide support for Portable Extensions.
+ * </p>
  *
  * @author David Allen
  * @author Pete Muir
@@ -54,7 +56,7 @@
 public interface ProcessSyntheticAnnotatedType<X> extends ProcessAnnotatedType<X> {
     /**
      * Get the extension instance which added the {@link AnnotatedType} for which this event is being fired.
-     * 
+     *
      * @return the extension instance
      * @throws IllegalStateException if called outside of the observer method invocation
      */
diff --git a/api/src/main/java/jakarta/enterprise/inject/spi/ProcessSyntheticBean.java b/api/src/main/java/jakarta/enterprise/inject/spi/ProcessSyntheticBean.java
index ecf68a3b0..7bb8f828d 100644
--- a/api/src/main/java/jakarta/enterprise/inject/spi/ProcessSyntheticBean.java
+++ b/api/src/main/java/jakarta/enterprise/inject/spi/ProcessSyntheticBean.java
@@ -8,7 +8,7 @@
  * You may obtain a copy of the License at
  * http://www.apache.org/licenses/LICENSE-2.0
  * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,  
+ * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
@@ -26,7 +26,9 @@
  * error by the container.
  * </p>
  *
- * <p>CDI Lite implementations are not required to provide support for Portable Extensions.</p>
+ * <p>
+ * CDI Lite implementations are not required to provide support for Portable Extensions.
+ * </p>
  *
  * @author Martin Kouba
  * @param <X> The class of the bean
@@ -36,7 +38,7 @@ public interface ProcessSyntheticBean<X> extends ProcessBean<X> {
 
     /**
      * Get the extension instance which added the {@link Bean} for which this event is being fired.
-     * 
+     *
      * @return the extension instance
      * @throws IllegalStateException if called outside of the observer method invocation
      */
diff --git a/api/src/main/java/jakarta/enterprise/inject/spi/ProcessSyntheticObserverMethod.java b/api/src/main/java/jakarta/enterprise/inject/spi/ProcessSyntheticObserverMethod.java
index f8b53b831..0fd4bb6b8 100644
--- a/api/src/main/java/jakarta/enterprise/inject/spi/ProcessSyntheticObserverMethod.java
+++ b/api/src/main/java/jakarta/enterprise/inject/spi/ProcessSyntheticObserverMethod.java
@@ -8,7 +8,7 @@
  * You may obtain a copy of the License at
  * http://www.apache.org/licenses/LICENSE-2.0
  * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,  
+ * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
@@ -23,11 +23,14 @@
  * registering the {@link ObserverMethod} object.
  * </p>
  * <p>
- * If any observer method of a {@code ProcessSyntheticObserverMethod} event throws an exception, the exception is treated as a definition
+ * If any observer method of a {@code ProcessSyntheticObserverMethod} event throws an exception, the exception is treated as a
+ * definition
  * error by the container.
  * </p>
  *
- * <p>CDI Lite implementations are not required to provide support for Portable Extensions.</p>
+ * <p>
+ * CDI Lite implementations are not required to provide support for Portable Extensions.
+ * </p>
  *
  * @see ObserverMethod
  * @author Martin Kouba
@@ -39,7 +42,7 @@ public interface ProcessSyntheticObserverMethod<T, X> extends ProcessObserverMet
 
     /**
      * Get the extension instance which added the {@link ObserverMethod} for which this event is being fired.
-     * 
+     *
      * @return the extension instance
      * @throws IllegalStateException if called outside of the observer method invocation
      */
diff --git a/api/src/main/java/jakarta/enterprise/inject/spi/Producer.java b/api/src/main/java/jakarta/enterprise/inject/spi/Producer.java
index 7d3a438df..0b2a3b730 100644
--- a/api/src/main/java/jakarta/enterprise/inject/spi/Producer.java
+++ b/api/src/main/java/jakarta/enterprise/inject/spi/Producer.java
@@ -8,7 +8,7 @@
  * You may obtain a copy of the License at
  * http://www.apache.org/licenses/LICENSE-2.0
  * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,  
+ * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
@@ -24,8 +24,10 @@
  * Provides a generic operation for producing an instance of a type.
  * </p>
  *
- * <p>CDI Lite implementations are not required to provide support for {@code Producer}.</p>
- * 
+ * <p>
+ * CDI Lite implementations are not required to provide support for {@code Producer}.
+ * </p>
+ *
  * @author Pete Muir
  * @author David Allen
  * @param <T> The class of object produced by the producer
@@ -36,15 +38,17 @@ public interface Producer<T> {
      * Causes an instance to be produced via the {@code Producer}.
      * </p>
      * <p>
-     * If the {@code Producer} represents a class, this will invoke the constructor annotated {@link jakarta.inject.Inject} if it
-     * exists, or the constructor with no parameters otherwise. If the class has interceptors, <code>produce()</code> is responsible
+     * If the {@code Producer} represents a class, this will invoke the constructor annotated {@link jakarta.inject.Inject} if
+     * it
+     * exists, or the constructor with no parameters otherwise. If the class has interceptors, <code>produce()</code> is
+     * responsible
      * for building the interceptors and decorators of the instance.
      * </p>
      * <p>
      * If the {@code Producer} represents a producer field or method, this will invoke the producer method on, or access the
      * producer field of, a contextual instance of the bean that declares the producer.
      * </p>
-     * 
+     *
      * @param ctx The {@link CreationalContext} to use for the produced object
      * @return the instance produced
      */
@@ -62,7 +66,7 @@ public interface Producer<T> {
      * instance of the bean that declares the disposer method or performs any additional required cleanup, if any, to destroy
      * state associated with a resource.
      * </p>
-     * 
+     *
      * @param instance The instance to dispose
      */
     public void dispose(T instance);
@@ -74,7 +78,7 @@ public interface Producer<T> {
      * method parameters. For a producer method, this returns the set of {@code InjectionPoint} objects representing all
      * parameters of the producer method.
      * </p>
-     * 
+     *
      * @return the set of all {@linkplain InjectionPoint injection points} for the producer
      */
     public Set<InjectionPoint> getInjectionPoints();
diff --git a/api/src/main/java/jakarta/enterprise/inject/spi/ProducerFactory.java b/api/src/main/java/jakarta/enterprise/inject/spi/ProducerFactory.java
index 94f3229d2..bb790af0e 100644
--- a/api/src/main/java/jakarta/enterprise/inject/spi/ProducerFactory.java
+++ b/api/src/main/java/jakarta/enterprise/inject/spi/ProducerFactory.java
@@ -8,7 +8,7 @@
  * You may obtain a copy of the License at
  * http://www.apache.org/licenses/LICENSE-2.0
  * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,  
+ * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
@@ -20,29 +20,31 @@
  * <p>
  * An {@link ProducerFactory} can create an {@link Producer} for a given bean.
  * </p>
- * 
+ *
  * <p>
  * The {@link ProducerFactory} obtained from {@link BeanManager#getProducerFactory(AnnotatedMethod, Bean)} or
  * {@link BeanManager#getProducerFactory(AnnotatedField, Bean)} is capable of providing container created
  * producers. This factory can be wrapped to add behavior to container created producers.
  * </p>
- * 
+ *
  * <p>
  * For example:
  * </p>
- * 
+ *
  * <pre>
  * BeanAttributes&lt;MyBean&gt; myBeanAttributes = beanManager.createBeanAttributes(myBeanAnnotatedFieldField);
  * beanManager.createBean(myBeanAttributes, MyBean.class, new ProducerFactory() {
- * 
+ *
  *     public &lt;T&gt; Producer&lt;T&gt; createProducer(Bean&lt;T&gt; bean) {
  *         return new WrappingProducer&lt;T&gt;(beanManager.getProducerFactory(myBeanAnnotatedField).createProducer(bean));
  *     }
  * });
  * </pre>
  *
- * <p>CDI Lite implementations are not required to provide support for {@code ProducerFactory}.</p>
- * 
+ * <p>
+ * CDI Lite implementations are not required to provide support for {@code ProducerFactory}.
+ * </p>
+ *
  * @author Pete Muir
  * @since 1.1
  * @param <X> type of the bean containing the producer
diff --git a/api/src/main/java/jakarta/enterprise/inject/spi/SecurityActions.java b/api/src/main/java/jakarta/enterprise/inject/spi/SecurityActions.java
index 56aa55bbb..357475048 100644
--- a/api/src/main/java/jakarta/enterprise/inject/spi/SecurityActions.java
+++ b/api/src/main/java/jakarta/enterprise/inject/spi/SecurityActions.java
@@ -35,7 +35,6 @@ private SecurityActions() {
 
     static <T> ServiceLoader<T> loadService(Class<T> service, ClassLoader classLoader) {
         return AccessController.doPrivileged(
-                (PrivilegedAction<ServiceLoader<T>>) () -> ServiceLoader.load(service, classLoader)
-        );
+                (PrivilegedAction<ServiceLoader<T>>) () -> ServiceLoader.load(service, classLoader));
     }
 }
diff --git a/api/src/main/java/jakarta/enterprise/inject/spi/SessionBeanType.java b/api/src/main/java/jakarta/enterprise/inject/spi/SessionBeanType.java
index 4c6ce69b0..cca23a954 100644
--- a/api/src/main/java/jakarta/enterprise/inject/spi/SessionBeanType.java
+++ b/api/src/main/java/jakarta/enterprise/inject/spi/SessionBeanType.java
@@ -8,7 +8,7 @@
  * You may obtain a copy of the License at
  * http://www.apache.org/licenses/LICENSE-2.0
  * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,  
+ * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
@@ -17,9 +17,9 @@
 
 /**
  * Identifies the kind of EJB session bean.
- * 
+ *
  * @author Gavin King
- * 
+ *
  */
 public enum SessionBeanType {
     /**
diff --git a/api/src/main/java/jakarta/enterprise/inject/spi/Unmanaged.java b/api/src/main/java/jakarta/enterprise/inject/spi/Unmanaged.java
index 2e6a96b5e..becb23501 100644
--- a/api/src/main/java/jakarta/enterprise/inject/spi/Unmanaged.java
+++ b/api/src/main/java/jakarta/enterprise/inject/spi/Unmanaged.java
@@ -8,7 +8,7 @@
  * You may obtain a copy of the License at
  * http://www.apache.org/licenses/LICENSE-2.0
  * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,  
+ * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
@@ -22,7 +22,7 @@
  * <p>
  * Helper class for injecting and calling lifecycle callbacks unmanaged instances for use by framework and library integrators.
  * </p>
- * 
+ *
  * <pre>
  * Unmanaged&lt;Foo&gt; unmanagedFoo = new Unmanaged&lt;Foo&gt;(Foo.class);
  * UnmanagedInstance&lt;Foo&gt; fooInstance = unmanagedFoo.newInstance();
@@ -30,16 +30,18 @@
  * ... // Use the foo instance
  * fooInstance.preDestroy().dispose();
  * </pre>
- * 
+ *
  * <p>
  * An instance of this class can be safely held for the lifetime of the application.
  * </p>
- * 
+ *
  * <p>
  * {@link UnmanagedInstance}s created by this class are not suitable for sharing between threads.
  * </p>
  *
- * <p>CDI Lite implementations are not required to provide support for {@code Unmanaged}.</p>
+ * <p>
+ * CDI Lite implementations are not required to provide support for {@code Unmanaged}.
+ * </p>
  *
  * @author Pete Muir
  * @since 1.1
@@ -52,6 +54,7 @@ public class Unmanaged<T> {
 
     /**
      * Create an injector for the given class
+     *
      * @param manager the {@link BeanManager}
      * @param clazz class of the unmanaged instances
      */
@@ -63,6 +66,7 @@ public Unmanaged(BeanManager manager, Class<T> clazz) {
 
     /**
      * Create an injector for the given class, using the current bean manager
+     *
      * @param clazz class of the unmanaged instances
      */
     public Unmanaged(Class<T> clazz) {
@@ -80,7 +84,7 @@ public UnmanagedInstance<T> newInstance() {
 
     /**
      * Represents a non-contextual instance.
-     * 
+     *
      * @see Unmanaged
      */
     public static class UnmanagedInstance<T> {
@@ -97,6 +101,7 @@ private UnmanagedInstance(BeanManager beanManager, InjectionTarget<T> injectionT
 
         /**
          * Get the instance
+         *
          * @return the instance
          */
         public T get() {
@@ -105,7 +110,7 @@ public T get() {
 
         /**
          * Create the instance
-         * 
+         *
          * @throws IllegalStateException if produce() is called on an already produced instance
          * @throws IllegalStateException if produce() is called on an instance that has already been disposed
          * @return self
@@ -123,7 +128,7 @@ public UnmanagedInstance<T> produce() {
 
         /**
          * Inject the instance
-         * 
+         *
          * @throws IllegalStateException if inject() is called before produce() is called
          * @throws IllegalStateException if inject() is called on an instance that has already been disposed
          * @return self
@@ -141,7 +146,7 @@ public UnmanagedInstance<T> inject() {
 
         /**
          * Call the @PostConstruct callback
-         * 
+         *
          * @throws IllegalStateException if postConstruct() is called before produce() is called
          * @throws IllegalStateException if postConstruct() is called on an instance that has already been disposed
          * @return self
@@ -159,7 +164,7 @@ public UnmanagedInstance<T> postConstruct() {
 
         /**
          * Call the @PreDestroy callback
-         * 
+         *
          * @throws IllegalStateException if preDestroy() is called before produce() is called
          * @throws IllegalStateException if preDestroy() is called on an instance that has already been disposed
          * @return self
@@ -177,7 +182,7 @@ public UnmanagedInstance<T> preDestroy() {
 
         /**
          * Dispose of the instance, doing any necessary cleanup
-         * 
+         *
          * @throws IllegalStateException if dispose() is called before produce() is called
          * @throws IllegalStateException if dispose() is called on an instance that has already been disposed
          * @return self
diff --git a/api/src/main/java/jakarta/enterprise/inject/spi/WithAnnotations.java b/api/src/main/java/jakarta/enterprise/inject/spi/WithAnnotations.java
index 23b96d8d8..b6b7460d8 100644
--- a/api/src/main/java/jakarta/enterprise/inject/spi/WithAnnotations.java
+++ b/api/src/main/java/jakarta/enterprise/inject/spi/WithAnnotations.java
@@ -8,7 +8,7 @@
  * You may obtain a copy of the License at
  * http://www.apache.org/licenses/LICENSE-2.0
  * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,  
+ * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
@@ -28,15 +28,19 @@
  * {@link WithAnnotations} may be applied to any portable extension observer method with an event parameter type of
  * {@link ProcessAnnotatedType} to filter the events delivered.
  * </p>
- * 
+ *
  * <p>
  * If the {@link WithAnnotations} annotation is applied to a portable extension observer method, then only
  * {@link ProcessAnnotatedType} events for types which have at least one of the annotations specified are observed. The
- * annotation can appear on the annotated type, or on any member, or any parameter of any member of the annotated type, as defined 
- * in section <a href="https://docs.jboss.org/cdi/spec/1.2/cdi-spec.html#alternative_metadata_sources">11.4 Alternative metadata sources</a>.
+ * annotation can appear on the annotated type, or on any member, or any parameter of any member of the annotated type, as
+ * defined
+ * in section <a href="https://docs.jboss.org/cdi/spec/1.2/cdi-spec.html#alternative_metadata_sources">11.4 Alternative metadata
+ * sources</a>.
  * The annotation may be applied as a meta-annotation on any annotation considered.
  *
- * <p>CDI Lite implementations are not required to provide support for Portable Extensions.</p>
+ * <p>
+ * CDI Lite implementations are not required to provide support for Portable Extensions.
+ * </p>
  *
  * @author Pete Muir
  * @since 1.1
diff --git a/api/src/main/java/jakarta/enterprise/inject/spi/configurator/AnnotatedConstructorConfigurator.java b/api/src/main/java/jakarta/enterprise/inject/spi/configurator/AnnotatedConstructorConfigurator.java
index 83396c19e..8b420aadb 100644
--- a/api/src/main/java/jakarta/enterprise/inject/spi/configurator/AnnotatedConstructorConfigurator.java
+++ b/api/src/main/java/jakarta/enterprise/inject/spi/configurator/AnnotatedConstructorConfigurator.java
@@ -27,7 +27,9 @@
  *
  * This interface is part of the {@link AnnotatedTypeConfigurator} SPI and helps defining an {@link AnnotatedConstructor}
  *
- * <p>CDI Lite implementations are not required to provide support for Portable Extensions.</p>
+ * <p>
+ * CDI Lite implementations are not required to provide support for Portable Extensions.
+ * </p>
  *
  * @author Martin Kouba
  * @author Antoine Sabot-Durand
@@ -37,14 +39,14 @@
 public interface AnnotatedConstructorConfigurator<T> {
 
     /**
-     * 
+     *
      * @return the original {@link AnnotatedConstructor}
      */
     AnnotatedConstructor<T> getAnnotated();
 
     /**
      * Add an annotation to the constructor.
-     * 
+     *
      * @param annotation the annotation to add
      * @return self
      */
@@ -56,32 +58,32 @@ public interface AnnotatedConstructorConfigurator<T> {
      * <p>
      * Example predicates:
      * </p>
-     * 
+     *
      * <pre>
      *  {@code
      * // To remove all the annotations:
      * (a) -> true
-     * 
+     *
      * // To remove annotations with a concrete annotation type:
      * (a) -> a.annotationType().equals(Foo.class)
-     * 
+     *
      * // To remove annotation equal to a specified object:
      * (a) -> a.equals(fooAnnotation)
-     * 
+     *
      * // To remove annotations that are considered equivalent for the purposes of typesafe resolution:
      * (a) -> beanManager.areQualifiersEquivalent(a, fooQualifier)
      * (a) -> beanManager.areInterceptorBindingsEquivalent(a, fooInterceptorBinding)
      * }
      * </pre>
-     * 
+     *
      * @param predicate {@link Predicate} used to filter annotations to remove
      * @return self
      */
     AnnotatedConstructorConfigurator<T> remove(Predicate<Annotation> predicate);
-    
+
     /**
      * Remove all the annotations.
-     * 
+     *
      * @return self
      */
     default AnnotatedConstructorConfigurator<T> removeAll() {
@@ -89,14 +91,14 @@ default AnnotatedConstructorConfigurator<T> removeAll() {
     }
 
     /**
-     * 
+     *
      * @return an immutable list of {@link AnnotatedParameterConfigurator}s reflecting the
      *         {@link AnnotatedConstructor#getParameters()}
      */
     List<AnnotatedParameterConfigurator<T>> params();
 
     /**
-     * 
+     *
      * @param predicate Testing the original {@link AnnotatedParameter}
      * @return a sequence of {@link AnnotatedParameterConfigurator}s matching the given predicate
      * @see AnnotatedParameterConfigurator#getAnnotated()
diff --git a/api/src/main/java/jakarta/enterprise/inject/spi/configurator/AnnotatedFieldConfigurator.java b/api/src/main/java/jakarta/enterprise/inject/spi/configurator/AnnotatedFieldConfigurator.java
index 096289045..a109f79c9 100644
--- a/api/src/main/java/jakarta/enterprise/inject/spi/configurator/AnnotatedFieldConfigurator.java
+++ b/api/src/main/java/jakarta/enterprise/inject/spi/configurator/AnnotatedFieldConfigurator.java
@@ -23,7 +23,9 @@
 /**
  * This interface is part of the {@link AnnotatedTypeConfigurator} SPI and helps defining an {@link AnnotatedField}
  *
- * <p>CDI Lite implementations are not required to provide support for Portable Extensions.</p>
+ * <p>
+ * CDI Lite implementations are not required to provide support for Portable Extensions.
+ * </p>
  *
  * @author Martin Kouba
  * @author Antoine Sabot-Durand
@@ -31,16 +33,16 @@
  * @param <T> the class declaring the field
  */
 public interface AnnotatedFieldConfigurator<T> {
-    
+
     /**
-     * 
+     *
      * @return the original {@link AnnotatedField}
      */
     AnnotatedField<T> getAnnotated();
-    
+
     /**
      * Add an annotation to the field.
-     * 
+     *
      * @param annotation the annotation to add
      * @return self
      */
@@ -52,32 +54,32 @@ public interface AnnotatedFieldConfigurator<T> {
      * <p>
      * Example predicates:
      * </p>
-     * 
+     *
      * <pre>
      *  {@code
      * // To remove all the annotations:
      * (a) -> true
-     * 
+     *
      * // To remove annotations with a concrete annotation type:
      * (a) -> a.annotationType().equals(Foo.class)
-     * 
+     *
      * // To remove annotation equal to a specified object:
      * (a) -> a.equals(fooAnnotation)
-     * 
+     *
      * // To remove annotations that are considered equivalent for the purposes of typesafe resolution:
      * (a) -> beanManager.areQualifiersEquivalent(a, fooQualifier)
      * (a) -> beanManager.areInterceptorBindingsEquivalent(a, fooInterceptorBinding)
      * }
      * </pre>
-     * 
+     *
      * @param predicate {@link Predicate} used to filter annotations to remove
      * @return self
      */
     AnnotatedFieldConfigurator<T> remove(Predicate<Annotation> predicate);
-    
+
     /**
      * Remove all the annotations.
-     * 
+     *
      * @return self
      */
     default AnnotatedFieldConfigurator<T> removeAll() {
diff --git a/api/src/main/java/jakarta/enterprise/inject/spi/configurator/AnnotatedMethodConfigurator.java b/api/src/main/java/jakarta/enterprise/inject/spi/configurator/AnnotatedMethodConfigurator.java
index 6012777f7..a257d0b11 100644
--- a/api/src/main/java/jakarta/enterprise/inject/spi/configurator/AnnotatedMethodConfigurator.java
+++ b/api/src/main/java/jakarta/enterprise/inject/spi/configurator/AnnotatedMethodConfigurator.java
@@ -26,7 +26,9 @@
 /**
  * This interface is part of the {@link AnnotatedTypeConfigurator} SPI and helps defining an {@link AnnotatedMethod}
  *
- * <p>CDI Lite implementations are not required to provide support for Portable Extensions.</p>
+ * <p>
+ * CDI Lite implementations are not required to provide support for Portable Extensions.
+ * </p>
  *
  * @author Martin Kouba
  * @author Antoine Sabot-Durand
@@ -36,7 +38,7 @@
 public interface AnnotatedMethodConfigurator<T> {
 
     /**
-     * 
+     *
      * @return the original {@link AnnotatedMethod}
      */
     AnnotatedMethod<T> getAnnotated();
@@ -55,24 +57,24 @@ public interface AnnotatedMethodConfigurator<T> {
      * <p>
      * Example predicates:
      * </p>
-     * 
+     *
      * <pre>
      *  {@code
      * // To remove all the annotations:
      * (a) -> true
-     * 
+     *
      * // To remove annotations with a concrete annotation type:
      * (a) -> a.annotationType().equals(Foo.class)
-     * 
+     *
      * // To remove annotation equal to a specified object:
      * (a) -> a.equals(fooAnnotation)
-     * 
+     *
      * // To remove annotations that are considered equivalent for the purposes of typesafe resolution:
      * (a) -> beanManager.areQualifiersEquivalent(a, fooQualifier)
      * (a) -> beanManager.areInterceptorBindingsEquivalent(a, fooInterceptorBinding)
      * }
      * </pre>
-     * 
+     *
      * @param predicate {@link Predicate} used to filter annotations to remove
      * @return self
      */
@@ -80,22 +82,22 @@ public interface AnnotatedMethodConfigurator<T> {
 
     /**
      * Remove all the annotations.
-     * 
+     *
      * @return self
      */
     default AnnotatedMethodConfigurator<T> removeAll() {
         return remove((a) -> true);
     }
-    
+
     /**
-     * 
+     *
      * @return an immutable list of {@link AnnotatedParameterConfigurator}s reflecting the
      *         {@link AnnotatedMethod#getParameters()}
      */
     List<AnnotatedParameterConfigurator<T>> params();
 
     /**
-     * 
+     *
      * @param predicate Testing the original {@link AnnotatedParameter}
      * @return a sequence of {@link AnnotatedParameterConfigurator}s matching the given predicate
      * @see AnnotatedParameterConfigurator#getAnnotated()
diff --git a/api/src/main/java/jakarta/enterprise/inject/spi/configurator/AnnotatedParameterConfigurator.java b/api/src/main/java/jakarta/enterprise/inject/spi/configurator/AnnotatedParameterConfigurator.java
index 71304e467..a4c16b565 100644
--- a/api/src/main/java/jakarta/enterprise/inject/spi/configurator/AnnotatedParameterConfigurator.java
+++ b/api/src/main/java/jakarta/enterprise/inject/spi/configurator/AnnotatedParameterConfigurator.java
@@ -24,7 +24,9 @@
  *
  * This interface is part of the {@link AnnotatedTypeConfigurator} SPI and helps defining an {@link AnnotatedParameter}
  *
- * <p>CDI Lite implementations are not required to provide support for Portable Extensions.</p>
+ * <p>
+ * CDI Lite implementations are not required to provide support for Portable Extensions.
+ * </p>
  *
  * @author Martin Kouba
  * @author Antoine Sabot-Durand
@@ -32,13 +34,13 @@
  * @param <T> the class containing the method declaring the parameter
  */
 public interface AnnotatedParameterConfigurator<T> {
-    
+
     /**
-     * 
+     *
      * @return the original {@link AnnotatedParameter}
      */
     AnnotatedParameter<T> getAnnotated();
-    
+
     /**
      * Add an annotation to the parameter.
      *
@@ -46,42 +48,42 @@ public interface AnnotatedParameterConfigurator<T> {
      * @return self
      */
     AnnotatedParameterConfigurator<T> add(Annotation annotation);
-    
+
     /**
      * Remove annotations that match the specified predicate.
      *
      * <p>
      * Example predicates:
      * </p>
-     * 
+     *
      * <pre>
      *  {@code
      * // To remove all the annotations:
      * (a) -> true
-     * 
+     *
      * // To remove annotations with a concrete annotation type:
      * (a) -> a.annotationType().equals(Foo.class)
-     * 
+     *
      * // To remove annotation equal to a specified object:
      * (a) -> a.equals(fooAnnotation)
-     * 
+     *
      * // To remove annotations that are considered equivalent for the purposes of typesafe resolution:
      * (a) -> beanManager.areQualifiersEquivalent(a, fooQualifier)
      * (a) -> beanManager.areInterceptorBindingsEquivalent(a, fooInterceptorBinding)
      * }
      * </pre>
-     * 
+     *
      * @param predicate {@link Predicate} used to filter annotations to remove
      * @return self
      */
     AnnotatedParameterConfigurator<T> remove(Predicate<Annotation> predicate);
-    
+
     /**
      * Remove all the annotations.
-     * 
+     *
      * @return self
      */
-    default     AnnotatedParameterConfigurator<T> removeAll() {
+    default AnnotatedParameterConfigurator<T> removeAll() {
         return remove((a) -> true);
     }
 
diff --git a/api/src/main/java/jakarta/enterprise/inject/spi/configurator/AnnotatedTypeConfigurator.java b/api/src/main/java/jakarta/enterprise/inject/spi/configurator/AnnotatedTypeConfigurator.java
index b1f6698b1..a25400479 100644
--- a/api/src/main/java/jakarta/enterprise/inject/spi/configurator/AnnotatedTypeConfigurator.java
+++ b/api/src/main/java/jakarta/enterprise/inject/spi/configurator/AnnotatedTypeConfigurator.java
@@ -34,16 +34,18 @@
  * This API is a helper to configure a new {@link AnnotatedType} instance. The container must provide an implementation of
  * this interface.
  * </p>
- * 
+ *
  * <p>
  * AnnotatedTypeConfigurator is not reusable.
  * </p>
- * 
+ *
  * <p>
  * This configurator is not thread safe and shall not be used concurrently.
  * </p>
  *
- * <p>CDI Lite implementations are not required to provide support for Portable Extensions.</p>
+ * <p>
+ * CDI Lite implementations are not required to provide support for Portable Extensions.
+ * </p>
  *
  * @see BeforeBeanDiscovery#addAnnotatedType(Class, String)
  * @see AfterTypeDiscovery#addAnnotatedType(Class, String)
@@ -56,7 +58,7 @@
 public interface AnnotatedTypeConfigurator<T> {
 
     /**
-     * 
+     *
      * @return the original {@link AnnotatedType}
      */
     AnnotatedType<T> getAnnotated();
@@ -75,32 +77,32 @@ public interface AnnotatedTypeConfigurator<T> {
      * <p>
      * Example predicates:
      * </p>
-     * 
+     *
      * <pre>
      *  {@code
      * // To remove all the annotations:
      * (a) -> true
-     * 
+     *
      * // To remove annotations with a concrete annotation type:
      * (a) -> a.annotationType().equals(Foo.class)
-     * 
+     *
      * // To remove annotation equal to a specified object:
      * (a) -> a.equals(fooAnnotation)
-     * 
+     *
      * // To remove annotations that are considered equivalent for the purposes of typesafe resolution:
      * (a) -> beanManager.areQualifiersEquivalent(a, fooQualifier)
      * (a) -> beanManager.areInterceptorBindingsEquivalent(a, fooInterceptorBinding)
      * }
      * </pre>
-     * 
+     *
      * @param predicate {@link Predicate} used to filter annotations to remove
      * @return self
      */
     AnnotatedTypeConfigurator<T> remove(Predicate<Annotation> predicate);
-    
+
     /**
      * Remove all the annotations.
-     * 
+     *
      * @return self
      */
     default AnnotatedTypeConfigurator<T> removeAll() {
@@ -108,7 +110,7 @@ default AnnotatedTypeConfigurator<T> removeAll() {
     }
 
     /**
-     * 
+     *
      * @return an immutable set of {@link AnnotatedMethodConfigurator}s reflecting the {@link AnnotatedType#getMethods()}
      */
     Set<AnnotatedMethodConfigurator<? super T>> methods();
@@ -123,7 +125,7 @@ default Stream<AnnotatedMethodConfigurator<? super T>> filterMethods(Predicate<A
     }
 
     /**
-     * 
+     *
      * @return an immutable set of {@link AnnotatedFieldConfigurator}s reflecting the {@link AnnotatedType#getFields()}
      */
     Set<AnnotatedFieldConfigurator<? super T>> fields();
@@ -138,14 +140,14 @@ default Stream<AnnotatedFieldConfigurator<? super T>> filterFields(Predicate<Ann
     }
 
     /**
-     * 
+     *
      * @return an immutable set of {@link AnnotatedConstructorConfigurator}s reflecting the
      *         {@link AnnotatedType#getConstructors()}
      */
     Set<AnnotatedConstructorConfigurator<T>> constructors();
 
     /**
-     * 
+     *
      * @param predicate Testing the original {@link AnnotatedConstructor}
      * @return a sequence of {@link AnnotatedConstructorConfigurator}s matching the given predicate
      * @see AnnotatedConstructorConfigurator#getAnnotated()
diff --git a/api/src/main/java/jakarta/enterprise/inject/spi/configurator/BeanAttributesConfigurator.java b/api/src/main/java/jakarta/enterprise/inject/spi/configurator/BeanAttributesConfigurator.java
index 5fdae6e7c..715b8ce42 100644
--- a/api/src/main/java/jakarta/enterprise/inject/spi/configurator/BeanAttributesConfigurator.java
+++ b/api/src/main/java/jakarta/enterprise/inject/spi/configurator/BeanAttributesConfigurator.java
@@ -15,20 +15,23 @@
  */
 package jakarta.enterprise.inject.spi.configurator;
 
-import jakarta.enterprise.inject.spi.BeanAttributes;
-import jakarta.enterprise.inject.spi.ProcessBeanAttributes;
-import jakarta.enterprise.util.TypeLiteral;
 import java.lang.annotation.Annotation;
 import java.lang.reflect.Type;
 import java.util.Set;
 
+import jakarta.enterprise.inject.spi.BeanAttributes;
+import jakarta.enterprise.inject.spi.ProcessBeanAttributes;
+import jakarta.enterprise.util.TypeLiteral;
+
 /**
  * This API is an helper to configure a new {@link BeanAttributes} instance.
  * CDI container must provides an implementation of this interface.
  *
  * This configurator is not thread safe and shall not be used concurrently.
  *
- * <p>CDI Lite implementations are not required to provide support for Portable Extensions.</p>
+ * <p>
+ * CDI Lite implementations are not required to provide support for Portable Extensions.
+ * </p>
  *
  * @see ProcessBeanAttributes#configureBeanAttributes()
  * @param <T> the class of the bean instance
diff --git a/api/src/main/java/jakarta/enterprise/inject/spi/configurator/BeanConfigurator.java b/api/src/main/java/jakarta/enterprise/inject/spi/configurator/BeanConfigurator.java
index db12cf9ca..3d0f1ac91 100644
--- a/api/src/main/java/jakarta/enterprise/inject/spi/configurator/BeanConfigurator.java
+++ b/api/src/main/java/jakarta/enterprise/inject/spi/configurator/BeanConfigurator.java
@@ -38,7 +38,9 @@
  *
  * This builder is not thread safe and shall not be used concurrently.
  *
- * <p>CDI Lite implementations are not required to provide support for Portable Extensions.</p>
+ * <p>
+ * CDI Lite implementations are not required to provide support for Portable Extensions.
+ * </p>
  *
  * @see AfterBeanDiscovery#addBean()
  * @author Martin Kouba
diff --git a/api/src/main/java/jakarta/enterprise/inject/spi/configurator/InjectionPointConfigurator.java b/api/src/main/java/jakarta/enterprise/inject/spi/configurator/InjectionPointConfigurator.java
index 2048fafcc..a8dca511d 100644
--- a/api/src/main/java/jakarta/enterprise/inject/spi/configurator/InjectionPointConfigurator.java
+++ b/api/src/main/java/jakarta/enterprise/inject/spi/configurator/InjectionPointConfigurator.java
@@ -16,19 +16,22 @@
 
 package jakarta.enterprise.inject.spi.configurator;
 
-import jakarta.enterprise.inject.spi.InjectionPoint;
-import jakarta.enterprise.inject.spi.ProcessInjectionPoint;
 import java.lang.annotation.Annotation;
 import java.lang.reflect.Type;
 import java.util.Set;
 
+import jakarta.enterprise.inject.spi.InjectionPoint;
+import jakarta.enterprise.inject.spi.ProcessInjectionPoint;
+
 /**
  * This API is an helper to configure an existing {@link InjectionPoint} instance.
  * CDI container must provides an implementation of this interface.
  *
  * This builder is not thread safe and shall not be used concurrently.
  *
- * <p>CDI Lite implementations are not required to provide support for Portable Extensions.</p>
+ * <p>
+ * CDI Lite implementations are not required to provide support for Portable Extensions.
+ * </p>
  *
  * @see ProcessInjectionPoint#configureInjectionPoint()
  * @author Antoine Sabot-Durand
diff --git a/api/src/main/java/jakarta/enterprise/inject/spi/configurator/ObserverMethodConfigurator.java b/api/src/main/java/jakarta/enterprise/inject/spi/configurator/ObserverMethodConfigurator.java
index 66e71bba1..014659748 100644
--- a/api/src/main/java/jakarta/enterprise/inject/spi/configurator/ObserverMethodConfigurator.java
+++ b/api/src/main/java/jakarta/enterprise/inject/spi/configurator/ObserverMethodConfigurator.java
@@ -8,7 +8,7 @@
  * You may obtain a copy of the License at
  * http://www.apache.org/licenses/LICENSE-2.0
  * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,  
+ * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
@@ -35,12 +35,14 @@
  * An {@link ObserverMethodConfigurator} can configure an {@link ObserverMethod}. The container must provide an implementation
  * of this interface.
  * </p>
- * 
+ *
  * <p>
  * This configurator is not thread safe and shall not be used concurrently.
  * </p>
  *
- * <p>CDI Lite implementations are not required to provide support for Portable Extensions.</p>
+ * <p>
+ * CDI Lite implementations are not required to provide support for Portable Extensions.
+ * </p>
  *
  * @param <T> type of the event the configured ObserverMethod will observe
  * @author Antoine Sabot-Durand
@@ -172,7 +174,7 @@ public interface ObserverMethodConfigurator<T> {
 
     /**
      * Represents an operation that accepts a context of a fired event.
-     * 
+     *
      * @author Martin Kouba
      *
      * @param <T> event type
@@ -182,7 +184,7 @@ public interface ObserverMethodConfigurator<T> {
     interface EventConsumer<T> {
 
         /**
-         * 
+         *
          * @param eventContext the {@link EventContext} used to fire the event
          * @throws Exception The thrown checked exception is wrapped and rethrown as an (unchecked) {@link ObserverException}
          */
diff --git a/api/src/main/java/jakarta/enterprise/inject/spi/configurator/ProducerConfigurator.java b/api/src/main/java/jakarta/enterprise/inject/spi/configurator/ProducerConfigurator.java
index ceb4163b5..466ea3bb4 100644
--- a/api/src/main/java/jakarta/enterprise/inject/spi/configurator/ProducerConfigurator.java
+++ b/api/src/main/java/jakarta/enterprise/inject/spi/configurator/ProducerConfigurator.java
@@ -8,7 +8,7 @@
  * You may obtain a copy of the License at
  * http://www.apache.org/licenses/LICENSE-2.0
  * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,  
+ * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
@@ -27,12 +27,14 @@
  * A {@link ProducerConfigurator} can configure a {@link Producer}. The container must provide an implementation of this
  * interface.
  * </p>
- * 
+ *
  * <p>
  * This configurator is not thread safe and shall not be used concurrently.
  * </p>
  *
- * <p>CDI Lite implementations are not required to provide support for Portable Extensions.</p>
+ * <p>
+ * CDI Lite implementations are not required to provide support for Portable Extensions.
+ * </p>
  *
  * @param <T> The return type of the producer method or the type of the producer field
  * @author Martin Kouba
@@ -53,12 +55,11 @@ public interface ProducerConfigurator<T> {
 
     /**
      * Set a callback to destroy the produced instance.
-     * 
+     *
      * @param callback a {@link Consumer} defining the callback to set
      * @return self
      * @see Producer#dispose(Object)
      */
     ProducerConfigurator<T> disposeWith(Consumer<T> callback);
 
-
 }
diff --git a/api/src/main/java/jakarta/enterprise/inject/spi/package-info.java b/api/src/main/java/jakarta/enterprise/inject/spi/package-info.java
index cb611f1f7..a36c44f1b 100644
--- a/api/src/main/java/jakarta/enterprise/inject/spi/package-info.java
+++ b/api/src/main/java/jakarta/enterprise/inject/spi/package-info.java
@@ -8,126 +8,153 @@
  * You may obtain a copy of the License at
  * http://www.apache.org/licenses/LICENSE-2.0
  * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,  
+ * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
 /**
- * <p>The portable extension integration SPI.</p>
- * 
- * <p>A portable extension may integrate with the container by:</p>
- * 
+ * <p>
+ * The portable extension integration SPI.
+ * </p>
+ *
+ * <p>
+ * A portable extension may integrate with the container by:
+ * </p>
+ *
  * <ul>
- * <li>Providing its own beans, interceptors and decorators to the 
+ * <li>Providing its own beans, interceptors and decorators to the
  * container</li>
- * <li>Injecting dependencies into its own objects using the 
+ * <li>Injecting dependencies into its own objects using the
  * dependency injection service</li>
  * <li>Providing a context implementation for a custom scope</li>
- * <li>Augmenting or overriding the annotation-based metadata with 
+ * <li>Augmenting or overriding the annotation-based metadata with
  * metadata from some other source</li>
  * </ul>
- * 
+ *
  * <h2>The <code>BeanManager</code> object</h2>
- * 
- * <p>Portable extensions sometimes interact directly with the container 
- * via programmatic API call. The interface 
- * {@link jakarta.enterprise.inject.spi.BeanManager} provides operations 
- * for obtaining contextual references for beans, along with many other 
- * operations of use to portable extensions.</p>
- * 
+ *
+ * <p>
+ * Portable extensions sometimes interact directly with the container
+ * via programmatic API call. The interface
+ * {@link jakarta.enterprise.inject.spi.BeanManager} provides operations
+ * for obtaining contextual references for beans, along with many other
+ * operations of use to portable extensions.
+ * </p>
+ *
  * <h2>Container lifecycle events</h2>
- * 
- * <p>During the application initialization process, the container fires 
- * a series of {@linkplain jakarta.enterprise.event events}, allowing 
- * portable extensions to integrate with the container initialization 
+ *
+ * <p>
+ * During the application initialization process, the container fires
+ * a series of {@linkplain jakarta.enterprise.event events}, allowing
+ * portable extensions to integrate with the container initialization
  * process. Observer methods of these events must belong to
- * {@linkplain jakarta.enterprise.inject.spi.Extension extensions} declared 
- * in <code>META-INF/services</code>.</p>
- * 
- * <p>Lifecycle events include
+ * {@linkplain jakarta.enterprise.inject.spi.Extension extensions} declared
+ * in <code>META-INF/services</code>.
+ * </p>
+ *
+ * <p>
+ * Lifecycle events include
  * {@link jakarta.enterprise.inject.spi.BeforeBeanDiscovery},
  * {@link jakarta.enterprise.inject.spi.AfterBeanDiscovery},
  * {@link jakarta.enterprise.inject.spi.AfterDeploymentValidation} and
- * {@link jakarta.enterprise.inject.spi.BeforeShutdown}.</p>
- * 
+ * {@link jakarta.enterprise.inject.spi.BeforeShutdown}.
+ * </p>
+ *
  * <h2>Interfaces representing enabled beans</h2>
- * 
- * <p>The interfaces 
+ *
+ * <p>
+ * The interfaces
  * {@link jakarta.enterprise.inject.spi.Bean},
  * {@link jakarta.enterprise.inject.spi.Decorator},
  * {@link jakarta.enterprise.inject.spi.Interceptor} and
  * {@link jakarta.enterprise.inject.spi.ObserverMethod}
- * define everything the container needs to manage instances of 
- * a bean, interceptor, decorator or observer method.</p>
- * 
- * <p>An instance of <code>Bean</code> exists for every
- * {@linkplain jakarta.enterprise.inject enabled bean}. A portable 
- * extension may add support for new kinds of beans by implementing 
+ * define everything the container needs to manage instances of
+ * a bean, interceptor, decorator or observer method.
+ * </p>
+ *
+ * <p>
+ * An instance of <code>Bean</code> exists for every
+ * {@linkplain jakarta.enterprise.inject enabled bean}. A portable
+ * extension may add support for new kinds of beans by implementing
  * <code>Bean</code>, observing the event
- * {@link jakarta.enterprise.inject.spi.AfterBeanDiscovery} event 
- * {@linkplain jakarta.enterprise.inject.spi.AfterBeanDiscovery#addBean(Bean) 
- * registering beans} with the container. An instance of 
+ * {@link jakarta.enterprise.inject.spi.AfterBeanDiscovery} event
+ * {@linkplain jakarta.enterprise.inject.spi.AfterBeanDiscovery#addBean(Bean)
+ * registering beans} with the container. An instance of
  * <code>ObserverMethod</code> exists for every
- * {@linkplain jakarta.enterprise.event observer method} of every 
- * enabled bean. A portable extension may add observers by implementing 
+ * {@linkplain jakarta.enterprise.event observer method} of every
+ * enabled bean. A portable extension may add observers by implementing
  * <code>ObserverMethod</code> and
- * {@linkplain jakarta.enterprise.inject.spi.AfterBeanDiscovery#addObserverMethod(ObserverMethod) 
- * registering an instance} with the container.</p>
- * 
- * <p>A portable extension may be notified of the existence of an
- * enabled bean by observing the container lifecycle event type 
- * {@link jakarta.enterprise.inject.spi.ProcessBean} or one of its 
+ * {@linkplain jakarta.enterprise.inject.spi.AfterBeanDiscovery#addObserverMethod(ObserverMethod)
+ * registering an instance} with the container.
+ * </p>
+ *
+ * <p>
+ * A portable extension may be notified of the existence of an
+ * enabled bean by observing the container lifecycle event type
+ * {@link jakarta.enterprise.inject.spi.ProcessBean} or one of its
  * {@linkplain jakarta.enterprise.inject.spi.ProcessBean subtypes},
- * or of the existence of an observer method of an enabled bean by 
+ * or of the existence of an observer method of an enabled bean by
  * observing the event type
- * {@link jakarta.enterprise.inject.spi.ProcessObserverMethod}.</p>
- * 
+ * {@link jakarta.enterprise.inject.spi.ProcessObserverMethod}.
+ * </p>
+ *
  * <h2>Alternate metadata sources</h2>
- * 
- * <p>A portable extension may provide an alternative metadata 
- * source, such as configuration by XML.</p>
- * 
- * <p>{@link jakarta.enterprise.inject.spi.Annotated}
- * and its subtypes allow a portable extension to specify 
- * metadata that overrides the annotations that exist on a 
- * bean class. The portable extension is responsible for 
- * implementing the interfaces, thereby exposing the metadata 
- * to the container. The container must use the operations of 
+ *
+ * <p>
+ * A portable extension may provide an alternative metadata
+ * source, such as configuration by XML.
+ * </p>
+ *
+ * <p>
+ * {@link jakarta.enterprise.inject.spi.Annotated}
+ * and its subtypes allow a portable extension to specify
+ * metadata that overrides the annotations that exist on a
+ * bean class. The portable extension is responsible for
+ * implementing the interfaces, thereby exposing the metadata
+ * to the container. The container must use the operations of
  * <code>Annotated</code> and its subinterfaces to discover program
- * element types and annotations, instead of directly calling the 
- * Java Reflection API.</p>
- * 
- * <p>A portable extension provides its metadata to the 
- * container by observing the event 
- * {@link jakarta.enterprise.inject.spi.ProcessAnnotatedType} and 
+ * element types and annotations, instead of directly calling the
+ * Java Reflection API.
+ * </p>
+ *
+ * <p>
+ * A portable extension provides its metadata to the
+ * container by observing the event
+ * {@link jakarta.enterprise.inject.spi.ProcessAnnotatedType} and
  * {@linkplain jakarta.enterprise.inject.spi.ProcessAnnotatedType#setAnnotatedType(AnnotatedType)
- * wrapping} the {@link jakarta.enterprise.inject.spi.AnnotatedType}.</p>
- * 
+ * wrapping} the {@link jakarta.enterprise.inject.spi.AnnotatedType}.
+ * </p>
+ *
  * <h2><code>Producer</code> and <code>InjectionTarget</code></h2>
- * 
- * <p>The interfaces {@link jakarta.enterprise.inject.spi.Producer} and
- * {@link jakarta.enterprise.inject.spi.InjectionTarget} abstract the 
- * basic lifecycle of (contextual or non-contextual) container managed 
- * objects, including instantiation and destruction, dependency injection 
- * and lifecycle callbacks.</p>
- * 
- * <p>An instance of {@link jakarta.enterprise.inject.spi.InjectionTarget} 
+ *
+ * <p>
+ * The interfaces {@link jakarta.enterprise.inject.spi.Producer} and
+ * {@link jakarta.enterprise.inject.spi.InjectionTarget} abstract the
+ * basic lifecycle of (contextual or non-contextual) container managed
+ * objects, including instantiation and destruction, dependency injection
+ * and lifecycle callbacks.
+ * </p>
+ *
+ * <p>
+ * An instance of {@link jakarta.enterprise.inject.spi.InjectionTarget}
  * may be product of
  * {@linkplain jakarta.enterprise.inject.spi.BeanManager#getInjectionTargetFactory(AnnotatedType)}
  * obtained from the {@link jakarta.enterprise.inject.spi.BeanManager},
  * allowing a portable extension to request these container services for
- * objects under the control of the portable extension.</p>
- * 
- * <p>Furthermore, a portable extension may replace the implementation
+ * objects under the control of the portable extension.
+ * </p>
+ *
+ * <p>
+ * Furthermore, a portable extension may replace the implementation
  * of {@link jakarta.enterprise.inject.spi.InjectionTarget} or
  * {@link jakarta.enterprise.inject.spi.Producer} used by the container
  * with its own implementation by observing the events
  * {@link jakarta.enterprise.inject.spi.ProcessInjectionTarget} or
- * {@link jakarta.enterprise.inject.spi.ProcessProducer}.</p>
- * 
+ * {@link jakarta.enterprise.inject.spi.ProcessProducer}.
+ * </p>
+ *
  * @see jakarta.enterprise.inject
  * @see jakarta.enterprise.context.spi
  */
 package jakarta.enterprise.inject.spi;
-
diff --git a/api/src/main/java/jakarta/enterprise/invoke/Invoker.java b/api/src/main/java/jakarta/enterprise/invoke/Invoker.java
index ede8faa8f..52b8796b5 100644
--- a/api/src/main/java/jakarta/enterprise/invoke/Invoker.java
+++ b/api/src/main/java/jakarta/enterprise/invoke/Invoker.java
@@ -119,13 +119,13 @@ public interface Invoker<T, R> {
      * TODO the previous 2 paragraphs refer to "assignability", which needs to be defined somewhere!
      *
      * TODO when the `InvokerBuilder` applies transformations, some of the requirements above
-     *  are no longer strictly necessary, should reflect that in this text somehow (it is already
-     *  mentioned in `InvokerBuilder`, but that likely isn't enough)
+     * are no longer strictly necessary, should reflect that in this text somehow (it is already
+     * mentioned in `InvokerBuilder`, but that likely isn't enough)
      *
      * @param instance the instance on which the target method is to be invoked, may only be {@code null}
-     *                 if the method is {@code static}
+     *        if the method is {@code static}
      * @param arguments arguments to be supplied to the target method, may only be {@code null}
-     *                  if the method declares no parameter
+     *        if the method declares no parameter
      * @return return value of the target method, or {@code null} if the method is declared {@code void}
      */
     R invoke(T instance, Object[] arguments); // TODO throws Exception ?
diff --git a/api/src/main/java/jakarta/enterprise/invoke/InvokerBuilder.java b/api/src/main/java/jakarta/enterprise/invoke/InvokerBuilder.java
index 97342ef7b..8b6255652 100644
--- a/api/src/main/java/jakarta/enterprise/invoke/InvokerBuilder.java
+++ b/api/src/main/java/jakarta/enterprise/invoke/InvokerBuilder.java
@@ -60,12 +60,13 @@
  *
  * <pre>
  * builder.setInstanceLookup()
- *        .setArgumentTransformer(0, String.class, "toUpperCase")
- *        .setReturnValueTransformer(Transformations.class, "repeatTwice")
- *        .build();
+ *         .setArgumentTransformer(0, String.class, "toUpperCase")
+ *         .setReturnValueTransformer(Transformations.class, "repeatTwice")
+ *         .build();
  * </pre>
  *
  * The resulting invoker will be equivalent to the following class:
+ *
  * <pre>
  * class TheInvoker implements Invoker&lt;MyService, String&gt; {
  *     String invoke(MyService ignored, Object[] arguments) {
@@ -220,7 +221,7 @@
  * in which case the invoker will return the return value of the exception transformer. If
  * the invoker is supposed to throw an exception, the exception transformer must throw.
  * TODO this requires that implementations catch java.lang.Throwable, which is perhaps a bit too much?
- *  maybe stick with java.lang.Exception?
+ * maybe stick with java.lang.Exception?
  *
  * <h2>Invoker wrapping</h2>
  *
@@ -277,12 +278,12 @@
  * {@link Invoker#invoke(Object, Object[]) Invoker.invoke()} all hold.
  * <p>
  * TODO specify what happens when a transformer/wrapper declares a parameter of a primitive type
- *  but the actual value passed to the invoker is `null` (the transformer should get a zero value?)
+ * but the actual value passed to the invoker is `null` (the transformer should get a zero value?)
  * TODO specify what happens when a transformer/wrapper declares a parameter of some type
- *  but the actual value passed to the invoker is not assignable to it (CCE?)
+ * but the actual value passed to the invoker is not assignable to it (CCE?)
  *
  * @param <T> type of outcome of this builder; always represents an {@code Invoker},
- *            but does not necessarily have to be an {@code Invoker} instance directly
+ *        but does not necessarily have to be an {@code Invoker} instance directly
  * @since 4.1
  */
 // TODO more kinds of transformations could be defined, expecially for argument handling
@@ -301,7 +302,7 @@ public interface InvokerBuilder<T> {
      * @param position zero-based argument position for which lookup is enabled
      * @return this builder
      * @throws IllegalArgumentException if {@code position} is greather than or equal to
-     * the number of parameters declared by the target method
+     *         the number of parameters declared by the target method
      */
     InvokerBuilder<T> setArgumentLookup(int position);
 
@@ -323,7 +324,7 @@ public interface InvokerBuilder<T> {
      * @param methodName transformer method name
      * @return this builder
      * @throws IllegalArgumentException if {@code position} is greather than or equal to
-     * the number of parameters declared by the target method
+     *         the number of parameters declared by the target method
      * @throws IllegalStateException if this method is called more than once with the same {@code position}
      */
     InvokerBuilder<T> setArgumentTransformer(int position, Class<?> clazz, String methodName);
diff --git a/api/src/main/java/jakarta/enterprise/util/AnnotationLiteral.java b/api/src/main/java/jakarta/enterprise/util/AnnotationLiteral.java
index a9d8cdc7d..936d97fda 100644
--- a/api/src/main/java/jakarta/enterprise/util/AnnotationLiteral.java
+++ b/api/src/main/java/jakarta/enterprise/util/AnnotationLiteral.java
@@ -35,17 +35,17 @@
  * <p>
  * Reflection operations are using {@link SecurityActions} utility class to support security manager.
  * </p>
- * 
+ *
  * <p>
  * An instance of an annotation type may be obtained by subclassing <code>AnnotationLiteral</code>.
  * The subclass must implement the annotation interface to satisfy the {@link Annotation} contract.
  * </p>
- * 
+ *
  * <pre>
  * public abstract class PayByQualifier extends AnnotationLiteral&lt;PayBy&gt; implements PayBy {
  * }
  * </pre>
- * 
+ *
  * <pre>
  * PayBy payByCheque = new PayByQualifier() {
  *     public PaymentMethod value() {
@@ -53,17 +53,17 @@
  *     }
  * };
  * </pre>
- * 
+ *
  * @author Pete Muir
  * @author Gavin King
  * @author Marko Luksa
  * @author Antoine Sabot-Durand
- * 
+ *
  * @param <T> the annotation type
- * 
+ *
  * @see Instance#select(Annotation...)
  * @see Event#select(Annotation...)
- * 
+ *
  */
 public abstract class AnnotationLiteral<T extends Annotation> implements Annotation, Serializable {
 
diff --git a/api/src/main/java/jakarta/enterprise/util/Nonbinding.java b/api/src/main/java/jakarta/enterprise/util/Nonbinding.java
index 40a402a8a..56cb5445d 100644
--- a/api/src/main/java/jakarta/enterprise/util/Nonbinding.java
+++ b/api/src/main/java/jakarta/enterprise/util/Nonbinding.java
@@ -25,7 +25,8 @@
 /**
  * <p>
  * Excludes a member of an annotation type (such as a {@linkplain jakarta.inject.Qualifier qualifier type} or
- * {@linkplain jakarta.interceptor.InterceptorBinding interceptor binding type}) from consideration when the container compares two annotation
+ * {@linkplain jakarta.interceptor.InterceptorBinding interceptor binding type}) from consideration when the container compares
+ * two annotation
  * instances.
  * </p>
  *
diff --git a/api/src/main/java/jakarta/enterprise/util/SecurityActions.java b/api/src/main/java/jakarta/enterprise/util/SecurityActions.java
index 471b83e46..32a40be8c 100644
--- a/api/src/main/java/jakarta/enterprise/util/SecurityActions.java
+++ b/api/src/main/java/jakarta/enterprise/util/SecurityActions.java
@@ -39,19 +39,16 @@ static void setAccessible(Method method) {
                     (PrivilegedAction<?>) () -> {
                         method.setAccessible(true);
                         return null;
-                    }
-            );
+                    });
         } else {
             method.setAccessible(true);
         }
     }
 
-
     static Method[] getDeclaredMethods(Class<?> clazz) {
         if (System.getSecurityManager() != null) {
             return AccessController.doPrivileged(
-                    (PrivilegedAction<Method[]>) () -> clazz.getDeclaredMethods()
-            );
+                    (PrivilegedAction<Method[]>) () -> clazz.getDeclaredMethods());
         } else {
             return clazz.getDeclaredMethods();
         }
diff --git a/api/src/main/java/jakarta/enterprise/util/TypeLiteral.java b/api/src/main/java/jakarta/enterprise/util/TypeLiteral.java
index 1fd24c6b9..9f84db190 100644
--- a/api/src/main/java/jakarta/enterprise/util/TypeLiteral.java
+++ b/api/src/main/java/jakarta/enterprise/util/TypeLiteral.java
@@ -8,7 +8,7 @@
  * You may obtain a copy of the License at
  * http://www.apache.org/licenses/LICENSE-2.0
  * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,  
+ * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
@@ -29,24 +29,24 @@
  * <p>
  * Supports inline instantiation of objects that represent parameterized types with actual type parameters.
  * </p>
- * 
+ *
  * <p>
  * An object that represents any parameterized type may be obtained by subclassing <code>TypeLiteral</code>.
  * </p>
- * 
+ *
  * <pre>
  * TypeLiteral&lt;List&lt;String&gt;&gt; stringListType = new TypeLiteral&lt;List&lt;String&gt;&gt;() {
  * };
  * </pre>
- * 
+ *
  * @author Gavin King
  * @author Pete Muir
- * 
+ *
  * @param <T> the type, including all actual type parameters
- * 
+ *
  * @see Instance#select(TypeLiteral, Annotation...)
  * @see Event#select(TypeLiteral, Annotation...)
- * 
+ *
  */
 public abstract class TypeLiteral<T> implements Serializable {
 
diff --git a/api/src/main/java/jakarta/enterprise/util/package-info.java b/api/src/main/java/jakarta/enterprise/util/package-info.java
index d84f539dc..fd4a383b6 100644
--- a/api/src/main/java/jakarta/enterprise/util/package-info.java
+++ b/api/src/main/java/jakarta/enterprise/util/package-info.java
@@ -8,7 +8,7 @@
  * You may obtain a copy of the License at
  * http://www.apache.org/licenses/LICENSE-2.0
  * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,  
+ * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
diff --git a/api/src/test/java/org/jboss/cdi/api/test/AnnotationLiteralTest.java b/api/src/test/java/org/jboss/cdi/api/test/AnnotationLiteralTest.java
index 70652fd63..f6eb8c857 100644
--- a/api/src/test/java/org/jboss/cdi/api/test/AnnotationLiteralTest.java
+++ b/api/src/test/java/org/jboss/cdi/api/test/AnnotationLiteralTest.java
@@ -121,7 +121,7 @@ public void testInitializedLiteral() {
     public void testDestroyedLiteral() {
         assertEquals(Destroyed.Literal.of(ConversationScoped.class).value(), ConversationScoped.class);
     }
-    
+
     @Test
     public void testBeforeDestroyedLiteral() {
         assertEquals(BeforeDestroyed.Literal.of(RequestScoped.class).value(), RequestScoped.class);
@@ -130,7 +130,7 @@ public void testBeforeDestroyedLiteral() {
         assertEquals(BeforeDestroyed.Literal.SESSION.value(), SessionScoped.class);
         assertEquals(BeforeDestroyed.Literal.APPLICATION.value(), ApplicationScoped.class);
     }
-    
+
     @SuppressWarnings("serial")
     @Test
     public void testApplicationScopedLiteral() {
@@ -165,28 +165,28 @@ public void testDependentLiteral() {
         assertEquals(new AnnotationLiteral<Dependent>() {
         }, Dependent.Literal.INSTANCE);
     }
-    
+
     @SuppressWarnings("serial")
     @Test
     public void testVetoedLiteral() {
         assertEquals(new AnnotationLiteral<Vetoed>() {
         }, Vetoed.Literal.INSTANCE);
     }
-    
+
     @SuppressWarnings("serial")
     @Test
     public void testInjectLiteral() {
         assertEquals(new AnnotationLiteral<Inject>() {
         }, InjectLiteral.INSTANCE);
     }
-    
+
     @SuppressWarnings("serial")
     @Test
     public void testSpecializesLiteral() {
         assertEquals(new AnnotationLiteral<Specializes>() {
         }, Specializes.Literal.INSTANCE);
     }
-    
+
     @SuppressWarnings("serial")
     @Test
     public void testTransientReferenceLiteral() {
diff --git a/api/src/test/java/org/jboss/cdi/api/test/CDITest.java b/api/src/test/java/org/jboss/cdi/api/test/CDITest.java
index 00bfd4b72..f910ad4bc 100644
--- a/api/src/test/java/org/jboss/cdi/api/test/CDITest.java
+++ b/api/src/test/java/org/jboss/cdi/api/test/CDITest.java
@@ -16,17 +16,20 @@
 
 package org.jboss.cdi.api.test;
 
-import org.testng.Assert;
-import org.testng.annotations.BeforeMethod;
-import org.testng.annotations.Test;
-import jakarta.enterprise.inject.spi.CDI;
-import jakarta.enterprise.inject.spi.CDIProvider;
 import java.io.FileWriter;
 import java.nio.file.FileSystems;
 import java.nio.file.Files;
 
+import jakarta.enterprise.inject.spi.CDI;
+import jakarta.enterprise.inject.spi.CDIProvider;
+
+import org.testng.Assert;
+import org.testng.annotations.BeforeMethod;
+import org.testng.annotations.Test;
+
 /**
  * Test for CDIProvider resolution in CDI abstract class.
+ *
  * @author Antoine Sabot-durand
  *
  */
@@ -42,7 +45,6 @@ public static void resetCDI() {
             discoveredProviders = null;
         }
 
-
     }
 
     @BeforeMethod
@@ -57,7 +59,6 @@ public void testWithoutServiceFile() throws Exception {
         CDI.current();
     }
 
-
     @Test
     public void testWithOneGoodCDIProvider() throws Exception {
 
@@ -99,7 +100,6 @@ public void testWithTwoGoodCDIProvider() throws Exception {
         Assert.assertTrue(CDI.current().getClass().equals(DummyCDIProvider.DummyCDI.class));
     }
 
-
     @Test
     public void testWithTwoGoodCDIProviderReverse() throws Exception {
         FileWriter fw = new FileWriter(SERVICE_FILE_NAME);
@@ -120,7 +120,6 @@ public void testWithTwoCDIProviderOneWithNullCDIAndOneGood() throws Exception {
         Assert.assertTrue(CDI.current().getClass().equals(DummyCDIProvider2.DummyCDI2.class));
     }
 
-
     @Test
     public void testWithThreeCDIProviderOneWithNullCDIAndOthersGood() throws Exception {
         FileWriter fw = new FileWriter(SERVICE_FILE_NAME);
@@ -133,7 +132,6 @@ public void testWithThreeCDIProviderOneWithNullCDIAndOthersGood() throws Excepti
         Assert.assertTrue(CDI.current().getClass().equals(DummyCDIProvider.DummyCDI.class));
     }
 
-
     @Test(expectedExceptions = IllegalStateException.class)
     public void testWithFirstGoodCDIProvider() throws Exception {
         FileWriter fw = new FileWriter(SERVICE_FILE_NAME);
@@ -144,7 +142,6 @@ public void testWithFirstGoodCDIProvider() throws Exception {
         CDI.current();
     }
 
-
     @Test(expectedExceptions = IllegalStateException.class)
     public void testWithCDIProviderBadClass() throws Exception {
         FileWriter fw = new FileWriter(SERVICE_FILE_NAME);
@@ -162,4 +159,4 @@ public void testForClosedContainer() throws Exception {
         ClosableCDIProvider.closeContainer();
         CDI.current();
     }
-}
\ No newline at end of file
+}
diff --git a/api/src/test/java/org/jboss/cdi/api/test/ClosableCDIProvider.java b/api/src/test/java/org/jboss/cdi/api/test/ClosableCDIProvider.java
index 2349c446e..3c43046e0 100644
--- a/api/src/test/java/org/jboss/cdi/api/test/ClosableCDIProvider.java
+++ b/api/src/test/java/org/jboss/cdi/api/test/ClosableCDIProvider.java
@@ -16,13 +16,14 @@
 
 package org.jboss.cdi.api.test;
 
+import java.lang.annotation.Annotation;
+import java.util.Iterator;
+
 import jakarta.enterprise.inject.Instance;
 import jakarta.enterprise.inject.spi.BeanManager;
 import jakarta.enterprise.inject.spi.CDI;
 import jakarta.enterprise.inject.spi.CDIProvider;
 import jakarta.enterprise.util.TypeLiteral;
-import java.lang.annotation.Annotation;
-import java.util.Iterator;
 
 /**
  * Created by antoine on 16/12/2015.
@@ -47,7 +48,6 @@ public int getPriority() {
 
     public static class DummyCDI extends CDI<Object> {
 
-
         @Override
         public BeanManager getBeanManager() {
             return null;
@@ -77,7 +77,7 @@ public boolean isUnsatisfied() {
         public boolean isAmbiguous() {
             return false;
         }
-        
+
         @Override
         public void destroy(Object instance) {
 
diff --git a/api/src/test/java/org/jboss/cdi/api/test/DummyCDIProvider.java b/api/src/test/java/org/jboss/cdi/api/test/DummyCDIProvider.java
index 1afe91665..ec3e45b58 100644
--- a/api/src/test/java/org/jboss/cdi/api/test/DummyCDIProvider.java
+++ b/api/src/test/java/org/jboss/cdi/api/test/DummyCDIProvider.java
@@ -42,7 +42,6 @@ public int getPriority() {
 
     public static class DummyCDI extends CDI<Object> {
 
-
         @Override
         public BeanManager getBeanManager() {
             return null;
@@ -72,7 +71,7 @@ public boolean isUnsatisfied() {
         public boolean isAmbiguous() {
             return false;
         }
-        
+
         @Override
         public void destroy(Object instance) {
 
diff --git a/api/src/test/java/org/jboss/cdi/api/test/DummyCDIProvider2.java b/api/src/test/java/org/jboss/cdi/api/test/DummyCDIProvider2.java
index 88bdf6bc9..6de0d5d84 100644
--- a/api/src/test/java/org/jboss/cdi/api/test/DummyCDIProvider2.java
+++ b/api/src/test/java/org/jboss/cdi/api/test/DummyCDIProvider2.java
@@ -30,7 +30,6 @@
  */
 public class DummyCDIProvider2 implements CDIProvider {
 
-
     @Override
     public CDI<Object> getCDI() {
         return new DummyCDI2();
@@ -43,7 +42,6 @@ public int getPriority() {
 
     public static class DummyCDI2 extends CDI<Object> {
 
-
         @Override
         public BeanManager getBeanManager() {
             return null;
@@ -73,7 +71,7 @@ public boolean isUnsatisfied() {
         public boolean isAmbiguous() {
             return false;
         }
-        
+
         @Override
         public void destroy(Object instance) {
 
diff --git a/api/src/test/java/org/jboss/cdi/api/test/annotated/AbstractAnnotatedTest.java b/api/src/test/java/org/jboss/cdi/api/test/annotated/AbstractAnnotatedTest.java
index dd7365a34..7a5b7780c 100644
--- a/api/src/test/java/org/jboss/cdi/api/test/annotated/AbstractAnnotatedTest.java
+++ b/api/src/test/java/org/jboss/cdi/api/test/annotated/AbstractAnnotatedTest.java
@@ -16,20 +16,22 @@
 
 package org.jboss.cdi.api.test.annotated;
 
-import org.testng.Assert;
-import org.testng.annotations.Test;
+import static java.util.Arrays.asList;
 
-import jakarta.enterprise.inject.spi.Annotated;
 import java.lang.annotation.Annotation;
 import java.util.Collections;
 import java.util.LinkedHashSet;
 import java.util.Set;
 
-import static java.util.Arrays.asList;
+import jakarta.enterprise.inject.spi.Annotated;
+
+import org.testng.Assert;
+import org.testng.annotations.Test;
 
 public abstract class AbstractAnnotatedTest {
 
-    @Test public void shouldFindAnnotationsOnAnnotated() {
+    @Test
+    public void shouldFindAnnotationsOnAnnotated() {
         Annotated annotated = getAnnotated();
 
         Set<Repeater> repeaters = annotated.getAnnotations(Repeater.class);
@@ -37,7 +39,8 @@ public abstract class AbstractAnnotatedTest {
         Assert.assertEquals(repeaters, new LinkedHashSet<>(asList(getAnnotationsByType(Repeater.class))));
     }
 
-    @Test public void shouldReturnSingletonForNonRepeatableAnnotation() {
+    @Test
+    public void shouldReturnSingletonForNonRepeatableAnnotation() {
         Annotated annotated = getAnnotated();
 
         Set<Repeaters> repeaters = annotated.getAnnotations(Repeaters.class);
@@ -46,6 +49,8 @@ public abstract class AbstractAnnotatedTest {
     }
 
     protected abstract Annotated getAnnotated();
+
     protected abstract <T extends Annotation> T[] getAnnotationsByType(Class<T> annotationClass);
+
     protected abstract <T extends Annotation> T getAnnotation(Class<T> annotationClass);
 }
diff --git a/api/src/test/java/org/jboss/cdi/api/test/annotated/AnnotatedCallableHolder.java b/api/src/test/java/org/jboss/cdi/api/test/annotated/AnnotatedCallableHolder.java
index 76a125ee0..9e75e6e64 100644
--- a/api/src/test/java/org/jboss/cdi/api/test/annotated/AnnotatedCallableHolder.java
+++ b/api/src/test/java/org/jboss/cdi/api/test/annotated/AnnotatedCallableHolder.java
@@ -16,49 +16,59 @@
 
 package org.jboss.cdi.api.test.annotated;
 
-import jakarta.enterprise.inject.spi.AnnotatedCallable;
-import jakarta.enterprise.inject.spi.AnnotatedParameter;
-import jakarta.enterprise.inject.spi.AnnotatedType;
 import java.lang.annotation.Annotation;
 import java.lang.reflect.Member;
 import java.lang.reflect.Type;
 import java.util.List;
 import java.util.Set;
 
-public abstract class AnnotatedCallableHolder<T> implements AnnotatedCallable<T>{
-    @Override public List<AnnotatedParameter<T>> getParameters() {
+import jakarta.enterprise.inject.spi.AnnotatedCallable;
+import jakarta.enterprise.inject.spi.AnnotatedParameter;
+import jakarta.enterprise.inject.spi.AnnotatedType;
+
+public abstract class AnnotatedCallableHolder<T> implements AnnotatedCallable<T> {
+    @Override
+    public List<AnnotatedParameter<T>> getParameters() {
         return null;
     }
 
-    @Override public Member getJavaMember() {
+    @Override
+    public Member getJavaMember() {
         return null;
     }
 
-    @Override public boolean isStatic() {
+    @Override
+    public boolean isStatic() {
         return false;
     }
 
-    @Override public AnnotatedType<T> getDeclaringType() {
+    @Override
+    public AnnotatedType<T> getDeclaringType() {
         return null;
     }
 
-    @Override public Type getBaseType() {
+    @Override
+    public Type getBaseType() {
         return null;
     }
 
-    @Override public Set<Type> getTypeClosure() {
+    @Override
+    public Set<Type> getTypeClosure() {
         return null;
     }
 
-    @Override public <T extends Annotation> T getAnnotation(Class<T> annotationType) {
+    @Override
+    public <T extends Annotation> T getAnnotation(Class<T> annotationType) {
         return null;
     }
 
-    @Override public Set<Annotation> getAnnotations() {
+    @Override
+    public Set<Annotation> getAnnotations() {
         return null;
     }
 
-    @Override public boolean isAnnotationPresent(Class<? extends Annotation> annotationType) {
+    @Override
+    public boolean isAnnotationPresent(Class<? extends Annotation> annotationType) {
         return false;
     }
 }
diff --git a/api/src/test/java/org/jboss/cdi/api/test/annotated/AnnotatedConstructorHolder.java b/api/src/test/java/org/jboss/cdi/api/test/annotated/AnnotatedConstructorHolder.java
index fd70511ec..262c20a55 100644
--- a/api/src/test/java/org/jboss/cdi/api/test/annotated/AnnotatedConstructorHolder.java
+++ b/api/src/test/java/org/jboss/cdi/api/test/annotated/AnnotatedConstructorHolder.java
@@ -16,9 +16,10 @@
 
 package org.jboss.cdi.api.test.annotated;
 
-import jakarta.enterprise.inject.spi.AnnotatedConstructor;
 import java.lang.reflect.Constructor;
 
+import jakarta.enterprise.inject.spi.AnnotatedConstructor;
+
 public class AnnotatedConstructorHolder<T> extends AnnotatedCallableHolder<T> implements AnnotatedConstructor<T> {
     private final Constructor<T> constructor;
 
@@ -26,7 +27,8 @@ public AnnotatedConstructorHolder(Constructor<T> constructor) {
         this.constructor = constructor;
     }
 
-    @Override public Constructor<T> getJavaMember() {
+    @Override
+    public Constructor<T> getJavaMember() {
         return constructor;
     }
 }
diff --git a/api/src/test/java/org/jboss/cdi/api/test/annotated/AnnotatedConstructorTest.java b/api/src/test/java/org/jboss/cdi/api/test/annotated/AnnotatedConstructorTest.java
index 454b7d68e..614041a03 100644
--- a/api/src/test/java/org/jboss/cdi/api/test/annotated/AnnotatedConstructorTest.java
+++ b/api/src/test/java/org/jboss/cdi/api/test/annotated/AnnotatedConstructorTest.java
@@ -16,27 +16,33 @@
 
 package org.jboss.cdi.api.test.annotated;
 
-import org.testng.annotations.BeforeClass;
-
-import jakarta.enterprise.inject.spi.Annotated;
 import java.lang.annotation.Annotation;
 import java.lang.reflect.Constructor;
 
-public class AnnotatedConstructorTest extends AbstractAnnotatedTest{
+import jakarta.enterprise.inject.spi.Annotated;
+
+import org.testng.annotations.BeforeClass;
+
+public class AnnotatedConstructorTest extends AbstractAnnotatedTest {
     Constructor<RepeatBean> constructor;
+
     @BeforeClass
     public void setupConstructor() throws Exception {
         this.constructor = RepeatBean.class.getConstructor();
     }
-    @Override protected Annotated getAnnotated() {
+
+    @Override
+    protected Annotated getAnnotated() {
         return new AnnotatedConstructorHolder<>(constructor);
     }
 
-    @Override protected <T extends Annotation> T[] getAnnotationsByType(Class<T> annotationClass) {
+    @Override
+    protected <T extends Annotation> T[] getAnnotationsByType(Class<T> annotationClass) {
         return constructor.getAnnotationsByType(annotationClass);
     }
 
-    @Override protected <T extends Annotation> T getAnnotation(Class<T> annotationClass) {
+    @Override
+    protected <T extends Annotation> T getAnnotation(Class<T> annotationClass) {
         return constructor.getAnnotation(annotationClass);
     }
 }
diff --git a/api/src/test/java/org/jboss/cdi/api/test/annotated/AnnotatedFieldHolder.java b/api/src/test/java/org/jboss/cdi/api/test/annotated/AnnotatedFieldHolder.java
index 69102ce4e..26d5b931d 100644
--- a/api/src/test/java/org/jboss/cdi/api/test/annotated/AnnotatedFieldHolder.java
+++ b/api/src/test/java/org/jboss/cdi/api/test/annotated/AnnotatedFieldHolder.java
@@ -16,9 +16,10 @@
 
 package org.jboss.cdi.api.test.annotated;
 
-import jakarta.enterprise.inject.spi.AnnotatedField;
 import java.lang.reflect.Field;
 
+import jakarta.enterprise.inject.spi.AnnotatedField;
+
 public class AnnotatedFieldHolder<T> extends AnnotatedMemberHolder<T> implements AnnotatedField<T> {
     private final Field field;
 
@@ -26,7 +27,8 @@ public AnnotatedFieldHolder(Field field) {
         this.field = field;
     }
 
-    @Override public Field getJavaMember() {
+    @Override
+    public Field getJavaMember() {
         return this.field;
     }
 }
diff --git a/api/src/test/java/org/jboss/cdi/api/test/annotated/AnnotatedFieldTest.java b/api/src/test/java/org/jboss/cdi/api/test/annotated/AnnotatedFieldTest.java
index 62c559b6d..99e98b8ef 100644
--- a/api/src/test/java/org/jboss/cdi/api/test/annotated/AnnotatedFieldTest.java
+++ b/api/src/test/java/org/jboss/cdi/api/test/annotated/AnnotatedFieldTest.java
@@ -16,28 +16,33 @@
 
 package org.jboss.cdi.api.test.annotated;
 
-import org.testng.annotations.BeforeClass;
-
-import jakarta.enterprise.inject.spi.Annotated;
 import java.lang.annotation.Annotation;
 import java.lang.reflect.Field;
 
-public class AnnotatedFieldTest extends AbstractAnnotatedTest{
+import jakarta.enterprise.inject.spi.Annotated;
+
+import org.testng.annotations.BeforeClass;
+
+public class AnnotatedFieldTest extends AbstractAnnotatedTest {
     private Field field;
+
     @BeforeClass
     public void getField() throws Exception {
         field = RepeatBean.class.getDeclaredField("field");
     }
 
-    @Override protected Annotated getAnnotated() {
+    @Override
+    protected Annotated getAnnotated() {
         return new AnnotatedFieldHolder<>(field);
     }
 
-    @Override protected <T extends Annotation> T[] getAnnotationsByType(Class<T> annotationClass) {
+    @Override
+    protected <T extends Annotation> T[] getAnnotationsByType(Class<T> annotationClass) {
         return field.getAnnotationsByType(annotationClass);
     }
 
-    @Override protected <T extends Annotation> T getAnnotation(Class<T> annotationClass) {
+    @Override
+    protected <T extends Annotation> T getAnnotation(Class<T> annotationClass) {
         return field.getAnnotation(annotationClass);
     }
 }
diff --git a/api/src/test/java/org/jboss/cdi/api/test/annotated/AnnotatedMemberHolder.java b/api/src/test/java/org/jboss/cdi/api/test/annotated/AnnotatedMemberHolder.java
index 054a46c2e..5357fe810 100644
--- a/api/src/test/java/org/jboss/cdi/api/test/annotated/AnnotatedMemberHolder.java
+++ b/api/src/test/java/org/jboss/cdi/api/test/annotated/AnnotatedMemberHolder.java
@@ -16,43 +16,52 @@
 
 package org.jboss.cdi.api.test.annotated;
 
-import jakarta.enterprise.inject.spi.AnnotatedMember;
-import jakarta.enterprise.inject.spi.AnnotatedType;
 import java.lang.annotation.Annotation;
 import java.lang.reflect.Member;
 import java.lang.reflect.Type;
 import java.util.Set;
 
+import jakarta.enterprise.inject.spi.AnnotatedMember;
+import jakarta.enterprise.inject.spi.AnnotatedType;
+
 public abstract class AnnotatedMemberHolder<T> implements AnnotatedMember<T> {
-    @Override public Member getJavaMember() {
+    @Override
+    public Member getJavaMember() {
         return null;
     }
 
-    @Override public boolean isStatic() {
+    @Override
+    public boolean isStatic() {
         return false;
     }
 
-    @Override public AnnotatedType<T> getDeclaringType() {
+    @Override
+    public AnnotatedType<T> getDeclaringType() {
         return null;
     }
 
-    @Override public Type getBaseType() {
+    @Override
+    public Type getBaseType() {
         return null;
     }
 
-    @Override public Set<Type> getTypeClosure() {
+    @Override
+    public Set<Type> getTypeClosure() {
         return null;
     }
 
-    @Override public <T extends Annotation> T getAnnotation(Class<T> annotationType) {
+    @Override
+    public <T extends Annotation> T getAnnotation(Class<T> annotationType) {
         return null;
     }
 
-    @Override public Set<Annotation> getAnnotations() {
+    @Override
+    public Set<Annotation> getAnnotations() {
         return null;
     }
 
-    @Override public boolean isAnnotationPresent(Class<? extends Annotation> annotationType) {
+    @Override
+    public boolean isAnnotationPresent(Class<? extends Annotation> annotationType) {
         return false;
     }
 }
diff --git a/api/src/test/java/org/jboss/cdi/api/test/annotated/AnnotatedMethodHolder.java b/api/src/test/java/org/jboss/cdi/api/test/annotated/AnnotatedMethodHolder.java
index 5942b27a4..df61e6228 100644
--- a/api/src/test/java/org/jboss/cdi/api/test/annotated/AnnotatedMethodHolder.java
+++ b/api/src/test/java/org/jboss/cdi/api/test/annotated/AnnotatedMethodHolder.java
@@ -16,17 +16,19 @@
 
 package org.jboss.cdi.api.test.annotated;
 
-import jakarta.enterprise.inject.spi.AnnotatedMethod;
 import java.lang.reflect.Method;
 
-public class AnnotatedMethodHolder<T> extends AnnotatedCallableHolder<T> implements AnnotatedMethod<T>{
+import jakarta.enterprise.inject.spi.AnnotatedMethod;
+
+public class AnnotatedMethodHolder<T> extends AnnotatedCallableHolder<T> implements AnnotatedMethod<T> {
     private final Method method;
 
     public AnnotatedMethodHolder(Method method) {
         this.method = method;
     }
 
-    @Override public Method getJavaMember() {
+    @Override
+    public Method getJavaMember() {
         return method;
     }
 }
diff --git a/api/src/test/java/org/jboss/cdi/api/test/annotated/AnnotatedMethodTest.java b/api/src/test/java/org/jboss/cdi/api/test/annotated/AnnotatedMethodTest.java
index 39f80ce20..e1abbccb3 100644
--- a/api/src/test/java/org/jboss/cdi/api/test/annotated/AnnotatedMethodTest.java
+++ b/api/src/test/java/org/jboss/cdi/api/test/annotated/AnnotatedMethodTest.java
@@ -16,29 +16,34 @@
 
 package org.jboss.cdi.api.test.annotated;
 
-import org.testng.annotations.BeforeClass;
-
-import jakarta.enterprise.inject.spi.Annotated;
 import java.lang.annotation.Annotation;
 import java.lang.reflect.Method;
 
-public class AnnotatedMethodTest extends AbstractAnnotatedTest{
+import jakarta.enterprise.inject.spi.Annotated;
+
+import org.testng.annotations.BeforeClass;
+
+public class AnnotatedMethodTest extends AbstractAnnotatedTest {
     private Method method;
+
     @BeforeClass
     public void getMethod() throws Exception {
         method = RepeatBean.class.getMethod("doRepeat", RepeatBean.class);
     }
 
-    @Override protected Annotated getAnnotated() {
+    @Override
+    protected Annotated getAnnotated() {
         return new AnnotatedMethodHolder<>(method);
     }
 
-    @Override protected <T extends Annotation> T[] getAnnotationsByType(Class<T> annotationClass) {
+    @Override
+    protected <T extends Annotation> T[] getAnnotationsByType(Class<T> annotationClass) {
         return method.getAnnotationsByType(annotationClass);
     }
 
-    @Override protected <T extends Annotation> T getAnnotation(Class<T> annotationClass) {
+    @Override
+    protected <T extends Annotation> T getAnnotation(Class<T> annotationClass) {
         return method.getAnnotation(annotationClass);
     }
 
-}
\ No newline at end of file
+}
diff --git a/api/src/test/java/org/jboss/cdi/api/test/annotated/AnnotatedParameterHolder.java b/api/src/test/java/org/jboss/cdi/api/test/annotated/AnnotatedParameterHolder.java
index 3323724a7..397cf378b 100644
--- a/api/src/test/java/org/jboss/cdi/api/test/annotated/AnnotatedParameterHolder.java
+++ b/api/src/test/java/org/jboss/cdi/api/test/annotated/AnnotatedParameterHolder.java
@@ -16,12 +16,13 @@
 
 package org.jboss.cdi.api.test.annotated;
 
-import jakarta.enterprise.inject.spi.AnnotatedCallable;
-import jakarta.enterprise.inject.spi.AnnotatedParameter;
 import java.lang.annotation.Annotation;
 import java.lang.reflect.Type;
 import java.util.Set;
 
+import jakarta.enterprise.inject.spi.AnnotatedCallable;
+import jakarta.enterprise.inject.spi.AnnotatedParameter;
+
 public class AnnotatedParameterHolder<T> implements AnnotatedParameter<T> {
     private final AnnotatedCallable<T> annotatedCallable;
 
@@ -29,31 +30,38 @@ public AnnotatedParameterHolder(AnnotatedCallable<T> annotatedCallable) {
         this.annotatedCallable = annotatedCallable;
     }
 
-    @Override public int getPosition() {
+    @Override
+    public int getPosition() {
         return 0;
     }
 
-    @Override public AnnotatedCallable<T> getDeclaringCallable() {
+    @Override
+    public AnnotatedCallable<T> getDeclaringCallable() {
         return this.annotatedCallable;
     }
 
-    @Override public Type getBaseType() {
+    @Override
+    public Type getBaseType() {
         return null;
     }
 
-    @Override public Set<Type> getTypeClosure() {
+    @Override
+    public Set<Type> getTypeClosure() {
         return null;
     }
 
-    @Override public <T extends Annotation> T getAnnotation(Class<T> annotationType) {
+    @Override
+    public <T extends Annotation> T getAnnotation(Class<T> annotationType) {
         return null;
     }
 
-    @Override public Set<Annotation> getAnnotations() {
+    @Override
+    public Set<Annotation> getAnnotations() {
         return null;
     }
 
-    @Override public boolean isAnnotationPresent(Class<? extends Annotation> annotationType) {
+    @Override
+    public boolean isAnnotationPresent(Class<? extends Annotation> annotationType) {
         return false;
     }
 }
diff --git a/api/src/test/java/org/jboss/cdi/api/test/annotated/AnnotatedParameterTest.java b/api/src/test/java/org/jboss/cdi/api/test/annotated/AnnotatedParameterTest.java
index ad1297ac5..ebed8985d 100644
--- a/api/src/test/java/org/jboss/cdi/api/test/annotated/AnnotatedParameterTest.java
+++ b/api/src/test/java/org/jboss/cdi/api/test/annotated/AnnotatedParameterTest.java
@@ -16,30 +16,36 @@
 
 package org.jboss.cdi.api.test.annotated;
 
-import org.testng.annotations.BeforeClass;
-
-import jakarta.enterprise.inject.spi.Annotated;
 import java.lang.annotation.Annotation;
 import java.lang.reflect.Method;
 import java.lang.reflect.Parameter;
 
+import jakarta.enterprise.inject.spi.Annotated;
+
+import org.testng.annotations.BeforeClass;
+
 public class AnnotatedParameterTest extends AbstractAnnotatedTest {
     private Method method;
     private Parameter parameter;
+
     @BeforeClass
     public void getMethod() throws Exception {
         this.method = RepeatBean.class.getMethod("doRepeat", RepeatBean.class);
         this.parameter = method.getParameters()[0];
     }
-    @Override protected Annotated getAnnotated() {
+
+    @Override
+    protected Annotated getAnnotated() {
         return new AnnotatedParameterHolder<>(new AnnotatedMethodHolder<>(method));
     }
 
-    @Override protected <T extends Annotation> T[] getAnnotationsByType(Class<T> annotationClass) {
+    @Override
+    protected <T extends Annotation> T[] getAnnotationsByType(Class<T> annotationClass) {
         return parameter.getAnnotationsByType(annotationClass);
     }
 
-    @Override protected <T extends Annotation> T getAnnotation(Class<T> annotationClass) {
+    @Override
+    protected <T extends Annotation> T getAnnotation(Class<T> annotationClass) {
         return parameter.getAnnotation(annotationClass);
     }
 }
diff --git a/api/src/test/java/org/jboss/cdi/api/test/annotated/AnnotatedTypeHolder.java b/api/src/test/java/org/jboss/cdi/api/test/annotated/AnnotatedTypeHolder.java
index a2290c86c..98dfa42ed 100644
--- a/api/src/test/java/org/jboss/cdi/api/test/annotated/AnnotatedTypeHolder.java
+++ b/api/src/test/java/org/jboss/cdi/api/test/annotated/AnnotatedTypeHolder.java
@@ -16,13 +16,14 @@
 
 package org.jboss.cdi.api.test.annotated;
 
+import java.lang.annotation.Annotation;
+import java.lang.reflect.Type;
+import java.util.Set;
+
 import jakarta.enterprise.inject.spi.AnnotatedConstructor;
 import jakarta.enterprise.inject.spi.AnnotatedField;
 import jakarta.enterprise.inject.spi.AnnotatedMethod;
 import jakarta.enterprise.inject.spi.AnnotatedType;
-import java.lang.annotation.Annotation;
-import java.lang.reflect.Type;
-import java.util.Set;
 
 final class AnnotatedTypeHolder<T> implements AnnotatedType<T> {
     private final Class<T> clazz;
@@ -31,39 +32,48 @@ public AnnotatedTypeHolder(Class<T> clazz) {
         this.clazz = clazz;
     }
 
-    @Override public Class<T> getJavaClass() {
+    @Override
+    public Class<T> getJavaClass() {
         return clazz;
     }
 
-    @Override public Set<AnnotatedConstructor<T>> getConstructors() {
+    @Override
+    public Set<AnnotatedConstructor<T>> getConstructors() {
         return null;
     }
 
-    @Override public Set<AnnotatedMethod<? super T>> getMethods() {
+    @Override
+    public Set<AnnotatedMethod<? super T>> getMethods() {
         return null;
     }
 
-    @Override public Set<AnnotatedField<? super T>> getFields() {
+    @Override
+    public Set<AnnotatedField<? super T>> getFields() {
         return null;
     }
 
-    @Override public Type getBaseType() {
+    @Override
+    public Type getBaseType() {
         return null;
     }
 
-    @Override public Set<Type> getTypeClosure() {
+    @Override
+    public Set<Type> getTypeClosure() {
         return null;
     }
 
-    @Override public <T extends Annotation> T getAnnotation(Class<T> annotationType) {
+    @Override
+    public <T extends Annotation> T getAnnotation(Class<T> annotationType) {
         return null;
     }
 
-    @Override public Set<Annotation> getAnnotations() {
+    @Override
+    public Set<Annotation> getAnnotations() {
         return null;
     }
 
-    @Override public boolean isAnnotationPresent(Class<? extends Annotation> annotationType) {
+    @Override
+    public boolean isAnnotationPresent(Class<? extends Annotation> annotationType) {
         return false;
     }
 }
diff --git a/api/src/test/java/org/jboss/cdi/api/test/annotated/AnnotatedTypeTest.java b/api/src/test/java/org/jboss/cdi/api/test/annotated/AnnotatedTypeTest.java
index 314b467e9..54a42424e 100644
--- a/api/src/test/java/org/jboss/cdi/api/test/annotated/AnnotatedTypeTest.java
+++ b/api/src/test/java/org/jboss/cdi/api/test/annotated/AnnotatedTypeTest.java
@@ -16,21 +16,25 @@
 
 package org.jboss.cdi.api.test.annotated;
 
-import jakarta.enterprise.inject.spi.Annotated;
 import java.lang.annotation.Annotation;
 
+import jakarta.enterprise.inject.spi.Annotated;
+
 public class AnnotatedTypeTest extends AbstractAnnotatedTest {
 
-    @Override protected Annotated getAnnotated() {
+    @Override
+    protected Annotated getAnnotated() {
         return new AnnotatedTypeHolder<>(RepeatBean.class);
     }
 
-    @Override protected <T extends Annotation> T[] getAnnotationsByType(Class<T> annotationClass) {
+    @Override
+    protected <T extends Annotation> T[] getAnnotationsByType(Class<T> annotationClass) {
         return RepeatBean.class.getAnnotationsByType(annotationClass);
     }
 
-    @Override protected <T extends Annotation> T getAnnotation(Class<T> annotationClass) {
+    @Override
+    protected <T extends Annotation> T getAnnotation(Class<T> annotationClass) {
         return RepeatBean.class.getAnnotation(annotationClass);
     }
 
-}
\ No newline at end of file
+}
diff --git a/api/src/test/java/org/jboss/cdi/api/test/annotated/RepeatBean.java b/api/src/test/java/org/jboss/cdi/api/test/annotated/RepeatBean.java
index b4c35bd13..e7b9c8029 100644
--- a/api/src/test/java/org/jboss/cdi/api/test/annotated/RepeatBean.java
+++ b/api/src/test/java/org/jboss/cdi/api/test/annotated/RepeatBean.java
@@ -24,6 +24,7 @@ public class RepeatBean {
     public RepeatBean() {
 
     }
+
     @Repeater("e")
     @Repeater("f")
     public void doRepeat(@Repeater("p") @Repeater("q") RepeatBean parameter) {
diff --git a/api/src/test/java/org/jboss/cdi/api/test/annotated/Repeater.java b/api/src/test/java/org/jboss/cdi/api/test/annotated/Repeater.java
index d4a021f29..acb70c77e 100644
--- a/api/src/test/java/org/jboss/cdi/api/test/annotated/Repeater.java
+++ b/api/src/test/java/org/jboss/cdi/api/test/annotated/Repeater.java
@@ -19,7 +19,7 @@
 import java.lang.annotation.*;
 
 @Retention(RetentionPolicy.RUNTIME)
-@Target({ElementType.TYPE, ElementType.METHOD, ElementType.CONSTRUCTOR, ElementType.FIELD, ElementType.PARAMETER})
+@Target({ ElementType.TYPE, ElementType.METHOD, ElementType.CONSTRUCTOR, ElementType.FIELD, ElementType.PARAMETER })
 @Repeatable(Repeaters.class)
 public @interface Repeater {
     String value();
diff --git a/api/src/test/java/org/jboss/cdi/api/test/annotated/Repeaters.java b/api/src/test/java/org/jboss/cdi/api/test/annotated/Repeaters.java
index 21e1e77af..14f83a7c9 100644
--- a/api/src/test/java/org/jboss/cdi/api/test/annotated/Repeaters.java
+++ b/api/src/test/java/org/jboss/cdi/api/test/annotated/Repeaters.java
@@ -22,7 +22,7 @@
 import java.lang.annotation.Target;
 
 @Retention(RetentionPolicy.RUNTIME)
-@Target({ElementType.TYPE, ElementType.METHOD, ElementType.CONSTRUCTOR, ElementType.FIELD, ElementType.PARAMETER})
+@Target({ ElementType.TYPE, ElementType.METHOD, ElementType.CONSTRUCTOR, ElementType.FIELD, ElementType.PARAMETER })
 public @interface Repeaters {
     Repeater[] value();
 }
diff --git a/api/src/test/java/org/jboss/cdi/api/test/annotated/parameter/AnnotatedParameterTest.java b/api/src/test/java/org/jboss/cdi/api/test/annotated/parameter/AnnotatedParameterTest.java
index 54b4c65e5..2eba83b7c 100644
--- a/api/src/test/java/org/jboss/cdi/api/test/annotated/parameter/AnnotatedParameterTest.java
+++ b/api/src/test/java/org/jboss/cdi/api/test/annotated/parameter/AnnotatedParameterTest.java
@@ -33,7 +33,7 @@
 
 /**
  * Test for the default method implementation of {@link AnnotatedParameter#getJavaParameter()}.
- * 
+ *
  * @author Jozef Hartinger
  *
  */
@@ -89,7 +89,7 @@ public <T extends Annotation> T getAnnotation(Class<T> annotationType) {
         public Set<Annotation> getAnnotations() {
             return null;
         }
-        
+
         @Override
         public <T extends Annotation> Set<T> getAnnotations(Class<T> annotationType) {
             return null;
@@ -137,7 +137,7 @@ public <T extends Annotation> T getAnnotation(Class<T> annotationType) {
         public Set<Annotation> getAnnotations() {
             return null;
         }
-        
+
         @Override
         public <T extends Annotation> Set<T> getAnnotations(Class<T> annotationType) {
             return null;
diff --git a/api/src/test/java/org/jboss/cdi/api/test/event/NotificationOptionsTest.java b/api/src/test/java/org/jboss/cdi/api/test/event/NotificationOptionsTest.java
index 0222093a3..95e032c76 100644
--- a/api/src/test/java/org/jboss/cdi/api/test/event/NotificationOptionsTest.java
+++ b/api/src/test/java/org/jboss/cdi/api/test/event/NotificationOptionsTest.java
@@ -12,7 +12,7 @@
 import org.testng.annotations.Test;
 
 /**
- * 
+ *
  * @author Martin Kouba
  */
 public class NotificationOptionsTest {
diff --git a/api/src/test/java/org/jboss/cdi/api/test/privileged/CDIPrivilegedTest.java b/api/src/test/java/org/jboss/cdi/api/test/privileged/CDIPrivilegedTest.java
index eec8a8e54..16588a78c 100644
--- a/api/src/test/java/org/jboss/cdi/api/test/privileged/CDIPrivilegedTest.java
+++ b/api/src/test/java/org/jboss/cdi/api/test/privileged/CDIPrivilegedTest.java
@@ -37,7 +37,6 @@ public class CDIPrivilegedTest {
 
     private static final String SERVICE_FILE_NAME = SERVICE_PATH + CDIProvider.class.getName();
 
-
     @Test
     public void cdiCurrentShouldWork() {
         try {
diff --git a/api/src/test/java/org/jboss/cdi/api/test/privileged/FakeCDIProvider.java b/api/src/test/java/org/jboss/cdi/api/test/privileged/FakeCDIProvider.java
index 6e165a669..e583ef9df 100644
--- a/api/src/test/java/org/jboss/cdi/api/test/privileged/FakeCDIProvider.java
+++ b/api/src/test/java/org/jboss/cdi/api/test/privileged/FakeCDIProvider.java
@@ -27,6 +27,7 @@
 
 /**
  * A fake CDI Provider for testing
+ *
  * @author Antoine Sabot-Durand
  */
 public class FakeCDIProvider implements CDIProvider {
@@ -43,7 +44,6 @@ public int getPriority() {
 
     public static class FakeCDI extends CDI<Object> {
 
-
         @Override
         public BeanManager getBeanManager() {
             return null;
@@ -73,7 +73,7 @@ public boolean isUnsatisfied() {
         public boolean isAmbiguous() {
             return false;
         }
-        
+
         @Override
         public void destroy(Object instance) {
 
diff --git a/api/src/test/java/org/jboss/cdi/api/test/privileged/annotation/AnnotationLiteralTest.java b/api/src/test/java/org/jboss/cdi/api/test/privileged/annotation/AnnotationLiteralTest.java
index 42fea8242..e989967b5 100644
--- a/api/src/test/java/org/jboss/cdi/api/test/privileged/annotation/AnnotationLiteralTest.java
+++ b/api/src/test/java/org/jboss/cdi/api/test/privileged/annotation/AnnotationLiteralTest.java
@@ -17,6 +17,7 @@
 package org.jboss.cdi.api.test.privileged.annotation;
 
 import jakarta.enterprise.util.AnnotationLiteral;
+
 import org.testng.Assert;
 import org.testng.annotations.Test;
 
diff --git a/api/src/test/java/org/jboss/cdi/api/test/privileged/annotation/MyAnnotation.java b/api/src/test/java/org/jboss/cdi/api/test/privileged/annotation/MyAnnotation.java
index e80af7445..f13c1fb0a 100644
--- a/api/src/test/java/org/jboss/cdi/api/test/privileged/annotation/MyAnnotation.java
+++ b/api/src/test/java/org/jboss/cdi/api/test/privileged/annotation/MyAnnotation.java
@@ -22,7 +22,7 @@
 import java.lang.annotation.Target;
 
 @Retention(RetentionPolicy.RUNTIME)
-@Target({ElementType.TYPE, ElementType.METHOD, ElementType.CONSTRUCTOR, ElementType.FIELD, ElementType.PARAMETER})
+@Target({ ElementType.TYPE, ElementType.METHOD, ElementType.CONSTRUCTOR, ElementType.FIELD, ElementType.PARAMETER })
 public @interface MyAnnotation {
 
     public String member1() default "member1";
diff --git a/api/src/test/java/org/jboss/cdi/api/test/privileged/annotation/MyAnnotationLiteral.java b/api/src/test/java/org/jboss/cdi/api/test/privileged/annotation/MyAnnotationLiteral.java
index 1aa3590c4..96046febb 100644
--- a/api/src/test/java/org/jboss/cdi/api/test/privileged/annotation/MyAnnotationLiteral.java
+++ b/api/src/test/java/org/jboss/cdi/api/test/privileged/annotation/MyAnnotationLiteral.java
@@ -39,5 +39,4 @@ public int member2() {
 
     private int m2;
 
-
 }
diff --git a/api/src/test/java/org/jboss/cdi/api/test/se/DummySeContainerInitializer.java b/api/src/test/java/org/jboss/cdi/api/test/se/DummySeContainerInitializer.java
index ef65c285a..bf13badb6 100644
--- a/api/src/test/java/org/jboss/cdi/api/test/se/DummySeContainerInitializer.java
+++ b/api/src/test/java/org/jboss/cdi/api/test/se/DummySeContainerInitializer.java
@@ -16,11 +16,12 @@
 
 package org.jboss.cdi.api.test.se;
 
+import java.lang.annotation.Annotation;
+import java.util.Map;
+
 import jakarta.enterprise.inject.se.SeContainer;
 import jakarta.enterprise.inject.se.SeContainerInitializer;
 import jakarta.enterprise.inject.spi.Extension;
-import java.lang.annotation.Annotation;
-import java.util.Map;
 
 /**
  *
@@ -82,7 +83,8 @@ public SeContainerInitializer selectAlternatives(Class<?>... alternativeClasses)
 
     @SafeVarargs
     @Override
-    public final SeContainerInitializer selectAlternativeStereotypes(Class<? extends Annotation>... alternativeStereotypeClasses) {
+    public final SeContainerInitializer selectAlternativeStereotypes(
+            Class<? extends Annotation>... alternativeStereotypeClasses) {
         return null;
     }
 
@@ -96,7 +98,6 @@ public SeContainerInitializer setProperties(Map<String, Object> properties) {
         return null;
     }
 
-
     @Override
     public SeContainerInitializer disableDiscovery() {
         return null;
diff --git a/api/src/test/java/org/jboss/cdi/api/test/se/DummySeContainerInitializer2.java b/api/src/test/java/org/jboss/cdi/api/test/se/DummySeContainerInitializer2.java
index 11889f4c9..9cfb85db3 100644
--- a/api/src/test/java/org/jboss/cdi/api/test/se/DummySeContainerInitializer2.java
+++ b/api/src/test/java/org/jboss/cdi/api/test/se/DummySeContainerInitializer2.java
@@ -16,11 +16,12 @@
 
 package org.jboss.cdi.api.test.se;
 
+import java.lang.annotation.Annotation;
+import java.util.Map;
+
 import jakarta.enterprise.inject.se.SeContainer;
 import jakarta.enterprise.inject.se.SeContainerInitializer;
 import jakarta.enterprise.inject.spi.Extension;
-import java.lang.annotation.Annotation;
-import java.util.Map;
 
 /**
  *
@@ -82,7 +83,8 @@ public SeContainerInitializer selectAlternatives(Class<?>... alternativeClasses)
 
     @SafeVarargs
     @Override
-    public final SeContainerInitializer selectAlternativeStereotypes(Class<? extends Annotation>... alternativeStereotypeClasses) {
+    public final SeContainerInitializer selectAlternativeStereotypes(
+            Class<? extends Annotation>... alternativeStereotypeClasses) {
         return null;
     }
 
diff --git a/api/src/test/java/org/jboss/cdi/api/test/se/SeContainerInitializerTest.java b/api/src/test/java/org/jboss/cdi/api/test/se/SeContainerInitializerTest.java
index 0ab2fc6ef..90c239d7c 100644
--- a/api/src/test/java/org/jboss/cdi/api/test/se/SeContainerInitializerTest.java
+++ b/api/src/test/java/org/jboss/cdi/api/test/se/SeContainerInitializerTest.java
@@ -16,17 +16,19 @@
 
 package org.jboss.cdi.api.test.se;
 
-import org.testng.Assert;
-import org.testng.annotations.BeforeMethod;
-import org.testng.annotations.Test;
-
-import jakarta.enterprise.inject.se.SeContainerInitializer;
 import java.io.FileWriter;
 import java.nio.file.FileSystems;
 import java.nio.file.Files;
 
+import jakarta.enterprise.inject.se.SeContainerInitializer;
+
+import org.testng.Assert;
+import org.testng.annotations.BeforeMethod;
+import org.testng.annotations.Test;
+
 /**
  * Test for CDIProvider resolution in CDI abstract class.
+ *
  * @author Antoine Sabot-durand
  *
  */
@@ -78,4 +80,4 @@ public void testWithTwoGoodSeContainerInitializer() throws Exception {
         Assert.assertTrue(SeContainerInitializer.newInstance().getClass().equals(DummySeContainerInitializer.class) ||
                 SeContainerInitializer.newInstance().getClass().equals(DummySeContainerInitializer2.class));
     }
-}
\ No newline at end of file
+}
diff --git a/el/src/main/java/jakarta/enterprise/inject/spi/el/ELAwareBeanManager.java b/el/src/main/java/jakarta/enterprise/inject/spi/el/ELAwareBeanManager.java
index 8fa8e475f..e7ba393b4 100644
--- a/el/src/main/java/jakarta/enterprise/inject/spi/el/ELAwareBeanManager.java
+++ b/el/src/main/java/jakarta/enterprise/inject/spi/el/ELAwareBeanManager.java
@@ -21,7 +21,8 @@ public interface ELAwareBeanManager extends BeanManager {
 
     /**
      * Returns a wrapper {@link jakarta.el.ExpressionFactory} that delegates {@link jakarta.el.MethodExpression} and
-     * {@link jakarta.el.ValueExpression} creation to the given {@link jakarta.el.ExpressionFactory}. When a Unified EL expression
+     * {@link jakarta.el.ValueExpression} creation to the given {@link jakarta.el.ExpressionFactory}. When a Unified EL
+     * expression
      * is evaluated using a {@link jakarta.el.MethodExpression} or {@link jakarta.el.ValueExpression} returned by the wrapper
      * {@link jakarta.el.ExpressionFactory}, the container handles destruction of objects with scope
      * {@link Dependent}.
diff --git a/lang-model/src/main/java/jakarta/enterprise/lang/model/AnnotationInfo.java b/lang-model/src/main/java/jakarta/enterprise/lang/model/AnnotationInfo.java
index a8ee4947d..6172785d4 100644
--- a/lang-model/src/main/java/jakarta/enterprise/lang/model/AnnotationInfo.java
+++ b/lang-model/src/main/java/jakarta/enterprise/lang/model/AnnotationInfo.java
@@ -1,10 +1,10 @@
 package jakarta.enterprise.lang.model;
 
-import jakarta.enterprise.lang.model.declarations.ClassInfo;
-
 import java.lang.annotation.Repeatable;
 import java.util.Map;
 
+import jakarta.enterprise.lang.model.declarations.ClassInfo;
+
 /**
  * An annotation instance, typically obtained from an {@link AnnotationTarget}.
  * Provides access to annotation members and their values.
@@ -76,7 +76,8 @@ default boolean hasValue() {
     /**
      * Returns the {@linkplain AnnotationMember value} of this annotation's {@link AnnotationMember#VALUE value} member.
      *
-     * @return value of this annotation's {@link AnnotationMember#VALUE value} member or {@code null} if the member does not exist
+     * @return value of this annotation's {@link AnnotationMember#VALUE value} member or {@code null} if the member does not
+     *         exist
      */
     default AnnotationMember value() {
         return member(AnnotationMember.VALUE);
diff --git a/lang-model/src/main/java/jakarta/enterprise/lang/model/AnnotationMember.java b/lang-model/src/main/java/jakarta/enterprise/lang/model/AnnotationMember.java
index 474460a41..892022b94 100644
--- a/lang-model/src/main/java/jakarta/enterprise/lang/model/AnnotationMember.java
+++ b/lang-model/src/main/java/jakarta/enterprise/lang/model/AnnotationMember.java
@@ -1,10 +1,10 @@
 package jakarta.enterprise.lang.model;
 
+import java.util.List;
+
 import jakarta.enterprise.lang.model.declarations.ClassInfo;
 import jakarta.enterprise.lang.model.types.Type;
 
-import java.util.List;
-
 /**
  * The value of an annotation member. Annotation member values are of several kinds:
  * <ul>
diff --git a/lang-model/src/main/java/jakarta/enterprise/lang/model/AnnotationTarget.java b/lang-model/src/main/java/jakarta/enterprise/lang/model/AnnotationTarget.java
index 2503a6a95..b34233bcb 100644
--- a/lang-model/src/main/java/jakarta/enterprise/lang/model/AnnotationTarget.java
+++ b/lang-model/src/main/java/jakarta/enterprise/lang/model/AnnotationTarget.java
@@ -1,12 +1,12 @@
 package jakarta.enterprise.lang.model;
 
-import jakarta.enterprise.lang.model.declarations.DeclarationInfo;
-import jakarta.enterprise.lang.model.types.Type;
-
 import java.lang.annotation.Annotation;
 import java.util.Collection;
 import java.util.function.Predicate;
 
+import jakarta.enterprise.lang.model.declarations.DeclarationInfo;
+import jakarta.enterprise.lang.model.types.Type;
+
 /**
  * An annotation target is anything that can be annotated.
  * That is:
@@ -84,7 +84,8 @@ public interface AnnotationTarget {
      * Returns whether given predicate matches any annotation present on this annotation target.
      *
      * @param predicate annotation predicate, must not be {@code null}
-     * @return {@code true} if given predicate matches any annotation present on this annotation target, {@code false} otherwise.
+     * @return {@code true} if given predicate matches any annotation present on this annotation target, {@code false}
+     *         otherwise.
      */
     boolean hasAnnotation(Predicate<AnnotationInfo> predicate);
 
diff --git a/lang-model/src/main/java/jakarta/enterprise/lang/model/declarations/ClassInfo.java b/lang-model/src/main/java/jakarta/enterprise/lang/model/declarations/ClassInfo.java
index 4c0c16a09..836faf7ed 100644
--- a/lang-model/src/main/java/jakarta/enterprise/lang/model/declarations/ClassInfo.java
+++ b/lang-model/src/main/java/jakarta/enterprise/lang/model/declarations/ClassInfo.java
@@ -1,11 +1,11 @@
 package jakarta.enterprise.lang.model.declarations;
 
-import jakarta.enterprise.lang.model.types.Type;
-import jakarta.enterprise.lang.model.types.TypeVariable;
-
 import java.util.Collection;
 import java.util.List;
 
+import jakarta.enterprise.lang.model.types.Type;
+import jakarta.enterprise.lang.model.types.TypeVariable;
+
 /**
  * A class. Five kinds of classes are distinguished:
  * <ul>
diff --git a/lang-model/src/main/java/jakarta/enterprise/lang/model/declarations/MethodInfo.java b/lang-model/src/main/java/jakarta/enterprise/lang/model/declarations/MethodInfo.java
index e896dff07..c519e816d 100644
--- a/lang-model/src/main/java/jakarta/enterprise/lang/model/declarations/MethodInfo.java
+++ b/lang-model/src/main/java/jakarta/enterprise/lang/model/declarations/MethodInfo.java
@@ -1,8 +1,9 @@
 package jakarta.enterprise.lang.model.declarations;
 
+import java.util.List;
+
 import jakarta.enterprise.lang.model.types.Type;
 import jakarta.enterprise.lang.model.types.TypeVariable;
-import java.util.List;
 
 /**
  * A method or a constructor, {@linkplain #declaringClass() declared} in some class.
@@ -38,7 +39,7 @@ public interface MethodInfo extends DeclarationInfo {
      * If this method may declare a receiver parameter but does not, returns a {@link Type} with no annotations.
      *
      * @return the type of the receiver parameter declared by this method, with or without annotations,
-     * or {@code null} if this method cannot declare a receiver parameter
+     *         or {@code null} if this method cannot declare a receiver parameter
      */
     Type receiverType();
 
diff --git a/lang-model/src/main/java/jakarta/enterprise/lang/model/types/ParameterizedType.java b/lang-model/src/main/java/jakarta/enterprise/lang/model/types/ParameterizedType.java
index 9e1606c73..82f1192ea 100644
--- a/lang-model/src/main/java/jakarta/enterprise/lang/model/types/ParameterizedType.java
+++ b/lang-model/src/main/java/jakarta/enterprise/lang/model/types/ParameterizedType.java
@@ -1,8 +1,9 @@
 package jakarta.enterprise.lang.model.types;
 
-import jakarta.enterprise.lang.model.declarations.ClassInfo;
 import java.util.List;
 
+import jakarta.enterprise.lang.model.declarations.ClassInfo;
+
 /**
  * A parameterized type. That is, a {@linkplain #genericClass() generic class} together with
  * a list of {@linkplain #typeArguments() type arguments}. The list of type arguments
diff --git a/lang-model/src/main/java/jakarta/enterprise/lang/model/types/Type.java b/lang-model/src/main/java/jakarta/enterprise/lang/model/types/Type.java
index f737c962d..ae115d154 100644
--- a/lang-model/src/main/java/jakarta/enterprise/lang/model/types/Type.java
+++ b/lang-model/src/main/java/jakarta/enterprise/lang/model/types/Type.java
@@ -27,7 +27,8 @@
  * <li>a {@linkplain ClassType class} type, such as {@code String}</li>
  * <li>an {@linkplain ArrayType array} type, such as {@code int[]} or {@code String[][]}</li>
  * <li>a {@linkplain ParameterizedType parameterized} type, such as {@code List<String>}</li>
- * <li>a {@linkplain TypeVariable type variable}, such as {@code T} when used in a class that declares a type parameter {@code T}</li>
+ * <li>a {@linkplain TypeVariable type variable}, such as {@code T} when used in a class that declares a type parameter
+ * {@code T}</li>
  * <li>a {@linkplain WildcardType wildcard} type, such as the type argument in {@code List<? extends Number>}</li>
  * </ul>
  *