Author: lryan
Date: Thu Feb 12 18:12:19 2009
New Revision: 743821
URL: http://svn.apache.org/viewvc?rev=743821&view=rev
Log:
Use more specific type literal for Guice binding of handlers
Modified:
incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/DefaultHandlerRegistry.java
incubator/shindig/trunk/java/common/src/test/java/org/apache/shindig/protocol/DataServiceServletTest.java
incubator/shindig/trunk/java/common/src/test/java/org/apache/shindig/protocol/DefaultHandlerRegistryTest.java
incubator/shindig/trunk/java/common/src/test/java/org/apache/shindig/protocol/JsonRpcServletTest.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/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
Modified:
incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/DefaultHandlerRegistry.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/DefaultHandlerRegistry.java?rev=743821&r1=743820&r2=743821&view=diff
==============================================================================
---
incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/DefaultHandlerRegistry.java
(original)
+++
incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/DefaultHandlerRegistry.java
Thu Feb 12 18:12:19 2009
@@ -72,7 +72,7 @@
*/
@Inject
public DefaultHandlerRegistry(Injector injector,
- @Named("org.apache.shindig.handlers")Set
handlers,
+
@Named("org.apache.shindig.handlers")Set<Object> handlers,
BeanJsonConverter beanJsonConverter,
HandlerExecutionListener executionListener) {
this.injector = injector;
Modified:
incubator/shindig/trunk/java/common/src/test/java/org/apache/shindig/protocol/DataServiceServletTest.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/common/src/test/java/org/apache/shindig/protocol/DataServiceServletTest.java?rev=743821&r1=743820&r2=743821&view=diff
==============================================================================
---
incubator/shindig/trunk/java/common/src/test/java/org/apache/shindig/protocol/DataServiceServletTest.java
(original)
+++
incubator/shindig/trunk/java/common/src/test/java/org/apache/shindig/protocol/DataServiceServletTest.java
Thu Feb 12 18:12:19 2009
@@ -73,7 +73,7 @@
EasyMock.expect(atomConverter.getContentType()).andReturn("application/atom+xml").anyTimes();
HandlerRegistry registry = new DefaultHandlerRegistry(null,
- Sets.newHashSet(new TestHandler()), jsonConverter,
+ Sets.<Object>newHashSet(new TestHandler()), jsonConverter,
new HandlerExecutionListener.NoOpHandlerExecutionListener());
servlet.setHandlerRegistry(registry);
Modified:
incubator/shindig/trunk/java/common/src/test/java/org/apache/shindig/protocol/DefaultHandlerRegistryTest.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/common/src/test/java/org/apache/shindig/protocol/DefaultHandlerRegistryTest.java?rev=743821&r1=743820&r2=743821&view=diff
==============================================================================
---
incubator/shindig/trunk/java/common/src/test/java/org/apache/shindig/protocol/DefaultHandlerRegistryTest.java
(original)
+++
incubator/shindig/trunk/java/common/src/test/java/org/apache/shindig/protocol/DefaultHandlerRegistryTest.java
Thu Feb 12 18:12:19 2009
@@ -45,7 +45,7 @@
protected void setUp() throws Exception {
super.setUp();
registry = new DefaultHandlerRegistry(null,
- Sets.newHashSet(new TestHandler()), null,
+ Sets.<Object>newHashSet(new TestHandler()), null,
new HandlerExecutionListener.NoOpHandlerExecutionListener());
}
Modified:
incubator/shindig/trunk/java/common/src/test/java/org/apache/shindig/protocol/JsonRpcServletTest.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/common/src/test/java/org/apache/shindig/protocol/JsonRpcServletTest.java?rev=743821&r1=743820&r2=743821&view=diff
==============================================================================
---
incubator/shindig/trunk/java/common/src/test/java/org/apache/shindig/protocol/JsonRpcServletTest.java
(original)
+++
incubator/shindig/trunk/java/common/src/test/java/org/apache/shindig/protocol/JsonRpcServletTest.java
Thu Feb 12 18:12:19 2009
@@ -68,7 +68,7 @@
atomConverter = mockControl.createMock(BeanConverter.class);
HandlerRegistry registry = new DefaultHandlerRegistry(null,
- Sets.newHashSet(new TestHandler()), jsonConverter,
+ Sets.<Object>newHashSet(new TestHandler()), jsonConverter,
new HandlerExecutionListener.NoOpHandlerExecutionListener());
servlet.setHandlerRegistry(registry);
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=743821&r1=743820&r2=743821&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 Feb 12 18:12:19 2009
@@ -70,8 +70,8 @@
bind(new TypeLiteral<List<AuthenticationHandler>>(){}).toProvider(
AuthenticationHandlerProvider.class);
- bind(Set.class).annotatedWith(Names.named("org.apache.shindig.handlers"))
- .toInstance(ImmutableSet.of(ActivityHandler.class,
AppDataHandler.class,
+ bind(new
TypeLiteral<Set<Object>>(){}).annotatedWith(Names.named("org.apache.shindig.handlers"))
+ .toInstance(ImmutableSet.<Object>of(ActivityHandler.class,
AppDataHandler.class,
PersonHandler.class, SampleContainerHandler.class));
bind(ContainerConfig.class).to(JsonContainerConfig.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=743821&r1=743820&r2=743821&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 Feb 12 18:12:19 2009
@@ -77,8 +77,8 @@
bind(new TypeLiteral<List<AuthenticationHandler>>(){}).toProvider(
AuthenticationHandlerProvider.class);
- bind(Set.class).annotatedWith(Names.named("org.apache.shindig.handlers"))
- .toInstance(ImmutableSet.of(ActivityHandler.class,
AppDataHandler.class,
+ bind(new
TypeLiteral<Set<Object>>(){}).annotatedWith(Names.named("org.apache.shindig.handlers"))
+ .toInstance(ImmutableSet.<Object>of(ActivityHandler.class,
AppDataHandler.class,
PersonHandler.class, SampleContainerHandler.class));
}
}
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=743821&r1=743820&r2=743821&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 Feb 12 18:12:19 2009
@@ -33,6 +33,7 @@
import com.google.common.collect.ImmutableSet;
import com.google.inject.AbstractModule;
+import com.google.inject.TypeLiteral;
import com.google.inject.name.Names;
import java.util.Set;
@@ -56,8 +57,8 @@
bind(BeanConverter.class).annotatedWith(Names.named("shindig.bean.converter.json")).to(
BeanJsonConverter.class);
- bind(Set.class).annotatedWith(Names.named("org.apache.shindig.handlers"))
- .toInstance(ImmutableSet.of(ActivityHandler.class,
AppDataHandler.class,
+ bind(new
TypeLiteral<Set<Object>>(){}).annotatedWith(Names.named("org.apache.shindig.handlers"))
+ .toInstance(ImmutableSet.<Object>of(ActivityHandler.class,
AppDataHandler.class,
PersonHandler.class));
bind(String.class).annotatedWith(
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=743821&r1=743820&r2=743821&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 Feb 12 18:12:19 2009
@@ -82,7 +82,7 @@
containerConfig = new JsonContainerConfig(config, new Expressions());
handler = new ActivityHandler(activityService, containerConfig);
- registry = new DefaultHandlerRegistry(null, Sets.newHashSet(handler),
converter,
+ registry = new DefaultHandlerRegistry(null,
Sets.<Object>newHashSet(handler), converter,
new HandlerExecutionListener.NoOpHandlerExecutionListener());
}
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=743821&r1=743820&r2=743821&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 Feb 12 18:12:19 2009
@@ -68,7 +68,7 @@
converter = mock(BeanJsonConverter.class);
appDataService = mock(AppDataService.class);
AppDataHandler handler = new AppDataHandler(appDataService);
- registry = new DefaultHandlerRegistry(null, Sets.newHashSet(handler),
converter,
+ registry = new DefaultHandlerRegistry(null,
Sets.<Object>newHashSet(handler), converter,
new HandlerExecutionListener.NoOpHandlerExecutionListener());
}
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=743821&r1=743820&r2=743821&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 Feb 12 18:12:19 2009
@@ -90,7 +90,7 @@
containerConfig = new JsonContainerConfig(config, new Expressions());
handler = new PersonHandler(personService, containerConfig);
- registry = new DefaultHandlerRegistry(null, Sets.newHashSet(handler),
converter,
+ registry = new DefaultHandlerRegistry(null,
Sets.<Object>newHashSet(handler), converter,
new HandlerExecutionListener.NoOpHandlerExecutionListener());
}
