You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@aries.apache.org by cs...@apache.org on 2017/10/10 16:36:02 UTC
[3/3] aries-jax-rs-whiteboard git commit: Update component DSL
semantics
Update component DSL semantics
Project: http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/repo
Commit: http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/commit/95c2f63a
Tree: http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/tree/95c2f63a
Diff: http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/diff/95c2f63a
Branch: refs/heads/master
Commit: 95c2f63a40d2c6ae8fb0f4d66d3a215f3a544f5c
Parents: 9b895c0
Author: Carlos Sierra <cs...@apache.org>
Authored: Tue Oct 10 17:38:29 2017 +0200
Committer: Carlos Sierra <cs...@apache.org>
Committed: Tue Oct 10 17:59:46 2017 +0200
----------------------------------------------------------------------
.../activator/CXFJaxRsBundleActivator.java | 4 ++--
.../jax/rs/whiteboard/internal/Whiteboard.java | 23 ++++++++++----------
2 files changed, 13 insertions(+), 14 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/95c2f63a/jax-rs.whiteboard/src/main/java/org/apache/aries/jax/rs/whiteboard/activator/CXFJaxRsBundleActivator.java
----------------------------------------------------------------------
diff --git a/jax-rs.whiteboard/src/main/java/org/apache/aries/jax/rs/whiteboard/activator/CXFJaxRsBundleActivator.java b/jax-rs.whiteboard/src/main/java/org/apache/aries/jax/rs/whiteboard/activator/CXFJaxRsBundleActivator.java
index 3c4359e..3a21e20 100644
--- a/jax-rs.whiteboard/src/main/java/org/apache/aries/jax/rs/whiteboard/activator/CXFJaxRsBundleActivator.java
+++ b/jax-rs.whiteboard/src/main/java/org/apache/aries/jax/rs/whiteboard/activator/CXFJaxRsBundleActivator.java
@@ -52,8 +52,8 @@ public class CXFJaxRsBundleActivator implements BundleActivator {
RuntimeDelegate.setInstance(new RuntimeDelegateImpl());
}
- private OSGiResult<?> _defaultOSGiResult;
- private OSGiResult<?> _whiteboardsResult;
+ private OSGiResult _defaultOSGiResult;
+ private OSGiResult _whiteboardsResult;
@Override
public void start(BundleContext bundleContext) throws Exception {
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/95c2f63a/jax-rs.whiteboard/src/main/java/org/apache/aries/jax/rs/whiteboard/internal/Whiteboard.java
----------------------------------------------------------------------
diff --git a/jax-rs.whiteboard/src/main/java/org/apache/aries/jax/rs/whiteboard/internal/Whiteboard.java b/jax-rs.whiteboard/src/main/java/org/apache/aries/jax/rs/whiteboard/internal/Whiteboard.java
index 7a9d179..4324ada 100644
--- a/jax-rs.whiteboard/src/main/java/org/apache/aries/jax/rs/whiteboard/internal/Whiteboard.java
+++ b/jax-rs.whiteboard/src/main/java/org/apache/aries/jax/rs/whiteboard/internal/Whiteboard.java
@@ -141,7 +141,7 @@ public class Whiteboard {
private final OSGi<Void> _program;
private final List<Object> _endpoints;
private final ServiceRegistration<?> _runtimeRegistration;
- private OSGiResult<Void> _osgiResult;
+ private OSGiResult _osgiResult;
private Whiteboard(
BundleContext bundleContext, Dictionary<String, ?> configuration) {
@@ -485,7 +485,7 @@ public class Whiteboard {
)
)
)
- ).foreach(
+ ).effects(
__ -> _runtime.addApplicationEndpoint(
applicationName, serviceReference),
__ -> _runtime.removeApplicationEndpoint(
@@ -516,10 +516,10 @@ public class Whiteboard {
just(serviceReference),
_runtime::addNotGettableExtension,
_runtime::removeNotGettableExtension
- ).foreach(
+ ).effects(
registrator::addProvider,
registrator::removeProvider
- ).foreach(
+ ).effects(
__ -> _runtime.addApplicationExtension(
applicationName, serviceReference),
__ -> _runtime.removeApplicationExtension(
@@ -584,7 +584,7 @@ public class Whiteboard {
return nothing();
}
- ).foreach(
+ ).effects(
__ -> {},
__ -> _runtime.addDependentApplication(
applicationReference)
@@ -596,11 +596,9 @@ public class Whiteboard {
()-> _runtime.removeDependentApplication(applicationReference)).
then(program);
- program = program.foreach(
- __ -> _runtime.removeDependentApplication(applicationReference)
- ).
- then(
- just(applicationReference)
+ program = program.effects(
+ __ -> _runtime.removeDependentApplication(applicationReference),
+ __ -> {}
);
return program;
@@ -636,7 +634,7 @@ public class Whiteboard {
).
filter(
extensionFilter::match
- ).foreach(
+ ).effects(
__ -> {},
__ -> _runtime.addDependentService(serviceReference)
).
@@ -652,7 +650,8 @@ public class Whiteboard {
then(program);
program = program.foreach(
- __ -> _runtime.removeDependentService(serviceReference)
+ __ -> _runtime.removeDependentService(serviceReference),
+ __ -> {}
);
return program;