Author: pderop
Date: Wed Jan 27 23:27:34 2016
New Revision: 1727214
URL: http://svn.apache.org/viewvc?rev=1727214&view=rev
Log:
Made API more consistent.
Added:
felix/sandbox/pderop/dependencymanager-lambda/org.apache.felix.dependencymanager.lambda/src/org/apache/felix/dm/lambda/
felix/sandbox/pderop/dependencymanager-lambda/org.apache.felix.dependencymanager.lambda/src/org/apache/felix/dm/lambda/BundleAdapterBuilder.java
felix/sandbox/pderop/dependencymanager-lambda/org.apache.felix.dependencymanager.lambda/src/org/apache/felix/dm/lambda/BundleDependencyBuilder.java
felix/sandbox/pderop/dependencymanager-lambda/org.apache.felix.dependencymanager.lambda/src/org/apache/felix/dm/lambda/ComponentBuilder.java
felix/sandbox/pderop/dependencymanager-lambda/org.apache.felix.dependencymanager.lambda/src/org/apache/felix/dm/lambda/ComponentCallback.java
felix/sandbox/pderop/dependencymanager-lambda/org.apache.felix.dependencymanager.lambda/src/org/apache/felix/dm/lambda/ConfigurationDependencyBuilder.java
felix/sandbox/pderop/dependencymanager-lambda/org.apache.felix.dependencymanager.lambda/src/org/apache/felix/dm/lambda/DependencyActivatorBase.java
felix/sandbox/pderop/dependencymanager-lambda/org.apache.felix.dependencymanager.lambda/src/org/apache/felix/dm/lambda/DependencyBuilder.java
felix/sandbox/pderop/dependencymanager-lambda/org.apache.felix.dependencymanager.lambda/src/org/apache/felix/dm/lambda/FactoryPidAdapterBuilder.java
felix/sandbox/pderop/dependencymanager-lambda/org.apache.felix.dependencymanager.lambda/src/org/apache/felix/dm/lambda/FutureDependencyBuilder.java
felix/sandbox/pderop/dependencymanager-lambda/org.apache.felix.dependencymanager.lambda/src/org/apache/felix/dm/lambda/ServiceAdapterBuilder.java
felix/sandbox/pderop/dependencymanager-lambda/org.apache.felix.dependencymanager.lambda/src/org/apache/felix/dm/lambda/ServiceAspectBuilder.java
felix/sandbox/pderop/dependencymanager-lambda/org.apache.felix.dependencymanager.lambda/src/org/apache/felix/dm/lambda/ServiceCallbacksBuilder.java
felix/sandbox/pderop/dependencymanager-lambda/org.apache.felix.dependencymanager.lambda/src/org/apache/felix/dm/lambda/ServiceDependencyBuilder.java
felix/sandbox/pderop/dependencymanager-lambda/org.apache.felix.dependencymanager.lambda/src/org/apache/felix/dm/lambda/callbacks/
felix/sandbox/pderop/dependencymanager-lambda/org.apache.felix.dependencymanager.lambda/src/org/apache/felix/dm/lambda/callbacks/CbBundle.java
felix/sandbox/pderop/dependencymanager-lambda/org.apache.felix.dependencymanager.lambda/src/org/apache/felix/dm/lambda/callbacks/CbComponent.java
felix/sandbox/pderop/dependencymanager-lambda/org.apache.felix.dependencymanager.lambda/src/org/apache/felix/dm/lambda/callbacks/CbComponentBundle.java
felix/sandbox/pderop/dependencymanager-lambda/org.apache.felix.dependencymanager.lambda/src/org/apache/felix/dm/lambda/callbacks/CbComponentDictionary.java
felix/sandbox/pderop/dependencymanager-lambda/org.apache.felix.dependencymanager.lambda/src/org/apache/felix/dm/lambda/callbacks/CbComponentRef.java
felix/sandbox/pderop/dependencymanager-lambda/org.apache.felix.dependencymanager.lambda/src/org/apache/felix/dm/lambda/callbacks/CbComponentRefService.java
felix/sandbox/pderop/dependencymanager-lambda/org.apache.felix.dependencymanager.lambda/src/org/apache/felix/dm/lambda/callbacks/CbComponentRefServiceRefService.java
felix/sandbox/pderop/dependencymanager-lambda/org.apache.felix.dependencymanager.lambda/src/org/apache/felix/dm/lambda/callbacks/CbComponentService.java
felix/sandbox/pderop/dependencymanager-lambda/org.apache.felix.dependencymanager.lambda/src/org/apache/felix/dm/lambda/callbacks/CbComponentServiceService.java
felix/sandbox/pderop/dependencymanager-lambda/org.apache.felix.dependencymanager.lambda/src/org/apache/felix/dm/lambda/callbacks/CbConsumer.java
felix/sandbox/pderop/dependencymanager-lambda/org.apache.felix.dependencymanager.lambda/src/org/apache/felix/dm/lambda/callbacks/CbDictionary.java
felix/sandbox/pderop/dependencymanager-lambda/org.apache.felix.dependencymanager.lambda/src/org/apache/felix/dm/lambda/callbacks/CbFuture.java
felix/sandbox/pderop/dependencymanager-lambda/org.apache.felix.dependencymanager.lambda/src/org/apache/felix/dm/lambda/callbacks/CbRef.java
felix/sandbox/pderop/dependencymanager-lambda/org.apache.felix.dependencymanager.lambda/src/org/apache/felix/dm/lambda/callbacks/CbRefService.java
felix/sandbox/pderop/dependencymanager-lambda/org.apache.felix.dependencymanager.lambda/src/org/apache/felix/dm/lambda/callbacks/CbRefServiceRefService.java
felix/sandbox/pderop/dependencymanager-lambda/org.apache.felix.dependencymanager.lambda/src/org/apache/felix/dm/lambda/callbacks/CbService.java
felix/sandbox/pderop/dependencymanager-lambda/org.apache.felix.dependencymanager.lambda/src/org/apache/felix/dm/lambda/callbacks/CbServiceDict.java
felix/sandbox/pderop/dependencymanager-lambda/org.apache.felix.dependencymanager.lambda/src/org/apache/felix/dm/lambda/callbacks/CbServiceMap.java
felix/sandbox/pderop/dependencymanager-lambda/org.apache.felix.dependencymanager.lambda/src/org/apache/felix/dm/lambda/callbacks/CbServiceService.java
felix/sandbox/pderop/dependencymanager-lambda/org.apache.felix.dependencymanager.lambda/src/org/apache/felix/dm/lambda/callbacks/CbTypeBundle.java
felix/sandbox/pderop/dependencymanager-lambda/org.apache.felix.dependencymanager.lambda/src/org/apache/felix/dm/lambda/callbacks/CbTypeComponent.java
felix/sandbox/pderop/dependencymanager-lambda/org.apache.felix.dependencymanager.lambda/src/org/apache/felix/dm/lambda/callbacks/CbTypeComponentBundle.java
felix/sandbox/pderop/dependencymanager-lambda/org.apache.felix.dependencymanager.lambda/src/org/apache/felix/dm/lambda/callbacks/CbTypeComponentDictionary.java
felix/sandbox/pderop/dependencymanager-lambda/org.apache.felix.dependencymanager.lambda/src/org/apache/felix/dm/lambda/callbacks/CbTypeComponentRef.java
felix/sandbox/pderop/dependencymanager-lambda/org.apache.felix.dependencymanager.lambda/src/org/apache/felix/dm/lambda/callbacks/CbTypeComponentRefService.java
felix/sandbox/pderop/dependencymanager-lambda/org.apache.felix.dependencymanager.lambda/src/org/apache/felix/dm/lambda/callbacks/CbTypeComponentRefServiceRefService.java
felix/sandbox/pderop/dependencymanager-lambda/org.apache.felix.dependencymanager.lambda/src/org/apache/felix/dm/lambda/callbacks/CbTypeComponentService.java
felix/sandbox/pderop/dependencymanager-lambda/org.apache.felix.dependencymanager.lambda/src/org/apache/felix/dm/lambda/callbacks/CbTypeComponentServiceDict.java
felix/sandbox/pderop/dependencymanager-lambda/org.apache.felix.dependencymanager.lambda/src/org/apache/felix/dm/lambda/callbacks/CbTypeComponentServiceMap.java
felix/sandbox/pderop/dependencymanager-lambda/org.apache.felix.dependencymanager.lambda/src/org/apache/felix/dm/lambda/callbacks/CbTypeComponentServiceService.java
felix/sandbox/pderop/dependencymanager-lambda/org.apache.felix.dependencymanager.lambda/src/org/apache/felix/dm/lambda/callbacks/CbTypeDictionary.java
felix/sandbox/pderop/dependencymanager-lambda/org.apache.felix.dependencymanager.lambda/src/org/apache/felix/dm/lambda/callbacks/CbTypeFuture.java
felix/sandbox/pderop/dependencymanager-lambda/org.apache.felix.dependencymanager.lambda/src/org/apache/felix/dm/lambda/callbacks/CbTypeRef.java
felix/sandbox/pderop/dependencymanager-lambda/org.apache.felix.dependencymanager.lambda/src/org/apache/felix/dm/lambda/callbacks/CbTypeRefService.java
felix/sandbox/pderop/dependencymanager-lambda/org.apache.felix.dependencymanager.lambda/src/org/apache/felix/dm/lambda/callbacks/CbTypeRefServiceRefService.java
felix/sandbox/pderop/dependencymanager-lambda/org.apache.felix.dependencymanager.lambda/src/org/apache/felix/dm/lambda/callbacks/CbTypeService.java
felix/sandbox/pderop/dependencymanager-lambda/org.apache.felix.dependencymanager.lambda/src/org/apache/felix/dm/lambda/callbacks/CbTypeServiceDict.java
felix/sandbox/pderop/dependencymanager-lambda/org.apache.felix.dependencymanager.lambda/src/org/apache/felix/dm/lambda/callbacks/CbTypeServiceMap.java
felix/sandbox/pderop/dependencymanager-lambda/org.apache.felix.dependencymanager.lambda/src/org/apache/felix/dm/lambda/callbacks/CbTypeServiceService.java
felix/sandbox/pderop/dependencymanager-lambda/org.apache.felix.dependencymanager.lambda/src/org/apache/felix/dm/lambda/callbacks/FluentProperties.java
felix/sandbox/pderop/dependencymanager-lambda/org.apache.felix.dependencymanager.lambda/src/org/apache/felix/dm/lambda/callbacks/SerializableLambda.java
felix/sandbox/pderop/dependencymanager-lambda/org.apache.felix.dependencymanager.lambda/src/org/apache/felix/dm/lambda/callbacks/packageinfo
felix/sandbox/pderop/dependencymanager-lambda/org.apache.felix.dependencymanager.lambda/src/org/apache/felix/dm/lambda/impl/
felix/sandbox/pderop/dependencymanager-lambda/org.apache.felix.dependencymanager.lambda/src/org/apache/felix/dm/lambda/impl/AdapterBase.java
felix/sandbox/pderop/dependencymanager-lambda/org.apache.felix.dependencymanager.lambda/src/org/apache/felix/dm/lambda/impl/BundleAdapterBuilderImpl.java
felix/sandbox/pderop/dependencymanager-lambda/org.apache.felix.dependencymanager.lambda/src/org/apache/felix/dm/lambda/impl/BundleDependencyBuilderImpl.java
felix/sandbox/pderop/dependencymanager-lambda/org.apache.felix.dependencymanager.lambda/src/org/apache/felix/dm/lambda/impl/CompletableFutureDependencyImpl.java
felix/sandbox/pderop/dependencymanager-lambda/org.apache.felix.dependencymanager.lambda/src/org/apache/felix/dm/lambda/impl/ComponentBuilderImpl.java
felix/sandbox/pderop/dependencymanager-lambda/org.apache.felix.dependencymanager.lambda/src/org/apache/felix/dm/lambda/impl/ConfigurationDependencyBuilderImpl.java
felix/sandbox/pderop/dependencymanager-lambda/org.apache.felix.dependencymanager.lambda/src/org/apache/felix/dm/lambda/impl/FactoryPidAdapterBuilderImpl.java
felix/sandbox/pderop/dependencymanager-lambda/org.apache.felix.dependencymanager.lambda/src/org/apache/felix/dm/lambda/impl/Helpers.java
felix/sandbox/pderop/dependencymanager-lambda/org.apache.felix.dependencymanager.lambda/src/org/apache/felix/dm/lambda/impl/SRefAsDictionary.java
felix/sandbox/pderop/dependencymanager-lambda/org.apache.felix.dependencymanager.lambda/src/org/apache/felix/dm/lambda/impl/SRefAsMap.java
felix/sandbox/pderop/dependencymanager-lambda/org.apache.felix.dependencymanager.lambda/src/org/apache/felix/dm/lambda/impl/ServiceAdapterBuilderImpl.java
felix/sandbox/pderop/dependencymanager-lambda/org.apache.felix.dependencymanager.lambda/src/org/apache/felix/dm/lambda/impl/ServiceAspectBuilderImpl.java
felix/sandbox/pderop/dependencymanager-lambda/org.apache.felix.dependencymanager.lambda/src/org/apache/felix/dm/lambda/impl/ServiceCallbacksBuilderImpl.java
felix/sandbox/pderop/dependencymanager-lambda/org.apache.felix.dependencymanager.lambda/src/org/apache/felix/dm/lambda/impl/ServiceDependencyBuilderImpl.java
felix/sandbox/pderop/dependencymanager-lambda/org.apache.felix.dependencymanager.lambda/src/org/apache/felix/dm/lambda/packageinfo
Removed:
felix/sandbox/pderop/dependencymanager-lambda/org.apache.felix.dependencymanager.lambda/src/org/apache/felix/dm/builder/
Modified:
felix/sandbox/pderop/dependencymanager-lambda/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/builder/lambda/itest/AbstractServiceDependencyTest.java
felix/sandbox/pderop/dependencymanager-lambda/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/builder/lambda/itest/AdapterAndConsumerTest.java
felix/sandbox/pderop/dependencymanager-lambda/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/builder/lambda/itest/AdapterNoAutoConfigIfInstanceCallbackIsUsed.java
felix/sandbox/pderop/dependencymanager-lambda/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/builder/lambda/itest/AdapterWithCallbackInstanceTest.java
felix/sandbox/pderop/dependencymanager-lambda/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/builder/lambda/itest/AdapterWithExtraDependenciesTest.java
felix/sandbox/pderop/dependencymanager-lambda/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/builder/lambda/itest/AdapterWithInstanceBoundDependencyTest.java
felix/sandbox/pderop/dependencymanager-lambda/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/builder/lambda/itest/AdapterWithModifiedInstanceBoundDependencyTest.java
felix/sandbox/pderop/dependencymanager-lambda/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/builder/lambda/itest/AdapterWithPropagationTest.java
felix/sandbox/pderop/dependencymanager-lambda/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/builder/lambda/itest/AdapterWithoutPropagationTest.java
felix/sandbox/pderop/dependencymanager-lambda/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/builder/lambda/itest/AspectBaseTest.java
felix/sandbox/pderop/dependencymanager-lambda/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/builder/lambda/itest/AspectChainTest.java
felix/sandbox/pderop/dependencymanager-lambda/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/builder/lambda/itest/AspectDynamicsTest.java
felix/sandbox/pderop/dependencymanager-lambda/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/builder/lambda/itest/AspectServiceDependencyTest.java
felix/sandbox/pderop/dependencymanager-lambda/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/builder/lambda/itest/AspectServiceDependencyWithSwapCallbackTest.java
felix/sandbox/pderop/dependencymanager-lambda/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/builder/lambda/itest/AspectWhiteboardTest.java
felix/sandbox/pderop/dependencymanager-lambda/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/builder/lambda/itest/AspectWithCallbacksServiceDependencyTest.java
felix/sandbox/pderop/dependencymanager-lambda/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/builder/lambda/itest/AspectWithPropagationTest.java
felix/sandbox/pderop/dependencymanager-lambda/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/builder/lambda/itest/AutoConfigTest.java
felix/sandbox/pderop/dependencymanager-lambda/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/builder/lambda/itest/BundleAdapterTest.java
felix/sandbox/pderop/dependencymanager-lambda/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/builder/lambda/itest/BundleAdapterWithCallbacksNotAutoConfiguredTest.java
felix/sandbox/pderop/dependencymanager-lambda/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/builder/lambda/itest/BundleDependencyTest.java
felix/sandbox/pderop/dependencymanager-lambda/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/builder/lambda/itest/ComponentTest.java
felix/sandbox/pderop/dependencymanager-lambda/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/builder/lambda/itest/CompositionTest.java
felix/sandbox/pderop/dependencymanager-lambda/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/builder/lambda/itest/DynamicProxyAspectTest.java
felix/sandbox/pderop/dependencymanager-lambda/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/builder/lambda/itest/FactoryConfigurationAdapterTest.java
felix/sandbox/pderop/dependencymanager-lambda/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/builder/lambda/itest/FactoryInjectedWithConfigurationBeforeTheCreateMethod.java
felix/sandbox/pderop/dependencymanager-lambda/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/builder/lambda/itest/InstanceBoundDependencyTest.java
felix/sandbox/pderop/dependencymanager-lambda/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/builder/lambda/itest/ModifiedBundleDependencyTest.java
felix/sandbox/pderop/dependencymanager-lambda/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/builder/lambda/itest/MultipleExtraDependenciesTest.java
felix/sandbox/pderop/dependencymanager-lambda/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/builder/lambda/itest/MultipleExtraDependencyTest.java
felix/sandbox/pderop/dependencymanager-lambda/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/builder/lambda/itest/MultipleExtraDependencyTest2.java
felix/sandbox/pderop/dependencymanager-lambda/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/builder/lambda/itest/MultipleServiceDependencyTest.java
felix/sandbox/pderop/dependencymanager-lambda/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/builder/lambda/itest/RemovedDependencyTest.java
felix/sandbox/pderop/dependencymanager-lambda/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/builder/lambda/itest/ServiceDependencyCallbackSignaturesTest.java
felix/sandbox/pderop/dependencymanager-lambda/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/builder/lambda/itest/ServiceDependencyInjectionTest.java
felix/sandbox/pderop/dependencymanager-lambda/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/builder/lambda/itest/ServiceDependencyPropagateTest.java
felix/sandbox/pderop/dependencymanager-lambda/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/builder/lambda/itest/ServiceDependencyTest.java
felix/sandbox/pderop/dependencymanager-lambda/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/builder/lambda/itest/ServiceDependencyThroughCallbackInstanceTest.java
felix/sandbox/pderop/dependencymanager-lambda/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/builder/lambda/itest/ServiceUpdateTest.java
felix/sandbox/pderop/dependencymanager-lambda/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/builder/lambda/itest/TemporalServiceDependencyTest.java
felix/sandbox/pderop/dependencymanager-lambda/org.apache.felix.dependencymanager.lambda.samples/src/org/apache/felix/dependencymanager/lambda/samples/compositefactory/Activator.java
felix/sandbox/pderop/dependencymanager-lambda/org.apache.felix.dependencymanager.lambda.samples/src/org/apache/felix/dependencymanager/lambda/samples/device/Activator.java
felix/sandbox/pderop/dependencymanager-lambda/org.apache.felix.dependencymanager.lambda.samples/src/org/apache/felix/dependencymanager/lambda/samples/device/DeviceAccessImpl.java
felix/sandbox/pderop/dependencymanager-lambda/org.apache.felix.dependencymanager.lambda.samples/src/org/apache/felix/dependencymanager/lambda/samples/dictionary/Activator.java
felix/sandbox/pderop/dependencymanager-lambda/org.apache.felix.dependencymanager.lambda.samples/src/org/apache/felix/dependencymanager/lambda/samples/factory/Activator.java
felix/sandbox/pderop/dependencymanager-lambda/org.apache.felix.dependencymanager.lambda.samples/src/org/apache/felix/dependencymanager/lambda/samples/future/Activator.java
felix/sandbox/pderop/dependencymanager-lambda/org.apache.felix.dependencymanager.lambda.samples/src/org/apache/felix/dependencymanager/lambda/samples/hello/Activator.java
felix/sandbox/pderop/dependencymanager-lambda/org.apache.felix.dependencymanager.lambda.samples/src/org/apache/felix/dependencymanager/lambda/samples/rx/completable/Activator.java
felix/sandbox/pderop/dependencymanager-lambda/org.apache.felix.dependencymanager.lambda.samples/src/org/apache/felix/dependencymanager/lambda/samples/rx/completable/SiteInfoImpl.java
felix/sandbox/pderop/dependencymanager-lambda/org.apache.felix.dependencymanager.lambda.samples/src/org/apache/felix/dependencymanager/lambda/samples/rx/observable/Activator.java
felix/sandbox/pderop/dependencymanager-lambda/org.apache.felix.dependencymanager.lambda.samples/src/org/apache/felix/dependencymanager/lambda/samples/rx/observable/ObservableComponent.java
felix/sandbox/pderop/dependencymanager-lambda/org.apache.felix.dependencymanager.lambda/bnd.bnd
Modified:
felix/sandbox/pderop/dependencymanager-lambda/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/builder/lambda/itest/AbstractServiceDependencyTest.java
URL:
http://svn.apache.org/viewvc/felix/sandbox/pderop/dependencymanager-lambda/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/builder/lambda/itest/AbstractServiceDependencyTest.java?rev=1727214&r1=1727213&r2=1727214&view=diff
==============================================================================
---
felix/sandbox/pderop/dependencymanager-lambda/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/builder/lambda/itest/AbstractServiceDependencyTest.java
(original)
+++
felix/sandbox/pderop/dependencymanager-lambda/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/builder/lambda/itest/AbstractServiceDependencyTest.java
Wed Jan 27 23:27:34 2016
@@ -18,7 +18,7 @@
*/
package org.apache.felix.dm.builder.lambda.itest;
-import static
org.apache.felix.dm.builder.lambda.DependencyActivatorBase.component;
+import static org.apache.felix.dm.lambda.DependencyActivatorBase.component;
import org.apache.felix.dm.Component;
import org.apache.felix.dm.DependencyManager;
@@ -38,7 +38,7 @@ public class AbstractServiceDependencyTe
.provides(ServiceAbstract.class).impl(new
ServiceProvider(e)).build();
Component sc = component(m)
- .impl(new ServiceConsumer(e)).withService(ServiceAbstract.class,
srv -> srv.cb(ServiceConsumer::bind, ServiceConsumer::unbind))
+ .impl(new ServiceConsumer(e)).withSrv(ServiceAbstract.class, srv ->
srv.cb(ServiceConsumer::bind, ServiceConsumer::unbind))
.build();
m.add(sp);
Modified:
felix/sandbox/pderop/dependencymanager-lambda/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/builder/lambda/itest/AdapterAndConsumerTest.java
URL:
http://svn.apache.org/viewvc/felix/sandbox/pderop/dependencymanager-lambda/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/builder/lambda/itest/AdapterAndConsumerTest.java?rev=1727214&r1=1727213&r2=1727214&view=diff
==============================================================================
---
felix/sandbox/pderop/dependencymanager-lambda/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/builder/lambda/itest/AdapterAndConsumerTest.java
(original)
+++
felix/sandbox/pderop/dependencymanager-lambda/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/builder/lambda/itest/AdapterAndConsumerTest.java
Wed Jan 27 23:27:34 2016
@@ -18,8 +18,8 @@
*/
package org.apache.felix.dm.builder.lambda.itest;
-import static
org.apache.felix.dm.builder.lambda.DependencyActivatorBase.adapter;
-import static
org.apache.felix.dm.builder.lambda.DependencyActivatorBase.component;
+import static org.apache.felix.dm.lambda.DependencyActivatorBase.adapter;
+import static org.apache.felix.dm.lambda.DependencyActivatorBase.component;
import org.apache.felix.dm.Component;
import org.apache.felix.dm.DependencyManager;
@@ -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)).withService(AdaptedService.class).build();
+ Component consumer = component(m).impl(new
ServiceConsumer(e)).withSrv(AdaptedService.class).build();
Component adapter = adapter(m,
OriginalService.class).provides(AdaptedService.class).impl(ServiceAdapter.class).build();
// add the provider and the adapter
Modified:
felix/sandbox/pderop/dependencymanager-lambda/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/builder/lambda/itest/AdapterNoAutoConfigIfInstanceCallbackIsUsed.java
URL:
http://svn.apache.org/viewvc/felix/sandbox/pderop/dependencymanager-lambda/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/builder/lambda/itest/AdapterNoAutoConfigIfInstanceCallbackIsUsed.java?rev=1727214&r1=1727213&r2=1727214&view=diff
==============================================================================
---
felix/sandbox/pderop/dependencymanager-lambda/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/builder/lambda/itest/AdapterNoAutoConfigIfInstanceCallbackIsUsed.java
(original)
+++
felix/sandbox/pderop/dependencymanager-lambda/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/builder/lambda/itest/AdapterNoAutoConfigIfInstanceCallbackIsUsed.java
Wed Jan 27 23:27:34 2016
@@ -18,8 +18,8 @@
*/
package org.apache.felix.dm.builder.lambda.itest;
-import static
org.apache.felix.dm.builder.lambda.DependencyActivatorBase.adapter;
-import static
org.apache.felix.dm.builder.lambda.DependencyActivatorBase.component;
+import static org.apache.felix.dm.lambda.DependencyActivatorBase.adapter;
+import static org.apache.felix.dm.lambda.DependencyActivatorBase.component;
import org.apache.felix.dm.DependencyManager;
import org.junit.Assert;
Modified:
felix/sandbox/pderop/dependencymanager-lambda/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/builder/lambda/itest/AdapterWithCallbackInstanceTest.java
URL:
http://svn.apache.org/viewvc/felix/sandbox/pderop/dependencymanager-lambda/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/builder/lambda/itest/AdapterWithCallbackInstanceTest.java?rev=1727214&r1=1727213&r2=1727214&view=diff
==============================================================================
---
felix/sandbox/pderop/dependencymanager-lambda/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/builder/lambda/itest/AdapterWithCallbackInstanceTest.java
(original)
+++
felix/sandbox/pderop/dependencymanager-lambda/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/builder/lambda/itest/AdapterWithCallbackInstanceTest.java
Wed Jan 27 23:27:34 2016
@@ -18,8 +18,8 @@
*/
package org.apache.felix.dm.builder.lambda.itest;
-import static
org.apache.felix.dm.builder.lambda.DependencyActivatorBase.adapter;
-import static
org.apache.felix.dm.builder.lambda.DependencyActivatorBase.component;
+import static org.apache.felix.dm.lambda.DependencyActivatorBase.adapter;
+import static org.apache.felix.dm.lambda.DependencyActivatorBase.component;
import java.util.Hashtable;
import java.util.Map;
@@ -41,11 +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)).withService(AdaptedService.class).build();
+ Component consumer = component(m).impl(new
ServiceConsumer(e)).withSrv(AdaptedService.class).build();
ServiceAdapterCallbackInstance callbackInstance = new
ServiceAdapterCallbackInstance(e);
Component adapter = adapter(m, OriginalService.class)
- .provides(AdaptedService.class).impl(new
ServiceAdapter(e)).autoConfig("m_originalService").propagate(true).cbi(callbackInstance,
"set", "changed", "unset")
+ .provides(AdaptedService.class).impl(new
ServiceAdapter(e)).propagate(true)
+ .autoConfig("m_originalService")
+ .cbi(callbackInstance, "set", "changed", "unset")
.build();
// add the provider and the adapter
@@ -80,12 +82,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)).withService(AdaptedService.class).build();
+ Component consumer = component(m).impl(new
ServiceConsumer(e)).withSrv(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).autoConfig("m_originalService").propagate(true)
+ .autoAdd(false).propagate(true)
+ .autoConfig("m_originalService")
.cbi(callbackInstance::set, callbackInstance::changed,
callbackInstance::unset));
// add the provider and the adapter
Modified:
felix/sandbox/pderop/dependencymanager-lambda/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/builder/lambda/itest/AdapterWithExtraDependenciesTest.java
URL:
http://svn.apache.org/viewvc/felix/sandbox/pderop/dependencymanager-lambda/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/builder/lambda/itest/AdapterWithExtraDependenciesTest.java?rev=1727214&r1=1727213&r2=1727214&view=diff
==============================================================================
---
felix/sandbox/pderop/dependencymanager-lambda/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/builder/lambda/itest/AdapterWithExtraDependenciesTest.java
(original)
+++
felix/sandbox/pderop/dependencymanager-lambda/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/builder/lambda/itest/AdapterWithExtraDependenciesTest.java
Wed Jan 27 23:27:34 2016
@@ -18,8 +18,8 @@
*/
package org.apache.felix.dm.builder.lambda.itest;
-import static
org.apache.felix.dm.builder.lambda.DependencyActivatorBase.adapter;
-import static
org.apache.felix.dm.builder.lambda.DependencyActivatorBase.component;
+import static org.apache.felix.dm.lambda.DependencyActivatorBase.adapter;
+import static org.apache.felix.dm.lambda.DependencyActivatorBase.component;
import org.apache.felix.dm.Component;
import org.apache.felix.dm.DependencyManager;
@@ -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).withService(S2.class, s2 -> s2.cb("add",
"remove")).build();
+ Component sa = adapter(m, S1.class).impl(SA.class).withSrv(S2.class,
s2 -> s2.cb("add", "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).withService(S2.class, s2 -> s2.cb(SA::add,
SA::remove)).build();
+ Component sa = adapter(m, S1.class).impl(SA.class).withSrv(S2.class,
s2 -> s2.cb(SA::add, SA::remove)).build();
m.add(sa);
// create a service S1, which triggers the creation of the first
adapter instance (A1)
Modified:
felix/sandbox/pderop/dependencymanager-lambda/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/builder/lambda/itest/AdapterWithInstanceBoundDependencyTest.java
URL:
http://svn.apache.org/viewvc/felix/sandbox/pderop/dependencymanager-lambda/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/builder/lambda/itest/AdapterWithInstanceBoundDependencyTest.java?rev=1727214&r1=1727213&r2=1727214&view=diff
==============================================================================
---
felix/sandbox/pderop/dependencymanager-lambda/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/builder/lambda/itest/AdapterWithInstanceBoundDependencyTest.java
(original)
+++
felix/sandbox/pderop/dependencymanager-lambda/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/builder/lambda/itest/AdapterWithInstanceBoundDependencyTest.java
Wed Jan 27 23:27:34 2016
@@ -18,8 +18,8 @@
*/
package org.apache.felix.dm.builder.lambda.itest;
-import static
org.apache.felix.dm.builder.lambda.DependencyActivatorBase.adapter;
-import static
org.apache.felix.dm.builder.lambda.DependencyActivatorBase.component;
+import static org.apache.felix.dm.lambda.DependencyActivatorBase.adapter;
+import static org.apache.felix.dm.lambda.DependencyActivatorBase.component;
import org.apache.felix.dm.Component;
import org.apache.felix.dm.DependencyManager;
@@ -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).withService(ServiceInterface3.class).build();
+ Component sc = component(m).impl(new
ServiceConsumer(e)).autoAdd(false).withSrv(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.withService(ServiceInterface2.class));
+ component(m_component, c->c.withSrv(ServiceInterface2.class));
}
public void start() {
m_ensure.step(2);
Modified:
felix/sandbox/pderop/dependencymanager-lambda/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/builder/lambda/itest/AdapterWithModifiedInstanceBoundDependencyTest.java
URL:
http://svn.apache.org/viewvc/felix/sandbox/pderop/dependencymanager-lambda/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/builder/lambda/itest/AdapterWithModifiedInstanceBoundDependencyTest.java?rev=1727214&r1=1727213&r2=1727214&view=diff
==============================================================================
---
felix/sandbox/pderop/dependencymanager-lambda/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/builder/lambda/itest/AdapterWithModifiedInstanceBoundDependencyTest.java
(original)
+++
felix/sandbox/pderop/dependencymanager-lambda/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/builder/lambda/itest/AdapterWithModifiedInstanceBoundDependencyTest.java
Wed Jan 27 23:27:34 2016
@@ -18,8 +18,8 @@
*/
package org.apache.felix.dm.builder.lambda.itest;
-import static
org.apache.felix.dm.builder.lambda.DependencyActivatorBase.adapter;
-import static
org.apache.felix.dm.builder.lambda.DependencyActivatorBase.component;
+import static org.apache.felix.dm.lambda.DependencyActivatorBase.adapter;
+import static org.apache.felix.dm.lambda.DependencyActivatorBase.component;
import java.util.Map;
import java.util.Properties;
@@ -74,7 +74,7 @@ public class AdapterWithModifiedInstance
void init(Component comp) {
m_e.step(2);
- component(comp, c->c.withService(C.class, s->s.cb("addC",
"removeC")));
+ component(comp, c->c.withSrv(C.class, s->s.cb("addC", "removeC")));
}
void addA(A a, Map<String, Object> properties) {
@@ -117,7 +117,7 @@ public class AdapterWithModifiedInstance
Component a = component(m).impl(new
AImpl(e)).provides(A.class).properties(foo -> "bar").build();
Component b = adapter(m, A.class).cb("addA", "changeA",
"removeA").provides(B.class).impl(new BImpl(e)).build();
- Component c = component(m).impl(new
CImpl()).provides(C.class).withService(A.class, "(foo=bar)").build();
+ Component c = component(m).impl(new
CImpl()).provides(C.class).withSrv(A.class, "(foo=bar)").build();
m.add(a);
m.add(c);
@@ -143,13 +143,9 @@ public class AdapterWithModifiedInstance
DependencyManager m = getDM();
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).withService(A.class, s ->
s.filter("(foo=bar)")).build();
+ 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();
m.add(a);
m.add(c);
Modified:
felix/sandbox/pderop/dependencymanager-lambda/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/builder/lambda/itest/AdapterWithPropagationTest.java
URL:
http://svn.apache.org/viewvc/felix/sandbox/pderop/dependencymanager-lambda/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/builder/lambda/itest/AdapterWithPropagationTest.java?rev=1727214&r1=1727213&r2=1727214&view=diff
==============================================================================
---
felix/sandbox/pderop/dependencymanager-lambda/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/builder/lambda/itest/AdapterWithPropagationTest.java
(original)
+++
felix/sandbox/pderop/dependencymanager-lambda/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/builder/lambda/itest/AdapterWithPropagationTest.java
Wed Jan 27 23:27:34 2016
@@ -18,8 +18,8 @@
*/
package org.apache.felix.dm.builder.lambda.itest;
-import static
org.apache.felix.dm.builder.lambda.DependencyActivatorBase.adapter;
-import static
org.apache.felix.dm.builder.lambda.DependencyActivatorBase.component;
+import static org.apache.felix.dm.lambda.DependencyActivatorBase.adapter;
+import static org.apache.felix.dm.lambda.DependencyActivatorBase.component;
import java.util.Hashtable;
import java.util.Map;
@@ -103,7 +103,7 @@ public class AdapterWithPropagationTest
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)).withService(S2.class, s ->
s.cb("add", "change", null)).build();
+ Component s3 = component(m).impl(new S3(e)).withSrv(S2.class, s ->
s.cb("add", "change", null)).build();
m.add(s1);
m.add(s1Adapter);
Modified:
felix/sandbox/pderop/dependencymanager-lambda/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/builder/lambda/itest/AdapterWithoutPropagationTest.java
URL:
http://svn.apache.org/viewvc/felix/sandbox/pderop/dependencymanager-lambda/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/builder/lambda/itest/AdapterWithoutPropagationTest.java?rev=1727214&r1=1727213&r2=1727214&view=diff
==============================================================================
---
felix/sandbox/pderop/dependencymanager-lambda/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/builder/lambda/itest/AdapterWithoutPropagationTest.java
(original)
+++
felix/sandbox/pderop/dependencymanager-lambda/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/builder/lambda/itest/AdapterWithoutPropagationTest.java
Wed Jan 27 23:27:34 2016
@@ -18,8 +18,8 @@
*/
package org.apache.felix.dm.builder.lambda.itest;
-import static
org.apache.felix.dm.builder.lambda.DependencyActivatorBase.adapter;
-import static
org.apache.felix.dm.builder.lambda.DependencyActivatorBase.component;
+import static org.apache.felix.dm.lambda.DependencyActivatorBase.adapter;
+import static org.apache.felix.dm.lambda.DependencyActivatorBase.component;
import java.util.Dictionary;
import java.util.Hashtable;
@@ -49,7 +49,7 @@ public class AdapterWithoutPropagationTe
// The consumer depends on the AdaptedService, but won't see foo=bar
property from the adaptee
Component consumer = component(m)
- .impl(new ServiceConsumer(e)).withService(AdaptedService.class, b
-> b.cb("set", "change", null)).build();
+ .impl(new ServiceConsumer(e)).withSrv(AdaptedService.class, b ->
b.cb("set", "change", null)).build();
// add the provider and the adapter
m.add(provider);
@@ -80,12 +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).cbi(saimpl::set, saimpl::change,
null).provides(AdaptedService.class).build();
+ Component adapter = adapter(m,
OriginalService.class).propagate(false).impl(saimpl).provides(AdaptedService.class).cbi(saimpl::set,
saimpl::change, null).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).withService(AdaptedService.class, s ->
s.cbi(scimpl::set, scimpl::change, null)).build();
+ Component consumer =
component(m).impl(scimpl).withSrv(AdaptedService.class, s -> s.cbi(scimpl::set,
scimpl::change, null)).build();
// add the provider and the adapter
m.add(provider);
Modified:
felix/sandbox/pderop/dependencymanager-lambda/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/builder/lambda/itest/AspectBaseTest.java
URL:
http://svn.apache.org/viewvc/felix/sandbox/pderop/dependencymanager-lambda/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/builder/lambda/itest/AspectBaseTest.java?rev=1727214&r1=1727213&r2=1727214&view=diff
==============================================================================
---
felix/sandbox/pderop/dependencymanager-lambda/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/builder/lambda/itest/AspectBaseTest.java
(original)
+++
felix/sandbox/pderop/dependencymanager-lambda/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/builder/lambda/itest/AspectBaseTest.java
Wed Jan 27 23:27:34 2016
@@ -18,8 +18,8 @@
*/
package org.apache.felix.dm.builder.lambda.itest;
-import static
org.apache.felix.dm.builder.lambda.DependencyActivatorBase.aspect;
-import static
org.apache.felix.dm.builder.lambda.DependencyActivatorBase.component;
+import static org.apache.felix.dm.lambda.DependencyActivatorBase.aspect;
+import static org.apache.felix.dm.lambda.DependencyActivatorBase.component;
import java.util.ArrayList;
import java.util.List;
@@ -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).withService(ServiceInterface.class, srv -> srv.cb("add",
"remove").autoConfig("m_service")).build();
+ Component sc = component(m).impl(c).withSrv(ServiceInterface.class,
srv -> srv.cb("add", "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).withService(ServiceInterface.class, srv ->
srv.cbi(c::add, c::remove).autoConfig("m_service")).build();
+ .impl(c).withSrv(ServiceInterface.class, srv -> srv.cbi(c::add,
c::remove).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).withService(ServiceInterface.class, srv -> srv.cb("add",
"remove").autoConfig("m_service")).build();
+ Component sc = component(m).impl(c).withSrv(ServiceInterface.class,
srv -> srv.cb("add", "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).withService(ServiceInterface.class, srv -> srv.cbi(c::add,
c::remove).autoConfig("m_service")).build();
+ Component sc = component(m).impl(c).withSrv(ServiceInterface.class,
srv -> srv.cbi(c::add, c::remove).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).withService(ServiceInterface.class, srv -> srv.cb("add",
"remove")).build();
+ Component sc = component(m).impl(c).withSrv(ServiceInterface.class,
srv -> srv.cb("add", "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).withService(ServiceInterface.class, srv -> srv.cbi(c::add,
c::remove)).build();
+ Component sc = component(m).impl(c).withSrv(ServiceInterface.class,
srv -> srv.cbi(c::add, c::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();
Modified:
felix/sandbox/pderop/dependencymanager-lambda/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/builder/lambda/itest/AspectChainTest.java
URL:
http://svn.apache.org/viewvc/felix/sandbox/pderop/dependencymanager-lambda/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/builder/lambda/itest/AspectChainTest.java?rev=1727214&r1=1727213&r2=1727214&view=diff
==============================================================================
---
felix/sandbox/pderop/dependencymanager-lambda/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/builder/lambda/itest/AspectChainTest.java
(original)
+++
felix/sandbox/pderop/dependencymanager-lambda/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/builder/lambda/itest/AspectChainTest.java
Wed Jan 27 23:27:34 2016
@@ -18,8 +18,8 @@
*/
package org.apache.felix.dm.builder.lambda.itest;
-import static
org.apache.felix.dm.builder.lambda.DependencyActivatorBase.aspect;
-import static
org.apache.felix.dm.builder.lambda.DependencyActivatorBase.component;
+import static org.apache.felix.dm.lambda.DependencyActivatorBase.aspect;
+import static org.apache.felix.dm.lambda.DependencyActivatorBase.component;
import org.apache.felix.dm.Component;
import org.apache.felix.dm.DependencyManager;
@@ -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)).withService(ServiceInterface.class).build();
+ Component sc = component(m).impl(new
ServiceConsumer(e)).withSrv(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/sandbox/pderop/dependencymanager-lambda/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/builder/lambda/itest/AspectDynamicsTest.java
URL:
http://svn.apache.org/viewvc/felix/sandbox/pderop/dependencymanager-lambda/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/builder/lambda/itest/AspectDynamicsTest.java?rev=1727214&r1=1727213&r2=1727214&view=diff
==============================================================================
---
felix/sandbox/pderop/dependencymanager-lambda/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/builder/lambda/itest/AspectDynamicsTest.java
(original)
+++
felix/sandbox/pderop/dependencymanager-lambda/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/builder/lambda/itest/AspectDynamicsTest.java
Wed Jan 27 23:27:34 2016
@@ -18,8 +18,8 @@
*/
package org.apache.felix.dm.builder.lambda.itest;
-import static
org.apache.felix.dm.builder.lambda.DependencyActivatorBase.aspect;
-import static
org.apache.felix.dm.builder.lambda.DependencyActivatorBase.component;
+import static org.apache.felix.dm.lambda.DependencyActivatorBase.aspect;
+import static org.apache.felix.dm.lambda.DependencyActivatorBase.component;
import org.apache.felix.dm.Component;
import org.apache.felix.dm.DependencyManager;
@@ -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)).withService(ServiceInterface.class, s->s.cb("add", null,
null, "swap")).build();
+ Component consumer = component(m).impl(new
ServiceConsumer(e)).withSrv(ServiceInterface.class, s->s.cb("add", null, null,
"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)).withService(ServiceInterface.class,
s->s.cb(ServiceConsumer::add).sw(ServiceConsumer::swap)).build();
+ Component consumer = component(m).impl(new
ServiceConsumer(e)).withSrv(ServiceInterface.class,
s->s.cb(ServiceConsumer::add).sw(ServiceConsumer::swap)).build();
Component aspect = aspect(m,
ServiceInterface.class).autoAdd(false).rank(1).impl(new ServiceAspect(e,
aspectStopEnsure)).build();
m.add(consumer);
Modified:
felix/sandbox/pderop/dependencymanager-lambda/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/builder/lambda/itest/AspectServiceDependencyTest.java
URL:
http://svn.apache.org/viewvc/felix/sandbox/pderop/dependencymanager-lambda/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/builder/lambda/itest/AspectServiceDependencyTest.java?rev=1727214&r1=1727213&r2=1727214&view=diff
==============================================================================
---
felix/sandbox/pderop/dependencymanager-lambda/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/builder/lambda/itest/AspectServiceDependencyTest.java
(original)
+++
felix/sandbox/pderop/dependencymanager-lambda/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/builder/lambda/itest/AspectServiceDependencyTest.java
Wed Jan 27 23:27:34 2016
@@ -18,8 +18,8 @@
*/
package org.apache.felix.dm.builder.lambda.itest;
-import static
org.apache.felix.dm.builder.lambda.DependencyActivatorBase.aspect;
-import static
org.apache.felix.dm.builder.lambda.DependencyActivatorBase.component;
+import static org.apache.felix.dm.lambda.DependencyActivatorBase.aspect;
+import static org.apache.felix.dm.lambda.DependencyActivatorBase.component;
import org.apache.felix.dm.Component;
import org.apache.felix.dm.DependencyManager;
@@ -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)).withService(ServiceInterface.class, s->s.cb("add",
"remove")).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).impl(ServiceProviderAspect.class).build();
m.add(sp);
Modified:
felix/sandbox/pderop/dependencymanager-lambda/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/builder/lambda/itest/AspectServiceDependencyWithSwapCallbackTest.java
URL:
http://svn.apache.org/viewvc/felix/sandbox/pderop/dependencymanager-lambda/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/builder/lambda/itest/AspectServiceDependencyWithSwapCallbackTest.java?rev=1727214&r1=1727213&r2=1727214&view=diff
==============================================================================
---
felix/sandbox/pderop/dependencymanager-lambda/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/builder/lambda/itest/AspectServiceDependencyWithSwapCallbackTest.java
(original)
+++
felix/sandbox/pderop/dependencymanager-lambda/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/builder/lambda/itest/AspectServiceDependencyWithSwapCallbackTest.java
Wed Jan 27 23:27:34 2016
@@ -18,8 +18,8 @@
*/
package org.apache.felix.dm.builder.lambda.itest;
-import static
org.apache.felix.dm.builder.lambda.DependencyActivatorBase.aspect;
-import static
org.apache.felix.dm.builder.lambda.DependencyActivatorBase.component;
+import static org.apache.felix.dm.lambda.DependencyActivatorBase.aspect;
+import static org.apache.felix.dm.lambda.DependencyActivatorBase.component;
import org.apache.felix.dm.Component;
import org.apache.felix.dm.DependencyManager;
@@ -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)).withService(ServiceInterface.class, s->s.cb("add", null,
"remove", "swap")).build();
+ Component sc = component(m).impl(new
ServiceConsumer(e)).withSrv(ServiceInterface.class, s->s.cb("add", null,
"remove", "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).withService(ServiceInterface.class,
s->s.cbi(scimpl::add, scimpl::remove).swi(scimpl::swap)).build();
+ Component sc =
component(m).impl(scimpl).withSrv(ServiceInterface.class, s->s.cbi(scimpl::add,
scimpl::remove).swi(scimpl::swap)).build();
Component asp = aspect(m,
ServiceInterface.class).rank(100).impl(ServiceProviderAspect.class).build();
m.add(sp);
m.add(sc);
Modified:
felix/sandbox/pderop/dependencymanager-lambda/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/builder/lambda/itest/AspectWhiteboardTest.java
URL:
http://svn.apache.org/viewvc/felix/sandbox/pderop/dependencymanager-lambda/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/builder/lambda/itest/AspectWhiteboardTest.java?rev=1727214&r1=1727213&r2=1727214&view=diff
==============================================================================
---
felix/sandbox/pderop/dependencymanager-lambda/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/builder/lambda/itest/AspectWhiteboardTest.java
(original)
+++
felix/sandbox/pderop/dependencymanager-lambda/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/builder/lambda/itest/AspectWhiteboardTest.java
Wed Jan 27 23:27:34 2016
@@ -17,8 +17,8 @@
* under the License.
*/
package org.apache.felix.dm.builder.lambda.itest;
-import static
org.apache.felix.dm.builder.lambda.DependencyActivatorBase.aspect;
-import static
org.apache.felix.dm.builder.lambda.DependencyActivatorBase.component;
+import static org.apache.felix.dm.lambda.DependencyActivatorBase.aspect;
+import static org.apache.felix.dm.lambda.DependencyActivatorBase.component;
import java.util.ArrayList;
import java.util.List;
@@ -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).withService(ServiceInterface.class,
srv->srv.required(false).cb("add", "remove")).build();
+ Component sc = component(m).impl(sci).withSrv(ServiceInterface.class,
srv->srv.required(false).cb("add", "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,7 +120,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).withService(ServiceInterface.class,
srv->srv.required(false).cbi(sci::add, sci::remove)).build();
+ 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();
Modified:
felix/sandbox/pderop/dependencymanager-lambda/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/builder/lambda/itest/AspectWithCallbacksServiceDependencyTest.java
URL:
http://svn.apache.org/viewvc/felix/sandbox/pderop/dependencymanager-lambda/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/builder/lambda/itest/AspectWithCallbacksServiceDependencyTest.java?rev=1727214&r1=1727213&r2=1727214&view=diff
==============================================================================
---
felix/sandbox/pderop/dependencymanager-lambda/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/builder/lambda/itest/AspectWithCallbacksServiceDependencyTest.java
(original)
+++
felix/sandbox/pderop/dependencymanager-lambda/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/builder/lambda/itest/AspectWithCallbacksServiceDependencyTest.java
Wed Jan 27 23:27:34 2016
@@ -18,8 +18,8 @@
*/
package org.apache.felix.dm.builder.lambda.itest;
-import static
org.apache.felix.dm.builder.lambda.DependencyActivatorBase.aspect;
-import static
org.apache.felix.dm.builder.lambda.DependencyActivatorBase.component;
+import static org.apache.felix.dm.lambda.DependencyActivatorBase.aspect;
+import static org.apache.felix.dm.lambda.DependencyActivatorBase.component;
import org.apache.felix.dm.Component;
import org.apache.felix.dm.DependencyManager;
@@ -35,7 +35,7 @@ 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)).withService(ServiceInterface.class, s->s.cb("add",
"remove")).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();
m.add(sp);
@@ -55,8 +55,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.getName()).build();
- Component sc = component(m).impl(new
ServiceConsumer(e)).withService(ServiceInterface.class,
s->s.cb(ServiceConsumer::add, ServiceConsumer::remove)).build();
- Component asp = aspect(m,
ServiceInterface.class).impl(ServiceProviderAspect.class).rank(100).cb(ServiceProviderAspect::add,
ServiceProviderAspect::remove).sw(ServiceProviderAspect::swap).build();
+ Component sc = component(m).impl(new
ServiceConsumer(e)).withSrv(ServiceInterface.class,
s->s.cb(ServiceConsumer::add, ServiceConsumer::remove)).build();
+ Component asp = aspect(m, ServiceInterface.class)
+ .impl(ServiceProviderAspect.class).rank(100)
+ .cb(ServiceProviderAspect::add,
ServiceProviderAspect::remove).sw(ServiceProviderAspect::swap)
+ .build();
m.add(sp);
m.add(sc);
@@ -75,11 +78,14 @@ 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)).withService(ServiceInterface.class, s->s.cb("add",
"remove")).build();
+ Component sc = component(m).impl(new
ServiceConsumer(e)).withSrv(ServiceInterface.class, s->s.cb("add",
"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)
+ .cbi(aspectCb::add, aspectCb::remove).swi(aspectCb::swap)
+ .build();
m.add(sp);
m.add(sc);
Modified:
felix/sandbox/pderop/dependencymanager-lambda/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/builder/lambda/itest/AspectWithPropagationTest.java
URL:
http://svn.apache.org/viewvc/felix/sandbox/pderop/dependencymanager-lambda/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/builder/lambda/itest/AspectWithPropagationTest.java?rev=1727214&r1=1727213&r2=1727214&view=diff
==============================================================================
---
felix/sandbox/pderop/dependencymanager-lambda/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/builder/lambda/itest/AspectWithPropagationTest.java
(original)
+++
felix/sandbox/pderop/dependencymanager-lambda/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/builder/lambda/itest/AspectWithPropagationTest.java
Wed Jan 27 23:27:34 2016
@@ -17,9 +17,9 @@
* under the License.
*/
package org.apache.felix.dm.builder.lambda.itest;
-import static
org.apache.felix.dm.builder.lambda.DependencyActivatorBase.adapter;
-import static
org.apache.felix.dm.builder.lambda.DependencyActivatorBase.aspect;
-import static
org.apache.felix.dm.builder.lambda.DependencyActivatorBase.component;
+import static org.apache.felix.dm.lambda.DependencyActivatorBase.adapter;
+import static org.apache.felix.dm.lambda.DependencyActivatorBase.aspect;
+import static org.apache.felix.dm.lambda.DependencyActivatorBase.component;
import java.util.Dictionary;
import java.util.HashMap;
@@ -99,7 +99,7 @@ public class AspectWithPropagationTest e
}
}
};
- Component clientComp = component(m).impl(client).withService(S.class,
srv->srv.cb("add", "change", null)).build();
+ Component clientComp = component(m).impl(client).withSrv(S.class,
srv->srv.cb("add", "change", null)).build();
// Add components in dependency manager
m.add(sComp);
@@ -151,7 +151,7 @@ public class AspectWithPropagationTest e
// Create an aspect aware client, depending on "S" service.
Client clientImpl;
- Component client = component(m).impl((clientImpl = new
Client())).withService(S.class, srv -> srv.cb("add", "change", "remove",
"swap")).build();
+ Component client = component(m).impl((clientImpl = new
Client())).withSrv(S.class, srv -> srv.cb("add", "change", "remove",
"swap")).build();
// Create some "S" aspects
Component[] aspects = new Component[ASPECTS];
@@ -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())).withService(S.class, srv->srv.cb("add", "change",
"remove")).build();
+ Component client = component(m).impl((clientImpl = new
Client())).withSrv(S.class, srv->srv.cb("add", "change", "remove")).build();
// Create some "S" aspects
Component[] aspects = new Component[ASPECTS];
@@ -365,7 +365,7 @@ public class AspectWithPropagationTest e
// Create Client2, which depends on "S2" service.
Client2 client2Impl;
- Component client2 = component(m).impl((client2Impl = new
Client2())).withService(S2.class, srv -> srv.cb("add", "change", null)).build();
+ Component client2 = component(m).impl((client2Impl = new
Client2())).withSrv(S2.class, srv -> srv.cb("add", "change", null)).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())).withService(S2.class, srv->srv.cb("add", "change", null)).build();
+ Component client2 = component(m).impl((client2Impl = new
Client2())).withSrv(S2.class, srv->srv.cb("add", "change", null)).build();
// Register client2
m.add(client2);
Modified:
felix/sandbox/pderop/dependencymanager-lambda/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/builder/lambda/itest/AutoConfigTest.java
URL:
http://svn.apache.org/viewvc/felix/sandbox/pderop/dependencymanager-lambda/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/builder/lambda/itest/AutoConfigTest.java?rev=1727214&r1=1727213&r2=1727214&view=diff
==============================================================================
---
felix/sandbox/pderop/dependencymanager-lambda/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/builder/lambda/itest/AutoConfigTest.java
(original)
+++
felix/sandbox/pderop/dependencymanager-lambda/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/builder/lambda/itest/AutoConfigTest.java
Wed Jan 27 23:27:34 2016
@@ -18,7 +18,7 @@
*/
package org.apache.felix.dm.builder.lambda.itest;
-import static
org.apache.felix.dm.builder.lambda.DependencyActivatorBase.component;
+import static org.apache.felix.dm.lambda.DependencyActivatorBase.component;
import java.util.ArrayList;
import java.util.Dictionary;
@@ -148,7 +148,7 @@ public class AutoConfigTest extends Test
}
private Component createConsumer(DependencyManager dm, Object consumer) {
- return
component(dm).impl(consumer).withService(Provider.class).build();
+ return component(dm).impl(consumer).withSrv(Provider.class).build();
}
public static interface Provider extends Runnable {
Modified:
felix/sandbox/pderop/dependencymanager-lambda/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/builder/lambda/itest/BundleAdapterTest.java
URL:
http://svn.apache.org/viewvc/felix/sandbox/pderop/dependencymanager-lambda/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/builder/lambda/itest/BundleAdapterTest.java?rev=1727214&r1=1727213&r2=1727214&view=diff
==============================================================================
---
felix/sandbox/pderop/dependencymanager-lambda/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/builder/lambda/itest/BundleAdapterTest.java
(original)
+++
felix/sandbox/pderop/dependencymanager-lambda/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/builder/lambda/itest/BundleAdapterTest.java
Wed Jan 27 23:27:34 2016
@@ -18,8 +18,8 @@
*/
package org.apache.felix.dm.builder.lambda.itest;
-import static
org.apache.felix.dm.builder.lambda.DependencyActivatorBase.bundleAdapter;
-import static
org.apache.felix.dm.builder.lambda.DependencyActivatorBase.component;
+import static org.apache.felix.dm.lambda.DependencyActivatorBase.bundleAdapter;
+import static org.apache.felix.dm.lambda.DependencyActivatorBase.component;
import org.apache.felix.dm.Component;
import org.apache.felix.dm.DependencyManager;
@@ -66,7 +66,7 @@ public class BundleAdapterTest extends T
Component adapter = bundleAdapter(m)
.mask(Bundle.INSTALLED | Bundle.RESOLVED | Bundle.ACTIVE)
- .cbi(cbInstance, "add", "remove")
+ .cb(cbInstance, "add", "remove")
.impl(baWithCb)
.provides(BundleAdapter.class.getName())
.build();
@@ -75,7 +75,7 @@ public class BundleAdapterTest extends T
Consumer c = new Consumer();
Component consumer = component(m)
.impl(c)
- .withService(BundleAdapter.class, s->s.cb("add", "remove"))
+ .withSrv(BundleAdapter.class, s->s.cb("add", "remove"))
.build();
// add the bundle adapter
@@ -109,7 +109,7 @@ public class BundleAdapterTest extends T
Consumer c = new Consumer();
Component consumer = component(m)
.impl(c)
- .withService(BundleAdapter.class, s->s.cb("add", "remove"))
+ .withSrv(BundleAdapter.class, s->s.cb("add", "remove"))
.build();
// add the bundle adapter
Modified:
felix/sandbox/pderop/dependencymanager-lambda/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/builder/lambda/itest/BundleAdapterWithCallbacksNotAutoConfiguredTest.java
URL:
http://svn.apache.org/viewvc/felix/sandbox/pderop/dependencymanager-lambda/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/builder/lambda/itest/BundleAdapterWithCallbacksNotAutoConfiguredTest.java?rev=1727214&r1=1727213&r2=1727214&view=diff
==============================================================================
---
felix/sandbox/pderop/dependencymanager-lambda/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/builder/lambda/itest/BundleAdapterWithCallbacksNotAutoConfiguredTest.java
(original)
+++
felix/sandbox/pderop/dependencymanager-lambda/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/builder/lambda/itest/BundleAdapterWithCallbacksNotAutoConfiguredTest.java
Wed Jan 27 23:27:34 2016
@@ -18,7 +18,7 @@
*/
package org.apache.felix.dm.builder.lambda.itest;
-import static
org.apache.felix.dm.builder.lambda.DependencyActivatorBase.bundleAdapter;
+import static org.apache.felix.dm.lambda.DependencyActivatorBase.bundleAdapter;
import org.apache.felix.dm.Component;
import org.apache.felix.dm.DependencyManager;
Modified:
felix/sandbox/pderop/dependencymanager-lambda/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/builder/lambda/itest/BundleDependencyTest.java
URL:
http://svn.apache.org/viewvc/felix/sandbox/pderop/dependencymanager-lambda/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/builder/lambda/itest/BundleDependencyTest.java?rev=1727214&r1=1727213&r2=1727214&view=diff
==============================================================================
---
felix/sandbox/pderop/dependencymanager-lambda/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/builder/lambda/itest/BundleDependencyTest.java
(original)
+++
felix/sandbox/pderop/dependencymanager-lambda/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/builder/lambda/itest/BundleDependencyTest.java
Wed Jan 27 23:27:34 2016
@@ -18,7 +18,7 @@
*/
package org.apache.felix.dm.builder.lambda.itest;
-import static
org.apache.felix.dm.builder.lambda.DependencyActivatorBase.component;
+import static org.apache.felix.dm.lambda.DependencyActivatorBase.component;
import org.apache.felix.dm.Component;
import org.apache.felix.dm.DependencyManager;
Modified:
felix/sandbox/pderop/dependencymanager-lambda/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/builder/lambda/itest/ComponentTest.java
URL:
http://svn.apache.org/viewvc/felix/sandbox/pderop/dependencymanager-lambda/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/builder/lambda/itest/ComponentTest.java?rev=1727214&r1=1727213&r2=1727214&view=diff
==============================================================================
---
felix/sandbox/pderop/dependencymanager-lambda/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/builder/lambda/itest/ComponentTest.java
(original)
+++
felix/sandbox/pderop/dependencymanager-lambda/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/builder/lambda/itest/ComponentTest.java
Wed Jan 27 23:27:34 2016
@@ -18,7 +18,7 @@
*/
package org.apache.felix.dm.builder.lambda.itest;
-import static
org.apache.felix.dm.builder.lambda.DependencyActivatorBase.component;
+import static org.apache.felix.dm.lambda.DependencyActivatorBase.component;
import java.util.Dictionary;
@@ -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)
- .withService(Provider.class, srv ->
srv.filter("(name=provider2)").cb(Consumer::add, Consumer::remove))
- .withService(Provider.class, srv ->
srv.filter("(name=provider1)").autoConfig("m_autoConfiguredProvider")));
+ .withSrv(Provider.class, srv ->
srv.filter("(name=provider2)").cb(Consumer::add, Consumer::remove))
+ .withSrv(Provider.class, srv ->
srv.filter("(name=provider1)").autoConfig("m_autoConfiguredProvider")));
// Create providers (auto added to dependency manager)
component(dm, comp -> comp
Modified:
felix/sandbox/pderop/dependencymanager-lambda/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/builder/lambda/itest/CompositionTest.java
URL:
http://svn.apache.org/viewvc/felix/sandbox/pderop/dependencymanager-lambda/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/builder/lambda/itest/CompositionTest.java?rev=1727214&r1=1727213&r2=1727214&view=diff
==============================================================================
---
felix/sandbox/pderop/dependencymanager-lambda/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/builder/lambda/itest/CompositionTest.java
(original)
+++
felix/sandbox/pderop/dependencymanager-lambda/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/builder/lambda/itest/CompositionTest.java
Wed Jan 27 23:27:34 2016
@@ -18,7 +18,7 @@
*/
package org.apache.felix.dm.builder.lambda.itest;
-import static
org.apache.felix.dm.builder.lambda.DependencyActivatorBase.component;
+import static org.apache.felix.dm.lambda.DependencyActivatorBase.component;
import org.apache.felix.dm.Component;
import org.apache.felix.dm.DependencyManager;
@@ -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")
- .withService(ServiceInterface.class, sb->sb.cb("add")).build();
+ .withSrv(ServiceInterface.class, sb->sb.cb("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)
- .withService(ServiceInterface.class, sb->sb.cb("add")).build();
+ .withSrv(ServiceInterface.class, sb->sb.cb("add")).build();
m.add(sp);
m.add(sc);
// ensure we executed all steps inside the component instance
Modified:
felix/sandbox/pderop/dependencymanager-lambda/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/builder/lambda/itest/DynamicProxyAspectTest.java
URL:
http://svn.apache.org/viewvc/felix/sandbox/pderop/dependencymanager-lambda/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/builder/lambda/itest/DynamicProxyAspectTest.java?rev=1727214&r1=1727213&r2=1727214&view=diff
==============================================================================
---
felix/sandbox/pderop/dependencymanager-lambda/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/builder/lambda/itest/DynamicProxyAspectTest.java
(original)
+++
felix/sandbox/pderop/dependencymanager-lambda/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/builder/lambda/itest/DynamicProxyAspectTest.java
Wed Jan 27 23:27:34 2016
@@ -18,8 +18,8 @@
*/
package org.apache.felix.dm.builder.lambda.itest;
-import static
org.apache.felix.dm.builder.lambda.DependencyActivatorBase.aspect;
-import static
org.apache.felix.dm.builder.lambda.DependencyActivatorBase.component;
+import static org.apache.felix.dm.lambda.DependencyActivatorBase.aspect;
+import static org.apache.felix.dm.lambda.DependencyActivatorBase.component;
import java.lang.reflect.InvocationHandler;
import java.lang.reflect.Method;
@@ -62,7 +62,7 @@ public class DynamicProxyAspectTest exte
// through the proxy twice
Component sc = component(m)
.impl(new ServiceConsumer(e))
- .withService(ServiceInterface.class,
ServiceInterface2.class).build();
+ .withSrv(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))
- .withService(ServiceInterface.class,
ServiceInterface2.class).build();
+ .withSrv(ServiceInterface.class, ServiceInterface2.class).build();
// register both producers, validate that both services are started
m.add(sp1);
Modified:
felix/sandbox/pderop/dependencymanager-lambda/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/builder/lambda/itest/FactoryConfigurationAdapterTest.java
URL:
http://svn.apache.org/viewvc/felix/sandbox/pderop/dependencymanager-lambda/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/builder/lambda/itest/FactoryConfigurationAdapterTest.java?rev=1727214&r1=1727213&r2=1727214&view=diff
==============================================================================
---
felix/sandbox/pderop/dependencymanager-lambda/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/builder/lambda/itest/FactoryConfigurationAdapterTest.java
(original)
+++
felix/sandbox/pderop/dependencymanager-lambda/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/builder/lambda/itest/FactoryConfigurationAdapterTest.java
Wed Jan 27 23:27:34 2016
@@ -18,8 +18,8 @@
*/
package org.apache.felix.dm.builder.lambda.itest;
-import static
org.apache.felix.dm.builder.lambda.DependencyActivatorBase.component;
-import static
org.apache.felix.dm.builder.lambda.DependencyActivatorBase.factoryPidAdapter;
+import static org.apache.felix.dm.lambda.DependencyActivatorBase.component;
+import static
org.apache.felix.dm.lambda.DependencyActivatorBase.factoryPidAdapter;
import java.io.IOException;
import java.util.Dictionary;
@@ -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).withService(ConfigurationAdmin.class).build();
+ Component s1 =
component(m).impl(configurator).withSrv(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")
- .withService(AdapterExtraDependency.class)
+ .withSrv(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).withService(AdapterService.class, srv ->
srv.cb("bind", "change", "remove")).build();
+ .impl(AdapterServiceConsumer.class).withSrv(AdapterService.class,
srv -> srv.cb("bind", "change", "remove")).build();
// Start services
m.add(s1);
Modified:
felix/sandbox/pderop/dependencymanager-lambda/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/builder/lambda/itest/FactoryInjectedWithConfigurationBeforeTheCreateMethod.java
URL:
http://svn.apache.org/viewvc/felix/sandbox/pderop/dependencymanager-lambda/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/builder/lambda/itest/FactoryInjectedWithConfigurationBeforeTheCreateMethod.java?rev=1727214&r1=1727213&r2=1727214&view=diff
==============================================================================
---
felix/sandbox/pderop/dependencymanager-lambda/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/builder/lambda/itest/FactoryInjectedWithConfigurationBeforeTheCreateMethod.java
(original)
+++
felix/sandbox/pderop/dependencymanager-lambda/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/builder/lambda/itest/FactoryInjectedWithConfigurationBeforeTheCreateMethod.java
Wed Jan 27 23:27:34 2016
@@ -18,7 +18,7 @@
*/
package org.apache.felix.dm.builder.lambda.itest;
-import static
org.apache.felix.dm.builder.lambda.DependencyActivatorBase.component;
+import static org.apache.felix.dm.lambda.DependencyActivatorBase.component;
import java.io.IOException;
import java.util.Dictionary;
@@ -45,13 +45,13 @@ public class FactoryInjectedWithConfigur
m_e = new Ensure();
// Create the component that creates a configuration.
- Component configurator = component(m).impl(new
Configurator("foobar")).withService(ConfigurationAdmin.class).build();
+ Component configurator = component(m).impl(new
Configurator("foobar")).withSrv(ConfigurationAdmin.class).build();
// Create the object that has to be injected with the configuration
before its create method is called.
MyFactory factory = new MyFactory();
// Create the Component for the MyComponent class that is created
using the factory above.
- Component myComponent = component(m).factory(factory,
"create").withConf(b->b.pid("foobar").cbi(factory, "updated")).build();
+ Component myComponent = component(m).factory(factory,
"create").withCnf(b->b.pid("foobar").cbi(factory, "updated")).build();
// provide the configuration
m.add(configurator);
@@ -67,13 +67,13 @@ public class FactoryInjectedWithConfigur
m_e = new Ensure();
// Create the component that creates a configuration.
- Component configurator = component(m).impl(new
Configurator("foobar")).withService(ConfigurationAdmin.class).build();
+ Component configurator = component(m).impl(new
Configurator("foobar")).withSrv(ConfigurationAdmin.class).build();
// Create the object that has to be injected with the configuration
before its create method is called.
MyFactory factory = new MyFactory();
// Create the Component for the MyComponent class that is created
using the factory above.
- Component myComponent = component(m).factory(factory,
"create").withConf(b->b.pid("foobar").cbi(factory::updated)).build();
+ Component myComponent = component(m).factory(factory,
"create").withCnf(b->b.pid("foobar").cbi(factory::updated)).build();
// provide the configuration
m.add(configurator);
