You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@aries.apache.org by ro...@apache.org on 2018/08/17 17:14:41 UTC
aries-jax-rs-whiteboard git commit: ARIES-1824 Add missing
`osgi.jaxrs.media.type` properties to extensions
Repository: aries-jax-rs-whiteboard
Updated Branches:
refs/heads/master 507451a5a -> 6eafab420
ARIES-1824 Add missing `osgi.jaxrs.media.type` properties to extensions
Signed-off-by: Raymond Auge <ro...@apache.org>
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/6eafab42
Tree: http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/tree/6eafab42
Diff: http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/diff/6eafab42
Branch: refs/heads/master
Commit: 6eafab4202d1f2d80555af3c7b5233e66fde734a
Parents: 507451a
Author: Raymond Auge <ro...@apache.org>
Authored: Fri Aug 17 12:47:23 2018 -0400
Committer: Raymond Auge <ro...@apache.org>
Committed: Fri Aug 17 13:13:13 2018 -0400
----------------------------------------------------------------------
.../src/main/java/test/JaxbJsonTest.java | 16 ++++++++++++++++
.../jax/rs/jackson/JaxbJsonBundleActivator.java | 4 +++-
2 files changed, 19 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/6eafab42/integrations/jackson/jackson-itest/src/main/java/test/JaxbJsonTest.java
----------------------------------------------------------------------
diff --git a/integrations/jackson/jackson-itest/src/main/java/test/JaxbJsonTest.java b/integrations/jackson/jackson-itest/src/main/java/test/JaxbJsonTest.java
index 0a9ee48..0ea44d8 100644
--- a/integrations/jackson/jackson-itest/src/main/java/test/JaxbJsonTest.java
+++ b/integrations/jackson/jackson-itest/src/main/java/test/JaxbJsonTest.java
@@ -18,6 +18,8 @@
package test;
import org.junit.Test;
+import org.osgi.service.jaxrs.whiteboard.JaxrsWhiteboardConstants;
+
import test.types.TestHelper;
import test.types.TestJaxbJson;
@@ -38,4 +40,18 @@ public class JaxbJsonTest extends TestHelper {
assertTrue(response.contains("value"));
}
+ @Test
+ public void testJSONPEndpointRequireExtension() {
+ WebTarget webTarget = createDefaultTarget().path("jaxbjson");
+
+ registerAddon(
+ new TestJaxbJson(),
+ JaxrsWhiteboardConstants.JAX_RS_EXTENSION_SELECT,
+ "(osgi.jaxrs.media.type=application/json)");
+
+ String response = webTarget.request().get(String.class);
+
+ assertTrue(response.contains("value"));
+ }
+
}
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/6eafab42/integrations/jackson/jackson-jaxrs/src/main/java/org/apache/aries/jax/rs/jackson/JaxbJsonBundleActivator.java
----------------------------------------------------------------------
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 a3c49a0..0ecebcb 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
@@ -29,6 +29,7 @@ import java.util.Enumeration;
import java.util.Hashtable;
import java.util.Map;
+import javax.ws.rs.core.MediaType;
import javax.ws.rs.ext.MessageBodyReader;
import javax.ws.rs.ext.MessageBodyWriter;
@@ -80,6 +81,7 @@ public class JaxbJsonBundleActivator implements BundleActivator {
Hashtable<String, Object> serviceProps =
new Hashtable<String, Object>() {{
put(JaxrsWhiteboardConstants.JAX_RS_EXTENSION, true);
+ put(JaxrsWhiteboardConstants.JAX_RS_MEDIA_TYPE, MediaType.APPLICATION_JSON);
putIfAbsent(
JaxrsWhiteboardConstants.JAX_RS_NAME, "jaxb-json");
put(Constants.SERVICE_RANKING, Integer.MIN_VALUE);
@@ -93,7 +95,7 @@ public class JaxbJsonBundleActivator implements BundleActivator {
while (keys.hasMoreElements()) {
String key = keys.nextElement();
-
+
if(!key.startsWith(".")) {
serviceProps.put(key, properties.get(key));
}