Author: mhermanto
Date: Tue Aug 2 00:00:44 2011
New Revision: 1152973
URL: http://svn.apache.org/viewvc?rev=1152973&view=rev
Log:
Rename: DeferredExportJsProcessor -> DeferJsProcessor.
No functional change.
Added:
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/js/DeferJsProcessor.java
- copied, changed from r1152887,
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/js/DeferredExportJsProcessor.java
shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/js/DeferJsProcessorTest.java
- copied, changed from r1152887,
shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/js/DeferredExportJsProcessorTest.java
Removed:
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/js/DeferredExportJsProcessor.java
shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/js/DeferredExportJsProcessorTest.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/DeferJsProcessor.java
(from r1152887,
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/js/DeferredExportJsProcessor.java)
URL:
http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/js/DeferJsProcessor.java?p2=shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/js/DeferJsProcessor.java&p1=shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/js/DeferredExportJsProcessor.java&r1=1152887&r2=1152973&rev=1152973&view=diff
==============================================================================
---
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/js/DeferredExportJsProcessor.java
(original)
+++
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/js/DeferJsProcessor.java
Tue Aug 2 00:00:44 2011
@@ -17,38 +17,22 @@
*/
package org.apache.shindig.gadgets.js;
-import com.google.common.annotations.VisibleForTesting;
-import com.google.common.base.Joiner;
import com.google.common.collect.ImmutableList;
-import com.google.common.collect.Lists;
-import com.google.common.collect.Maps;
import com.google.inject.Inject;
import com.google.inject.Provider;
import org.apache.shindig.gadgets.GadgetContext;
import org.apache.shindig.gadgets.GadgetException;
-import org.apache.shindig.gadgets.JsCompileMode;
-import org.apache.shindig.gadgets.features.ApiDirective;
import org.apache.shindig.gadgets.features.FeatureRegistry;
import org.apache.shindig.gadgets.features.FeatureRegistry.FeatureBundle;
import org.apache.shindig.gadgets.features.FeatureRegistry.LookupResult;
import org.apache.shindig.gadgets.features.FeatureRegistryProvider;
-import org.apache.shindig.gadgets.features.FeatureResource;
import org.apache.shindig.gadgets.uri.JsUriManager.JsUri;
-import java.util.Collection;
-import java.util.List;
-import java.util.Map;
-
-public class DeferredExportJsProcessor extends ExportJsProcessor {
-
- @VisibleForTesting
- static final String FEATURE_NAME = "exportjs";
-
- private static final String FUNCTION_NAME = "exportJs";
+public class DeferJsProcessor extends ExportJsProcessor {
@Inject
- public DeferredExportJsProcessor(FeatureRegistryProvider
featureRegistryProvider,
+ public DeferJsProcessor(FeatureRegistryProvider featureRegistryProvider,
Provider<GadgetContext> context) {
super(featureRegistryProvider, context);
}
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=1152973&r1=1152972&r2=1152973&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 Aug 2 00:00:44 2011
@@ -41,7 +41,7 @@ public class JsServingPipelineModule ext
@Named("shindig.js.optional-processors")
public List<JsProcessor> provideProcessors(
AddJslInfoVariableProcessor addJslInfoVariableProcessor,
- DeferredExportJsProcessor deferredExportJsProcessor,
+ DeferJsProcessor deferJsProcessor,
JsLoadProcessor jsLoaderGeneratorProcessor,
IfModifiedSinceProcessor ifModifiedSinceProcessor,
GetJsContentProcessor getJsContentProcessor,
@@ -54,7 +54,7 @@ public class JsServingPipelineModule ext
jsLoaderGeneratorProcessor.setUseAsync(true);
return ImmutableList.of(
addJslInfoVariableProcessor,
- deferredExportJsProcessor,
+ deferJsProcessor,
jsLoaderGeneratorProcessor,
ifModifiedSinceProcessor,
getJsContentProcessor,
Copied:
shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/js/DeferJsProcessorTest.java
(from r1152887,
shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/js/DeferredExportJsProcessorTest.java)
URL:
http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/js/DeferJsProcessorTest.java?p2=shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/js/DeferJsProcessorTest.java&p1=shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/js/DeferredExportJsProcessorTest.java&r1=1152887&r2=1152973&rev=1152973&view=diff
==============================================================================
---
shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/js/DeferredExportJsProcessorTest.java
(original)
+++
shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/js/DeferJsProcessorTest.java
Tue Aug 2 00:00:44 2011
@@ -45,8 +45,8 @@ import org.junit.Test;
import java.util.List;
-public class DeferredExportJsProcessorTest {
- private final String EXPORT_JS_DEB = "function exportJs() { };";
+public class DeferJsProcessorTest {
+ private final String DEFER_JS_DEB = "function deferJs() { };";
private final List<String> EXPORTS_1 = ImmutableList.of(
"gadgets",
@@ -67,14 +67,14 @@ public class DeferredExportJsProcessorTe
private final List<String> LIBS_WITHOUT_DEFER = Lists.newArrayList("lib2");
private final List<String> LOADED = Lists.newArrayList();
- private DeferredExportJsProcessor compiler;
+ private DeferJsProcessor compiler;
private FeatureRegistry featureRegistry;
@Before
public void setUp() throws Exception {
GadgetContext ctx = new GadgetContext();
Provider<GadgetContext> contextProviderMock = Providers.of(ctx);
- FeatureResource resource = mockResource(EXPORT_JS_DEB);
+ FeatureResource resource = mockResource(DEFER_JS_DEB);
FeatureRegistry.FeatureBundle bundle = mockExportJsBundle(resource);
LookupResult lookupMock = mockLookupResult(bundle);
final FeatureRegistry featureRegistryMock = mockRegistry(lookupMock);
@@ -84,7 +84,7 @@ public class DeferredExportJsProcessorTe
return featureRegistryMock;
}
};
- compiler = new DeferredExportJsProcessor(registryProvider,
contextProviderMock);
+ compiler = new DeferJsProcessor(registryProvider, contextProviderMock);
}
@Test
@@ -95,7 +95,7 @@ public class DeferredExportJsProcessorTe
boolean actualReturnCode = compiler.process(jsRequest, jsBuilder);
assertTrue(actualReturnCode);
assertEquals(
- EXPORT_JS_DEB + EXPORT_STRING_1_DEFER,
+ DEFER_JS_DEB + EXPORT_STRING_1_DEFER,
jsBuilder.build().toJsString());
}
