You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@shindig.apache.org by li...@apache.org on 2008/07/10 20:23:12 UTC
svn commit: r675665 - in /incubator/shindig/trunk/java:
common/src/main/java/org/apache/shindig/common/
gadgets/src/main/java/org/apache/shindig/gadgets/
gadgets/src/main/java/org/apache/shindig/gadgets/http/
gadgets/src/main/java/org/apache/shindig/ga...
Author: lindner
Date: Thu Jul 10 11:23:11 2008
New Revision: 675665
URL: http://svn.apache.org/viewvc?rev=675665&view=rev
Log:
Apply cleaned-up patch for SHINDIG-440 - Simplify Guice Configuration
Removed:
incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/common/CommonGuiceModule.java
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/DefaultModelGuiceModule.java
Modified:
incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/common/SecurityTokenDecoder.java
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/DefaultGuiceModule.java
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/GadgetBlacklist.java
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/GadgetSpecFactory.java
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/LockedDomainService.java
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/MessageBundleFactory.java
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/HttpCache.java
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/HttpFetcher.java
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/ContentRewriter.java
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/HttpGuiceModule.java
incubator/shindig/trunk/java/server/src/main/webapp/WEB-INF/web.full.xml
incubator/shindig/trunk/java/server/src/main/webapp/WEB-INF/web.gadgets.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/abdera/SocialRouteManager.java
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/dataservice/ActivityService.java
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/dataservice/AppDataService.java
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/dataservice/PersonService.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/PeopleService.java
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/Activity.java
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/Address.java
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/BodyType.java
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/Email.java
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/MediaItem.java
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/Message.java
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/Name.java
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/Organization.java
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/Person.java
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/Phone.java
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/Url.java
incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/SocialApiTestsGuiceModule.java
Modified: incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/common/SecurityTokenDecoder.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/common/SecurityTokenDecoder.java?rev=675665&r1=675664&r2=675665&view=diff
==============================================================================
--- incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/common/SecurityTokenDecoder.java (original)
+++ incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/common/SecurityTokenDecoder.java Thu Jul 10 11:23:11 2008
@@ -18,11 +18,16 @@
*/
package org.apache.shindig.common;
+import com.google.inject.ImplementedBy;
+
import java.util.Map;
/**
* Handles verification of gadget security tokens.
*/
+
+@ImplementedBy(BasicSecurityTokenDecoder.class)
+
public interface SecurityTokenDecoder {
/**
Modified: incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/DefaultGuiceModule.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/DefaultGuiceModule.java?rev=675665&r1=675664&r2=675665&view=diff
==============================================================================
--- incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/DefaultGuiceModule.java (original)
+++ incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/DefaultGuiceModule.java Thu Jul 10 11:23:11 2008
@@ -55,29 +55,7 @@
System.out.println("Created default injector: " + this);
Names.bindProperties(this.binder(), properties);
- bind(ContentRewriter.class).to(DefaultContentRewriter.class);
-
- bind(HttpFetcher.class).to(BasicHttpFetcher.class);
- bind(HttpCache.class).to(BasicHttpCache.class);
-
- bind(RemoteContentFetcherFactory.class);
- bind(SigningFetcherFactory.class);
- bind(OAuthFetcherFactory.class);
- bind(ContentFetcherFactory.class);
-
- bind(GadgetSpecFactory.class)
- .to(BasicGadgetSpecFactory.class);
-
- bind(MessageBundleFactory.class)
- .to(BasicMessageBundleFactory.class);
-
- bind(GadgetBlacklist.class).to(BasicGadgetBlacklist.class);
bind(Executor.class).toInstance(Executors.newCachedThreadPool());
- bind(LockedDomainService.class).to(HashLockedDomainService.class);
-
- bind(ContainerConfig.class);
- bind(GadgetFeatureRegistry.class);
- bind(GadgetServer.class);
// We perform static injection on HttpResponse for cache TTLs.
requestStaticInjection(HttpResponse.class);
Modified: incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/GadgetBlacklist.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/GadgetBlacklist.java?rev=675665&r1=675664&r2=675665&view=diff
==============================================================================
--- incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/GadgetBlacklist.java (original)
+++ incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/GadgetBlacklist.java Thu Jul 10 11:23:11 2008
@@ -17,11 +17,16 @@
*/
package org.apache.shindig.gadgets;
+import com.google.inject.ImplementedBy;
+
import java.net.URI;
/**
* A blacklist for gadgets. Gadgets found to be blacklisted cannot be rendered.
*/
+
+@ImplementedBy(BasicGadgetBlacklist.class)
+
public interface GadgetBlacklist {
/**
Modified: incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/GadgetSpecFactory.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/GadgetSpecFactory.java?rev=675665&r1=675664&r2=675665&view=diff
==============================================================================
--- incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/GadgetSpecFactory.java (original)
+++ incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/GadgetSpecFactory.java Thu Jul 10 11:23:11 2008
@@ -22,7 +22,12 @@
import java.net.URI;
+import com.google.inject.ImplementedBy;
+
/** Factory of gadget specs */
+
+@ImplementedBy(BasicGadgetSpecFactory.class)
+
public interface GadgetSpecFactory {
/** Return a gadget spec for a context */
Modified: incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/LockedDomainService.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/LockedDomainService.java?rev=675665&r1=675664&r2=675665&view=diff
==============================================================================
--- incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/LockedDomainService.java (original)
+++ incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/LockedDomainService.java Thu Jul 10 11:23:11 2008
@@ -18,6 +18,8 @@
*/
package org.apache.shindig.gadgets;
+import com.google.inject.ImplementedBy;
+
/**
* Interface for locked domain, a security mechanism that ensures that
* a gadget is always registered on a fixed, unique domain. This prevents
@@ -25,6 +27,9 @@
* modern web browsers implement a same origin policy that prevents pages served
* from different hosts from accessing each other's data.
*/
+
+@ImplementedBy(HashLockedDomainService.class)
+
public interface LockedDomainService {
/**
Modified: incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/MessageBundleFactory.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/MessageBundleFactory.java?rev=675665&r1=675664&r2=675665&view=diff
==============================================================================
--- incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/MessageBundleFactory.java (original)
+++ incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/MessageBundleFactory.java Thu Jul 10 11:23:11 2008
@@ -23,9 +23,14 @@
import java.net.URI;
+import com.google.inject.ImplementedBy;
+
/**
* Factory of message bundles
*/
+
+@ImplementedBy(BasicMessageBundleFactory.class)
+
public interface MessageBundleFactory {
MessageBundle getBundle(LocaleSpec localeSpec, GadgetContext context)
Modified: incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/HttpCache.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/HttpCache.java?rev=675665&r1=675664&r2=675665&view=diff
==============================================================================
--- incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/HttpCache.java (original)
+++ incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/HttpCache.java Thu Jul 10 11:23:11 2008
@@ -17,11 +17,16 @@
*/
package org.apache.shindig.gadgets.http;
+import com.google.inject.ImplementedBy;
+
import java.net.URI;
/**
* Cache of HttpResponse keyed by URI/HttpRequest
*/
+
+@ImplementedBy(BasicHttpCache.class)
+
public interface HttpCache {
public HttpResponse getResponse(URI uri);
Modified: incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/HttpFetcher.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/HttpFetcher.java?rev=675665&r1=675664&r2=675665&view=diff
==============================================================================
--- incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/HttpFetcher.java (original)
+++ incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/HttpFetcher.java Thu Jul 10 11:23:11 2008
@@ -18,10 +18,13 @@
package org.apache.shindig.gadgets.http;
import org.apache.shindig.gadgets.GadgetException;
+import com.google.inject.ImplementedBy;
/**
* Provide HttpResponse for a HttpRequest
*/
+@ImplementedBy(BasicHttpFetcher.class)
+
public interface HttpFetcher {
/**
Modified: incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/ContentRewriter.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/ContentRewriter.java?rev=675665&r1=675664&r2=675665&view=diff
==============================================================================
--- incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/ContentRewriter.java (original)
+++ incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/ContentRewriter.java Thu Jul 10 11:23:11 2008
@@ -25,9 +25,14 @@
import java.io.Writer;
import java.net.URI;
+import com.google.inject.ImplementedBy;
+
/**
* Standard interface for content rewriters
*/
+
+@ImplementedBy(DefaultContentRewriter.class)
+
public interface ContentRewriter {
/**
Modified: incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/HttpGuiceModule.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/HttpGuiceModule.java?rev=675665&r1=675664&r2=675665&view=diff
==============================================================================
--- incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/HttpGuiceModule.java (original)
+++ incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/HttpGuiceModule.java Thu Jul 10 11:23:11 2008
@@ -32,11 +32,7 @@
/** {@inheritDoc} */
@Override
protected void configure() {
- super.configure();
- bind(ProxyHandler.class).in(Scopes.SINGLETON);
- bind(JsonRpcHandler.class).in(Scopes.SINGLETON);
- bind(GadgetRenderingTask.class);
- bind(UrlGenerator.class).in(Scopes.SINGLETON);
+ super.configure();
}
public HttpGuiceModule(Properties properties) {
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=675665&r1=675664&r2=675665&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 Thu Jul 10 11:23:11 2008
@@ -26,7 +26,7 @@
<!-- If you have your own Guice module(s), put them here as a colon-separated list. -->
<context-param>
<param-name>guice-modules</param-name>
- <param-value>org.apache.shindig.common.CommonGuiceModule:org.apache.shindig.gadgets.servlet.HttpGuiceModule:org.apache.shindig.social.SocialApiGuiceModule</param-value>
+ <param-value>org.apache.shindig.gadgets.servlet.HttpGuiceModule:org.apache.shindig.social.SocialApiGuiceModule</param-value>
</context-param>
<listener>
Modified: incubator/shindig/trunk/java/server/src/main/webapp/WEB-INF/web.gadgets.xml
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/server/src/main/webapp/WEB-INF/web.gadgets.xml?rev=675665&r1=675664&r2=675665&view=diff
==============================================================================
--- incubator/shindig/trunk/java/server/src/main/webapp/WEB-INF/web.gadgets.xml (original)
+++ incubator/shindig/trunk/java/server/src/main/webapp/WEB-INF/web.gadgets.xml Thu Jul 10 11:23:11 2008
@@ -26,7 +26,7 @@
<!-- If you have your own Guice module(s), put them here as a colon-separated list. -->
<context-param>
<param-name>guice-modules</param-name>
- <param-value>org.apache.shindig.common.CommonGuiceModule:org.apache.shindig.gadgets.servlet.HttpGuiceModule</param-value>
+ <param-value>org.apache.shindig.gadgets.servlet.HttpGuiceModule</param-value>
</context-param>
<listener>
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=675665&r1=675664&r2=675665&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 Thu Jul 10 11:23:11 2008
@@ -26,7 +26,7 @@
<!-- If you have your own Guice module(s), put them here as a colon-separated list. -->
<context-param>
<param-name>guice-modules</param-name>
- <param-value>org.apache.shindig.common.CommonGuiceModule:org.apache.shindig.social.SocialApiGuiceModule</param-value>
+ <param-value>org.apache.shindig.social.SocialApiGuiceModule</param-value>
</context-param>
<filter>
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=675665&r1=675664&r2=675665&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 Thu Jul 10 11:23:11 2008
@@ -26,7 +26,7 @@
<!-- If you have your own Guice module(s), put them here as a colon-separated list. -->
<context-param>
<param-name>guice-modules</param-name>
- <param-value>org.apache.shindig.common.CommonGuiceModule:org.apache.shindig.gadgets.servlet.HttpGuiceModule:org.apache.shindig.social.SocialApiGuiceModule</param-value>
+ <param-value>org.apache.shindig.gadgets.servlet.HttpGuiceModule:org.apache.shindig.social.SocialApiGuiceModule</param-value>
</context-param>
<listener>
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=675665&r1=675664&r2=675665&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 Thu Jul 10 11:23:11 2008
@@ -19,6 +19,7 @@
package org.apache.shindig.social;
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;
@@ -26,42 +27,24 @@
import org.apache.shindig.common.servlet.ParameterFetcher;
import org.apache.shindig.social.abdera.SocialRouteManager;
-import org.apache.shindig.social.dataservice.ActivityService;
-import org.apache.shindig.social.dataservice.AppDataService;
import org.apache.shindig.social.dataservice.DataServiceServletFetcher;
-import org.apache.shindig.social.dataservice.PersonService;
-import org.apache.shindig.social.opensocial.ActivitiesService;
-import org.apache.shindig.social.opensocial.DataService;
-import org.apache.shindig.social.opensocial.DefaultModelGuiceModule;
import org.apache.shindig.social.opensocial.OpenSocialDataHandler;
-import org.apache.shindig.social.opensocial.PeopleService;
-import org.apache.shindig.social.samplecontainer.BasicActivitiesService;
-import org.apache.shindig.social.samplecontainer.BasicDataService;
-import org.apache.shindig.social.samplecontainer.BasicPeopleService;
-import org.apache.shindig.social.samplecontainer.SampleContainerRouteManager;
-import org.apache.shindig.social.samplecontainer.StateFileDataHandler;
+import org.apache.shindig.social.samplecontainer.*;
import java.util.List;
/**
* Provides social api component injection
*/
-public class SocialApiGuiceModule extends DefaultModelGuiceModule {
+public class SocialApiGuiceModule extends AbstractModule {
/** {@inheritDoc} */
@Override
protected void configure() {
- bind(PeopleService.class).to(BasicPeopleService.class);
- bind(DataService.class).to(BasicDataService.class);
- bind(ActivitiesService.class).to(BasicActivitiesService.class);
bind(new TypeLiteral<List<GadgetDataHandler>>() {})
.toProvider(GadgetDataHandlersProvider.class);
- bind(PersonService.class).to(BasicPeopleService.class);
- bind(ActivityService.class).to(BasicActivitiesService.class);
- bind(AppDataService.class).to(BasicDataService.class);
-
bind(SocialRouteManager.class).to(SampleContainerRouteManager.class);
bind(ParameterFetcher.class).annotatedWith(Names.named("GadgetDataServlet")).to(GadgetDataServletFetcher.class);
Modified: incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/abdera/SocialRouteManager.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/abdera/SocialRouteManager.java?rev=675665&r1=675664&r2=675665&view=diff
==============================================================================
--- incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/abdera/SocialRouteManager.java (original)
+++ incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/abdera/SocialRouteManager.java Thu Jul 10 11:23:11 2008
@@ -36,6 +36,8 @@
import java.util.HashMap;
import java.util.Map;
+import com.google.inject.ImplementedBy;
+
public class SocialRouteManager extends RouteManager {
private final PersonJsonAdapter personJsonAdapter;
private final PersonAdapter personAtomAdapter;
Modified: incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/dataservice/ActivityService.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/dataservice/ActivityService.java?rev=675665&r1=675664&r2=675665&view=diff
==============================================================================
--- incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/dataservice/ActivityService.java (original)
+++ incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/dataservice/ActivityService.java Thu Jul 10 11:23:11 2008
@@ -19,11 +19,16 @@
import org.apache.shindig.common.SecurityToken;
import org.apache.shindig.social.ResponseItem;
+import org.apache.shindig.social.samplecontainer.BasicActivitiesService;
import org.apache.shindig.social.opensocial.model.Activity;
import java.util.Set;
import java.util.concurrent.Future;
+import com.google.inject.ImplementedBy;
+
+@ImplementedBy(BasicActivitiesService.class)
+
public interface ActivityService {
/**
Modified: incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/dataservice/AppDataService.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/dataservice/AppDataService.java?rev=675665&r1=675664&r2=675665&view=diff
==============================================================================
--- incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/dataservice/AppDataService.java (original)
+++ incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/dataservice/AppDataService.java Thu Jul 10 11:23:11 2008
@@ -19,11 +19,15 @@
import org.apache.shindig.common.SecurityToken;
import org.apache.shindig.social.ResponseItem;
+import org.apache.shindig.social.samplecontainer.BasicDataService;
import java.util.Map;
import java.util.Set;
import java.util.concurrent.Future;
+import com.google.inject.ImplementedBy;
+
+@ImplementedBy(BasicDataService.class)
public interface AppDataService {
/**
Modified: incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/dataservice/PersonService.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/dataservice/PersonService.java?rev=675665&r1=675664&r2=675665&view=diff
==============================================================================
--- incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/dataservice/PersonService.java (original)
+++ incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/dataservice/PersonService.java Thu Jul 10 11:23:11 2008
@@ -19,11 +19,16 @@
import org.apache.shindig.common.SecurityToken;
import org.apache.shindig.social.ResponseItem;
+import org.apache.shindig.social.samplecontainer.BasicPeopleService;
import org.apache.shindig.social.opensocial.model.Person;
import java.util.Set;
import java.util.concurrent.Future;
+import com.google.inject.ImplementedBy;
+
+@ImplementedBy(BasicPeopleService.class)
+
public interface PersonService {
public enum SortOrder {
Modified: incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/ActivitiesService.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/ActivitiesService.java?rev=675665&r1=675664&r2=675665&view=diff
==============================================================================
--- incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/ActivitiesService.java (original)
+++ incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/ActivitiesService.java Thu Jul 10 11:23:11 2008
@@ -19,10 +19,15 @@
import org.apache.shindig.common.SecurityToken;
import org.apache.shindig.social.ResponseItem;
+import org.apache.shindig.social.samplecontainer.BasicActivitiesService;
import org.apache.shindig.social.opensocial.model.Activity;
import java.util.List;
+import com.google.inject.ImplementedBy;
+
+@ImplementedBy(BasicActivitiesService.class)
+
public interface ActivitiesService {
/**
* Returns a list of activities that correspond to the passed in person ids.
Modified: incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/DataService.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/DataService.java?rev=675665&r1=675664&r2=675665&view=diff
==============================================================================
--- incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/DataService.java (original)
+++ incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/DataService.java Thu Jul 10 11:23:11 2008
@@ -19,10 +19,15 @@
import org.apache.shindig.common.SecurityToken;
import org.apache.shindig.social.ResponseItem;
+import org.apache.shindig.social.samplecontainer.BasicDataService;
import java.util.List;
import java.util.Map;
+import com.google.inject.ImplementedBy;
+
+@ImplementedBy(BasicDataService.class)
+
public interface DataService {
/**
Modified: incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/PeopleService.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/PeopleService.java?rev=675665&r1=675664&r2=675665&view=diff
==============================================================================
--- incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/PeopleService.java (original)
+++ incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/PeopleService.java Thu Jul 10 11:23:11 2008
@@ -19,6 +19,7 @@
import org.apache.shindig.common.SecurityToken;
import org.apache.shindig.social.ResponseItem;
+import org.apache.shindig.social.samplecontainer.BasicPeopleService;
import org.apache.shindig.social.opensocial.model.ApiCollection;
import org.apache.shindig.social.opensocial.model.IdSpec;
import org.apache.shindig.social.opensocial.model.Person;
@@ -28,6 +29,10 @@
import java.util.List;
import java.util.Set;
+import com.google.inject.ImplementedBy;
+
+@ImplementedBy(BasicPeopleService.class)
+
public interface PeopleService {
/**
* Returns a list of people ids that the other handlers (currently data
Modified: incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/Activity.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/Activity.java?rev=675665&r1=675664&r2=675665&view=diff
==============================================================================
--- incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/Activity.java (original)
+++ incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/Activity.java Thu Jul 10 11:23:11 2008
@@ -17,10 +17,13 @@
*/
package org.apache.shindig.social.opensocial.model;
+import com.google.inject.ImplementedBy;
import java.util.Date;
import java.util.List;
import java.util.Map;
+@ImplementedBy(ActivityImpl.class)
+
public interface Activity {
public static enum Field {
Modified: incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/Address.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/Address.java?rev=675665&r1=675664&r2=675665&view=diff
==============================================================================
--- incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/Address.java (original)
+++ incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/Address.java Thu Jul 10 11:23:11 2008
@@ -17,11 +17,15 @@
*/
package org.apache.shindig.social.opensocial.model;
+import com.google.inject.ImplementedBy;
+
/**
* see
* http://code.google.com/apis/opensocial/docs/0.7/reference/opensocial.Address.Field.html
*
*/
+@ImplementedBy(AddressImpl.class)
+
public interface Address {
public static enum Field {
Modified: incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/BodyType.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/BodyType.java?rev=675665&r1=675664&r2=675665&view=diff
==============================================================================
--- incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/BodyType.java (original)
+++ incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/BodyType.java Thu Jul 10 11:23:11 2008
@@ -17,6 +17,10 @@
*/
package org.apache.shindig.social.opensocial.model;
+import com.google.inject.ImplementedBy;
+
+@ImplementedBy(BodyTypeImpl.class)
+
public interface BodyType {
public static enum Field {
Modified: incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/Email.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/Email.java?rev=675665&r1=675664&r2=675665&view=diff
==============================================================================
--- incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/Email.java (original)
+++ incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/Email.java Thu Jul 10 11:23:11 2008
@@ -17,11 +17,16 @@
*/
package org.apache.shindig.social.opensocial.model;
+import com.google.inject.ImplementedBy;
+
/**
* see
* http://code.google.com/apis/opensocial/docs/0.7/reference/opensocial.Email.Field.html
*
*/
+
+@ImplementedBy(EmailImpl.class)
+
public interface Email {
public static enum Field {
Modified: incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/MediaItem.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/MediaItem.java?rev=675665&r1=675664&r2=675665&view=diff
==============================================================================
--- incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/MediaItem.java (original)
+++ incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/MediaItem.java Thu Jul 10 11:23:11 2008
@@ -17,6 +17,10 @@
*/
package org.apache.shindig.social.opensocial.model;
+import com.google.inject.ImplementedBy;
+
+@ImplementedBy(MediaItemImpl.class)
+
public interface MediaItem {
public static enum Field {
Modified: incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/Message.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/Message.java?rev=675665&r1=675664&r2=675665&view=diff
==============================================================================
--- incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/Message.java (original)
+++ incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/Message.java Thu Jul 10 11:23:11 2008
@@ -17,6 +17,8 @@
*/
package org.apache.shindig.social.opensocial.model;
+import com.google.inject.ImplementedBy;
+
/**
*
* Base interface for all message objects.
@@ -25,6 +27,9 @@
* http://code.google.com/apis/opensocial/docs/0.7/reference/opensocial.Message.html
*
*/
+
+@ImplementedBy(MessageImpl.class)
+
public interface Message {
public static enum Field {
Modified: incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/Name.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/Name.java?rev=675665&r1=675664&r2=675665&view=diff
==============================================================================
--- incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/Name.java (original)
+++ incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/Name.java Thu Jul 10 11:23:11 2008
@@ -17,11 +17,16 @@
*/
package org.apache.shindig.social.opensocial.model;
+import com.google.inject.ImplementedBy;
+
/**
* see
* http://code.google.com/apis/opensocial/docs/0.7/reference/opensocial.Name.Field.html
*
*/
+
+@ImplementedBy(NameImpl.class)
+
public interface Name {
public static enum Field {
Modified: incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/Organization.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/Organization.java?rev=675665&r1=675664&r2=675665&view=diff
==============================================================================
--- incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/Organization.java (original)
+++ incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/Organization.java Thu Jul 10 11:23:11 2008
@@ -17,6 +17,7 @@
*/
package org.apache.shindig.social.opensocial.model;
+import com.google.inject.ImplementedBy;
import java.util.Date;
/**
@@ -24,6 +25,9 @@
* http://code.google.com/apis/opensocial/docs/0.7/reference/opensocial.Organization.Field.html
*
*/
+
+@ImplementedBy(OrganizationImpl.class)
+
public interface Organization {
public static enum Field {
Modified: incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/Person.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/Person.java?rev=675665&r1=675664&r2=675665&view=diff
==============================================================================
--- incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/Person.java (original)
+++ incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/Person.java Thu Jul 10 11:23:11 2008
@@ -17,6 +17,7 @@
*/
package org.apache.shindig.social.opensocial.model;
+import com.google.inject.ImplementedBy;
import org.apache.shindig.social.opensocial.util.EnumUtil;
import java.util.Date;
@@ -28,6 +29,9 @@
* http://code.google.com/apis/opensocial/docs/0.7/reference/opensocial.Person.Field.html
*
*/
+
+@ImplementedBy(PersonImpl.class)
+
public interface Person {
public static enum Field {
Modified: incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/Phone.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/Phone.java?rev=675665&r1=675664&r2=675665&view=diff
==============================================================================
--- incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/Phone.java (original)
+++ incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/Phone.java Thu Jul 10 11:23:11 2008
@@ -17,11 +17,16 @@
*/
package org.apache.shindig.social.opensocial.model;
+import com.google.inject.ImplementedBy;
+
/**
* see
* http://code.google.com/apis/opensocial/docs/0.7/reference/opensocial.Phone.Field.html
*
*/
+
+@ImplementedBy(PhoneImpl.class)
+
public interface Phone {
public static enum Field {
Modified: incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/Url.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/Url.java?rev=675665&r1=675664&r2=675665&view=diff
==============================================================================
--- incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/Url.java (original)
+++ incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/Url.java Thu Jul 10 11:23:11 2008
@@ -17,6 +17,10 @@
*/
package org.apache.shindig.social.opensocial.model;
+import com.google.inject.ImplementedBy;
+
+@ImplementedBy(UrlImpl.class)
+
public interface Url {
public static enum Field {
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=675665&r1=675664&r2=675665&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 Jul 10 11:23:11 2008
@@ -20,11 +20,10 @@
import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
+import com.google.inject.AbstractModule;
import com.google.inject.Singleton;
import com.google.inject.name.Names;
-import org.apache.shindig.common.BasicSecurityTokenDecoder;
-import org.apache.shindig.common.SecurityTokenDecoder;
import org.apache.shindig.common.servlet.ParameterFetcher;
import org.apache.shindig.social.abdera.SocialRouteManager;
import org.apache.shindig.social.dataservice.ActivityService;
@@ -33,7 +32,6 @@
import org.apache.shindig.social.dataservice.PersonService;
import org.apache.shindig.social.opensocial.ActivitiesService;
import org.apache.shindig.social.opensocial.DataService;
-import org.apache.shindig.social.opensocial.DefaultModelGuiceModule;
import org.apache.shindig.social.opensocial.PeopleService;
import org.apache.shindig.social.opensocial.model.Activity;
import org.apache.shindig.social.opensocial.model.ActivityImpl;
@@ -69,26 +67,16 @@
/**
* Provides social api component injection for all large tests
*/
-public class SocialApiTestsGuiceModule extends DefaultModelGuiceModule {
+public class SocialApiTestsGuiceModule extends AbstractModule {
private static Logger logger =
Logger.getLogger(SocialApiTestsGuiceModule.class.getName());
@Override
protected void configure() {
- super.configure();
- bind(PeopleService.class).to(BasicPeopleService.class);
- bind(DataService.class).to(BasicDataService.class);
- bind(ActivitiesService.class).to(BasicActivitiesService.class);
-
- bind(PersonService.class).to(BasicPeopleService.class);
- bind(ActivityService.class).to(BasicActivitiesService.class);
- bind(AppDataService.class).to(BasicDataService.class);
bind(XmlStateFileFetcher.class).to(MockXmlStateFileFetcher.class);
bind(SocialRouteManager.class).to(SampleContainerRouteManager.class);
- bind(SecurityTokenDecoder.class).to(BasicSecurityTokenDecoder.class);
-
bind(ParameterFetcher.class).annotatedWith(Names.named("GadgetDataServlet")).to(GadgetDataServletFetcher.class);
bind(ParameterFetcher.class).annotatedWith(Names.named("DataServiceServlet")).to(DataServiceServletFetcher.class);
}
@@ -99,8 +87,8 @@
public static final PersonImpl janeDoe;
public static final PersonImpl simpleDoe;
- public static ActivityImpl johnActivity;
- public static ActivityImpl janeActivity;
+ public static final ActivityImpl johnActivity;
+ public static final ActivityImpl janeActivity;
static {
// setup John Doe