Author: mhermanto Date: Tue Mar 29 21:56:06 2011 New Revision: 1086768 URL: http://svn.apache.org/viewvc?rev=1086768&view=rev Log: Follow up CL to "filter-out to-be-marked-cajole FeatureBundle." Addressing further comments -- rename Cajole to Caja.
http://codereview.appspot.com/4316046/. Added: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/js/CajaJsSubtractingProcessor.java - copied, changed from r1086766, shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/js/CajoleJsSubtractingProcessor.java shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/js/CajaJsSubtractingProcessorTest.java - copied, changed from r1086766, shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/js/CajoleJsSubtractingProcessorTest.java Removed: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/js/CajoleJsSubtractingProcessor.java shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/js/CajoleJsSubtractingProcessorTest.java Modified: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/js/JsServingPipelineModule.java Copied: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/js/CajaJsSubtractingProcessor.java (from r1086766, shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/js/CajoleJsSubtractingProcessor.java) URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/js/CajaJsSubtractingProcessor.java?p2=shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/js/CajaJsSubtractingProcessor.java&p1=shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/js/CajoleJsSubtractingProcessor.java&r1=1086766&r2=1086768&rev=1086768&view=diff ============================================================================== --- shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/js/CajoleJsSubtractingProcessor.java (original) +++ shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/js/CajaJsSubtractingProcessor.java Tue Mar 29 21:56:06 2011 @@ -27,13 +27,13 @@ import java.util.Map; * KIND, either express or implied. See the License for the * specific language governing permissions and limitations under the License. */ -public class CajoleJsSubtractingProcessor implements JsProcessor { +public class CajaJsSubtractingProcessor implements JsProcessor { @VisibleForTesting - static final String CAJOLE_ATTRIB_KEY = "cajole"; + static final String ATTRIB_KEY = "caja"; @VisibleForTesting - static final String CAJOLE_ATTRIB_VALUE = "1"; + static final String ATTRIB_VALUE = "1"; public boolean process(JsRequest jsRequest, JsResponseBuilder builder) { if (!jsRequest.getJsUri().cajoleContent()) { @@ -53,8 +53,8 @@ public class CajoleJsSubtractingProcesso if (resource != null) { Map<String, String> attribs = resource.getAttribs(); if (attribs != null) { - String attrib = attribs.get(CAJOLE_ATTRIB_KEY); - return CAJOLE_ATTRIB_VALUE.equals(attrib); + String attrib = attribs.get(ATTRIB_KEY); + return ATTRIB_VALUE.equals(attrib); } } return false; Modified: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/js/JsServingPipelineModule.java URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/js/JsServingPipelineModule.java?rev=1086768&r1=1086767&r2=1086768&view=diff ============================================================================== --- shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/js/JsServingPipelineModule.java (original) +++ shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/js/JsServingPipelineModule.java Tue Mar 29 21:56:06 2011 @@ -34,7 +34,7 @@ public class JsServingPipelineModule ext protected void configure() { // nothing to configure here } - + @Provides @Inject public List<JsProcessor> provideProcessors( @@ -42,14 +42,22 @@ public class JsServingPipelineModule ext JsLoadProcessor jsLoaderGeneratorProcessor, IfModifiedSinceProcessor ifModifiedSinceProcessor, GetJsContentProcessor getJsContentProcessor, + CajaJsSubtractingProcessor cajaJsSubtractingProcessor, ConfigInjectionProcessor configInjectionProcessor, AddOnloadFunctionProcessor addOnloadFunctionProcessor, AddJsLoadCallbackProcessor addJsLoadCallbackProcessor, CompilationProcessor compilationProcessor, AnonFuncWrappingProcessor anonFuncProcessor) { - return ImmutableList.of(injectJsInfoVariableProcessor, jsLoaderGeneratorProcessor, - ifModifiedSinceProcessor, getJsContentProcessor, configInjectionProcessor, - addOnloadFunctionProcessor, addJsLoadCallbackProcessor, compilationProcessor, + return ImmutableList.of( + injectJsInfoVariableProcessor, + jsLoaderGeneratorProcessor, + ifModifiedSinceProcessor, + getJsContentProcessor, + cajaJsSubtractingProcessor, + configInjectionProcessor, + addOnloadFunctionProcessor, + addJsLoadCallbackProcessor, + compilationProcessor, anonFuncProcessor); } Copied: shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/js/CajaJsSubtractingProcessorTest.java (from r1086766, shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/js/CajoleJsSubtractingProcessorTest.java) URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/js/CajaJsSubtractingProcessorTest.java?p2=shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/js/CajaJsSubtractingProcessorTest.java&p1=shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/js/CajoleJsSubtractingProcessorTest.java&r1=1086766&r2=1086768&rev=1086768&view=diff ============================================================================== --- shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/js/CajoleJsSubtractingProcessorTest.java (original) +++ shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/js/CajaJsSubtractingProcessorTest.java Tue Mar 29 21:56:06 2011 @@ -17,8 +17,8 @@ */ package org.apache.shindig.gadgets.js; -import static org.apache.shindig.gadgets.js.CajoleJsSubtractingProcessor.CAJOLE_ATTRIB_KEY; -import static org.apache.shindig.gadgets.js.CajoleJsSubtractingProcessor.CAJOLE_ATTRIB_VALUE; +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; import static org.junit.Assert.assertEquals; @@ -29,7 +29,6 @@ import com.google.common.collect.Immutab import com.google.common.collect.ImmutableMap; import com.google.common.collect.Lists; -import org.apache.shindig.gadgets.features.FeatureRegistry.FeatureBundle; import org.apache.shindig.gadgets.features.FeatureResource; import org.apache.shindig.gadgets.uri.JsUriManager.JsUri; import org.easymock.IMocksControl; @@ -39,19 +38,19 @@ import org.junit.Test; import java.util.List; import java.util.Map; -public class CajoleJsSubtractingProcessorTest { +public class CajaJsSubtractingProcessorTest { private static final List<String> ERRORS = ImmutableList.<String>of(); private static final String NORMAL_CONTENT_JS = "normal"; - private static final String CAJOLE_CONTENT_JS = "cajole"; + private static final String CAJA_CONTENT_JS = "cajole"; private IMocksControl control; private List<JsContent> contents = Lists.newArrayList(); private JsResponse response; private JsResponseBuilder builder; - private CajoleJsSubtractingProcessor processor; + private CajaJsSubtractingProcessor processor; @Before public void setUp() { @@ -62,14 +61,14 @@ public class CajoleJsSubtractingProcesso contents.add(JsContent.fromFeature(NORMAL_CONTENT_JS, null, null, mockFeatureResource(null))); contents.add(JsContent.fromFeature(NORMAL_CONTENT_JS, null, null, - mockFeatureResource(ImmutableMap.of(CAJOLE_ATTRIB_KEY, "blah")))); - contents.add(JsContent.fromFeature(CAJOLE_CONTENT_JS, null, "feature", - mockFeatureResource(ImmutableMap.of(CAJOLE_ATTRIB_KEY, CAJOLE_ATTRIB_VALUE)))); + mockFeatureResource(ImmutableMap.of(ATTRIB_KEY, "blah")))); + contents.add(JsContent.fromFeature(CAJA_CONTENT_JS, null, "feature", + mockFeatureResource(ImmutableMap.of(ATTRIB_KEY, ATTRIB_VALUE)))); response = new JsResponse(contents, -1, -1, false, ERRORS, null); builder = new JsResponseBuilder(response); - processor = new CajoleJsSubtractingProcessor(); + processor = new CajaJsSubtractingProcessor(); } @Test @@ -98,7 +97,7 @@ public class CajoleJsSubtractingProcesso control.verify(); assertTrue(actualReturn); - assertEquals(Strings.repeat(NORMAL_CONTENT_JS, 3) + CAJOLE_CONTENT_JS, + assertEquals(Strings.repeat(NORMAL_CONTENT_JS, 3) + CAJA_CONTENT_JS, actualResponse.toJsString()); }
