svn commit: r634268 - in /incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/social: Name.java Person.java http/SocialDataServlet.java

[do...@apache.org]

Author: doll
Date: Thu Mar  6 05:34:38 2008
New Revision: 634268

URL: http://svn.apache.org/viewvc?rev=634268&view=rev
Log:
Switched the opensocial-0.7 backend to use double quotes instead of single ones. It should now work again.


Modified:
    incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/social/Name.java
    incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/social/Person.java
    incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/social/http/SocialDataServlet.java

Modified: incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/social/Name.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/social/Name.java?rev=634268&r1=634267&r2=634268&view=diff
==============================================================================
--- incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/social/Name.java (original)
+++ incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/social/Name.java Thu Mar  6 05:34:38 2008
@@ -27,7 +27,7 @@
   // TODO: Use an auto translator
   public String toJson() {
     return "{"
-        + "'unstructured' : '" + unstructured + "'"
+        + "\"unstructured\" : \"" + unstructured + "\""
         + "}";
   }
 

Modified: incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/social/Person.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/social/Person.java?rev=634268&r1=634267&r2=634268&view=diff
==============================================================================
--- incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/social/Person.java (original)
+++ incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/social/Person.java Thu Mar  6 05:34:38 2008
@@ -31,10 +31,10 @@
   // TODO: Use an auto translator
   public String toJson() {
     return "{"
-        + "'id' : '" + id + "', "
-        + "'name' : " + name.toJson() + ", "
-        + "'thumbnailUrl' : '" + thumbnailUrl + "', "
-        + "'profileUrl' : '" + profileUrl + "'"
+        + "\"id\" : \"" + id + "\", "
+        + "\"name\" : " + name.toJson() + ", "
+        + "\"thumbnailUrl\" : \"" + thumbnailUrl + "\", "
+        + "\"profileUrl\" : \"" + profileUrl + "\""
         + "}";
   }
 

Modified: incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/social/http/SocialDataServlet.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/social/http/SocialDataServlet.java?rev=634268&r1=634267&r2=634268&view=diff
==============================================================================
--- incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/social/http/SocialDataServlet.java (original)
+++ incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/social/http/SocialDataServlet.java Thu Mar  6 05:34:38 2008
@@ -48,8 +48,8 @@
   private static final Logger logger
       = Logger.getLogger("org.apache.shindig.social");
   private static final String BAD__REQUEST__RESPONSE =
-      "{'responses' : {}, 'error' : '"
-      + ResponseError.BAD_REQUEST.toJson() + "'}";
+      "{\"responses\" : {}, \"error\" : \""
+      + ResponseError.BAD_REQUEST.toJson() + "\"}";
 
   // TODO: get through injection
   private PeopleHandler peopleHandler = new BasicPeopleHandler();
@@ -77,7 +77,7 @@
 
   private String createResponse(String requestParam) throws JSONException {
     JSONArray requestItems = new JSONArray(requestParam);
-    String jsonResponse = "{'responses' : [";
+    String jsonResponse = "{\"responses\" : [";
     int length = requestItems.length();
 
     for (int i = 0; i < length; i++) {
@@ -102,10 +102,10 @@
             break;
         }
 
-        jsonResponse += "{'response' : " + jsonData + "}";
+        jsonResponse += "{\"response\" : " + jsonData + "}";
       } catch (IllegalArgumentException e) {
-        jsonResponse += "{'response' : {}, 'error' : '"
-            + ResponseError.BAD_REQUEST.toJson() + "'}";
+        jsonResponse += "{\"response\" : {}, \"error\" : \""
+            + ResponseError.BAD_REQUEST.toJson() + "\"}";
       }
 
       if (i < length - 1) {
@@ -124,12 +124,12 @@
 
     for (String userId : people.keySet()) {
       Map<String, String> userData = people.get(userId);
-      jsonData += "'" + userId + "' : {";
+      jsonData += "\"" + userId + "\" : {";
 
       if (userData != null) {
         for (String dataKey : userData.keySet()) {
           String dataValue = userData.get(dataKey);
-          jsonData += "'" + dataKey + "' : '" + dataValue + "' ";
+          jsonData += "\"" + dataKey + "\" : \"" + dataValue + "\" ";
         }
       }