Author: lindner
Date: Sat Jan 24 00:35:41 2009
New Revision: 737272
URL: http://svn.apache.org/viewvc?rev=737272&view=rev
Log:
SHINDIG-560 | Modified Patch from Adam Winer | Support for @supportedFields
Modified:
incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/auth/AnonymousSecurityToken.java
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/service/ActivityHandler.java
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/service/AppDataHandler.java
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/service/DataRequestHandler.java
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/service/DataServiceServlet.java
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/service/PersonHandler.java
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/sample/service/SampleContainerHandler.java
incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/service/ActivityHandlerTest.java
incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/service/AppDataHandlerTest.java
incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/service/PersonHandlerTest.java
incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/spi/DataRequestHandlerTest.java
Modified:
incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/auth/AnonymousSecurityToken.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/auth/AnonymousSecurityToken.java?rev=737272&r1=737271&r2=737272&view=diff
==============================================================================
---
incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/auth/AnonymousSecurityToken.java
(original)
+++
incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/auth/AnonymousSecurityToken.java
Sat Jan 24 00:35:41 2009
@@ -25,7 +25,14 @@
*/
public class AnonymousSecurityToken implements SecurityToken {
- public AnonymousSecurityToken() { }
+ private String container;
+
+ public AnonymousSecurityToken() {
+ this.container = "default";
+ }
+ public AnonymousSecurityToken(String container) {
+ this.container = container;
+ }
public boolean isAnonymous() {
return true;
@@ -52,7 +59,7 @@
}
public String getContainer() {
- return "";
+ return this.container;
}
public String getAppUrl() {
Modified:
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/service/ActivityHandler.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/service/ActivityHandler.java?rev=737272&r1=737271&r2=737272&view=diff
==============================================================================
---
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/service/ActivityHandler.java
(original)
+++
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/service/ActivityHandler.java
Sat Jan 24 00:35:41 2009
@@ -17,14 +17,10 @@
*/
package org.apache.shindig.social.opensocial.service;
-import org.apache.shindig.social.core.util.ContainerConf;
import org.apache.shindig.social.opensocial.model.Activity;
import org.apache.shindig.social.opensocial.spi.ActivityService;
import org.apache.shindig.social.opensocial.spi.SocialSpiException;
import org.apache.shindig.social.opensocial.spi.UserId;
-import org.apache.shindig.common.ContainerConfigException;
-import org.apache.shindig.common.util.ImmediateFuture;
-import org.apache.shindig.social.opensocial.spi.RestfulCollection;
import org.apache.shindig.social.opensocial.spi.CollectionOptions;
import com.google.common.collect.Sets;
@@ -34,23 +30,15 @@
import java.util.List;
import java.util.Set;
import java.util.concurrent.Future;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
public class ActivityHandler extends DataRequestHandler {
- private final static Logger logger =
Logger.getLogger(ActivityHandler.class.getName());
private final ActivityService service;
private static final String ACTIVITY_ID_PATH
= "/activities/{userId}+/{groupId}/{appId}/{activityId}+";
- private static final String ACTIVITY_SUP_FIELDS_REGEX =
"/activities/@supportedFields";
- private static Pattern activityPatternSupFields =
Pattern.compile(ACTIVITY_SUP_FIELDS_REGEX);
@Inject
- public ActivityHandler(ActivityService service, ContainerConf containerConf)
{
- super(containerConf);
+ public ActivityHandler(ActivityService service) {
this.service = service;
}
@@ -117,15 +105,6 @@
@Override
protected Future<?> handleGet(RequestItem request)
throws SocialSpiException {
- if (isValidSupportedFieldsRestCall(request)) {
- List<String> activityFieldsList = null;
- try {
- activityFieldsList = containerConf.getActivityFieldsList();
- } catch (ContainerConfigException e) {
- logger.log(Level.SEVERE,"Not able to retrieve ActivityFields
from container.js",e);
- }
- return ImmediateFuture.newInstance(new
RestfulCollection<String>(activityFieldsList));
- }
request.applyUrlTemplate(ACTIVITY_ID_PATH);
Set<UserId> userIds = request.getUsers();
@@ -156,11 +135,4 @@
// getSortBy(params), getFilterBy(params), getStartIndex(params),
getCount(params),
request.getFields(), options, request.getToken());
}
-
- private boolean isValidSupportedFieldsRestCall(RequestItem request) {
- String url = ((RestfulRequestItem)request).getUrl();
- Matcher supFieldsMatcher = activityPatternSupFields.matcher(url);
- boolean isValidSupFieldsUrl = supFieldsMatcher.matches();
- return isValidSupFieldsUrl;
- }
}
Modified:
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/service/AppDataHandler.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/service/AppDataHandler.java?rev=737272&r1=737271&r2=737272&view=diff
==============================================================================
---
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/service/AppDataHandler.java
(original)
+++
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/service/AppDataHandler.java
Sat Jan 24 00:35:41 2009
@@ -18,7 +18,6 @@
package org.apache.shindig.social.opensocial.service;
import org.apache.shindig.social.ResponseError;
-import org.apache.shindig.social.core.util.ContainerConf;
import org.apache.shindig.social.opensocial.spi.AppDataService;
import org.apache.shindig.social.opensocial.spi.SocialSpiException;
import org.apache.shindig.social.opensocial.spi.UserId;
@@ -37,8 +36,7 @@
private static final String APP_DATA_PATH =
"/appdata/{userId}+/{groupId}/{appId}";
@Inject
- public AppDataHandler(AppDataService service, ContainerConf containerConf) {
- super(containerConf);
+ public AppDataHandler(AppDataService service) {
this.service = service;
}
Modified:
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/service/DataRequestHandler.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/service/DataRequestHandler.java?rev=737272&r1=737271&r2=737272&view=diff
==============================================================================
---
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/service/DataRequestHandler.java
(original)
+++
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/service/DataRequestHandler.java
Sat Jan 24 00:35:41 2009
@@ -20,7 +20,6 @@
import org.apache.shindig.common.util.ImmediateFuture;
import org.apache.shindig.social.ResponseError;
import org.apache.shindig.social.opensocial.spi.SocialSpiException;
-import org.apache.shindig.social.core.util.ContainerConf;
import com.google.common.collect.ImmutableSet;
@@ -34,14 +33,8 @@
private static final Set<String> CREATE_SYNONYMS = ImmutableSet.of("post",
"create");
private static final Set<String> UPDATE_SYNONYMS = ImmutableSet.of("put",
"update");
private static final Set<String> DELETE_SYNONYMS = ImmutableSet.of("delete");
- protected ContainerConf containerConf;
- /**
- *
- */
-
- public DataRequestHandler(ContainerConf containerConf) {
- this.containerConf = containerConf;
+ public DataRequestHandler() {
}
public Future<?> handleItem(RequestItem request) {
Modified:
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/service/DataServiceServlet.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/service/DataServiceServlet.java?rev=737272&r1=737271&r2=737272&view=diff
==============================================================================
---
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/service/DataServiceServlet.java
(original)
+++
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/service/DataServiceServlet.java
Sat Jan 24 00:35:41 2009
@@ -18,19 +18,31 @@
package org.apache.shindig.social.opensocial.service;
import org.apache.shindig.auth.SecurityToken;
+import org.apache.shindig.common.ContainerConfig;
+import org.apache.shindig.social.ResponseError;
import org.apache.shindig.social.opensocial.spi.DataCollection;
import org.apache.shindig.social.opensocial.spi.RestfulCollection;
import com.google.common.collect.ImmutableMap;
+import com.google.common.collect.Lists;
+import com.google.common.collect.Maps;
+import com.google.common.base.Objects;
+import com.google.inject.Inject;
import java.io.IOException;
import java.io.PrintWriter;
+import java.util.List;
+import java.util.Map;
import java.util.logging.Logger;
import java.util.logging.Level;
import javax.servlet.ServletException;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+import org.json.JSONArray;
+import org.json.JSONException;
+import org.json.JSONObject;
+
public class DataServiceServlet extends ApiServlet {
protected static final String FORMAT_PARAM = "format";
@@ -45,6 +57,13 @@
private static final Logger logger =
Logger.getLogger("org.apache.shindig.social.opensocial.spi");
+ /** Map from service name to the property name in the container config */
+ private static final Map<String, String> SERVICE_TO_SUPPORTED_FIELD_MAP =
+ ImmutableMap.of("people", "person", "activities", "activity");
+
+
+ private ContainerConfig config;
+
@Override
protected void doGet(HttpServletRequest servletRequest,
HttpServletResponse servletResponse)
@@ -92,6 +111,11 @@
responseItem.getErrorMessage());
}
+ @Inject
+ public void setContainerConfig(ContainerConfig config) {
+ this.config = config;
+ }
+
/**
* Handler for non-batch requests.
*/
@@ -99,7 +123,13 @@
HttpServletResponse servletResponse, SecurityToken token,
BeanConverter converter) throws IOException {
RestfulRequestItem requestItem = new RestfulRequestItem(servletRequest,
token, converter);
- ResponseItem responseItem = getResponseItem(handleRequestItem(requestItem,
servletRequest));
+ ResponseItem responseItem;
+
+ if (requestItem.getUrl().endsWith("/@supportedFields")) {
+ responseItem = getSupportedFields(requestItem);
+ } else {
+ responseItem = getResponseItem(handleRequestItem(requestItem,
servletRequest));
+ }
servletResponse.setContentType(converter.getContentType());
if (responseItem.getError() == null) {
@@ -116,6 +146,66 @@
}
}
+ private ResponseItem getSupportedFields(RequestItem requestItem) {
+ String service = requestItem.getService();
+ String configProperty = SERVICE_TO_SUPPORTED_FIELD_MAP.get(service);
+ if (configProperty == null) {
+ configProperty = service;
+ }
+
+ String container =
Objects.firstNonNull(requestItem.getToken().getContainer(), "default");
+ // TODO: hardcoding opensocial-0.8 is brittle
+ JSONArray fields = config.getJsonArray(container,
+ "gadgets.features/opensocial-0.8/supportedFields/" + configProperty);
+
+ if (fields == null) {
+ return new ResponseItem(ResponseError.NOT_IMPLEMENTED,"Supported fields
not available for" +
+ " service \"" + service + "\"");
+ }
+
+ return new ResponseItem(toList(fields));
+ }
+
+ // TODO: delete this when Kevin lands his config changes
+ private Object toList(JSONArray fields) {
+ List<Object> list = Lists.newArrayList();
+ for (int index = 0; index < fields.length(); index++) {
+ try {
+ Object o = fields.get(index);
+ if (o instanceof JSONObject) {
+ list.add(toMap((JSONObject) o));
+ } else {
+ list.add(fields.get(index));
+ }
+ } catch (JSONException e) {
+ // Ignore
+ }
+ }
+
+ return list;
+ }
+
+ // TODO: delete this when Kevin lands his config changes
+ private Object toMap(JSONObject json) {
+ Map<String, Object> map = Maps.newHashMap();
+
+ for (String name : JSONObject.getNames(json)) {
+ try {
+ Object o = json.get(name);
+ if (o instanceof JSONObject) {
+ o = toMap((JSONObject) o);
+ } else if (o instanceof JSONArray) {
+ o = toList((JSONArray) o);
+ }
+
+ map.put(name, o);
+ } catch (JSONException e) {
+ // Ignore
+ }
+ }
+
+ return map;
+ }
BeanConverter getConverterForRequest(HttpServletRequest servletRequest) {
String formatString = null;
Modified:
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/service/PersonHandler.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/service/PersonHandler.java?rev=737272&r1=737271&r2=737272&view=diff
==============================================================================
---
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/service/PersonHandler.java
(original)
+++
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/service/PersonHandler.java
Sat Jan 24 00:35:41 2009
@@ -17,10 +17,7 @@
*/
package org.apache.shindig.social.opensocial.service;
-import org.apache.shindig.common.ContainerConfigException;
-import org.apache.shindig.common.util.ImmediateFuture;
import org.apache.shindig.social.ResponseError;
-import org.apache.shindig.social.core.util.ContainerConf;
import org.apache.shindig.social.opensocial.model.Person;
import org.apache.shindig.social.opensocial.spi.CollectionOptions;
import org.apache.shindig.social.opensocial.spi.GroupId;
@@ -32,23 +29,14 @@
import com.google.inject.Inject;
import java.util.Set;
import java.util.concurrent.Future;
-import java.util.logging.Logger;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
public class PersonHandler extends DataRequestHandler {
- private final static Logger logger =
Logger.getLogger(PersonHandler.class.getName());
private final PersonService personService;
private static final String PEOPLE_PATH =
"/people/{userId}+/{groupId}/{personId}+";
- private static final String PEOPLE_SUP_FIELDS_REGEX =
"/people/@supportedFields";
- private static Pattern peoplePatternSupFields =
Pattern.compile(PEOPLE_SUP_FIELDS_REGEX);
- private Object personFields = null;
@Inject
- public PersonHandler(PersonService personService, ContainerConf
containerConf) {
- super(containerConf);
+ public PersonHandler(PersonService personService) {
this.personService = personService;
}
@@ -75,20 +63,6 @@
@Override
protected Future<?> handleGet(RequestItem request) throws SocialSpiException
{
request.applyUrlTemplate(PEOPLE_PATH);
- if (request instanceof RestfulRequestItem) {
- if (isValidSupportedFieldsRestCall(request)) {
- if (personFields == null) {
- logger.fine("personFieldsList is null");
- try {
- personFields = this.containerConf.getPersonFields();
- } catch (ContainerConfigException e) {
- throw new SocialSpiException(ResponseError.INTERNAL_ERROR,
- "Error trying to Supported Person Fields from
container.js", e);
- }
- }
- return ImmediateFuture.newInstance(personFields);
- }
- }
GroupId groupId = request.getGroup();
Set<String> optionalPersonId =
Sets.newLinkedHashSet(request.getListParameter("personId"));
Set<String> fields = request.getFields(Person.Field.DEFAULT_FIELDS);
@@ -128,11 +102,4 @@
// Every other case is a collection response.
return personService.getPeople(userIds, groupId, options, fields,
request.getToken());
}
-
- private boolean isValidSupportedFieldsRestCall(RequestItem request) {
- String url = ((RestfulRequestItem)request).getUrl();
- Matcher supFieldsMatcher =peoplePatternSupFields.matcher(url);
- boolean isValidSupFieldsUrl = supFieldsMatcher.matches();
- return isValidSupFieldsUrl;
- }
}
Modified:
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/sample/service/SampleContainerHandler.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/sample/service/SampleContainerHandler.java?rev=737272&r1=737271&r2=737272&view=diff
==============================================================================
---
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/sample/service/SampleContainerHandler.java
(original)
+++
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/sample/service/SampleContainerHandler.java
Sat Jan 24 00:35:41 2009
@@ -25,7 +25,6 @@
import org.apache.commons.httpclient.methods.GetMethod;
import org.apache.shindig.common.util.ImmediateFuture;
import org.apache.shindig.social.ResponseError;
-import org.apache.shindig.social.core.util.ContainerConf;
import org.apache.shindig.social.opensocial.service.DataRequestHandler;
import org.apache.shindig.social.opensocial.service.RequestItem;
import org.apache.shindig.social.opensocial.spi.SocialSpiException;
@@ -43,8 +42,7 @@
private static final String POST_PATH = "/samplecontainer/{type}/{doevil}";
@Inject
- public SampleContainerHandler(JsonDbOpensocialService dbService,
ContainerConf containerConf) {
- super(containerConf);
+ public SampleContainerHandler(JsonDbOpensocialService dbService) {
this.service = dbService;
}
Modified:
incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/service/ActivityHandlerTest.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/service/ActivityHandlerTest.java?rev=737272&r1=737271&r2=737272&view=diff
==============================================================================
---
incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/service/ActivityHandlerTest.java
(original)
+++
incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/service/ActivityHandlerTest.java
Sat Jan 24 00:35:41 2009
@@ -25,8 +25,6 @@
import org.apache.shindig.common.EasyMockTestCase;
import org.apache.shindig.social.core.model.ActivityImpl;
import org.apache.shindig.social.core.util.BeanJsonConverter;
-import org.apache.shindig.social.core.util.ContainerConf;
-import org.apache.shindig.social.core.util.JsonContainerConf;
import org.apache.shindig.social.opensocial.model.Activity;
import org.apache.shindig.social.opensocial.spi.ActivityService;
import org.apache.shindig.social.opensocial.spi.CollectionOptions;
@@ -35,7 +33,6 @@
import org.apache.shindig.social.opensocial.spi.SocialSpiException;
import org.apache.shindig.social.opensocial.spi.UserId;
import org.easymock.classextension.EasyMock;
-import org.junit.Test;
import java.util.List;
import java.util.Set;
@@ -62,8 +59,7 @@
token.setAppId("appId");
converter = EasyMock.createMock(BeanJsonConverter.class);
activityService = EasyMock.createMock(ActivityService.class);
- ContainerConf containerConf = new JsonContainerConf();
- handler = new ActivityHandler(activityService, containerConf);
+ handler = new ActivityHandler(activityService);
}
@Override
Modified:
incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/service/AppDataHandlerTest.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/service/AppDataHandlerTest.java?rev=737272&r1=737271&r2=737272&view=diff
==============================================================================
---
incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/service/AppDataHandlerTest.java
(original)
+++
incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/service/AppDataHandlerTest.java
Sat Jan 24 00:35:41 2009
@@ -24,8 +24,6 @@
import org.apache.shindig.common.util.ImmediateFuture;
import org.apache.shindig.common.EasyMockTestCase;
import org.apache.shindig.social.core.util.BeanJsonConverter;
-import org.apache.shindig.social.core.util.ContainerConf;
-import org.apache.shindig.social.core.util.JsonContainerConf;
import org.apache.shindig.social.opensocial.spi.AppDataService;
import org.apache.shindig.social.opensocial.spi.DataCollection;
import org.apache.shindig.social.opensocial.spi.GroupId;
@@ -61,8 +59,7 @@
token = new FakeGadgetToken();
converter = EasyMock.createMock(BeanJsonConverter.class);
appDataService = EasyMock.createMock(AppDataService.class);
- ContainerConf containerConf = new JsonContainerConf();
- handler = new AppDataHandler(appDataService, containerConf);
+ handler = new AppDataHandler(appDataService);
}
@Override
Modified:
incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/service/PersonHandlerTest.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/service/PersonHandlerTest.java?rev=737272&r1=737271&r2=737272&view=diff
==============================================================================
---
incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/service/PersonHandlerTest.java
(original)
+++
incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/service/PersonHandlerTest.java
Sat Jan 24 00:35:41 2009
@@ -22,8 +22,6 @@
import org.apache.shindig.common.EasyMockTestCase;
import org.apache.shindig.social.ResponseError;
import org.apache.shindig.social.core.model.PersonImpl;
-import org.apache.shindig.social.core.util.ContainerConf;
-import org.apache.shindig.social.core.util.JsonContainerConf;
import org.apache.shindig.social.opensocial.model.Person;
import org.apache.shindig.social.opensocial.spi.CollectionOptions;
import org.apache.shindig.social.opensocial.spi.GroupId;
@@ -73,8 +71,7 @@
super.setUp();
token = new FakeGadgetToken();
personService = EasyMock.createMock(PersonService.class);
- ContainerConf containerConf = new JsonContainerConf();
- handler = new PersonHandler(personService, containerConf);
+ handler = new PersonHandler(personService);
}
@Override
Modified:
incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/spi/DataRequestHandlerTest.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/spi/DataRequestHandlerTest.java?rev=737272&r1=737271&r2=737272&view=diff
==============================================================================
---
incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/spi/DataRequestHandlerTest.java
(original)
+++
incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/spi/DataRequestHandlerTest.java
Sat Jan 24 00:35:41 2009
@@ -21,8 +21,6 @@
import org.apache.shindig.common.util.ImmediateFuture;
import org.apache.shindig.social.ResponseError;
-import org.apache.shindig.social.core.util.ContainerConf;
-import org.apache.shindig.social.core.util.JsonContainerConf;
import org.apache.shindig.social.opensocial.service.DataRequestHandler;
import org.apache.shindig.social.opensocial.service.RequestItem;
import org.apache.shindig.social.opensocial.service.RestfulRequestItem;
@@ -37,8 +35,7 @@
@Override
protected void setUp() throws Exception {
super.setUp();
- ContainerConf containerConf = new JsonContainerConf();
- drh = new DataRequestHandler(containerConf) {
+ drh = new DataRequestHandler() {
@Override
protected Future<?> handleDelete(RequestItem request) {
return ImmediateFuture.newInstance("DELETE");
