Author: doll
Date: Wed Jul 16 17:32:58 2008
New Revision: 677478
URL: http://svn.apache.org/viewvc?rev=677478&view=rev
Log:
Deleted the old json wire format code for java.
If you still need this code please use the svn branch at
incubator/shindig/branches/reTIRED/
The default for both java and php is now the restful code.
Removed:
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/DataResponse.java
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/GadgetDataHandler.java
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/GadgetDataServlet.java
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/GadgetDataServletFetcher.java
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/RequestItem.java
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/ActivitiesService.java
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/DataService.java
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/OpenSocialDataHandler.java
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/PeopleService.java
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/ApiCollection.java
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/ApiCollectionImpl.java
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/DataCollection.java
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/samplecontainer/StateFileDataHandler.java
Modified:
incubator/shindig/trunk/config/container.js
incubator/shindig/trunk/java/server/src/main/webapp/WEB-INF/web.full.xml
incubator/shindig/trunk/java/server/src/main/webapp/WEB-INF/web.social.xml
incubator/shindig/trunk/java/server/src/main/webapp/WEB-INF/web.xml
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/SocialApiGuiceModule.java
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/samplecontainer/BasicActivitiesService.java
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/samplecontainer/BasicDataService.java
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/samplecontainer/BasicPeopleService.java
incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/SocialApiTestsGuiceModule.java
incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/util/BeanJsonConverterTest.java
Modified: incubator/shindig/trunk/config/container.js
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/config/container.js?rev=677478&r1=677477&r2=677478&view=diff
==============================================================================
--- incubator/shindig/trunk/config/container.js (original)
+++ incubator/shindig/trunk/config/container.js Wed Jul 16 17:32:58 2008
@@ -98,7 +98,7 @@
"opensocial-0.8" : {
// Path to fetch opensocial data from
// Must be on the same domain as the gadget rendering server
- "path" : "/social/data",
+ "path" : "/social/rest",
"domain" : "shindig",
"enableCaja" : false,
"supportedFields" : {
@@ -109,7 +109,7 @@
// Otherwise, uses the json wire format.
// If you are using the default Shindig setup and want to use rest, don't
// forget to change the "path" config to /social/rest
- "useRestful" : false
+ "useRestful" : true
}
}}
Modified:
incubator/shindig/trunk/java/server/src/main/webapp/WEB-INF/web.full.xml
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/server/src/main/webapp/WEB-INF/web.full.xml?rev=677478&r1=677477&r2=677478&view=diff
==============================================================================
--- incubator/shindig/trunk/java/server/src/main/webapp/WEB-INF/web.full.xml
(original)
+++ incubator/shindig/trunk/java/server/src/main/webapp/WEB-INF/web.full.xml
Wed Jul 16 17:32:58 2008
@@ -72,14 +72,6 @@
</servlet-class>
</servlet>
- <!-- Serve social data -->
- <servlet>
- <servlet-name>socialdata</servlet-name>
- <servlet-class>
- org.apache.shindig.social.GadgetDataServlet
- </servlet-class>
- </servlet>
-
<!-- javascript serving -->
<servlet>
<servlet-name>js</servlet-name>
@@ -125,11 +117,6 @@
</servlet-mapping>
<servlet-mapping>
- <servlet-name>socialdata</servlet-name>
- <url-pattern>/social/data</url-pattern>
- </servlet-mapping>
-
- <servlet-mapping>
<servlet-name>restapiServlet</servlet-name>
<url-pattern>/social/rest/*</url-pattern>
</servlet-mapping>
Modified:
incubator/shindig/trunk/java/server/src/main/webapp/WEB-INF/web.social.xml
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/server/src/main/webapp/WEB-INF/web.social.xml?rev=677478&r1=677477&r2=677478&view=diff
==============================================================================
--- incubator/shindig/trunk/java/server/src/main/webapp/WEB-INF/web.social.xml
(original)
+++ incubator/shindig/trunk/java/server/src/main/webapp/WEB-INF/web.social.xml
Wed Jul 16 17:32:58 2008
@@ -43,14 +43,6 @@
<listener-class>org.apache.shindig.common.servlet.GuiceServletContextListener</listener-class>
</listener>
- <!-- Serve social data -->
- <servlet>
- <servlet-name>socialdata</servlet-name>
- <servlet-class>
- org.apache.shindig.social.GadgetDataServlet
- </servlet-class>
- </servlet>
-
<!-- Serve REST api -->
<servlet>
<servlet-name>restapiServlet</servlet-name>
@@ -60,11 +52,6 @@
</servlet>
<servlet-mapping>
- <servlet-name>socialdata</servlet-name>
- <url-pattern>/social/data</url-pattern>
- </servlet-mapping>
-
- <servlet-mapping>
<servlet-name>restapiServlet</servlet-name>
<url-pattern>/social/rest/*</url-pattern>
</servlet-mapping>
Modified: incubator/shindig/trunk/java/server/src/main/webapp/WEB-INF/web.xml
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/server/src/main/webapp/WEB-INF/web.xml?rev=677478&r1=677477&r2=677478&view=diff
==============================================================================
--- incubator/shindig/trunk/java/server/src/main/webapp/WEB-INF/web.xml
(original)
+++ incubator/shindig/trunk/java/server/src/main/webapp/WEB-INF/web.xml Wed Jul
16 17:32:58 2008
@@ -73,14 +73,6 @@
</servlet-class>
</servlet>
- <!-- Serve social data -->
- <servlet>
- <servlet-name>socialdata</servlet-name>
- <servlet-class>
- org.apache.shindig.social.GadgetDataServlet
- </servlet-class>
- </servlet>
-
<!-- javascript serving -->
<servlet>
<servlet-name>js</servlet-name>
@@ -126,11 +118,6 @@
</servlet-mapping>
<servlet-mapping>
- <servlet-name>socialdata</servlet-name>
- <url-pattern>/social/data</url-pattern>
- </servlet-mapping>
-
- <servlet-mapping>
<servlet-name>restapiServlet</servlet-name>
<url-pattern>/social/rest/*</url-pattern>
</servlet-mapping>
Modified:
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/SocialApiGuiceModule.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/SocialApiGuiceModule.java?rev=677478&r1=677477&r2=677478&view=diff
==============================================================================
---
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/SocialApiGuiceModule.java
(original)
+++
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/SocialApiGuiceModule.java
Wed Jul 16 17:32:58 2008
@@ -21,19 +21,11 @@
import org.apache.shindig.common.servlet.ParameterFetcher;
import org.apache.shindig.social.dataservice.DataServiceServletFetcher;
import org.apache.shindig.social.dataservice.HandlerProvider;
-import org.apache.shindig.social.opensocial.OpenSocialDataHandler;
import
org.apache.shindig.social.samplecontainer.SampleContainerHandlerProvider;
-import org.apache.shindig.social.samplecontainer.StateFileDataHandler;
-import com.google.common.collect.Lists;
import com.google.inject.AbstractModule;
-import com.google.inject.Inject;
-import com.google.inject.Provider;
-import com.google.inject.TypeLiteral;
import com.google.inject.name.Names;
-import java.util.List;
-
/**
* Provides social api component injection
*/
@@ -42,29 +34,10 @@
/** [EMAIL PROTECTED] */
@Override
protected void configure() {
-
- bind(new TypeLiteral<List<GadgetDataHandler>>() {})
- .toProvider(GadgetDataHandlersProvider.class);
-
bind(HandlerProvider.class).to(SampleContainerHandlerProvider.class);
-
bind(ParameterFetcher.class).annotatedWith(Names.named("GadgetDataServlet")).to(GadgetDataServletFetcher.class);
-
bind(ParameterFetcher.class).annotatedWith(Names.named("DataServiceServlet")).to(DataServiceServletFetcher.class);
- }
-
- public static class GadgetDataHandlersProvider
- implements Provider<List<GadgetDataHandler>> {
- List<GadgetDataHandler> handlers;
-
- @Inject
- public GadgetDataHandlersProvider(OpenSocialDataHandler
- openSocialDataHandler, StateFileDataHandler stateFileHandler) {
- handlers = Lists.newArrayList(openSocialDataHandler, stateFileHandler);
- }
-
- public List<GadgetDataHandler> get() {
- return handlers;
- }
+
bind(ParameterFetcher.class).annotatedWith(Names.named("DataServiceServlet"))
+ .to(DataServiceServletFetcher.class);
}
}
Modified:
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/samplecontainer/BasicActivitiesService.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/samplecontainer/BasicActivitiesService.java?rev=677478&r1=677477&r2=677478&view=diff
==============================================================================
---
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/samplecontainer/BasicActivitiesService.java
(original)
+++
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/samplecontainer/BasicActivitiesService.java
Wed Jul 16 17:32:58 2008
@@ -22,15 +22,13 @@
import org.apache.shindig.social.ResponseError;
import org.apache.shindig.social.ResponseItem;
import org.apache.shindig.social.dataservice.ActivityService;
-import org.apache.shindig.social.dataservice.RestfulCollection;
import org.apache.shindig.social.dataservice.GroupId;
+import org.apache.shindig.social.dataservice.RestfulCollection;
import org.apache.shindig.social.dataservice.UserId;
-import org.apache.shindig.social.opensocial.ActivitiesService;
import org.apache.shindig.social.opensocial.model.Activity;
import com.google.common.collect.Lists;
import com.google.inject.Inject;
-import org.json.JSONObject;
import java.util.Date;
import java.util.List;
@@ -38,8 +36,7 @@
import java.util.Set;
import java.util.concurrent.Future;
-public class BasicActivitiesService implements ActivitiesService,
- ActivityService {
+public class BasicActivitiesService implements ActivityService {
private XmlStateFileFetcher fetcher;
@Inject
@@ -48,49 +45,6 @@
fetcher.loadDefaultStateFileIfNoneLoaded();
}
- public ResponseItem<List<Activity>> getActivities(List<String> ids,
- SecurityToken token) {
- Map<String, List<Activity>> allActivities = fetcher.getActivities();
-
- List<Activity> activities = Lists.newArrayList();
-
- for (String id : ids) {
- List<Activity> personActivities = allActivities.get(id);
- if (personActivities != null) {
- activities.addAll(personActivities);
- }
- }
-
- // TODO: Sort them
- return new ResponseItem<List<Activity>>(activities);
- }
-
- public ResponseItem<Activity> getActivity(String id, String activityId,
- SecurityToken token) {
- List<Activity> allActivities = getActivities(
- Lists.newArrayList(id), token).getResponse();
-
- for (Activity activity : allActivities) {
- if (activity.getId().equals(activityId)) {
- return new ResponseItem<Activity>(activity);
- }
- }
- return new ResponseItem<Activity>(ResponseError.BAD_REQUEST,
- "Activity not found", null);
- }
-
- public ResponseItem createActivity(String personId, Activity activity,
- SecurityToken token) {
- // TODO: Validate the activity and do any template expanding
- activity.setUserId(personId);
- activity.setPostedTime(new Date().getTime());
-
- fetcher.createActivity(personId, activity);
- return new ResponseItem<JSONObject>(new JSONObject());
- }
-
- // New interface methods
-
public Future<ResponseItem<RestfulCollection<Activity>>>
getActivities(UserId userId,
GroupId groupId, String appId, Set<String> fields, SecurityToken token) {
return ImmediateFuture.newInstance(getActivitiesInternal(userId, groupId,
token));
Modified:
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/samplecontainer/BasicDataService.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/samplecontainer/BasicDataService.java?rev=677478&r1=677477&r2=677478&view=diff
==============================================================================
---
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/samplecontainer/BasicDataService.java
(original)
+++
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/samplecontainer/BasicDataService.java
Wed Jul 16 17:32:58 2008
@@ -25,19 +25,17 @@
import org.apache.shindig.social.dataservice.DataCollection;
import org.apache.shindig.social.dataservice.GroupId;
import org.apache.shindig.social.dataservice.UserId;
-import org.apache.shindig.social.opensocial.DataService;
-import com.google.common.collect.Maps;
import com.google.common.collect.Lists;
+import com.google.common.collect.Maps;
import com.google.inject.Inject;
-import org.json.JSONObject;
import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.concurrent.Future;
-public class BasicDataService implements DataService, AppDataService {
+public class BasicDataService implements AppDataService {
private XmlStateFileFetcher fetcher;
@@ -47,8 +45,8 @@
fetcher.loadDefaultStateFileIfNoneLoaded();
}
- public ResponseItem<Map<String, Map<String, String>>> getPersonData(
- List<String> ids, List<String> keys, SecurityToken token) {
+ private Map<String, Map<String, String>> getPersonData(
+ List<String> ids, Set<String> keys, SecurityToken token) {
Map<String, Map<String, String>> allData = fetcher.getAppData();
@@ -74,19 +72,7 @@
}
}
- return new ResponseItem<Map<String, Map<String, String>>>(data);
- }
-
- public ResponseItem updatePersonData(String id, String key, String value,
- SecurityToken token) {
- if (!isValidKey(key)) {
- return new ResponseItem<Object>(ResponseError.BAD_REQUEST,
- "The person data key had invalid characters",
- null);
- }
-
- fetcher.setAppData(id, key, value);
- return new ResponseItem<JSONObject>(new JSONObject());
+ return data;
}
/**
@@ -116,9 +102,6 @@
return true;
}
-
- // New interface methods
-
public Future<ResponseItem<DataCollection>> getPersonData(
UserId userId, GroupId groupId, String appId, Set<String> fields,
SecurityToken token) {
@@ -136,8 +119,7 @@
}
// TODO: Respect appId
- Map<String, Map<String, String>> data
- = getPersonData(ids, Lists.newArrayList(fields), token).getResponse();
+ Map<String, Map<String, String>> data = getPersonData(ids, fields, token);
return ImmediateFuture.newInstance(new ResponseItem<DataCollection>(new
DataCollection(data)));
}
Modified:
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/samplecontainer/BasicPeopleService.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/samplecontainer/BasicPeopleService.java?rev=677478&r1=677477&r2=677478&view=diff
==============================================================================
---
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/samplecontainer/BasicPeopleService.java
(original)
+++
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/samplecontainer/BasicPeopleService.java
Wed Jul 16 17:32:58 2008
@@ -25,15 +25,10 @@
import org.apache.shindig.social.dataservice.PersonService;
import org.apache.shindig.social.dataservice.RestfulCollection;
import org.apache.shindig.social.dataservice.UserId;
-import org.apache.shindig.social.opensocial.PeopleService;
-import org.apache.shindig.social.opensocial.model.ApiCollection;
-import org.apache.shindig.social.opensocial.model.ApiCollectionImpl;
-import org.apache.shindig.social.opensocial.model.IdSpec;
import org.apache.shindig.social.opensocial.model.Person;
import com.google.common.collect.Lists;
import com.google.inject.Inject;
-import org.json.JSONException;
import java.util.Collections;
import java.util.Comparator;
@@ -42,7 +37,7 @@
import java.util.Set;
import java.util.concurrent.Future;
-public class BasicPeopleService implements PeopleService, PersonService {
+public class BasicPeopleService implements PersonService {
private static final Comparator<Person> NAME_COMPARATOR
= new Comparator<Person>() {
public int compare(Person person, Person person1) {
@@ -79,73 +74,6 @@
return people;
}
- public ResponseItem<ApiCollection<Person>> getPeople(List<String> ids,
- PeopleService.SortOrder sortOrder, PeopleService.FilterType filter,
- int first, int max,
- Set<String> profileDetails, SecurityToken token) {
- List<Person> people = getPeople(ids, token);
-
- // We can pretend that by default the people are in top friends order
- if (sortOrder.equals(PeopleService.SortOrder.name)) {
- Collections.sort(people, NAME_COMPARATOR);
- }
-
- // TODO: The samplecontainer doesn't really have the concept of HAS_APP so
- // we can't support any filters yet. We should fix this.
-
- int totalSize = people.size();
- int last = first + max;
- people = people.subList(first, Math.min(last, totalSize));
-
- ApiCollection<Person> collection = new ApiCollectionImpl<Person>(people,
first,
- totalSize);
- return new ResponseItem<ApiCollection<Person>>(collection);
- }
-
- public ResponseItem<Person> getPerson(String id, SecurityToken token) {
- List<Person> people = getPeople(Lists.newArrayList(id), token);
- if (people.size() == 1) {
- return new ResponseItem<Person>(people.get(0));
- } else {
- return new ResponseItem<Person>(ResponseError.BAD_REQUEST,
- "Person " + id + " not found", null);
- }
- }
-
- public List<String> getIds(IdSpec idSpec, SecurityToken token)
- throws JSONException {
- Map<String, List<String>> friendIds = fetcher.getFriendIds();
-
- List<String> ids = Lists.newArrayList();
- switch(idSpec.getType()) {
- case OWNER:
- ids.add(token.getOwnerId());
- break;
- case VIEWER:
- ids.add(token.getViewerId());
- break;
- case OWNER_FRIENDS:
- List<String> ownerFriends = friendIds.get(token.getOwnerId());
- if (ownerFriends != null) {
- ids.addAll(ownerFriends);
- }
- break;
- case VIEWER_FRIENDS:
- List<String> viewerFriends = friendIds.get(token.getViewerId());
- if (viewerFriends != null) {
- ids.addAll(viewerFriends);
- }
- break;
- case USER_IDS:
- ids.addAll(idSpec.fetchUserIds());
- break;
- }
- return ids;
- }
-
-
- // New interface methods
-
public Future<ResponseItem<RestfulCollection<Person>>> getPeople(UserId
userId,
GroupId groupId, PersonService.SortOrder sortOrder,
PersonService.FilterType filter, int first, int max,
Modified:
incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/SocialApiTestsGuiceModule.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/SocialApiTestsGuiceModule.java?rev=677478&r1=677477&r2=677478&view=diff
==============================================================================
---
incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/SocialApiTestsGuiceModule.java
(original)
+++
incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/SocialApiTestsGuiceModule.java
Wed Jul 16 17:32:58 2008
@@ -62,11 +62,9 @@
@Override
protected void configure() {
-
bind(XmlStateFileFetcher.class).to(MockXmlStateFileFetcher.class);
-
-
bind(ParameterFetcher.class).annotatedWith(Names.named("GadgetDataServlet")).to(GadgetDataServletFetcher.class);
-
bind(ParameterFetcher.class).annotatedWith(Names.named("DataServiceServlet")).to(DataServiceServletFetcher.class);
+
bind(ParameterFetcher.class).annotatedWith(Names.named("DataServiceServlet"))
+ .to(DataServiceServletFetcher.class);
}
@Singleton
Modified:
incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/util/BeanJsonConverterTest.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/util/BeanJsonConverterTest.java?rev=677478&r1=677477&r2=677478&view=diff
==============================================================================
---
incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/util/BeanJsonConverterTest.java
(original)
+++
incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/util/BeanJsonConverterTest.java
Wed Jul 16 17:32:58 2008
@@ -17,18 +17,11 @@
*/
package org.apache.shindig.social.opensocial.util;
-import com.google.common.collect.Lists;
-import com.google.common.collect.Maps;
-import com.google.inject.Guice;
-
-import junit.framework.TestCase;
-
import org.apache.shindig.social.SocialApiTestsGuiceModule;
import org.apache.shindig.social.opensocial.model.Activity;
import org.apache.shindig.social.opensocial.model.ActivityImpl;
import org.apache.shindig.social.opensocial.model.Address;
import org.apache.shindig.social.opensocial.model.AddressImpl;
-import org.apache.shindig.social.opensocial.model.DataCollection;
import org.apache.shindig.social.opensocial.model.Email;
import org.apache.shindig.social.opensocial.model.EmailImpl;
import org.apache.shindig.social.opensocial.model.MediaItem;
@@ -38,6 +31,11 @@
import org.apache.shindig.social.opensocial.model.PersonImpl;
import org.apache.shindig.social.opensocial.model.Phone;
import org.apache.shindig.social.opensocial.model.PhoneImpl;
+
+import com.google.common.collect.Lists;
+import com.google.common.collect.Maps;
+import com.google.inject.Guice;
+import junit.framework.TestCase;
import org.json.JSONArray;
import org.json.JSONObject;
@@ -208,26 +206,6 @@
assertEquals("video", actualItem.getType().toString());
}
- public void testJsonToData() throws Exception {
- String jsonActivity = "{personId : 'john.doe', " +
- "appdata : {count : 0, favoriteColor : 'yellow'}}";
- DataCollection.Data result =
beanJsonConverter.convertToObject(jsonActivity,
- DataCollection.Data.class);
-
- assertEquals("john.doe", result.getPersonId());
- Map<String, String> data = result.getAppdata();
- assertEquals(2, data.size());
-
- for (String key : data.keySet()) {
- String value = data.get(key);
- if (key.equals("count")) {
- assertEquals("0", value);
- } else if (key.equals("favoriteColor")) {
- assertEquals("yellow", value);
- }
- }
- }
-
public void testJsonToMap() throws Exception {
String jsonActivity = "{count : 0, favoriteColor : 'yellow'}";
Map<String, String> data = Maps.newHashMap();
