Author: lindner
Date: Thu Jan 22 12:21:38 2009
New Revision: 736777
URL: http://svn.apache.org/viewvc?rev=736777&view=rev
Log:
SHINDIG-560 | Modified Patch from Ian Boston | Add support for @supportedFields
Modified:
incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/auth/AuthenticationHandler.java
incubator/shindig/trunk/java/samples/src/test/java/org/apache/shindig/social/opensocial/jpa/spi/integration/JpaTestGuiceModule.java
incubator/shindig/trunk/java/server/src/test/java/org/apache/shindig/server/endtoend/EndToEndModule.java
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/config/SocialApiGuiceModule.java
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/oauth/OAuthConsumerRequestAuthenticationHandler.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/PersonHandler.java
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/service/RestfulRequestItem.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/SocialApiTestsGuiceModule.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/AuthenticationHandler.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/auth/AuthenticationHandler.java?rev=736777&r1=736776&r2=736777&view=diff
==============================================================================
---
incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/auth/AuthenticationHandler.java
(original)
+++
incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/auth/AuthenticationHandler.java
Thu Jan 22 12:21:38 2009
@@ -51,17 +51,17 @@
* @return Header value for a WWW-Authenticate Header
*/
String getWWWAuthenticateHeader(String realm);
-
+
/**
* An exception thrown by an AuthenticationHandler in the situation where
* a malformed credential or token is passed. A handler which throws this
exception
* is required to include the appropriate error state in the servlet response
*/
public static final class InvalidAuthenticationException extends
RuntimeException {
-
+
private Map<String,String> additionalHeaders;
private String redirect;
-
+
/**
* @param message Message to output in error response
* @param cause Underlying exception
@@ -69,11 +69,12 @@
public InvalidAuthenticationException(String message, Throwable cause) {
this(message, cause, null, null);
}
-
+
/**
* @param message Message to output in error response
- * @param additionalHeaders Headers to add to error response
* @param cause Underlying exception
+ * @param additionalHeaders Headers to add to error response
+ * @param redirect URL to redirect to on error
*/
public InvalidAuthenticationException(String message, Throwable cause,
Map<String,String> additionalHeaders, String redirect) {
@@ -81,11 +82,11 @@
this.additionalHeaders = additionalHeaders;
this.redirect = redirect;
}
-
+
public Map<String, String> getAdditionalHeaders() {
return additionalHeaders;
}
-
+
public String getRedirect() {
return redirect;
}
Modified:
incubator/shindig/trunk/java/samples/src/test/java/org/apache/shindig/social/opensocial/jpa/spi/integration/JpaTestGuiceModule.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/samples/src/test/java/org/apache/shindig/social/opensocial/jpa/spi/integration/JpaTestGuiceModule.java?rev=736777&r1=736776&r2=736777&view=diff
==============================================================================
---
incubator/shindig/trunk/java/samples/src/test/java/org/apache/shindig/social/opensocial/jpa/spi/integration/JpaTestGuiceModule.java
(original)
+++
incubator/shindig/trunk/java/samples/src/test/java/org/apache/shindig/social/opensocial/jpa/spi/integration/JpaTestGuiceModule.java
Thu Jan 22 12:21:38 2009
@@ -18,6 +18,8 @@
package org.apache.shindig.social.opensocial.jpa.spi.integration;
+import org.apache.shindig.social.core.util.ContainerConf;
+import org.apache.shindig.social.core.util.JsonContainerConf;
import org.apache.shindig.social.opensocial.jpa.AccountDb;
import org.apache.shindig.social.opensocial.jpa.ActivityDb;
import org.apache.shindig.social.opensocial.jpa.AddressDb;
@@ -43,6 +45,7 @@
import org.apache.shindig.social.opensocial.model.Organization;
import org.apache.shindig.social.opensocial.model.Person;
import org.apache.shindig.social.opensocial.model.Url;
+import org.apache.shindig.social.opensocial.service.PersonHandler;
import org.apache.shindig.social.opensocial.spi.ActivityService;
import org.apache.shindig.social.opensocial.spi.AppDataService;
import org.apache.shindig.social.opensocial.spi.PersonService;
@@ -50,7 +53,10 @@
import javax.persistence.EntityManager;
import com.google.inject.AbstractModule;
+import com.google.inject.Inject;
+import com.google.inject.Provider;
import com.google.inject.Scopes;
+import com.google.inject.TypeLiteral;
/**
* Provides component injection for tests
@@ -60,6 +66,7 @@
*/
public class JpaTestGuiceModule extends AbstractModule {
+
private EntityManager entityManager;
JpaTestGuiceModule(EntityManager entityManager) {
@@ -91,5 +98,7 @@
this.bind(Organization.class).to(OrganizationDb.class);
this.bind(Person.class).to(PersonDb.class);
this.bind(Url.class).to(UrlDb.class);
+ this.bind(ContainerConf.class).to(JsonContainerConf.class);
+
}
}
Modified:
incubator/shindig/trunk/java/server/src/test/java/org/apache/shindig/server/endtoend/EndToEndModule.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/server/src/test/java/org/apache/shindig/server/endtoend/EndToEndModule.java?rev=736777&r1=736776&r2=736777&view=diff
==============================================================================
---
incubator/shindig/trunk/java/server/src/test/java/org/apache/shindig/server/endtoend/EndToEndModule.java
(original)
+++
incubator/shindig/trunk/java/server/src/test/java/org/apache/shindig/server/endtoend/EndToEndModule.java
Thu Jan 22 12:21:38 2009
@@ -24,6 +24,8 @@
import org.apache.shindig.social.core.util.BeanJsonConverter;
import org.apache.shindig.social.core.util.BeanXStreamAtomConverter;
import org.apache.shindig.social.core.util.BeanXStreamConverter;
+import org.apache.shindig.social.core.util.ContainerConf;
+import org.apache.shindig.social.core.util.JsonContainerConf;
import org.apache.shindig.social.opensocial.service.BeanConverter;
import org.apache.shindig.social.opensocial.service.DataServiceServletFetcher;
@@ -58,5 +60,6 @@
bind(new TypeLiteral<List<AuthenticationHandler>>(){}).toProvider(
AuthenticationHandlerProvider.class);
+ bind(ContainerConf.class).to(JsonContainerConf.class);
}
}
Modified:
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/config/SocialApiGuiceModule.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/config/SocialApiGuiceModule.java?rev=736777&r1=736776&r2=736777&view=diff
==============================================================================
---
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/config/SocialApiGuiceModule.java
(original)
+++
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/config/SocialApiGuiceModule.java
Thu Jan 22 12:21:38 2009
@@ -25,6 +25,8 @@
import org.apache.shindig.social.core.util.BeanJsonConverter;
import org.apache.shindig.social.core.util.BeanXStreamAtomConverter;
import org.apache.shindig.social.core.util.BeanXStreamConverter;
+import org.apache.shindig.social.core.util.ContainerConf;
+import org.apache.shindig.social.core.util.JsonContainerConf;
import org.apache.shindig.social.opensocial.service.BeanConverter;
import org.apache.shindig.social.opensocial.service.DataServiceServletFetcher;
import org.apache.shindig.social.opensocial.service.StandardHandlerDispatcher;
@@ -50,7 +52,7 @@
/** {...@inheritdoc} */
@Override
protected void configure() {
- bind(HandlerDispatcher.class).toProvider(HandlerDispatcherProvider.class);
+
bind(HandlerDispatcher.class).toProvider(HandlerDispatcherProvider.class);
bind(ParameterFetcher.class).annotatedWith(Names.named("DataServiceServlet"))
.to(DataServiceServletFetcher.class);
@@ -71,6 +73,7 @@
bind(new TypeLiteral<List<AuthenticationHandler>>(){}).toProvider(
AuthenticationHandlerProvider.class);
+ bind(ContainerConf.class).to(JsonContainerConf.class);
}
/**
Modified:
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/oauth/OAuthConsumerRequestAuthenticationHandler.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/oauth/OAuthConsumerRequestAuthenticationHandler.java?rev=736777&r1=736776&r2=736777&view=diff
==============================================================================
---
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/oauth/OAuthConsumerRequestAuthenticationHandler.java
(original)
+++
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/oauth/OAuthConsumerRequestAuthenticationHandler.java
Thu Jan 22 12:21:38 2009
@@ -69,7 +69,7 @@
if (service.thirdPartyHasAccessToUser(requestMessage, containerKey,
userId)) {
return service.getSecurityToken(containerKey, userId);
} else {
- return null;
+ throw new InvalidAuthenticationException("Access for app not
allowed",null);
}
} catch (OAuthException oae) {
throw new InvalidAuthenticationException(oae.getMessage(), oae);
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=736777&r1=736776&r2=736777&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
Thu Jan 22 12:21:38 2009
@@ -17,10 +17,14 @@
*/
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;
@@ -29,15 +33,23 @@
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) {
+ public ActivityHandler(ActivityService service, ContainerConf containerConf)
{
+ super(containerConf);
this.service = service;
}
@@ -104,6 +116,15 @@
@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();
@@ -134,5 +155,11 @@
// 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=736777&r1=736776&r2=736777&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
Thu Jan 22 12:21:38 2009
@@ -18,6 +18,7 @@
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;
@@ -36,7 +37,8 @@
private static final String APP_DATA_PATH =
"/appdata/{userId}+/{groupId}/{appId}";
@Inject
- public AppDataHandler(AppDataService service) {
+ public AppDataHandler(AppDataService service, ContainerConf containerConf) {
+ super(containerConf);
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=736777&r1=736776&r2=736777&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
Thu Jan 22 12:21:38 2009
@@ -20,6 +20,7 @@
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;
@@ -33,7 +34,16 @@
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 Future<?> handleItem(RequestItem request) {
if (request.getOperation() == null) {
return ImmediateFuture.errorInstance(new
SocialSpiException(ResponseError.NOT_IMPLEMENTED,
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=736777&r1=736776&r2=736777&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
Thu Jan 22 12:21:38 2009
@@ -17,7 +17,10 @@
*/
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;
@@ -27,19 +30,25 @@
import com.google.common.collect.Sets;
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) {
+ public PersonHandler(PersonService personService, ContainerConf
containerConf) {
+ super(containerConf);
this.personService = personService;
}
@@ -66,7 +75,20 @@
@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);
@@ -106,4 +128,11 @@
// 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/opensocial/service/RestfulRequestItem.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/service/RestfulRequestItem.java?rev=736777&r1=736776&r2=736777&view=diff
==============================================================================
---
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/service/RestfulRequestItem.java
(original)
+++
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/service/RestfulRequestItem.java
Thu Jan 22 12:21:38 2009
@@ -244,4 +244,8 @@
}
return stringList;
}
+
+ public String getUrl() {
+ return this.url;
+ }
}
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=736777&r1=736776&r2=736777&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
Thu Jan 22 12:21:38 2009
@@ -25,6 +25,7 @@
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;
@@ -42,7 +43,8 @@
private static final String POST_PATH = "/samplecontainer/{type}/{doevil}";
@Inject
- public SampleContainerHandler(JsonDbOpensocialService dbService) {
+ public SampleContainerHandler(JsonDbOpensocialService dbService,
ContainerConf containerConf) {
+ super(containerConf);
this.service = dbService;
}
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=736777&r1=736776&r2=736777&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
Thu Jan 22 12:21:38 2009
@@ -21,6 +21,8 @@
import org.apache.shindig.common.servlet.ParameterFetcher;
import org.apache.shindig.social.core.util.BeanJsonConverter;
import org.apache.shindig.social.core.util.BeanXStreamConverter;
+import org.apache.shindig.social.core.util.ContainerConf;
+import org.apache.shindig.social.core.util.JsonContainerConf;
import org.apache.shindig.social.opensocial.service.BeanConverter;
import org.apache.shindig.social.opensocial.service.DataServiceServletFetcher;
@@ -44,6 +46,8 @@
BeanXStreamConverter.class);
bind(BeanConverter.class).annotatedWith(Names.named("shindig.bean.converter.json")).to(
BeanJsonConverter.class);
+ bind(ContainerConf.class).to(JsonContainerConf.class);
+
}
}
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=736777&r1=736776&r2=736777&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
Thu Jan 22 12:21:38 2009
@@ -25,6 +25,8 @@
import org.apache.shindig.social.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;
@@ -60,8 +62,8 @@
token.setAppId("appId");
converter = EasyMock.createMock(BeanJsonConverter.class);
activityService = EasyMock.createMock(ActivityService.class);
-
- handler = new ActivityHandler(activityService);
+ ContainerConf containerConf = new JsonContainerConf();
+ handler = new ActivityHandler(activityService, containerConf);
}
@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=736777&r1=736776&r2=736777&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
Thu Jan 22 12:21:38 2009
@@ -24,6 +24,8 @@
import org.apache.shindig.common.util.ImmediateFuture;
import org.apache.shindig.social.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;
@@ -59,8 +61,8 @@
token = new FakeGadgetToken();
converter = EasyMock.createMock(BeanJsonConverter.class);
appDataService = EasyMock.createMock(AppDataService.class);
-
- handler = new AppDataHandler(appDataService);
+ ContainerConf containerConf = new JsonContainerConf();
+ handler = new AppDataHandler(appDataService, containerConf);
}
@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=736777&r1=736776&r2=736777&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
Thu Jan 22 12:21:38 2009
@@ -22,6 +22,8 @@
import org.apache.shindig.social.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;
@@ -71,8 +73,8 @@
super.setUp();
token = new FakeGadgetToken();
personService = EasyMock.createMock(PersonService.class);
-
- handler = new PersonHandler(personService);
+ ContainerConf containerConf = new JsonContainerConf();
+ handler = new PersonHandler(personService, containerConf);
}
@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=736777&r1=736776&r2=736777&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
Thu Jan 22 12:21:38 2009
@@ -21,6 +21,8 @@
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;
@@ -35,7 +37,8 @@
@Override
protected void setUp() throws Exception {
super.setUp();
- drh = new DataRequestHandler() {
+ ContainerConf containerConf = new JsonContainerConf();
+ drh = new DataRequestHandler(containerConf) {
@Override
protected Future<?> handleDelete(RequestItem request) {
return ImmediateFuture.newInstance("DELETE");
