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 2019/02/21 13:18:55 UTC
[aries-jax-rs-whiteboard] branch master updated: [ARIES-1899] Unify
configurations
This is an automated email from the ASF dual-hosted git repository.
csierra pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/aries-jax-rs-whiteboard.git
The following commit(s) were added to refs/heads/master by this push:
new 3a21658 [ARIES-1899] Unify configurations
3a21658 is described below
commit 3a21658dbe1bf003d3f0f7727ea835640461dc04
Author: Carlos Sierra <cs...@apache.org>
AuthorDate: Thu Feb 21 09:24:38 2019 +0100
[ARIES-1899] Unify configurations
---
.../rs/jaxb/json/activator/JaxbJsonBundleActivator.java | 14 ++++++++------
.../aries/jax/rs/jackson/JaxbJsonBundleActivator.java | 14 ++++++++------
.../rs/whiteboard/activator/CxfJaxrsBundleActivator.java | 3 +++
3 files changed, 19 insertions(+), 12 deletions(-)
diff --git a/integrations/cxf-jettison/cxf-jettison-jaxrs/src/main/java/org/apache/aries/jax/rs/jaxb/json/activator/JaxbJsonBundleActivator.java b/integrations/cxf-jettison/cxf-jettison-jaxrs/src/main/java/org/apache/aries/jax/rs/jaxb/json/activator/JaxbJsonBundleActivator.java
index 5f0802c..0465f02 100644
--- a/integrations/cxf-jettison/cxf-jettison-jaxrs/src/main/java/org/apache/aries/jax/rs/jaxb/json/activator/JaxbJsonBundleActivator.java
+++ b/integrations/cxf-jettison/cxf-jettison-jaxrs/src/main/java/org/apache/aries/jax/rs/jaxb/json/activator/JaxbJsonBundleActivator.java
@@ -34,6 +34,7 @@ import java.util.Dictionary;
import java.util.Enumeration;
import java.util.Hashtable;
import java.util.Map;
+import java.util.Objects;
import java.util.Optional;
import static org.apache.aries.component.dsl.OSGi.all;
@@ -52,12 +53,13 @@ public class JaxbJsonBundleActivator implements BundleActivator {
public static final String CONFIG_PID = "org.apache.aries.jax.rs.jaxb.json";
public static OSGi<Dictionary<String, ?>> CONFIGURATION =
- coalesce(
- all(
- configurations(CONFIG_PID),
- configuration(CONFIG_PID)
- ),
- just(Hashtable::new)
+ all(
+ configurations(CONFIG_PID),
+ coalesce(
+ configuration(CONFIG_PID),
+ just(Hashtable::new))
+ ).filter(
+ c -> !Objects.equals(c.get("enabled"), "false")
);
@Override
diff --git a/integrations/jackson/jackson-jaxrs/src/main/java/org/apache/aries/jax/rs/jackson/JaxbJsonBundleActivator.java b/integrations/jackson/jackson-jaxrs/src/main/java/org/apache/aries/jax/rs/jackson/JaxbJsonBundleActivator.java
index 0ecebcb..b7e0dc0 100644
--- a/integrations/jackson/jackson-jaxrs/src/main/java/org/apache/aries/jax/rs/jackson/JaxbJsonBundleActivator.java
+++ b/integrations/jackson/jackson-jaxrs/src/main/java/org/apache/aries/jax/rs/jackson/JaxbJsonBundleActivator.java
@@ -28,6 +28,7 @@ import java.util.Dictionary;
import java.util.Enumeration;
import java.util.Hashtable;
import java.util.Map;
+import java.util.Objects;
import javax.ws.rs.core.MediaType;
import javax.ws.rs.ext.MessageBodyReader;
@@ -45,12 +46,13 @@ public class JaxbJsonBundleActivator implements BundleActivator {
public static final String CONFIG_PID = "org.apache.aries.jax.rs.jackson";
public static OSGi<Dictionary<String, ?>> CONFIGURATION =
- coalesce(
- all(
- configurations(CONFIG_PID),
- configuration(CONFIG_PID)
- ),
- just(Hashtable::new)
+ all(
+ configurations(CONFIG_PID),
+ coalesce(
+ configuration(CONFIG_PID),
+ just(Hashtable::new))
+ ).filter(
+ c -> !Objects.equals(c.get("enabled"), "false")
);
@Override
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 9ef9fa4..d215173 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
@@ -22,6 +22,7 @@ import java.util.Dictionary;
import java.util.Hashtable;
import java.util.List;
import java.util.Map;
+import java.util.Objects;
import javax.ws.rs.client.ClientBuilder;
import javax.ws.rs.client.WebTarget;
@@ -91,6 +92,8 @@ public class CxfJaxrsBundleActivator implements BundleActivator {
return properties;
})
)
+ ).filter(
+ c -> !Objects.equals(c.get("enabled"), "false")
).
effects(
debugTracking(_log, () -> "whiteboard configuration")