[opensocial-java-client] r120 committed - Fix for myspace activity creation issue. MyspaceProvider now wraps tem...

[codesite...@google.com]

Revision: 120
Author: jle.e...@gmail.com
Date: Thu Oct 29 13:53:45 2009
Log: Fix for myspace activity creation issue. MyspaceProvider now wraps
template parameters correctly.
http://code.google.com/p/opensocial-java-client/source/detail?r=120

Modified:
/trunk
/trunk/java/samples/ActivitiesExample.java
/trunk/java/src/org/opensocial/client/OpenSocialRequest.java
/trunk/java/src/org/opensocial/data/OpenSocialActivity.java
/trunk/java/src/org/opensocial/providers/MySpaceProvider.java

=======================================
--- /trunk/java/samples/ActivitiesExample.java Mon Oct 12 14:22:13 2009
+++ /trunk/java/samples/ActivitiesExample.java Thu Oct 29 13:53:45 2009
@@ -48,7 +48,7 @@
params.put("groupId", OpenSocialClient.SELF);
params.put("startIndex", "1");
params.put("count", "5");
-
batch.addRequest(c.getActivitiesService().get(params), "fetchActivitiesSelf");
+
//batch.addRequest(c.getActivitiesService().get(params), "fetchActivitiesSelf");
// End Fetch Activities Self

// Fetch Activities Friends
@@ -57,17 +57,15 @@
params.put("groupId", OpenSocialClient.FRIENDS);
params.put("startIndex", "1");
params.put("count", "5");
-
batch.addRequest(c.getActivitiesService().get(params), "fetchActivitiesFriends");
+
//batch.addRequest(c.getActivitiesService().get(params), "fetchActivitiesFriends");
// End Fetch Activities Friends

// Create Activitiy
OpenSocialActivity activity = new OpenSocialActivity();
- activity.setField("title", "osapi java test title");
- activity.setField("body", "osapi java test body");

// MySpace specific items
- activity.setField("titleId", "Template_4");
- activity.addTemplateParameter("friend", "495184236");
+ activity.setField("titleId", "Template_1");
+ activity.addTemplateParameter("service", "Java SDK");
activity.addTemplateParameter("content", "hello there this is my
template parama content");

params = new HashMap<String, String>();
@@ -79,7 +77,7 @@
// End Create Activitiy

//supportedFields
-
batch.addRequest(c.getActivitiesService().getSupportedFields(), "supportedFields");
+
//batch.addRequest(c.getActivitiesService().getSupportedFields(), "supportedFields");

batch.send(c);

=======================================
--- /trunk/java/src/org/opensocial/client/OpenSocialRequest.java Wed Apr 1
02:18:41 2009
+++ /trunk/java/src/org/opensocial/client/OpenSocialRequest.java Thu Oct 29
13:53:45 2009
@@ -122,7 +122,10 @@
public String getRestPathComponent() {
return restPathComponent;
}
-
+
+ public String getRpcMethod() {
+ return rpcMethod;
+ }
public String getRestMethod() {
return restMethod;
}
=======================================
--- /trunk/java/src/org/opensocial/data/OpenSocialActivity.java Mon Oct 12
14:22:13 2009
+++ /trunk/java/src/org/opensocial/data/OpenSocialActivity.java Thu Oct 29
13:53:45 2009
@@ -35,10 +35,10 @@

public void addTemplateParameter(String key, String value) {
try{
- if(!this.has("templateParameters")) {
- this.put("templateParameters", new JSONArray());
- }
- JSONArray templateParams = this.getJSONArray("templateParameters");
+ if(!this.has("templateParams")) {
+ this.put("templateParams", new JSONArray());
+ }
+ JSONArray templateParams = this.getJSONArray("templateParams");
JSONObject kvp = new JSONObject();
kvp.put("key", key);
kvp.put("value", value);
=======================================
--- /trunk/java/src/org/opensocial/providers/MySpaceProvider.java Wed Oct
28 13:41:39 2009
+++ /trunk/java/src/org/opensocial/providers/MySpaceProvider.java Thu Oct
29 13:53:45 2009
@@ -38,6 +38,22 @@

public void preRequest(OpenSocialRequest request) {

+ if(request.getRpcMethod().equals("activities.create")){
+ this.fixMsTemplateParameters(request);
+ }
+ }
+
+ private void fixMsTemplateParameters(OpenSocialRequest request) {
+ try{
+ JSONObject activity = new
JSONObject(request.getParameter("activity"));
+ JSONArray params = activity.getJSONArray("templateParams");
+ JSONObject templateParams = new JSONObject();
+ templateParams.put("msParameters", params);
+ activity.put("templateParams", templateParams);
+ request.addParameter("activity", activity.toString());
+ }catch(JSONException e){
+ e.printStackTrace();
+ }
}

public void postRequest(OpenSocialRequest request,