You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@shindig.apache.org by ga...@apache.org on 2010/11/27 22:12:10 UTC
svn commit: r1039761 - in /shindig/trunk/java/gadgets/src:
main/java/org/apache/shindig/gadgets/rewrite/
test/java/org/apache/shindig/gadgets/render/
test/java/org/apache/shindig/gadgets/rewrite/
Author: gagan
Date: Sat Nov 27 21:12:09 2010
New Revision: 1039761
URL: http://svn.apache.org/viewvc?rev=1039761&view=rev
Log:
Patch by gagan.goku | Issue 3213042: Injecting Provider<DefaultConfig> allowing it to be overridden | http://codereview.appspot.com/3213042/
Modified:
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/ContentRewriterFeature.java
shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/render/SanitizingGadgetRewriterTest.java
shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/render/SanitizingResponseRewriterTest.java
shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/BaseRewriterTestCase.java
shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/RewriterTestBase.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=1039761&r1=1039760&r2=1039761&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 Sat Nov 27 21:12:09 2010
@@ -22,6 +22,7 @@ import com.google.common.collect.Immutab
import com.google.common.collect.Lists;
import com.google.common.collect.Sets;
import com.google.inject.Inject;
+import com.google.inject.Provider;
import com.google.inject.Singleton;
import com.google.inject.name.Named;
@@ -68,16 +69,16 @@ public class ContentRewriterFeature {
@Singleton
public static class Factory {
private final GadgetSpecFactory specFactory;
- private final Config defaultConfig;
+ private final Provider<DefaultConfig> defaultConfig;
@Inject
- public Factory(GadgetSpecFactory specFactory, DefaultConfig defaultConfig) {
+ public Factory(GadgetSpecFactory specFactory, Provider<DefaultConfig> defaultConfig) {
this.specFactory = specFactory;
this.defaultConfig = defaultConfig;
}
public Config getDefault() {
- return defaultConfig;
+ return defaultConfig.get();
}
public Config get(HttpRequest request) {
@@ -103,14 +104,14 @@ public class ContentRewriterFeature {
// Falls through to default.
}
}
- return defaultConfig;
+ return defaultConfig.get();
}
public Config get(GadgetSpec spec) {
Config rewriterFeature =
(Config)spec.getAttribute("content-rewriter");
if (rewriterFeature != null) return rewriterFeature;
- rewriterFeature = new Config(spec, defaultConfig);
+ rewriterFeature = new Config(spec, defaultConfig.get());
spec.setAttribute("content-rewriter", rewriterFeature);
return rewriterFeature;
}
Modified: shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/render/SanitizingGadgetRewriterTest.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/render/SanitizingGadgetRewriterTest.java?rev=1039761&r1=1039760&r2=1039761&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/render/SanitizingGadgetRewriterTest.java (original)
+++ shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/render/SanitizingGadgetRewriterTest.java Sat Nov 27 21:12:09 2010
@@ -18,6 +18,7 @@
*/
package org.apache.shindig.gadgets.render;
+import com.google.inject.util.Providers;
import org.apache.shindig.common.uri.Uri;
import org.apache.shindig.gadgets.Gadget;
import org.apache.shindig.gadgets.GadgetContext;
@@ -120,8 +121,8 @@ public class SanitizingGadgetRewriterTes
newTags.addAll(DEFAULT_TAGS);
ContentRewriterFeature.Factory rewriterFeatureFactory =
new ContentRewriterFeature.Factory(null,
- new ContentRewriterFeature.DefaultConfig(
- ".*", "", "HTTP", "embed,img,script,link,style", false, false, false));
+ Providers.of(new ContentRewriterFeature.DefaultConfig(
+ ".*", "", "HTTP", "embed,img,script,link,style", false, false, false)));
return new SanitizingGadgetRewriter(newTags, attributes, rewriterFeatureFactory,
new CajaCssSanitizer(new CajaCssParser()), new PassthruManager("host.com", "/proxy"));
}
Modified: shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/render/SanitizingResponseRewriterTest.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/render/SanitizingResponseRewriterTest.java?rev=1039761&r1=1039760&r2=1039761&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/render/SanitizingResponseRewriterTest.java (original)
+++ shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/render/SanitizingResponseRewriterTest.java Sat Nov 27 21:12:09 2010
@@ -21,6 +21,7 @@ package org.apache.shindig.gadgets.rende
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNull;
+import com.google.inject.util.Providers;
import org.apache.commons.io.IOUtils;
import org.apache.shindig.common.uri.Uri;
import org.apache.shindig.gadgets.http.HttpRequest;
@@ -59,8 +60,8 @@ public class SanitizingResponseRewriterT
private ResponseRewriter createRewriter(Set<String> tags, Set<String> attributes) {
ContentRewriterFeature.Factory rewriterFeatureFactory =
new ContentRewriterFeature.Factory(null,
- new ContentRewriterFeature.DefaultConfig(
- ".*", "", "HTTP", "embed,img,script,link,style", false, false, false));
+ Providers.of(new ContentRewriterFeature.DefaultConfig(
+ ".*", "", "HTTP", "embed,img,script,link,style", false, false, false)));
return new SanitizingResponseRewriter(rewriterFeatureFactory,
new CajaCssSanitizer(new CajaCssParser()), new PassthruManager(PROXY_HOST, PROXY_PATH));
}
Modified: shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/BaseRewriterTestCase.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/BaseRewriterTestCase.java?rev=1039761&r1=1039760&r2=1039761&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/BaseRewriterTestCase.java (original)
+++ shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/BaseRewriterTestCase.java Sat Nov 27 21:12:09 2010
@@ -17,6 +17,7 @@
*/
package org.apache.shindig.gadgets.rewrite;
+import com.google.inject.util.Providers;
import org.apache.shindig.common.PropertiesModule;
import org.apache.shindig.common.uri.Uri;
import org.apache.shindig.gadgets.Gadget;
@@ -74,7 +75,7 @@ public abstract class BaseRewriterTestCa
@Before
public void setUp() throws Exception {
rewriterFeatureFactory = new ContentRewriterFeature.Factory(null,
- new ContentRewriterFeature.DefaultConfig(".*", "", "86400", "embed,img,script,link,style", false, false, false));
+ Providers.of(new ContentRewriterFeature.DefaultConfig(".*", "", "86400", "embed,img,script,link,style", false, false, false)));
defaultRewriterFeature = rewriterFeatureFactory.getDefault();
tags = defaultRewriterFeature.getIncludedTags();
injector = Guice.createInjector(getParseModule(), new PropertiesModule(), new TestModule());
@@ -221,7 +222,7 @@ public abstract class BaseRewriterTestCa
private final ContentRewriterFeature.Config feature;
public FakeRewriterFeatureFactory(ContentRewriterFeature.Config feature) {
- super(null, new ContentRewriterFeature.DefaultConfig(".*", "", "HTTP", "", false, false, false));
+ super(null, Providers.of(new ContentRewriterFeature.DefaultConfig(".*", "", "HTTP", "", false, false, false)));
this.feature = feature;
}
Modified: shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/RewriterTestBase.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/RewriterTestBase.java?rev=1039761&r1=1039760&r2=1039761&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/RewriterTestBase.java (original)
+++ shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/RewriterTestBase.java Sat Nov 27 21:12:09 2010
@@ -17,6 +17,7 @@
*/
package org.apache.shindig.gadgets.rewrite;
+import com.google.inject.util.Providers;
import org.apache.shindig.common.PropertiesModule;
import org.apache.shindig.common.uri.Uri;
import org.apache.shindig.gadgets.Gadget;
@@ -71,7 +72,7 @@ public abstract class RewriterTestBase {
@Before
public void setUp() throws Exception {
rewriterFeatureFactory = new ContentRewriterFeature.Factory(null,
- new ContentRewriterFeature.DefaultConfig(".*", "", "86400", TAGS, false, false, false));
+ Providers.of(new ContentRewriterFeature.DefaultConfig(".*", "", "86400", TAGS, false, false, false)));
defaultRewriterFeature = rewriterFeatureFactory.getDefault();
tags = defaultRewriterFeature.getIncludedTags();
injector = Guice.createInjector(getParseModule(), new PropertiesModule(), new TestModule());