Author: lryan
Date: Thu Aug 21 14:21:29 2008
New Revision: 687865
URL: http://svn.apache.org/viewvc?rev=687865&view=rev
Log:
Move generic JSON<->Query param conversion out of social and into common
Added:
incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/common/util/JsonConversionUtil.java
- copied, changed from r687462,
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/service/JsonConversionUtils.java
incubator/shindig/trunk/java/common/src/test/java/org/apache/shindig/common/util/JsonConversionUtilTest.java
- copied, changed from r687462,
incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/service/JsonConversionUtilsTest.java
Removed:
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/service/JsonConversionUtils.java
incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/service/JsonConversionUtilsTest.java
Modified:
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/service/JsonRpcServlet.java
Copied:
incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/common/util/JsonConversionUtil.java
(from r687462,
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/service/JsonConversionUtils.java)
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/common/util/JsonConversionUtil.java?p2=incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/common/util/JsonConversionUtil.java&p1=incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/service/JsonConversionUtils.java&r1=687462&r2=687865&rev=687865&view=diff
==============================================================================
---
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/service/JsonConversionUtils.java
(original)
+++
incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/common/util/JsonConversionUtil.java
Thu Aug 21 14:21:29 2008
@@ -15,11 +15,10 @@
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations under the License.
*/
-package org.apache.shindig.social.opensocial.service;
+package org.apache.shindig.common.util;
-import com.google.common.collect.Maps;
-import com.google.common.collect.Sets;
import com.google.common.collect.ImmutableSet;
+import com.google.common.collect.Maps;
import org.json.JSONArray;
import org.json.JSONException;
@@ -36,7 +35,7 @@
/**
* Utilities for converting a JSON object to and from a URL encoding
*/
-public class JsonConversionUtils {
+public class JsonConversionUtil {
private static final Pattern ARRAY_MATCH =
Pattern.compile("(\\w+)\\((\\d+)\\)");
Copied:
incubator/shindig/trunk/java/common/src/test/java/org/apache/shindig/common/util/JsonConversionUtilTest.java
(from r687462,
incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/service/JsonConversionUtilsTest.java)
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/common/src/test/java/org/apache/shindig/common/util/JsonConversionUtilTest.java?p2=incubator/shindig/trunk/java/common/src/test/java/org/apache/shindig/common/util/JsonConversionUtilTest.java&p1=incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/service/JsonConversionUtilsTest.java&r1=687462&r2=687865&rev=687865&view=diff
==============================================================================
---
incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/service/JsonConversionUtilsTest.java
(original)
+++
incubator/shindig/trunk/java/common/src/test/java/org/apache/shindig/common/util/JsonConversionUtilTest.java
Thu Aug 21 14:21:29 2008
@@ -15,7 +15,7 @@
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations under the License.
*/
-package org.apache.shindig.social.opensocial.service;
+package org.apache.shindig.common.util;
import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
@@ -31,74 +31,74 @@
/**
* Test for conversion of a structured key-value set to a JSON object
*/
-public class JsonConversionUtilsTest extends TestCase {
+public class JsonConversionUtilTest extends TestCase {
- public JsonConversionUtilsTest() {
+ public JsonConversionUtilTest() {
}
public void testSimplePathToJsonParsing()
throws Exception {
JSONObject root = new JSONObject();
- JsonConversionUtils.buildHolder(root, "a.a.a".split("\\."), 0);
+ JsonConversionUtil.buildHolder(root, "a.a.a".split("\\."), 0);
assertJsonEquals(root, new JSONObject("{a:{a:{}}}"));
}
public void testArrayPathToJsonParsing()
throws Exception {
JSONObject root = new JSONObject();
- JsonConversionUtils.buildHolder(root, "a.a(0).a".split("\\."), 0);
- JsonConversionUtils.buildHolder(root, "a.a(1).a".split("\\."), 0);
- JsonConversionUtils.buildHolder(root, "a.a(2).a".split("\\."), 0);
+ JsonConversionUtil.buildHolder(root, "a.a(0).a".split("\\."), 0);
+ JsonConversionUtil.buildHolder(root, "a.a(1).a".split("\\."), 0);
+ JsonConversionUtil.buildHolder(root, "a.a(2).a".split("\\."), 0);
assertJsonEquals(root, new JSONObject("{a:{a:[{},{},{}]}}"));
}
public void testValueToJsonParsing()
throws Exception {
- assertJsonEquals(JsonConversionUtils.convertToJsonValue("abc"), "abc");
- assertJsonEquals(JsonConversionUtils.convertToJsonValue("\"a,b,c\""),
"a,b,c");
- assertJsonEquals(JsonConversionUtils.convertToJsonValue("true"), true);
- assertJsonEquals(JsonConversionUtils.convertToJsonValue("false"), false);
- assertJsonEquals(JsonConversionUtils.convertToJsonValue("null"),
JSONObject.NULL);
- assertJsonEquals(JsonConversionUtils.convertToJsonValue("'abc'"), "abc");
- assertJsonEquals(JsonConversionUtils.convertToJsonValue("a,b,c"),
+ assertJsonEquals(JsonConversionUtil.convertToJsonValue("abc"), "abc");
+ assertJsonEquals(JsonConversionUtil.convertToJsonValue("\"a,b,c\""),
"a,b,c");
+ assertJsonEquals(JsonConversionUtil.convertToJsonValue("true"), true);
+ assertJsonEquals(JsonConversionUtil.convertToJsonValue("false"), false);
+ assertJsonEquals(JsonConversionUtil.convertToJsonValue("null"),
JSONObject.NULL);
+ assertJsonEquals(JsonConversionUtil.convertToJsonValue("'abc'"), "abc");
+ assertJsonEquals(JsonConversionUtil.convertToJsonValue("a,b,c"),
new JSONArray(Lists.newArrayList("a", "b", "c")));
-
assertJsonEquals(JsonConversionUtils.convertToJsonValue("1,2,3,true,false,null"),
+
assertJsonEquals(JsonConversionUtil.convertToJsonValue("1,2,3,true,false,null"),
new JSONArray(Lists.newArrayList(1, 2, 3, true,
false, null)));
- assertJsonEquals(JsonConversionUtils.convertToJsonValue("(1)"),
+ assertJsonEquals(JsonConversionUtil.convertToJsonValue("(1)"),
new JSONArray(Lists.newArrayList(1)));
- assertJsonEquals(JsonConversionUtils.convertToJsonValue("(true)"),
+ assertJsonEquals(JsonConversionUtil.convertToJsonValue("(true)"),
new JSONArray(Lists.newArrayList(true)));
}
public void testParameterMapToJsonParsing()
throws Exception {
-
assertJsonEquals(JsonConversionUtils.parametersToJsonObject(Maps.immutableMap("a.b.c",
"1")),
+
assertJsonEquals(JsonConversionUtil.parametersToJsonObject(Maps.immutableMap("a.b.c",
"1")),
new JSONObject("{a:{b:{c:1}}}"));
assertJsonEquals(
- JsonConversionUtils.parametersToJsonObject(Maps.immutableMap("a.b.c",
"\"1\"")),
+ JsonConversionUtil.parametersToJsonObject(Maps.immutableMap("a.b.c",
"\"1\"")),
new JSONObject("{a:{b:{c:\"1\"}}}"));
-
assertJsonEquals(JsonConversionUtils.parametersToJsonObject(Maps.immutableMap("a.b.c",
"true")),
+
assertJsonEquals(JsonConversionUtil.parametersToJsonObject(Maps.immutableMap("a.b.c",
"true")),
new JSONObject("{a:{b:{c:true}}}"));
assertJsonEquals(
- JsonConversionUtils.parametersToJsonObject(Maps.immutableMap("a.b.c",
"false")),
+ JsonConversionUtil.parametersToJsonObject(Maps.immutableMap("a.b.c",
"false")),
new JSONObject("{a:{b:{c:false}}}"));
-
assertJsonEquals(JsonConversionUtils.parametersToJsonObject(Maps.immutableMap("a.b.c",
"null")),
+
assertJsonEquals(JsonConversionUtil.parametersToJsonObject(Maps.immutableMap("a.b.c",
"null")),
new JSONObject("{a:{b:{c:null}}}"));
- assertJsonEquals(JsonConversionUtils.parametersToJsonObject(
+ assertJsonEquals(JsonConversionUtil.parametersToJsonObject(
Maps.immutableMap("a.b(0).c", "hello", "a.b(1).c", "hello")),
new JSONObject("{a:{b:[{c:\"hello\"},{c:\"hello\"}]}}"));
- assertJsonEquals(JsonConversionUtils.parametersToJsonObject(
+ assertJsonEquals(JsonConversionUtil.parametersToJsonObject(
Maps.immutableMap("a.b.c", "hello, true, false, null, 1,2, \"null\",
\"()\"")),
new
JSONObject("{a:{b:{c:[\"hello\",true,false,null,1,2,\"null\",\"()\"]}}}"));
- assertJsonEquals(JsonConversionUtils.parametersToJsonObject(
+ assertJsonEquals(JsonConversionUtil.parametersToJsonObject(
Maps.immutableMap("a.b.c", "\"hello, true, false, null, 1,2\"")),
new JSONObject("{a:{b:{c:\"hello, true, false, null, 1,2\"}}}"));
}
public void testJSONToParameterMapParsing()
throws Exception {
- java.util.Map resultMap = JsonConversionUtils
+ java.util.Map resultMap = JsonConversionUtil
.fromJson(new JSONObject("{a:{b:[{c:\"hello\"},{c:\"hello\"}]}}"));
}
Modified:
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/service/JsonRpcServlet.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/service/JsonRpcServlet.java?rev=687865&r1=687864&r2=687865&view=diff
==============================================================================
---
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/service/JsonRpcServlet.java
(original)
+++
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/service/JsonRpcServlet.java
Thu Aug 21 14:21:29 2008
@@ -18,12 +18,12 @@
package org.apache.shindig.social.opensocial.service;
import org.apache.shindig.common.SecurityToken;
-import org.apache.shindig.social.ResponseItem;
+import org.apache.shindig.common.util.JsonConversionUtil;
import org.apache.shindig.social.ResponseError;
+import org.apache.shindig.social.ResponseItem;
import org.apache.shindig.social.opensocial.spi.DataCollection;
import org.apache.shindig.social.opensocial.spi.RestfulCollection;
-import com.google.common.collect.Maps;
import com.google.common.collect.Lists;
import org.apache.commons.io.IOUtils;
@@ -32,7 +32,6 @@
import org.json.JSONObject;
import java.io.IOException;
-import java.util.Map;
import java.util.List;
import java.util.concurrent.Future;
@@ -49,7 +48,7 @@
HttpServletResponse servletResponse)
throws ServletException, IOException {
try {
- JSONObject request = JsonConversionUtils.fromRequest(servletRequest);
+ JSONObject request = JsonConversionUtil.fromRequest(servletRequest);
SecurityToken token = getSecurityToken(servletRequest);
dispatch(request, servletResponse, token);
} catch (JSONException je) {
