openwebbeans-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rmannibu...@apache.org
Subject svn commit: r1797783 - /openwebbeans/meecrowave/trunk/meecrowave-core/src/main/java/org/apache/meecrowave/cxf/MeecrowaveBus.java
Date Tue, 06 Jun 2017 12:37:50 GMT
Author: rmannibucau
Date: Tue Jun  6 12:37:50 2017
New Revision: 1797783

URL: http://svn.apache.org/viewvc?rev=1797783&view=rev
Log:
MEECROWAVE-35 application/*+json support

Modified:
    openwebbeans/meecrowave/trunk/meecrowave-core/src/main/java/org/apache/meecrowave/cxf/MeecrowaveBus.java

Modified: openwebbeans/meecrowave/trunk/meecrowave-core/src/main/java/org/apache/meecrowave/cxf/MeecrowaveBus.java
URL: http://svn.apache.org/viewvc/openwebbeans/meecrowave/trunk/meecrowave-core/src/main/java/org/apache/meecrowave/cxf/MeecrowaveBus.java?rev=1797783&r1=1797782&r2=1797783&view=diff
==============================================================================
--- openwebbeans/meecrowave/trunk/meecrowave-core/src/main/java/org/apache/meecrowave/cxf/MeecrowaveBus.java
(original)
+++ openwebbeans/meecrowave/trunk/meecrowave-core/src/main/java/org/apache/meecrowave/cxf/MeecrowaveBus.java
Tue Jun  6 12:37:50 2017
@@ -187,8 +187,8 @@ public class MeecrowaveBus implements Bu
     }
 
     @Provider
-    @Produces(MediaType.APPLICATION_JSON)
-    @Consumes(MediaType.APPLICATION_JSON)
+    @Produces({MediaType.APPLICATION_JSON, "*/*+json"})
+    @Consumes({MediaType.APPLICATION_JSON, "*/*+json"})
     public static class ConfiguredJsonbJaxrsProvider<T> extends JsonbJaxrsProvider<T>
{
         private ConfiguredJsonbJaxrsProvider(final String encoding,
                                              final boolean nulls,
@@ -208,8 +208,8 @@ public class MeecrowaveBus implements Bu
     }
 
     @Provider
-    @Produces(MediaType.APPLICATION_JSON)
-    @Consumes(MediaType.APPLICATION_JSON)
+    @Produces({MediaType.APPLICATION_JSON, "application/*+json"})
+    @Consumes({MediaType.APPLICATION_JSON, "application/*+json"})
     public static class ConfiguredJsrProvider extends DelegateProvider<JsonStructure>
{ // TODO: probably wire the encoding in johnzon
         private ConfiguredJsrProvider(final String bufferStrategy, final int maxStringLen,
                                       final int maxReadBufferLen, final int maxWriteBufferLen,



Mime
View raw message