You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@shindig.apache.org by ie...@apache.org on 2009/01/08 12:45:12 UTC
svn commit: r732692 - in /incubator/shindig/trunk/java/samples/src:
main/java/org/apache/shindig/social/opensocial/jpa/spi/ActivityServiceDb.java
test/java/org/apache/shindig/social/opensocial/jpa/spi/ActivityServiceDbTest.java
Author: ieb
Date: Thu Jan 8 03:45:11 2009
New Revision: 732692
URL: http://svn.apache.org/viewvc?rev=732692&view=rev
Log:
SHINDIG-824
Patch from Chico Charlesworth
Fixes:Samples Services are brokn by paging, build mvn -Psamples clean install fails.
Thanks
Modified:
incubator/shindig/trunk/java/samples/src/main/java/org/apache/shindig/social/opensocial/jpa/spi/ActivityServiceDb.java
incubator/shindig/trunk/java/samples/src/test/java/org/apache/shindig/social/opensocial/jpa/spi/ActivityServiceDbTest.java
Modified: incubator/shindig/trunk/java/samples/src/main/java/org/apache/shindig/social/opensocial/jpa/spi/ActivityServiceDb.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/samples/src/main/java/org/apache/shindig/social/opensocial/jpa/spi/ActivityServiceDb.java?rev=732692&r1=732691&r2=732692&view=diff
==============================================================================
--- incubator/shindig/trunk/java/samples/src/main/java/org/apache/shindig/social/opensocial/jpa/spi/ActivityServiceDb.java (original)
+++ incubator/shindig/trunk/java/samples/src/main/java/org/apache/shindig/social/opensocial/jpa/spi/ActivityServiceDb.java Thu Jan 8 03:45:11 2009
@@ -27,6 +27,7 @@
import org.apache.shindig.social.opensocial.model.Activity;
import org.apache.shindig.social.opensocial.model.MediaItem;
import org.apache.shindig.social.opensocial.spi.ActivityService;
+import org.apache.shindig.social.opensocial.spi.CollectionOptions;
import org.apache.shindig.social.opensocial.spi.GroupId;
import org.apache.shindig.social.opensocial.spi.RestfulCollection;
import org.apache.shindig.social.opensocial.spi.SocialSpiException;
@@ -42,12 +43,18 @@
import javax.persistence.Query;
/**
- *
+ * The Class ActivityServiceDb.
*/
public class ActivityServiceDb implements ActivityService {
+ /** The entity manager. */
private EntityManager entityManager;
+ /**
+ * Instantiates a new activity service db.
+ *
+ * @param entityManager the entity manager
+ */
@Inject
public ActivityServiceDb(EntityManager entityManager) {
this.entityManager = entityManager;
@@ -117,12 +124,13 @@
// TODO Auto-generated method stub
return null;
}
-
+
/* (non-Javadoc)
- * @see org.apache.shindig.social.opensocial.spi.ActivityService#getActivities(java.util.Set, org.apache.shindig.social.opensocial.spi.GroupId, java.lang.String, java.util.Set, org.apache.shindig.auth.SecurityToken)
+ * @see org.apache.shindig.social.opensocial.spi.ActivityService#getActivities(java.util.Set, org.apache.shindig.social.opensocial.spi.GroupId, java.lang.String, java.util.Set, org.apache.shindig.social.opensocial.spi.CollectionOptions, org.apache.shindig.auth.SecurityToken)
*/
- public Future<RestfulCollection<Activity>> getActivities(Set<UserId> userIds, GroupId groupId,
- String appId, Set<String> fields, SecurityToken token) throws SocialSpiException {
+ public Future<RestfulCollection<Activity>> getActivities(Set<UserId> userIds,
+ GroupId groupId, String appId, Set<String> fields,
+ CollectionOptions options, SecurityToken token) throws SocialSpiException {
// TODO currently the implementation of this method ignores the fields variable. Is this correct?
@@ -178,12 +186,13 @@
// db wait times.
return ImmediateFuture.newInstance(new RestfulCollection<Activity>(plist));
}
-
+
/* (non-Javadoc)
- * @see org.apache.shindig.social.opensocial.spi.ActivityService#getActivities(org.apache.shindig.social.opensocial.spi.UserId, org.apache.shindig.social.opensocial.spi.GroupId, java.lang.String, java.util.Set, java.util.Set, org.apache.shindig.auth.SecurityToken)
+ * @see org.apache.shindig.social.opensocial.spi.ActivityService#getActivities(org.apache.shindig.social.opensocial.spi.UserId, org.apache.shindig.social.opensocial.spi.GroupId, java.lang.String, java.util.Set, org.apache.shindig.social.opensocial.spi.CollectionOptions, java.util.Set, org.apache.shindig.auth.SecurityToken)
*/
- public Future<RestfulCollection<Activity>> getActivities(UserId userId, GroupId groupId,
- String appId, Set<String> fields, Set<String> activityIds, SecurityToken token)
+ public Future<RestfulCollection<Activity>> getActivities(UserId userId,
+ GroupId groupId, String appId, Set<String> fields,
+ CollectionOptions options, Set<String> activityIds, SecurityToken token)
throws SocialSpiException {
return ImmediateFuture.newInstance(new RestfulCollection<Activity>(getActivities(userId, activityIds, token)));
}
@@ -202,11 +211,13 @@
/**
- * @param userId
- * @param groupId
- * @param appId
- * @param token
- * @return
+ * Gets the activities.
+ *
+ * @param userId the user id
+ * @param token the token
+ * @param activityId the activity id
+ *
+ * @return the activities
*/
private Activity getActivities(UserId userId, String activityId,
SecurityToken token) {
@@ -225,11 +236,13 @@
/**
- * @param userId
- * @param groupId
- * @param appId
- * @param token
- * @return
+ * Gets the activities.
+ *
+ * @param userId the user id
+ * @param token the token
+ * @param activityIds the activity ids
+ *
+ * @return the activities
*/
private List<Activity> getActivities(UserId userId, Set<String> activityIds,
SecurityToken token) {
Modified: incubator/shindig/trunk/java/samples/src/test/java/org/apache/shindig/social/opensocial/jpa/spi/ActivityServiceDbTest.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/samples/src/test/java/org/apache/shindig/social/opensocial/jpa/spi/ActivityServiceDbTest.java?rev=732692&r1=732691&r2=732692&view=diff
==============================================================================
--- incubator/shindig/trunk/java/samples/src/test/java/org/apache/shindig/social/opensocial/jpa/spi/ActivityServiceDbTest.java (original)
+++ incubator/shindig/trunk/java/samples/src/test/java/org/apache/shindig/social/opensocial/jpa/spi/ActivityServiceDbTest.java Thu Jan 8 03:45:11 2009
@@ -22,6 +22,7 @@
import org.apache.shindig.social.opensocial.model.Activity;
import org.apache.shindig.social.opensocial.model.EnumUtil;
+import org.apache.shindig.social.opensocial.spi.CollectionOptions;
import org.apache.shindig.social.opensocial.spi.GroupId;
import org.apache.shindig.social.opensocial.spi.RestfulCollection;
import org.apache.shindig.social.opensocial.spi.UserId;
@@ -64,7 +65,7 @@
@Test
public void getJohnDoeActivities() throws Exception {
- Future<RestfulCollection<Activity>> result = this.activityServiceDb.getActivities(SpiTestUtil.buildUserIds("john.doe"), new GroupId(GroupId.Type.self, "@self"), null, ACTIVITY_ALL_FIELDS, SpiTestUtil.DEFAULT_TEST_SECURITY_TOKEN);
+ Future<RestfulCollection<Activity>> result = this.activityServiceDb.getActivities(SpiTestUtil.buildUserIds("john.doe"), new GroupId(GroupId.Type.self, "@self"), null, ACTIVITY_ALL_FIELDS, new CollectionOptions(), SpiTestUtil.DEFAULT_TEST_SECURITY_TOKEN);
RestfulCollection<Activity> activityCollection = result.get();
assertEquals(1, activityCollection.getTotalResults());
assertEquals(0, activityCollection.getStartIndex());
@@ -73,7 +74,7 @@
@Test
public void getJohnDoeFriendsActivities() throws Exception {
- Future<RestfulCollection<Activity>> result = this.activityServiceDb.getActivities(SpiTestUtil.buildUserIds("john.doe"), new GroupId(GroupId.Type.friends, "@friends"), null, ACTIVITY_ALL_FIELDS, SpiTestUtil.DEFAULT_TEST_SECURITY_TOKEN);
+ Future<RestfulCollection<Activity>> result = this.activityServiceDb.getActivities(SpiTestUtil.buildUserIds("john.doe"), new GroupId(GroupId.Type.friends, "@friends"), null, ACTIVITY_ALL_FIELDS, new CollectionOptions(), SpiTestUtil.DEFAULT_TEST_SECURITY_TOKEN);
RestfulCollection<Activity> activityCollection = result.get();
assertEquals(2, activityCollection.getTotalResults());
assertEquals(0, activityCollection.getStartIndex());
@@ -88,7 +89,7 @@
this.activityServiceDb.createActivity(new UserId(Type.userId, "john.doe"), new GroupId(GroupId.Type.self, "@self"), "2", ACTIVITY_ALL_FIELDS, activity, SpiTestUtil.DEFAULT_TEST_SECURITY_TOKEN);
// Check activity was created as expected
- Future<RestfulCollection<Activity>> result = this.activityServiceDb.getActivities(SpiTestUtil.buildUserIds("john.doe"), new GroupId(GroupId.Type.self, "@self"), null, ACTIVITY_ALL_FIELDS, SpiTestUtil.DEFAULT_TEST_SECURITY_TOKEN);
+ Future<RestfulCollection<Activity>> result = this.activityServiceDb.getActivities(SpiTestUtil.buildUserIds("john.doe"), new GroupId(GroupId.Type.self, "@self"), null, ACTIVITY_ALL_FIELDS, new CollectionOptions(), SpiTestUtil.DEFAULT_TEST_SECURITY_TOKEN);
RestfulCollection<Activity> activityCollection = result.get();
assertEquals(2, activityCollection.getTotalResults());
assertEquals(0, activityCollection.getStartIndex());