You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@shindig.apache.org by lr...@apache.org on 2009/02/11 19:33:47 UTC
svn commit: r743443 - in /incubator/shindig/trunk/java:
common/src/main/java/org/apache/shindig/protocol/
common/src/test/java/org/apache/shindig/protocol/
server/src/test/java/org/apache/shindig/server/endtoend/
social-api/src/main/java/org/apache/shi...
Author: lryan
Date: Wed Feb 11 18:33:47 2009
New Revision: 743443
URL: http://svn.apache.org/viewvc?rev=743443&view=rev
Log:
Bind a Set of API handlers instead of a List
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=743443&r1=743442&r2=743443&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 Wed Feb 11 18:33:47 2009
@@ -71,7 +71,7 @@
*/
@Inject
public DefaultHandlerRegistry(Injector injector,
- @Named("org.apache.shindig.handlers")List handlers,
+ @Named("org.apache.shindig.handlers")Set handlers,
BeanJsonConverter beanJsonConverter) {
this.injector = injector;
this.beanJsonConverter = beanJsonConverter;
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=743443&r1=743442&r2=743443&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 Wed Feb 11 18:33:47 2009
@@ -25,16 +25,19 @@
import org.apache.shindig.protocol.conversion.BeanJsonConverter;
import com.google.common.collect.ImmutableMap;
-import com.google.common.collect.Lists;
+import com.google.common.collect.Sets;
+
import junit.framework.TestCase;
+
import org.easymock.IMocksControl;
import org.easymock.classextension.EasyMock;
+import java.io.IOException;
+import java.io.PrintWriter;
+
import javax.servlet.ServletInputStream;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import java.io.IOException;
-import java.io.PrintWriter;
public class DataServiceServletTest extends TestCase {
@@ -70,7 +73,7 @@
EasyMock.expect(atomConverter.getContentType()).andReturn("application/atom+xml").anyTimes();
HandlerRegistry registry = new DefaultHandlerRegistry(null,
- Lists.newArrayList(new TestHandler()), jsonConverter);
+ Sets.newHashSet(new TestHandler()), jsonConverter);
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=743443&r1=743442&r2=743443&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 Wed Feb 11 18:33:47 2009
@@ -19,7 +19,6 @@
package org.apache.shindig.protocol;
-import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
import com.google.common.collect.Sets;
@@ -46,7 +45,7 @@
protected void setUp() throws Exception {
super.setUp();
registry = new DefaultHandlerRegistry(null,
- Lists.newArrayList(new TestHandler()), null);
+ Sets.newHashSet(new TestHandler()), null);
}
public void testGetHandlerRPC() throws Exception {
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=743443&r1=743442&r2=743443&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 Wed Feb 11 18:33:47 2009
@@ -22,21 +22,24 @@
import org.apache.shindig.protocol.conversion.BeanJsonConverter;
import com.google.common.collect.ImmutableMap;
-import com.google.common.collect.Lists;
+import com.google.common.collect.Sets;
+
import junit.framework.TestCase;
+
import org.easymock.IMocksControl;
import org.easymock.classextension.EasyMock;
import org.json.JSONArray;
import org.json.JSONObject;
-import javax.servlet.ServletInputStream;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
import java.io.ByteArrayInputStream;
import java.io.IOException;
import java.io.InputStream;
import java.io.PrintWriter;
+import javax.servlet.ServletInputStream;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
/**
*
*/
@@ -65,7 +68,7 @@
atomConverter = mockControl.createMock(BeanConverter.class);
HandlerRegistry registry = new DefaultHandlerRegistry(null,
- Lists.newArrayList(new TestHandler()), jsonConverter);
+ Sets.newHashSet(new TestHandler()), jsonConverter);
servlet.setHandlerRegistry(registry);
servlet.setBeanConverters(jsonConverter, xmlConverter, atomConverter);
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=743443&r1=743442&r2=743443&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 Wed Feb 11 18:33:47 2009
@@ -35,12 +35,13 @@
import org.apache.shindig.social.opensocial.service.PersonHandler;
import org.apache.shindig.social.sample.service.SampleContainerHandler;
-import com.google.common.collect.ImmutableList;
+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.List;
+import java.util.Set;
/**
* Guice module for the end-to-end tests.
@@ -69,8 +70,8 @@
bind(new TypeLiteral<List<AuthenticationHandler>>(){}).toProvider(
AuthenticationHandlerProvider.class);
- bind(List.class).annotatedWith(Names.named("org.apache.shindig.handlers"))
- .toInstance(ImmutableList.of(ActivityHandler.class, AppDataHandler.class,
+ bind(Set.class).annotatedWith(Names.named("org.apache.shindig.handlers"))
+ .toInstance(ImmutableSet.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=743443&r1=743442&r2=743443&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 Wed Feb 11 18:33:47 2009
@@ -36,12 +36,13 @@
import org.apache.shindig.social.opensocial.service.PersonHandler;
import org.apache.shindig.social.sample.service.SampleContainerHandler;
-import com.google.common.collect.Lists;
+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.List;
+import java.util.Set;
/**
* Provides social api component injection. Implementor may want to replace this module if they need
@@ -76,8 +77,8 @@
bind(new TypeLiteral<List<AuthenticationHandler>>(){}).toProvider(
AuthenticationHandlerProvider.class);
- bind(List.class).annotatedWith(Names.named("org.apache.shindig.handlers"))
- .toInstance(Lists.immutableList(ActivityHandler.class, AppDataHandler.class,
+ bind(Set.class).annotatedWith(Names.named("org.apache.shindig.handlers"))
+ .toInstance(ImmutableSet.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=743443&r1=743442&r2=743443&view=diff
==============================================================================
--- incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/SocialApiTestsGuiceModule.java (original)
+++ incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/SocialApiTestsGuiceModule.java Wed Feb 11 18:33:47 2009
@@ -31,11 +31,11 @@
import org.apache.shindig.social.opensocial.service.AppDataHandler;
import org.apache.shindig.social.opensocial.service.PersonHandler;
-import com.google.common.collect.Lists;
+import com.google.common.collect.ImmutableSet;
import com.google.inject.AbstractModule;
import com.google.inject.name.Names;
-import java.util.List;
+import java.util.Set;
/**
* Provides social api component injection for all large tests
@@ -56,8 +56,8 @@
bind(BeanConverter.class).annotatedWith(Names.named("shindig.bean.converter.json")).to(
BeanJsonConverter.class);
- bind(List.class).annotatedWith(Names.named("org.apache.shindig.handlers"))
- .toInstance(Lists.immutableList(ActivityHandler.class, AppDataHandler.class,
+ bind(Set.class).annotatedWith(Names.named("org.apache.shindig.handlers"))
+ .toInstance(ImmutableSet.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=743443&r1=743442&r2=743443&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 Wed Feb 11 18:33:47 2009
@@ -37,7 +37,6 @@
import org.apache.shindig.social.opensocial.spi.UserId;
import com.google.common.collect.ImmutableList;
-import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
import com.google.common.collect.Sets;
@@ -82,7 +81,7 @@
containerConfig = new JsonContainerConfig(config, new Expressions());
handler = new ActivityHandler(activityService, containerConfig);
- registry = new DefaultHandlerRegistry(null, Lists.newArrayList(handler), converter);
+ registry = new DefaultHandlerRegistry(null, Sets.newHashSet(handler), converter);
}
private void assertHandleGetForGroup(GroupId.Type group) throws Exception {
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=743443&r1=743442&r2=743443&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 Wed Feb 11 18:33:47 2009
@@ -31,7 +31,6 @@
import org.apache.shindig.social.opensocial.spi.SocialSpiException;
import org.apache.shindig.social.opensocial.spi.UserId;
-import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
import com.google.common.collect.Sets;
@@ -68,7 +67,7 @@
converter = mock(BeanJsonConverter.class);
appDataService = mock(AppDataService.class);
AppDataHandler handler = new AppDataHandler(appDataService);
- registry = new DefaultHandlerRegistry(null, Lists.newArrayList(handler), converter);
+ registry = new DefaultHandlerRegistry(null, Sets.newHashSet(handler), converter);
}
private void assertHandleGetForGroup(GroupId.Type group) throws Exception {
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=743443&r1=743442&r2=743443&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 Wed Feb 11 18:33:47 2009
@@ -39,7 +39,6 @@
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableSortedSet;
-import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
import com.google.common.collect.Sets;
@@ -90,7 +89,7 @@
containerConfig = new JsonContainerConfig(config, new Expressions());
handler = new PersonHandler(personService, containerConfig);
- registry = new DefaultHandlerRegistry(null, Lists.newArrayList(handler), converter);
+ registry = new DefaultHandlerRegistry(null, Sets.newHashSet(handler), converter);
}
public void testHandleGetAllNoParams() throws Exception {