Decide on other mentions of Full-only concepts in the CDI Lite spec p…

…art.

spec/src/main/asciidoc/cdi-spec.asciidoc

@@ -73,6 +73,8 @@ include::core/injectionandresolution_full.asciidoc[]
 
 include::core/scopescontexts_full.asciidoc[]
 
+include::core/lifecycle_full.asciidoc[]
+
 include::core/interceptors_full.asciidoc[]
 
 include::core/decorators.asciidoc[]

spec/src/main/asciidoc/core/injectionandresolution.asciidoc

@@ -48,9 +48,6 @@ An alternative may be given a priority for the application:
 * by placing the `@Priority` annotation on the bean class of a managed bean, or
 * by placing the `@Priority` annotation on the bean class that declares the producer method, field or resource.
 
-Custom bean implementations which are also alternatives may implement <<prioritized, Prioritized interface>> in which case they will be enabled for entire application with given priority.
-// TODO this refers to Portable Extensions, maybe move to Full? maybe mention Build Compatible Extensions?
-
 [[enablement]]
 
 ==== Enabled and disabled beans
@@ -74,9 +71,6 @@ A bean is _available for injection_ in a certain module if:
 * the bean is either not an alternative, or the module is a bean archive and the bean is a selected alternative for the application,  and
 * the bean class is required to be accessible to classes in the module, according to the class accessibility requirements of the module architecture.
 
-For a custom implementation of the `Bean` interface defined in <<bean>>, the container calls `getBeanClass()` to determine the bean class of the bean and `InjectionPoint.getMember()` and then `Member.getDeclaringClass()` to determine the class that declares an injection point.
-// TODO this refers to Portable Extensions, maybe move to Full? maybe mention Build Compatible Extensions?
-
 [[typesafe_resolution]]
 
 === Typesafe resolution
@@ -105,10 +99,6 @@ A bean is eligible for injection to a certain injection point if:
 * it is available for injection in the module that contains the class that declares the injection point, and
 * it is assignable to the injection point (using <<assignable_parameters>>).
 
-
-For a custom implementation of the `Bean` interface defined in <<bean>>, the container calls `getTypes()` and `getQualifiers()` to determine the bean types and qualifiers.
-// TODO this refers to Portable Extensions, maybe move to Full? maybe mention Build Compatible Extensions?
-
 [[unsatisfied_and_ambig_dependencies]]
 
 ==== Unsatisfied and ambiguous dependencies
@@ -127,9 +117,6 @@ If there is exactly one bean remaining, the container will select this bean, and
 The container must validate all injection points of all enabled beans, all observer methods and all disposer methods when the application is initialized to ensure that there are no unsatisfied or unresolvable ambiguous dependencies.
 If an unsatisfied or unresolvable ambiguous dependency exists, the container automatically detects the problem and treats it as a deployment problem.
 
-For a custom implementation of the `Bean` interface defined in <<bean>>, the container calls `getInjectionPoints()` to determine the set of injection points.
-// TODO this refers to Portable Extensions, maybe move to Full? maybe mention Build Compatible Extensions?
-
 [[legal_injection_point_types]]
 
 ==== Legal injection point types
@@ -312,11 +299,6 @@ In certain scenarios, for example if a request scoped bean is injected into a se
 * The container may use a client proxy when creating beans with circular dependencies.
 This is only necessary when the circular dependencies are initialized via a managed bean constructor or producer method parameter.
 (Beans with scope `@Dependent` never have circular dependencies.)
-* Finally, client proxies may be passivated, even when the bean itself may not be.
-Therefore the container must use a client proxy whenever a bean with normal scope is injected into a bean with a passivating scope, as defined in <<passivating_scope>>.
-(On the other hand, beans with scope `@Dependent` must be serialized along with their client.)
-// TODO move passivation to Full?
-
 
 Client proxies are never required for a bean whose scope is a pseudo-scope such as `@Dependent`.
 
@@ -474,8 +456,7 @@ Behavior of this method in {cdi_full} is specified therein.
 * The `isDelegate()` method may, in {cdi_lite} environment, always return `false`.
 Behavior of this method in {cdi_full} is specified therein.
 * The `isTransient()` method returns `true` if the injection point is a transient field, and `false` otherwise.
-If the injection point represents a dynamically obtained instance then the `isTransient()` method returns `true` if the `Instance` injection point is a transient field, and `false` otherwise. If this injection point is declared as transient, after bean's passivation, the value will not be restored. Instance<> injection point is the preferred approach.
-// TODO move passivation to Full?
+If the injection point represents a dynamically obtained instance then the `isTransient()` method returns `true` if the `Instance` injection point is a transient field, and `false` otherwise.
 
 Occasionally, a bean with scope `@Dependent` needs to access metadata relating to the object into which it is injected.
 For example, the following producer method creates injectable `Logger` s.
@@ -489,8 +470,6 @@ The log category of a `Logger` depends upon the class of the object into which i
 ----
 
 The container must provide a bean with scope `@Dependent`, bean type `InjectionPoint` and qualifier `@Default`, allowing dependent objects, as defined in <<dependent_objects>>, to obtain information about the injection point to which they belong.
-The built-in implementation must be a passivation capable dependency, as defined in <<passivation_capable_dependency>>.
-// TODO move passivation to Full?
 
 If a bean that declares any scope other than `@Dependent` has an injection point of type `InjectionPoint` and qualifier `@Default`, the container automatically detects the problem and treats it as a definition error.
 
@@ -749,9 +728,6 @@ The container must provide a built-in bean that:
 * has no bean name, and
 * has an implementation provided automatically by the container.
 
-The built-in implementation must be a passivation capable dependency, as defined in <<passivation_capable_dependency>>.
-// TODO move passivation to Full?
-
 [[annotationliteral_typeliteral]]
 
 ==== Using `AnnotationLiteral` and `TypeLiteral`
@@ -793,7 +769,6 @@ The following built-in annotations define a `Literal` static nested class to sup
 * `jakarta.enterprise.inject.Any`
 * `jakarta.enterprise.inject.Default`
 * `jakarta.enterprise.inject.Specializes`
-// TODO move to Full?
 * `jakarta.enterprise.inject.Vetoed`
 * `jakarta.enterprise.util.Nonbinding`
 * `jakarta.enterprise.context.Initialized`
@@ -803,7 +778,6 @@ The following built-in annotations define a `Literal` static nested class to sup
 * `jakarta.enterprise.context.ApplicationScoped`
 * `jakarta.enterprise.context.Dependent`
 * `jakarta.enterprise.context.ConversationScoped`
-// TODO move to Full?
 * `jakarta.enterprise.inject.Alternative`
 * `jakarta.enterprise.inject.Typed`
 

spec/src/main/asciidoc/core/injectionandresolution_full.asciidoc

@@ -17,6 +17,8 @@ An alternative is not available for injection, lookup or name resolution to clas
 
 {cdi_full} provides an additional way to select alternatives to the one defined in <<declaring_selected_alternatives_application>>.
 
+Custom bean implementations which are also alternatives may implement <<prioritized, Prioritized interface>> in which case they will be enabled for entire application with given priority.
+
 [[declaring_selected_alternatives_bean_archive]]
 
 ===== Declaring selected alternatives for a bean archive
@@ -57,7 +59,6 @@ If there is no annotation with the specified name, or the annotation is not an `
 If the same type is listed twice under the `<alternatives>` element, the container automatically detects the problem and treats it as a deployment problem.
 
 For a custom implementation of the `Bean` interface defined in <<bean>>, the container calls `isAlternative()` to determine whether the bean is an alternative, and `getBeanClass()` and `getStereotypes()` to determine whether an alternative is selected in a certain bean archive.
-// TODO this refers to Portable Extensions, maybe move to Full? maybe mention Build Compatible Extensions?
 
 [[enablement_full]]
 
@@ -95,7 +96,7 @@ A bean is also _available for injection_ in a certain module if:
 * the bean is not a decorator,
 * the bean is either not an alternative, or the module is a bean archive and the bean is a selected alternative of the bean archive.
 
-// TODO here, maybe we shouldn't do "in addition to", but "is overridden" and spell out the full rules again
+For a custom implementation of the `Bean` interface defined in <<bean>>, the container calls `getBeanClass()` to determine the bean class of the bean and `InjectionPoint.getMember()` and then `Member.getDeclaringClass()` to determine the class that declares an injection point.
 
 [[typesafe_resolution_full]]
 
@@ -109,6 +110,8 @@ In addition to rules defined in <<performing_typesafe_resolution>>, the followin
 
 * Parameterized and raw types are considered to match if they are identical or if the bean type is _assignable_ to the required type, as defined in <<assignable_parameters>> or <<delegate_assignable_parameters>>.
 
+Furthermore, for a custom implementation of the `Bean` interface defined in <<bean>>, the container calls `getTypes()` and `getQualifiers()` to determine the bean types and qualifiers.
+
 [[unsatisfied_and_ambig_dependencies_full]]
 
 ==== Unsatisfied and ambiguous dependencies in {cdi_full}
@@ -117,6 +120,8 @@ In addition to rules defined in <<unsatisfied_and_ambig_dependencies>>, the foll
 
 An unsatisfied or ambiguous dependency cannot exist for a decorator delegate injection point, defined in <<delegate_attribute>>.
 
+Furthermore, for a custom implementation of the `Bean` interface defined in <<bean>>, the container calls `getInjectionPoints()` to determine the set of injection points.
+
 [[assignable_parameters_full]]
 
 ==== Assignability of raw and parameterized types in {cdi_full}
@@ -136,6 +141,14 @@ In addition to rules defined in <<ambig_names>>, the following rules apply.
 When an ambiguous name exists, the container attempts to resolve the ambiguity.
 The container eliminates all eligible beans that are not alternatives selected for the bean archive or selected for the application, except for producer methods and fields of beans that are alternatives.
 
+[[client_proxies_full]]
+
+=== Client proxies in {cdi_full}
+
+In addition to the reasons for indirection defined in <<client_proxies>>, in {cdi_full} client proxies may be passivated, even when the bean itself may not be.
+Therefore the container must use a client proxy whenever a bean with normal scope is injected into a bean with a passivating scope, as defined in <<passivating_scope>>.
+(On the other hand, beans with scope `@Dependent` must be serialized along with their client.)
+
 ==== Injection point metadata in {cdi_full}
 
 The behavior of `InjectionPoint` metadata is overridden as follows:
@@ -145,6 +158,10 @@ If the injection point represents a dynamically obtained instance, then the `get
 * The `isDelegate()` method returns `true` if the injection point is a decorator delegate injection point, and `false` otherwise.
 If the injection point represents a dynamically obtained instance then `isDelegate()` returns false.
 
+If the injection point represents a dynamically obtained instance then the `isTransient()` method returns `true` if the `Instance` injection point is a transient field, and `false` otherwise. If this injection point is declared as transient, after bean's passivation, the value will not be restored. Instance<> injection point is the preferred approach.
+
+In {cdi_full}, the built-in implementation of `InjectionPoint` must be a passivation capable dependency, as defined in <<passivation_capable_dependency>>.
+
 [[bean_metadata_full]]
 
 ==== Bean metadata in {cdi_full}
@@ -173,3 +190,17 @@ If:
 * the injection point is a field, an initializer method parameter or a bean constructor of a decorator, with qualifier `@Decorated`, then the type parameter of the injected `Bean` must be the same as the delegate type.
 
 Otherwise, the container automatically detects the problem and treats it as a definition error.
+
+[[programmatic_lookup_full]]
+
+=== Programmatic lookup in {cdi_full}
+
+[[dynamic_lookup_full]]
+
+==== The `Instance` interface in {cdi_full}
+
+[[builtin_instance_full]]
+
+==== The built-in `Instance` in {cdi_full}
+
+In addition to rules defined in <<builtin_instance>>, the built-in implementation of `Instance` must be a passivation capable dependency, as defined in <<passivation_capable_dependency>>.

spec/src/main/asciidoc/core/lifecycle.asciidoc

@@ -83,28 +83,17 @@ In this case, any object returned by the producer method will not have any depen
 
 === Container invocations and interception
 
-When the application invokes:
-
-* a method of a bean via a contextual reference to the bean, as defined in <<contextual_reference>>,
-* a method of a bean via a non-contextual reference to the bean, if the instance was created by the container (e.g. using  `InjectionTarget.produce()` or `UnmanagedInstance.produce()`), or
-// TODO mentions Full-only concepts
-* a method of a bean via a non-contextual reference to the bean, if the instance was enhanced with the `InterceptionFactory` interface as defined in <<interception_factory>>,
-// TODO mentions Full-only concepts
-
-the invocation is treated as a _business method invocation_.
+When the application invokes a method of a bean via a contextual reference to the bean, as defined in <<contextual_reference>>, the invocation is treated as a _business method invocation_.
 
 When the container invokes a method of a bean, the invocation may or may not be treated as a business method invocation:
 
 * Invocations of initializer methods by the container are not business method invocations.
-* Invocations of producer, disposer and observer methods by the container are business method invocations and are intercepted by method interceptors and decorators.
-// TODO mentions decorators
+* Invocations of producer, disposer and observer methods by the container are business method invocations and are intercepted by method interceptors.
 * Invocation of lifecycle callbacks by the container are not business method invocations, but are intercepted by interceptors for lifecycle callbacks.
-* Invocations of interceptors and decorator methods during method or lifecycle callback interception are not business method invocations, and therefore no recursive interception occurs.
-// TODO mentions decorators
+* Invocations of interceptor methods during method or lifecycle callback interception are not business method invocations, and therefore no recursive interception occurs.
 * Invocations of methods declared by `java.lang.Object` are not business method invocations.
 
-A method invocation passes through method interceptors and decorators if, and only if, it is a business method invocation.
-// TODO mentions decorators
+A method invocation passes through method interceptors if, and only if, it is a business method invocation.
 
 Otherwise, the invocation is treated as a normal Java method call and is not intercepted by the container.
 

spec/src/main/asciidoc/core/lifecycle_full.asciidoc

@@ -0,0 +1,29 @@
+[[lifecycle_full]]
+
+== Lifecycle of contextual instances in {cdi_full}
+
+[[biz_method_full]]
+
+=== Container invocations and interception in {cdi_full}
+
+Instead of the rules in <<biz_method>>, the following rules apply in {cdi_full}.
+
+When the application invokes:
+
+* a method of a bean via a contextual reference to the bean, as defined in <<contextual_reference>>,
+* a method of a bean via a non-contextual reference to the bean, if the instance was created by the container (e.g. using  `InjectionTarget.produce()` or `UnmanagedInstance.produce()`, or
+* a method of a bean via a non-contextual reference to the bean, if the instance was enhanced with the `InterceptionFactory` interface as defined in <<interception_factory>>,
+
+the invocation is treated as a _business method invocation_.
+
+When the container invokes a method of a bean, the invocation may or may not be treated as a business method invocation:
+
+* Invocations of initializer methods by the container are not business method invocations.
+* Invocations of producer, disposer and observer methods by the container are business method invocations and are intercepted by method interceptors and decorators.
+* Invocation of lifecycle callbacks by the container are not business method invocations, but are intercepted by interceptors for lifecycle callbacks.
+* Invocations of interceptors and decorator methods during method or lifecycle callback interception are not business method invocations, and therefore no recursive interception occurs.
+* Invocations of methods declared by `java.lang.Object` are not business method invocations.
+
+A method invocation passes through method interceptors and decorators if, and only if, it is a business method invocation.
+
+Otherwise, the invocation is treated as a normal Java method call and is not intercepted by the container.