You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wink.apache.org by nf...@apache.org on 2009/07/08 07:05:09 UTC
svn commit: r792036 - in /incubator/wink/trunk: wink-common/
wink-common/src/main/java/org/apache/wink/common/internal/providers/entity/json/
wink-common/src/main/java/org/apache/wink/common/model/json/
wink-server/src/test/java/org/apache/wink/server/...
Author: nfischer
Date: Wed Jul 8 05:05:09 2009
New Revision: 792036
URL: http://svn.apache.org/viewvc?rev=792036&view=rev
Log:
Using published org.json version 20080701 instead of duplicating sources [WINK-28]
Removed:
incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/model/json/JSONArray.java
incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/model/json/JSONException.java
incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/model/json/JSONObject.java
incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/model/json/JSONString.java
incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/model/json/JSONStringer.java
incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/model/json/JSONTokener.java
incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/model/json/JSONWriter.java
Modified:
incubator/wink/trunk/wink-common/pom.xml
incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/providers/entity/json/AbstractJsonXmlProvider.java
incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/providers/entity/json/JsonJAXBProvider.java
incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/providers/entity/json/JsonProvider.java
incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/model/json/JSONUtils.java
incubator/wink/trunk/wink-server/src/test/java/org/apache/wink/server/internal/providers/entity/AssetProviderTest.java
incubator/wink/trunk/wink-server/src/test/java/org/apache/wink/server/internal/providers/entity/JsonProviderTest.java
Modified: incubator/wink/trunk/wink-common/pom.xml
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-common/pom.xml?rev=792036&r1=792035&r2=792036&view=diff
==============================================================================
--- incubator/wink/trunk/wink-common/pom.xml (original)
+++ incubator/wink/trunk/wink-common/pom.xml Wed Jul 8 05:05:09 2009
@@ -49,6 +49,11 @@
<groupId>org.slf4j</groupId>
<artifactId>slf4j-simple</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.json</groupId>
+ <artifactId>json</artifactId>
+ <version>20080701</version>
+ </dependency>
<dependency>
<groupId>xmlunit</groupId>
<artifactId>xmlunit</artifactId>
Modified: incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/providers/entity/json/AbstractJsonXmlProvider.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/providers/entity/json/AbstractJsonXmlProvider.java?rev=792036&r1=792035&r2=792036&view=diff
==============================================================================
--- incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/providers/entity/json/AbstractJsonXmlProvider.java (original)
+++ incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/providers/entity/json/AbstractJsonXmlProvider.java Wed Jul 8 05:05:09 2009
@@ -35,12 +35,12 @@
import org.slf4j.LoggerFactory;
import org.apache.wink.common.internal.providers.entity.xml.AbstractJAXBProvider;
import org.apache.wink.common.model.atom.AtomJAXBUtils;
-import org.apache.wink.common.model.json.JSONException;
-import org.apache.wink.common.model.json.JSONObject;
import org.xml.sax.Attributes;
import org.xml.sax.ContentHandler;
import org.xml.sax.Locator;
import org.xml.sax.SAXException;
+import org.json.JSONObject;
+import org.json.JSONException;
public class AbstractJsonXmlProvider extends AbstractJAXBProvider {
Modified: incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/providers/entity/json/JsonJAXBProvider.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/providers/entity/json/JsonJAXBProvider.java?rev=792036&r1=792035&r2=792036&view=diff
==============================================================================
--- incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/providers/entity/json/JsonJAXBProvider.java (original)
+++ incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/providers/entity/json/JsonJAXBProvider.java Wed Jul 8 05:05:09 2009
@@ -43,7 +43,7 @@
import org.apache.wink.common.annotations.Scope;
import org.apache.wink.common.annotations.Scope.ScopeType;
import org.apache.wink.common.internal.utils.MediaTypeUtils;
-import org.apache.wink.common.model.json.JSONObject;
+import org.json.JSONObject;
@Scope(ScopeType.PROTOTYPE)
Modified: incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/providers/entity/json/JsonProvider.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/providers/entity/json/JsonProvider.java?rev=792036&r1=792035&r2=792036&view=diff
==============================================================================
--- incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/providers/entity/json/JsonProvider.java (original)
+++ incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/providers/entity/json/JsonProvider.java Wed Jul 8 05:05:09 2009
@@ -42,9 +42,9 @@
import org.apache.wink.common.RestConstants;
import org.apache.wink.common.internal.providers.entity.xml.AbstractJAXBProvider;
import org.apache.wink.common.internal.utils.MediaTypeUtils;
-import org.apache.wink.common.model.json.JSONException;
-import org.apache.wink.common.model.json.JSONObject;
import org.apache.wink.common.utils.ProviderUtils;
+import org.json.JSONObject;
+import org.json.JSONException;
@Provider
Modified: incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/model/json/JSONUtils.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/model/json/JSONUtils.java?rev=792036&r1=792035&r2=792036&view=diff
==============================================================================
--- incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/model/json/JSONUtils.java (original)
+++ incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/model/json/JSONUtils.java Wed Jul 8 05:05:09 2009
@@ -17,22 +17,32 @@
* under the License.
*
*******************************************************************************/
-
package org.apache.wink.common.model.json;
import java.util.Iterator;
+import org.json.JSONObject;
+import org.json.JSONArray;
+import org.json.JSONTokener;
+import org.json.JSONException;
+
public class JSONUtils {
-
+
+ public static JSONObject objectForString(final String input) throws JSONException {
+ assert input != null;
+ JSONTokener tok = new JSONTokener(input);
+ return new JSONObject(tok);
+ }
+
public static boolean equals(JSONObject expected, JSONObject actual) {
return isJSONEquals(expected, actual);
}
-
+
public static boolean equals(JSONArray expected, JSONArray actual) {
return isJSONEquals(expected, actual);
}
-
+
private static boolean isJSONEquals(Object expected, Object actual) {
if (expected == actual) {
return true;
@@ -71,7 +81,7 @@
}
return true;
}
-
+
// all other objects
return expected.equals(actual);
}
Modified: incubator/wink/trunk/wink-server/src/test/java/org/apache/wink/server/internal/providers/entity/AssetProviderTest.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-server/src/test/java/org/apache/wink/server/internal/providers/entity/AssetProviderTest.java?rev=792036&r1=792035&r2=792036&view=diff
==============================================================================
--- incubator/wink/trunk/wink-server/src/test/java/org/apache/wink/server/internal/providers/entity/AssetProviderTest.java (original)
+++ incubator/wink/trunk/wink-server/src/test/java/org/apache/wink/server/internal/providers/entity/AssetProviderTest.java Wed Jul 8 05:05:09 2009
@@ -40,10 +40,11 @@
import javax.xml.bind.annotation.XmlValue;
import org.apache.wink.common.annotations.Asset;
-import org.apache.wink.common.model.json.JSONException;
-import org.apache.wink.common.model.json.JSONObject;
+import org.apache.wink.common.model.json.JSONUtils;
import org.apache.wink.server.internal.servlet.MockServletInvocationTest;
import org.apache.wink.test.mock.MockRequestConstructor;
+import org.json.JSONException;
+import org.json.JSONObject;
import org.springframework.mock.web.MockHttpServletRequest;
import org.springframework.mock.web.MockHttpServletResponse;
@@ -154,7 +155,9 @@
MockHttpServletRequest request = MockRequestConstructor.constructMockRequest("GET", "/test", "application/json");
MockHttpServletResponse response = invoke(request);
assertEquals(200, response.getStatus());
- assertEquals(JSON, response.getContentAsString());
+ JSONObject result = JSONUtils.objectForString(response.getContentAsString());
+ JSONObject expected = JSONUtils.objectForString(JSON);
+ assertTrue(JSONUtils.equals(expected, result));
}
public void testAssetGetXml() throws Exception {
Modified: incubator/wink/trunk/wink-server/src/test/java/org/apache/wink/server/internal/providers/entity/JsonProviderTest.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-server/src/test/java/org/apache/wink/server/internal/providers/entity/JsonProviderTest.java?rev=792036&r1=792035&r2=792036&view=diff
==============================================================================
--- incubator/wink/trunk/wink-server/src/test/java/org/apache/wink/server/internal/providers/entity/JsonProviderTest.java (original)
+++ incubator/wink/trunk/wink-server/src/test/java/org/apache/wink/server/internal/providers/entity/JsonProviderTest.java Wed Jul 8 05:05:09 2009
@@ -38,13 +38,14 @@
import javax.xml.namespace.QName;
import org.apache.wink.common.annotations.Asset;
-import org.apache.wink.common.model.json.JSONException;
-import org.apache.wink.common.model.json.JSONObject;
+import org.apache.wink.common.model.json.JSONUtils;
import org.apache.wink.common.model.synd.SyndEntry;
import org.apache.wink.common.model.synd.SyndFeed;
import org.apache.wink.common.model.synd.SyndText;
import org.apache.wink.server.internal.servlet.MockServletInvocationTest;
import org.apache.wink.test.mock.MockRequestConstructor;
+import org.json.JSONException;
+import org.json.JSONObject;
import org.springframework.mock.web.MockHttpServletRequest;
import org.springframework.mock.web.MockHttpServletResponse;
@@ -94,6 +95,12 @@
+ " \"$\": \"entry title\"\n"
+ " }\n" + "}}";
+ private void compairJsonContent(final String expected, final String actual) throws JSONException {
+ JSONObject result = JSONUtils.objectForString(actual);
+ JSONObject want = JSONUtils.objectForString(expected);
+ assertTrue(JSONUtils.equals(want, result));
+ }
+
@Path("test")
public static class TestResource {
@@ -239,7 +246,7 @@
"/test/json", "application/json");
MockHttpServletResponse response = invoke(request);
assertEquals(200, response.getStatus());
- assertEquals(JSON, response.getContentAsString());
+ compairJsonContent(JSON, response.getContentAsString());
}
public void testGetJsonFeed() throws Exception {
@@ -247,7 +254,7 @@
"/test/jsonfeed", "application/json");
MockHttpServletResponse response = invoke(request);
assertEquals(200, response.getStatus());
- assertEquals(JSON_FEED, response.getContentAsString());
+ compairJsonContent(JSON_FEED, response.getContentAsString());
}
public void testGetJsonFromJAXB() throws Exception {
@@ -255,7 +262,7 @@
"/test/jaxb", "application/json");
MockHttpServletResponse response = invoke(request);
assertEquals(200, response.getStatus());
- assertEquals(JSON, response.getContentAsString());
+ compairJsonContent(JSON, response.getContentAsString());
}
public void testGetJsonFromJAXBElement() throws Exception {
@@ -263,7 +270,7 @@
"/test/jaxbelement", "application/json");
MockHttpServletResponse response = invoke(request);
assertEquals(200, response.getStatus());
- assertEquals(JSON, response.getContentAsString());
+ compairJsonContent(JSON, response.getContentAsString());
}
public void testGetJsonFromAtom() throws Exception {
@@ -271,7 +278,7 @@
"/test/atom", "application/json");
MockHttpServletResponse response = invoke(request);
assertEquals(200, response.getStatus());
- assertEquals(JSON_AS_ATOM_ENTRY, response.getContentAsString());
+ compairJsonContent(JSON_AS_ATOM_ENTRY, response.getContentAsString());
}
public void testGetJsonAsset() throws Exception {
@@ -279,7 +286,7 @@
"/test/jsonasset", "application/json");
MockHttpServletResponse response = invoke(request);
assertEquals(200, response.getStatus());
- assertEquals(JSON, response.getContentAsString());
+ compairJsonContent(JSON, response.getContentAsString());
}
public void testGetJAXBAsset() throws Exception {
@@ -287,7 +294,7 @@
"/test/jaxbasset", "application/json");
MockHttpServletResponse response = invoke(request);
assertEquals(200, response.getStatus());
- assertEquals(JSON, response.getContentAsString());
+ compairJsonContent(JSON, response.getContentAsString());
}
public void testGetAtomAsset() throws Exception {
@@ -295,7 +302,7 @@
"/test/atomasset", "application/json");
MockHttpServletResponse response = invoke(request);
assertEquals(200, response.getStatus());
- assertEquals(JSON, response.getContentAsString());
+ compairJsonContent(JSON, response.getContentAsString());
}
}