svn commit: r1086800 - in /shindig/trunk/java/gadgets/src: main/java/org/apache/shindig/gadgets/js/CajaJsSubtractingProcessor.java test/java/org/apache/shindig/gadgets/js/CajaJsSubtractingProcessorTest.java

[mh...@apache.org]

Author: mhermanto
Date: Tue Mar 29 23:15:52 2011
New Revision: 1086800

URL: http://svn.apache.org/viewvc?rev=1086800&view=rev
Log:
Filter-out to-be-marked-caja FeatureResource. Addressing John's (more) comments - use of UriCommon.PARAM.
http://codereview.appspot.com/4316046/.

Modified:
    shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/js/CajaJsSubtractingProcessor.java
    shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/js/CajaJsSubtractingProcessorTest.java

Modified: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/js/CajaJsSubtractingProcessor.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/js/CajaJsSubtractingProcessor.java?rev=1086800&r1=1086799&r2=1086800&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/js/CajaJsSubtractingProcessor.java (original)
+++ shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/js/CajaJsSubtractingProcessor.java Tue Mar 29 23:15:52 2011
@@ -7,6 +7,7 @@ import com.google.common.collect.Immutab
 
 import org.apache.shindig.gadgets.features.FeatureRegistry.FeatureBundle;
 import org.apache.shindig.gadgets.features.FeatureResource;
+import org.apache.shindig.gadgets.uri.UriCommon;
 
 import java.util.Map;
 
@@ -30,9 +31,6 @@ import java.util.Map;
 public class CajaJsSubtractingProcessor implements JsProcessor {
 
   @VisibleForTesting
-  static final String ATTRIB_KEY = "caja";
-
-  @VisibleForTesting
   static final String ATTRIB_VALUE = "1";
 
   public boolean process(JsRequest jsRequest, JsResponseBuilder builder) {
@@ -53,7 +51,7 @@ public class CajaJsSubtractingProcessor 
     if (resource != null) {
       Map<String, String> attribs = resource.getAttribs();
       if (attribs != null) {
-        String attrib = attribs.get(ATTRIB_KEY);
+        String attrib = attribs.get(UriCommon.Param.CAJOLE.getKey());
         return ATTRIB_VALUE.equals(attrib);
       }
     }

Modified: shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/js/CajaJsSubtractingProcessorTest.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/js/CajaJsSubtractingProcessorTest.java?rev=1086800&r1=1086799&r2=1086800&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/js/CajaJsSubtractingProcessorTest.java (original)
+++ shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/js/CajaJsSubtractingProcessorTest.java Tue Mar 29 23:15:52 2011
@@ -17,7 +17,6 @@
  */
 package org.apache.shindig.gadgets.js;
 
-import static org.apache.shindig.gadgets.js.CajaJsSubtractingProcessor.ATTRIB_KEY;
 import static org.apache.shindig.gadgets.js.CajaJsSubtractingProcessor.ATTRIB_VALUE;
 import static org.easymock.EasyMock.createControl;
 import static org.easymock.EasyMock.expect;
@@ -31,6 +30,7 @@ import com.google.common.collect.Lists;
 
 import org.apache.shindig.gadgets.features.FeatureResource;
 import org.apache.shindig.gadgets.uri.JsUriManager.JsUri;
+import org.apache.shindig.gadgets.uri.UriCommon;
 import org.easymock.IMocksControl;
 import org.junit.Before;
 import org.junit.Test;
@@ -43,7 +43,7 @@ public class CajaJsSubtractingProcessorT
   private static final List<String> ERRORS = ImmutableList.<String>of();
 
   private static final String NORMAL_CONTENT_JS = "normal";
-  private static final String CAJA_CONTENT_JS = "cajole";
+  private static final String CAJA_CONTENT_JS = "cajoled";
 
   private IMocksControl control;
   private List<JsContent> contents = Lists.newArrayList();
@@ -61,9 +61,9 @@ public class CajaJsSubtractingProcessorT
     contents.add(JsContent.fromFeature(NORMAL_CONTENT_JS, null, null,
         mockFeatureResource(null)));
     contents.add(JsContent.fromFeature(NORMAL_CONTENT_JS, null, null,
-        mockFeatureResource(ImmutableMap.of(ATTRIB_KEY, "blah"))));
+        mockFeatureResource(ImmutableMap.of(UriCommon.Param.CAJOLE.getKey(), "blah"))));
     contents.add(JsContent.fromFeature(CAJA_CONTENT_JS, null, "feature",
-        mockFeatureResource(ImmutableMap.of(ATTRIB_KEY, ATTRIB_VALUE))));
+        mockFeatureResource(ImmutableMap.of(UriCommon.Param.CAJOLE.getKey(), ATTRIB_VALUE))));
     
     response = new JsResponse(contents, -1, -1, false, ERRORS, null);
     builder = new JsResponseBuilder(response);