You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@shindig.apache.org by aw...@apache.org on 2009/08/05 18:41:34 UTC
svn commit: r801292 - in /incubator/shindig/trunk/java/common/src:
main/java/org/apache/shindig/protocol/ContentTypes.java
test/java/org/apache/shindig/protocol/ContentTypesTest.java
Author: awiner
Date: Wed Aug 5 16:41:34 2009
New Revision: 801292
URL: http://svn.apache.org/viewvc?rev=801292&view=rev
Log:
SHINDIG-1142: JSON-RPC service SHOULD permit application/json-rpc for Accept and Content-Type headers according to the spec
- Add support for application/json-rpc and application/jsonrequest as per the JSON-RPC spec
Modified:
incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/ContentTypes.java
incubator/shindig/trunk/java/common/src/test/java/org/apache/shindig/protocol/ContentTypesTest.java
Modified: incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/ContentTypes.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/ContentTypes.java?rev=801292&r1=801291&r2=801292&view=diff
==============================================================================
--- incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/ContentTypes.java (original)
+++ incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/ContentTypes.java Wed Aug 5 16:41:34 2009
@@ -33,11 +33,13 @@
private static final Logger logger = Logger.getLogger(ContentTypes.class.getName());
/**
- * Allowed alternatives to application/json
+ * Allowed alternatives to application/json, including types listed
+ * in JSON-RPC spec.
*/
public static final Set<String> ALLOWED_JSON_CONTENT_TYPES =
ImmutableSet.of("application/json", "text/x-json", "application/javascript",
- "application/x-javascript", "text/javascript", "text/ecmascript");
+ "application/x-javascript", "text/javascript", "text/ecmascript",
+ "application/json-rpc", "application/jsonrequest");
/**
* Allowed alternatives to application/xml
Modified: incubator/shindig/trunk/java/common/src/test/java/org/apache/shindig/protocol/ContentTypesTest.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/common/src/test/java/org/apache/shindig/protocol/ContentTypesTest.java?rev=801292&r1=801291&r2=801292&view=diff
==============================================================================
--- incubator/shindig/trunk/java/common/src/test/java/org/apache/shindig/protocol/ContentTypesTest.java (original)
+++ incubator/shindig/trunk/java/common/src/test/java/org/apache/shindig/protocol/ContentTypesTest.java Wed Aug 5 16:41:34 2009
@@ -34,6 +34,11 @@
ContentTypes.OUTPUT_JSON_CONTENT_TYPE, true);
}
+ public void testAllowJsonRpc() throws Exception {
+ ContentTypes.checkContentTypes(ContentTypes.ALLOWED_JSON_CONTENT_TYPES,
+ "application/json-rpc", true);
+ }
+
public void testAllowAtom() throws Exception {
ContentTypes.checkContentTypes(ContentTypes.ALLOWED_ATOM_CONTENT_TYPES,
ContentTypes.OUTPUT_ATOM_CONTENT_TYPE, true);