cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From serg...@apache.org
Subject svn commit: r1532895 - in /cxf/trunk/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/provider: dom4j/DOM4JProvider.java json/JSONProvider.java
Date Wed, 16 Oct 2013 20:30:55 GMT
Author: sergeyb
Date: Wed Oct 16 20:30:55 2013
New Revision: 1532895

URL: http://svn.apache.org/r1532895
Log:
JSON & DOM4J providers should support composite JSON media types by default

Modified:
    cxf/trunk/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/provider/dom4j/DOM4JProvider.java
    cxf/trunk/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/provider/json/JSONProvider.java

Modified: cxf/trunk/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/provider/dom4j/DOM4JProvider.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/provider/dom4j/DOM4JProvider.java?rev=1532895&r1=1532894&r2=1532895&view=diff
==============================================================================
--- cxf/trunk/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/provider/dom4j/DOM4JProvider.java
(original)
+++ cxf/trunk/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/provider/dom4j/DOM4JProvider.java
Wed Oct 16 20:30:55 2013
@@ -25,8 +25,10 @@ import java.io.StringReader;
 import java.lang.annotation.Annotation;
 import java.lang.reflect.Type;
 
+import javax.ws.rs.Consumes;
 import javax.ws.rs.NotAcceptableException;
 import javax.ws.rs.NotSupportedException;
+import javax.ws.rs.Produces;
 import javax.ws.rs.WebApplicationException;
 import javax.ws.rs.core.Context;
 import javax.ws.rs.core.MediaType;
@@ -38,8 +40,8 @@ import javax.ws.rs.ext.Providers;
 import org.apache.cxf.jaxrs.provider.AbstractConfigurableProvider;
 import org.apache.cxf.staxutils.StaxUtils;
 
-@javax.ws.rs.Produces({"application/xml", "application/*+xml", "text/xml", "application/json"
})
-@javax.ws.rs.Consumes({"application/xml", "application/*+xml", "text/xml", "application/json"
})
+@Produces({"application/xml", "application/*+xml", "text/xml", "application/json", "application/*+json"
})
+@Consumes({"application/xml", "application/*+xml", "text/xml", "application/json", "application/*+json"
})
 public class DOM4JProvider extends AbstractConfigurableProvider 
     implements MessageBodyReader<org.dom4j.Document>, MessageBodyWriter<org.dom4j.Document>
{
 

Modified: cxf/trunk/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/provider/json/JSONProvider.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/provider/json/JSONProvider.java?rev=1532895&r1=1532894&r2=1532895&view=diff
==============================================================================
--- cxf/trunk/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/provider/json/JSONProvider.java
(original)
+++ cxf/trunk/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/provider/json/JSONProvider.java
Wed Oct 16 20:30:55 2013
@@ -79,8 +79,8 @@ import org.codehaus.jettison.mapped.Simp
 import org.codehaus.jettison.mapped.TypeConverter;
 import org.codehaus.jettison.util.StringIndenter;
 
-@Produces("application/json")
-@Consumes("application/json")
+@Produces({"application/json", "application/*+json" })
+@Consumes({"application/json", "application/*+json" })
 @Provider
 public class JSONProvider<T> extends AbstractJAXBProvider<T>  {
     



Mime
View raw message