svn commit: r1779844 - in /axis/axis2/java/core/trunk/modules/json: test-repository/json/axis2.xml test/org/apache/axis2/json/JSONIntegrationTest.java test/org/apache/axis2/json/JSONTestConstants.java

[veithen]

Author: veithen
Date: Sun Jan 22 19:20:02 2017
New Revision: 1779844

URL: http://svn.apache.org/viewvc?rev=1779844&view=rev
Log:
AXIS2-2037: Using a non standard content type (application/json/badgerfish) is 
already a questionable choice, but at least it should be spec compliant (which 
is not the case because of the second slash). Use application/json+badgerfish 
instead.

Modified:
    axis/axis2/java/core/trunk/modules/json/test-repository/json/axis2.xml
    
axis/axis2/java/core/trunk/modules/json/test/org/apache/axis2/json/JSONIntegrationTest.java
    
axis/axis2/java/core/trunk/modules/json/test/org/apache/axis2/json/JSONTestConstants.java

Modified: axis/axis2/java/core/trunk/modules/json/test-repository/json/axis2.xml
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/json/test-repository/json/axis2.xml?rev=1779844&r1=1779843&r2=1779844&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/json/test-repository/json/axis2.xml 
(original)
+++ axis/axis2/java/core/trunk/modules/json/test-repository/json/axis2.xml Sun 
Jan 22 19:20:02 2017
@@ -126,7 +126,7 @@
                          
class="org.apache.axis2.transport.http.SOAPMessageFormatter"/>
         <messageFormatter contentType="application/json"
                          class="org.apache.axis2.json.JSONMessageFormatter"/>
-        <messageFormatter contentType="application/json/badgerfish"
+        <messageFormatter contentType="application/json+badgerfish"
                          
class="org.apache.axis2.json.JSONBadgerfishMessageFormatter"/>
         <messageFormatter contentType="text/javascript"
                          class="org.apache.axis2.json.JSONMessageFormatter"/>
@@ -140,7 +140,7 @@
     <messageBuilders>
         <messageBuilder contentType="application/json"
                          class="org.apache.axis2.json.JSONOMBuilder"/>
-        <messageBuilder contentType="application/json/badgerfish"
+        <messageBuilder contentType="application/json+badgerfish"
                          
class="org.apache.axis2.json.JSONBadgerfishOMBuilder"/>
         <messageBuilder contentType="text/javascript"
                          class="org.apache.axis2.json.JSONOMBuilder"/>

Modified: 
axis/axis2/java/core/trunk/modules/json/test/org/apache/axis2/json/JSONIntegrationTest.java
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/json/test/org/apache/axis2/json/JSONIntegrationTest.java?rev=1779844&r1=1779843&r2=1779844&view=diff
==============================================================================
--- 
axis/axis2/java/core/trunk/modules/json/test/org/apache/axis2/json/JSONIntegrationTest.java
 (original)
+++ 
axis/axis2/java/core/trunk/modules/json/test/org/apache/axis2/json/JSONIntegrationTest.java
 Sun Jan 22 19:20:02 2017
@@ -80,7 +80,7 @@ public class JSONIntegrationTest impleme
 
     @Test
     public void testEchoOMWithJSONBadgerfish() throws Exception{
-       doEchoOM("application/json/badgerfish", 
Constants.Configuration.HTTP_METHOD_POST);
+       doEchoOM("application/json+badgerfish", 
Constants.Configuration.HTTP_METHOD_POST);
     }
 
     @Test
@@ -97,7 +97,7 @@ public class JSONIntegrationTest impleme
     public void testPOJOServiceWithJSONBadgerfish() throws Exception {
         HttpURLConnection conn = (HttpURLConnection)new 
URL(server.getEndpoint("POJOService")).openConnection();
         conn.setDoOutput(true);
-        conn.addRequestProperty("Content-Type", "application/json/badgerfish");
+        conn.addRequestProperty("Content-Type", "application/json+badgerfish");
         Writer out = new OutputStreamWriter(conn.getOutputStream(), "UTF-8");
         // XML is: <sayHello 
xmlns="http://example.org";><myName>Joe</myName></sayHello>
         out.write("{ \"sayHello\" : { \"@xmlns\" : { \"$\" : 
\"http://example.org\"; }, \"myName\" : { \"$\" : \"Joe\" } } }");

Modified: 
axis/axis2/java/core/trunk/modules/json/test/org/apache/axis2/json/JSONTestConstants.java
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/json/test/org/apache/axis2/json/JSONTestConstants.java?rev=1779844&r1=1779843&r2=1779844&view=diff
==============================================================================
--- 
axis/axis2/java/core/trunk/modules/json/test/org/apache/axis2/json/JSONTestConstants.java
 (original)
+++ 
axis/axis2/java/core/trunk/modules/json/test/org/apache/axis2/json/JSONTestConstants.java
 Sun Jan 22 19:20:02 2017
@@ -21,7 +21,7 @@ package org.apache.axis2.json;
 
 public interface JSONTestConstants {
 
-    public static final String CONTENT_TYPE_BADGERFISH = 
"application/json/badgerfish";
+    public static final String CONTENT_TYPE_BADGERFISH = 
"application/json+badgerfish";
     
     public static final String CONTENT_TYPE_MAPPED = "application/json";