You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@aries.apache.org by ro...@apache.org on 2018/09/24 20:23:58 UTC

svn commit: r1841890 - in /aries/trunk/cdi/cdi-extender: ./ src/main/java/org/apache/aries/cdi/container/internal/bean/ src/main/java/org/apache/aries/cdi/container/internal/container/ src/main/java/org/apache/aries/cdi/container/internal/model/

Author: rotty3000
Date: Mon Sep 24 20:23:58 2018
New Revision: 1841890

URL: http://svn.apache.org/viewvc?rev=1841890&view=rev
Log:
[CDI] updates

Signed-off-by: Raymond Auge <ro...@apache.org>

Modified:
    aries/trunk/cdi/cdi-extender/pom.xml
    aries/trunk/cdi/cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/bean/ComponentPropertiesBean.java
    aries/trunk/cdi/cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/container/ComponentContext.java
    aries/trunk/cdi/cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/container/DiscoveryExtension.java
    aries/trunk/cdi/cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/container/ReferenceSync.java
    aries/trunk/cdi/cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/container/RuntimeExtension.java
    aries/trunk/cdi/cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/model/ContainerActivator.java
    aries/trunk/cdi/cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/model/ExtendedActivationDTO.java
    aries/trunk/cdi/cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/model/FactoryActivator.java
    aries/trunk/cdi/cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/model/InstanceActivator.java
    aries/trunk/cdi/cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/model/OSGiBean.java
    aries/trunk/cdi/cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/model/SingleActivator.java

Modified: aries/trunk/cdi/cdi-extender/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/cdi/cdi-extender/pom.xml?rev=1841890&r1=1841889&r2=1841890&view=diff
==============================================================================
--- aries/trunk/cdi/cdi-extender/pom.xml (original)
+++ aries/trunk/cdi/cdi-extender/pom.xml Mon Sep 24 20:23:58 2018
@@ -57,6 +57,11 @@
 		</dependency>
 		<dependency>
 			<groupId>org.apache.geronimo.specs</groupId>
+			<artifactId>geronimo-interceptor_1.2_spec</artifactId>
+			<version>1.1</version>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.geronimo.specs</groupId>
 			<artifactId>geronimo-jcdi_2.0_spec</artifactId>
 			<version>1.1</version>
 		</dependency>
@@ -208,12 +213,6 @@
 			<scope>test</scope>
 		</dependency>
 		<dependency>
-			<groupId>org.apache.geronimo.specs</groupId>
-			<artifactId>geronimo-interceptor_1.2_spec</artifactId>
-			<version>1.1</version>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
 			<groupId>org.slf4j</groupId>
 			<artifactId>log4j-over-slf4j</artifactId>
 			<version>1.7.25</version>

Modified: aries/trunk/cdi/cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/bean/ComponentPropertiesBean.java
URL: http://svn.apache.org/viewvc/aries/trunk/cdi/cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/bean/ComponentPropertiesBean.java?rev=1841890&r1=1841889&r2=1841890&view=diff
==============================================================================
--- aries/trunk/cdi/cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/bean/ComponentPropertiesBean.java (original)
+++ aries/trunk/cdi/cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/bean/ComponentPropertiesBean.java Mon Sep 24 20:23:58 2018
@@ -27,11 +27,13 @@ import javax.enterprise.inject.Default;
 import javax.enterprise.inject.spi.Bean;
 import javax.enterprise.inject.spi.InjectionPoint;
 
+import org.apache.aries.cdi.container.internal.container.ComponentContext;
+import org.apache.aries.cdi.container.internal.container.ContainerState;
 import org.apache.aries.cdi.container.internal.container.Mark;
+import org.apache.aries.cdi.container.internal.model.ExtendedActivationDTO;
 import org.apache.aries.cdi.container.internal.model.ExtendedConfigurationTemplateDTO;
 import org.apache.aries.cdi.container.internal.util.Conversions;
 import org.apache.aries.cdi.container.internal.util.Sets;
-import org.osgi.service.cdi.ComponentType;
 import org.osgi.service.cdi.annotations.ComponentProperties;
 import org.osgi.service.cdi.annotations.ComponentScoped;
 import org.osgi.service.cdi.annotations.PID;
@@ -40,9 +42,11 @@ import org.osgi.service.cdi.runtime.dto.
 public class ComponentPropertiesBean implements Bean<Object> {
 
 	public ComponentPropertiesBean(
+		ContainerState containerState,
 		ComponentTemplateDTO component,
 		ExtendedConfigurationTemplateDTO template) {
 
+		_containerState = containerState;
 		_component = component;
 		_template = template;
 
@@ -56,8 +60,23 @@ public class ComponentPropertiesBean imp
 
 	@Override
 	public Object create(CreationalContext<Object> creationalContext) {
-		Objects.requireNonNull(_properties);
-		return Conversions.convert(_properties).to(_template.injectionPointType);
+		Map<String, Object> properties;
+		ExtendedActivationDTO current = ComponentContext.With.current();
+
+		if (current == null) {
+			properties = _containerState.containerDTO().components.get(0).instances.get(0).properties;
+		}
+		else {
+			properties = current.instance.properties;
+		}
+
+		Objects.requireNonNull(properties);
+
+		if (_injectionPoint != null) {
+			return Conversions.convert(properties).to(_injectionPoint.getType());
+		}
+
+		return Conversions.convert(properties).to(_template.injectionPointType);
 	}
 
 	@Override
@@ -76,9 +95,12 @@ public class ComponentPropertiesBean imp
 
 	@Override
 	public Class<? extends Annotation> getScope() {
-		if (_component.type == ComponentType.CONTAINER) {
+		ExtendedActivationDTO current = ComponentContext.With.current();
+
+		if (current == null) {
 			return ApplicationScoped.class;
 		}
+
 		return ComponentScoped.class;
 	}
 
@@ -112,12 +134,12 @@ public class ComponentPropertiesBean imp
 		return false;
 	}
 
-	public void setMark(Mark mark) {
-		_qualifiers.add(mark);
+	public void setInjectionPoint(InjectionPoint injectionPoint) {
+		_injectionPoint = injectionPoint;
 	}
 
-	public void setProperties(Map<String, Object> properties) {
-		_properties = properties;
+	public void setMark(Mark mark) {
+		_qualifiers.add(mark);
 	}
 
 	@Override
@@ -129,10 +151,11 @@ public class ComponentPropertiesBean imp
 	}
 
 	private final ComponentTemplateDTO _component;
+	private final ContainerState _containerState;
 	private final Set<Annotation> _qualifiers;
 	private final ExtendedConfigurationTemplateDTO _template;
 	private final Set<Type> _types;
-	private volatile Map<String, Object> _properties;
 	private volatile String _string;
+	private volatile InjectionPoint _injectionPoint;
 
 }

Modified: aries/trunk/cdi/cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/container/ComponentContext.java
URL: http://svn.apache.org/viewvc/aries/trunk/cdi/cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/container/ComponentContext.java?rev=1841890&r1=1841889&r2=1841890&view=diff
==============================================================================
--- aries/trunk/cdi/cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/container/ComponentContext.java (original)
+++ aries/trunk/cdi/cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/container/ComponentContext.java Mon Sep 24 20:23:58 2018
@@ -23,6 +23,7 @@ import javax.enterprise.context.spi.Cont
 import javax.enterprise.context.spi.CreationalContext;
 import javax.enterprise.inject.spi.Bean;
 
+import org.apache.aries.cdi.container.internal.model.ExtendedActivationDTO;
 import org.osgi.service.cdi.annotations.ComponentScoped;
 import org.osgi.service.cdi.runtime.dto.ActivationDTO;
 
@@ -97,11 +98,11 @@ public class ComponentContext implements
 	}
 
 	private static final Map<ActivationDTO, Map<Class<?>, BeanInstance<?>>> _beans = new ConcurrentHashMap<>();
-	private static final ThreadLocal<ActivationDTO> _componentModel = new ThreadLocal<>();
+	private static final ThreadLocal<ExtendedActivationDTO> _componentModel = new ThreadLocal<>();
 
 	public static class With implements AutoCloseable {
 
-		public With(ActivationDTO activationDTO) {
+		public With(ExtendedActivationDTO activationDTO) {
 			_componentModel.set(activationDTO);
 		}
 
@@ -110,6 +111,10 @@ public class ComponentContext implements
 			_componentModel.set(null);
 		}
 
+		public static ExtendedActivationDTO current() {
+			return _componentModel.get();
+		}
+
 	}
 
 	@SuppressWarnings("rawtypes")

Modified: aries/trunk/cdi/cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/container/DiscoveryExtension.java
URL: http://svn.apache.org/viewvc/aries/trunk/cdi/cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/container/DiscoveryExtension.java?rev=1841890&r1=1841889&r2=1841890&view=diff
==============================================================================
--- aries/trunk/cdi/cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/container/DiscoveryExtension.java (original)
+++ aries/trunk/cdi/cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/container/DiscoveryExtension.java Mon Sep 24 20:23:58 2018
@@ -278,7 +278,7 @@ public class DiscoveryExtension implemen
 
 				_containerState.containerDTO().template.components.add(componentTemplate);
 
-				osgiBean.setComponent(componentTemplate);
+				osgiBean.setComponent(_containerState, componentTemplate);
 			}
 			else if ((annotated instanceof AnnotatedType) &&
 					Optional.ofNullable(
@@ -345,7 +345,7 @@ public class DiscoveryExtension implemen
 
 				_containerState.containerDTO().template.components.add(componentTemplate);
 
-				osgiBean.setComponent(componentTemplate);
+				osgiBean.setComponent(_containerState, componentTemplate);
 			}
 			else if ((annotated instanceof AnnotatedType) &&
 					Optional.ofNullable(
@@ -389,7 +389,7 @@ public class DiscoveryExtension implemen
 					_containerTemplate.activations.add(activationTemplate);
 				}
 
-				osgiBean.setComponent(_containerTemplate);
+				osgiBean.setComponent(_containerState, _containerTemplate);
 			}
 		}
 		catch (Exception e) {
@@ -556,7 +556,7 @@ public class DiscoveryExtension implemen
 					injectionPoint
 				).build();
 
-				osgiBean.addConfiguration(configurationModel.toDTO());
+				osgiBean.addConfiguration(_containerState, configurationModel.toDTO());
 			}
 			catch (Exception e) {
 				_containerState.error(e);
@@ -595,7 +595,7 @@ public class DiscoveryExtension implemen
 		ComponentTemplateDTO currentTemplate = osgiBean.getComponent();
 
 		if (currentTemplate == null) {
-			osgiBean.setComponent(template);
+			osgiBean.setComponent(_containerState, template);
 		}
 		else if (!currentTemplate.equals(template)) {
 			throw new IllegalStateException("Something is wrong here");

Modified: aries/trunk/cdi/cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/container/ReferenceSync.java
URL: http://svn.apache.org/viewvc/aries/trunk/cdi/cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/container/ReferenceSync.java?rev=1841890&r1=1841889&r2=1841890&view=diff
==============================================================================
--- aries/trunk/cdi/cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/container/ReferenceSync.java (original)
+++ aries/trunk/cdi/cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/container/ReferenceSync.java Mon Sep 24 20:23:58 2018
@@ -24,6 +24,7 @@ import org.apache.aries.cdi.container.in
 import org.apache.aries.cdi.container.internal.util.Conversions;
 import org.apache.aries.cdi.container.internal.util.Maps;
 import org.apache.aries.cdi.container.internal.util.SRs;
+import org.apache.aries.cdi.container.internal.util.Syncro;
 import org.osgi.framework.ServiceReference;
 import org.osgi.service.cdi.ReferencePolicy;
 import org.osgi.service.cdi.ReferencePolicyOption;
@@ -60,9 +61,9 @@ public class ReferenceSync implements Se
 			requiresUpdate = false;
 		}
 
-		_referenceDTO.matches = SRs.from(_referenceDTO.serviceTracker.getServiceReferences(), reference);
+		try (Syncro open = _syncro.open()) {
+			_referenceDTO.matches = SRs.from(_referenceDTO.serviceTracker.getServiceReferences(), reference);
 
-		try {
 			if (collectionType == CollectionType.BINDER_SERVICE ||
 				collectionType == CollectionType.BINDER_REFERENCE ||
 				collectionType == CollectionType.BINDER_BEAN_SERVICE_OBJECTS) {
@@ -134,9 +135,9 @@ public class ReferenceSync implements Se
 			requiresUpdate = false;
 		}
 
-		_referenceDTO.matches.removeIf(d -> d.id == SRs.id(reference));
+		try (Syncro open = _syncro.open()) {
+			_referenceDTO.matches.removeIf(d -> d.id == SRs.id(reference));
 
-		try {
 			if (collectionType == CollectionType.BINDER_SERVICE ||
 				collectionType == CollectionType.BINDER_REFERENCE ||
 				collectionType == CollectionType.BINDER_BEAN_SERVICE_OBJECTS) {
@@ -207,6 +208,7 @@ public class ReferenceSync implements Se
 	private final Logger _log;
 	private final ExtendedReferenceDTO _referenceDTO;
 	private volatile String _string;
+	private final Syncro _syncro = new Syncro(true);
 	private final ExtendedReferenceTemplateDTO _templateDTO;
 
 }

Modified: aries/trunk/cdi/cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/container/RuntimeExtension.java
URL: http://svn.apache.org/viewvc/aries/trunk/cdi/cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/container/RuntimeExtension.java?rev=1841890&r1=1841889&r2=1841890&view=diff
==============================================================================
--- aries/trunk/cdi/cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/container/RuntimeExtension.java (original)
+++ aries/trunk/cdi/cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/container/RuntimeExtension.java Mon Sep 24 20:23:58 2018
@@ -14,12 +14,15 @@
 
 package org.apache.aries.cdi.container.internal.container;
 
+import static javax.interceptor.Interceptor.Priority.*;
+
 import java.util.Dictionary;
 import java.util.Hashtable;
 import java.util.List;
 import java.util.Objects;
 import java.util.concurrent.CopyOnWriteArrayList;
 
+import javax.annotation.Priority;
 import javax.enterprise.context.ApplicationScoped;
 import javax.enterprise.context.spi.Context;
 import javax.enterprise.context.spi.CreationalContext;
@@ -117,7 +120,10 @@ public class RuntimeExtension implements
 		);
 	}
 
-	void afterDeploymentValidation(@Observes AfterDeploymentValidation adv, BeanManager bm) {
+	void afterDeploymentValidation(
+		@Observes @Priority(PLATFORM_AFTER + 100) AfterDeploymentValidation adv,
+		BeanManager bm) {
+
 		_log.debug(l -> l.debug("CCR AfterDeploymentValidation on {}", _containerState.bundle()));
 
 		_containerState.beanManager(bm);
@@ -242,14 +248,6 @@ public class RuntimeExtension implements
 		).forEach(
 			t -> {
 				ComponentPropertiesBean bean = t.bean;
-				if (componentTemplate.type == ComponentType.CONTAINER) {
-					if (t.pid == null) {
-						bean.setProperties(componentTemplate.properties);
-					}
-					else {
-						bean.setProperties(componentDTO.instances.get(0).properties);
-					}
-				}
 
 				_log.debug(l -> l.debug("CCR Adding synthetic bean {} on {}", bean, _containerState.bundle()));
 
@@ -332,6 +330,7 @@ public class RuntimeExtension implements
 
 				pip.setInjectionPoint(markedInjectionPoint);
 
+				t.bean.setInjectionPoint(injectionPoint);
 				t.bean.setMark(markedInjectionPoint.getMark());
 
 				return true;

Modified: aries/trunk/cdi/cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/model/ContainerActivator.java
URL: http://svn.apache.org/viewvc/aries/trunk/cdi/cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/model/ContainerActivator.java?rev=1841890&r1=1841889&r2=1841890&view=diff
==============================================================================
--- aries/trunk/cdi/cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/model/ContainerActivator.java (original)
+++ aries/trunk/cdi/cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/model/ContainerActivator.java Mon Sep 24 20:23:58 2018
@@ -59,7 +59,7 @@ public class ContainerActivator extends
 					}
 					).orElse(true);
 
-			instance.active = false;
+			_instance.active = false;
 
 			return result;
 		}
@@ -67,13 +67,13 @@ public class ContainerActivator extends
 
 	@Override
 	public Op closeOp() {
-		return Op.of(Mode.CLOSE, Type.CONTAINER_ACTIVATOR, instance.template.name);
+		return Op.of(Mode.CLOSE, Type.CONTAINER_ACTIVATOR, _instance.template.name);
 	}
 
 	@Override
 	public boolean open() {
 		try (Syncro open = syncro.open()) {
-			if (!instance.referencesResolved()) {
+			if (!_instance.referencesResolved()) {
 				return false;
 			}
 
@@ -92,7 +92,7 @@ public class ContainerActivator extends
 					).orElse(true);
 
 			if (result) {
-				instance.active = true;
+				_instance.active = true;
 			}
 
 			return result;
@@ -101,7 +101,7 @@ public class ContainerActivator extends
 
 	@Override
 	public Op openOp() {
-		return Op.of(Mode.OPEN, Type.CONTAINER_ACTIVATOR, instance.template.name);
+		return Op.of(Mode.OPEN, Type.CONTAINER_ACTIVATOR, _instance.template.name);
 	}
 
 	private final Logger _log;

Modified: aries/trunk/cdi/cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/model/ExtendedActivationDTO.java
URL: http://svn.apache.org/viewvc/aries/trunk/cdi/cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/model/ExtendedActivationDTO.java?rev=1841890&r1=1841889&r2=1841890&view=diff
==============================================================================
--- aries/trunk/cdi/cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/model/ExtendedActivationDTO.java (original)
+++ aries/trunk/cdi/cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/model/ExtendedActivationDTO.java Mon Sep 24 20:23:58 2018
@@ -20,6 +20,8 @@ import org.osgi.service.cdi.runtime.dto.
 
 public class ExtendedActivationDTO extends ActivationDTO {
 
+	public ExtendedComponentInstanceDTO instance;
+
 	public Consumer<ExtendedActivationDTO> onClose;
 
 }

Modified: aries/trunk/cdi/cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/model/FactoryActivator.java
URL: http://svn.apache.org/viewvc/aries/trunk/cdi/cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/model/FactoryActivator.java?rev=1841890&r1=1841889&r2=1841890&view=diff
==============================================================================
--- aries/trunk/cdi/cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/model/FactoryActivator.java (original)
+++ aries/trunk/cdi/cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/model/FactoryActivator.java Mon Sep 24 20:23:58 2018
@@ -15,39 +15,28 @@
 package org.apache.aries.cdi.container.internal.model;
 
 import java.lang.annotation.Annotation;
-import java.util.AbstractMap;
 import java.util.Arrays;
 import java.util.Map;
 import java.util.Map.Entry;
-import java.util.Objects;
 import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.CopyOnWriteArrayList;
 
-import javax.enterprise.context.BeforeDestroyed;
-import javax.enterprise.context.Destroyed;
-import javax.enterprise.context.Initialized;
-import javax.enterprise.context.spi.CreationalContext;
 import javax.enterprise.inject.spi.Bean;
 import javax.enterprise.inject.spi.BeanManager;
 
 import org.apache.aries.cdi.container.internal.bean.ReferenceBean;
-import org.apache.aries.cdi.container.internal.container.ComponentContext.With;
 import org.apache.aries.cdi.container.internal.container.ContainerState;
 import org.apache.aries.cdi.container.internal.container.Op;
 import org.apache.aries.cdi.container.internal.container.Op.Mode;
 import org.apache.aries.cdi.container.internal.container.Op.Type;
 import org.apache.aries.cdi.container.internal.util.Maps;
 import org.apache.aries.cdi.container.internal.util.SRs;
-import org.apache.aries.cdi.container.internal.util.Sets;
 import org.apache.aries.cdi.container.internal.util.Syncro;
-import org.apache.aries.cdi.container.internal.util.Throw;
 import org.osgi.framework.Bundle;
 import org.osgi.framework.PrototypeServiceFactory;
 import org.osgi.framework.ServiceFactory;
 import org.osgi.framework.ServiceRegistration;
 import org.osgi.service.cdi.ServiceScope;
-import org.osgi.service.cdi.annotations.ComponentScoped;
 import org.osgi.service.log.Logger;
 
 public class FactoryActivator extends InstanceActivator {
@@ -80,7 +69,7 @@ public class FactoryActivator extends In
 				serviceRegistration = null;
 			}
 
-			instance.activations.removeIf(
+			_instance.activations.removeIf(
 				a -> {
 					ExtendedActivationDTO extended = (ExtendedActivationDTO)a;
 					extended.onClose.accept(extended);
@@ -88,7 +77,7 @@ public class FactoryActivator extends In
 				}
 			);
 
-			instance.active = false;
+			_instance.active = false;
 
 			return true;
 		}
@@ -96,7 +85,7 @@ public class FactoryActivator extends In
 
 	@Override
 	public Op closeOp() {
-		return Op.of(Mode.CLOSE, Type.FACTORY_ACTIVATOR, instance.ident());
+		return Op.of(Mode.CLOSE, Type.FACTORY_ACTIVATOR, _instance.ident());
 	}
 
 	@Override
@@ -108,7 +97,7 @@ public class FactoryActivator extends In
 				return false;
 			}
 
-			if (!instance.referencesResolved() || instance.active) {
+			if (!_instance.referencesResolved() || _instance.active) {
 				return false;
 			}
 
@@ -119,11 +108,11 @@ public class FactoryActivator extends In
 			}
 
 			ExtendedActivationTemplateDTO activationTemplate =
-				(ExtendedActivationTemplateDTO)instance.template.activations.get(0);
+				(ExtendedActivationTemplateDTO)_instance.template.activations.get(0);
 
-			instance.template.references.stream().map(ExtendedReferenceTemplateDTO.class::cast).forEach(
+			_instance.template.references.stream().map(ExtendedReferenceTemplateDTO.class::cast).forEach(
 				t -> {
-					instance.references.stream().filter(
+					_instance.references.stream().filter(
 						r -> r.template == t
 					).findFirst().map(
 						ExtendedReferenceDTO.class::cast
@@ -137,15 +126,8 @@ public class FactoryActivator extends In
 				}
 			);
 
-			instance.template.configurations.stream().map(ExtendedConfigurationTemplateDTO.class::cast).filter(
-				t -> Objects.nonNull(t.injectionPointType)
-			).forEach(
-				t -> {
-					t.bean.setProperties(instance.properties);
-				}
-			);
 
-			ExtendedComponentTemplateDTO extended = (ExtendedComponentTemplateDTO)instance.template;
+			ExtendedComponentTemplateDTO extended = (ExtendedComponentTemplateDTO)_instance.template;
 
 			Set<Bean<?>> beans = beanManager.getBeans(
 				extended.bean.getBeanClass(), extended.bean.getQualifiers().toArray(new Annotation[0]));
@@ -154,7 +136,7 @@ public class FactoryActivator extends In
 			if (activationTemplate.serviceClasses.isEmpty() /* immediate */) {
 				activate(bean, activationTemplate, beanManager);
 
-				_log.debug(l -> l.debug("CCR `immediate component` {} activated on {}", instance.ident(), bundle()));
+				_log.debug(l -> l.debug("CCR `immediate component` {} activated on {}", _instance.ident(), bundle()));
 			}
 			else if (activationTemplate.scope == ServiceScope.SINGLETON) {
 				Entry<ExtendedActivationDTO, Object> entry = activate(
@@ -162,10 +144,10 @@ public class FactoryActivator extends In
 				serviceRegistration = containerState.bundleContext().registerService(
 					activationTemplate.serviceClasses.toArray(new String[0]),
 					entry.getValue(),
-					Maps.dict(instance.properties));
+					Maps.dict(_instance.properties));
 				entry.getKey().service = SRs.from(serviceRegistration.getReference());
 
-				_log.debug(l -> l.debug("CCR `singleton scope service` {} activated on {}", instance.ident(), bundle()));
+				_log.debug(l -> l.debug("CCR `singleton scope service` {} activated on {}", _instance.ident(), bundle()));
 			}
 			else if (activationTemplate.scope == ServiceScope.BUNDLE) {
 				serviceRegistration = containerState.bundleContext().registerService(
@@ -193,10 +175,10 @@ public class FactoryActivator extends In
 						final Map<Object, ExtendedActivationDTO> _locals = new ConcurrentHashMap<>();
 
 					},
-					Maps.dict(instance.properties)
+					Maps.dict(_instance.properties)
 				);
 
-				_log.debug(l -> l.debug("CCR `bundle scope service` {} activated on {}", instance.ident(), bundle()));
+				_log.debug(l -> l.debug("CCR `bundle scope service` {} activated on {}", _instance.ident(), bundle()));
 			}
 			else if (activationTemplate.scope == ServiceScope.PROTOTYPE) {
 				serviceRegistration = containerState.bundleContext().registerService(
@@ -224,13 +206,13 @@ public class FactoryActivator extends In
 						final Map<Object, ExtendedActivationDTO> _locals = new ConcurrentHashMap<>();
 
 					},
-					Maps.dict(instance.properties)
+					Maps.dict(_instance.properties)
 				);
 
-				_log.debug(l -> l.debug("CCR `prototype scope service` {} activated on {}", instance.ident(), bundle()));
+				_log.debug(l -> l.debug("CCR `prototype scope service` {} activated on {}", _instance.ident(), bundle()));
 			}
 
-			instance.active = true;
+			_instance.active = true;
 
 			return true;
 		}
@@ -238,48 +220,12 @@ public class FactoryActivator extends In
 
 	@Override
 	public Op openOp() {
-		return Op.of(Mode.OPEN, Type.FACTORY_ACTIVATOR, instance.ident());
+		return Op.of(Mode.OPEN, Type.FACTORY_ACTIVATOR, _instance.ident());
 	}
 
 	@Override
 	public String toString() {
-		return Arrays.asList(getClass().getSimpleName(), instance.ident()).toString();
-	}
-
-	@SuppressWarnings({ "unchecked", "rawtypes" })
-	Entry<ExtendedActivationDTO, Object> activate(
-		Bean<? extends Object> bean,
-		ExtendedActivationTemplateDTO activationTemplate,
-		BeanManager beanManager) {
-
-		ExtendedActivationDTO activationDTO = new ExtendedActivationDTO();
-		activationDTO.errors = new CopyOnWriteArrayList<>();
-		activationDTO.template = activationTemplate;
-		instance.activations.add(activationDTO);
-
-		try (With with = new With(activationDTO)) {
-			try {
-				final Object object = containerState.componentContext().get(
-					(Bean)bean,
-					(CreationalContext)beanManager.createCreationalContext(bean));
-				final Set<Annotation> qualifiers = bean.getQualifiers();
-				beanManager.fireEvent(object, Sets.hashSet(qualifiers, Initialized.Literal.of(ComponentScoped.class)).toArray(new Annotation[0]));
-				activationDTO.onClose = a -> {
-					try (With with2 = new With(a)) {
-						beanManager.fireEvent(object, Sets.hashSet(qualifiers, BeforeDestroyed.Literal.of(ComponentScoped.class)).toArray(new Annotation[0]));
-						containerState.componentContext().destroy();
-						beanManager.fireEvent(object, Sets.hashSet(qualifiers, Destroyed.Literal.of(ComponentScoped.class)).toArray(new Annotation[0]));
-						instance.activations.remove(a);
-					}
-				};
-				return new AbstractMap.SimpleImmutableEntry<>(activationDTO, object);
-			}
-			catch (Throwable t) {
-				_log.error(l -> l.error("CCR Error single activator create for {} on {}", instance, bundle(), t));
-				activationDTO.errors.add(Throw.asString(t));
-				return new AbstractMap.SimpleImmutableEntry<>(activationDTO, null);
-			}
-		}
+		return Arrays.asList(getClass().getSimpleName(), _instance.ident()).toString();
 	}
 
 	private final Syncro _lock = new Syncro(true);

Modified: aries/trunk/cdi/cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/model/InstanceActivator.java
URL: http://svn.apache.org/viewvc/aries/trunk/cdi/cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/model/InstanceActivator.java?rev=1841890&r1=1841889&r2=1841890&view=diff
==============================================================================
--- aries/trunk/cdi/cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/model/InstanceActivator.java (original)
+++ aries/trunk/cdi/cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/model/InstanceActivator.java Mon Sep 24 20:23:58 2018
@@ -14,9 +14,27 @@
 
 package org.apache.aries.cdi.container.internal.model;
 
+import java.lang.annotation.Annotation;
+import java.util.AbstractMap;
+import java.util.Map.Entry;
+import java.util.Set;
+import java.util.concurrent.CopyOnWriteArrayList;
+
+import javax.enterprise.context.BeforeDestroyed;
+import javax.enterprise.context.Destroyed;
+import javax.enterprise.context.Initialized;
+import javax.enterprise.context.spi.CreationalContext;
+import javax.enterprise.inject.spi.Bean;
+import javax.enterprise.inject.spi.BeanManager;
+
+import org.apache.aries.cdi.container.internal.container.ComponentContext.With;
 import org.apache.aries.cdi.container.internal.container.ContainerState;
 import org.apache.aries.cdi.container.internal.container.Op;
 import org.apache.aries.cdi.container.internal.container.Phase;
+import org.apache.aries.cdi.container.internal.util.Sets;
+import org.apache.aries.cdi.container.internal.util.Throw;
+import org.osgi.service.cdi.annotations.ComponentScoped;
+import org.osgi.service.log.Logger;
 
 public abstract class InstanceActivator extends Phase {
 
@@ -43,7 +61,8 @@ public abstract class InstanceActivator
 	protected InstanceActivator(Builder<?> builder) {
 		super(builder._containerState, builder._next);
 
-		this.instance = builder._instance;
+		_instance = builder._instance;
+		_log = builder._containerState.ccrLogs().getLogger(InstanceActivator.class);
 	}
 
 	@Override
@@ -52,6 +71,71 @@ public abstract class InstanceActivator
 	@Override
 	public abstract Op openOp();
 
-	protected final ExtendedComponentInstanceDTO instance;
+	@SuppressWarnings({ "unchecked", "rawtypes" })
+	protected Entry<ExtendedActivationDTO, Object> activate(
+		Bean<? extends Object> bean,
+		ExtendedActivationTemplateDTO activationTemplate,
+		BeanManager beanManager) {
+
+		ExtendedActivationDTO activationDTO = new ExtendedActivationDTO();
+		activationDTO.errors = new CopyOnWriteArrayList<>();
+		activationDTO.template = activationTemplate;
+		activationDTO.instance = _instance;
+
+		_instance.activations.add(activationDTO);
+
+		try (With with = new With(activationDTO)) {
+			try {
+				final Object object = containerState.componentContext().get(
+					(Bean)bean,
+					(CreationalContext)beanManager.createCreationalContext(bean));
+
+				final Set<Annotation> qualifiers = bean.getQualifiers();
+
+				try {
+					beanManager.fireEvent(object, Sets.hashSet(qualifiers, Initialized.Literal.of(ComponentScoped.class)).toArray(new Annotation[0]));
+				}
+				catch (Throwable t) {
+					_log.error(l -> l.error("CCR Error in activator event @Initialized for {} on {}", _instance, bundle(), t));
+					activationDTO.errors.add(Throw.asString(t));
+				}
+
+				activationDTO.onClose = a -> {
+					try (With with2 = new With(a)) {
+						try {
+							beanManager.fireEvent(object, Sets.hashSet(qualifiers, BeforeDestroyed.Literal.of(ComponentScoped.class)).toArray(new Annotation[0]));
+						}
+						catch (Throwable t) {
+							_log.error(l -> l.error("CCR Error in activator event @BeforeDestroyed for {} on {}", _instance, bundle(), t));
+							activationDTO.errors.add(Throw.asString(t));
+						}
+
+						containerState.componentContext().destroy();
+
+						try {
+							beanManager.fireEvent(object, Sets.hashSet(qualifiers, Destroyed.Literal.of(ComponentScoped.class)).toArray(new Annotation[0]));
+						}
+						catch (Throwable t) {
+							_log.error(l -> l.error("CCR Error in activator event @Destroyed for {} on {}", _instance, bundle(), t));
+							activationDTO.errors.add(Throw.asString(t));
+						}
+
+						_instance.activations.remove(a);
+					}
+				};
+
+				return new AbstractMap.SimpleImmutableEntry<>(activationDTO, object);
+			}
+			catch (Throwable t) {
+				_log.error(l -> l.error("CCR Error in activator create for {} on {}", _instance, bundle(), t));
+				activationDTO.errors.add(Throw.asString(t));
+
+				return new AbstractMap.SimpleImmutableEntry<>(activationDTO, null);
+			}
+		}
+	}
+
+	private final Logger _log;
+	protected final ExtendedComponentInstanceDTO _instance;
 
 }

Modified: aries/trunk/cdi/cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/model/OSGiBean.java
URL: http://svn.apache.org/viewvc/aries/trunk/cdi/cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/model/OSGiBean.java?rev=1841890&r1=1841889&r2=1841890&view=diff
==============================================================================
--- aries/trunk/cdi/cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/model/OSGiBean.java (original)
+++ aries/trunk/cdi/cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/model/OSGiBean.java Mon Sep 24 20:23:58 2018
@@ -21,6 +21,7 @@ import java.util.concurrent.atomic.Atomi
 
 import org.apache.aries.cdi.container.internal.bean.ComponentPropertiesBean;
 import org.apache.aries.cdi.container.internal.bean.ReferenceBean;
+import org.apache.aries.cdi.container.internal.container.ContainerState;
 import org.apache.aries.cdi.container.internal.util.Logs;
 import org.apache.aries.cdi.container.internal.util.Syncro;
 import org.osgi.service.cdi.runtime.dto.template.ComponentTemplateDTO;
@@ -51,14 +52,14 @@ public class OSGiBean implements Compara
 		_beanClass = beanClass;
 	}
 
-	public synchronized void addConfiguration(ConfigurationTemplateDTO dto) {
+	public synchronized void addConfiguration(ContainerState containerState, ConfigurationTemplateDTO dto) {
 		try (Syncro syncro = _lock.open()) {
 			if (_componentTemplate == null) {
 				_configurationsQueue.add(dto);
 			}
 			else {
 				((ExtendedConfigurationTemplateDTO)dto).bean = new ComponentPropertiesBean(
-					_componentTemplate, (ExtendedConfigurationTemplateDTO)dto);
+					containerState, _componentTemplate, (ExtendedConfigurationTemplateDTO)dto);
 
 				_componentTemplate.configurations.add(dto);
 			}
@@ -106,7 +107,7 @@ public class OSGiBean implements Compara
 		return _componentTemplate;
 	}
 
-	public void setComponent(ComponentTemplateDTO componentTemplate) {
+	public void setComponent(ContainerState containerState, ComponentTemplateDTO componentTemplate) {
 		try (Syncro syncro = _lock.open()) {
 			if (_componentTemplate != null) {
 				return;
@@ -115,7 +116,7 @@ public class OSGiBean implements Compara
 			_configurationsQueue.removeIf(
 				dto -> {
 					((ExtendedConfigurationTemplateDTO)dto).bean = new ComponentPropertiesBean(
-						_componentTemplate, (ExtendedConfigurationTemplateDTO)dto);
+						containerState, _componentTemplate, (ExtendedConfigurationTemplateDTO)dto);
 
 					_componentTemplate.configurations.add(dto);
 					return true;

Modified: aries/trunk/cdi/cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/model/SingleActivator.java
URL: http://svn.apache.org/viewvc/aries/trunk/cdi/cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/model/SingleActivator.java?rev=1841890&r1=1841889&r2=1841890&view=diff
==============================================================================
--- aries/trunk/cdi/cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/model/SingleActivator.java (original)
+++ aries/trunk/cdi/cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/model/SingleActivator.java Mon Sep 24 20:23:58 2018
@@ -15,38 +15,28 @@
 package org.apache.aries.cdi.container.internal.model;
 
 import java.lang.annotation.Annotation;
-import java.util.AbstractMap;
 import java.util.Arrays;
 import java.util.Map;
 import java.util.Map.Entry;
 import java.util.Objects;
 import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.CopyOnWriteArrayList;
 
-import javax.enterprise.context.BeforeDestroyed;
-import javax.enterprise.context.Destroyed;
-import javax.enterprise.context.Initialized;
-import javax.enterprise.context.spi.CreationalContext;
 import javax.enterprise.inject.spi.Bean;
 import javax.enterprise.inject.spi.BeanManager;
 
 import org.apache.aries.cdi.container.internal.bean.ReferenceBean;
-import org.apache.aries.cdi.container.internal.container.ComponentContext.With;
 import org.apache.aries.cdi.container.internal.container.ContainerState;
 import org.apache.aries.cdi.container.internal.container.Op;
 import org.apache.aries.cdi.container.internal.container.Op.Mode;
 import org.apache.aries.cdi.container.internal.util.Maps;
 import org.apache.aries.cdi.container.internal.util.SRs;
-import org.apache.aries.cdi.container.internal.util.Sets;
 import org.apache.aries.cdi.container.internal.util.Syncro;
-import org.apache.aries.cdi.container.internal.util.Throw;
 import org.osgi.framework.Bundle;
 import org.osgi.framework.PrototypeServiceFactory;
 import org.osgi.framework.ServiceFactory;
 import org.osgi.framework.ServiceRegistration;
 import org.osgi.service.cdi.ServiceScope;
-import org.osgi.service.cdi.annotations.ComponentScoped;
 import org.osgi.service.log.Logger;
 
 public class SingleActivator extends InstanceActivator {
@@ -58,7 +48,7 @@ public class SingleActivator extends Ins
 		}
 
 		@Override
-		public SingleActivator build() {
+		public InstanceActivator build() {
 			return _cache.computeIfAbsent(_instance, i -> new SingleActivator(this));
 		}
 
@@ -79,15 +69,17 @@ public class SingleActivator extends Ins
 				serviceRegistration = null;
 			}
 
-			instance.activations.removeIf(
+			_instance.activations.removeIf(
 				a -> {
 					ExtendedActivationDTO extended = (ExtendedActivationDTO)a;
+					Objects.requireNonNull(extended);
+					Objects.requireNonNull(extended.onClose);
 					extended.onClose.accept(extended);
 					return true;
 				}
 			);
 
-			instance.active = false;
+			_instance.active = false;
 
 			return true;
 		}
@@ -95,7 +87,7 @@ public class SingleActivator extends Ins
 
 	@Override
 	public Op closeOp() {
-		return Op.of(Mode.CLOSE, Op.Type.SINGLE_ACTIVATOR, instance.ident());
+		return Op.of(Mode.CLOSE, Op.Type.SINGLE_ACTIVATOR, _instance.ident());
 	}
 
 	@Override
@@ -107,7 +99,7 @@ public class SingleActivator extends Ins
 				return false;
 			}
 
-			if (!instance.referencesResolved() || instance.active) {
+			if (!_instance.referencesResolved() || _instance.active) {
 				return false;
 			}
 
@@ -118,11 +110,11 @@ public class SingleActivator extends Ins
 			}
 
 			ExtendedActivationTemplateDTO activationTemplate =
-				(ExtendedActivationTemplateDTO)instance.template.activations.get(0);
+				(ExtendedActivationTemplateDTO)_instance.template.activations.get(0);
 
-			instance.template.references.stream().map(ExtendedReferenceTemplateDTO.class::cast).forEach(
+			_instance.template.references.stream().map(ExtendedReferenceTemplateDTO.class::cast).forEach(
 				t -> {
-					instance.references.stream().filter(
+					_instance.references.stream().filter(
 						r -> r.template == t
 					).findFirst().map(
 						ExtendedReferenceDTO.class::cast
@@ -136,15 +128,8 @@ public class SingleActivator extends Ins
 				}
 			);
 
-			instance.template.configurations.stream().map(ExtendedConfigurationTemplateDTO.class::cast).filter(
-				t -> Objects.nonNull(t.injectionPointType)
-			).forEach(
-				t -> {
-					t.bean.setProperties(instance.properties);
-				}
-			);
 
-			ExtendedComponentTemplateDTO extended = (ExtendedComponentTemplateDTO)instance.template;
+			ExtendedComponentTemplateDTO extended = (ExtendedComponentTemplateDTO)_instance.template;
 
 			Set<Bean<?>> beans = beanManager.getBeans(
 				extended.bean.getBeanClass(), extended.bean.getQualifiers().toArray(new Annotation[0]));
@@ -153,7 +138,7 @@ public class SingleActivator extends Ins
 			if (activationTemplate.serviceClasses.isEmpty() /* immediate */) {
 				activate(bean, activationTemplate, beanManager);
 
-				_log.debug(l -> l.debug("CCR `immediate component` {} activated on {}", instance.ident(), bundle()));
+				_log.debug(l -> l.debug("CCR `immediate component` {} activated on {}", _instance.ident(), bundle()));
 			}
 			else if (activationTemplate.scope == ServiceScope.SINGLETON) {
 				Entry<ExtendedActivationDTO, Object> entry = activate(
@@ -161,10 +146,10 @@ public class SingleActivator extends Ins
 				serviceRegistration = containerState.bundleContext().registerService(
 					activationTemplate.serviceClasses.toArray(new String[0]),
 					entry.getValue(),
-					Maps.dict(instance.properties));
+					Maps.dict(_instance.properties));
 				entry.getKey().service = SRs.from(serviceRegistration.getReference());
 
-				_log.debug(l -> l.debug("CCR `singleton scope service` {} activated on {}", instance.ident(), bundle()));
+				_log.debug(l -> l.debug("CCR `singleton scope service` {} activated on {}", _instance.ident(), bundle()));
 			}
 			else if (activationTemplate.scope == ServiceScope.BUNDLE) {
 				serviceRegistration = containerState.bundleContext().registerService(
@@ -192,10 +177,10 @@ public class SingleActivator extends Ins
 						final Map<Object, ExtendedActivationDTO> _locals = new ConcurrentHashMap<>();
 
 					},
-					Maps.dict(instance.properties)
+					Maps.dict(_instance.properties)
 				);
 
-				_log.debug(l -> l.debug("CCR `bundle scope service` {} activated on {}", instance.ident(), bundle()));
+				_log.debug(l -> l.debug("CCR `bundle scope service` {} activated on {}", _instance.ident(), bundle()));
 			}
 			else if (activationTemplate.scope == ServiceScope.PROTOTYPE) {
 				serviceRegistration = containerState.bundleContext().registerService(
@@ -223,13 +208,13 @@ public class SingleActivator extends Ins
 						final Map<Object, ExtendedActivationDTO> _locals = new ConcurrentHashMap<>();
 
 					},
-					Maps.dict(instance.properties)
+					Maps.dict(_instance.properties)
 				);
 
-				_log.debug(l -> l.debug("CCR `prototype scope service` {} activated on {}", instance.ident(), bundle()));
+				_log.debug(l -> l.debug("CCR `prototype scope service` {} activated on {}", _instance.ident(), bundle()));
 			}
 
-			instance.active = true;
+			_instance.active = true;
 
 			return true;
 		}
@@ -237,48 +222,12 @@ public class SingleActivator extends Ins
 
 	@Override
 	public Op openOp() {
-		return Op.of(Mode.OPEN, Op.Type.SINGLE_ACTIVATOR, instance.ident());
+		return Op.of(Mode.OPEN, Op.Type.SINGLE_ACTIVATOR, _instance.ident());
 	}
 
 	@Override
 	public String toString() {
-		return Arrays.asList(getClass().getSimpleName(), instance.ident()).toString();
-	}
-
-	@SuppressWarnings({ "unchecked", "rawtypes" })
-	Entry<ExtendedActivationDTO, Object> activate(
-		Bean<? extends Object> bean,
-		ExtendedActivationTemplateDTO activationTemplate,
-		BeanManager beanManager) {
-
-		ExtendedActivationDTO activationDTO = new ExtendedActivationDTO();
-		activationDTO.errors = new CopyOnWriteArrayList<>();
-		activationDTO.template = activationTemplate;
-		instance.activations.add(activationDTO);
-
-		try (With with = new With(activationDTO)) {
-			try {
-				final Object object = containerState.componentContext().get(
-					(Bean)bean,
-					(CreationalContext)beanManager.createCreationalContext(bean));
-				final Set<Annotation> qualifiers = bean.getQualifiers();
-				beanManager.fireEvent(object, Sets.hashSet(qualifiers, Initialized.Literal.of(ComponentScoped.class)).toArray(new Annotation[0]));
-				activationDTO.onClose = a -> {
-					try (With with2 = new With(a)) {
-						beanManager.fireEvent(object, Sets.hashSet(qualifiers, BeforeDestroyed.Literal.of(ComponentScoped.class)).toArray(new Annotation[0]));
-						containerState.componentContext().destroy();
-						beanManager.fireEvent(object, Sets.hashSet(qualifiers, Destroyed.Literal.of(ComponentScoped.class)).toArray(new Annotation[0]));
-						instance.activations.remove(a);
-					}
-				};
-				return new AbstractMap.SimpleImmutableEntry<>(activationDTO, object);
-			}
-			catch (Throwable t) {
-				_log.error(l -> l.error("CCR Error single activator create for {} on {}", instance, bundle(), t));
-				activationDTO.errors.add(Throw.asString(t));
-				return new AbstractMap.SimpleImmutableEntry<>(activationDTO, null);
-			}
-		}
+		return Arrays.asList(getClass().getSimpleName(), _instance.ident()).toString();
 	}
 
 	private final Syncro _lock = new Syncro(true);