Author: hsaputra
Date: Fri Nov 11 01:33:31 2011
New Revision: 1200685
URL: http://svn.apache.org/viewvc?rev=1200685&view=rev
Log:
Simplify the ContentRewriterFeature.Factory to reduce number of public methods
to get Config object. CR: https://reviews.apache.org/r/2798
Modified:
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/ContentRewriterFeature.java
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/ImageResizeRewriter.java
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/ProxyingContentRewriter.java
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/ScriptConcatContentRewriter.java
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/StyleConcatContentRewriter.java
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/StyleTagExtractorContentRewriter.java
shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/ImageResizeRewriterTest.java
Modified:
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/ContentRewriterFeature.java
URL:
http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/ContentRewriterFeature.java?rev=1200685&r1=1200684&r2=1200685&view=diff
==============================================================================
---
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/ContentRewriterFeature.java
(original)
+++
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/ContentRewriterFeature.java
Fri Nov 11 01:33:31 2011
@@ -83,17 +83,20 @@ public class ContentRewriterFeature {
}
public Config get(HttpRequest request) {
- return get(request.getGadget());
- }
-
- public Config get(final Uri gadgetUri) {
GadgetSpec spec;
- if (gadgetUri != null) {
+ final Uri gadgetUrl = request.getGadget();
+ final boolean isIgnoreCache = request.getIgnoreCache();
+ if (gadgetUrl != null) {
try {
GadgetContext context = new GadgetContext() {
@Override
public Uri getUrl() {
- return gadgetUri;
+ return gadgetUrl;
+ }
+
+ @Override
+ public boolean getIgnoreCache() {
+ return isIgnoreCache;
}
};
Modified:
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/ImageResizeRewriter.java
URL:
http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/ImageResizeRewriter.java?rev=1200685&r1=1200684&r2=1200685&view=diff
==============================================================================
---
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/ImageResizeRewriter.java
(original)
+++
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/ImageResizeRewriter.java
Fri Nov 11 01:33:31 2011
@@ -54,7 +54,7 @@ public class ImageResizeRewriter extends
@Override
protected List<DomWalker.Visitor> makeVisitors(Gadget context, Uri
gadgetUri) {
- ContentRewriterFeature.Config config = featureConfigFactory.get(gadgetUri);
+ ContentRewriterFeature.Config config =
featureConfigFactory.get(context.getSpec());
return Arrays.<DomWalker.Visitor>asList(new
ImageResizeVisitor(proxyUriManager, config));
}
Modified:
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/ProxyingContentRewriter.java
URL:
http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/ProxyingContentRewriter.java?rev=1200685&r1=1200684&r2=1200685&view=diff
==============================================================================
---
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/ProxyingContentRewriter.java
(original)
+++
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/ProxyingContentRewriter.java
Fri Nov 11 01:33:31 2011
@@ -48,7 +48,7 @@ public class ProxyingContentRewriter ext
@Override
protected List<Visitor> makeVisitors(Gadget context, Uri gadgetUri) {
- ContentRewriterFeature.Config config = featureConfigFactory.get(gadgetUri);
+ ContentRewriterFeature.Config config =
featureConfigFactory.get(context.getSpec());
// Note that concat is including with proxy in order to prevent
// proxying the rewritten concat url
// Basically Url rewritters should all be in one dom walker.
Modified:
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/ScriptConcatContentRewriter.java
URL:
http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/ScriptConcatContentRewriter.java?rev=1200685&r1=1200684&r2=1200685&view=diff
==============================================================================
---
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/ScriptConcatContentRewriter.java
(original)
+++
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/ScriptConcatContentRewriter.java
Fri Nov 11 01:33:31 2011
@@ -60,7 +60,7 @@ public class ScriptConcatContentRewriter
@Override
protected List<Visitor> makeVisitors(Gadget context, Uri gadgetUri) {
- ContentRewriterFeature.Config config = featureConfigFactory.get(gadgetUri);
+ ContentRewriterFeature.Config config =
featureConfigFactory.get(context.getSpec());
return Arrays.asList(
new CacheEnforcementVisitor(config, executor, cache, requestPipeline,
CacheEnforcementVisitor.Tags.SCRIPT),
Modified:
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/StyleConcatContentRewriter.java
URL:
http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/StyleConcatContentRewriter.java?rev=1200685&r1=1200684&r2=1200685&view=diff
==============================================================================
---
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/StyleConcatContentRewriter.java
(original)
+++
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/StyleConcatContentRewriter.java
Fri Nov 11 01:33:31 2011
@@ -59,7 +59,7 @@ public class StyleConcatContentRewriter
@Override
protected List<Visitor> makeVisitors(Gadget context, Uri gadgetUri) {
- ContentRewriterFeature.Config config = featureConfigFactory.get(gadgetUri);
+ ContentRewriterFeature.Config config =
featureConfigFactory.get(context.getSpec());
return Arrays.asList(
new CacheEnforcementVisitor(config, executor, cache, requestPipeline,
CacheEnforcementVisitor.Tags.STYLESHEET),
Modified:
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/StyleTagExtractorContentRewriter.java
URL:
http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/StyleTagExtractorContentRewriter.java?rev=1200685&r1=1200684&r2=1200685&view=diff
==============================================================================
---
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/StyleTagExtractorContentRewriter.java
(original)
+++
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/StyleTagExtractorContentRewriter.java
Fri Nov 11 01:33:31 2011
@@ -48,7 +48,7 @@ public class StyleTagExtractorContentRew
@Override
protected List<Visitor> makeVisitors(Gadget context, Uri gadgetUri) {
- ContentRewriterFeature.Config config = featureConfigFactory.get(gadgetUri);
+ ContentRewriterFeature.Config config =
featureConfigFactory.get(context.getSpec());
return Arrays.<Visitor>asList(
new StyleTagExtractorVisitor(config, cssRewriter, proxyUriManager));
}
Modified:
shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/ImageResizeRewriterTest.java
URL:
http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/ImageResizeRewriterTest.java?rev=1200685&r1=1200684&r2=1200685&view=diff
==============================================================================
---
shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/ImageResizeRewriterTest.java
(original)
+++
shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/ImageResizeRewriterTest.java
Fri Nov 11 01:33:31 2011
@@ -18,6 +18,7 @@
package org.apache.shindig.gadgets.rewrite;
+import org.apache.shindig.gadgets.spec.GadgetSpec;
import org.junit.Test;
import org.junit.Before;
import static org.junit.Assert.assertEquals;
@@ -57,7 +58,8 @@ public class ImageResizeRewriterTest {
rewriter = new ImageResizeRewriter(proxyUriManager, factory);
domImpl = new ParseModule.DOMImplementationProvider();
parser = new CajaHtmlParser(domImpl.get());
-
EasyMock.expect(factory.get(EasyMock.isA(Uri.class))).andReturn(featureConfig).anyTimes();
+
EasyMock.expect(factory.get(EasyMock.isA(HttpRequest.class))).andReturn(featureConfig).anyTimes();
+
EasyMock.expect(factory.get(EasyMock.isA(GadgetSpec.class))).andReturn(featureConfig).anyTimes();
EasyMock.expect(config.getString(CONTAINER,
DefaultProxyUriManager.PROXY_HOST_PARAM))
.andReturn("shindig.com").anyTimes();
EasyMock.expect(config.getString(CONTAINER,
DefaultProxyUriManager.PROXY_PATH_PARAM))
