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 2018/01/30 13:27:26 UTC
[2/3] aries-jax-rs-whiteboard git commit: Not needed anymore
Not needed anymore
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/0079ab17
Tree: http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/tree/0079ab17
Diff: http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/diff/0079ab17
Branch: refs/heads/master
Commit: 0079ab1753c7fb5e90919c6b3a3dedc448ff9c2f
Parents: 03f27dc
Author: Carlos Sierra <cs...@apache.org>
Authored: Tue Jan 30 14:22:44 2018 +0100
Committer: Carlos Sierra <cs...@apache.org>
Committed: Tue Jan 30 14:22:44 2018 +0100
----------------------------------------------------------------------
.../rs/whiteboard/activator/CxfJaxrsBundleActivator.java | 7 ++-----
.../apache/aries/jax/rs/whiteboard/internal/Utils.java | 4 ----
.../aries/jax/rs/whiteboard/internal/Whiteboard.java | 10 +++++-----
3 files changed, 7 insertions(+), 14 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/0079ab17/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 4f9f3d5..f7c88f7 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
@@ -39,7 +39,6 @@ import org.slf4j.LoggerFactory;
import static java.lang.String.format;
import static org.apache.aries.jax.rs.whiteboard.internal.Utils.canonicalize;
-import static org.apache.aries.jax.rs.whiteboard.internal.Utils.ignoreResult;
import static org.apache.aries.jax.rs.whiteboard.internal.Whiteboard.createWhiteboard;
import static org.apache.aries.osgi.functional.OSGi.all;
import static org.apache.aries.osgi.functional.OSGi.configurations;
@@ -82,10 +81,8 @@ public class CxfJaxrsBundleActivator implements BundleActivator {
_defaultOSGiResult =
all(
- ignoreResult(
- register(
- ClientBuilder.class, new ClientBuilderFactory(), null)),
- ignoreResult(runWhiteboard(bundleContext, defaultConfiguration))
+ ignore(registerClient()),
+ ignore(runWhiteboard(bundleContext, defaultConfiguration))
)
.run(bundleContext);
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/0079ab17/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 c04a6e4..0007673 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
@@ -215,10 +215,6 @@ public class Utils {
serviceRegistration.setProperties(properties);
}
- public static OSGi<Void> ignoreResult(OSGi<?> program) {
- return program.map(t -> null);
- }
-
public interface PropertyHolder {
Object get(String propertyName);
}
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/0079ab17/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 5b473a5..6355a2b 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
@@ -71,12 +71,12 @@ import static org.apache.aries.jax.rs.whiteboard.internal.Utils.canonicalize;
import static org.apache.aries.jax.rs.whiteboard.internal.Utils.generateApplicationName;
import static org.apache.aries.jax.rs.whiteboard.internal.Utils.getProperties;
import static org.apache.aries.jax.rs.whiteboard.internal.Utils.highestPer;
-import static org.apache.aries.jax.rs.whiteboard.internal.Utils.ignoreResult;
import static org.apache.aries.jax.rs.whiteboard.internal.Utils.onlyGettables;
import static org.apache.aries.jax.rs.whiteboard.internal.Utils.service;
import static org.apache.aries.jax.rs.whiteboard.internal.Utils.updateProperty;
import static org.apache.aries.osgi.functional.OSGi.all;
import static org.apache.aries.osgi.functional.OSGi.effects;
+import static org.apache.aries.osgi.functional.OSGi.ignore;
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;
@@ -149,10 +149,10 @@ public class Whiteboard {
_counter = new ServiceRegistrationChangeCounter(_runtimeRegistration);
_program =
all(
- ignoreResult(registerDefaultApplication()),
- ignoreResult(applications()),
- ignoreResult(applicationResources()),
- ignoreResult(applicationExtensions()
+ ignore(registerDefaultApplication()),
+ ignore(applications()),
+ ignore(applicationResources()),
+ ignore(applicationExtensions()
));
}