svn commit: r908336 - in /shindig/trunk/java/gadgets/src: main/java/org/apache/shindig/gadgets/render/DefaultRpcServiceLookup.java test/java/org/apache/shindig/gadgets/render/DefaultRpcServiceLookupTest.java

[jo...@apache.org]

Author: johnh
Date: Wed Feb 10 03:11:47 2010
New Revision: 908336

URL: http://svn.apache.org/viewvc?rev=908336&view=rev
Log:
Instead of raising an exception handling bad request by defaulting to
empty list of services.

Patch provided by Ziv Horesh.


Modified:
    shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/render/DefaultRpcServiceLookup.java
    shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/render/DefaultRpcServiceLookupTest.java

Modified: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/render/DefaultRpcServiceLookup.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/render/DefaultRpcServiceLookup.java?rev=908336&r1=908335&r2=908336&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/render/DefaultRpcServiceLookup.java (original)
+++ shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/render/DefaultRpcServiceLookup.java Wed Feb 10 03:11:47 2010
@@ -65,9 +65,10 @@
    * @return Map of Services, by endpoint for the given container.
    */
   public Multimap<String, String> getServicesFor(String container, String host) {
-    Preconditions.checkNotNull(container);
-    Preconditions.checkArgument(container.length() != 0);
-    Preconditions.checkNotNull(host);
+    // Support empty container or host by providing empty services:
+    if (container == null || container.length() == 0 || host == null) {
+      return ImmutableMultimap.<String, String>builder().build();
+    }
 
     Multimap<String, String> foundServices = containerServices.get(container);
     if (foundServices == null) {

Modified: shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/render/DefaultRpcServiceLookupTest.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/render/DefaultRpcServiceLookupTest.java?rev=908336&r1=908335&r2=908336&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/render/DefaultRpcServiceLookupTest.java (original)
+++ shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/render/DefaultRpcServiceLookupTest.java Wed Feb 10 03:11:47 2010
@@ -51,11 +51,11 @@
     assertEquals(0, services.size());
   }
 
-  @Test(expected=Exception.class)
+  @Test
   public void testGetServicesForContainer_Null() throws Exception {
     String container = null;
-    svcLookup.getServicesFor(container, host);
-    fail("Should have thrown an exception for an invalid container");
+    Multimap<String, String> services = svcLookup.getServicesFor(container, host);
+    assertEquals(0, services.size());
   }
 
   @Test