Api usage updates
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/c086a928 Tree: http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/tree/c086a928 Diff: http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/diff/c086a928 Branch: refs/heads/master Commit: c086a9287892241ca2f591c7f7e0407c1b0ab89b Parents: 6b44cd4 Author: Carlos Sierra <[email protected]> Authored: Tue Nov 21 18:37:48 2017 +0100 Committer: Carlos Sierra <[email protected]> Committed: Tue Nov 21 18:37:48 2017 +0100 ---------------------------------------------------------------------- .../aries/jax/rs/whiteboard/internal/Utils.java | 9 ++++----- .../jax/rs/whiteboard/internal/Whiteboard.java | 16 ++++++++-------- 2 files changed, 12 insertions(+), 13 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/c086a928/jax-rs.whiteboard/src/main/java/org/apache/aries/jax/rs/whiteboard/internal/Utils.java ---------------------------------------------------------------------- diff --git a/jax-rs.whiteboard/src/main/java/org/apache/aries/jax/rs/whiteboard/internal/Utils.java b/jax-rs.whiteboard/src/main/java/org/apache/aries/jax/rs/whiteboard/internal/Utils.java index 014eabb..624310c 100644 --- a/jax-rs.whiteboard/src/main/java/org/apache/aries/jax/rs/whiteboard/internal/Utils.java +++ b/jax-rs.whiteboard/src/main/java/org/apache/aries/jax/rs/whiteboard/internal/Utils.java @@ -35,6 +35,7 @@ import java.util.function.Consumer; import java.util.function.Function; import static org.apache.aries.osgi.functional.OSGi.bundleContext; +import static org.apache.aries.osgi.functional.OSGi.effects; import static org.apache.aries.osgi.functional.OSGi.just; import static org.apache.aries.osgi.functional.OSGi.nothing; import static org.apache.aries.osgi.functional.OSGi.onClose; @@ -143,12 +144,10 @@ public class Utils { catch (Exception e){ } if (service == null) { - whenAddedNotGettable.accept(immutable); - return - onClose( - () -> whenLeavingNotGettable.accept( - immutable) + effects( + () -> whenAddedNotGettable.accept(immutable), + () -> whenLeavingNotGettable.accept(immutable) ).then( nothing() ); http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/c086a928/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 1f9ff5a..961c468 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 @@ -656,11 +656,10 @@ public class Whiteboard { private static <T> OSGi<T> countChanges( OSGi<T> program, ChangeCounter counter) { - return program.flatMap(t -> { - counter.inc(); - - return onClose(counter::inc).then(just(t)); - }); + return program.effects( + __ -> counter.inc(), + __ -> counter.inc() + ); } private static CXFNonSpringServlet createCXFServlet(Bus bus) { @@ -698,9 +697,10 @@ public class Whiteboard { return just(sr); } else { - onInvalidAdded.accept(sr); - return - onClose(() -> onInvalidRemoved.accept(sr)).then(nothing()); + return effects( + () -> onInvalidAdded.accept(sr), + () -> onInvalidRemoved.accept(sr)). + then(nothing()); } }); }
