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/06/04 23:26:09 UTC
svn commit: r1832901 [1/2] - in /aries/trunk/cdi:
cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/bean/
cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/command/
cdi-extender/src/main/java/org/apache/aries/cdi/conta...
Author: rotty3000
Date: Mon Jun 4 23:26:08 2018
New Revision: 1832901
URL: http://svn.apache.org/viewvc?rev=1832901&view=rev
Log:
[CDI] updated to latest draft OSGi API
Signed-off-by: Raymond Auge <ro...@apache.org>
Added:
aries/trunk/cdi/cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/bean/ComponentPropertiesBean.java
- copied, changed from r1832868, aries/trunk/cdi/cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/bean/ConfigurationBean.java
aries/trunk/cdi/cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/model/BindBeanServiceObjectsImpl.java
- copied, changed from r1832868, aries/trunk/cdi/cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/model/BindServiceObjectsImpl.java
aries/trunk/cdi/cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/model/BindServiceImpl.java
- copied, changed from r1832868, aries/trunk/cdi/cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/model/BindObjectImpl.java
aries/trunk/cdi/cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/model/ComponentPropertiesModel.java
- copied, changed from r1832868, aries/trunk/cdi/cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/model/ConfigurationModel.java
Removed:
aries/trunk/cdi/cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/bean/ConfigurationBean.java
aries/trunk/cdi/cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/model/BindObjectImpl.java
aries/trunk/cdi/cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/model/BindServiceObjectsImpl.java
aries/trunk/cdi/cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/model/ConfigurationModel.java
Modified:
aries/trunk/cdi/cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/bean/ReferenceBean.java
aries/trunk/cdi/cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/command/CDICommand.java
aries/trunk/cdi/cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/container/ContainerState.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/CollectionType.java
aries/trunk/cdi/cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/model/ExtendedComponentInstanceDTO.java
aries/trunk/cdi/cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/model/ExtendedConfigurationTemplateDTO.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/ReferenceModel.java
aries/trunk/cdi/cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/util/DTOs.java
aries/trunk/cdi/cdi-extender/src/main/java/org/apache/aries/cdi/provider/package-info.java
aries/trunk/cdi/cdi-extender/src/test/java/org/apache/aries/cdi/container/internal/phase/TemplatesTests.java
aries/trunk/cdi/cdi-extender/src/test/java/org/apache/aries/cdi/container/test/beans/BarAnnotated.java
aries/trunk/cdi/cdi-extender/src/test/java/org/apache/aries/cdi/container/test/beans/BarBadlyAnnotated.java
aries/trunk/cdi/cdi-extender/src/test/java/org/apache/aries/cdi/container/test/beans/BarProducer.java
aries/trunk/cdi/cdi-extender/src/test/java/org/apache/aries/cdi/container/test/beans/BarWithConfig.java
aries/trunk/cdi/cdi-extender/src/test/java/org/apache/aries/cdi/container/test/beans/FieldFoo.java
aries/trunk/cdi/cdi-extender/src/test/java/org/apache/aries/cdi/container/test/beans/FieldListFoo.java
aries/trunk/cdi/cdi-extender/src/test/java/org/apache/aries/cdi/container/test/beans/FooAnnotated.java
aries/trunk/cdi/cdi-extender/src/test/java/org/apache/aries/cdi/container/test/beans/FooWithReferenceAndConfig.java
aries/trunk/cdi/cdi-extender/src/test/java/org/apache/aries/cdi/container/test/beans/MethodBindFoo.java
aries/trunk/cdi/cdi-extender/src/test/java/org/apache/aries/cdi/container/test/beans/MethodBindFooNamed.java
aries/trunk/cdi/cdi-extender/src/test/java/org/apache/aries/cdi/container/test/beans/MethodSetFoo.java
aries/trunk/cdi/cdi-extender/src/test/java/org/apache/aries/cdi/container/test/beans/ObserverFoo.java
aries/trunk/cdi/cdi-extender/src/test/java/org/apache/aries/cdi/container/test/beans/Reference_D_R_M_U_Service.java
aries/trunk/cdi/cdi-extender/src/test/java/org/apache/aries/cdi/container/test/beans/Reference_S_R_M_U_Service.java
aries/trunk/cdi/cdi-extender/src/test/java/org/apache/aries/cdi/container/test/beans/ctordynamicgreedy/CtorCollectionFoo.java
aries/trunk/cdi/cdi-extender/src/test/java/org/apache/aries/cdi/container/test/beans/ctordynamicgreedy/CtorFoo.java
aries/trunk/cdi/cdi-extender/src/test/java/org/apache/aries/cdi/container/test/beans/ctordynamicgreedy/CtorFooBar.java
aries/trunk/cdi/cdi-extender/src/test/java/org/apache/aries/cdi/container/test/beans/ctordynamicgreedy/CtorFooFoo.java
aries/trunk/cdi/cdi-extender/src/test/java/org/apache/aries/cdi/container/test/beans/ctordynamicgreedy/CtorFooFooNamed.java
aries/trunk/cdi/cdi-extender/src/test/java/org/apache/aries/cdi/container/test/beans/ctordynamicgreedy/CtorFooNamed.java
aries/trunk/cdi/cdi-extender/src/test/java/org/apache/aries/cdi/container/test/beans/ctordynamicgreedy/CtorFooOptional.java
aries/trunk/cdi/cdi-extender/src/test/java/org/apache/aries/cdi/container/test/beans/ctordynamicgreedy/CtorListFoo.java
aries/trunk/cdi/cdi-extender/src/test/java/org/apache/aries/cdi/container/test/beans/ctordynamicreluctant/CtorCollectionFoo.java
aries/trunk/cdi/cdi-extender/src/test/java/org/apache/aries/cdi/container/test/beans/ctordynamicreluctant/CtorFoo.java
aries/trunk/cdi/cdi-extender/src/test/java/org/apache/aries/cdi/container/test/beans/ctordynamicreluctant/CtorFooBar.java
aries/trunk/cdi/cdi-extender/src/test/java/org/apache/aries/cdi/container/test/beans/ctordynamicreluctant/CtorFooFoo.java
aries/trunk/cdi/cdi-extender/src/test/java/org/apache/aries/cdi/container/test/beans/ctordynamicreluctant/CtorFooFooNamed.java
aries/trunk/cdi/cdi-extender/src/test/java/org/apache/aries/cdi/container/test/beans/ctordynamicreluctant/CtorFooNamed.java
aries/trunk/cdi/cdi-extender/src/test/java/org/apache/aries/cdi/container/test/beans/ctordynamicreluctant/CtorFooOptional.java
aries/trunk/cdi/cdi-extender/src/test/java/org/apache/aries/cdi/container/test/beans/ctordynamicreluctant/CtorListFoo.java
aries/trunk/cdi/cdi-extender/src/test/java/org/apache/aries/cdi/container/test/beans/ctorstaticgreedy/CtorCollectionFoo.java
aries/trunk/cdi/cdi-extender/src/test/java/org/apache/aries/cdi/container/test/beans/ctorstaticgreedy/CtorFoo.java
aries/trunk/cdi/cdi-extender/src/test/java/org/apache/aries/cdi/container/test/beans/ctorstaticgreedy/CtorFooBar.java
aries/trunk/cdi/cdi-extender/src/test/java/org/apache/aries/cdi/container/test/beans/ctorstaticgreedy/CtorFooFoo.java
aries/trunk/cdi/cdi-extender/src/test/java/org/apache/aries/cdi/container/test/beans/ctorstaticgreedy/CtorFooFooNamed.java
aries/trunk/cdi/cdi-extender/src/test/java/org/apache/aries/cdi/container/test/beans/ctorstaticgreedy/CtorFooNamed.java
aries/trunk/cdi/cdi-extender/src/test/java/org/apache/aries/cdi/container/test/beans/ctorstaticgreedy/CtorFooOptional.java
aries/trunk/cdi/cdi-extender/src/test/java/org/apache/aries/cdi/container/test/beans/ctorstaticgreedy/CtorListFoo.java
aries/trunk/cdi/cdi-extender/src/test/java/org/apache/aries/cdi/container/test/beans/ctorstaticreluctant/CtorCollectionFoo.java
aries/trunk/cdi/cdi-extender/src/test/java/org/apache/aries/cdi/container/test/beans/ctorstaticreluctant/CtorFoo.java
aries/trunk/cdi/cdi-extender/src/test/java/org/apache/aries/cdi/container/test/beans/ctorstaticreluctant/CtorFooBar.java
aries/trunk/cdi/cdi-extender/src/test/java/org/apache/aries/cdi/container/test/beans/ctorstaticreluctant/CtorFooFoo.java
aries/trunk/cdi/cdi-extender/src/test/java/org/apache/aries/cdi/container/test/beans/ctorstaticreluctant/CtorFooFooNamed.java
aries/trunk/cdi/cdi-extender/src/test/java/org/apache/aries/cdi/container/test/beans/ctorstaticreluctant/CtorFooNamed.java
aries/trunk/cdi/cdi-extender/src/test/java/org/apache/aries/cdi/container/test/beans/ctorstaticreluctant/CtorFooOptional.java
aries/trunk/cdi/cdi-extender/src/test/java/org/apache/aries/cdi/container/test/beans/ctorstaticreluctant/CtorListFoo.java
aries/trunk/cdi/cdi-itests/logback.xml
aries/trunk/cdi/cdi-itests/src/main/java/org/apache/aries/cdi/test/tb1/BeanImpl.java
aries/trunk/cdi/cdi-itests/src/main/java/org/apache/aries/cdi/test/tb11/OptionalReference_AS.java
aries/trunk/cdi/cdi-itests/src/main/java/org/apache/aries/cdi/test/tb11/OptionalReference_FC.java
aries/trunk/cdi/cdi-itests/src/main/java/org/apache/aries/cdi/test/tb11/OptionalReference_SC.java
aries/trunk/cdi/cdi-itests/src/main/java/org/apache/aries/cdi/test/tb3/ConfigurationBeanA.java
aries/trunk/cdi/cdi-itests/src/main/java/org/apache/aries/cdi/test/tb3/ConfigurationBeanB.java
aries/trunk/cdi/cdi-itests/src/main/java/org/apache/aries/cdi/test/tb5/ConfigurationBeanC.java
aries/trunk/cdi/cdi-itests/src/main/java/org/apache/aries/cdi/test/tb6/RequestData.java
aries/trunk/cdi/cdi-itests/src/main/java/org/apache/aries/cdi/test/tb7/ConfigurationBeanF.java
Copied: aries/trunk/cdi/cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/bean/ComponentPropertiesBean.java (from r1832868, aries/trunk/cdi/cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/bean/ConfigurationBean.java)
URL: http://svn.apache.org/viewvc/aries/trunk/cdi/cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/bean/ComponentPropertiesBean.java?p2=aries/trunk/cdi/cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/bean/ComponentPropertiesBean.java&p1=aries/trunk/cdi/cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/bean/ConfigurationBean.java&r1=1832868&r2=1832901&rev=1832901&view=diff
==============================================================================
--- aries/trunk/cdi/cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/bean/ConfigurationBean.java (original)
+++ aries/trunk/cdi/cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/bean/ComponentPropertiesBean.java Mon Jun 4 23:26:08 2018
@@ -32,21 +32,21 @@ import org.apache.aries.cdi.container.in
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.Configuration;
import org.osgi.service.cdi.annotations.PID;
import org.osgi.service.cdi.runtime.dto.template.ComponentTemplateDTO;
-public class ConfigurationBean implements Bean<Object> {
+public class ComponentPropertiesBean implements Bean<Object> {
- public ConfigurationBean(
+ public ComponentPropertiesBean(
ComponentTemplateDTO component,
ExtendedConfigurationTemplateDTO template) {
_component = component;
_template = template;
- _qualifiers = Sets.hashSet(Configuration.Literal.INSTANCE, Default.Literal.INSTANCE);
+ _qualifiers = Sets.hashSet(ComponentProperties.Literal.INSTANCE, Default.Literal.INSTANCE);
_types = Sets.hashSet(_template.injectionPointType, Object.class);
if (_template.pid != null) {
Modified: aries/trunk/cdi/cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/bean/ReferenceBean.java
URL: http://svn.apache.org/viewvc/aries/trunk/cdi/cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/bean/ReferenceBean.java?rev=1832901&r1=1832900&r2=1832901&view=diff
==============================================================================
--- aries/trunk/cdi/cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/bean/ReferenceBean.java (original)
+++ aries/trunk/cdi/cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/bean/ReferenceBean.java Mon Jun 4 23:26:08 2018
@@ -44,8 +44,10 @@ import org.osgi.framework.ServiceReferen
import org.osgi.service.cdi.ComponentType;
import org.osgi.service.cdi.MaximumCardinality;
import org.osgi.service.cdi.ReferencePolicy;
+import org.osgi.service.cdi.ReferencePolicyOption;
import org.osgi.service.cdi.annotations.ComponentScoped;
import org.osgi.service.cdi.annotations.Reference;
+import org.osgi.service.cdi.annotations.Reluctant;
import org.osgi.service.cdi.runtime.dto.template.ComponentTemplateDTO;
import org.osgi.service.log.Logger;
@@ -61,6 +63,11 @@ public class ReferenceBean implements Be
_log = logs.getLogger(getClass());
_qualifiers = Sets.hashSet(Reference.Literal.of(Object.class, ""), Default.Literal.INSTANCE);
+
+ if (_template.policyOption == ReferencePolicyOption.RELUCTANT) {
+ _qualifiers.add(Reluctant.Literal.INSTANCE);
+ }
+
_types = Sets.hashSet(_template.injectionPointType, Object.class);
}
@@ -73,9 +80,9 @@ public class ReferenceBean implements Be
final SortedMap<ServiceReference<Object>, Object> tracked = _snapshot.serviceTracker.getTracked();
- if (_template.collectionType == CollectionType.BINDER_OBJECT ||
+ if (_template.collectionType == CollectionType.BINDER_SERVICE ||
_template.collectionType == CollectionType.BINDER_REFERENCE ||
- _template.collectionType == CollectionType.BINDER_SERVICE_OBJECTS) {
+ _template.collectionType == CollectionType.BINDER_BEAN_SERVICE_OBJECTS) {
return _snapshot.binder;
}
Modified: aries/trunk/cdi/cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/command/CDICommand.java
URL: http://svn.apache.org/viewvc/aries/trunk/cdi/cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/command/CDICommand.java?rev=1832901&r1=1832900&r2=1832901&view=diff
==============================================================================
--- aries/trunk/cdi/cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/command/CDICommand.java (original)
+++ aries/trunk/cdi/cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/command/CDICommand.java Mon Jun 4 23:26:08 2018
@@ -216,8 +216,7 @@ public class CDICommand {
if (instanceDTO != null) {
configurationDTO = instanceDTO.configurations.stream().filter(
- c -> c.template.componentConfiguration == conf.componentConfiguration &&
- c.template.maximumCardinality == conf.maximumCardinality &&
+ c -> c.template.maximumCardinality == conf.maximumCardinality &&
c.template.pid == conf.pid &&
c.template.policy == conf.policy
).findFirst().orElse(null);
@@ -244,13 +243,6 @@ public class CDICommand {
(itr.hasNext() ? PSSSTLLS : SSSSTLLS),
conf.pid);
}
-
- f.format(
- "%s%s%sCOMPONENT CONFIGURATION: %s%n",
- prefix,
- (hasNext ? PSSSPSSS : SSSSPSSS),
- (itr.hasNext() ? PSSSCLLS : SSSSCLLS),
- conf.componentConfiguration);
}
if (instanceDTO != null) {
Modified: aries/trunk/cdi/cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/container/ContainerState.java
URL: http://svn.apache.org/viewvc/aries/trunk/cdi/cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/container/ContainerState.java?rev=1832901&r1=1832900&r2=1832901&view=diff
==============================================================================
--- aries/trunk/cdi/cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/container/ContainerState.java (original)
+++ aries/trunk/cdi/cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/container/ContainerState.java Mon Jun 4 23:26:08 2018
@@ -157,7 +157,6 @@ public class ContainerState {
_containerComponentTemplateDTO.type = ComponentType.CONTAINER;
ExtendedConfigurationTemplateDTO configurationTemplate = new ExtendedConfigurationTemplateDTO();
- configurationTemplate.componentConfiguration = true;
configurationTemplate.maximumCardinality = MaximumCardinality.ONE;
configurationTemplate.pid = Optional.ofNullable(
(String)cdiAttributes.get(CDI_CONTAINER_ID)
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=1832901&r1=1832900&r2=1832901&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 Jun 4 23:26:08 2018
@@ -50,7 +50,7 @@ import javax.enterprise.inject.spi.Proce
import javax.enterprise.inject.spi.ProcessSyntheticBean;
import org.apache.aries.cdi.container.internal.model.BeansModel;
-import org.apache.aries.cdi.container.internal.model.ConfigurationModel;
+import org.apache.aries.cdi.container.internal.model.ComponentPropertiesModel;
import org.apache.aries.cdi.container.internal.model.ExtendedActivationTemplateDTO;
import org.apache.aries.cdi.container.internal.model.ExtendedComponentTemplateDTO;
import org.apache.aries.cdi.container.internal.model.ExtendedConfigurationTemplateDTO;
@@ -63,15 +63,15 @@ import org.osgi.service.cdi.ComponentTyp
import org.osgi.service.cdi.ConfigurationPolicy;
import org.osgi.service.cdi.MaximumCardinality;
import org.osgi.service.cdi.ServiceScope;
+import org.osgi.service.cdi.annotations.ComponentProperties;
import org.osgi.service.cdi.annotations.ComponentScoped;
-import org.osgi.service.cdi.annotations.Configuration;
import org.osgi.service.cdi.annotations.FactoryComponent;
import org.osgi.service.cdi.annotations.PID;
import org.osgi.service.cdi.annotations.Reference;
import org.osgi.service.cdi.annotations.ServiceInstance;
import org.osgi.service.cdi.annotations.SingleComponent;
-import org.osgi.service.cdi.reference.BindObject;
-import org.osgi.service.cdi.reference.BindServiceObjects;
+import org.osgi.service.cdi.reference.BindBeanServiceObjects;
+import org.osgi.service.cdi.reference.BindService;
import org.osgi.service.cdi.reference.BindServiceReference;
import org.osgi.service.cdi.runtime.dto.template.ComponentTemplateDTO;
@@ -239,7 +239,6 @@ public class DiscoveryExtension implemen
PID -> {
ExtendedConfigurationTemplateDTO configurationTemplate = new ExtendedConfigurationTemplateDTO();
- configurationTemplate.componentConfiguration = true;
configurationTemplate.declaringClass = annotatedClass;
configurationTemplate.maximumCardinality = MaximumCardinality.ONE;
configurationTemplate.pid = Optional.of(PID.value()).map(
@@ -267,7 +266,6 @@ public class DiscoveryExtension implemen
if (componentTemplate.configurations.isEmpty()) {
ExtendedConfigurationTemplateDTO configurationTemplate = new ExtendedConfigurationTemplateDTO();
- configurationTemplate.componentConfiguration = true;
configurationTemplate.declaringClass = annotatedClass;
configurationTemplate.maximumCardinality = MaximumCardinality.ONE;
configurationTemplate.pid = componentTemplate.name;
@@ -311,7 +309,6 @@ public class DiscoveryExtension implemen
PID -> {
ExtendedConfigurationTemplateDTO configurationTemplate = new ExtendedConfigurationTemplateDTO();
- configurationTemplate.componentConfiguration = true;
configurationTemplate.declaringClass = annotatedClass;
configurationTemplate.maximumCardinality = MaximumCardinality.ONE;
configurationTemplate.pid = Optional.of(PID.value()).map(
@@ -331,7 +328,6 @@ public class DiscoveryExtension implemen
ExtendedConfigurationTemplateDTO configurationTemplate = new ExtendedConfigurationTemplateDTO();
- configurationTemplate.componentConfiguration = true;
configurationTemplate.declaringClass = annotatedClass;
configurationTemplate.maximumCardinality = MaximumCardinality.MANY;
configurationTemplate.pid = Optional.ofNullable(
@@ -401,7 +397,7 @@ public class DiscoveryExtension implemen
}
}
- void processBindObject(@Observes ProcessInjectionPoint<?, BindObject<?>> pip) {
+ void processBindObject(@Observes ProcessInjectionPoint<?, BindService<?>> pip) {
InjectionPoint injectionPoint = pip.getInjectionPoint();
Class<?> declaringClass = getDeclaringClass(injectionPoint);
@@ -435,7 +431,7 @@ public class DiscoveryExtension implemen
}
}
- void processBindServiceObjects(@Observes ProcessInjectionPoint<?, BindServiceObjects<?>> pip) {
+ void processBindServiceObjects(@Observes ProcessInjectionPoint<?, BindBeanServiceObjects<?>> pip) {
InjectionPoint injectionPoint = pip.getInjectionPoint();
Class<?> declaringClass = getDeclaringClass(injectionPoint);
@@ -518,10 +514,10 @@ public class DiscoveryExtension implemen
Annotated annotated = injectionPoint.getAnnotated();
Reference reference = annotated.getAnnotation(Reference.class);
- Configuration configuration = annotated.getAnnotation(Configuration.class);
+ ComponentProperties componentProperties = annotated.getAnnotation(ComponentProperties.class);
if (reference != null) {
- if (configuration != null) {
+ if (componentProperties != null) {
_containerState.error(
new IllegalArgumentException(
String.format(
@@ -550,9 +546,9 @@ public class DiscoveryExtension implemen
_containerState.error(e);
}
}
- else if (configuration != null) {
+ else if (componentProperties != null) {
try {
- ConfigurationModel configurationModel = new ConfigurationModel.Builder(
+ ComponentPropertiesModel configurationModel = new ComponentPropertiesModel.Builder(
injectionPoint.getType()
).declaringClass(
declaringClass
@@ -617,7 +613,7 @@ public class DiscoveryExtension implemen
}
for (InjectionPoint injectionPoint : bean.getInjectionPoints()) {
- if ((injectionPoint.getAnnotated().getAnnotation(Configuration.class) != null) ||
+ if ((injectionPoint.getAnnotated().getAnnotation(ComponentProperties.class) != null) ||
(injectionPoint.getAnnotated().getAnnotation(Reference.class) != null)) {
continue;
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=1832901&r1=1832900&r2=1832901&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 Jun 4 23:26:08 2018
@@ -63,9 +63,9 @@ public class ReferenceSync implements Se
_referenceDTO.matches = SRs.from(_referenceDTO.serviceTracker.getServiceReferences(), reference);
try {
- if (collectionType == CollectionType.BINDER_OBJECT ||
+ if (collectionType == CollectionType.BINDER_SERVICE ||
collectionType == CollectionType.BINDER_REFERENCE ||
- collectionType == CollectionType.BINDER_SERVICE_OBJECTS) {
+ collectionType == CollectionType.BINDER_BEAN_SERVICE_OBJECTS) {
requiresUpdate = false;
@@ -104,9 +104,9 @@ public class ReferenceSync implements Se
public void modifiedService(ServiceReference<Object> reference, Object service) {
CollectionType collectionType = _templateDTO.collectionType;
- if (collectionType == CollectionType.BINDER_OBJECT ||
+ if (collectionType == CollectionType.BINDER_SERVICE ||
collectionType == CollectionType.BINDER_REFERENCE ||
- collectionType == CollectionType.BINDER_SERVICE_OBJECTS) {
+ collectionType == CollectionType.BINDER_BEAN_SERVICE_OBJECTS) {
_referenceDTO.binder.modifiedService(reference);
}
@@ -137,9 +137,9 @@ public class ReferenceSync implements Se
_referenceDTO.matches.removeIf(d -> d.id == SRs.id(reference));
try {
- if (collectionType == CollectionType.BINDER_OBJECT ||
+ if (collectionType == CollectionType.BINDER_SERVICE ||
collectionType == CollectionType.BINDER_REFERENCE ||
- collectionType == CollectionType.BINDER_SERVICE_OBJECTS) {
+ collectionType == CollectionType.BINDER_BEAN_SERVICE_OBJECTS) {
requiresUpdate = false;
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=1832901&r1=1832900&r2=1832901&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 Jun 4 23:26:08 2018
@@ -41,11 +41,11 @@ import javax.enterprise.inject.spi.Proce
import javax.enterprise.inject.spi.Producer;
import javax.enterprise.inject.spi.ProducerFactory;
-import org.apache.aries.cdi.container.internal.bean.ConfigurationBean;
+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.Op.Mode;
import org.apache.aries.cdi.container.internal.container.Op.Type;
-import org.apache.aries.cdi.container.internal.model.ConfigurationModel;
+import org.apache.aries.cdi.container.internal.model.ComponentPropertiesModel;
import org.apache.aries.cdi.container.internal.model.ExtendedActivationDTO;
import org.apache.aries.cdi.container.internal.model.ExtendedActivationTemplateDTO;
import org.apache.aries.cdi.container.internal.model.ExtendedComponentInstanceDTO;
@@ -65,11 +65,11 @@ import org.osgi.framework.ServiceRegistr
import org.osgi.service.cdi.CDIConstants;
import org.osgi.service.cdi.ComponentType;
import org.osgi.service.cdi.ServiceScope;
+import org.osgi.service.cdi.annotations.ComponentProperties;
import org.osgi.service.cdi.annotations.ComponentScoped;
-import org.osgi.service.cdi.annotations.Configuration;
import org.osgi.service.cdi.annotations.Reference;
-import org.osgi.service.cdi.reference.BindObject;
-import org.osgi.service.cdi.reference.BindServiceObjects;
+import org.osgi.service.cdi.reference.BindBeanServiceObjects;
+import org.osgi.service.cdi.reference.BindService;
import org.osgi.service.cdi.reference.BindServiceReference;
import org.osgi.service.cdi.runtime.dto.ComponentDTO;
import org.osgi.service.cdi.runtime.dto.template.ComponentTemplateDTO;
@@ -96,11 +96,12 @@ public class RuntimeExtension implements
}
void beforeBeanDiscovery(@Observes BeforeBeanDiscovery bbd) {
- bbd.addQualifier(org.osgi.service.cdi.annotations.Configuration.class);
- bbd.addQualifier(org.osgi.service.cdi.annotations.Greedy.class);
+ bbd.addQualifier(org.osgi.service.cdi.annotations.ComponentProperties.class);
+ bbd.addQualifier(org.osgi.service.cdi.annotations.MinimumCardinality.class);
bbd.addQualifier(org.osgi.service.cdi.annotations.PID.class);
bbd.addQualifier(org.osgi.service.cdi.annotations.PrototypeRequired.class);
bbd.addQualifier(org.osgi.service.cdi.annotations.Reference.class);
+ bbd.addQualifier(org.osgi.service.cdi.annotations.Reluctant.class);
bbd.addQualifier(org.osgi.service.cdi.annotations.Service.class);
bbd.addQualifier(org.osgi.service.cdi.annotations.ServiceInstance.class);
bbd.addScope(ComponentScoped.class, false, false);
@@ -168,11 +169,11 @@ public class RuntimeExtension implements
);
}
- void processBindObject(@Observes ProcessInjectionPoint<?, BindObject<?>> pip) {
+ void processBindObject(@Observes ProcessInjectionPoint<?, BindService<?>> pip) {
processInjectionPoint(pip, true);
}
- void processBindServiceObjects(@Observes ProcessInjectionPoint<?, BindServiceObjects<?>> pip) {
+ void processBindServiceObjects(@Observes ProcessInjectionPoint<?, BindBeanServiceObjects<?>> pip) {
processInjectionPoint(pip, true);
}
@@ -198,15 +199,15 @@ public class RuntimeExtension implements
}
Annotated annotated = injectionPoint.getAnnotated();
- Configuration configuration = annotated.getAnnotation(Configuration.class);
+ ComponentProperties componentProperties = annotated.getAnnotation(ComponentProperties.class);
Reference reference = annotated.getAnnotation(Reference.class);
if (((reference != null) || special) && matchReference(osgiBean, pip)) {
return;
}
- if (configuration != null) {
- matchConfiguration(osgiBean, configuration, pip);
+ if (componentProperties != null) {
+ matchConfiguration(osgiBean, pip);
}
}
@@ -237,7 +238,7 @@ public class RuntimeExtension implements
t -> Objects.nonNull(t.injectionPointType)
).forEach(
t -> {
- ConfigurationBean bean = t.bean;
+ ComponentPropertiesBean bean = t.bean;
if (componentTemplate.type == ComponentType.CONTAINER) {
if (t.pid == null) {
bean.setProperties(componentTemplate.properties);
@@ -307,12 +308,12 @@ public class RuntimeExtension implements
return _containerState.submit(cl.openOp(), cl::open);
}
- private boolean matchConfiguration(OSGiBean osgiBean, Configuration configuration, ProcessInjectionPoint<?, ?> pip) {
+ private boolean matchConfiguration(OSGiBean osgiBean, ProcessInjectionPoint<?, ?> pip) {
InjectionPoint injectionPoint = pip.getInjectionPoint();
Class<?> declaringClass = DiscoveryExtension.getDeclaringClass(injectionPoint);
- ConfigurationTemplateDTO current = new ConfigurationModel.Builder(injectionPoint.getType()).declaringClass(
+ ConfigurationTemplateDTO current = new ComponentPropertiesModel.Builder(injectionPoint.getType()).declaringClass(
declaringClass
).injectionPoint(
injectionPoint
Copied: aries/trunk/cdi/cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/model/BindBeanServiceObjectsImpl.java (from r1832868, aries/trunk/cdi/cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/model/BindServiceObjectsImpl.java)
URL: http://svn.apache.org/viewvc/aries/trunk/cdi/cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/model/BindBeanServiceObjectsImpl.java?p2=aries/trunk/cdi/cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/model/BindBeanServiceObjectsImpl.java&p1=aries/trunk/cdi/cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/model/BindServiceObjectsImpl.java&r1=1832868&r2=1832901&rev=1832901&view=diff
==============================================================================
--- aries/trunk/cdi/cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/model/BindServiceObjectsImpl.java (original)
+++ aries/trunk/cdi/cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/model/BindBeanServiceObjectsImpl.java Mon Jun 4 23:26:08 2018
@@ -25,10 +25,10 @@ import org.apache.aries.cdi.container.in
import org.osgi.framework.BundleContext;
import org.osgi.framework.ServiceReference;
import org.osgi.service.cdi.reference.BeanServiceObjects;
-import org.osgi.service.cdi.reference.BindServiceObjects;
+import org.osgi.service.cdi.reference.BindBeanServiceObjects;
import org.osgi.service.log.Logger;
-public class BindServiceObjectsImpl<T> implements Binder<T>, BindServiceObjects<T> {
+public class BindBeanServiceObjectsImpl<T> implements Binder<T>, BindBeanServiceObjects<T> {
private final ContainerState _containerState;
private final Logger _log;
@@ -41,13 +41,13 @@ public class BindServiceObjectsImpl<T> i
private volatile BeanServiceObjects<T> serviceObjects;
- public BindServiceObjectsImpl(ContainerState containerState) {
+ public BindBeanServiceObjectsImpl(ContainerState containerState) {
_containerState = containerState;
_log = _containerState.containerLogs().getLogger(getClass());
}
@Override
- public BindServiceObjectsImpl<T> addingService(ServiceReference<T> reference) {
+ public BindBeanServiceObjectsImpl<T> addingService(ServiceReference<T> reference) {
if (_enqueue.get()) {
_queue.add(reference);
return this;
@@ -71,7 +71,7 @@ public class BindServiceObjectsImpl<T> i
}
@Override
- public BindServiceObjectsImpl<T> modifiedService(ServiceReference<T> reference) {
+ public BindBeanServiceObjectsImpl<T> modifiedService(ServiceReference<T> reference) {
if (_enqueue.get()) {
return this; // i.e. do nothing
}
@@ -91,7 +91,7 @@ public class BindServiceObjectsImpl<T> i
}
@Override
- public BindServiceObjectsImpl<T> removedService(ServiceReference<T> reference) {
+ public BindBeanServiceObjectsImpl<T> removedService(ServiceReference<T> reference) {
if (_enqueue.get()) {
_queue.remove(reference);
return this;
@@ -123,19 +123,19 @@ public class BindServiceObjectsImpl<T> i
}
@Override
- public BindServiceObjectsImpl<T> adding(Consumer<BeanServiceObjects<T>> action) {
+ public BindBeanServiceObjectsImpl<T> adding(Consumer<BeanServiceObjects<T>> action) {
onAdding = Optional.ofNullable(action);
return this;
}
@Override
- public BindServiceObjectsImpl<T> modified(Consumer<BeanServiceObjects<T>> consumer) {
+ public BindBeanServiceObjectsImpl<T> modified(Consumer<BeanServiceObjects<T>> consumer) {
onUpdate = Optional.ofNullable(consumer);
return this;
}
@Override
- public BindServiceObjectsImpl<T> removed(Consumer<BeanServiceObjects<T>> consumer) {
+ public BindBeanServiceObjectsImpl<T> removed(Consumer<BeanServiceObjects<T>> consumer) {
onRemove = Optional.ofNullable(consumer);
return this;
}
Copied: aries/trunk/cdi/cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/model/BindServiceImpl.java (from r1832868, aries/trunk/cdi/cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/model/BindObjectImpl.java)
URL: http://svn.apache.org/viewvc/aries/trunk/cdi/cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/model/BindServiceImpl.java?p2=aries/trunk/cdi/cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/model/BindServiceImpl.java&p1=aries/trunk/cdi/cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/model/BindObjectImpl.java&r1=1832868&r2=1832901&rev=1832901&view=diff
==============================================================================
--- aries/trunk/cdi/cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/model/BindObjectImpl.java (original)
+++ aries/trunk/cdi/cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/model/BindServiceImpl.java Mon Jun 4 23:26:08 2018
@@ -26,10 +26,10 @@ import org.apache.aries.cdi.container.in
import org.apache.aries.cdi.container.internal.util.Maps;
import org.osgi.framework.BundleContext;
import org.osgi.framework.ServiceReference;
-import org.osgi.service.cdi.reference.BindObject;
+import org.osgi.service.cdi.reference.BindService;
import org.osgi.service.log.Logger;
-public class BindObjectImpl<T> implements Binder<T>, BindObject<T> {
+public class BindServiceImpl<T> implements Binder<T>, BindService<T> {
private final ContainerState _containerState;
private final Logger _log;
@@ -45,13 +45,13 @@ public class BindObjectImpl<T> implement
private volatile T service;
- public BindObjectImpl(ContainerState containerState) {
+ public BindServiceImpl(ContainerState containerState) {
_containerState = containerState;
_log = _containerState.containerLogs().getLogger(getClass());
}
@Override
- public BindObjectImpl<T> addingService(ServiceReference<T> reference) {
+ public BindServiceImpl<T> addingService(ServiceReference<T> reference) {
if (_enqueue.get()) {
_queue.add(reference);
return this;
@@ -86,7 +86,7 @@ public class BindObjectImpl<T> implement
}
@Override
- public BindObjectImpl<T> modifiedService(ServiceReference<T> reference) {
+ public BindServiceImpl<T> modifiedService(ServiceReference<T> reference) {
if (_enqueue.get()) {
return this; // i.e. do nothing
}
@@ -118,7 +118,7 @@ public class BindObjectImpl<T> implement
}
@Override
- public BindObjectImpl<T> removedService(ServiceReference<T> reference) {
+ public BindServiceImpl<T> removedService(ServiceReference<T> reference) {
if (_enqueue.get()) {
_queue.remove(reference);
return this;
@@ -162,37 +162,37 @@ public class BindObjectImpl<T> implement
}
@Override
- public BindObjectImpl<T> adding(Consumer<T> action) {
+ public BindServiceImpl<T> adding(Consumer<T> action) {
onAdding = Optional.ofNullable(action);
return this;
}
@Override
- public BindObjectImpl<T> adding(BiConsumer<T, Map<String, Object>> action) {
+ public BindServiceImpl<T> adding(BiConsumer<T, Map<String, Object>> action) {
onAddingBi = Optional.ofNullable(action);
return this;
}
@Override
- public BindObjectImpl<T> modified(Consumer<T> consumer) {
+ public BindServiceImpl<T> modified(Consumer<T> consumer) {
onUpdate = Optional.ofNullable(consumer);
return this;
}
@Override
- public BindObjectImpl<T> modified(BiConsumer<T, Map<String, Object>> consumer) {
+ public BindServiceImpl<T> modified(BiConsumer<T, Map<String, Object>> consumer) {
onUpdateBi = Optional.ofNullable(consumer);
return this;
}
@Override
- public BindObjectImpl<T> removed(Consumer<T> consumer) {
+ public BindServiceImpl<T> removed(Consumer<T> consumer) {
onRemove = Optional.ofNullable(consumer);
return this;
}
@Override
- public BindObjectImpl<T> removed(BiConsumer<T, Map<String, Object>> consumer) {
+ public BindServiceImpl<T> removed(BiConsumer<T, Map<String, Object>> consumer) {
onRemoveBi = Optional.ofNullable(consumer);
return this;
}
Modified: aries/trunk/cdi/cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/model/CollectionType.java
URL: http://svn.apache.org/viewvc/aries/trunk/cdi/cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/model/CollectionType.java?rev=1832901&r1=1832900&r2=1832901&view=diff
==============================================================================
--- aries/trunk/cdi/cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/model/CollectionType.java (original)
+++ aries/trunk/cdi/cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/model/CollectionType.java Mon Jun 4 23:26:08 2018
@@ -64,7 +64,7 @@ public enum CollectionType {
* Used to indicate the reference is a binder for registering handler
* methods for tracking service instances.
*/
- BINDER_OBJECT("binder_object"),
+ BINDER_SERVICE("binder_service"),
/**
* Used to indicate the reference is a binder for registering handler
@@ -74,9 +74,9 @@ public enum CollectionType {
/**
* Used to indicate the reference is a binder for registering handler
- * methods for tracking service objects.
+ * methods for tracking bean service objects.
*/
- BINDER_SERVICE_OBJECTS("binder_service_objects");
+ BINDER_BEAN_SERVICE_OBJECTS("binder_bean_service_objects");
private final String value;
Copied: aries/trunk/cdi/cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/model/ComponentPropertiesModel.java (from r1832868, aries/trunk/cdi/cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/model/ConfigurationModel.java)
URL: http://svn.apache.org/viewvc/aries/trunk/cdi/cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/model/ComponentPropertiesModel.java?p2=aries/trunk/cdi/cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/model/ComponentPropertiesModel.java&p1=aries/trunk/cdi/cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/model/ConfigurationModel.java&r1=1832868&r2=1832901&rev=1832901&view=diff
==============================================================================
--- aries/trunk/cdi/cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/model/ConfigurationModel.java (original)
+++ aries/trunk/cdi/cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/model/ComponentPropertiesModel.java Mon Jun 4 23:26:08 2018
@@ -30,7 +30,7 @@ import org.osgi.service.cdi.MaximumCardi
import org.osgi.service.cdi.annotations.PID;
import org.osgi.service.cdi.runtime.dto.template.ConfigurationTemplateDTO;
-public class ConfigurationModel {
+public class ComponentPropertiesModel {
public static class Builder {
@@ -38,10 +38,10 @@ public class ConfigurationModel {
_injectionPointType = injectionPointType;
}
- public ConfigurationModel build() {
+ public ComponentPropertiesModel build() {
Objects.requireNonNull(_delcaringClass);
Objects.requireNonNull(_injectionPointType);
- return new ConfigurationModel(_injectionPointType, _delcaringClass, _pid, _qualifiers);
+ return new ComponentPropertiesModel(_injectionPointType, _delcaringClass, _pid, _qualifiers);
}
public Builder declaringClass(Class<?> delcaringClass) {
@@ -62,7 +62,7 @@ public class ConfigurationModel {
}
- private ConfigurationModel(
+ private ComponentPropertiesModel(
Type injectionPointType,
Class<?> delcaringClass,
PID pid,
@@ -109,12 +109,8 @@ public class ConfigurationModel {
dto.maximumCardinality = MaximumCardinality.ONE;
if (_pid != null) {
- dto.componentConfiguration = false;
dto.pid = _pid.value();
}
- else {
- dto.componentConfiguration = true;
- }
dto.policy = (_pid != null) ? _pid.policy() : ConfigurationPolicy.OPTIONAL;
Modified: aries/trunk/cdi/cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/model/ExtendedComponentInstanceDTO.java
URL: http://svn.apache.org/viewvc/aries/trunk/cdi/cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/model/ExtendedComponentInstanceDTO.java?rev=1832901&r1=1832900&r2=1832901&view=diff
==============================================================================
--- aries/trunk/cdi/cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/model/ExtendedComponentInstanceDTO.java (original)
+++ aries/trunk/cdi/cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/model/ExtendedComponentInstanceDTO.java Mon Jun 4 23:26:08 2018
@@ -182,14 +182,14 @@ public class ExtendedComponentInstanceDT
t -> {
ExtendedReferenceDTO referenceDTO = new ExtendedReferenceDTO();
- if (t.collectionType == CollectionType.BINDER_OBJECT) {
- referenceDTO.binder = new BindObjectImpl<>(_containerState);
+ if (t.collectionType == CollectionType.BINDER_SERVICE) {
+ referenceDTO.binder = new BindServiceImpl<>(_containerState);
}
else if (t.collectionType == CollectionType.BINDER_REFERENCE) {
referenceDTO.binder = new BindServiceReferenceImpl<>(_containerState);
}
- else if (t.collectionType == CollectionType.BINDER_SERVICE_OBJECTS) {
- referenceDTO.binder = new BindServiceObjectsImpl<>(_containerState);
+ else if (t.collectionType == CollectionType.BINDER_BEAN_SERVICE_OBJECTS) {
+ referenceDTO.binder = new BindBeanServiceObjectsImpl<>(_containerState);
}
referenceDTO.matches = new CopyOnWriteArrayList<>();
@@ -275,7 +275,7 @@ public class ExtendedComponentInstanceDT
for (ConfigurationTemplateDTO t : template.configurations) {
configurations.stream().filter(
- c -> c.template.equals(t) && t.componentConfiguration
+ c -> c.template.equals(t)
).findFirst().ifPresent(
c -> {
Map<String, Object> copy = new HashMap<>(c.properties);
Modified: aries/trunk/cdi/cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/model/ExtendedConfigurationTemplateDTO.java
URL: http://svn.apache.org/viewvc/aries/trunk/cdi/cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/model/ExtendedConfigurationTemplateDTO.java?rev=1832901&r1=1832900&r2=1832901&view=diff
==============================================================================
--- aries/trunk/cdi/cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/model/ExtendedConfigurationTemplateDTO.java (original)
+++ aries/trunk/cdi/cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/model/ExtendedConfigurationTemplateDTO.java Mon Jun 4 23:26:08 2018
@@ -16,7 +16,7 @@ package org.apache.aries.cdi.container.i
import java.lang.reflect.Type;
-import org.apache.aries.cdi.container.internal.bean.ConfigurationBean;
+import org.apache.aries.cdi.container.internal.bean.ComponentPropertiesBean;
import org.osgi.service.cdi.runtime.dto.template.ConfigurationTemplateDTO;
public class ExtendedConfigurationTemplateDTO extends ConfigurationTemplateDTO {
@@ -37,14 +37,13 @@ public class ExtendedConfigurationTempla
*/
public Type injectionPointType;
- public ConfigurationBean bean;
+ public ComponentPropertiesBean bean;
@Override
public int hashCode() {
final int prime = 31;
int result = 1;
result = prime * result + ((beanClass == null) ? 0 : beanClass.hashCode());
- result = prime * result + (componentConfiguration ? 1231 : 1237);
result = prime * result + ((declaringClass == null) ? 0 : declaringClass.hashCode());
result = prime * result + ((injectionPointType == null) ? 0 : injectionPointType.hashCode());
result = prime * result + ((maximumCardinality == null) ? 0 : maximumCardinality.hashCode());
@@ -72,9 +71,6 @@ public class ExtendedConfigurationTempla
} else if (!beanClass.equals(other.beanClass)) {
return false;
}
- if (componentConfiguration != other.componentConfiguration) {
- return false;
- }
if (declaringClass == null) {
if (other.declaringClass != null) {
return false;
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=1832901&r1=1832900&r2=1832901&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 Jun 4 23:26:08 2018
@@ -19,7 +19,7 @@ import java.util.Objects;
import java.util.concurrent.CopyOnWriteArrayList;
import java.util.concurrent.atomic.AtomicBoolean;
-import org.apache.aries.cdi.container.internal.bean.ConfigurationBean;
+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.util.Logs;
import org.apache.aries.cdi.container.internal.util.Syncro;
@@ -57,7 +57,7 @@ public class OSGiBean implements Compara
_configurationsQueue.add(dto);
}
else {
- ((ExtendedConfigurationTemplateDTO)dto).bean = new ConfigurationBean(
+ ((ExtendedConfigurationTemplateDTO)dto).bean = new ComponentPropertiesBean(
_componentTemplate, (ExtendedConfigurationTemplateDTO)dto);
_componentTemplate.configurations.add(dto);
@@ -114,7 +114,7 @@ public class OSGiBean implements Compara
_componentTemplate = componentTemplate;
_configurationsQueue.removeIf(
dto -> {
- ((ExtendedConfigurationTemplateDTO)dto).bean = new ConfigurationBean(
+ ((ExtendedConfigurationTemplateDTO)dto).bean = new ComponentPropertiesBean(
_componentTemplate, (ExtendedConfigurationTemplateDTO)dto);
_componentTemplate.configurations.add(dto);
Modified: aries/trunk/cdi/cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/model/ReferenceModel.java
URL: http://svn.apache.org/viewvc/aries/trunk/cdi/cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/model/ReferenceModel.java?rev=1832901&r1=1832900&r2=1832901&view=diff
==============================================================================
--- aries/trunk/cdi/cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/model/ReferenceModel.java (original)
+++ aries/trunk/cdi/cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/model/ReferenceModel.java Mon Jun 4 23:26:08 2018
@@ -46,13 +46,13 @@ import org.osgi.framework.ServiceReferen
import org.osgi.service.cdi.MaximumCardinality;
import org.osgi.service.cdi.ReferencePolicy;
import org.osgi.service.cdi.ReferencePolicyOption;
-import org.osgi.service.cdi.annotations.Greedy;
import org.osgi.service.cdi.annotations.PrototypeRequired;
import org.osgi.service.cdi.annotations.Reference;
-import org.osgi.service.cdi.reference.BindObject;
-import org.osgi.service.cdi.reference.BindServiceObjects;
-import org.osgi.service.cdi.reference.BindServiceReference;
+import org.osgi.service.cdi.annotations.Reluctant;
import org.osgi.service.cdi.reference.BeanServiceObjects;
+import org.osgi.service.cdi.reference.BindBeanServiceObjects;
+import org.osgi.service.cdi.reference.BindService;
+import org.osgi.service.cdi.reference.BindServiceReference;
public class ReferenceModel {
@@ -157,8 +157,8 @@ public class ReferenceModel {
_name = calculateName(_serviceType, _annotated);
- if (_annotated.isAnnotationPresent(Greedy.class)) {
- _greedy = true;
+ if (_annotated.isAnnotationPresent(Reluctant.class)) {
+ _greedy = false;
}
_targetFilter = buildFilter();
@@ -278,22 +278,6 @@ public class ReferenceModel {
sb.append(targetFilter);
}
-// for (Annotation qualifier : getQualifiers()) {
-// Class<? extends Annotation> annotationType = qualifier.annotationType();
-//
-// if (annotationType.equals(Reference.class) ||
-// annotationType.equals(Prototype.class)) {
-//
-// // TODO filter out blacklisted qualifiers
-//
-// continue;
-// }
-//
-// Map<String, String> map = Conversions.convert(qualifier).sourceAs(qualifier.annotationType()).to(_mapType);
-//
-// Maps.appendFilter(sb, map);
-// }
-
if (_prototype && filterValid) {
sb.append(")");
}
@@ -366,7 +350,7 @@ public class ReferenceModel {
throw new IllegalArgumentException(
"ServiceReference must specify a generic type argument: " + type);
}
- else if ((Collection.class == clazz || Iterable.class == clazz || List.class == clazz) &&
+ else if ((Collection.class == clazz || List.class == clazz) &&
!_referenceType.isPresent()) {
throw new IllegalArgumentException(
@@ -380,7 +364,7 @@ public class ReferenceModel {
_collectionType = CollectionType.REFERENCE;
return;
}
- else if (Collection.class == clazz || Iterable.class == clazz || List.class == clazz) {
+ else if (Collection.class == clazz || List.class == clazz) {
_collectionType = CollectionType.SERVICE;
_multiplicity = MaximumCardinality.MANY;
_optional = true;
@@ -405,12 +389,11 @@ public class ReferenceModel {
"Instance<T> is not supported with @Reference: " + type);
}
- if (BindObject.class.isAssignableFrom(cast(rawType))) {
- _collectionType = CollectionType.BINDER_OBJECT;
+ if (BindService.class.isAssignableFrom(cast(rawType))) {
+ _collectionType = CollectionType.BINDER_SERVICE;
_dynamic = true;
_multiplicity = MaximumCardinality.MANY;
_optional = true;
- _greedy = true;
if (argument instanceof WildcardType ||
argument instanceof ParameterizedType) {
@@ -429,7 +412,6 @@ public class ReferenceModel {
_dynamic = true;
_multiplicity = MaximumCardinality.MANY;
_optional = true;
- _greedy = true;
if (argument instanceof WildcardType ||
argument instanceof ParameterizedType) {
@@ -443,12 +425,11 @@ public class ReferenceModel {
return;
}
- if (BindServiceObjects.class.isAssignableFrom(cast(rawType))) {
- _collectionType = CollectionType.BINDER_SERVICE_OBJECTS;
+ if (BindBeanServiceObjects.class.isAssignableFrom(cast(rawType))) {
+ _collectionType = CollectionType.BINDER_BEAN_SERVICE_OBJECTS;
_dynamic = true;
_multiplicity = MaximumCardinality.MANY;
_optional = true;
- _greedy = true;
if (argument instanceof WildcardType ||
argument instanceof ParameterizedType) {
@@ -484,7 +465,6 @@ public class ReferenceModel {
if ((_multiplicity == MaximumCardinality.ONE) &&
((Collection.class == cast(rawType)) ||
- (Iterable.class == cast(rawType)) ||
(List.class == cast(rawType)))) {
_optional = true;
@@ -615,7 +595,7 @@ public class ReferenceModel {
private CollectionType _collectionType = CollectionType.SERVICE;
private final Class<?> _declaringClass;
private boolean _dynamic = false;
- private boolean _greedy = false;
+ private boolean _greedy = true;
private final Type _injectionPointType;
private MaximumCardinality _multiplicity = MaximumCardinality.ONE;
private final String _name;
Modified: aries/trunk/cdi/cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/util/DTOs.java
URL: http://svn.apache.org/viewvc/aries/trunk/cdi/cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/util/DTOs.java?rev=1832901&r1=1832900&r2=1832901&view=diff
==============================================================================
--- aries/trunk/cdi/cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/util/DTOs.java (original)
+++ aries/trunk/cdi/cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/util/DTOs.java Mon Jun 4 23:26:08 2018
@@ -244,7 +244,6 @@ public class DTOs {
static ConfigurationTemplateDTO copy0(ConfigurationTemplateDTO original) {
ConfigurationTemplateDTO copy = new ConfigurationTemplateDTO();
- copy.componentConfiguration = original.componentConfiguration;
copy.maximumCardinality = original.maximumCardinality;
copy.pid = original.pid;
copy.policy = original.policy;
Modified: aries/trunk/cdi/cdi-extender/src/main/java/org/apache/aries/cdi/provider/package-info.java
URL: http://svn.apache.org/viewvc/aries/trunk/cdi/cdi-extender/src/main/java/org/apache/aries/cdi/provider/package-info.java?rev=1832901&r1=1832900&r2=1832901&view=diff
==============================================================================
--- aries/trunk/cdi/cdi-extender/src/main/java/org/apache/aries/cdi/provider/package-info.java (original)
+++ aries/trunk/cdi/cdi-extender/src/main/java/org/apache/aries/cdi/provider/package-info.java Mon Jun 4 23:26:08 2018
@@ -18,7 +18,7 @@
uses = {
org.osgi.service.cdi.ServiceScope.class,
org.osgi.service.cdi.annotations.Reference.class,
- org.osgi.service.cdi.reference.BindObject.class,
+ org.osgi.service.cdi.reference.BindService.class,
org.osgi.service.cdi.runtime.CDIComponentRuntime.class,
org.osgi.service.cdi.runtime.dto.ActivationDTO.class,
org.osgi.service.cdi.runtime.dto.template.ActivationTemplateDTO.class
@@ -31,7 +31,7 @@
uses = {
org.osgi.service.cdi.ServiceScope.class,
org.osgi.service.cdi.annotations.Reference.class,
- org.osgi.service.cdi.reference.BindObject.class,
+ org.osgi.service.cdi.reference.BindService.class,
org.osgi.service.cdi.runtime.CDIComponentRuntime.class,
org.osgi.service.cdi.runtime.dto.ActivationDTO.class,
org.osgi.service.cdi.runtime.dto.template.ActivationTemplateDTO.class
Modified: aries/trunk/cdi/cdi-extender/src/test/java/org/apache/aries/cdi/container/internal/phase/TemplatesTests.java
URL: http://svn.apache.org/viewvc/aries/trunk/cdi/cdi-extender/src/test/java/org/apache/aries/cdi/container/internal/phase/TemplatesTests.java?rev=1832901&r1=1832900&r2=1832901&view=diff
==============================================================================
--- aries/trunk/cdi/cdi-extender/src/test/java/org/apache/aries/cdi/container/internal/phase/TemplatesTests.java (original)
+++ aries/trunk/cdi/cdi-extender/src/test/java/org/apache/aries/cdi/container/internal/phase/TemplatesTests.java Mon Jun 4 23:26:08 2018
@@ -69,7 +69,7 @@ public class TemplatesTests extends Base
{
ActivationTemplateDTO at = template.activations.get(0);
- assertEquals(Maps.of("jaxrs.resource", true), at.properties);
+ assertEquals(Maps.of("osgi.jaxrs.resource", true), at.properties);
assertEquals(ServiceScope.SINGLETON, at.scope);
assertEquals(Arrays.asList(Baz.class.getName()), at.serviceClasses);
}
@@ -243,7 +243,6 @@ public class TemplatesTests extends Base
{ // configuration "barService"
ConfigurationTemplateDTO configurationTemplateDTO = ct.configurations.get(0);
- assertEquals(true, configurationTemplateDTO.componentConfiguration);
assertEquals(MaximumCardinality.MANY, configurationTemplateDTO.maximumCardinality);
assertEquals("barService", configurationTemplateDTO.pid);
assertEquals(ConfigurationPolicy.REQUIRED, configurationTemplateDTO.policy);
@@ -257,7 +256,7 @@ public class TemplatesTests extends Base
{
ActivationTemplateDTO at = ct.activations.get(0);
- assertEquals(Maps.of("jaxrs.resource", true), at.properties);
+ assertEquals(Maps.of("osgi.jaxrs.resource", true), at.properties);
assertEquals(ServiceScope.SINGLETON, at.scope);
assertEquals(Arrays.asList(Baz.class.getName()), at.serviceClasses);
}
@@ -291,20 +290,11 @@ public class TemplatesTests extends Base
{ // configuration "osgi.cdi.foo"
ConfigurationTemplateDTO configurationTemplateDTO = ct.configurations.get(0);
- assertEquals(true, configurationTemplateDTO.componentConfiguration);
assertEquals(MaximumCardinality.ONE, configurationTemplateDTO.maximumCardinality);
assertEquals("osgi.cdi.foo", configurationTemplateDTO.pid);
assertEquals(ConfigurationPolicy.OPTIONAL, configurationTemplateDTO.policy);
}
- { // "foo.config
- ConfigurationTemplateDTO configurationTemplateDTO = ct.configurations.get(1);
- assertEquals(false, configurationTemplateDTO.componentConfiguration);
- assertEquals(MaximumCardinality.ONE, configurationTemplateDTO.maximumCardinality);
- assertEquals("foo.config", configurationTemplateDTO.pid);
- assertEquals(ConfigurationPolicy.REQUIRED, configurationTemplateDTO.policy);
- }
-
List<ReferenceTemplateDTO> references = TestUtil.sort(ct.references, (a, b) -> a.name.compareTo(b.name));
{
@@ -409,7 +399,6 @@ public class TemplatesTests extends Base
{ // configuration "foo.annotated"
ConfigurationTemplateDTO configurationTemplateDTO = ct.configurations.get(0);
- assertEquals(true, configurationTemplateDTO.componentConfiguration);
assertEquals(MaximumCardinality.ONE, configurationTemplateDTO.maximumCardinality);
assertEquals("foo.annotated", configurationTemplateDTO.pid);
assertEquals(ConfigurationPolicy.OPTIONAL, configurationTemplateDTO.policy);
Modified: aries/trunk/cdi/cdi-extender/src/test/java/org/apache/aries/cdi/container/test/beans/BarAnnotated.java
URL: http://svn.apache.org/viewvc/aries/trunk/cdi/cdi-extender/src/test/java/org/apache/aries/cdi/container/test/beans/BarAnnotated.java?rev=1832901&r1=1832900&r2=1832901&view=diff
==============================================================================
--- aries/trunk/cdi/cdi-extender/src/test/java/org/apache/aries/cdi/container/test/beans/BarAnnotated.java (original)
+++ aries/trunk/cdi/cdi-extender/src/test/java/org/apache/aries/cdi/container/test/beans/BarAnnotated.java Mon Jun 4 23:26:08 2018
@@ -24,45 +24,46 @@ import javax.inject.Provider;
import org.apache.aries.cdi.extra.propertytypes.JaxrsResource;
import org.osgi.framework.ServiceReference;
-import org.osgi.service.cdi.ConfigurationPolicy;
-import org.osgi.service.cdi.annotations.Configuration;
-import org.osgi.service.cdi.annotations.Greedy;
-import org.osgi.service.cdi.annotations.PID;
+import org.osgi.service.cdi.annotations.ComponentProperties;
import org.osgi.service.cdi.annotations.PrototypeRequired;
import org.osgi.service.cdi.annotations.Reference;
+import org.osgi.service.cdi.annotations.Reluctant;
import org.osgi.service.cdi.annotations.Service;
public class BarAnnotated {
@Inject
- @Greedy
@Reference
Foo foo;
@Inject
+ @Reluctant
@Reference
Optional<Foo> fooOptional;
@Inject
+ @Reluctant
@Reference
Provider<Collection<Foo>> dynamicFoos;
@Inject
+ @Reluctant
@Reference
Collection<Map.Entry<Map<String, Object>, Integer>> tupleIntegers;
@Inject
+ @Reluctant
@PrototypeRequired
@Reference
Collection<ServiceReference<Foo>> serviceReferencesFoos;
@Inject
+ @Reluctant
@Reference(Foo.class)
Collection<Map<String, Object>> propertiesFoos;
@Inject
- @PID(value = "foo.config", policy = ConfigurationPolicy.REQUIRED)
- @Configuration
+ @ComponentProperties
Config config;
@Produces
Modified: aries/trunk/cdi/cdi-extender/src/test/java/org/apache/aries/cdi/container/test/beans/BarBadlyAnnotated.java
URL: http://svn.apache.org/viewvc/aries/trunk/cdi/cdi-extender/src/test/java/org/apache/aries/cdi/container/test/beans/BarBadlyAnnotated.java?rev=1832901&r1=1832900&r2=1832901&view=diff
==============================================================================
--- aries/trunk/cdi/cdi-extender/src/test/java/org/apache/aries/cdi/container/test/beans/BarBadlyAnnotated.java (original)
+++ aries/trunk/cdi/cdi-extender/src/test/java/org/apache/aries/cdi/container/test/beans/BarBadlyAnnotated.java Mon Jun 4 23:26:08 2018
@@ -16,14 +16,14 @@ package org.apache.aries.cdi.container.t
import javax.inject.Inject;
-import org.osgi.service.cdi.annotations.Configuration;
+import org.osgi.service.cdi.annotations.ComponentProperties;
import org.osgi.service.cdi.annotations.Reference;
public class BarBadlyAnnotated {
@Inject
@Reference
- @Configuration
+ @ComponentProperties
Foo foo;
}
Modified: aries/trunk/cdi/cdi-extender/src/test/java/org/apache/aries/cdi/container/test/beans/BarProducer.java
URL: http://svn.apache.org/viewvc/aries/trunk/cdi/cdi-extender/src/test/java/org/apache/aries/cdi/container/test/beans/BarProducer.java?rev=1832901&r1=1832900&r2=1832901&view=diff
==============================================================================
--- aries/trunk/cdi/cdi-extender/src/test/java/org/apache/aries/cdi/container/test/beans/BarProducer.java (original)
+++ aries/trunk/cdi/cdi-extender/src/test/java/org/apache/aries/cdi/container/test/beans/BarProducer.java Mon Jun 4 23:26:08 2018
@@ -21,6 +21,7 @@ import java.math.BigDecimal;
import javax.enterprise.inject.Produces;
import org.osgi.service.cdi.annotations.Reference;
+import org.osgi.service.cdi.annotations.Reluctant;
import org.osgi.service.cdi.annotations.Service;
import org.osgi.service.cdi.annotations.ServiceInstance;
import org.osgi.service.cdi.propertytypes.ServiceRanking;
@@ -28,7 +29,7 @@ import org.osgi.service.cdi.propertytype
public class BarProducer {
@Produces
@Service
- public Bar getBar(@Reference Bar bar) {
+ public Bar getBar(@Reluctant @Reference Bar bar) {
return bar;
}
Modified: aries/trunk/cdi/cdi-extender/src/test/java/org/apache/aries/cdi/container/test/beans/BarWithConfig.java
URL: http://svn.apache.org/viewvc/aries/trunk/cdi/cdi-extender/src/test/java/org/apache/aries/cdi/container/test/beans/BarWithConfig.java?rev=1832901&r1=1832900&r2=1832901&view=diff
==============================================================================
--- aries/trunk/cdi/cdi-extender/src/test/java/org/apache/aries/cdi/container/test/beans/BarWithConfig.java (original)
+++ aries/trunk/cdi/cdi-extender/src/test/java/org/apache/aries/cdi/container/test/beans/BarWithConfig.java Mon Jun 4 23:26:08 2018
@@ -16,7 +16,7 @@ package org.apache.aries.cdi.container.t
import javax.inject.Inject;
-import org.osgi.service.cdi.annotations.Configuration;
+import org.osgi.service.cdi.annotations.ComponentProperties;
public class BarWithConfig {
@@ -24,7 +24,7 @@ public class BarWithConfig {
public Bar bar;
@Inject
- @Configuration
+ @ComponentProperties
public Config config;
}
Modified: aries/trunk/cdi/cdi-extender/src/test/java/org/apache/aries/cdi/container/test/beans/FieldFoo.java
URL: http://svn.apache.org/viewvc/aries/trunk/cdi/cdi-extender/src/test/java/org/apache/aries/cdi/container/test/beans/FieldFoo.java?rev=1832901&r1=1832900&r2=1832901&view=diff
==============================================================================
--- aries/trunk/cdi/cdi-extender/src/test/java/org/apache/aries/cdi/container/test/beans/FieldFoo.java (original)
+++ aries/trunk/cdi/cdi-extender/src/test/java/org/apache/aries/cdi/container/test/beans/FieldFoo.java Mon Jun 4 23:26:08 2018
@@ -17,9 +17,11 @@ package org.apache.aries.cdi.container.t
import javax.inject.Inject;
import org.osgi.service.cdi.annotations.Reference;
+import org.osgi.service.cdi.annotations.Reluctant;
public class FieldFoo {
@Inject
+ @Reluctant
@Reference
Foo foo;
}
\ No newline at end of file
Modified: aries/trunk/cdi/cdi-extender/src/test/java/org/apache/aries/cdi/container/test/beans/FieldListFoo.java
URL: http://svn.apache.org/viewvc/aries/trunk/cdi/cdi-extender/src/test/java/org/apache/aries/cdi/container/test/beans/FieldListFoo.java?rev=1832901&r1=1832900&r2=1832901&view=diff
==============================================================================
--- aries/trunk/cdi/cdi-extender/src/test/java/org/apache/aries/cdi/container/test/beans/FieldListFoo.java (original)
+++ aries/trunk/cdi/cdi-extender/src/test/java/org/apache/aries/cdi/container/test/beans/FieldListFoo.java Mon Jun 4 23:26:08 2018
@@ -19,9 +19,11 @@ import java.util.List;
import javax.inject.Inject;
import org.osgi.service.cdi.annotations.Reference;
+import org.osgi.service.cdi.annotations.Reluctant;
public class FieldListFoo {
@Inject
+ @Reluctant
@Reference
List<Foo> foo;
}
\ No newline at end of file
Modified: aries/trunk/cdi/cdi-extender/src/test/java/org/apache/aries/cdi/container/test/beans/FooAnnotated.java
URL: http://svn.apache.org/viewvc/aries/trunk/cdi/cdi-extender/src/test/java/org/apache/aries/cdi/container/test/beans/FooAnnotated.java?rev=1832901&r1=1832900&r2=1832901&view=diff
==============================================================================
--- aries/trunk/cdi/cdi-extender/src/test/java/org/apache/aries/cdi/container/test/beans/FooAnnotated.java (original)
+++ aries/trunk/cdi/cdi-extender/src/test/java/org/apache/aries/cdi/container/test/beans/FooAnnotated.java Mon Jun 4 23:26:08 2018
@@ -20,7 +20,7 @@ import javax.inject.Named;
import org.osgi.service.cdi.annotations.Service;
import org.osgi.service.cdi.annotations.SingleComponent;
import org.osgi.service.cdi.propertytypes.ServiceRanking;
-import org.osgi.service.cdi.reference.BindObject;
+import org.osgi.service.cdi.reference.BindService;
@SingleComponent
@Named("foo.annotated")
@@ -29,7 +29,7 @@ import org.osgi.service.cdi.reference.Bi
public class FooAnnotated implements Foo, Cloneable {
@Inject
- void watchFoos(BindObject<Integer> numbers) {
+ void watchFoos(BindService<Integer> numbers) {
numbers.adding(number -> System.out.println("Added: " + number)
).modified(number -> System.out.println("Updated: " + number)
).removed(number -> System.out.println("Removed: " + number)
Modified: aries/trunk/cdi/cdi-extender/src/test/java/org/apache/aries/cdi/container/test/beans/FooWithReferenceAndConfig.java
URL: http://svn.apache.org/viewvc/aries/trunk/cdi/cdi-extender/src/test/java/org/apache/aries/cdi/container/test/beans/FooWithReferenceAndConfig.java?rev=1832901&r1=1832900&r2=1832901&view=diff
==============================================================================
--- aries/trunk/cdi/cdi-extender/src/test/java/org/apache/aries/cdi/container/test/beans/FooWithReferenceAndConfig.java (original)
+++ aries/trunk/cdi/cdi-extender/src/test/java/org/apache/aries/cdi/container/test/beans/FooWithReferenceAndConfig.java Mon Jun 4 23:26:08 2018
@@ -16,16 +16,17 @@ package org.apache.aries.cdi.container.t
import javax.inject.Inject;
+import org.osgi.service.cdi.annotations.ComponentProperties;
import org.osgi.service.cdi.annotations.ComponentScoped;
-import org.osgi.service.cdi.annotations.Configuration;
import org.osgi.service.cdi.annotations.Reference;
-import org.osgi.service.cdi.reference.BindObject;
+import org.osgi.service.cdi.annotations.Reluctant;
+import org.osgi.service.cdi.reference.BindService;
@ComponentScoped
public class FooWithReferenceAndConfig {
@Inject
- void watchNumbers(BindObject<Integer> numbers) {
+ void watchNumbers(BindService<Integer> numbers) {
numbers.adding(number -> System.out.println("Added: " + number)
).modified(number -> System.out.println("Updated: " + number)
).removed(number -> System.out.println("Removed: " + number)
@@ -33,11 +34,12 @@ public class FooWithReferenceAndConfig {
}
@Inject
+ @Reluctant
@Reference
public Foo fooReference;
@Inject
- @Configuration
+ @ComponentProperties
public Config config;
}
Modified: aries/trunk/cdi/cdi-extender/src/test/java/org/apache/aries/cdi/container/test/beans/MethodBindFoo.java
URL: http://svn.apache.org/viewvc/aries/trunk/cdi/cdi-extender/src/test/java/org/apache/aries/cdi/container/test/beans/MethodBindFoo.java?rev=1832901&r1=1832900&r2=1832901&view=diff
==============================================================================
--- aries/trunk/cdi/cdi-extender/src/test/java/org/apache/aries/cdi/container/test/beans/MethodBindFoo.java (original)
+++ aries/trunk/cdi/cdi-extender/src/test/java/org/apache/aries/cdi/container/test/beans/MethodBindFoo.java Mon Jun 4 23:26:08 2018
@@ -17,8 +17,9 @@ package org.apache.aries.cdi.container.t
import javax.inject.Inject;
import org.osgi.service.cdi.annotations.Reference;
+import org.osgi.service.cdi.annotations.Reluctant;
public class MethodBindFoo {
@Inject
- public void bindFoo(@Reference Foo foo) {}
+ public void bindFoo(@Reluctant @Reference Foo foo) {}
}
\ No newline at end of file
Modified: aries/trunk/cdi/cdi-extender/src/test/java/org/apache/aries/cdi/container/test/beans/MethodBindFooNamed.java
URL: http://svn.apache.org/viewvc/aries/trunk/cdi/cdi-extender/src/test/java/org/apache/aries/cdi/container/test/beans/MethodBindFooNamed.java?rev=1832901&r1=1832900&r2=1832901&view=diff
==============================================================================
--- aries/trunk/cdi/cdi-extender/src/test/java/org/apache/aries/cdi/container/test/beans/MethodBindFooNamed.java (original)
+++ aries/trunk/cdi/cdi-extender/src/test/java/org/apache/aries/cdi/container/test/beans/MethodBindFooNamed.java Mon Jun 4 23:26:08 2018
@@ -18,8 +18,9 @@ import javax.inject.Inject;
import javax.inject.Named;
import org.osgi.service.cdi.annotations.Reference;
+import org.osgi.service.cdi.annotations.Reluctant;
public class MethodBindFooNamed {
@Inject
- public void bindFoo(@Reference @Named("_foo_") Foo foo) {}
+ public void bindFoo(@Reluctant @Reference @Named("_foo_") Foo foo) {}
}
\ No newline at end of file
Modified: aries/trunk/cdi/cdi-extender/src/test/java/org/apache/aries/cdi/container/test/beans/MethodSetFoo.java
URL: http://svn.apache.org/viewvc/aries/trunk/cdi/cdi-extender/src/test/java/org/apache/aries/cdi/container/test/beans/MethodSetFoo.java?rev=1832901&r1=1832900&r2=1832901&view=diff
==============================================================================
--- aries/trunk/cdi/cdi-extender/src/test/java/org/apache/aries/cdi/container/test/beans/MethodSetFoo.java (original)
+++ aries/trunk/cdi/cdi-extender/src/test/java/org/apache/aries/cdi/container/test/beans/MethodSetFoo.java Mon Jun 4 23:26:08 2018
@@ -17,8 +17,9 @@ package org.apache.aries.cdi.container.t
import javax.inject.Inject;
import org.osgi.service.cdi.annotations.Reference;
+import org.osgi.service.cdi.annotations.Reluctant;
public class MethodSetFoo {
@Inject
- public void setFoo(@Reference Foo foo) {}
+ public void setFoo(@Reluctant @Reference Foo foo) {}
}
\ No newline at end of file
Modified: aries/trunk/cdi/cdi-extender/src/test/java/org/apache/aries/cdi/container/test/beans/ObserverFoo.java
URL: http://svn.apache.org/viewvc/aries/trunk/cdi/cdi-extender/src/test/java/org/apache/aries/cdi/container/test/beans/ObserverFoo.java?rev=1832901&r1=1832900&r2=1832901&view=diff
==============================================================================
--- aries/trunk/cdi/cdi-extender/src/test/java/org/apache/aries/cdi/container/test/beans/ObserverFoo.java (original)
+++ aries/trunk/cdi/cdi-extender/src/test/java/org/apache/aries/cdi/container/test/beans/ObserverFoo.java Mon Jun 4 23:26:08 2018
@@ -21,7 +21,7 @@ import javax.enterprise.context.Applicat
import javax.enterprise.inject.spi.EventMetadata;
import javax.inject.Inject;
-import org.osgi.service.cdi.reference.BindObject;
+import org.osgi.service.cdi.reference.BindService;
@ApplicationScoped
public class ObserverFoo {
@@ -31,8 +31,7 @@ public class ObserverFoo {
}
@Inject
- void foos(BindObject<Foo> event, EventMetadata eventMetadata) {
-
+ void foos(BindService<Foo> event, EventMetadata eventMetadata) {
event.adding(
foo -> {
System.out.printf("Adding %s, %s%n", foo, eventMetadata);
Modified: aries/trunk/cdi/cdi-extender/src/test/java/org/apache/aries/cdi/container/test/beans/Reference_D_R_M_U_Service.java
URL: http://svn.apache.org/viewvc/aries/trunk/cdi/cdi-extender/src/test/java/org/apache/aries/cdi/container/test/beans/Reference_D_R_M_U_Service.java?rev=1832901&r1=1832900&r2=1832901&view=diff
==============================================================================
--- aries/trunk/cdi/cdi-extender/src/test/java/org/apache/aries/cdi/container/test/beans/Reference_D_R_M_U_Service.java (original)
+++ aries/trunk/cdi/cdi-extender/src/test/java/org/apache/aries/cdi/container/test/beans/Reference_D_R_M_U_Service.java Mon Jun 4 23:26:08 2018
@@ -19,11 +19,13 @@ import javax.inject.Inject;
import javax.inject.Provider;
import org.osgi.service.cdi.annotations.Reference;
+import org.osgi.service.cdi.annotations.Reluctant;
import org.osgi.service.log.Logger;
// dynamic, reluctant, mandatory, unary
public class Reference_D_R_M_U_Service {
@Inject
+ @Reluctant
@Reference
Provider<Foo> foo;
Modified: aries/trunk/cdi/cdi-extender/src/test/java/org/apache/aries/cdi/container/test/beans/Reference_S_R_M_U_Service.java
URL: http://svn.apache.org/viewvc/aries/trunk/cdi/cdi-extender/src/test/java/org/apache/aries/cdi/container/test/beans/Reference_S_R_M_U_Service.java?rev=1832901&r1=1832900&r2=1832901&view=diff
==============================================================================
--- aries/trunk/cdi/cdi-extender/src/test/java/org/apache/aries/cdi/container/test/beans/Reference_S_R_M_U_Service.java (original)
+++ aries/trunk/cdi/cdi-extender/src/test/java/org/apache/aries/cdi/container/test/beans/Reference_S_R_M_U_Service.java Mon Jun 4 23:26:08 2018
@@ -17,11 +17,13 @@ package org.apache.aries.cdi.container.t
import javax.inject.Inject;
import org.osgi.service.cdi.annotations.Reference;
+import org.osgi.service.cdi.annotations.Reluctant;
import org.osgi.service.log.Logger;
// static, reluctant, mandatory, unary
public class Reference_S_R_M_U_Service {
@Inject
+ @Reluctant
@Reference
Foo foo;
Modified: aries/trunk/cdi/cdi-extender/src/test/java/org/apache/aries/cdi/container/test/beans/ctordynamicgreedy/CtorCollectionFoo.java
URL: http://svn.apache.org/viewvc/aries/trunk/cdi/cdi-extender/src/test/java/org/apache/aries/cdi/container/test/beans/ctordynamicgreedy/CtorCollectionFoo.java?rev=1832901&r1=1832900&r2=1832901&view=diff
==============================================================================
--- aries/trunk/cdi/cdi-extender/src/test/java/org/apache/aries/cdi/container/test/beans/ctordynamicgreedy/CtorCollectionFoo.java (original)
+++ aries/trunk/cdi/cdi-extender/src/test/java/org/apache/aries/cdi/container/test/beans/ctordynamicgreedy/CtorCollectionFoo.java Mon Jun 4 23:26:08 2018
@@ -20,10 +20,9 @@ import javax.inject.Inject;
import javax.inject.Provider;
import org.apache.aries.cdi.container.test.beans.Foo;
-import org.osgi.service.cdi.annotations.Greedy;
import org.osgi.service.cdi.annotations.Reference;
public class CtorCollectionFoo {
@Inject
- public CtorCollectionFoo(@Greedy @Reference Provider<Collection<Foo>> foos) {}
+ public CtorCollectionFoo(@Reference Provider<Collection<Foo>> foos) {}
}
\ No newline at end of file
Modified: aries/trunk/cdi/cdi-extender/src/test/java/org/apache/aries/cdi/container/test/beans/ctordynamicgreedy/CtorFoo.java
URL: http://svn.apache.org/viewvc/aries/trunk/cdi/cdi-extender/src/test/java/org/apache/aries/cdi/container/test/beans/ctordynamicgreedy/CtorFoo.java?rev=1832901&r1=1832900&r2=1832901&view=diff
==============================================================================
--- aries/trunk/cdi/cdi-extender/src/test/java/org/apache/aries/cdi/container/test/beans/ctordynamicgreedy/CtorFoo.java (original)
+++ aries/trunk/cdi/cdi-extender/src/test/java/org/apache/aries/cdi/container/test/beans/ctordynamicgreedy/CtorFoo.java Mon Jun 4 23:26:08 2018
@@ -18,10 +18,9 @@ import javax.inject.Inject;
import javax.inject.Provider;
import org.apache.aries.cdi.container.test.beans.Foo;
-import org.osgi.service.cdi.annotations.Greedy;
import org.osgi.service.cdi.annotations.Reference;
public class CtorFoo {
@Inject
- public CtorFoo(@Greedy @Reference Provider<Foo> foo) {}
+ public CtorFoo(@Reference Provider<Foo> foo) {}
}
\ No newline at end of file
Modified: aries/trunk/cdi/cdi-extender/src/test/java/org/apache/aries/cdi/container/test/beans/ctordynamicgreedy/CtorFooBar.java
URL: http://svn.apache.org/viewvc/aries/trunk/cdi/cdi-extender/src/test/java/org/apache/aries/cdi/container/test/beans/ctordynamicgreedy/CtorFooBar.java?rev=1832901&r1=1832900&r2=1832901&view=diff
==============================================================================
--- aries/trunk/cdi/cdi-extender/src/test/java/org/apache/aries/cdi/container/test/beans/ctordynamicgreedy/CtorFooBar.java (original)
+++ aries/trunk/cdi/cdi-extender/src/test/java/org/apache/aries/cdi/container/test/beans/ctordynamicgreedy/CtorFooBar.java Mon Jun 4 23:26:08 2018
@@ -19,10 +19,9 @@ import javax.inject.Provider;
import org.apache.aries.cdi.container.test.beans.Bar;
import org.apache.aries.cdi.container.test.beans.Foo;
-import org.osgi.service.cdi.annotations.Greedy;
import org.osgi.service.cdi.annotations.Reference;
public class CtorFooBar {
@Inject
- public CtorFooBar(@Greedy @Reference Provider<Foo> foo, @Greedy @Reference Provider<Bar> bar) {}
+ public CtorFooBar(@Reference Provider<Foo> foo, @Reference Provider<Bar> bar) {}
}
\ No newline at end of file
Modified: aries/trunk/cdi/cdi-extender/src/test/java/org/apache/aries/cdi/container/test/beans/ctordynamicgreedy/CtorFooFoo.java
URL: http://svn.apache.org/viewvc/aries/trunk/cdi/cdi-extender/src/test/java/org/apache/aries/cdi/container/test/beans/ctordynamicgreedy/CtorFooFoo.java?rev=1832901&r1=1832900&r2=1832901&view=diff
==============================================================================
--- aries/trunk/cdi/cdi-extender/src/test/java/org/apache/aries/cdi/container/test/beans/ctordynamicgreedy/CtorFooFoo.java (original)
+++ aries/trunk/cdi/cdi-extender/src/test/java/org/apache/aries/cdi/container/test/beans/ctordynamicgreedy/CtorFooFoo.java Mon Jun 4 23:26:08 2018
@@ -18,10 +18,9 @@ import javax.inject.Inject;
import javax.inject.Provider;
import org.apache.aries.cdi.container.test.beans.Foo;
-import org.osgi.service.cdi.annotations.Greedy;
import org.osgi.service.cdi.annotations.Reference;
public class CtorFooFoo {
@Inject
- public CtorFooFoo(@Greedy @Reference Provider<Foo> foo_a, @Greedy @Reference Provider<Foo> foo_b) {}
+ public CtorFooFoo(@Reference Provider<Foo> foo_a, @Reference Provider<Foo> foo_b) {}
}
\ No newline at end of file
Modified: aries/trunk/cdi/cdi-extender/src/test/java/org/apache/aries/cdi/container/test/beans/ctordynamicgreedy/CtorFooFooNamed.java
URL: http://svn.apache.org/viewvc/aries/trunk/cdi/cdi-extender/src/test/java/org/apache/aries/cdi/container/test/beans/ctordynamicgreedy/CtorFooFooNamed.java?rev=1832901&r1=1832900&r2=1832901&view=diff
==============================================================================
--- aries/trunk/cdi/cdi-extender/src/test/java/org/apache/aries/cdi/container/test/beans/ctordynamicgreedy/CtorFooFooNamed.java (original)
+++ aries/trunk/cdi/cdi-extender/src/test/java/org/apache/aries/cdi/container/test/beans/ctordynamicgreedy/CtorFooFooNamed.java Mon Jun 4 23:26:08 2018
@@ -19,12 +19,11 @@ import javax.inject.Named;
import javax.inject.Provider;
import org.apache.aries.cdi.container.test.beans.Foo;
-import org.osgi.service.cdi.annotations.Greedy;
import org.osgi.service.cdi.annotations.Reference;
public class CtorFooFooNamed {
@Inject
public CtorFooFooNamed(
- @Greedy @Reference @Named("foo_a") Provider<Foo> foo_a,
- @Greedy @Reference @Named("foo_b") Provider<Foo> foo_b) {}
+ @Reference @Named("foo_a") Provider<Foo> foo_a,
+ @Reference @Named("foo_b") Provider<Foo> foo_b) {}
}
\ No newline at end of file
Modified: aries/trunk/cdi/cdi-extender/src/test/java/org/apache/aries/cdi/container/test/beans/ctordynamicgreedy/CtorFooNamed.java
URL: http://svn.apache.org/viewvc/aries/trunk/cdi/cdi-extender/src/test/java/org/apache/aries/cdi/container/test/beans/ctordynamicgreedy/CtorFooNamed.java?rev=1832901&r1=1832900&r2=1832901&view=diff
==============================================================================
--- aries/trunk/cdi/cdi-extender/src/test/java/org/apache/aries/cdi/container/test/beans/ctordynamicgreedy/CtorFooNamed.java (original)
+++ aries/trunk/cdi/cdi-extender/src/test/java/org/apache/aries/cdi/container/test/beans/ctordynamicgreedy/CtorFooNamed.java Mon Jun 4 23:26:08 2018
@@ -19,10 +19,9 @@ import javax.inject.Named;
import javax.inject.Provider;
import org.apache.aries.cdi.container.test.beans.Foo;
-import org.osgi.service.cdi.annotations.Greedy;
import org.osgi.service.cdi.annotations.Reference;
public class CtorFooNamed {
@Inject
- public CtorFooNamed(@Greedy @Reference @Named("_foo_") Provider<Foo> foo) {}
+ public CtorFooNamed(@Reference @Named("_foo_") Provider<Foo> foo) {}
}
\ No newline at end of file
Modified: aries/trunk/cdi/cdi-extender/src/test/java/org/apache/aries/cdi/container/test/beans/ctordynamicgreedy/CtorFooOptional.java
URL: http://svn.apache.org/viewvc/aries/trunk/cdi/cdi-extender/src/test/java/org/apache/aries/cdi/container/test/beans/ctordynamicgreedy/CtorFooOptional.java?rev=1832901&r1=1832900&r2=1832901&view=diff
==============================================================================
--- aries/trunk/cdi/cdi-extender/src/test/java/org/apache/aries/cdi/container/test/beans/ctordynamicgreedy/CtorFooOptional.java (original)
+++ aries/trunk/cdi/cdi-extender/src/test/java/org/apache/aries/cdi/container/test/beans/ctordynamicgreedy/CtorFooOptional.java Mon Jun 4 23:26:08 2018
@@ -20,10 +20,9 @@ import javax.inject.Inject;
import javax.inject.Provider;
import org.apache.aries.cdi.container.test.beans.Foo;
-import org.osgi.service.cdi.annotations.Greedy;
import org.osgi.service.cdi.annotations.Reference;
public class CtorFooOptional {
@Inject
- public CtorFooOptional(@Greedy @Reference Provider<Optional<Foo>> foo) {}
+ public CtorFooOptional(@Reference Provider<Optional<Foo>> foo) {}
}
\ No newline at end of file
Modified: aries/trunk/cdi/cdi-extender/src/test/java/org/apache/aries/cdi/container/test/beans/ctordynamicgreedy/CtorListFoo.java
URL: http://svn.apache.org/viewvc/aries/trunk/cdi/cdi-extender/src/test/java/org/apache/aries/cdi/container/test/beans/ctordynamicgreedy/CtorListFoo.java?rev=1832901&r1=1832900&r2=1832901&view=diff
==============================================================================
--- aries/trunk/cdi/cdi-extender/src/test/java/org/apache/aries/cdi/container/test/beans/ctordynamicgreedy/CtorListFoo.java (original)
+++ aries/trunk/cdi/cdi-extender/src/test/java/org/apache/aries/cdi/container/test/beans/ctordynamicgreedy/CtorListFoo.java Mon Jun 4 23:26:08 2018
@@ -20,10 +20,9 @@ import javax.inject.Inject;
import javax.inject.Provider;
import org.apache.aries.cdi.container.test.beans.Foo;
-import org.osgi.service.cdi.annotations.Greedy;
import org.osgi.service.cdi.annotations.Reference;
public class CtorListFoo {
@Inject
- public CtorListFoo(@Greedy @Reference Provider<List<Foo>> foos) {}
+ public CtorListFoo(@Reference Provider<List<Foo>> foos) {}
}
\ No newline at end of file
Modified: aries/trunk/cdi/cdi-extender/src/test/java/org/apache/aries/cdi/container/test/beans/ctordynamicreluctant/CtorCollectionFoo.java
URL: http://svn.apache.org/viewvc/aries/trunk/cdi/cdi-extender/src/test/java/org/apache/aries/cdi/container/test/beans/ctordynamicreluctant/CtorCollectionFoo.java?rev=1832901&r1=1832900&r2=1832901&view=diff
==============================================================================
--- aries/trunk/cdi/cdi-extender/src/test/java/org/apache/aries/cdi/container/test/beans/ctordynamicreluctant/CtorCollectionFoo.java (original)
+++ aries/trunk/cdi/cdi-extender/src/test/java/org/apache/aries/cdi/container/test/beans/ctordynamicreluctant/CtorCollectionFoo.java Mon Jun 4 23:26:08 2018
@@ -21,8 +21,9 @@ import javax.inject.Provider;
import org.apache.aries.cdi.container.test.beans.Foo;
import org.osgi.service.cdi.annotations.Reference;
+import org.osgi.service.cdi.annotations.Reluctant;
public class CtorCollectionFoo {
@Inject
- public CtorCollectionFoo(@Reference Provider<Collection<Foo>> foos) {}
+ public CtorCollectionFoo(@Reluctant @Reference Provider<Collection<Foo>> foos) {}
}
\ No newline at end of file
Modified: aries/trunk/cdi/cdi-extender/src/test/java/org/apache/aries/cdi/container/test/beans/ctordynamicreluctant/CtorFoo.java
URL: http://svn.apache.org/viewvc/aries/trunk/cdi/cdi-extender/src/test/java/org/apache/aries/cdi/container/test/beans/ctordynamicreluctant/CtorFoo.java?rev=1832901&r1=1832900&r2=1832901&view=diff
==============================================================================
--- aries/trunk/cdi/cdi-extender/src/test/java/org/apache/aries/cdi/container/test/beans/ctordynamicreluctant/CtorFoo.java (original)
+++ aries/trunk/cdi/cdi-extender/src/test/java/org/apache/aries/cdi/container/test/beans/ctordynamicreluctant/CtorFoo.java Mon Jun 4 23:26:08 2018
@@ -19,8 +19,9 @@ import javax.inject.Provider;
import org.apache.aries.cdi.container.test.beans.Foo;
import org.osgi.service.cdi.annotations.Reference;
+import org.osgi.service.cdi.annotations.Reluctant;
public class CtorFoo {
@Inject
- public CtorFoo(@Reference Provider<Foo> foo) {}
+ public CtorFoo(@Reluctant @Reference Provider<Foo> foo) {}
}
\ No newline at end of file
Modified: aries/trunk/cdi/cdi-extender/src/test/java/org/apache/aries/cdi/container/test/beans/ctordynamicreluctant/CtorFooBar.java
URL: http://svn.apache.org/viewvc/aries/trunk/cdi/cdi-extender/src/test/java/org/apache/aries/cdi/container/test/beans/ctordynamicreluctant/CtorFooBar.java?rev=1832901&r1=1832900&r2=1832901&view=diff
==============================================================================
--- aries/trunk/cdi/cdi-extender/src/test/java/org/apache/aries/cdi/container/test/beans/ctordynamicreluctant/CtorFooBar.java (original)
+++ aries/trunk/cdi/cdi-extender/src/test/java/org/apache/aries/cdi/container/test/beans/ctordynamicreluctant/CtorFooBar.java Mon Jun 4 23:26:08 2018
@@ -20,8 +20,9 @@ import javax.inject.Provider;
import org.apache.aries.cdi.container.test.beans.Bar;
import org.apache.aries.cdi.container.test.beans.Foo;
import org.osgi.service.cdi.annotations.Reference;
+import org.osgi.service.cdi.annotations.Reluctant;
public class CtorFooBar {
@Inject
- public CtorFooBar(@Reference Provider<Foo> foo, @Reference Provider<Bar> bar) {}
+ public CtorFooBar(@Reluctant @Reference Provider<Foo> foo, @Reluctant @Reference Provider<Bar> bar) {}
}
\ No newline at end of file