svn commit: r981720 - in /shindig/trunk/java/gadgets/src: main/java/org/apache/shindig/gadgets/uri/DefaultConcatUriManager.java test/java/org/apache/shindig/gadgets/uri/DefaultConcatUriManagerTest.java

[jo...@apache.org]

Author: johnh
Date: Tue Aug  3 02:01:16 2010
New Revision: 981720

URL: http://svn.apache.org/viewvc?rev=981720&view=rev
Log:
DefaultConcatUriManager updates: make splitToken optional, and support value "false" to mean "do not use split-JS".


Modified:
    shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/uri/DefaultConcatUriManager.java
    shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/uri/DefaultConcatUriManagerTest.java

Modified: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/uri/DefaultConcatUriManager.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/uri/DefaultConcatUriManager.java?rev=981720&r1=981719&r2=981720&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/uri/DefaultConcatUriManager.java (original)
+++ shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/uri/DefaultConcatUriManager.java Tue Aug  3 02:01:16 2010
@@ -111,16 +111,18 @@ public class DefaultConcatUriManager imp
     List<Uri> resourceUris = ctx.getBatch();
     Map<Uri, String> snippets = Maps.newHashMapWithExpectedSize(resourceUris.size());
     
-    String splitParam = getReqVal(ctx.getContainer(), CONCAT_JS_SPLIT_PARAM);
-    if (!isAdjacent) {
+    String splitParam = config.getString(ctx.getContainer(), CONCAT_JS_SPLIT_PARAM);
+    boolean doSplit = false;
+    if (!isAdjacent && splitParam != null && !"false".equalsIgnoreCase(splitParam)) {
       uriBuilder.addQueryParameter(Param.JSON.getKey(), splitParam);
+      doSplit = true;
     }
 
     Integer i = Integer.valueOf(START_INDEX);
     for (Uri resource : resourceUris) {
       uriBuilder.addQueryParameter(i.toString(), resource.toString());
       i++;
-      if (!isAdjacent) {
+      if (doSplit) {
         snippets.put(resource, getJsSnippet(splitParam, resource));
       }
     }

Modified: shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/uri/DefaultConcatUriManagerTest.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/uri/DefaultConcatUriManagerTest.java?rev=981720&r1=981719&r2=981720&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/uri/DefaultConcatUriManagerTest.java (original)
+++ shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/uri/DefaultConcatUriManagerTest.java Tue Aug  3 02:01:16 2010
@@ -186,12 +186,14 @@ public class DefaultConcatUriManagerTest
     manager.make(fromList(gadget, resourceUris, ConcatUriManager.Type.JS), false);
   }
   
-  @Test(expected = RuntimeException.class)
+  @Test
   public void typeJsMissingSplitTokenConfig() throws Exception {
     Gadget gadget = mockGadget(false, false);
     DefaultConcatUriManager manager = makeManager("host.com", "/foo", null, null);
     List<List<Uri>> resourceUris = ImmutableList.<List<Uri>>of(ImmutableList.of(RESOURCE_1));
-    manager.make(fromList(gadget, resourceUris, ConcatUriManager.Type.JS), false);
+    List<ConcatData> concatUris = manager.make(fromList(gadget, resourceUris, ConcatUriManager.Type.JS), false);
+    assertEquals(1, concatUris.size());
+    assertNull(concatUris.get(0).getUri().getQueryParameter(Param.JSON.getKey()));
   }
   
   @Test