You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@shindig.apache.org by li...@apache.org on 2010/06/22 22:48:26 UTC
svn commit: r957026 - in /shindig/trunk/java/gadgets/src:
main/java/org/apache/shindig/gadgets/rewrite/
main/java/org/apache/shindig/gadgets/uri/
test/java/org/apache/shindig/gadgets/render/
test/java/org/apache/shindig/gadgets/render/old/ test/java/or...
Author: lindner
Date: Tue Jun 22 20:48:26 2010
New Revision: 957026
URL: http://svn.apache.org/viewvc?rev=957026&view=rev
Log:
use guice typeconverters to simplify calling conventions
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/uri/DefaultConcatUriManager.java
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/uri/DefaultProxyUriManager.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/render/old/SanitizingGadgetRewriterTest.java
shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/render/old/SanitizingRequestRewriterTest.java
shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/ConcatVisitorTest.java
shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/ContentRewriterFeatureTestCase.java
shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/ContentRewriterFeatureTestCaseOS9.java
shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/RewriterTestBase.java
shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/old/BaseRewriterTestCase.java
shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/old/ProxyingLinkRewriterTest.java
shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/uri/DefaultConcatUriManagerTest.java
shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/uri/DefaultProxyUriManagerTest.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=957026&r1=957025&r2=957026&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 Tue Jun 22 20:48:26 2010
@@ -133,10 +133,9 @@ public class ContentRewriterFeature {
@Named("shindig.content-rewrite.exclude-urls")String excludeUrls,
@Named("shindig.content-rewrite.expires")String expires,
@Named("shindig.content-rewrite.include-tags")String includeTags,
- @Named("shindig.content-rewrite.only-allow-excludes")String onlyAllowExcludes,
- @Named("shindig.content-rewrite.enable-split-js-concat")String enableSplitJsConcat) {
- super(includeUrls, excludeUrls, expires, includeTags,
- Boolean.parseBoolean(onlyAllowExcludes), Boolean.parseBoolean(enableSplitJsConcat));
+ @Named("shindig.content-rewrite.only-allow-excludes")boolean onlyAllowExcludes,
+ @Named("shindig.content-rewrite.enable-split-js-concat")boolean enableSplitJsConcat) {
+ super(includeUrls, excludeUrls, expires, includeTags, onlyAllowExcludes, enableSplitJsConcat);
}
}
Modified: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/uri/DefaultConcatUriManager.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/uri/DefaultConcatUriManager.java?rev=957026&r1=957025&r2=957026&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/uri/DefaultConcatUriManager.java (original)
+++ shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/uri/DefaultConcatUriManager.java Tue Jun 22 20:48:26 2010
@@ -56,8 +56,8 @@ public class DefaultConcatUriManager imp
@Inject(optional = true)
public void setUseStrictParsing(
- @Named("shindig.uri.concat.use-strict-parsing") String useStrict) {
- this.strictParsing = Boolean.parseBoolean(useStrict);
+ @Named("shindig.uri.concat.use-strict-parsing") boolean useStrict) {
+ this.strictParsing = useStrict;
}
public List<ConcatData> make(List<ConcatUri> resourceUris,
Modified: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/uri/DefaultProxyUriManager.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/uri/DefaultProxyUriManager.java?rev=957026&r1=957025&r2=957026&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/uri/DefaultProxyUriManager.java (original)
+++ shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/uri/DefaultProxyUriManager.java Tue Jun 22 20:48:26 2010
@@ -75,8 +75,8 @@ public class DefaultProxyUriManager impl
}
@Inject(optional = true)
- public void setUseStrictParsing(@Named("shindig.uri.proxy.use-strict-parsing") String useStrict) {
- this.strictParsing = Boolean.parseBoolean(useStrict);
+ public void setUseStrictParsing(@Named("shindig.uri.proxy.use-strict-parsing") boolean useStrict) {
+ this.strictParsing = useStrict;
}
public List<Uri> make(List<ProxyUri> resources, Integer forcedRefresh) {
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=957026&r1=957025&r2=957026&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 Tue Jun 22 20:48:26 2010
@@ -121,7 +121,7 @@ public class SanitizingGadgetRewriterTes
ContentRewriterFeature.Factory rewriterFeatureFactory =
new ContentRewriterFeature.Factory(null,
new ContentRewriterFeature.DefaultConfig(
- ".*", "", "HTTP", "embed,img,script,link,style", "false", "false"));
+ ".*", "", "HTTP", "embed,img,script,link,style", 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=957026&r1=957025&r2=957026&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 Tue Jun 22 20:48:26 2010
@@ -57,7 +57,7 @@ public class SanitizingResponseRewriterT
ContentRewriterFeature.Factory rewriterFeatureFactory =
new ContentRewriterFeature.Factory(null,
new ContentRewriterFeature.DefaultConfig(
- ".*", "", "HTTP", "embed,img,script,link,style", "false", "false"));
+ ".*", "", "HTTP", "embed,img,script,link,style", false, false));
return new SanitizingResponseRewriter(rewriterFeatureFactory,
new CajaCssSanitizer(new CajaCssParser()), new PassthruManager());
}
Modified: shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/render/old/SanitizingGadgetRewriterTest.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/render/old/SanitizingGadgetRewriterTest.java?rev=957026&r1=957025&r2=957026&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/render/old/SanitizingGadgetRewriterTest.java (original)
+++ shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/render/old/SanitizingGadgetRewriterTest.java Tue Jun 22 20:48:26 2010
@@ -120,7 +120,7 @@ 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"));
+ new ContentRewriterFeature.DefaultConfig(".*", "", "HTTP", "embed,img,script,link,style", false, false));
return new SanitizingGadgetRewriter(newTags, attributes, rewriterFeatureFactory,
new CajaCssSanitizer(new CajaCssParser()), new DefaultSanitizingProxyingLinkRewriterFactory(rewriterUris));
}
Modified: shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/render/old/SanitizingRequestRewriterTest.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/render/old/SanitizingRequestRewriterTest.java?rev=957026&r1=957025&r2=957026&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/render/old/SanitizingRequestRewriterTest.java (original)
+++ shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/render/old/SanitizingRequestRewriterTest.java Tue Jun 22 20:48:26 2010
@@ -57,7 +57,7 @@ public class SanitizingRequestRewriterTe
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"));
+ new ContentRewriterFeature.DefaultConfig(".*", "", "HTTP", "embed,img,script,link,style", false, false));
return new SanitizingRequestRewriter(rewriterFeatureFactory,
new CajaCssSanitizer(new CajaCssParser()), new DefaultSanitizingProxyingLinkRewriterFactory(rewriterUris));
}
Modified: shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/ConcatVisitorTest.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/ConcatVisitorTest.java?rev=957026&r1=957025&r2=957026&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/ConcatVisitorTest.java (original)
+++ shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/ConcatVisitorTest.java Tue Jun 22 20:48:26 2010
@@ -511,7 +511,7 @@ public class ConcatVisitorTest extends D
private ContentRewriterFeature.Config config(String exclude, boolean splitJs) {
return new ContentRewriterFeature.DefaultConfig(".*", exclude == null ? "" : exclude,
- "0", "", "false", splitJs ? "true" : "false");
+ "0", "", false, splitJs);
}
private List<Node> seqNodes(Node... nodes) {
Modified: shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/ContentRewriterFeatureTestCase.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/ContentRewriterFeatureTestCase.java?rev=957026&r1=957025&r2=957026&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/ContentRewriterFeatureTestCase.java (original)
+++ shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/ContentRewriterFeatureTestCase.java Tue Jun 22 20:48:26 2010
@@ -33,8 +33,7 @@ public class ContentRewriterFeatureTestC
public void testContainerDefaultIncludeAll() throws Exception {
defaultRewriterFeature =
new ContentRewriterFeature.Config(createSpecWithoutRewrite(),
- new ContentRewriterFeature.DefaultConfig(
- ".*", "", "0", TAGS, "false", "false"));
+ new ContentRewriterFeature.DefaultConfig(".*", "", "0", TAGS, false, false));
assertTrue(defaultRewriterFeature.isRewriteEnabled());
assertTrue(defaultRewriterFeature.shouldRewriteURL("http://www.test.com"));
}
@@ -43,8 +42,7 @@ public class ContentRewriterFeatureTestC
public void testContainerDefaultIncludeNone() throws Exception {
defaultRewriterFeature =
new ContentRewriterFeature.Config(createSpecWithoutRewrite(),
- new ContentRewriterFeature.DefaultConfig(
- "", ".*", "0", TAGS, "false", "false"));
+ new ContentRewriterFeature.DefaultConfig("", ".*", "0", TAGS, false, false));
assertFalse(defaultRewriterFeature.isRewriteEnabled());
assertFalse(defaultRewriterFeature.shouldRewriteURL("http://www.test.com"));
}
@@ -52,8 +50,7 @@ public class ContentRewriterFeatureTestC
@Test
public void testContainerDefaultExcludeOverridesInclude() throws Exception {
defaultRewriterFeature = new ContentRewriterFeature.Config(createSpecWithoutRewrite(),
- new ContentRewriterFeature.DefaultConfig(
- ".*", ".*", "0", TAGS, "false", "false"));
+ new ContentRewriterFeature.DefaultConfig(".*", ".*", "0", TAGS, false, false));
assertFalse(defaultRewriterFeature.isRewriteEnabled());
assertFalse(defaultRewriterFeature.shouldRewriteURL("http://www.test.com"));
}
@@ -62,8 +59,7 @@ public class ContentRewriterFeatureTestC
public void testSpecExcludeOverridesContainerDefaultInclude() throws Exception {
defaultRewriterFeature = new ContentRewriterFeature.Config(
createSpecWithRewrite("", ".*", "0", tags),
- new ContentRewriterFeature.DefaultConfig(
- ".*", "", "0", TAGS, "false", "false"));
+ new ContentRewriterFeature.DefaultConfig(".*", "", "0", TAGS, false, false));
assertFalse(defaultRewriterFeature.isRewriteEnabled());
assertFalse(defaultRewriterFeature.shouldRewriteURL("http://www.test.com"));
}
@@ -72,8 +68,7 @@ public class ContentRewriterFeatureTestC
public void testSpecExcludeOnlyOverridesContainerDefaultInclude() throws Exception {
defaultRewriterFeature = new ContentRewriterFeature.Config(
createSpecWithRewrite(null, ".*", null, null),
- new ContentRewriterFeature.DefaultConfig(
- ".*", "", "0", TAGS, "false", "false"));
+ new ContentRewriterFeature.DefaultConfig(".*", "", "0", TAGS, false, false));
assertFalse(defaultRewriterFeature.isRewriteEnabled());
assertFalse(defaultRewriterFeature.shouldRewriteURL("http://www.test.com"));
}
@@ -82,8 +77,7 @@ public class ContentRewriterFeatureTestC
public void testSpecExcludeOverridesContainerDefaultExclude() throws Exception {
defaultRewriterFeature = new ContentRewriterFeature.Config(
createSpecWithRewrite(".*", "", "0", tags),
- new ContentRewriterFeature.DefaultConfig(
- "", ".*", "0", TAGS, "false", "false"));
+ new ContentRewriterFeature.DefaultConfig("", ".*", "0", TAGS, false, false));
assertTrue(defaultRewriterFeature.isRewriteEnabled());
assertTrue(defaultRewriterFeature.shouldRewriteURL("http://www.test.com"));
}
@@ -92,7 +86,7 @@ public class ContentRewriterFeatureTestC
public void testExcludeOverridesInclude() throws Exception {
defaultRewriterFeature = new ContentRewriterFeature.Config(
createSpecWithRewrite("test\\.com", "test", "0", tags),
- new ContentRewriterFeature.DefaultConfig("", "", "0", TAGS, "false", "false"));
+ new ContentRewriterFeature.DefaultConfig("", "", "0", TAGS, false, false));
assertTrue(defaultRewriterFeature.isRewriteEnabled());
assertFalse(defaultRewriterFeature.shouldRewriteURL("http://www.test.com"));
}
@@ -101,7 +95,7 @@ public class ContentRewriterFeatureTestC
public void testIncludeOnlyMatch() throws Exception {
defaultRewriterFeature = new ContentRewriterFeature.Config(
createSpecWithRewrite("test\\.com", "testx", "0", tags),
- new ContentRewriterFeature.DefaultConfig("", "", "0", TAGS, "false", "false"));
+ new ContentRewriterFeature.DefaultConfig("", "", "0", TAGS, false, false));
assertTrue(defaultRewriterFeature.isRewriteEnabled());
assertTrue(defaultRewriterFeature.shouldRewriteURL("http://www.test.com"));
assertFalse(defaultRewriterFeature.shouldRewriteURL("http://testx.test.com"));
@@ -111,7 +105,7 @@ public class ContentRewriterFeatureTestC
public void testTagRewrite() throws Exception {
defaultRewriterFeature = new ContentRewriterFeature.Config(
createSpecWithRewrite("test\\.com", "testx", "0", tags),
- new ContentRewriterFeature.DefaultConfig("", "", "0", TAGS, "false", "false"));
+ new ContentRewriterFeature.DefaultConfig("", "", "0", TAGS, false, false));
assertFalse(defaultRewriterFeature.shouldRewriteTag("IFRAME"));
assertTrue(defaultRewriterFeature.shouldRewriteTag("img"));
assertTrue(defaultRewriterFeature.shouldRewriteTag("ScripT"));
@@ -122,7 +116,7 @@ public class ContentRewriterFeatureTestC
Set<String> newTags = Sets.newHashSet("iframe");
defaultRewriterFeature = new ContentRewriterFeature.Config(
createSpecWithRewrite("test\\.com", "testx", "0", newTags),
- new ContentRewriterFeature.DefaultConfig("", "", "0", TAGS, "false", "false"));
+ new ContentRewriterFeature.DefaultConfig("", "", "0", TAGS, false, false));
assertTrue(defaultRewriterFeature.shouldRewriteTag("IFRAME"));
assertFalse(defaultRewriterFeature.shouldRewriteTag("img"));
assertFalse(defaultRewriterFeature.shouldRewriteTag("ScripT"));
@@ -133,7 +127,7 @@ public class ContentRewriterFeatureTestC
public void testExpiresTimeParse() throws Exception {
defaultRewriterFeature = new ContentRewriterFeature.Config(
createSpecWithRewrite("test\\.com", "testx", "12345", tags),
- new ContentRewriterFeature.DefaultConfig("", "", "0", TAGS, "false", "false"));
+ new ContentRewriterFeature.DefaultConfig("", "", "0", TAGS, false, false));
assertNotNull(defaultRewriterFeature.getExpires());
assertNotNull(defaultRewriterFeature.getExpires() == 12345);
}
@@ -142,7 +136,7 @@ public class ContentRewriterFeatureTestC
public void testExpiresHTTPParse() throws Exception {
defaultRewriterFeature = new ContentRewriterFeature.Config(
createSpecWithRewrite("test\\.com", "testx", "htTp ", tags),
- new ContentRewriterFeature.DefaultConfig("", "", "12345", TAGS, "false", "false"));
+ new ContentRewriterFeature.DefaultConfig("", "", "12345", TAGS, false, false));
assertEquals(ContentRewriterFeature.EXPIRES_DEFAULT, defaultRewriterFeature.getExpires());
}
@@ -150,7 +144,7 @@ public class ContentRewriterFeatureTestC
public void testExpiresInvalidParse() throws Exception {
defaultRewriterFeature = new ContentRewriterFeature.Config(
createSpecWithRewrite("test\\.com", "testx", "junk", tags),
- new ContentRewriterFeature.DefaultConfig("", "", "12345", TAGS, "false", "false"));
+ new ContentRewriterFeature.DefaultConfig("", "", "12345", TAGS, false, false));
assertNotNull(defaultRewriterFeature.getExpires());
assertNotNull(defaultRewriterFeature.getExpires() == 12345);
}
@@ -159,7 +153,7 @@ public class ContentRewriterFeatureTestC
public void testSpecEmptyContainerWithExclude() throws Exception {
defaultRewriterFeature = new ContentRewriterFeature.Config(
createSpecWithRewrite(null, null, null, null),
- new ContentRewriterFeature.DefaultConfig(".*", "test", "0", TAGS, "false", "false"));
+ new ContentRewriterFeature.DefaultConfig(".*", "test", "0", TAGS, false, false));
assertTrue(defaultRewriterFeature.isRewriteEnabled());
assertTrue(defaultRewriterFeature.shouldRewriteURL("http://www.foobar.com"));
assertFalse(defaultRewriterFeature.shouldRewriteURL("http://www.test.com"));
@@ -169,7 +163,7 @@ public class ContentRewriterFeatureTestC
public void testSpecExcludeOnlyOverridesContainerWithExclude() throws Exception {
defaultRewriterFeature = new ContentRewriterFeature.Config(
createSpecWithRewrite(null, "", null, null),
- new ContentRewriterFeature.DefaultConfig(".*", "test", "0", TAGS, "false", "false"));
+ new ContentRewriterFeature.DefaultConfig(".*", "test", "0", TAGS, false, false));
assertTrue(defaultRewriterFeature.isRewriteEnabled());
assertTrue(defaultRewriterFeature.shouldRewriteURL("http://www.foobar.com"));
assertTrue(defaultRewriterFeature.shouldRewriteURL("http://www.test.com"));
@@ -179,7 +173,7 @@ public class ContentRewriterFeatureTestC
public void testSpecEmptyDoesNotOverridesContainerDefaultNoInclude() throws Exception {
defaultRewriterFeature = new ContentRewriterFeature.Config(
createSpecWithRewrite(null, null, null, null),
- new ContentRewriterFeature.DefaultConfig("", "test", "0", TAGS, "false", "false"));
+ new ContentRewriterFeature.DefaultConfig("", "test", "0", TAGS, false, false));
assertFalse(defaultRewriterFeature.isRewriteEnabled());
assertFalse(defaultRewriterFeature.shouldRewriteURL("http://www.foobar.com"));
assertFalse(defaultRewriterFeature.shouldRewriteURL("http://www.test.com"));
@@ -189,7 +183,7 @@ public class ContentRewriterFeatureTestC
public void testSpecIncludeOnlyOverridesContainerDefaultNoInclude() throws Exception {
defaultRewriterFeature = new ContentRewriterFeature.Config(
createSpecWithRewrite(".*", null, null, null),
- new ContentRewriterFeature.DefaultConfig("", "test", "0", TAGS, "false", "false"));
+ new ContentRewriterFeature.DefaultConfig("", "test", "0", TAGS, false, false));
assertTrue(defaultRewriterFeature.isRewriteEnabled());
assertTrue(defaultRewriterFeature.shouldRewriteURL("http://www.foobar.com"));
assertFalse(defaultRewriterFeature.shouldRewriteURL("http://www.test.com"));
@@ -198,14 +192,14 @@ public class ContentRewriterFeatureTestC
@Test
public void testSplitJsSupported() throws Exception {
defaultRewriterFeature =
- new ContentRewriterFeature.DefaultConfig("", "test", "0", TAGS, "false", "true");
+ new ContentRewriterFeature.DefaultConfig("", "test", "0", TAGS, false, true);
assertTrue(defaultRewriterFeature.isSplitJsEnabled());
}
@Test
public void testSplitJsNotSupported() throws Exception {
defaultRewriterFeature =
- new ContentRewriterFeature.DefaultConfig("", "test", "0", TAGS, "false", "false");
+ new ContentRewriterFeature.DefaultConfig("", "test", "0", TAGS, false, false);
assertFalse(defaultRewriterFeature.isSplitJsEnabled());
}
}
Modified: shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/ContentRewriterFeatureTestCaseOS9.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/ContentRewriterFeatureTestCaseOS9.java?rev=957026&r1=957025&r2=957026&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/ContentRewriterFeatureTestCaseOS9.java (original)
+++ shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/ContentRewriterFeatureTestCaseOS9.java Tue Jun 22 20:48:26 2010
@@ -36,7 +36,7 @@ public class ContentRewriterFeatureTestC
throws Exception {
defaultRewriterFeature = new ContentRewriterFeature.Config(
createSpecWithRewriteOS9(new String[] { "" }, new String[] { "*" }, "0", tags),
- new ContentRewriterFeature.DefaultConfig(".*", "", "0", TAGS, "false", "false"));
+ new ContentRewriterFeature.DefaultConfig(".*", "", "0", TAGS, false, false));
assertFalse(defaultRewriterFeature.isRewriteEnabled());
assertFalse(defaultRewriterFeature.shouldRewriteURL("http://www.test.com"));
}
@@ -46,7 +46,7 @@ public class ContentRewriterFeatureTestC
throws Exception {
defaultRewriterFeature = new ContentRewriterFeature.Config(
createSpecWithRewriteOS9(null, new String[] { "foo", "bar" }, "0", tags),
- new ContentRewriterFeature.DefaultConfig(".*", "", "0", TAGS, "false", "false"));
+ new ContentRewriterFeature.DefaultConfig(".*", "", "0", TAGS, false, false));
assertTrue(defaultRewriterFeature.isRewriteEnabled());
assertTrue(defaultRewriterFeature.shouldRewriteURL("http://www.test.com"));
assertFalse(defaultRewriterFeature.shouldRewriteURL("http://www.foo.com"));
@@ -58,7 +58,7 @@ public class ContentRewriterFeatureTestC
throws Exception {
defaultRewriterFeature = new ContentRewriterFeature.Config(
createSpecWithRewriteOS9(null, new String[] { "*" }, null, null),
- new ContentRewriterFeature.DefaultConfig(".*", "", "0", TAGS, "false", "false"));
+ new ContentRewriterFeature.DefaultConfig(".*", "", "0", TAGS, false, false));
assertFalse(defaultRewriterFeature.isRewriteEnabled());
assertFalse(defaultRewriterFeature.shouldRewriteURL("http://www.test.com"));
}
@@ -68,7 +68,7 @@ public class ContentRewriterFeatureTestC
throws Exception {
defaultRewriterFeature = new ContentRewriterFeature.Config(
createSpecWithRewriteOS9(new String[] { "*" }, new String[] { "" }, "0", tags),
- new ContentRewriterFeature.DefaultConfig("", ".*", "0", TAGS, "false", "false"));
+ new ContentRewriterFeature.DefaultConfig("", ".*", "0", TAGS, false, false));
assertTrue(defaultRewriterFeature.isRewriteEnabled());
assertTrue(defaultRewriterFeature.shouldRewriteURL("http://www.test.com"));
}
@@ -77,7 +77,7 @@ public class ContentRewriterFeatureTestC
public void testExcludeOverridesInclude() throws Exception {
defaultRewriterFeature = new ContentRewriterFeature.Config(
createSpecWithRewriteOS9(new String[] { "test.com" }, new String[] { "test" }, "0", tags),
- new ContentRewriterFeature.DefaultConfig("", "", "0", TAGS, "false", "false"));
+ new ContentRewriterFeature.DefaultConfig("", "", "0", TAGS, false, false));
assertTrue(defaultRewriterFeature.isRewriteEnabled());
assertFalse(defaultRewriterFeature.shouldRewriteURL("http://www.test.com"));
}
@@ -86,7 +86,7 @@ public class ContentRewriterFeatureTestC
public void testIncludeOnlyMatch() throws Exception {
defaultRewriterFeature = new ContentRewriterFeature.Config(
createSpecWithRewriteOS9(new String[] { "test.com" }, new String[] { "testx" }, "0", tags),
- new ContentRewriterFeature.DefaultConfig("", "", "0", TAGS, "false", "false"));
+ new ContentRewriterFeature.DefaultConfig("", "", "0", TAGS, false, false));
assertTrue(defaultRewriterFeature.isRewriteEnabled());
assertTrue(defaultRewriterFeature.shouldRewriteURL("http://www.test.com"));
assertFalse(defaultRewriterFeature
@@ -97,7 +97,7 @@ public class ContentRewriterFeatureTestC
public void testSpecEmptyContainerWithExclude() throws Exception {
defaultRewriterFeature = new ContentRewriterFeature.Config(
createSpecWithRewriteOS9(null, null, null, null),
- new ContentRewriterFeature.DefaultConfig(".*", "test", "0", TAGS, "false", "false"));
+ new ContentRewriterFeature.DefaultConfig(".*", "test", "0", TAGS, false, false));
assertTrue(defaultRewriterFeature.isRewriteEnabled());
assertTrue(defaultRewriterFeature.shouldRewriteURL("http://www.foobar.com"));
assertFalse(defaultRewriterFeature.shouldRewriteURL("http://www.test.com"));
@@ -108,7 +108,7 @@ public class ContentRewriterFeatureTestC
throws Exception {
defaultRewriterFeature = new ContentRewriterFeature.Config(
createSpecWithRewriteOS9(null, new String[] { "" }, null, null),
- new ContentRewriterFeature.DefaultConfig(".*", "test", "0", TAGS, "false", "false"));
+ new ContentRewriterFeature.DefaultConfig(".*", "test", "0", TAGS, false, false));
assertTrue(defaultRewriterFeature.isRewriteEnabled());
assertTrue(defaultRewriterFeature.shouldRewriteURL("http://www.foobar.com"));
assertTrue(defaultRewriterFeature.shouldRewriteURL("http://www.test.com"));
@@ -119,7 +119,7 @@ public class ContentRewriterFeatureTestC
throws Exception {
defaultRewriterFeature = new ContentRewriterFeature.Config(
createSpecWithRewriteOS9(null, null, null, null),
- new ContentRewriterFeature.DefaultConfig("", "test", "0", TAGS, "false", "false"));
+ new ContentRewriterFeature.DefaultConfig("", "test", "0", TAGS, false, false));
assertFalse(defaultRewriterFeature.isRewriteEnabled());
assertFalse(defaultRewriterFeature
.shouldRewriteURL("http://www.foobar.com"));
@@ -131,7 +131,7 @@ public class ContentRewriterFeatureTestC
throws Exception {
defaultRewriterFeature = new ContentRewriterFeature.Config(
createSpecWithRewriteOS9(new String[] { "*" }, null, null, null),
- new ContentRewriterFeature.DefaultConfig("", "test", "0", TAGS, "false", "false"));
+ new ContentRewriterFeature.DefaultConfig("", "test", "0", TAGS, false, false));
assertTrue(defaultRewriterFeature.isRewriteEnabled());
assertTrue(defaultRewriterFeature.shouldRewriteURL("http://www.foobar.com"));
assertFalse(defaultRewriterFeature.shouldRewriteURL("http://www.test.com"));
@@ -142,7 +142,7 @@ public class ContentRewriterFeatureTestC
throws Exception {
defaultRewriterFeature = new ContentRewriterFeature.Config(
createSpecWithRewriteOS9(new String[] { "foo", "bar" }, null, null, null),
- new ContentRewriterFeature.DefaultConfig("", "test", "0", TAGS, "false", "false"));
+ new ContentRewriterFeature.DefaultConfig("", "test", "0", TAGS, false, false));
assertTrue(defaultRewriterFeature.isRewriteEnabled());
assertTrue(defaultRewriterFeature.shouldRewriteURL("http://www.foo.com"));
assertTrue(defaultRewriterFeature.shouldRewriteURL("http://www.bar.com"));
@@ -154,8 +154,7 @@ public class ContentRewriterFeatureTestC
throws Exception {
defaultRewriterFeature = new ContentRewriterFeature.Config(
createSpecWithRewriteOS9(new String[] { "foo", "bar" }, null, null, null),
- new ContentRewriterFeature.DefaultConfig(
- ".*", "test", "0", TAGS, "false", "false"));
+ new ContentRewriterFeature.DefaultConfig("*", "test", "0", TAGS, false, false));
assertTrue(defaultRewriterFeature.isRewriteEnabled());
assertTrue(defaultRewriterFeature.shouldRewriteURL("http://www.foo.com"));
assertTrue(defaultRewriterFeature.shouldRewriteURL("http://www.bar.com"));
@@ -166,8 +165,7 @@ public class ContentRewriterFeatureTestC
public void testSpecExcludeDisallowOverrideIncludeUrls() throws Exception {
defaultRewriterFeature = new ContentRewriterFeature.Config(
createSpecWithRewrite("norewrite", null, null, null),
- new ContentRewriterFeature.DefaultConfig(
- "^http://www.include.com", "def", "3600", TAGS, "true", "false"));
+ new ContentRewriterFeature.DefaultConfig("^http://www.include.com", "def", "3600", TAGS, true, false));
assertTrue(defaultRewriterFeature.isRewriteEnabled());
assertTrue(defaultRewriterFeature
.shouldRewriteURL("http://www.include.com/abc"));
@@ -181,8 +179,7 @@ public class ContentRewriterFeatureTestC
public void testSpecExcludeOverrideExcludeUrls() throws Exception {
defaultRewriterFeature = new ContentRewriterFeature.Config(
createSpecWithRewrite(null, "abc", null, null),
- new ContentRewriterFeature.DefaultConfig(
- "^http://www.include.com", "def", "3600", TAGS, "true", "false"));
+ new ContentRewriterFeature.DefaultConfig("^http://www.include.com", "def", "3600", TAGS, true, false));
assertTrue(defaultRewriterFeature.isRewriteEnabled());
assertFalse(defaultRewriterFeature
.shouldRewriteURL("http://www.include.com/abc"));
@@ -196,8 +193,7 @@ public class ContentRewriterFeatureTestC
public void testSpecExcludeDisallowOverrideIncludeUrlOS9() throws Exception {
defaultRewriterFeature = new ContentRewriterFeature.Config(
createSpecWithRewriteOS9(new String[] { "abc" }, null, null, null),
- new ContentRewriterFeature.DefaultConfig(
- "^http://www.include.com", "", "3600", TAGS, "true", "false"));
+ new ContentRewriterFeature.DefaultConfig("^http://www.include.com", "", "3600", TAGS, true, false));
assertTrue(defaultRewriterFeature.isRewriteEnabled());
assertTrue(defaultRewriterFeature
.shouldRewriteURL("http://www.include.com/abc"));
@@ -209,8 +205,7 @@ public class ContentRewriterFeatureTestC
public void testSpecExcludeDisallowOverrideExcludeUrlOS9() throws Exception {
defaultRewriterFeature = new ContentRewriterFeature.Config(
createSpecWithRewriteOS9(null, new String[] { "def" }, null, null),
- new ContentRewriterFeature.DefaultConfig(
- "^http://www.include.com", "", "3600", TAGS, "true", "false"));
+ new ContentRewriterFeature.DefaultConfig("^http://www.include.com", "", "3600", TAGS, true, false));
assertTrue(defaultRewriterFeature.isRewriteEnabled());
assertTrue(defaultRewriterFeature
.shouldRewriteURL("http://www.include.com/abc"));
@@ -224,7 +219,7 @@ public class ContentRewriterFeatureTestC
public void testSpecExcludeDisallowOverrideDefaultExpires() throws Exception {
defaultRewriterFeature = new ContentRewriterFeature.Config(
createSpecWithRewrite("test\\.com", "testx", "3000", tags),
- new ContentRewriterFeature.DefaultConfig("", "", "", TAGS, "true", "false"));
+ new ContentRewriterFeature.DefaultConfig("", "", "", TAGS, true, false));
assertNotNull(defaultRewriterFeature.getExpires());
assertNotNull(defaultRewriterFeature.getExpires() == 3000);
}
@@ -233,7 +228,7 @@ public class ContentRewriterFeatureTestC
public void testSpecExcludeDisallowOverrideExpiresGreater() throws Exception {
defaultRewriterFeature = new ContentRewriterFeature.Config(
createSpecWithRewrite("test\\.com", "testx", "8000", tags),
- new ContentRewriterFeature.DefaultConfig("", "", "3000", TAGS, "true", "false"));
+ new ContentRewriterFeature.DefaultConfig("", "", "3000", TAGS, true, false));
assertNotNull(defaultRewriterFeature.getExpires());
assertNotNull(defaultRewriterFeature.getExpires() == 3000);
}
@@ -242,7 +237,7 @@ public class ContentRewriterFeatureTestC
public void testSpecExcludeDisallowOverrideExpiresLesser() throws Exception {
defaultRewriterFeature = new ContentRewriterFeature.Config(
createSpecWithRewrite("test\\.com", "testx", "2000", tags),
- new ContentRewriterFeature.DefaultConfig("", "", "3000", TAGS, "true", "false"));
+ new ContentRewriterFeature.DefaultConfig("", "", "3000", TAGS, true, false));
assertNotNull(defaultRewriterFeature.getExpires());
assertNotNull(defaultRewriterFeature.getExpires() == 2000);
}
@@ -251,7 +246,7 @@ public class ContentRewriterFeatureTestC
public void testSpecExcludeDisallowOverrideTagsSubset() throws Exception {
defaultRewriterFeature = new ContentRewriterFeature.Config(
createSpecWithRewrite("test\\.com", "testx", "0", Sets.newHashSet("img")),
- new ContentRewriterFeature.DefaultConfig("", "", "0", "img,script", "true", "false"));
+ new ContentRewriterFeature.DefaultConfig("", "", "0", "img,script", true, false));
assertFalse(defaultRewriterFeature.shouldRewriteTag("IFRAME"));
assertTrue(defaultRewriterFeature.shouldRewriteTag("img"));
assertFalse(defaultRewriterFeature.shouldRewriteTag("ScripT"));
@@ -261,7 +256,7 @@ public class ContentRewriterFeatureTestC
public void testSpecExcludeDisallowOverrideTagsSuperset() throws Exception {
defaultRewriterFeature = new ContentRewriterFeature.Config(
createSpecWithRewrite( "test\\.com", "testx", "0", Sets.newHashSet("img", "script", "link")),
- new ContentRewriterFeature.DefaultConfig("", "", "0", "img,script", "true", "false"));
+ new ContentRewriterFeature.DefaultConfig("", "", "0", "img,script", true, false));
assertFalse(defaultRewriterFeature.shouldRewriteTag("IFRAME"));
assertTrue(defaultRewriterFeature.shouldRewriteTag("img"));
assertTrue(defaultRewriterFeature.shouldRewriteTag("ScripT"));
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=957026&r1=957025&r2=957026&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 Tue Jun 22 20:48:26 2010
@@ -71,8 +71,7 @@ public abstract class RewriterTestBase {
@Before
public void setUp() throws Exception {
rewriterFeatureFactory = new ContentRewriterFeature.Factory(null,
- new ContentRewriterFeature.DefaultConfig(".*", "", "86400",
- TAGS, "false", "false"));
+ new ContentRewriterFeature.DefaultConfig(".*", "", "86400", TAGS, false, false));
defaultRewriterFeature = rewriterFeatureFactory.getDefault();
tags = defaultRewriterFeature.getIncludedTags();
injector = Guice.createInjector(getParseModule(), new PropertiesModule(), new TestModule());
Modified: shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/old/BaseRewriterTestCase.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/old/BaseRewriterTestCase.java?rev=957026&r1=957025&r2=957026&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/old/BaseRewriterTestCase.java (original)
+++ shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/old/BaseRewriterTestCase.java Tue Jun 22 20:48:26 2010
@@ -84,8 +84,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"));
+ new ContentRewriterFeature.DefaultConfig(".*", "", "86400", "embed,img,script,link,style", false, false));
defaultRewriterFeature = rewriterFeatureFactory.getDefault();
tags = defaultRewriterFeature.getIncludedTags();
defaultContainerRewriterUris = new ContentRewriterUris(
@@ -266,7 +265,7 @@ public abstract class BaseRewriterTestCa
private final ContentRewriterFeature.Config feature;
public FakeRewriterFeatureFactory(ContentRewriterFeature.Config feature) {
- super(null, new ContentRewriterFeature.DefaultConfig(".*", "", "HTTP", "", "false", "false"));
+ super(null, new ContentRewriterFeature.DefaultConfig(".*", "", "HTTP", "", false, false));
this.feature = feature;
}
Modified: shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/old/ProxyingLinkRewriterTest.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/old/ProxyingLinkRewriterTest.java?rev=957026&r1=957025&r2=957026&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/old/ProxyingLinkRewriterTest.java (original)
+++ shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/old/ProxyingLinkRewriterTest.java Tue Jun 22 20:48:26 2010
@@ -78,7 +78,7 @@ public class ProxyingLinkRewriterTest ex
@Test
public void testWithRefresh() throws Exception {
ContentRewriterFeature.Config contentRewriterFeature = new ContentRewriterFeature.DefaultConfig(
- ".*", "", "3600", "embed,img,script,link,style", "false", "false");
+ ".*", "", "3600", "embed,img,script,link,style", false, false);
ProxyingLinkRewriter rewriter = new DefaultProxyingLinkRewriterFactory(
defaultContainerRewriterUris).create(SPEC_URL, contentRewriterFeature,
"default", false, false);
@@ -90,7 +90,7 @@ public class ProxyingLinkRewriterTest ex
@Test
public void testWithBadRefresh() throws Exception {
ContentRewriterFeature.Config contentRewriterFeature = new ContentRewriterFeature.DefaultConfig(
- ".*", "", "HTTP", "embed,img,script,link,style", "false", "false");
+ ".*", "", "HTTP", "embed,img,script,link,style", false, false);
ProxyingLinkRewriter rewriter = new DefaultProxyingLinkRewriterFactory(
defaultContainerRewriterUris).create(SPEC_URL, contentRewriterFeature,
"default", false, false);
Modified: shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/uri/DefaultConcatUriManagerTest.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/uri/DefaultConcatUriManagerTest.java?rev=957026&r1=957025&r2=957026&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/uri/DefaultConcatUriManagerTest.java (original)
+++ shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/uri/DefaultConcatUriManagerTest.java Tue Jun 22 20:48:26 2010
@@ -204,7 +204,7 @@ public class DefaultConcatUriManagerTest
@Test
public void validateNoContainerStrict() {
DefaultConcatUriManager manager = makeManager("host.com", "/path", null, null);
- manager.setUseStrictParsing("true");
+ manager.setUseStrictParsing(true);
ConcatUriManager.ConcatUri validated =
manager.process(Uri.parse("http://host.com/path?q=f"));
assertEquals(UriStatus.BAD_URI, validated.getStatus());
@@ -221,7 +221,7 @@ public class DefaultConcatUriManagerTest
@Test
public void validateHostMismatchStrict() {
DefaultConcatUriManager manager = makeManager("host.com", "/path", null, null);
- manager.setUseStrictParsing("true");
+ manager.setUseStrictParsing(true);
ConcatUriManager.ConcatUri validated =
manager.process(Uri.parse("http://another.com/path?" +
Param.CONTAINER.getKey() + '=' + CONTAINER + "&type=css"));
@@ -231,7 +231,7 @@ public class DefaultConcatUriManagerTest
@Test
public void validatePathMismatchStrict() {
DefaultConcatUriManager manager = makeManager("host.com", "/path", null, null);
- manager.setUseStrictParsing("true");
+ manager.setUseStrictParsing(true);
ConcatUriManager.ConcatUri validated =
manager.process(Uri.parse("http://host.com/another?" +
Param.CONTAINER.getKey() + '=' + CONTAINER + "&type=css"));
Modified: shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/uri/DefaultProxyUriManagerTest.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/uri/DefaultProxyUriManagerTest.java?rev=957026&r1=957025&r2=957026&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/uri/DefaultProxyUriManagerTest.java (original)
+++ shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/uri/DefaultProxyUriManagerTest.java Tue Jun 22 20:48:26 2010
@@ -312,7 +312,7 @@ public class DefaultProxyUriManagerTest
String host = "host.com";
String path = "/proxy/path";
DefaultProxyUriManager manager = makeManager("foo" + host, path, null);
- manager.setUseStrictParsing("true");
+ manager.setUseStrictParsing(true);
Uri testUri = new UriBuilder().setAuthority(host).setPath(path)
.addQueryParameter(Param.URL.getKey(), "http://foo.com").toUri();
manager.process(testUri);