One note on this cl, after looking at the code in my ide it seems like a lot of these lines were modified to be > 80 chars long. Just something to remember for the future.
- Cassie On Fri, Mar 21, 2008 at 11:27 AM, <[EMAIL PROTECTED]> wrote: > Author: lindner > Date: Fri Mar 21 03:26:44 2008 > New Revision: 639591 > > URL: http://svn.apache.org/viewvc?rev=639591&view=rev > Log: > Pass in GadgetToken to all calls for SHINDIG-144, still > need to adjust samplecontainer to store based on appId > > Modified: > > > incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/social/opensocial/ActivitiesService.java > > > incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/social/opensocial/DataService.java > > > incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/social/opensocial/OpenSocialDataHandler.java > > > incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/social/samplecontainer/BasicActivitiesService.java > > > incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/social/samplecontainer/BasicDataService.java > > Modified: > incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/social/opensocial/ActivitiesService.java > URL: > http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/social/opensocial/ActivitiesService.java?rev=639591&r1=639590&r2=639591&view=diff > > ============================================================================== > --- > incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/social/opensocial/ActivitiesService.java > (original) > +++ > incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/social/opensocial/ActivitiesService.java > Fri Mar 21 03:26:44 2008 > @@ -17,6 +17,8 @@ > */ > package org.apache.shindig.social.opensocial; > > +import org.apache.shindig.gadgets.GadgetToken; > + > import org.apache.shindig.social.ResponseItem; > import org.apache.shindig.social.opensocial.model.Activity; > > @@ -26,16 +28,18 @@ > /** > * Returns a list of activities that correspond to the passed in person > ids. > * @param ids The ids of the people to fetch activities for. > + * @param token A valid GadgetToken > * @return a response item with the list of activities. > */ > - public ResponseItem<List<Activity>> getActivities(List<String> ids); > + public ResponseItem<List<Activity>> getActivities(List<String> ids, > GadgetToken token); > > /** > * Creates the passed in activity for the given user. Once > createActivity is > * called, getActivities will be able to return the Activity. > * @param personId The id of the person to create the activity for. > * @param activity The activity to create. > + * @param token A valid GadgetToken > * @return a response item containing any errors > */ > - public ResponseItem createActivity(String personId, Activity activity); > + public ResponseItem createActivity(String personId, Activity activity, > GadgetToken token); > } > > Modified: > incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/social/opensocial/DataService.java > URL: > http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/social/opensocial/DataService.java?rev=639591&r1=639590&r2=639591&view=diff > > ============================================================================== > --- > incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/social/opensocial/DataService.java > (original) > +++ > incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/social/opensocial/DataService.java > Fri Mar 21 03:26:44 2008 > @@ -18,12 +18,21 @@ > package org.apache.shindig.social.opensocial; > > import org.apache.shindig.social.ResponseItem; > +import org.apache.shindig.gadgets.GadgetToken; > > import java.util.List; > import java.util.Map; > > public interface DataService { > - public ResponseItem<Map<String, Map<String, String>>> > getPersonData(List<String> ids); > + > + /** > + * Fetch data for a list of ids. > + * @param ids The list of ids > + * @param token The GadgetToken for this request > + * @return ResponseItem a response item with the error code set if > there was a problem > + */ > + > + public ResponseItem<Map<String, Map<String, String>>> > getPersonData(List<String> ids, GadgetToken token); > > /** > * Updates the data key for the given person with the new value. > @@ -33,5 +42,5 @@ > * @param value The new value of the data. > * @return ResponseItem a response item with the error code set if there > was a problem > */ > - public ResponseItem updatePersonData(String id, String key, String > value); > + public ResponseItem updatePersonData(String id, String key, String > value, GadgetToken token); > } > > Modified: > incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/social/opensocial/OpenSocialDataHandler.java > URL: > http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/social/opensocial/OpenSocialDataHandler.java?rev=639591&r1=639590&r2=639591&view=diff > > ============================================================================== > --- > incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/social/opensocial/OpenSocialDataHandler.java > (original) > +++ > incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/social/opensocial/OpenSocialDataHandler.java > Fri Mar 21 03:26:44 2008 > @@ -20,6 +20,9 @@ > import org.json.JSONException; > import org.json.JSONObject; > import org.json.JSONArray; > + > +import org.apache.shindig.gadgets.GadgetToken; > + > import org.apache.shindig.social.samplecontainer.BasicPeopleService; > import org.apache.shindig.social.samplecontainer.BasicDataService; > import org.apache.shindig.social.samplecontainer.BasicActivitiesService; > @@ -100,7 +103,7 @@ > break; > > case FETCH_PERSON_APP_DATA : > - response = dataHandler.getPersonData(peopleIds); > + response = dataHandler.getPersonData(peopleIds, > request.getToken()); > break; > > case UPDATE_PERSON_APP_DATA: > @@ -110,11 +113,11 @@ > String key = params.getString("key"); > String value = params.getString("value"); > > - response = dataHandler.updatePersonData(id, key, value); > + response = dataHandler.updatePersonData(id, key, value, > request.getToken()); > break; > > case FETCH_ACTIVITIES: > - response = activitiesHandler.getActivities(peopleIds); > + response = activitiesHandler.getActivities(peopleIds, > request.getToken()); > break; > > case CREATE_ACTIVITY: > @@ -125,7 +128,7 @@ > // so json -> pojo > Activity activity = new Activity("5", personId); > activity.setTitle("Temporary title - we don't read json right > now"); > - response = activitiesHandler.createActivity(personId, > activity); > + response = activitiesHandler.createActivity(personId, activity, > request.getToken()); > break; > } > > @@ -141,4 +144,4 @@ > > return response; > } > -} > \ No newline at end of file > +} > > Modified: > incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/social/samplecontainer/BasicActivitiesService.java > URL: > http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/social/samplecontainer/BasicActivitiesService.java?rev=639591&r1=639590&r2=639591&view=diff > > ============================================================================== > --- > incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/social/samplecontainer/BasicActivitiesService.java > (original) > +++ > incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/social/samplecontainer/BasicActivitiesService.java > Fri Mar 21 03:26:44 2008 > @@ -17,6 +17,8 @@ > */ > package org.apache.shindig.social.samplecontainer; > > +import org.apache.shindig.gadgets.GadgetToken; > + > import org.apache.shindig.social.ResponseItem; > import org.apache.shindig.social.opensocial.ActivitiesService; > import org.apache.shindig.social.opensocial.model.Activity; > @@ -31,7 +33,8 @@ > * @author Cassandra Doll <[EMAIL PROTECTED]> > */ > public class BasicActivitiesService implements ActivitiesService { > - public ResponseItem<List<Activity>> getActivities(List<String> ids) { > + public ResponseItem<List<Activity>> getActivities(List<String> ids, > + GadgetToken token) { > Map<String, List<Activity>> allActivities = > XmlStateFileFetcher.get().getActivities(); > > @@ -48,7 +51,8 @@ > return new ResponseItem<List<Activity>>(activities); > } > > - public ResponseItem createActivity(String personId, Activity activity) > { > + public ResponseItem createActivity(String personId, Activity activity, > + GadgetToken token) { > // TODO: Validate the activity and do any template expanding > activity.setUserId(personId); > activity.setPostedTime(new Date().getTime()); > > Modified: > incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/social/samplecontainer/BasicDataService.java > URL: > http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/social/samplecontainer/BasicDataService.java?rev=639591&r1=639590&r2=639591&view=diff > > ============================================================================== > --- > incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/social/samplecontainer/BasicDataService.java > (original) > +++ > incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/social/samplecontainer/BasicDataService.java > Fri Mar 21 03:26:44 2008 > @@ -17,6 +17,7 @@ > */ > package org.apache.shindig.social.samplecontainer; > > +import org.apache.shindig.gadgets.GadgetToken; > import org.apache.shindig.social.ResponseError; > import org.apache.shindig.social.ResponseItem; > import org.apache.shindig.social.opensocial.DataService; > @@ -29,7 +30,7 @@ > public class BasicDataService implements DataService { > > public ResponseItem<Map<String, Map<String, String>>> getPersonData( > - List<String> ids) { > + List<String> ids, GadgetToken token) { > > Map<String, Map<String, String>> allData > = XmlStateFileFetcher.get().getAppData(); > @@ -45,7 +46,7 @@ > return new ResponseItem<Map<String, Map<String, String>>>(data); > } > > - public ResponseItem updatePersonData(String id, String key, String > value) { > + public ResponseItem updatePersonData(String id, String key, String > value, GadgetToken token) { > if (!isValidKey(key)) { > return new ResponseItem<Object>(ResponseError.BAD_REQUEST, > "The person data key had invalid characters", > > >
