Author: pderop
Date: Thu Jan 21 22:52:22 2016
New Revision: 1726125
URL: http://svn.apache.org/viewvc?rev=1726125&view=rev
Log:
Made callbacks based on method references more fluent (removed usage of Cb enum
for all dependencies except for ComponentBuilder).
Removed:
felix/sandbox/pderop/dependencymanager-lambda/org.apache.felix.dependencymanager.lambda/src/org/apache/felix/dm/builder/lambda/Cb.java
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/AdapterWithModifiedInstanceBoundDependencyTest.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/AspectDynamicsTest.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/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/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/ServiceDependencyCallbackSignaturesTest.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.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/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/observable/ObservableComponent.java
felix/sandbox/pderop/dependencymanager-lambda/org.apache.felix.dependencymanager.lambda/src/org/apache/felix/dm/builder/lambda/BundleAdapterBuilder.java
felix/sandbox/pderop/dependencymanager-lambda/org.apache.felix.dependencymanager.lambda/src/org/apache/felix/dm/builder/lambda/BundleDependencyBuilder.java
felix/sandbox/pderop/dependencymanager-lambda/org.apache.felix.dependencymanager.lambda/src/org/apache/felix/dm/builder/lambda/ComponentBuilder.java
felix/sandbox/pderop/dependencymanager-lambda/org.apache.felix.dependencymanager.lambda/src/org/apache/felix/dm/builder/lambda/Functions.java
felix/sandbox/pderop/dependencymanager-lambda/org.apache.felix.dependencymanager.lambda/src/org/apache/felix/dm/builder/lambda/ServiceCallbacksBuilder.java
felix/sandbox/pderop/dependencymanager-lambda/org.apache.felix.dependencymanager.lambda/src/org/apache/felix/dm/builder/lambda/impl/AdapterBase.java
felix/sandbox/pderop/dependencymanager-lambda/org.apache.felix.dependencymanager.lambda/src/org/apache/felix/dm/builder/lambda/impl/BundleAdapterBuilderImpl.java
felix/sandbox/pderop/dependencymanager-lambda/org.apache.felix.dependencymanager.lambda/src/org/apache/felix/dm/builder/lambda/impl/BundleDependencyBuilderImpl.java
felix/sandbox/pderop/dependencymanager-lambda/org.apache.felix.dependencymanager.lambda/src/org/apache/felix/dm/builder/lambda/impl/CompletableFutureDependencyImpl.java
felix/sandbox/pderop/dependencymanager-lambda/org.apache.felix.dependencymanager.lambda/src/org/apache/felix/dm/builder/lambda/impl/ComponentBuilderImpl.java
felix/sandbox/pderop/dependencymanager-lambda/org.apache.felix.dependencymanager.lambda/src/org/apache/felix/dm/builder/lambda/impl/ConfigurationDependencyBuilderImpl.java
felix/sandbox/pderop/dependencymanager-lambda/org.apache.felix.dependencymanager.lambda/src/org/apache/felix/dm/builder/lambda/impl/FactoryPidAdapterBuilderImpl.java
felix/sandbox/pderop/dependencymanager-lambda/org.apache.felix.dependencymanager.lambda/src/org/apache/felix/dm/builder/lambda/impl/Helpers.java
felix/sandbox/pderop/dependencymanager-lambda/org.apache.felix.dependencymanager.lambda/src/org/apache/felix/dm/builder/lambda/impl/ServiceCallbacksBuilderImpl.java
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=1726125&r1=1726124&r2=1726125&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
Thu Jan 21 22:52:22 2016
@@ -18,8 +18,6 @@
*/
package org.apache.felix.dm.builder.lambda.itest;
-import static org.apache.felix.dm.builder.lambda.Cb.ADD;
-import static org.apache.felix.dm.builder.lambda.Cb.REM;
import static
org.apache.felix.dm.builder.lambda.DependencyActivatorBase.component;
import org.apache.felix.dm.Component;
@@ -40,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(ADD, ServiceConsumer::bind).cb(REM, ServiceConsumer::unbind))
+ .impl(new ServiceConsumer(e)).withService(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=1726125&r1=1726124&r2=1726125&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
Thu Jan 21 22:52:22 2016
@@ -34,7 +34,7 @@ public class AdapterAndConsumerTest exte
// helper class that ensures certain steps get executed in sequence
Ensure e = new Ensure();
- Component provider =
component(m).provides(OriginalService.class).impl(new ServiceProvider(e)).
build();
+ 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 adapter = adapter(m,
OriginalService.class).provides(AdaptedService.class).impl(ServiceAdapter.class).build();
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=1726125&r1=1726124&r2=1726125&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
Thu Jan 21 22:52:22 2016
@@ -18,7 +18,6 @@
*/
package org.apache.felix.dm.builder.lambda.itest;
-import static org.apache.felix.dm.builder.lambda.Cb.ADD;
import static
org.apache.felix.dm.builder.lambda.DependencyActivatorBase.adapter;
import static
org.apache.felix.dm.builder.lambda.DependencyActivatorBase.component;
@@ -59,7 +58,7 @@ public class AdapterNoAutoConfigIfInstan
// Declare S1 adapter
S1AdapterCallback s1AdapterCB = new S1AdapterCallback();
- adapter(m, S1.class, a -> a.impl(S1Adapter.class).cbi(ADD,
s1AdapterCB::set));
+ adapter(m, S1.class, a ->
a.impl(S1Adapter.class).cbi(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/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=1726125&r1=1726124&r2=1726125&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
Thu Jan 21 22:52:22 2016
@@ -18,9 +18,6 @@
*/
package org.apache.felix.dm.builder.lambda.itest;
-import static org.apache.felix.dm.builder.lambda.Cb.ADD;
-import static org.apache.felix.dm.builder.lambda.Cb.CHG;
-import static org.apache.felix.dm.builder.lambda.Cb.REM;
import static
org.apache.felix.dm.builder.lambda.DependencyActivatorBase.adapter;
import static
org.apache.felix.dm.builder.lambda.DependencyActivatorBase.component;
@@ -89,7 +86,7 @@ public class AdapterWithCallbackInstance
Component adapter = adapter(m, OriginalService.class, adp -> adp
.provides(AdaptedService.class).impl(new ServiceAdapter(e))
.autoAdd(false).autoConfig("m_originalService").propagate(true)
- .cbi(ADD, callbackInstance::set).cbi(CHG,
callbackInstance::changed).cbi(REM, callbackInstance::unset));
+ .cbi(callbackInstance::set, callbackInstance::changed,
callbackInstance::unset));
// 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/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=1726125&r1=1726124&r2=1726125&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
Thu Jan 21 22:52:22 2016
@@ -18,8 +18,6 @@
*/
package org.apache.felix.dm.builder.lambda.itest;
-import static org.apache.felix.dm.builder.lambda.Cb.ADD;
-import static org.apache.felix.dm.builder.lambda.Cb.REM;
import static
org.apache.felix.dm.builder.lambda.DependencyActivatorBase.adapter;
import static
org.apache.felix.dm.builder.lambda.DependencyActivatorBase.component;
@@ -73,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(ADD,
SA::add).cb(REM, SA::remove)).build();
+ Component sa = adapter(m,
S1.class).impl(SA.class).withService(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/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=1726125&r1=1726124&r2=1726125&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
Thu Jan 21 22:52:22 2016
@@ -18,9 +18,6 @@
*/
package org.apache.felix.dm.builder.lambda.itest;
-import static org.apache.felix.dm.builder.lambda.Cb.ADD;
-import static org.apache.felix.dm.builder.lambda.Cb.CHG;
-import static org.apache.felix.dm.builder.lambda.Cb.REM;
import static
org.apache.felix.dm.builder.lambda.DependencyActivatorBase.adapter;
import static
org.apache.felix.dm.builder.lambda.DependencyActivatorBase.component;
@@ -149,7 +146,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)
- .impl(new BImpl(e)).provides(B.class).cb(ADD, BImpl::addA).cb(CHG,
BImpl::changeA).cb(REM, BImpl::removeA)
+ .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();
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=1726125&r1=1726124&r2=1726125&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
Thu Jan 21 22:52:22 2016
@@ -18,8 +18,6 @@
*/
package org.apache.felix.dm.builder.lambda.itest;
-import static org.apache.felix.dm.builder.lambda.Cb.ADD;
-import static org.apache.felix.dm.builder.lambda.Cb.CHG;
import static
org.apache.felix.dm.builder.lambda.DependencyActivatorBase.adapter;
import static
org.apache.felix.dm.builder.lambda.DependencyActivatorBase.component;
@@ -83,11 +81,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(ADD, saimpl::set).cbi(CHG,
saimpl::change).provides(AdaptedService.class).build();
+ .propagate(false).impl(saimpl).cbi(saimpl::set, saimpl::change,
null).provides(AdaptedService.class).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(ADD,
scimpl::set).cbi(CHG, scimpl::change)).build();
+ Component consumer =
component(m).impl(scimpl).withService(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=1726125&r1=1726124&r2=1726125&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
Thu Jan 21 22:52:22 2016
@@ -18,8 +18,6 @@
*/
package org.apache.felix.dm.builder.lambda.itest;
-import static org.apache.felix.dm.builder.lambda.Cb.ADD;
-import static org.apache.felix.dm.builder.lambda.Cb.REM;
import static
org.apache.felix.dm.builder.lambda.DependencyActivatorBase.aspect;
import static
org.apache.felix.dm.builder.lambda.DependencyActivatorBase.component;
@@ -83,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(ADD,
c::add).cbi(REM, c::remove).autoConfig("m_service")).build();
+ .impl(c).withService(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);
@@ -160,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(ADD,
c::add).cbi(REM, c::remove).autoConfig("m_service")).build();
+ Component sc =
component(m).impl(c).withService(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
@@ -243,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(ADD,
c::add).cbi(REM, c::remove)).build();
+ Component sc =
component(m).impl(c).withService(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/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=1726125&r1=1726124&r2=1726125&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
Thu Jan 21 22:52:22 2016
@@ -18,7 +18,6 @@
*/
package org.apache.felix.dm.builder.lambda.itest;
-import static org.apache.felix.dm.builder.lambda.Cb.ADD;
import static
org.apache.felix.dm.builder.lambda.DependencyActivatorBase.aspect;
import static
org.apache.felix.dm.builder.lambda.DependencyActivatorBase.component;
@@ -95,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(ADD,
ServiceConsumer::add).sw(ServiceConsumer::swap)).build();
+ Component consumer = component(m).impl(new
ServiceConsumer(e)).withService(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/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=1726125&r1=1726124&r2=1726125&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
Thu Jan 21 22:52:22 2016
@@ -18,8 +18,6 @@
*/
package org.apache.felix.dm.builder.lambda.itest;
-import static org.apache.felix.dm.builder.lambda.Cb.ADD;
-import static org.apache.felix.dm.builder.lambda.Cb.REM;
import static
org.apache.felix.dm.builder.lambda.DependencyActivatorBase.aspect;
import static
org.apache.felix.dm.builder.lambda.DependencyActivatorBase.component;
@@ -57,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(ADD,
scimpl::add).cbi(REM, scimpl::remove).swi(scimpl::swap)).build();
+ Component sc =
component(m).impl(scimpl).withService(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=1726125&r1=1726124&r2=1726125&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
Thu Jan 21 22:52:22 2016
@@ -17,8 +17,6 @@
* under the License.
*/
package org.apache.felix.dm.builder.lambda.itest;
-import static org.apache.felix.dm.builder.lambda.Cb.ADD;
-import static org.apache.felix.dm.builder.lambda.Cb.REM;
import static
org.apache.felix.dm.builder.lambda.DependencyActivatorBase.aspect;
import static
org.apache.felix.dm.builder.lambda.DependencyActivatorBase.component;
@@ -122,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(ADD, sci::add).cbi(REM, sci::remove)).build();
+ Component sc =
component(m).impl(sci).withService(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=1726125&r1=1726124&r2=1726125&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
Thu Jan 21 22:52:22 2016
@@ -18,8 +18,6 @@
*/
package org.apache.felix.dm.builder.lambda.itest;
-import static org.apache.felix.dm.builder.lambda.Cb.ADD;
-import static org.apache.felix.dm.builder.lambda.Cb.REM;
import static
org.apache.felix.dm.builder.lambda.DependencyActivatorBase.aspect;
import static
org.apache.felix.dm.builder.lambda.DependencyActivatorBase.component;
@@ -57,8 +55,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)).withService(ServiceInterface.class, s->s.cb(ADD,
ServiceConsumer::add).cb(REM, ServiceConsumer::remove)).build();
- Component asp = aspect(m,
ServiceInterface.class).impl(ServiceProviderAspect.class).rank(100).cb(ADD,
ServiceProviderAspect::add).cb(REM,
ServiceProviderAspect::remove).sw(ServiceProviderAspect::swap).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();
m.add(sp);
m.add(sc);
@@ -81,7 +79,7 @@ public class AspectWithCallbacksServiceD
ServiceProviderAspect providerAspect = new ServiceProviderAspect();
ServiceProviderAspectCallbackInstance aspectCb = new
ServiceProviderAspectCallbackInstance(providerAspect);
- Component asp = aspect(m,
ServiceInterface.class).rank(100).impl(providerAspect).cbi(ADD,
aspectCb::add).cbi(REM,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/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=1726125&r1=1726124&r2=1726125&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
Thu Jan 21 22:52:22 2016
@@ -18,13 +18,13 @@
*/
package org.apache.felix.dm.builder.lambda.itest;
-import org.junit.Assert;
+import static
org.apache.felix.dm.builder.lambda.DependencyActivatorBase.bundleAdapter;
+import static
org.apache.felix.dm.builder.lambda.DependencyActivatorBase.component;
import org.apache.felix.dm.Component;
import org.apache.felix.dm.DependencyManager;
-import org.apache.felix.dm.builder.lambda.Cb;
+import org.junit.Assert;
import org.osgi.framework.Bundle;
-import static org.apache.felix.dm.builder.lambda.DependencyActivatorBase.*;
/**
* @author <a href="mailto:[email protected]";>Felix Project Team</a>
@@ -100,7 +100,7 @@ public class BundleAdapterTest extends T
Component adapter = bundleAdapter(m)
.mask(Bundle.INSTALLED | Bundle.RESOLVED | Bundle.ACTIVE)
- .cbi(Cb.ADD, cbInstance::add).cbi(Cb.REM, cbInstance::remove)
+ .cbi(cbInstance::add, cbInstance::remove)
.impl(baWithCb)
.provides(BundleAdapter.class.getName())
.build();
@@ -155,7 +155,7 @@ public class BundleAdapterTest extends T
m_ba.add(b);
}
- void remove(Bundle b) {
+ void remove(Component c, Bundle b) {
m_ba.remove(b);
}
}
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=1726125&r1=1726124&r2=1726125&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
Thu Jan 21 22:52:22 2016
@@ -18,12 +18,12 @@
*/
package org.apache.felix.dm.builder.lambda.itest;
-import org.junit.Assert;
+import static
org.apache.felix.dm.builder.lambda.DependencyActivatorBase.bundleAdapter;
import org.apache.felix.dm.Component;
import org.apache.felix.dm.DependencyManager;
+import org.junit.Assert;
import org.osgi.framework.Bundle;
-import static org.apache.felix.dm.builder.lambda.DependencyActivatorBase.*;
/**
* @author <a href="mailto:[email protected]";>Felix Project Team</a>
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=1726125&r1=1726124&r2=1726125&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
Thu Jan 21 22:52:22 2016
@@ -22,7 +22,6 @@ import static org.apache.felix.dm.builde
import org.apache.felix.dm.Component;
import org.apache.felix.dm.DependencyManager;
-import org.apache.felix.dm.builder.lambda.Cb;
import org.junit.Assert;
import org.osgi.framework.Bundle;
@@ -60,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(Cb.ADD, MyConsumer::add).cb(Cb.REM,
MyConsumer::remove)));
+ Component consumer = component(m, comp ->
comp.impl(c).withBundle(bundle -> bundle.cb(MyConsumer::add,
MyConsumer::remove)));
// check if at least one bundle was found
c.check();
@@ -73,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(Cb.ADD,
FilteredConsumer::add).cb(Cb.REM, FilteredConsumer::remove)));
+ .withBundle(bundle->
bundle.filter(filter).cb(FilteredConsumer::add, FilteredConsumer::remove)));
e.step(2);
// remove the consumer again
m.remove(consumerWithFilter);
@@ -100,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(Cb.ADD, impl::add).cbi(Cb.REM, impl::remove)));
+ .withBundle(b -> b.filter("(Bundle-SymbolicName=" + BSN +
")").cbi(impl::add, impl::remove)));
e.waitForStep(1, 5000);
// remove the consumer again
m.remove(consumerWithFilter);
@@ -129,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(Cb.ADD, impl::add).cbi(Cb.REM, impl::remove)).build();
+ .withBundle(b -> b.filter("(Bundle-SymbolicName=" + BSN
+ ")").cbi(impl::add, impl::remove)).build();
// add a consumer with a filter
m.add(consumerWithFilter);
e.waitForStep(1, 5000);
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=1726125&r1=1726124&r2=1726125&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
Thu Jan 21 22:52:22 2016
@@ -18,8 +18,6 @@
*/
package org.apache.felix.dm.builder.lambda.itest;
-import static org.apache.felix.dm.builder.lambda.Cb.ADD;
-import static org.apache.felix.dm.builder.lambda.Cb.REM;
import static
org.apache.felix.dm.builder.lambda.DependencyActivatorBase.component;
import java.util.Dictionary;
@@ -39,7 +37,7 @@ 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(ADD, Consumer::add).cb(REM, Consumer::remove))
+ .withService(Provider.class, srv ->
srv.filter("(name=provider2)").cb(Consumer::add, Consumer::remove))
.withService(Provider.class, srv ->
srv.filter("(name=provider1)").autoConfig("m_autoConfiguredProvider")));
// Create providers (auto added to dependency manager)
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=1726125&r1=1726124&r2=1726125&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
Thu Jan 21 22:52:22 2016
@@ -51,7 +51,7 @@ public class FactoryInjectedWithConfigur
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").withConfiguration(b->b.pid("foobar").cbi(factory, "updated")).build();
+ Component myComponent = component(m).factory(factory,
"create").withConf(b->b.pid("foobar").cbi(factory, "updated")).build();
// provide the configuration
m.add(configurator);
@@ -73,7 +73,7 @@ public class FactoryInjectedWithConfigur
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").withConfiguration(b->b.pid("foobar").cbi(factory::updated)).build();
+ Component myComponent = component(m).factory(factory,
"create").withConf(b->b.pid("foobar").cbi(factory::updated)).build();
// provide the configuration
m.add(configurator);
Modified:
felix/sandbox/pderop/dependencymanager-lambda/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/builder/lambda/itest/InstanceBoundDependencyTest.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/InstanceBoundDependencyTest.java?rev=1726125&r1=1726124&r2=1726125&view=diff
==============================================================================
---
felix/sandbox/pderop/dependencymanager-lambda/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/builder/lambda/itest/InstanceBoundDependencyTest.java
(original)
+++
felix/sandbox/pderop/dependencymanager-lambda/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/builder/lambda/itest/InstanceBoundDependencyTest.java
Thu Jan 21 22:52:22 2016
@@ -18,9 +18,6 @@
*/
package org.apache.felix.dm.builder.lambda.itest;
-import static org.apache.felix.dm.builder.lambda.Cb.ADD;
-import static org.apache.felix.dm.builder.lambda.Cb.CHG;
-import static org.apache.felix.dm.builder.lambda.Cb.REM;
import static
org.apache.felix.dm.builder.lambda.DependencyActivatorBase.component;
import java.util.HashMap;
@@ -153,7 +150,7 @@ public class InstanceBoundDependencyTest
}
void init(Component c) {
- component(c, comp->comp.withService(S2.class, srv -> srv.cb(ADD,
C::addS2).cb(CHG, C::changeS2).cb(REM, C::removeS2)));
+ component(c, comp->comp.withService(S2.class, srv ->
srv.cb(C::addS2, C::changeS2, C::removeS2)));
m_e.step(1);
}
}
Modified:
felix/sandbox/pderop/dependencymanager-lambda/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/builder/lambda/itest/ModifiedBundleDependencyTest.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/ModifiedBundleDependencyTest.java?rev=1726125&r1=1726124&r2=1726125&view=diff
==============================================================================
---
felix/sandbox/pderop/dependencymanager-lambda/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/builder/lambda/itest/ModifiedBundleDependencyTest.java
(original)
+++
felix/sandbox/pderop/dependencymanager-lambda/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/builder/lambda/itest/ModifiedBundleDependencyTest.java
Thu Jan 21 22:52:22 2016
@@ -22,7 +22,6 @@ import static org.apache.felix.dm.builde
import org.apache.felix.dm.Component;
import org.apache.felix.dm.DependencyManager;
-import org.apache.felix.dm.builder.lambda.Cb;
import org.junit.Assert;
import org.osgi.framework.Bundle;
import org.osgi.framework.BundleException;
@@ -142,7 +141,7 @@ public class ModifiedBundleDependencyTes
String filter = "(Bundle-SymbolicName=org.apache.felix.metatype)";
int mask =
Bundle.INSTALLED|Bundle.ACTIVE|Bundle.RESOLVED|Bundle.STARTING;
Component b = component(m).provides(B.class).impl(impl)
- .withBundle(bd -> bd.filter(filter).mask(mask).cbi(Cb.ADD,
impl::add).cbi(Cb.CHG, impl::change).cbi(Cb.REM, impl::remove)).build();
+ .withBundle(bd -> bd.filter(filter).mask(mask).cbi(impl::add,
impl::change, impl::remove)).build();
Bundle dmtest = getBundle("org.apache.felix.metatype");
try {
Modified:
felix/sandbox/pderop/dependencymanager-lambda/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/builder/lambda/itest/ServiceDependencyCallbackSignaturesTest.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/ServiceDependencyCallbackSignaturesTest.java?rev=1726125&r1=1726124&r2=1726125&view=diff
==============================================================================
---
felix/sandbox/pderop/dependencymanager-lambda/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/builder/lambda/itest/ServiceDependencyCallbackSignaturesTest.java
(original)
+++
felix/sandbox/pderop/dependencymanager-lambda/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/builder/lambda/itest/ServiceDependencyCallbackSignaturesTest.java
Thu Jan 21 22:52:22 2016
@@ -18,9 +18,6 @@
*/
package org.apache.felix.dm.builder.lambda.itest;
-import static org.apache.felix.dm.builder.lambda.Cb.ADD;
-import static org.apache.felix.dm.builder.lambda.Cb.CHG;
-import static org.apache.felix.dm.builder.lambda.Cb.REM;
import static
org.apache.felix.dm.builder.lambda.DependencyActivatorBase.component;
import java.util.Dictionary;
@@ -83,15 +80,15 @@ public class ServiceDependencyCallbackSi
Component provider = component(m)
.impl(new ProviderImpl()).provides(Provider.class.getName(),
props).build();
- component(m, c->c.impl(new Consumer1()).withService(Provider.class,
srv->srv.cb(ADD, Consumer1::bind).cb(CHG, Consumer1::change).cb(REM,
Consumer1::remove)));
- component(m, c->c.impl(new Consumer2()).withService(Provider.class,
srv->srv.cb(ADD, Consumer2::bind).cb(CHG, Consumer2::change).cb(REM,
Consumer2::remove)));
- component(m, c->c.impl(new Consumer3()).withService(Provider.class,
srv->srv.cb(ADD, Consumer3::bind).cb(CHG, Consumer3::change).cb(REM,
Consumer3::remove)));
- component(m, c->c.impl(new Consumer4()).withService(Provider.class,
srv->srv.cb(ADD, Consumer4::bind).cb(CHG, Consumer4::change).cb(REM,
Consumer4::remove)));
- component(m, c->c.impl(new Consumer5()).withService(Provider.class,
srv->srv.cb(ADD, Consumer5::bind).cb(CHG, Consumer5::change).cb(REM,
Consumer5::remove)));
- component(m, c->c.impl(new Consumer6()).withService(Provider.class,
srv->srv.cb(ADD, Consumer6::bind).cb(CHG, Consumer6::change).cb(REM,
Consumer6::remove)));
- component(m, c->c.impl(new Consumer7()).withService(Provider.class,
srv->srv.cb(ADD, Consumer7::bind).cb(CHG, Consumer7::change).cb(REM,
Consumer7::remove)));
- component(m, c->c.impl(new Consumer8()).withService(Provider.class,
srv->srv.cb(ADD, Consumer8::bind).cb(CHG, Consumer8::change).cb(REM,
Consumer8::remove)));
- component(m, c->c.impl(new Consumer9()).withService(Provider.class,
srv->srv.cb(ADD, Consumer9::bind).cb(CHG, Consumer9::change).cb(REM,
Consumer9::remove)));
+ component(m, c->c.impl(new Consumer1()).withService(Provider.class,
srv->srv.cb(Consumer1::bind, Consumer1::change, Consumer1::remove)));
+ component(m, c->c.impl(new Consumer2()).withService(Provider.class,
srv->srv.cb(Consumer2::bind, Consumer2::change, Consumer2::remove)));
+ component(m, c->c.impl(new Consumer3()).withService(Provider.class,
srv->srv.cb(Consumer3::bind, Consumer3::change, Consumer3::remove)));
+ component(m, c->c.impl(new Consumer4()).withService(Provider.class,
srv->srv.cb(Consumer4::bind, Consumer4::change, Consumer4::remove)));
+ component(m, c->c.impl(new Consumer5()).withService(Provider.class,
srv->srv.cb(Consumer5::bind, Consumer5::change, Consumer5::remove)));
+ component(m, c->c.impl(new Consumer6()).withService(Provider.class,
srv->srv.cb(Consumer6::bind, Consumer6::change, Consumer6::remove)));
+ component(m, c->c.impl(new Consumer7()).withService(Provider.class,
srv->srv.cb(Consumer7::bind, Consumer7::change, Consumer7::remove)));
+ component(m, c->c.impl(new Consumer8()).withService(Provider.class,
srv->srv.cb(Consumer8::bind, Consumer8::change, Consumer8::remove)));
+ component(m, c->c.impl(new Consumer9()).withService(Provider.class,
srv->srv.cb(Consumer9::bind, Consumer9::change, Consumer9::remove)));
m.add(provider);
m_ensure.waitForStep(9, 5000);
Modified:
felix/sandbox/pderop/dependencymanager-lambda/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/builder/lambda/itest/ServiceDependencyPropagateTest.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/ServiceDependencyPropagateTest.java?rev=1726125&r1=1726124&r2=1726125&view=diff
==============================================================================
---
felix/sandbox/pderop/dependencymanager-lambda/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/builder/lambda/itest/ServiceDependencyPropagateTest.java
(original)
+++
felix/sandbox/pderop/dependencymanager-lambda/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/builder/lambda/itest/ServiceDependencyPropagateTest.java
Thu Jan 21 22:52:22 2016
@@ -18,7 +18,6 @@
*/
package org.apache.felix.dm.builder.lambda.itest;
-import static org.apache.felix.dm.builder.lambda.Cb.ADD;
import static
org.apache.felix.dm.builder.lambda.DependencyActivatorBase.component;
import java.util.Dictionary;
@@ -105,7 +104,7 @@ public class ServiceDependencyPropagateT
Ensure e = new Ensure();
Component c1 = component(m)
.impl(new C1(e))
- .withService(C2.class, s->s.cb(ADD, C1::bind)).build();
+ .withService(C2.class, s->s.cb(C1::bind)).build();
C2 c2Impl = new C2();
Component c2 = component(m)
Modified:
felix/sandbox/pderop/dependencymanager-lambda/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/builder/lambda/itest/ServiceDependencyTest.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/ServiceDependencyTest.java?rev=1726125&r1=1726124&r2=1726125&view=diff
==============================================================================
---
felix/sandbox/pderop/dependencymanager-lambda/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/builder/lambda/itest/ServiceDependencyTest.java
(original)
+++
felix/sandbox/pderop/dependencymanager-lambda/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/builder/lambda/itest/ServiceDependencyTest.java
Thu Jan 21 22:52:22 2016
@@ -18,8 +18,6 @@
*/
package org.apache.felix.dm.builder.lambda.itest;
-import static org.apache.felix.dm.builder.lambda.Cb.ADD;
-import static org.apache.felix.dm.builder.lambda.Cb.REM;
import static
org.apache.felix.dm.builder.lambda.DependencyActivatorBase.component;
import org.apache.felix.dm.Component;
@@ -38,7 +36,7 @@ public class ServiceDependencyTest exten
Component sc = component(m).impl(new
ServiceConsumer(e)).withService(ServiceInterface.class).build();
Component sc2 = component(m).impl(new ServiceConsumerCallbacks(e))
- .withService(ServiceInterface.class, srv ->
srv.required(false).cb(ADD, ServiceConsumerCallbacks::add).cb(REM,
ServiceConsumerCallbacks::remove))
+ .withService(ServiceInterface.class, srv ->
srv.required(false).cb(ServiceConsumerCallbacks::add,
ServiceConsumerCallbacks::remove))
.build();
m.add(sp);
Modified:
felix/sandbox/pderop/dependencymanager-lambda/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/builder/lambda/itest/ServiceDependencyThroughCallbackInstanceTest.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/ServiceDependencyThroughCallbackInstanceTest.java?rev=1726125&r1=1726124&r2=1726125&view=diff
==============================================================================
---
felix/sandbox/pderop/dependencymanager-lambda/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/builder/lambda/itest/ServiceDependencyThroughCallbackInstanceTest.java
(original)
+++
felix/sandbox/pderop/dependencymanager-lambda/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/builder/lambda/itest/ServiceDependencyThroughCallbackInstanceTest.java
Thu Jan 21 22:52:22 2016
@@ -18,8 +18,6 @@
*/
package org.apache.felix.dm.builder.lambda.itest;
-import static org.apache.felix.dm.builder.lambda.Cb.ADD;
-import static org.apache.felix.dm.builder.lambda.Cb.REM;
import static
org.apache.felix.dm.builder.lambda.DependencyActivatorBase.component;
import org.apache.felix.dm.DependencyManager;
@@ -54,7 +52,7 @@ public class ServiceDependencyThroughCal
CallbackInstance instance = new CallbackInstance();
component(m, comp -> comp
.impl(new SimpleService() {})
- .withService(Service.class, srv -> srv.cbi(ADD,
instance::added).cbi(REM, instance::removed)));
+ .withService(Service.class, srv ->
srv.cbi(instance::added, instance::removed)));
Assert.assertEquals(numberOfServices, instance.getCount());
m.clear();
Modified:
felix/sandbox/pderop/dependencymanager-lambda/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/builder/lambda/itest/ServiceUpdateTest.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/ServiceUpdateTest.java?rev=1726125&r1=1726124&r2=1726125&view=diff
==============================================================================
---
felix/sandbox/pderop/dependencymanager-lambda/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/builder/lambda/itest/ServiceUpdateTest.java
(original)
+++
felix/sandbox/pderop/dependencymanager-lambda/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/builder/lambda/itest/ServiceUpdateTest.java
Thu Jan 21 22:52:22 2016
@@ -18,9 +18,6 @@
*/
package org.apache.felix.dm.builder.lambda.itest;
-import static org.apache.felix.dm.builder.lambda.Cb.ADD;
-import static org.apache.felix.dm.builder.lambda.Cb.CHG;
-import static org.apache.felix.dm.builder.lambda.Cb.REM;
import static
org.apache.felix.dm.builder.lambda.DependencyActivatorBase.component;
import java.net.URL;
@@ -47,10 +44,10 @@ public class ServiceUpdateTest extends T
component(m, comp -> comp
.impl(new ServiceProvider(e))
.withService(ServiceInterface.class, srv -> srv
- .cb(ADD, ServiceProvider::add).cb(CHG,
ServiceProvider::change).cb(REM, ServiceProvider::remove)));
+ .cb(ServiceProvider::add,
ServiceProvider::change, ServiceProvider::remove)));
component(m, comp -> comp
.impl(provider)
- .withService(ResourceHandler.class, srv -> srv.cb(ADD,
ResourceProvider::add).cb(REM, ResourceProvider::remove)));
+ .withService(ResourceHandler.class, srv ->
srv.cb(ResourceProvider::add, ResourceProvider::remove)));
// TODO implement resource adapters in new builder API and use it for
the following resource adapter.
Modified:
felix/sandbox/pderop/dependencymanager-lambda/org.apache.felix.dependencymanager.lambda.samples/src/org/apache/felix/dependencymanager/lambda/samples/compositefactory/Activator.java
URL:
http://svn.apache.org/viewvc/felix/sandbox/pderop/dependencymanager-lambda/org.apache.felix.dependencymanager.lambda.samples/src/org/apache/felix/dependencymanager/lambda/samples/compositefactory/Activator.java?rev=1726125&r1=1726124&r2=1726125&view=diff
==============================================================================
---
felix/sandbox/pderop/dependencymanager-lambda/org.apache.felix.dependencymanager.lambda.samples/src/org/apache/felix/dependencymanager/lambda/samples/compositefactory/Activator.java
(original)
+++
felix/sandbox/pderop/dependencymanager-lambda/org.apache.felix.dependencymanager.lambda.samples/src/org/apache/felix/dependencymanager/lambda/samples/compositefactory/Activator.java
Thu Jan 21 22:52:22 2016
@@ -19,7 +19,7 @@
package org.apache.felix.dependencymanager.lambda.samples.compositefactory;
import static java.lang.System.out;
-import static org.apache.felix.dm.builder.lambda.Cb.*;
+import static org.apache.felix.dm.builder.lambda.ComponentBuilder.Cb.START;
import org.apache.felix.dm.builder.lambda.DependencyActivatorBase;
import org.osgi.service.cm.ConfigurationAdmin;
@@ -53,8 +53,8 @@ public class Activator extends Dependenc
component(comp -> comp
.factory(factory::create, factory::getComposition)
.life(START, ProviderImpl::start) // only call start on
ProviderImpl
- .withService(LogService.class, srv -> srv.cb(ADD,
ProviderImpl::bind).cb(ADD, ProviderComposite1::bind))
- .withConfiguration(conf ->
conf.pid(ProviderFactory.class).cbi(factory::updated)));
+ .withService(LogService.class, srv ->
srv.cb(ProviderImpl::bind).cb(ProviderComposite1::bind))
+ .withConf(conf ->
conf.pid(ProviderFactory.class).cbi(factory::updated)));
// Creates a configuration with pid name =
"org.apache.felix.dependencymanager.lambda.samples.compositefactory.ProviderFactory"
component(comp -> comp
Modified:
felix/sandbox/pderop/dependencymanager-lambda/org.apache.felix.dependencymanager.lambda.samples/src/org/apache/felix/dependencymanager/lambda/samples/device/Activator.java
URL:
http://svn.apache.org/viewvc/felix/sandbox/pderop/dependencymanager-lambda/org.apache.felix.dependencymanager.lambda.samples/src/org/apache/felix/dependencymanager/lambda/samples/device/Activator.java?rev=1726125&r1=1726124&r2=1726125&view=diff
==============================================================================
---
felix/sandbox/pderop/dependencymanager-lambda/org.apache.felix.dependencymanager.lambda.samples/src/org/apache/felix/dependencymanager/lambda/samples/device/Activator.java
(original)
+++
felix/sandbox/pderop/dependencymanager-lambda/org.apache.felix.dependencymanager.lambda.samples/src/org/apache/felix/dependencymanager/lambda/samples/device/Activator.java
Thu Jan 21 22:52:22 2016
@@ -19,7 +19,6 @@
package org.apache.felix.dependencymanager.lambda.samples.device;
import static java.lang.System.out;
-import static org.apache.felix.dm.builder.lambda.Cb.ADD;
import org.apache.felix.dm.builder.lambda.DependencyActivatorBase;
import org.osgi.service.log.LogService;
@@ -41,7 +40,7 @@ public class Activator extends Dependenc
component(comp -> comp
.impl(DeviceAccessConsumer.class)
.withService(LogService.class)
- .withService(DeviceAccess.class, srv -> srv.cb(ADD,
DeviceAccessConsumer::add)));
+ .withService(DeviceAccess.class, srv ->
srv.cb(DeviceAccessConsumer::add)));
}
private void createDeviceAndParameter(int id) {
Modified:
felix/sandbox/pderop/dependencymanager-lambda/org.apache.felix.dependencymanager.lambda.samples/src/org/apache/felix/dependencymanager/lambda/samples/dictionary/Activator.java
URL:
http://svn.apache.org/viewvc/felix/sandbox/pderop/dependencymanager-lambda/org.apache.felix.dependencymanager.lambda.samples/src/org/apache/felix/dependencymanager/lambda/samples/dictionary/Activator.java?rev=1726125&r1=1726124&r2=1726125&view=diff
==============================================================================
---
felix/sandbox/pderop/dependencymanager-lambda/org.apache.felix.dependencymanager.lambda.samples/src/org/apache/felix/dependencymanager/lambda/samples/dictionary/Activator.java
(original)
+++
felix/sandbox/pderop/dependencymanager-lambda/org.apache.felix.dependencymanager.lambda.samples/src/org/apache/felix/dependencymanager/lambda/samples/dictionary/Activator.java
Thu Jan 21 22:52:22 2016
@@ -46,7 +46,7 @@ public class Activator extends Dependenc
aspect(DictionaryService.class, aspect -> aspect
.impl(DictionaryAspect.class)
.filter("(lang=en)").rank(10)
- .withConfiguration(conf ->
conf.pid(DictionaryAspectConfiguration.class).cb(DictionaryAspect::addWords))
+ .withConf(conf ->
conf.pid(DictionaryAspectConfiguration.class).cb(DictionaryAspect::addWords))
.withService(LogService.class, srv -> srv.required(false)));
// Create the SpellChecker component
Modified:
felix/sandbox/pderop/dependencymanager-lambda/org.apache.felix.dependencymanager.lambda.samples/src/org/apache/felix/dependencymanager/lambda/samples/factory/Activator.java
URL:
http://svn.apache.org/viewvc/felix/sandbox/pderop/dependencymanager-lambda/org.apache.felix.dependencymanager.lambda.samples/src/org/apache/felix/dependencymanager/lambda/samples/factory/Activator.java?rev=1726125&r1=1726124&r2=1726125&view=diff
==============================================================================
---
felix/sandbox/pderop/dependencymanager-lambda/org.apache.felix.dependencymanager.lambda.samples/src/org/apache/felix/dependencymanager/lambda/samples/factory/Activator.java
(original)
+++
felix/sandbox/pderop/dependencymanager-lambda/org.apache.felix.dependencymanager.lambda.samples/src/org/apache/felix/dependencymanager/lambda/samples/factory/Activator.java
Thu Jan 21 22:52:22 2016
@@ -19,8 +19,7 @@
package org.apache.felix.dependencymanager.lambda.samples.factory;
import static java.lang.System.out;
-import static org.apache.felix.dm.builder.lambda.Cb.ADD;
-import static org.apache.felix.dm.builder.lambda.Cb.START;
+import static org.apache.felix.dm.builder.lambda.ComponentBuilder.Cb.START;
import org.apache.felix.dm.builder.lambda.DependencyActivatorBase;
import org.osgi.service.log.LogService;
@@ -37,6 +36,6 @@ public class Activator extends Dependenc
.factory(ProviderFactory::new, ProviderFactory::create)
.provides(Provider.class)
.life(START, ProviderImpl::start)
- .withService(LogService.class, srv -> srv.required().cb(ADD,
ProviderImpl::set)));
+ .withService(LogService.class, srv ->
srv.required().cb(ProviderImpl::set)));
}
}
Modified:
felix/sandbox/pderop/dependencymanager-lambda/org.apache.felix.dependencymanager.lambda.samples/src/org/apache/felix/dependencymanager/lambda/samples/future/Activator.java
URL:
http://svn.apache.org/viewvc/felix/sandbox/pderop/dependencymanager-lambda/org.apache.felix.dependencymanager.lambda.samples/src/org/apache/felix/dependencymanager/lambda/samples/future/Activator.java?rev=1726125&r1=1726124&r2=1726125&view=diff
==============================================================================
---
felix/sandbox/pderop/dependencymanager-lambda/org.apache.felix.dependencymanager.lambda.samples/src/org/apache/felix/dependencymanager/lambda/samples/future/Activator.java
(original)
+++
felix/sandbox/pderop/dependencymanager-lambda/org.apache.felix.dependencymanager.lambda.samples/src/org/apache/felix/dependencymanager/lambda/samples/future/Activator.java
Thu Jan 21 22:52:22 2016
@@ -19,7 +19,6 @@
package org.apache.felix.dependencymanager.lambda.samples.future;
import static java.lang.System.out;
-import static org.apache.felix.dm.builder.lambda.Cb.ADD;
import java.util.List;
import java.util.concurrent.CompletableFuture;
@@ -50,7 +49,7 @@ public class Activator extends Dependenc
component(comp -> comp
.impl(FelixLinksImpl.class)
.provides(FelixLinks.class)
- .withService(LogService.class, srv -> srv.cb(ADD,
FelixLinksImpl::bind))
+ .withService(LogService.class, srv -> srv.cb(FelixLinksImpl::bind))
.withFuture(futureLinks, future ->
future.cb(FelixLinksImpl::setLinks)));
// Define a component that just displays the links found from the
Felix web site.
Modified:
felix/sandbox/pderop/dependencymanager-lambda/org.apache.felix.dependencymanager.lambda.samples/src/org/apache/felix/dependencymanager/lambda/samples/hello/Activator.java
URL:
http://svn.apache.org/viewvc/felix/sandbox/pderop/dependencymanager-lambda/org.apache.felix.dependencymanager.lambda.samples/src/org/apache/felix/dependencymanager/lambda/samples/hello/Activator.java?rev=1726125&r1=1726124&r2=1726125&view=diff
==============================================================================
---
felix/sandbox/pderop/dependencymanager-lambda/org.apache.felix.dependencymanager.lambda.samples/src/org/apache/felix/dependencymanager/lambda/samples/hello/Activator.java
(original)
+++
felix/sandbox/pderop/dependencymanager-lambda/org.apache.felix.dependencymanager.lambda.samples/src/org/apache/felix/dependencymanager/lambda/samples/hello/Activator.java
Thu Jan 21 22:52:22 2016
@@ -19,9 +19,8 @@
package org.apache.felix.dependencymanager.lambda.samples.hello;
import static java.lang.System.out;
-import static org.apache.felix.dm.builder.lambda.Cb.*;
+import static org.apache.felix.dm.builder.lambda.ComponentBuilder.Cb.START;
-import org.apache.felix.dm.builder.lambda.Cb;
import org.apache.felix.dm.builder.lambda.DependencyActivatorBase;
import org.osgi.service.cm.ConfigurationAdmin;
import org.osgi.service.log.LogService;
@@ -38,13 +37,13 @@ public class Activator extends Dependenc
.impl(ServiceProviderImpl.class)
.provides(ServiceProvider.class, property1 -> "value1", property2
-> 123) // property names are deduced from lambda parameter names
.life(START, ServiceProviderImpl::activate)
- .withService(LogService.class, srv -> srv.cb(ADD,
ServiceProviderImpl::bind)));
+ .withService(LogService.class, srv ->
srv.cb(ServiceProviderImpl::bind)));
component(comp -> comp
.impl(ServiceConsumer.class)
.withService(LogService.class)
.withService(ServiceProvider.class, srv ->
srv.filter("(property1=value1)"))
- .withConfiguration(conf ->
conf.pid(ServiceConsumer.class).cb(ServiceConsumer::updated)));
+ .withConf(conf ->
conf.pid(ServiceConsumer.class).cb(ServiceConsumer::updated)));
component(comp ->
comp.impl(Configurator.class).withService(ConfigurationAdmin.class));
}
Modified:
felix/sandbox/pderop/dependencymanager-lambda/org.apache.felix.dependencymanager.lambda.samples/src/org/apache/felix/dependencymanager/lambda/samples/rx/completable/Activator.java
URL:
http://svn.apache.org/viewvc/felix/sandbox/pderop/dependencymanager-lambda/org.apache.felix.dependencymanager.lambda.samples/src/org/apache/felix/dependencymanager/lambda/samples/rx/completable/Activator.java?rev=1726125&r1=1726124&r2=1726125&view=diff
==============================================================================
---
felix/sandbox/pderop/dependencymanager-lambda/org.apache.felix.dependencymanager.lambda.samples/src/org/apache/felix/dependencymanager/lambda/samples/rx/completable/Activator.java
(original)
+++
felix/sandbox/pderop/dependencymanager-lambda/org.apache.felix.dependencymanager.lambda.samples/src/org/apache/felix/dependencymanager/lambda/samples/rx/completable/Activator.java
Thu Jan 21 22:52:22 2016
@@ -19,7 +19,6 @@
package org.apache.felix.dependencymanager.lambda.samples.rx.completable;
import static java.lang.System.out;
-import static org.apache.felix.dm.builder.lambda.Cb.ADD;
import org.apache.felix.dm.builder.lambda.DependencyActivatorBase;
import org.osgi.service.log.LogService;
@@ -45,7 +44,7 @@ public class Activator extends Dependenc
component(comp -> comp
.provides(SiteInfo.class)
.factory(() -> new SiteInfoImpl("http://felix.apache.org/";))
- .withService(LogService.class, srv -> srv.cb(ADD,
SiteInfoImpl::bind)));
+ .withService(LogService.class, srv -> srv.cb(SiteInfoImpl::bind)));
// Define the FelixSite component that depends on the FelixSiteInfo
service
component(comp -> comp
Modified:
felix/sandbox/pderop/dependencymanager-lambda/org.apache.felix.dependencymanager.lambda.samples/src/org/apache/felix/dependencymanager/lambda/samples/rx/observable/ObservableComponent.java
URL:
http://svn.apache.org/viewvc/felix/sandbox/pderop/dependencymanager-lambda/org.apache.felix.dependencymanager.lambda.samples/src/org/apache/felix/dependencymanager/lambda/samples/rx/observable/ObservableComponent.java?rev=1726125&r1=1726124&r2=1726125&view=diff
==============================================================================
---
felix/sandbox/pderop/dependencymanager-lambda/org.apache.felix.dependencymanager.lambda.samples/src/org/apache/felix/dependencymanager/lambda/samples/rx/observable/ObservableComponent.java
(original)
+++
felix/sandbox/pderop/dependencymanager-lambda/org.apache.felix.dependencymanager.lambda.samples/src/org/apache/felix/dependencymanager/lambda/samples/rx/observable/ObservableComponent.java
Thu Jan 21 22:52:22 2016
@@ -18,6 +18,7 @@
*/
package org.apache.felix.dependencymanager.lambda.samples.rx.observable;
+import static org.apache.felix.dm.builder.lambda.ComponentBuilder.Cb.START;
import static
org.apache.felix.dm.builder.lambda.DependencyActivatorBase.component;
import java.util.Arrays;
@@ -26,7 +27,6 @@ import java.util.List;
import org.apache.felix.dm.Component;
import org.apache.felix.dm.DependencyManager;
-import org.apache.felix.dm.builder.lambda.Cb;
import org.osgi.service.log.LogService;
import io.reactivex.Observable;
@@ -80,7 +80,7 @@ public class ObservableComponent {
publisher.onSubscribe(EmptySubscription.INSTANCE);
component(m_dm, builder -> builder
.factory(() -> new
DocumentViewer(title))
- .lifeInst(Cb.START, publisher::onNext));
+ .lifeInst(START, publisher::onNext));
});
}
}
Modified:
felix/sandbox/pderop/dependencymanager-lambda/org.apache.felix.dependencymanager.lambda/src/org/apache/felix/dm/builder/lambda/BundleAdapterBuilder.java
URL:
http://svn.apache.org/viewvc/felix/sandbox/pderop/dependencymanager-lambda/org.apache.felix.dependencymanager.lambda/src/org/apache/felix/dm/builder/lambda/BundleAdapterBuilder.java?rev=1726125&r1=1726124&r2=1726125&view=diff
==============================================================================
---
felix/sandbox/pderop/dependencymanager-lambda/org.apache.felix.dependencymanager.lambda/src/org/apache/felix/dm/builder/lambda/BundleAdapterBuilder.java
(original)
+++
felix/sandbox/pderop/dependencymanager-lambda/org.apache.felix.dependencymanager.lambda/src/org/apache/felix/dm/builder/lambda/BundleAdapterBuilder.java
Thu Jan 21 22:52:22 2016
@@ -2,12 +2,8 @@ package org.apache.felix.dm.builder.lamb
import org.apache.felix.dm.builder.lambda.Functions.CbBundle;
import org.apache.felix.dm.builder.lambda.Functions.CbComponentBundle;
-import org.apache.felix.dm.builder.lambda.Functions.CbComponentDictionary;
-import org.apache.felix.dm.builder.lambda.Functions.CbDictionary;
import org.apache.felix.dm.builder.lambda.Functions.CbTypeBundle;
import org.apache.felix.dm.builder.lambda.Functions.CbTypeComponentBundle;
-import org.apache.felix.dm.builder.lambda.Functions.CbTypeComponentDictionary;
-import org.apache.felix.dm.builder.lambda.Functions.CbTypeDictionary;
/**
* Defines the interface for a Dependency Manager Factory Configuration
Adapter.
@@ -65,9 +61,17 @@ public interface BundleAdapterBuilder ex
BundleAdapterBuilder cb(String ... callbacks);
BundleAdapterBuilder cbi(Object callbackInstance, String ... callbacks);
- <T> BundleAdapterBuilder cb(Cb callbackType, CbTypeBundle<T> callback);
- BundleAdapterBuilder cbi(Cb callbackType, CbBundle callback);
-
- <T> BundleAdapterBuilder cb(Cb callbackType, CbTypeComponentBundle<T>
callback);
- BundleAdapterBuilder cbi(Cb callbackType, CbComponentBundle callback);
+ <T> BundleAdapterBuilder cb(CbTypeBundle<T> add);
+ <T> BundleAdapterBuilder cb(CbTypeBundle<T> add, CbTypeBundle<T> remove);
+ <T> BundleAdapterBuilder cb(CbTypeBundle<T> add, CbTypeBundle<T> change,
CbTypeBundle<T> remove);
+ BundleAdapterBuilder cbi(CbBundle add);
+ BundleAdapterBuilder cbi(CbBundle add, CbBundle remove);
+ BundleAdapterBuilder cbi(CbBundle add, CbBundle change, CbBundle remove);
+
+ <T> BundleAdapterBuilder cb(CbTypeComponentBundle<T> add);
+ <T> BundleAdapterBuilder cb(CbTypeComponentBundle<T> add,
CbTypeComponentBundle<T> remove);
+ <T> BundleAdapterBuilder cb(CbTypeComponentBundle<T> add,
CbTypeComponentBundle<T> change, CbTypeComponentBundle<T> remove);
+ BundleAdapterBuilder cbi(CbComponentBundle add);
+ BundleAdapterBuilder cbi(CbComponentBundle add, CbComponentBundle remove);
+ BundleAdapterBuilder cbi(CbComponentBundle add, CbComponentBundle change,
CbComponentBundle remove);
}
Modified:
felix/sandbox/pderop/dependencymanager-lambda/org.apache.felix.dependencymanager.lambda/src/org/apache/felix/dm/builder/lambda/BundleDependencyBuilder.java
URL:
http://svn.apache.org/viewvc/felix/sandbox/pderop/dependencymanager-lambda/org.apache.felix.dependencymanager.lambda/src/org/apache/felix/dm/builder/lambda/BundleDependencyBuilder.java?rev=1726125&r1=1726124&r2=1726125&view=diff
==============================================================================
---
felix/sandbox/pderop/dependencymanager-lambda/org.apache.felix.dependencymanager.lambda/src/org/apache/felix/dm/builder/lambda/BundleDependencyBuilder.java
(original)
+++
felix/sandbox/pderop/dependencymanager-lambda/org.apache.felix.dependencymanager.lambda/src/org/apache/felix/dm/builder/lambda/BundleDependencyBuilder.java
Thu Jan 21 22:52:22 2016
@@ -21,10 +21,21 @@ public interface BundleDependencyBuilder
BundleDependencyBuilder cb(String ... callbacks);
BundleDependencyBuilder cbi(Object callbackInstance, String ... callbacks);
- <T> BundleDependencyBuilder cb(Cb callbackType, CbTypeBundle<T> callback);
- <T> BundleDependencyBuilder cb(Cb callbackType, CbTypeComponentBundle<T>
callback);
- BundleDependencyBuilder cbi(Cb callbackType, CbBundle callback);
- BundleDependencyBuilder cbi(Cb callbackType, CbComponentBundle callback);
+ <T> BundleDependencyBuilder cb(CbTypeBundle<T> add);
+ <T> BundleDependencyBuilder cb(CbTypeBundle<T> add, CbTypeBundle<T>
remove);
+ <T> BundleDependencyBuilder cb(CbTypeBundle<T> add, CbTypeBundle<T>
change, CbTypeBundle<T> remove);
+
+ <T> BundleDependencyBuilder cb(CbTypeComponentBundle<T> add);
+ <T> BundleDependencyBuilder cb(CbTypeComponentBundle<T> add,
CbTypeComponentBundle<T> remove);
+ <T> BundleDependencyBuilder cb(CbTypeComponentBundle<T> add,
CbTypeComponentBundle<T> change, CbTypeComponentBundle<T> remove);
+
+ BundleDependencyBuilder cbi(CbBundle add);
+ BundleDependencyBuilder cbi(CbBundle add, CbBundle remove);
+ BundleDependencyBuilder cbi(CbBundle add, CbBundle change, CbBundle
remove);
+
+ BundleDependencyBuilder cbi(CbComponentBundle add);
+ BundleDependencyBuilder cbi(CbComponentBundle add, CbComponentBundle
remove);
+ BundleDependencyBuilder cbi(CbComponentBundle add, CbComponentBundle
change, CbComponentBundle remove);
/**
* Enables auto configuration for this dependency. This means the
component implementation (composition) will be
Modified:
felix/sandbox/pderop/dependencymanager-lambda/org.apache.felix.dependencymanager.lambda/src/org/apache/felix/dm/builder/lambda/ComponentBuilder.java
URL:
http://svn.apache.org/viewvc/felix/sandbox/pderop/dependencymanager-lambda/org.apache.felix.dependencymanager.lambda/src/org/apache/felix/dm/builder/lambda/ComponentBuilder.java?rev=1726125&r1=1726124&r2=1726125&view=diff
==============================================================================
---
felix/sandbox/pderop/dependencymanager-lambda/org.apache.felix.dependencymanager.lambda/src/org/apache/felix/dm/builder/lambda/ComponentBuilder.java
(original)
+++
felix/sandbox/pderop/dependencymanager-lambda/org.apache.felix.dependencymanager.lambda/src/org/apache/felix/dm/builder/lambda/ComponentBuilder.java
Thu Jan 21 22:52:22 2016
@@ -5,6 +5,7 @@ import java.util.concurrent.CompletableF
import java.util.function.Consumer;
import java.util.function.Function;
import java.util.function.Supplier;
+import java.util.stream.Stream;
import org.apache.felix.dm.Component;
import org.apache.felix.dm.builder.lambda.Functions.CbComponent;
@@ -18,6 +19,32 @@ import org.apache.felix.dm.builder.lambd
* @param <B> the builder that extends this class.
*/
public interface ComponentBuilder<B extends ComponentBuilder<B>> {
+
+ /**
+ * Component Callbacks.
+ */
+ public enum Cb {
+ /**
+ * Component initialized.
+ */
+ INIT,
+
+ /**
+ * Component started
+ */
+ START,
+
+ /**
+ * Component stopped.
+ */
+ STOP,
+
+ /**
+ * Component destroyed.
+ */
+ DESTROY
+ };
+
/**
* Configures the component implementation. Can be a class name, or a
component implementation object.
* @param impl the component implementation (a class, or an Object).
@@ -159,7 +186,7 @@ public interface ComponentBuilder<B exte
* @param service the dependency that is required and that will be
injected in any field with the same dependency type.
* @return this builder
*/
- B withService(Class<?> service, Class<?> ... services);
+ B withService(Class<?> ... services);
/**
* Adds a service dependency.
@@ -174,8 +201,20 @@ public interface ComponentBuilder<B exte
* @param consumer the lambda used to build the configuration dependency.
* @return this builder.
*/
- B withConfiguration(Consumer<ConfigurationDependencyBuilder> consumer);
+ B withConf(Consumer<ConfigurationDependencyBuilder> consumer);
+ @SuppressWarnings("unchecked")
+ default B withConf(String ... pids) {
+ Stream.of(pids).forEach(pid -> withConf(cnf -> cnf.pid(pid)));
+ return (B) this;
+ }
+
+ @SuppressWarnings("unchecked")
+ default B withConf(Class<?> ... pids) {
+ Stream.of(pids).forEach(pid -> withConf(cnf -> cnf.pid(pid)));
+ return (B) this;
+ }
+
/**
* Adds a bundle dependency.
* @param consumer the lambda used to build the bundle dependency.
Modified:
felix/sandbox/pderop/dependencymanager-lambda/org.apache.felix.dependencymanager.lambda/src/org/apache/felix/dm/builder/lambda/Functions.java
URL:
http://svn.apache.org/viewvc/felix/sandbox/pderop/dependencymanager-lambda/org.apache.felix.dependencymanager.lambda/src/org/apache/felix/dm/builder/lambda/Functions.java?rev=1726125&r1=1726124&r2=1726125&view=diff
==============================================================================
---
felix/sandbox/pderop/dependencymanager-lambda/org.apache.felix.dependencymanager.lambda/src/org/apache/felix/dm/builder/lambda/Functions.java
(original)
+++
felix/sandbox/pderop/dependencymanager-lambda/org.apache.felix.dependencymanager.lambda/src/org/apache/felix/dm/builder/lambda/Functions.java
Thu Jan 21 22:52:22 2016
@@ -4,7 +4,6 @@ import java.io.Serializable;
import java.util.Dictionary;
import java.util.Map;
import java.util.Objects;
-import java.util.function.BiConsumer;
import org.apache.felix.dm.Component;
import org.osgi.framework.Bundle;
