You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@shindig.apache.org by ch...@apache.org on 2010/07/13 19:55:15 UTC
svn commit: r963802 - in /shindig/trunk/java/gadgets/src:
main/java/org/apache/shindig/gadgets/spec/PipelinedData.java
test/java/org/apache/shindig/gadgets/spec/PipelinedDataTest.java
Author: chirag
Date: Tue Jul 13 17:55:14 2010
New Revision: 963802
URL: http://svn.apache.org/viewvc?rev=963802&view=rev
Log:
Add support for startIndex and count in os:ActivitiesRequest.
Code Review: http://codereview.appspot.com/1756043/show
Modified:
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/spec/PipelinedData.java
shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/spec/PipelinedDataTest.java
Modified: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/spec/PipelinedData.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/spec/PipelinedData.java?rev=963802&r1=963801&r2=963802&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/spec/PipelinedData.java (original)
+++ shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/spec/PipelinedData.java Tue Jul 13 17:55:14 2010
@@ -314,9 +314,11 @@ public class PipelinedData {
// TODO: SHINDIG-711 should be activityIds?
copyAttribute("activityId", child, expression, JSONArray.class);
copyAttribute("fields", child, expression, JSONArray.class);
+ copyAttribute("startIndex", child, expression, Integer.class);
+ copyAttribute("count", child, expression, Integer.class);
// TODO: add activity paging support
-
+
return expression;
}
Modified: shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/spec/PipelinedDataTest.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/spec/PipelinedDataTest.java?rev=963802&r1=963801&r2=963802&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/spec/PipelinedDataTest.java (original)
+++ shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/spec/PipelinedDataTest.java Tue Jul 13 17:55:14 2010
@@ -232,15 +232,20 @@ public class PipelinedDataTest {
String xml = "<Content><ActivitiesRequest xmlns=\"" + PipelinedData.OPENSOCIAL_NAMESPACE + "\" "
+ " key=\"key\""
+ " userId=\"@owner,@viewer\""
+ + " startIndex=\"10\""
+ + " count=\"20\""
+ " fields=\"foo,bar\""
+ "/></Content>";
+
PipelinedData socialData = new PipelinedData(XmlUtil.parse(xml), null);
assertTrue(socialData.needsOwner());
assertTrue(socialData.needsViewer());
JSONObject expected = new JSONObject("{method: 'activities.get', id: 'key', params:"
+ "{userId: ['@owner','@viewer'],"
+ + "startIndex: 10,"
+ + "count: 20,"
+ "fields: ['foo','bar']"
+ "}}");