Author: pderop
Date: Thu Feb 18 21:07:16 2016
New Revision: 1731147
URL: http://svn.apache.org/viewvc?rev=1731147&view=rev
Log:
Applied feedbacks that Jan Willem sent to me about the new dm-lambda library:
- renamed the DependencyManagerActivator.activate() method to
init(BundleContext ctx, DependencyManager dm)
- Removed abbreviated names like "cb()" or "cbi" methods, and replaced them
with niced method names like "add()/changed()/removed()" ...
- Added a system property
"org.apache.felix.dependencymanager.lambda.dependencymode" that allows to
control the default
mode of dependency (still to be discussed).
- added full support or new configuration types.
Added:
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda.samples/src/org/apache/felix/dm/lambda/samples/compositefactory/MyConfig.java
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda.samples/src/org/apache/felix/dm/lambda/samples/hello/Configuration.java
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda/src/org/apache/felix/dm/lambda/callbacks/Cb.java
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda/src/org/apache/felix/dm/lambda/callbacks/CbBundleComponent.java
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda/src/org/apache/felix/dm/lambda/callbacks/CbConfiguration.java
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda/src/org/apache/felix/dm/lambda/callbacks/CbConfigurationComponent.java
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda/src/org/apache/felix/dm/lambda/callbacks/CbDictionaryComponent.java
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda/src/org/apache/felix/dm/lambda/callbacks/CbRefServiceRefServiceComponent.java
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda/src/org/apache/felix/dm/lambda/callbacks/CbServiceComponent.java
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda/src/org/apache/felix/dm/lambda/callbacks/CbServiceComponentRef.java
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda/src/org/apache/felix/dm/lambda/callbacks/CbServiceRef.java
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda/src/org/apache/felix/dm/lambda/callbacks/CbServiceServiceComponent.java
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda/src/org/apache/felix/dm/lambda/callbacks/InstanceCb.java
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda/src/org/apache/felix/dm/lambda/callbacks/InstanceCbBundle.java
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda/src/org/apache/felix/dm/lambda/callbacks/InstanceCbBundleComponent.java
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda/src/org/apache/felix/dm/lambda/callbacks/InstanceCbComponent.java
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda/src/org/apache/felix/dm/lambda/callbacks/InstanceCbConfiguration.java
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda/src/org/apache/felix/dm/lambda/callbacks/InstanceCbConfigurationComponent.java
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda/src/org/apache/felix/dm/lambda/callbacks/InstanceCbDictionary.java
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda/src/org/apache/felix/dm/lambda/callbacks/InstanceCbDictionaryComponent.java
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda/src/org/apache/felix/dm/lambda/callbacks/InstanceCbFuture.java
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda/src/org/apache/felix/dm/lambda/callbacks/InstanceCbRefServiceRefService.java
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda/src/org/apache/felix/dm/lambda/callbacks/InstanceCbRefServiceRefServiceComponent.java
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda/src/org/apache/felix/dm/lambda/callbacks/InstanceCbService.java
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda/src/org/apache/felix/dm/lambda/callbacks/InstanceCbServiceComponent.java
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda/src/org/apache/felix/dm/lambda/callbacks/InstanceCbServiceComponentRef.java
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda/src/org/apache/felix/dm/lambda/callbacks/InstanceCbServiceDict.java
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda/src/org/apache/felix/dm/lambda/callbacks/InstanceCbServiceMap.java
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda/src/org/apache/felix/dm/lambda/callbacks/InstanceCbServiceRef.java
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda/src/org/apache/felix/dm/lambda/callbacks/InstanceCbServiceService.java
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda/src/org/apache/felix/dm/lambda/callbacks/InstanceCbServiceServiceComponent.java
Removed:
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda/src/org/apache/felix/dm/lambda/callbacks/CbComponentBundle.java
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda/src/org/apache/felix/dm/lambda/callbacks/CbComponentDictionary.java
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda/src/org/apache/felix/dm/lambda/callbacks/CbComponentRef.java
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda/src/org/apache/felix/dm/lambda/callbacks/CbComponentRefService.java
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda/src/org/apache/felix/dm/lambda/callbacks/CbComponentRefServiceRefService.java
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda/src/org/apache/felix/dm/lambda/callbacks/CbComponentService.java
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda/src/org/apache/felix/dm/lambda/callbacks/CbComponentServiceService.java
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda/src/org/apache/felix/dm/lambda/callbacks/CbConsumer.java
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda/src/org/apache/felix/dm/lambda/callbacks/CbRef.java
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda/src/org/apache/felix/dm/lambda/callbacks/CbRefService.java
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda/src/org/apache/felix/dm/lambda/callbacks/CbTypeBundle.java
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda/src/org/apache/felix/dm/lambda/callbacks/CbTypeComponent.java
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda/src/org/apache/felix/dm/lambda/callbacks/CbTypeComponentBundle.java
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda/src/org/apache/felix/dm/lambda/callbacks/CbTypeComponentDictionary.java
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda/src/org/apache/felix/dm/lambda/callbacks/CbTypeComponentRef.java
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda/src/org/apache/felix/dm/lambda/callbacks/CbTypeComponentRefService.java
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda/src/org/apache/felix/dm/lambda/callbacks/CbTypeComponentRefServiceRefService.java
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda/src/org/apache/felix/dm/lambda/callbacks/CbTypeComponentService.java
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda/src/org/apache/felix/dm/lambda/callbacks/CbTypeComponentServiceDict.java
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda/src/org/apache/felix/dm/lambda/callbacks/CbTypeComponentServiceMap.java
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda/src/org/apache/felix/dm/lambda/callbacks/CbTypeComponentServiceService.java
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda/src/org/apache/felix/dm/lambda/callbacks/CbTypeDictionary.java
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda/src/org/apache/felix/dm/lambda/callbacks/CbTypeFuture.java
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda/src/org/apache/felix/dm/lambda/callbacks/CbTypeRef.java
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda/src/org/apache/felix/dm/lambda/callbacks/CbTypeRefService.java
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda/src/org/apache/felix/dm/lambda/callbacks/CbTypeRefServiceRefService.java
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda/src/org/apache/felix/dm/lambda/callbacks/CbTypeService.java
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda/src/org/apache/felix/dm/lambda/callbacks/CbTypeServiceDict.java
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda/src/org/apache/felix/dm/lambda/callbacks/CbTypeServiceMap.java
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda/src/org/apache/felix/dm/lambda/callbacks/CbTypeServiceService.java
Modified:
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/lambda/itest/AbstractServiceDependencyTest.java
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/lambda/itest/AdapterAndConsumerTest.java
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/lambda/itest/AdapterNoAutoConfigIfInstanceCallbackIsUsed.java
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/lambda/itest/AdapterWithCallbackInstanceTest.java
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/lambda/itest/AdapterWithExtraDependenciesTest.java
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/lambda/itest/AdapterWithInstanceBoundDependencyTest.java
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/lambda/itest/AdapterWithModifiedInstanceBoundDependencyTest.java
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/lambda/itest/AdapterWithPropagationTest.java
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/lambda/itest/AdapterWithoutPropagationTest.java
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/lambda/itest/AspectBaseTest.java
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/lambda/itest/AspectChainTest.java
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/lambda/itest/AspectDynamicsTest.java
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/lambda/itest/AspectServiceDependencyTest.java
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/lambda/itest/AspectServiceDependencyWithSwapCallbackTest.java
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/lambda/itest/AspectWhiteboardTest.java
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/lambda/itest/AspectWithCallbacksServiceDependencyTest.java
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/lambda/itest/AspectWithPropagationTest.java
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/lambda/itest/AutoConfigTest.java
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/lambda/itest/BundleAdapterTest.java
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/lambda/itest/BundleAdapterWithCallbacksNotAutoConfiguredTest.java
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/lambda/itest/BundleDependencyTest.java
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/lambda/itest/ComponentTest.java
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/lambda/itest/CompositionTest.java
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/lambda/itest/DynamicProxyAspectTest.java
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/lambda/itest/FactoryConfigurationAdapterTest.java
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/lambda/itest/FactoryInjectedWithConfigurationBeforeTheCreateMethod.java
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/lambda/itest/InstanceBoundDependencyTest.java
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/lambda/itest/ModifiedBundleDependencyTest.java
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/lambda/itest/MultipleExtraDependenciesTest.java
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/lambda/itest/MultipleExtraDependencyTest.java
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/lambda/itest/MultipleExtraDependencyTest2.java
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/lambda/itest/MultipleServiceDependencyTest.java
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/lambda/itest/RemovedDependencyTest.java
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/lambda/itest/ResourceProvider.java
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/lambda/itest/ServiceDependencyCallbackSignaturesTest.java
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/lambda/itest/ServiceDependencyInjectionTest.java
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/lambda/itest/ServiceDependencyPropagateTest.java
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/lambda/itest/ServiceDependencyTest.java
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/lambda/itest/ServiceDependencyThroughCallbackInstanceTest.java
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/lambda/itest/ServiceUpdateTest.java
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/lambda/itest/TemporalServiceDependencyTest.java
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda.samples/src/org/apache/felix/dm/lambda/samples/compositefactory/Activator.java
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda.samples/src/org/apache/felix/dm/lambda/samples/compositefactory/Configurator.java
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda.samples/src/org/apache/felix/dm/lambda/samples/compositefactory/ProviderComposite1.java
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda.samples/src/org/apache/felix/dm/lambda/samples/compositefactory/ProviderComposite2.java
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda.samples/src/org/apache/felix/dm/lambda/samples/compositefactory/ProviderFactory.java
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda.samples/src/org/apache/felix/dm/lambda/samples/compositefactory/ProviderImpl.java
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda.samples/src/org/apache/felix/dm/lambda/samples/device/Activator.java
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda.samples/src/org/apache/felix/dm/lambda/samples/device/DeviceAccessConsumer.java
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda.samples/src/org/apache/felix/dm/lambda/samples/device/DeviceAccessImpl.java
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda.samples/src/org/apache/felix/dm/lambda/samples/device/DeviceImpl.java
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda.samples/src/org/apache/felix/dm/lambda/samples/device/DeviceParameterImpl.java
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda.samples/src/org/apache/felix/dm/lambda/samples/dictionary/Activator.java
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda.samples/src/org/apache/felix/dm/lambda/samples/dictionary/DictionaryAspect.java
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda.samples/src/org/apache/felix/dm/lambda/samples/dictionary/DictionaryImpl.java
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda.samples/src/org/apache/felix/dm/lambda/samples/factory/Activator.java
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda.samples/src/org/apache/felix/dm/lambda/samples/factory/ProviderImpl.java
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda.samples/src/org/apache/felix/dm/lambda/samples/future/Activator.java
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda.samples/src/org/apache/felix/dm/lambda/samples/future/PageLinksImpl.java
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda.samples/src/org/apache/felix/dm/lambda/samples/hello/Activator.java
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda.samples/src/org/apache/felix/dm/lambda/samples/hello/Configurator.java
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda.samples/src/org/apache/felix/dm/lambda/samples/hello/ServiceConsumer.java
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda.samples/src/org/apache/felix/dm/lambda/samples/hello/ServiceProviderImpl.java
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda/src/org/apache/felix/dm/lambda/BundleAdapterBuilder.java
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda/src/org/apache/felix/dm/lambda/BundleDependencyBuilder.java
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda/src/org/apache/felix/dm/lambda/ComponentBuilder.java
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda/src/org/apache/felix/dm/lambda/ConfigurationDependencyBuilder.java
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda/src/org/apache/felix/dm/lambda/DependencyManagerActivator.java
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda/src/org/apache/felix/dm/lambda/FactoryPidAdapterBuilder.java
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda/src/org/apache/felix/dm/lambda/FluentProperty.java
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda/src/org/apache/felix/dm/lambda/FutureDependencyBuilder.java
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda/src/org/apache/felix/dm/lambda/ServiceAdapterBuilder.java
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda/src/org/apache/felix/dm/lambda/ServiceAspectBuilder.java
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda/src/org/apache/felix/dm/lambda/ServiceCallbacksBuilder.java
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda/src/org/apache/felix/dm/lambda/ServiceDependencyBuilder.java
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda/src/org/apache/felix/dm/lambda/callbacks/CbBundle.java
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda/src/org/apache/felix/dm/lambda/callbacks/CbComponent.java
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda/src/org/apache/felix/dm/lambda/callbacks/CbDictionary.java
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda/src/org/apache/felix/dm/lambda/callbacks/CbFuture.java
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda/src/org/apache/felix/dm/lambda/callbacks/CbRefServiceRefService.java
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda/src/org/apache/felix/dm/lambda/callbacks/CbService.java
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda/src/org/apache/felix/dm/lambda/callbacks/CbServiceDict.java
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda/src/org/apache/felix/dm/lambda/callbacks/CbServiceMap.java
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda/src/org/apache/felix/dm/lambda/callbacks/CbServiceService.java
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda/src/org/apache/felix/dm/lambda/impl/AdapterBase.java
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda/src/org/apache/felix/dm/lambda/impl/BundleAdapterBuilderImpl.java
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda/src/org/apache/felix/dm/lambda/impl/BundleDependencyBuilderImpl.java
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda/src/org/apache/felix/dm/lambda/impl/CompletableFutureDependencyImpl.java
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda/src/org/apache/felix/dm/lambda/impl/ComponentBuilderImpl.java
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda/src/org/apache/felix/dm/lambda/impl/ConfigurationDependencyBuilderImpl.java
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda/src/org/apache/felix/dm/lambda/impl/FactoryPidAdapterBuilderImpl.java
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda/src/org/apache/felix/dm/lambda/impl/Helpers.java
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda/src/org/apache/felix/dm/lambda/impl/ServiceCallbacksBuilderImpl.java
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda/src/org/apache/felix/dm/lambda/impl/ServiceDependencyBuilderImpl.java
Modified:
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/lambda/itest/AbstractServiceDependencyTest.java
URL:
http://svn.apache.org/viewvc/felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/lambda/itest/AbstractServiceDependencyTest.java?rev=1731147&r1=1731146&r2=1731147&view=diff
==============================================================================
---
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/lambda/itest/AbstractServiceDependencyTest.java
(original)
+++
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/lambda/itest/AbstractServiceDependencyTest.java
Thu Feb 18 21:07:16 2016
@@ -37,7 +37,7 @@ public class AbstractServiceDependencyTe
Component sp =
component(m).provides(ServiceAbstract.class).impl(new
ServiceProvider(e)).build();
Component sc =
- component(m).impl(new
ServiceConsumer(e)).withSrv(ServiceAbstract.class, srv ->
srv.cb(ServiceConsumer::bind, ServiceConsumer::unbind)).build();
+ component(m).impl(new
ServiceConsumer(e)).withSvc(ServiceAbstract.class, srv ->
srv.add(ServiceConsumer::bind).remove(ServiceConsumer::unbind)).build();
m.add(sp);
m.add(sc);
Modified:
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/lambda/itest/AdapterAndConsumerTest.java
URL:
http://svn.apache.org/viewvc/felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/lambda/itest/AdapterAndConsumerTest.java?rev=1731147&r1=1731146&r2=1731147&view=diff
==============================================================================
---
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/lambda/itest/AdapterAndConsumerTest.java
(original)
+++
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/lambda/itest/AdapterAndConsumerTest.java
Thu Feb 18 21:07:16 2016
@@ -35,7 +35,7 @@ public class AdapterAndConsumerTest exte
Ensure e = new Ensure();
Component provider =
component(m).provides(OriginalService.class).impl(new
ServiceProvider(e)).build();
- Component consumer = component(m).impl(new
ServiceConsumer(e)).withSrv(AdaptedService.class).build();
+ Component consumer = component(m).impl(new
ServiceConsumer(e)).withSvc(AdaptedService.class).build();
Component adapter = adapter(m,
OriginalService.class).provides(AdaptedService.class).impl(ServiceAdapter.class).build();
// add the provider and the adapter
Modified:
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/lambda/itest/AdapterNoAutoConfigIfInstanceCallbackIsUsed.java
URL:
http://svn.apache.org/viewvc/felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/lambda/itest/AdapterNoAutoConfigIfInstanceCallbackIsUsed.java?rev=1731147&r1=1731146&r2=1731147&view=diff
==============================================================================
---
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/lambda/itest/AdapterNoAutoConfigIfInstanceCallbackIsUsed.java
(original)
+++
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/lambda/itest/AdapterNoAutoConfigIfInstanceCallbackIsUsed.java
Thu Feb 18 21:07:16 2016
@@ -40,7 +40,7 @@ public class AdapterNoAutoConfigIfInstan
// Declare S1 adapter
S1AdapterCallback s1AdapterCB = new S1AdapterCallback();
- adapter(m, S1.class, a -> a.impl(S1Adapter.class).cbi(s1AdapterCB,
"set"));
+ adapter(m, S1.class, a ->
a.impl(S1Adapter.class).callbackInstance(s1AdapterCB).add("set"));
// At this point, the s1AdapterCB.set(S1 s1) method should be called,
and s1Adapter.start() method should then be called.
// but s1 should not be injected on s1Adapter class fields.
@@ -58,7 +58,7 @@ public class AdapterNoAutoConfigIfInstan
// Declare S1 adapter
S1AdapterCallback s1AdapterCB = new S1AdapterCallback();
- adapter(m, S1.class, a ->
a.impl(S1Adapter.class).cbi(s1AdapterCB::set));
+ adapter(m, S1.class, a ->
a.impl(S1Adapter.class).add(s1AdapterCB::set));
// At this point, the s1AdapterCB.set(S1 s1) method should be called,
and s1Adapter.start() method should then be called.
// but s1 should not be injected on s1Adapter class fields.
Modified:
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/lambda/itest/AdapterWithCallbackInstanceTest.java
URL:
http://svn.apache.org/viewvc/felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/lambda/itest/AdapterWithCallbackInstanceTest.java?rev=1731147&r1=1731146&r2=1731147&view=diff
==============================================================================
---
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/lambda/itest/AdapterWithCallbackInstanceTest.java
(original)
+++
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/lambda/itest/AdapterWithCallbackInstanceTest.java
Thu Feb 18 21:07:16 2016
@@ -41,13 +41,13 @@ public class AdapterWithCallbackInstance
ServiceProvider serviceProvider = new ServiceProvider(e);
Component provider =
component(m).provides(OriginalService.class).impl(serviceProvider).build();
- Component consumer = component(m).impl(new
ServiceConsumer(e)).withSrv(AdaptedService.class).build();
+ Component consumer = component(m).impl(new
ServiceConsumer(e)).withSvc(AdaptedService.class).build();
ServiceAdapterCallbackInstance callbackInstance = new
ServiceAdapterCallbackInstance(e);
Component adapter = adapter(m, OriginalService.class)
.provides(AdaptedService.class).impl(new
ServiceAdapter(e)).propagate(true)
.autoConfig("m_originalService")
- .cbi(callbackInstance, "set", "changed", "unset")
+
.callbackInstance(callbackInstance).add("set").change("changed").remove("unset")
.build();
// add the provider and the adapter
@@ -82,14 +82,14 @@ public class AdapterWithCallbackInstance
ServiceProvider serviceProvider = new ServiceProvider(e);
Component provider =
component(m).provides(OriginalService.class).impl(serviceProvider).build();
- Component consumer = component(m).impl(new
ServiceConsumer(e)).withSrv(AdaptedService.class).build();
+ Component consumer = component(m).impl(new
ServiceConsumer(e)).withSvc(AdaptedService.class).build();
ServiceAdapterCallbackInstance callbackInstance = new
ServiceAdapterCallbackInstance(e);
Component adapter = adapter(m, OriginalService.class, adp -> adp
.provides(AdaptedService.class).impl(new ServiceAdapter(e))
.autoAdd(false).propagate(true)
.autoConfig("m_originalService")
- .cbi(callbackInstance::set, callbackInstance::changed,
callbackInstance::unset));
+
.add(callbackInstance::set).change(callbackInstance::changed).remove(callbackInstance::unset));
// add the provider and the adapter
m.add(provider);
Modified:
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/lambda/itest/AdapterWithExtraDependenciesTest.java
URL:
http://svn.apache.org/viewvc/felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/lambda/itest/AdapterWithExtraDependenciesTest.java?rev=1731147&r1=1731146&r2=1731147&view=diff
==============================================================================
---
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/lambda/itest/AdapterWithExtraDependenciesTest.java
(original)
+++
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/lambda/itest/AdapterWithExtraDependenciesTest.java
Thu Feb 18 21:07:16 2016
@@ -36,7 +36,7 @@ public class AdapterWithExtraDependencie
Ensure e = new Ensure();
// create a service adapter that adapts to services S1 and has an
optional dependency on services S2
- Component sa = adapter(m, S1.class).impl(SA.class).withSrv(S2.class,
s2 -> s2.cb("add", "remove")).build();
+ Component sa = adapter(m, S1.class).impl(SA.class).withSvc(S2.class,
s2 -> s2.add("add").remove("remove")).build();
m.add(sa);
// create a service S1, which triggers the creation of the first
adapter instance (A1)
@@ -71,7 +71,7 @@ public class AdapterWithExtraDependencie
Ensure e = new Ensure();
// create a service adapter that adapts to services S1 and has an
optional dependency on services S2
- Component sa = adapter(m, S1.class).impl(SA.class).withSrv(S2.class,
s2 -> s2.cb(SA::add, SA::remove)).build();
+ Component sa = adapter(m, S1.class).impl(SA.class).withSvc(S2.class,
s2 -> s2.add(SA::add).remove(SA::remove)).build();
m.add(sa);
// create a service S1, which triggers the creation of the first
adapter instance (A1)
Modified:
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/lambda/itest/AdapterWithInstanceBoundDependencyTest.java
URL:
http://svn.apache.org/viewvc/felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/lambda/itest/AdapterWithInstanceBoundDependencyTest.java?rev=1731147&r1=1731146&r2=1731147&view=diff
==============================================================================
---
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/lambda/itest/AdapterWithInstanceBoundDependencyTest.java
(original)
+++
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/lambda/itest/AdapterWithInstanceBoundDependencyTest.java
Thu Feb 18 21:07:16 2016
@@ -38,7 +38,7 @@ public class AdapterWithInstanceBoundDep
Component sp = component(m).provides(ServiceInterface.class).impl(new
ServiceProvider(e)).build();
Component sp2 =
component(m).provides(ServiceInterface2.class).impl(new
ServiceProvider2(e)).build();
- Component sc = component(m).impl(new
ServiceConsumer(e)).autoAdd(false).withSrv(ServiceInterface3.class).build();
+ Component sc = component(m).impl(new
ServiceConsumer(e)).autoAdd(false).withSvc(ServiceInterface3.class).build();
Component sa = adapter(m,
ServiceInterface.class).provides(ServiceInterface3.class).impl(new
ServiceAdapter(e)).build();
m.add(sc);
m.add(sp);
@@ -107,7 +107,7 @@ public class AdapterWithInstanceBoundDep
}
public void init() {
m_ensure.step(1);
- component(m_component, c->c.withSrv(ServiceInterface2.class));
+ component(m_component, c->c.withSvc(ServiceInterface2.class));
}
public void start() {
m_ensure.step(2);
Modified:
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/lambda/itest/AdapterWithModifiedInstanceBoundDependencyTest.java
URL:
http://svn.apache.org/viewvc/felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/lambda/itest/AdapterWithModifiedInstanceBoundDependencyTest.java?rev=1731147&r1=1731146&r2=1731147&view=diff
==============================================================================
---
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/lambda/itest/AdapterWithModifiedInstanceBoundDependencyTest.java
(original)
+++
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/lambda/itest/AdapterWithModifiedInstanceBoundDependencyTest.java
Thu Feb 18 21:07:16 2016
@@ -74,7 +74,7 @@ public class AdapterWithModifiedInstance
void init(Component comp) {
m_e.step(2);
- component(comp, c->c.withSrv(C.class, s->s.cb("addC", "removeC")));
+ component(comp, c->c.withSvc(C.class,
s->s.add("addC").remove("removeC")));
}
void addA(A a, Map<String, Object> properties) {
@@ -116,8 +116,8 @@ public class AdapterWithModifiedInstance
Ensure e = new Ensure();
Component a = component(m).impl(new
AImpl(e)).provides(A.class).properties(foo -> "bar").build();
- Component b = adapter(m, A.class).provides(B.class).impl(new
BImpl(e)).cb("addA", "changeA", "removeA").build();
- Component c = component(m).impl(new
CImpl()).provides(C.class).withSrv(A.class, "(foo=bar)").build();
+ Component b = adapter(m, A.class).provides(B.class).impl(new
BImpl(e)).add("addA").change("changeA").remove("removeA").build();
+ Component c = component(m).impl(new
CImpl()).provides(C.class).withSvc(A.class, "(foo=bar)").build();
m.add(a);
m.add(c);
@@ -144,8 +144,8 @@ public class AdapterWithModifiedInstance
Ensure e = new Ensure();
Component a = component(m).impl(new
AImpl(e)).provides(A.class).properties(foo -> "bar").build();
- Component b = adapter(m, A.class).impl(new
BImpl(e)).provides(B.class).cb(BImpl::addA, BImpl::changeA,
BImpl::removeA).build();
- Component c = component(m).impl(new
CImpl()).provides(C.class).withSrv(A.class, s -> s.filter("(foo=bar)")).build();
+ Component b = adapter(m, A.class).impl(new
BImpl(e)).provides(B.class).add(BImpl::addA).change(BImpl::changeA).remove(BImpl::removeA).build();
+ Component c = component(m).impl(new
CImpl()).provides(C.class).withSvc(A.class, s -> s.filter("(foo=bar)")).build();
m.add(a);
m.add(c);
Modified:
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/lambda/itest/AdapterWithPropagationTest.java
URL:
http://svn.apache.org/viewvc/felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/lambda/itest/AdapterWithPropagationTest.java?rev=1731147&r1=1731146&r2=1731147&view=diff
==============================================================================
---
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/lambda/itest/AdapterWithPropagationTest.java
(original)
+++
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/lambda/itest/AdapterWithPropagationTest.java
Thu Feb 18 21:07:16 2016
@@ -102,8 +102,8 @@ public class AdapterWithPropagationTest
Ensure e = new Ensure();
Component s1 = component(m).impl(new
S1Impl(e)).provides(S1.class).properties(p1 -> "v1", p2 ->
"v2overriden").build();
- Component s1Adapter = adapter(m, S1.class).cb("add", "change",
null).impl(new S1Adapter(e)).provides(S2.class).properties(p2 -> "v2").build();
- Component s3 = component(m).impl(new S3(e)).withSrv(S2.class, s ->
s.cb("add", "change", null)).build();
+ Component s1Adapter = adapter(m,
S1.class).add("add").change("change").impl(new
S1Adapter(e)).provides(S2.class).properties(p2 -> "v2").build();
+ Component s3 = component(m).impl(new S3(e)).withSvc(S2.class, s ->
s.add("add").change("change")).build();
m.add(s1);
m.add(s1Adapter);
Modified:
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/lambda/itest/AdapterWithoutPropagationTest.java
URL:
http://svn.apache.org/viewvc/felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/lambda/itest/AdapterWithoutPropagationTest.java?rev=1731147&r1=1731146&r2=1731147&view=diff
==============================================================================
---
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/lambda/itest/AdapterWithoutPropagationTest.java
(original)
+++
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/lambda/itest/AdapterWithoutPropagationTest.java
Thu Feb 18 21:07:16 2016
@@ -45,11 +45,11 @@ public class AdapterWithoutPropagationTe
// The Adapter will see the "foo=bar" property from the adaptee
Component adapter = adapter(m, OriginalService.class)
- .propagate(false).cb("set", "change",
null).provides(AdaptedService.class).impl(new ServiceAdapter(e)).build();
+
.propagate(false).add("set").change("change").provides(AdaptedService.class).impl(new
ServiceAdapter(e)).build();
// The consumer depends on the AdaptedService, but won't see foo=bar
property from the adaptee
Component consumer = component(m)
- .impl(new ServiceConsumer(e)).withSrv(AdaptedService.class, b ->
b.cb("set", "change", null)).build();
+ .impl(new ServiceConsumer(e)).withSvc(AdaptedService.class, b ->
b.add("set").change("change")).build();
// add the provider and the adapter
m.add(provider);
@@ -80,11 +80,11 @@ public class AdapterWithoutPropagationTe
// The Adapter will see the "foo=bar" property from the adaptee
ServiceAdapter saimpl = new ServiceAdapter(e);
- Component adapter = adapter(m,
OriginalService.class).propagate(false).impl(saimpl).provides(AdaptedService.class).cbi(saimpl::set,
saimpl::change, null).build();
+ Component adapter = adapter(m,
OriginalService.class).propagate(false).impl(saimpl).provides(AdaptedService.class).add(saimpl::set).change(saimpl::change).build();
// The consumer depends on the AdaptedService, but won't see foo=bar
property from the adaptee
ServiceConsumer scimpl = new ServiceConsumer(e);
- Component consumer =
component(m).impl(scimpl).withSrv(AdaptedService.class, s -> s.cbi(scimpl::set,
scimpl::change, null)).build();
+ Component consumer =
component(m).impl(scimpl).withSvc(AdaptedService.class, s ->
s.add(scimpl::set).change(scimpl::change)).build();
// add the provider and the adapter
m.add(provider);
Modified:
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/lambda/itest/AspectBaseTest.java
URL:
http://svn.apache.org/viewvc/felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/lambda/itest/AspectBaseTest.java?rev=1731147&r1=1731146&r2=1731147&view=diff
==============================================================================
---
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/lambda/itest/AspectBaseTest.java
(original)
+++
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/lambda/itest/AspectBaseTest.java
Thu Feb 18 21:07:16 2016
@@ -45,7 +45,7 @@ public class AspectBaseTest extends Test
ServiceConsumer c = new ServiceConsumer(e);
Component sp =
component(m).impl(p).provides(ServiceInterface.class).properties(name ->
"a").build();
- Component sc = component(m).impl(c).withSrv(ServiceInterface.class,
srv -> srv.cb("add", "remove").autoConfig("m_service")).build();
+ Component sc = component(m).impl(c).withSvc(ServiceInterface.class,
srv -> srv.add("add").remove("remove").autoConfig("m_service")).build();
Component sa = aspect(m,
ServiceInterface.class).rank(20).impl(ServiceAspect.class).build();
m.add(sc);
@@ -81,7 +81,7 @@ public class AspectBaseTest extends Test
Component sp =
component(m).impl(p).provides(ServiceInterface.class).properties(name ->
"a").build();
Component sc = component(m)
- .impl(c).withSrv(ServiceInterface.class, srv -> srv.cbi(c::add,
c::remove).autoConfig("m_service")).build();
+ .impl(c).withSvc(ServiceInterface.class, srv ->
srv.add(c::addRef).remove(c::removeRef).autoConfig("m_service")).build();
Component sa = aspect(m,
ServiceInterface.class).rank(20).impl(ServiceAspect.class).build();
m.add(sc);
@@ -116,7 +116,7 @@ public class AspectBaseTest extends Test
ServiceProvider p = new ServiceProvider(e, "a");
ServiceConsumer c = new ServiceConsumer(e);
Component sp =
component(m).impl(p).provides(ServiceInterface.class).properties(name ->
"a").build();
- Component sc = component(m).impl(c).withSrv(ServiceInterface.class,
srv -> srv.cb("add", "remove").autoConfig("m_service")).build();
+ Component sc = component(m).impl(c).withSvc(ServiceInterface.class,
srv -> srv.add("add").remove("remove").autoConfig("m_service")).build();
Component sa = aspect(m,
ServiceInterface.class).rank(20).impl(ServiceAspect.class).build();
// we first add the aspect
@@ -158,7 +158,7 @@ public class AspectBaseTest extends Test
ServiceConsumer c = new ServiceConsumer(e);
Component sp =
component(m).impl(p).provides(ServiceInterface.class).properties(name ->
"a").build();
- Component sc = component(m).impl(c).withSrv(ServiceInterface.class,
srv -> srv.cbi(c::add, c::remove).autoConfig("m_service")).build();
+ Component sc = component(m).impl(c).withSvc(ServiceInterface.class,
srv -> srv.add(c::addRef).remove(c::removeRef).autoConfig("m_service")).build();
Component sa = aspect(m,
ServiceInterface.class).rank(20).impl(ServiceAspect.class).build();
// we first add the aspect
@@ -199,7 +199,7 @@ public class AspectBaseTest extends Test
ServiceConsumer c = new ServiceConsumer(e);
Component sp = component(m).impl(new ServiceProvider(e,
"a")).provides(ServiceInterface.class).properties(name -> "a").build();
Component sp2 = component(m).impl(new ServiceProvider(e,
"b")).provides(ServiceInterface.class).properties(name -> "b").build();
- Component sc = component(m).impl(c).withSrv(ServiceInterface.class,
srv -> srv.cb("add", "remove")).build();
+ Component sc = component(m).impl(c).withSvc(ServiceInterface.class,
srv -> srv.add("add").remove("remove")).build();
Component sa = aspect(m,
ServiceInterface.class).rank(20).impl(ServiceAspect.class).build();
Component sa2 = aspect(m,
ServiceInterface.class).rank(10).impl(ServiceAspect.class).build();
@@ -241,7 +241,7 @@ public class AspectBaseTest extends Test
ServiceConsumer c = new ServiceConsumer(e);
Component sp = component(m).impl(new ServiceProvider(e,
"a")).provides(ServiceInterface.class).properties(name -> "a").build();
Component sp2 = component(m).impl(new ServiceProvider(e,
"b")).provides(ServiceInterface.class).properties(name -> "b").build();
- Component sc = component(m).impl(c).withSrv(ServiceInterface.class,
srv -> srv.cbi(c::add, c::remove)).build();
+ Component sc = component(m).impl(c).withSvc(ServiceInterface.class,
srv -> srv.add(c::addRef).remove(c::removeRef)).build();
Component sa = aspect(m,
ServiceInterface.class).rank(20).impl(ServiceAspect.class).build();
Component sa2 = aspect(m,
ServiceInterface.class).rank(10).impl(ServiceAspect.class).build();
@@ -310,13 +310,21 @@ public class AspectBaseTest extends Test
m_ensure = e;
}
- public void add(ServiceReference<ServiceInterface> ref,
ServiceInterface si) {
+ public void addRef(ServiceInterface si,
ServiceReference<ServiceInterface> ref) { // method ref callback
+ add(ref, si);
+ }
+
+ public void add(ServiceReference<ServiceInterface> ref,
ServiceInterface si) { // reflection callback
System.out.println("add: " + ServiceUtil.toString(ref));
m_services.add(si);
m_ensure.step();
}
- public void remove(ServiceReference<ServiceInterface> ref,
ServiceInterface si) {
+ public void removeRef(ServiceInterface si,
ServiceReference<ServiceInterface> ref) { // method ref callback
+ remove(ref, si);
+ }
+
+ public void remove(ServiceReference<ServiceInterface> ref,
ServiceInterface si) { // reflection callback
System.out.println("rem: " + ServiceUtil.toString(ref));
m_services.remove(si);
m_ensure.step();
Modified:
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/lambda/itest/AspectChainTest.java
URL:
http://svn.apache.org/viewvc/felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/lambda/itest/AspectChainTest.java?rev=1731147&r1=1731146&r2=1731147&view=diff
==============================================================================
---
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/lambda/itest/AspectChainTest.java
(original)
+++
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/lambda/itest/AspectChainTest.java
Thu Feb 18 21:07:16 2016
@@ -35,7 +35,7 @@ public class AspectChainTest extends Tes
Ensure e = new Ensure();
// create a service provider and consumer
Component sp = component(m).impl(new
ServiceProvider(e)).provides(ServiceInterface.class).build();
- Component sc = component(m).impl(new
ServiceConsumer(e)).withSrv(ServiceInterface.class).build();
+ Component sc = component(m).impl(new
ServiceConsumer(e)).withSvc(ServiceInterface.class).build();
Component sa2 = aspect(m, ServiceInterface.class).rank(20).impl(new
ServiceAspect(e, 3)).build();
Component sa3 = aspect(m, ServiceInterface.class).rank(30).impl(new
ServiceAspect(e, 2)).build();
Component sa1 = aspect(m, ServiceInterface.class).rank(10).impl(new
ServiceAspect(e, 4)).build();
Modified:
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/lambda/itest/AspectDynamicsTest.java
URL:
http://svn.apache.org/viewvc/felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/lambda/itest/AspectDynamicsTest.java?rev=1731147&r1=1731146&r2=1731147&view=diff
==============================================================================
---
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/lambda/itest/AspectDynamicsTest.java
(original)
+++
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/lambda/itest/AspectDynamicsTest.java
Thu Feb 18 21:07:16 2016
@@ -37,7 +37,7 @@ public class AspectDynamicsTest extends
// create a service provider and consumer
Component provider = component(m).impl(new
ServiceProvider(e)).provides(ServiceInterface.class).build();
Component provider2 = component(m).impl(new
ServiceProvider2(e)).provides(ServiceInterface2.class.getName()).build();
- Component consumer = component(m).impl(new
ServiceConsumer(e)).withSrv(ServiceInterface.class, s->s.cb("add", null, null,
"swap")).build();
+ Component consumer = component(m).impl(new
ServiceConsumer(e)).withSvc(ServiceInterface.class,
s->s.add("add").swap("swap")).build();
Component aspect = aspect(m,
ServiceInterface.class).autoAdd(false).rank(1).impl(new ServiceAspect(e,
aspectStopEnsure)).build();
m.add(consumer);
@@ -94,7 +94,7 @@ public class AspectDynamicsTest extends
// create a service provider and consumer
Component provider = component(m).impl(new
ServiceProvider(e)).provides(ServiceInterface.class.getName()).build();
Component provider2 = component(m).impl(new
ServiceProvider2(e)).provides(ServiceInterface2.class.getName()).build();
- Component consumer = component(m).impl(new
ServiceConsumer(e)).withSrv(ServiceInterface.class,
s->s.cb(ServiceConsumer::add).sw(ServiceConsumer::swap)).build();
+ Component consumer = component(m).impl(new
ServiceConsumer(e)).withSvc(ServiceInterface.class,
s->s.add(ServiceConsumer::add).swap(ServiceConsumer::swap)).build();
Component aspect = aspect(m,
ServiceInterface.class).autoAdd(false).rank(1).impl(new ServiceAspect(e,
aspectStopEnsure)).build();
m.add(consumer);
Modified:
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/lambda/itest/AspectServiceDependencyTest.java
URL:
http://svn.apache.org/viewvc/felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/lambda/itest/AspectServiceDependencyTest.java?rev=1731147&r1=1731146&r2=1731147&view=diff
==============================================================================
---
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/lambda/itest/AspectServiceDependencyTest.java
(original)
+++
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/lambda/itest/AspectServiceDependencyTest.java
Thu Feb 18 21:07:16 2016
@@ -35,7 +35,7 @@ public class AspectServiceDependencyTest
Ensure e = new Ensure();
// create a service provider and consumer
Component sp = component(m).impl(new
ServiceProvider(e)).provides(ServiceInterface.class.getName()).build();
- Component sc = component(m).impl(new
ServiceConsumer(e)).withSrv(ServiceInterface.class, s->s.cb("add",
"remove")).build();
+ Component sc = component(m).impl(new
ServiceConsumer(e)).withSvc(ServiceInterface.class,
s->s.add("add").remove("remove")).build();
Component asp = aspect(m,
ServiceInterface.class).rank(100).impl(ServiceProviderAspect.class).build();
m.add(sp);
Modified:
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/lambda/itest/AspectServiceDependencyWithSwapCallbackTest.java
URL:
http://svn.apache.org/viewvc/felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/lambda/itest/AspectServiceDependencyWithSwapCallbackTest.java?rev=1731147&r1=1731146&r2=1731147&view=diff
==============================================================================
---
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/lambda/itest/AspectServiceDependencyWithSwapCallbackTest.java
(original)
+++
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/lambda/itest/AspectServiceDependencyWithSwapCallbackTest.java
Thu Feb 18 21:07:16 2016
@@ -35,7 +35,7 @@ public class AspectServiceDependencyWith
Ensure e = new Ensure();
// create a service provider and consumer
Component sp = component(m).impl(new
ServiceProvider(e)).provides(ServiceInterface.class).build();
- Component sc = component(m).impl(new
ServiceConsumer(e)).withSrv(ServiceInterface.class, s->s.cb("add", null,
"remove", "swap")).build();
+ Component sc = component(m).impl(new
ServiceConsumer(e)).withSvc(ServiceInterface.class,
s->s.add("add").remove("remove").swap("swap")).build();
Component asp = aspect(m,
ServiceInterface.class).rank(100).impl(ServiceProviderAspect.class).build();
m.add(sp);
m.add(sc);
@@ -55,7 +55,7 @@ public class AspectServiceDependencyWith
// create a service provider and consumer
ServiceConsumer scimpl = new ServiceConsumer(e);
Component sp = component(m).impl(new
ServiceProvider(e)).provides(ServiceInterface.class).build();
- Component sc =
component(m).impl(scimpl).withSrv(ServiceInterface.class, s->s.cbi(scimpl::add,
scimpl::remove).swi(scimpl::swap)).build();
+ Component sc =
component(m).impl(scimpl).withSvc(ServiceInterface.class,
s->s.add(scimpl::add).remove(scimpl::remove).swap(scimpl::swap)).build();
Component asp = aspect(m,
ServiceInterface.class).rank(100).impl(ServiceProviderAspect.class).build();
m.add(sp);
m.add(sc);
Modified:
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/lambda/itest/AspectWhiteboardTest.java
URL:
http://svn.apache.org/viewvc/felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/lambda/itest/AspectWhiteboardTest.java?rev=1731147&r1=1731146&r2=1731147&view=diff
==============================================================================
---
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/lambda/itest/AspectWhiteboardTest.java
(original)
+++
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/lambda/itest/AspectWhiteboardTest.java
Thu Feb 18 21:07:16 2016
@@ -43,7 +43,7 @@ public class AspectWhiteboardTest extend
Component sp1 = component(m).impl(new
ServiceProvider(e)).provides(ServiceInterface.class.getName()).build();
Component sp2 = component(m).impl(new
ServiceProvider(e)).provides(ServiceInterface.class.getName()).build();
ServiceConsumer sci = new ServiceConsumer(e);
- Component sc = component(m).impl(sci).withSrv(ServiceInterface.class,
srv->srv.required(false).cb("add", "remove")).build();
+ Component sc = component(m).impl(sci).withSvc(ServiceInterface.class,
srv->srv.required(false).add("add").remove("remove")).build();
Component sa2 = aspect(m,
ServiceInterface.class).rank(20).autoAdd(false).impl(new ServiceAspect(e,
3)).build();
Component sa1 = aspect(m,
ServiceInterface.class).rank(10).autoAdd(false).impl(new ServiceAspect(e,
4)).build();
@@ -120,9 +120,9 @@ public class AspectWhiteboardTest extend
Component sp1 = component(m).impl(new
ServiceProvider(e)).provides(ServiceInterface.class.getName()).build();
Component sp2 = component(m).impl(new
ServiceProvider(e)).provides(ServiceInterface.class.getName()).build();
ServiceConsumer sci = new ServiceConsumer(e);
- Component sc = component(m).impl(sci).withSrv(ServiceInterface.class,
srv->srv.required(false).cbi(sci::add, sci::remove)).build();
- Component sa2 = aspect(m,
ServiceInterface.class).rank(20).autoAdd(false).impl(new ServiceAspect(e,
3)).build();
- Component sa1 = aspect(m,
ServiceInterface.class).rank(10).autoAdd(false).impl(new ServiceAspect(e,
4)).build();
+ Component sc = component(m).impl(sci).withSvc(ServiceInterface.class,
srv->srv.optional().add(sci::addRef).remove(sci::removeRef)).build();
+ Component sa2 = aspect(m, ServiceInterface.class).rank(20).impl(new
ServiceAspect(e, 3)).build();
+ Component sa1 = aspect(m, ServiceInterface.class).rank(10).impl(new
ServiceAspect(e, 4)).build();
// start with a service consumer
System.out.println("Adding consumer");
@@ -265,13 +265,26 @@ public class AspectWhiteboardTest extend
return ranking;
}
+ // method ref callback
+ public void addRef(ServiceInterface svc, ServiceReference ref) {
+ add(ref, svc);
+ }
+
+ // refection callback
public void add(ServiceReference ref, ServiceInterface svc) {
System.out.println("Added: " + ServiceUtil.toString(ref));
m_services.add(ref);
}
+
+ // method ref callback
+ public void removeRef(ServiceInterface svc, ServiceReference ref) {
+ remove(ref, svc);
+ }
+
+ // refection callback
public void remove(ServiceReference ref, ServiceInterface svc) {
System.out.println("Removed: " + ServiceUtil.toString(ref));
m_services.remove(ref);
- }
+ }
}
}
Modified:
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/lambda/itest/AspectWithCallbacksServiceDependencyTest.java
URL:
http://svn.apache.org/viewvc/felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/lambda/itest/AspectWithCallbacksServiceDependencyTest.java?rev=1731147&r1=1731146&r2=1731147&view=diff
==============================================================================
---
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/lambda/itest/AspectWithCallbacksServiceDependencyTest.java
(original)
+++
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/lambda/itest/AspectWithCallbacksServiceDependencyTest.java
Thu Feb 18 21:07:16 2016
@@ -35,8 +35,8 @@ public class AspectWithCallbacksServiceD
Ensure e = new Ensure();
// create a service provider and consumer
Component sp = component(m).impl(new
ServiceProvider(e)).provides(ServiceInterface.class.getName()).build();
- Component sc = component(m).impl(new
ServiceConsumer(e)).withSrv(ServiceInterface.class, s->s.cb("add",
"remove")).build();
- Component asp = aspect(m, ServiceInterface.class).rank(100).cb("add",
null, "remove", "swap").impl(ServiceProviderAspect.class).build();
+ Component sc = component(m).impl(new
ServiceConsumer(e)).withSvc(ServiceInterface.class,
s->s.add("add").remove("remove")).build();
+ Component asp = aspect(m,
ServiceInterface.class).rank(100).add("add").remove("remove").swap("swap").impl(ServiceProviderAspect.class).build();
m.add(sp);
m.add(sc);
@@ -55,10 +55,10 @@ public class AspectWithCallbacksServiceD
Ensure e = new Ensure();
// create a service provider and consumer
Component sp = component(m).impl(new
ServiceProvider(e)).provides(ServiceInterface.class.getName()).build();
- Component sc = component(m).impl(new
ServiceConsumer(e)).withSrv(ServiceInterface.class,
s->s.cb(ServiceConsumer::add, ServiceConsumer::remove)).build();
+ Component sc = component(m).impl(new
ServiceConsumer(e)).withSvc(ServiceInterface.class,
s->s.add(ServiceConsumer::add).remove(ServiceConsumer::remove)).build();
Component asp = aspect(m, ServiceInterface.class)
.impl(ServiceProviderAspect.class).rank(100)
- .cb(ServiceProviderAspect::add,
ServiceProviderAspect::remove).sw(ServiceProviderAspect::swap)
+
.add(ServiceProviderAspect::add).remove(ServiceProviderAspect::remove).swap(ServiceProviderAspect::swap)
.build();
m.add(sp);
@@ -78,11 +78,11 @@ public class AspectWithCallbacksServiceD
Ensure e = new Ensure();
// create a service provider and consumer
Component sp = component(m).impl(new
ServiceProvider(e)).provides(ServiceInterface.class).build();
- Component sc = component(m).impl(new
ServiceConsumer(e)).withSrv(ServiceInterface.class, s->s.cb("add",
"remove")).build();
+ Component sc = component(m).impl(new
ServiceConsumer(e)).withSvc(ServiceInterface.class,
s->s.add("add").remove("remove")).build();
ServiceProviderAspect providerAspect = new ServiceProviderAspect();
ServiceProviderAspectCallbackInstance aspectCb = new
ServiceProviderAspectCallbackInstance(providerAspect);
- Component asp = aspect(m,
ServiceInterface.class).rank(100).impl(providerAspect).cbi(aspectCb::add,
aspectCb::remove).swi(aspectCb::swap).build();
+ Component asp = aspect(m,
ServiceInterface.class).rank(100).impl(providerAspect).add(aspectCb::add).remove(aspectCb::remove).swap(aspectCb::swap).build();
m.add(sp);
m.add(sc);
Modified:
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/lambda/itest/AspectWithPropagationTest.java
URL:
http://svn.apache.org/viewvc/felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/lambda/itest/AspectWithPropagationTest.java?rev=1731147&r1=1731146&r2=1731147&view=diff
==============================================================================
---
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/lambda/itest/AspectWithPropagationTest.java
(original)
+++
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/lambda/itest/AspectWithPropagationTest.java
Thu Feb 18 21:07:16 2016
@@ -99,7 +99,7 @@ public class AspectWithPropagationTest e
}
}
};
- Component clientComp = component(m).impl(client).withSrv(S.class,
srv->srv.cb("add", "change", null)).build();
+ Component clientComp = component(m).impl(client).withSvc(S.class,
srv->srv.add("add").change("change")).build();
// Add components in dependency manager
m.add(sComp);
@@ -151,12 +151,12 @@ public class AspectWithPropagationTest e
// Create an aspect aware client, depending on "S" service.
Client clientImpl;
- Component client = component(m).impl((clientImpl = new
Client())).withSrv(S.class, srv -> srv.cb("add", "change", "remove",
"swap")).build();
+ Component client = component(m).impl((clientImpl = new
Client())).withSvc(S.class, srv ->
srv.add("add").change("change").remove("remove").swap("swap")).build();
// Create some "S" aspects
Component[] aspects = new Component[ASPECTS];
for (int rank = 1; rank <= ASPECTS; rank ++) {
- aspects[rank-1] = aspect(m, S.class).rank(rank).impl(new A("A" +
rank, rank)).cb("add", "change", "remove", "swap").build();
+ aspects[rank-1] = aspect(m, S.class).rank(rank).impl(new A("A" +
rank, rank)).add("add").change("change").remove("remove").swap("swap").build();
props = new Hashtable();
props.put("a" + rank, "v" + rank);
aspects[rank-1].setServiceProperties(props);
@@ -261,7 +261,7 @@ public class AspectWithPropagationTest e
// Create an aspect aware client, depending on "S" service.
Client clientImpl;
- Component client = component(m).impl((clientImpl = new
Client())).withSrv(S.class, srv->srv.cb("add", "change", "remove")).build();
+ Component client = component(m).impl((clientImpl = new
Client())).withSvc(S.class,
srv->srv.add("add").change("change").remove("remove")).build();
// Create some "S" aspects
Component[] aspects = new Component[ASPECTS];
@@ -354,18 +354,18 @@ public class AspectWithPropagationTest e
// Create some "S" aspects
Component[] aspects = new Component[ASPECTS];
for (int rank = 1; rank <= ASPECTS; rank ++) {
- aspects[rank-1] = aspect(m, S.class).rank(rank).impl(new A("A" +
rank, rank)).cb("add", "change", "remove", "swap").build();
+ aspects[rank-1] = aspect(m, S.class).rank(rank).impl(new A("A" +
rank, rank)).add("add").change("change").remove("remove").swap("swap").build();
props = new Hashtable();
props.put("a" + rank, "v" + rank);
aspects[rank-1].setServiceProperties(props);
}
// Create S2 adapter (which adapts S1 to S2 interface)
- Component adapter = adapter(m, S.class).cb("add", "change", "remove",
"swap").provides(S2.class).impl(new S2Impl()).build();
+ Component adapter = adapter(m,
S.class).add("add").change("change").remove("remove").swap("swap").provides(S2.class).impl(new
S2Impl()).build();
// Create Client2, which depends on "S2" service.
Client2 client2Impl;
- Component client2 = component(m).impl((client2Impl = new
Client2())).withSrv(S2.class, srv -> srv.cb("add", "change", null)).build();
+ Component client2 = component(m).impl((client2Impl = new
Client2())).withSvc(S2.class, srv -> srv.add("add").change("change")).build();
// Register client2
m.add(client2);
@@ -451,7 +451,7 @@ public class AspectWithPropagationTest e
// Create Client2, which depends on "S2" service.
Client2 client2Impl;
- Component client2 = component(m).impl((client2Impl = new
Client2())).withSrv(S2.class, srv->srv.cb("add", "change", null)).build();
+ Component client2 = component(m).impl((client2Impl = new
Client2())).withSvc(S2.class, srv->srv.add("add").change("change")).build();
// Register client2
m.add(client2);
Modified:
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/lambda/itest/AutoConfigTest.java
URL:
http://svn.apache.org/viewvc/felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/lambda/itest/AutoConfigTest.java?rev=1731147&r1=1731146&r2=1731147&view=diff
==============================================================================
---
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/lambda/itest/AutoConfigTest.java
(original)
+++
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/lambda/itest/AutoConfigTest.java
Thu Feb 18 21:07:16 2016
@@ -148,7 +148,7 @@ public class AutoConfigTest extends Test
}
private Component createConsumer(DependencyManager dm, Object consumer) {
- return component(dm).impl(consumer).withSrv(Provider.class).build();
+ return component(dm).impl(consumer).withSvc(Provider.class).build();
}
public static interface Provider extends Runnable {
Modified:
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/lambda/itest/BundleAdapterTest.java
URL:
http://svn.apache.org/viewvc/felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/lambda/itest/BundleAdapterTest.java?rev=1731147&r1=1731146&r2=1731147&view=diff
==============================================================================
---
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/lambda/itest/BundleAdapterTest.java
(original)
+++
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/lambda/itest/BundleAdapterTest.java
Thu Feb 18 21:07:16 2016
@@ -66,7 +66,8 @@ public class BundleAdapterTest extends T
Component adapter = bundleAdapter(m)
.mask(Bundle.INSTALLED | Bundle.RESOLVED | Bundle.ACTIVE)
- .cbi(cbInstance, "add", "remove")
+ .callbackInstance(cbInstance)
+ .add("add").remove("remove")
.impl(baWithCb)
.provides(BundleAdapter.class.getName())
.build();
@@ -75,7 +76,7 @@ public class BundleAdapterTest extends T
Consumer c = new Consumer();
Component consumer = component(m)
.impl(c)
- .withSrv(BundleAdapter.class, s->s.cb("add", "remove"))
+ .withSvc(BundleAdapter.class, s->s.add("add").remove("remove"))
.build();
// add the bundle adapter
@@ -100,7 +101,7 @@ public class BundleAdapterTest extends T
Component adapter = bundleAdapter(m)
.mask(Bundle.INSTALLED | Bundle.RESOLVED | Bundle.ACTIVE)
- .cbi(cbInstance::add, cbInstance::remove)
+ .add(cbInstance::addRef).remove(cbInstance::removeRef)
.impl(baWithCb)
.provides(BundleAdapter.class.getName())
.build();
@@ -109,7 +110,7 @@ public class BundleAdapterTest extends T
Consumer c = new Consumer();
Component consumer = component(m)
.impl(c)
- .withSrv(BundleAdapter.class, s->s.cb("add", "remove"))
+ .withSvc(BundleAdapter.class, s->s.add("add").remove("remove"))
.build();
// add the bundle adapter
@@ -151,13 +152,21 @@ public class BundleAdapterTest extends T
m_ba = ba;
}
- void add(Component c, Bundle b) {
+ void add(Component c, Bundle b) { // reflection callback
m_ba.add(b);
}
-
- void remove(Component c, Bundle b) {
+
+ void addRef(Bundle b, Component c) { // method reference callback
+ add(c, b);
+ }
+
+ void remove(Component c, Bundle b) { // reflection callback
m_ba.remove(b);
}
+
+ void removeRef(Bundle b, Component c) { // method reference callback
+ remove (c, b);
+ }
}
static class Consumer {
Modified:
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/lambda/itest/BundleAdapterWithCallbacksNotAutoConfiguredTest.java
URL:
http://svn.apache.org/viewvc/felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/lambda/itest/BundleAdapterWithCallbacksNotAutoConfiguredTest.java?rev=1731147&r1=1731146&r2=1731147&view=diff
==============================================================================
---
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/lambda/itest/BundleAdapterWithCallbacksNotAutoConfiguredTest.java
(original)
+++
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/lambda/itest/BundleAdapterWithCallbacksNotAutoConfiguredTest.java
Thu Feb 18 21:07:16 2016
@@ -38,7 +38,7 @@ public class BundleAdapterWithCallbacksN
String bsn = "org.apache.felix.dependencymanager";
String filter = "(Bundle-SymbolicName=" + bsn + ")";
- Component adapter =
bundleAdapter(m).mask(Bundle.ACTIVE).filter(filter).cb("add").impl(baWithCb).build();
+ Component adapter =
bundleAdapter(m).mask(Bundle.ACTIVE).filter(filter).add("add").impl(baWithCb).build();
// add the bundle adapter
m.add(adapter);
Modified:
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/lambda/itest/BundleDependencyTest.java
URL:
http://svn.apache.org/viewvc/felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/lambda/itest/BundleDependencyTest.java?rev=1731147&r1=1731146&r2=1731147&view=diff
==============================================================================
---
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/lambda/itest/BundleDependencyTest.java
(original)
+++
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/lambda/itest/BundleDependencyTest.java
Thu Feb 18 21:07:16 2016
@@ -35,7 +35,7 @@ public class BundleDependencyTest extend
DependencyManager m = getDM();
// create a service provider and consumer
MyConsumer c = new MyConsumer();
- Component consumer = component(m, comp ->
comp.impl(c).withBundle(bundle -> bundle.cb("add", "remove")));
+ Component consumer = component(m, comp ->
comp.impl(c).withBundle(bundle -> bundle.add("add").remove("remove")));
// check if at least one bundle was found
c.check();
@@ -48,7 +48,7 @@ public class BundleDependencyTest extend
Ensure e = new Ensure();
String filter = "(Bundle-SymbolicName=" + BSN + ")";
Component consumerWithFilter = component(m, comp -> comp.impl(new
FilteredConsumer(e))
- .withBundle(bundle-> bundle.filter(filter).cb("add", "remove")));
+ .withBundle(bundle->
bundle.filter(filter).add("add").remove("remove")));
e.step(2);
// remove the consumer again
m.remove(consumerWithFilter);
@@ -59,7 +59,7 @@ public class BundleDependencyTest extend
DependencyManager m = getDM();
// create a service provider and consumer
MyConsumer c = new MyConsumer();
- Component consumer = component(m, comp ->
comp.impl(c).withBundle(bundle -> bundle.cb(MyConsumer::add,
MyConsumer::remove)));
+ Component consumer = component(m, comp ->
comp.impl(c).withBundle(bundle ->
bundle.add(MyConsumer::add).remove(MyConsumer::remove)));
// check if at least one bundle was found
c.check();
@@ -72,7 +72,7 @@ public class BundleDependencyTest extend
Ensure e = new Ensure();
String filter = "(Bundle-SymbolicName=" + BSN + ")";
Component consumerWithFilter = component(m, comp -> comp.impl(new
FilteredConsumer(e))
- .withBundle(bundle->
bundle.filter(filter).cb(FilteredConsumer::add, FilteredConsumer::remove)));
+ .withBundle(bundle->
bundle.filter(filter).add(FilteredConsumer::add).remove(FilteredConsumer::remove)));
e.step(2);
// remove the consumer again
m.remove(consumerWithFilter);
@@ -85,7 +85,7 @@ public class BundleDependencyTest extend
// helper class that ensures certain steps get executed in sequence
Ensure e = new Ensure();
Component consumerWithFilter = component(m, c -> c.impl(new
FilteredConsumerRequired(e))
- .withBundle(b -> b.filter("(Bundle-SymbolicName=" + BSN +
")").cb("add", "remove")));
+ .withBundle(b -> b.filter("(Bundle-SymbolicName=" + BSN +
")").add("add").remove("remove")));
e.waitForStep(1, 5000);
// remove the consumer again
m.remove(consumerWithFilter);
@@ -99,7 +99,7 @@ public class BundleDependencyTest extend
Ensure e = new Ensure();
FilteredConsumerRequired impl = new FilteredConsumerRequired(e);
Component consumerWithFilter = component(m, c -> c.impl(impl)
- .withBundle(b -> b.filter("(Bundle-SymbolicName=" + BSN +
")").cbi(impl::add, impl::remove)));
+ .withBundle(b -> b.filter("(Bundle-SymbolicName=" + BSN +
")").add(impl::add).remove(impl::remove)));
e.waitForStep(1, 5000);
// remove the consumer again
m.remove(consumerWithFilter);
@@ -114,7 +114,7 @@ public class BundleDependencyTest extend
// add a consumer with a filter
FilteredConsumerRequiredWithComponentArg impl = new
FilteredConsumerRequiredWithComponentArg(e);
Component consumerWithFilter = component(m, c -> c.impl(impl)
- .withBundle(b -> b.filter("(Bundle-SymbolicName=" + BSN +
")").cb("add", "remove")));
+ .withBundle(b -> b.filter("(Bundle-SymbolicName=" + BSN +
")").add("add").remove("remove")));
e.waitForStep(1, 5000);
// remove the consumer again
m.remove(consumerWithFilter);
@@ -128,7 +128,7 @@ public class BundleDependencyTest extend
Ensure e = new Ensure();
FilteredConsumerRequiredWithComponentArg impl = new
FilteredConsumerRequiredWithComponentArg(e);
Component consumerWithFilter = component(m).impl(impl)
- .withBundle(b -> b.filter("(Bundle-SymbolicName=" + BSN
+ ")").cbi(impl::add, impl::remove)).build();
+ .withBundle(b -> b.filter("(Bundle-SymbolicName=" + BSN
+ ")").add(impl::addRef).remove(impl::removeRef)).build();
// add a consumer with a filter
m.add(consumerWithFilter);
e.waitForStep(1, 5000);
@@ -206,15 +206,23 @@ public class BundleDependencyTest extend
m_ensure = e;
}
- public void add(Component component, Bundle b) {
- Assert.assertNotNull(component);
+ public void add(Component component, Bundle b) { // method ref callback
+ Assert.assertNotNull(component);
if (b.getSymbolicName().equals(BSN)) {
m_ensure.step(1);
}
}
- public void remove(Component component, Bundle b) {
- Assert.assertNotNull(component);
+ public void addRef(Bundle b, Component component) { // method ref
callback
+ add(component, b);
+ }
+
+ public void removeRef(Bundle b, Component component) { // method ref
callback
+ remove(component, b);
+ }
+
+ public void remove(Component component, Bundle b) { // method ref
callback
+ Assert.assertNotNull(component);
Assert.assertNotNull(b);
if (b.getSymbolicName().equals(BSN)) {
m_ensure.step(2);
Modified:
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/lambda/itest/ComponentTest.java
URL:
http://svn.apache.org/viewvc/felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/lambda/itest/ComponentTest.java?rev=1731147&r1=1731146&r2=1731147&view=diff
==============================================================================
---
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/lambda/itest/ComponentTest.java
(original)
+++
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/lambda/itest/ComponentTest.java
Thu Feb 18 21:07:16 2016
@@ -37,8 +37,8 @@ public class ComponentTest extends TestB
// Create consumer (dependency is required by default using builder
api).
component(dm, comp -> comp
.factory(Consumer::new)
- .withSrv(Provider.class, srv ->
srv.filter("(name=provider2)").cb(Consumer::add, Consumer::remove))
- .withSrv(Provider.class, srv ->
srv.filter("(name=provider1)").autoConfig("m_autoConfiguredProvider")));
+ .withSvc(Provider.class, srv ->
srv.filter("(name=provider2)").add(Consumer::add).remove(Consumer::remove))
+ .withSvc(Provider.class, srv ->
srv.filter("(name=provider1)").autoConfig("m_autoConfiguredProvider")));
// Create providers (auto added to dependency manager)
component(dm, comp -> comp
Modified:
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/lambda/itest/CompositionTest.java
URL:
http://svn.apache.org/viewvc/felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/lambda/itest/CompositionTest.java?rev=1731147&r1=1731146&r2=1731147&view=diff
==============================================================================
---
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/lambda/itest/CompositionTest.java
(original)
+++
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/lambda/itest/CompositionTest.java
Thu Feb 18 21:07:16 2016
@@ -35,7 +35,7 @@ public class CompositionTest extends Tes
// create a service provider and consumer
Component sp = component(m).impl(new
ServiceProvider(e)).provides(ServiceInterface.class).build();
Component sc = component(m).impl(new
ServiceConsumer(e)).composition("getComposition")
- .withSrv(ServiceInterface.class, sb->sb.cb("add")).build();
+ .withSvc(ServiceInterface.class, sb->sb.add("add")).build();
m.add(sp);
m.add(sc);
// ensure we executed all steps inside the component instance
@@ -51,7 +51,7 @@ public class CompositionTest extends Tes
Component sp = component(m).impl(new
ServiceProvider(e)).provides(ServiceInterface.class).build();
ServiceConsumer scimpl = new ServiceConsumer(e);
Component sc =
component(m).impl(scimpl).composition(scimpl::getComposition)
- .withSrv(ServiceInterface.class, sb->sb.cb("add")).build();
+ .withSvc(ServiceInterface.class, sb->sb.add("add")).build();
m.add(sp);
m.add(sc);
// ensure we executed all steps inside the component instance
Modified:
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/lambda/itest/DynamicProxyAspectTest.java
URL:
http://svn.apache.org/viewvc/felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/lambda/itest/DynamicProxyAspectTest.java?rev=1731147&r1=1731146&r2=1731147&view=diff
==============================================================================
---
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/lambda/itest/DynamicProxyAspectTest.java
(original)
+++
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/lambda/itest/DynamicProxyAspectTest.java
Thu Feb 18 21:07:16 2016
@@ -62,7 +62,7 @@ public class DynamicProxyAspectTest exte
// through the proxy twice
Component sc = component(m)
.impl(new ServiceConsumer(e))
- .withSrv(ServiceInterface.class, ServiceInterface2.class).build();
+ .withSvc(ServiceInterface.class, ServiceInterface2.class).build();
// register both producers, validate that both services are started
m.add(sp1);
@@ -114,7 +114,7 @@ public class DynamicProxyAspectTest exte
// through the proxy twice
Component sc = component(m)
.impl(new ServiceConsumer(e))
- .withSrv(ServiceInterface.class, ServiceInterface2.class).build();
+ .withSvc(ServiceInterface.class, ServiceInterface2.class).build();
// register both producers, validate that both services are started
m.add(sp1);
Modified:
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/lambda/itest/FactoryConfigurationAdapterTest.java
URL:
http://svn.apache.org/viewvc/felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/lambda/itest/FactoryConfigurationAdapterTest.java?rev=1731147&r1=1731146&r2=1731147&view=diff
==============================================================================
---
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/lambda/itest/FactoryConfigurationAdapterTest.java
(original)
+++
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/lambda/itest/FactoryConfigurationAdapterTest.java
Thu Feb 18 21:07:16 2016
@@ -54,13 +54,13 @@ public class FactoryConfigurationAdapter
// Create a Configuration instance, which will create/update/remove a
configuration for factoryPid "MyFactoryPid"
ConfigurationCreator configurator = new
ConfigurationCreator("MyFactoryPid", "key", "value1");
- Component s1 =
component(m).impl(configurator).withSrv(ConfigurationAdmin.class).build();
+ Component s1 =
component(m).impl(configurator).withSvc(ConfigurationAdmin.class).build();
// Create an Adapter that will be instantiated, once the configuration
is created.
// This Adapter provides an AdapterService, and depends on an
AdapterExtraDependency service.
Component s2 = factoryPidAdapter(m)
-
.factoryPid("MyFactoryPid").impl(adapterImplClass).cb(adapterUpdate).propagate().provides(AdapterService.class,
"foo", "bar")
- .withSrv(AdapterExtraDependency.class)
+
.factoryPid("MyFactoryPid").impl(adapterImplClass).update(adapterUpdate).propagate().provides(AdapterService.class,
"foo", "bar")
+ .withSvc(AdapterExtraDependency.class)
.build();
// Create extra adapter service dependency upon which our adapter
depends on.
@@ -69,7 +69,7 @@ public class FactoryConfigurationAdapter
// Create an AdapterService Consumer
Component s4 = component(m)
- .impl(AdapterServiceConsumer.class).withSrv(AdapterService.class,
srv -> srv.cb("bind", "change", "remove")).build();
+ .impl(AdapterServiceConsumer.class).withSvc(AdapterService.class,
srv -> srv.add("bind").change("change").remove("remove")).build();
// Start services
m.add(s1);
