You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@shindig.apache.org by jo...@apache.org on 2010/08/02 23:14:05 UTC
svn commit: r981689 - in /shindig/trunk/java/gadgets/src:
main/java/org/apache/shindig/gadgets/
main/java/org/apache/shindig/gadgets/render/
main/java/org/apache/shindig/gadgets/rewrite/old/
main/java/org/apache/shindig/gadgets/servlet/ test/java/org/a...
Author: johnh
Date: Mon Aug 2 21:14:02 2010
New Revision: 981689
URL: http://svn.apache.org/viewvc?rev=981689&view=rev
Log:
Remove several uses of ProxyBase.PARAM_CONSTS in favor of UriCommon.Param equivalents.
Modified:
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/Gadget.java
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/render/SanitizingProxyUriManager.java
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/old/ConcatLinkRewriter.java
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/GadgetRenderingServlet.java
shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/parse/caja/old/CajaCssSanitizerTest.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/SanitizingProxyUriManagerTest.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/servlet/GadgetRenderingServletTest.java
Modified: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/Gadget.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/Gadget.java?rev=981689&r1=981688&r2=981689&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/Gadget.java (original)
+++ shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/Gadget.java Mon Aug 2 21:14:02 2010
@@ -19,10 +19,10 @@ package org.apache.shindig.gadgets;
import org.apache.shindig.gadgets.features.FeatureRegistry;
import org.apache.shindig.gadgets.preload.PreloadedData;
-import org.apache.shindig.gadgets.servlet.ProxyBase;
import org.apache.shindig.gadgets.spec.GadgetSpec;
import org.apache.shindig.gadgets.spec.LocaleSpec;
import org.apache.shindig.gadgets.spec.View;
+import org.apache.shindig.gadgets.uri.UriCommon;
import com.google.common.collect.Lists;
import com.google.common.collect.Sets;
@@ -149,6 +149,6 @@ public class Gadget {
public boolean sanitizeOutput() {
return (getCurrentView() != null &&
getCurrentView().getType() == View.ContentType.HTML_SANITIZED) ||
- "1".equals(getContext().getParameter(ProxyBase.SANITIZE_CONTENT_PARAM));
+ "1".equals(getContext().getParameter(UriCommon.Param.SANITIZE.getKey()));
}
}
Modified: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/render/SanitizingProxyUriManager.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/render/SanitizingProxyUriManager.java?rev=981689&r1=981688&r2=981689&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/render/SanitizingProxyUriManager.java (original)
+++ shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/render/SanitizingProxyUriManager.java Mon Aug 2 21:14:02 2010
@@ -21,8 +21,8 @@ package org.apache.shindig.gadgets.rende
import org.apache.shindig.common.uri.Uri;
import org.apache.shindig.common.uri.UriBuilder;
import org.apache.shindig.gadgets.GadgetException;
-import org.apache.shindig.gadgets.servlet.ProxyBase;
import org.apache.shindig.gadgets.uri.ProxyUriManager;
+import org.apache.shindig.gadgets.uri.UriCommon.Param;
import com.google.common.collect.Lists;
@@ -52,9 +52,9 @@ public class SanitizingProxyUriManager i
for (Uri origUri : origUris) {
UriBuilder newUri = new UriBuilder(origUri);
- newUri.addQueryParameter(ProxyBase.SANITIZE_CONTENT_PARAM, "1");
+ newUri.addQueryParameter(Param.SANITIZE.getKey(), "1");
if (expectedMime != null) {
- newUri.addQueryParameter(ProxyBase.REWRITE_MIME_TYPE_PARAM, expectedMime);
+ newUri.addQueryParameter(Param.REWRITE_MIME_TYPE.getKey(), expectedMime);
}
sanitizedUris.add(newUri.toUri());
}
Modified: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/old/ConcatLinkRewriter.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/old/ConcatLinkRewriter.java?rev=981689&r1=981688&r2=981689&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/old/ConcatLinkRewriter.java (original)
+++ shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/old/ConcatLinkRewriter.java Mon Aug 2 21:14:02 2010
@@ -23,7 +23,7 @@ import com.google.common.collect.Lists;
import org.apache.shindig.common.uri.Uri;
import org.apache.shindig.common.util.Utf8UrlCoder;
import org.apache.shindig.gadgets.rewrite.ContentRewriterFeature;
-import org.apache.shindig.gadgets.servlet.ProxyBase;
+import org.apache.shindig.gadgets.uri.UriCommon.Param;
import java.io.UnsupportedEncodingException;
import java.net.URLEncoder;
@@ -86,7 +86,8 @@ public class ConcatLinkRewriter {
if (ignoreCache)
builder.append("nocache=1&");
if (rewriterFeature.getExpires() != null) {
- builder.append(ProxyBase.REFRESH_PARAM).append('=').append(rewriterFeature.getExpires().toString()).append('&');
+ builder.append(Param.REFRESH.getKey()).append('=')
+ .append(rewriterFeature.getExpires().toString()).append('&');
}
} else {
builder.append('&');
@@ -108,7 +109,7 @@ public class ConcatLinkRewriter {
String mimeType, String container) {
String concatBaseNoGadget = rewriterUris.getConcatBase(container);
return concatBaseNoGadget
- + ProxyBase.REWRITE_MIME_TYPE_PARAM
+ + Param.REWRITE_MIME_TYPE.getKey()
+ '='
+ mimeType
+ ((gadgetUri == null) ? "" : "&gadget="
Modified: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/GadgetRenderingServlet.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/GadgetRenderingServlet.java?rev=981689&r1=981688&r2=981689&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/GadgetRenderingServlet.java (original)
+++ shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/GadgetRenderingServlet.java Mon Aug 2 21:14:02 2010
@@ -26,6 +26,7 @@ import org.apache.shindig.gadgets.render
import org.apache.shindig.gadgets.render.RenderingResults;
import org.apache.shindig.gadgets.uri.IframeUriManager;
import org.apache.shindig.gadgets.uri.UriStatus;
+import org.apache.shindig.gadgets.uri.UriCommon.Param;
import com.google.inject.Inject;
@@ -150,7 +151,7 @@ public class GadgetRenderingServlet exte
// Unversioned files get cached for 5 minutes by default, but this can be overridden
// with a query parameter.
int ttl = DEFAULT_CACHE_TTL;
- String ttlStr = params.getRequest().getParameter(ProxyBase.REFRESH_PARAM);
+ String ttlStr = params.getRequest().getParameter(Param.REFRESH.getKey());
if (!StringUtils.isEmpty(ttlStr)) {
try {
ttl = Integer.parseInt(ttlStr);
Modified: shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/parse/caja/old/CajaCssSanitizerTest.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/parse/caja/old/CajaCssSanitizerTest.java?rev=981689&r1=981688&r2=981689&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/parse/caja/old/CajaCssSanitizerTest.java (original)
+++ shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/parse/caja/old/CajaCssSanitizerTest.java Mon Aug 2 21:14:02 2010
@@ -22,7 +22,7 @@ import org.apache.shindig.common.uri.Uri
import org.apache.shindig.gadgets.parse.caja.CajaCssParser;
import org.apache.shindig.gadgets.parse.caja.old.CajaCssSanitizer;
import org.apache.shindig.gadgets.rewrite.old.LinkRewriter;
-import org.apache.shindig.gadgets.servlet.ProxyBase;
+import org.apache.shindig.gadgets.uri.UriCommon.Param;
import com.google.caja.parser.css.CssTree;
import org.junit.Before;
@@ -45,12 +45,12 @@ public class CajaCssSanitizerTest extend
sanitizer = new CajaCssSanitizer(parser);
importRewriter = new LinkRewriter() {
public String rewrite(String link, Uri context) {
- return link + '&' + ProxyBase.SANITIZE_CONTENT_PARAM + "=1&rewriteMime=text/css";
+ return link + '&' + Param.SANITIZE.getKey() + "=1&rewriteMime=text/css";
}
};
imageRewriter = new LinkRewriter() {
public String rewrite(String link, Uri context) {
- return link + '&' + ProxyBase.SANITIZE_CONTENT_PARAM + "=1&rewriteMime=image/*";
+ return link + '&' + Param.SANITIZE.getKey() + "=1&rewriteMime=image/*";
}
};
}
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=981689&r1=981688&r2=981689&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 Mon Aug 2 21:14:02 2010
@@ -29,9 +29,9 @@ import org.apache.shindig.gadgets.rewrit
import org.apache.shindig.gadgets.rewrite.ContentRewriterFeature;
import org.apache.shindig.gadgets.rewrite.GadgetRewriter;
import org.apache.shindig.gadgets.rewrite.MutableContent;
-import org.apache.shindig.gadgets.servlet.ProxyBase;
import org.apache.shindig.gadgets.spec.GadgetSpec;
import org.apache.shindig.gadgets.uri.PassthruManager;
+import org.apache.shindig.gadgets.uri.UriCommon.Param;
import com.google.common.collect.ImmutableSet;
import com.google.common.collect.Sets;
@@ -53,7 +53,7 @@ public class SanitizingGadgetRewriterTes
private final GadgetContext sanitaryGadgetContext = new GadgetContext() {
@Override
public String getParameter(String name) {
- return ProxyBase.SANITIZE_CONTENT_PARAM.equals(name) ? "1" : null;
+ return Param.SANITIZE.getKey().equals(name) ? "1" : null;
}
@Override
Modified: shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/render/SanitizingProxyUriManagerTest.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/render/SanitizingProxyUriManagerTest.java?rev=981689&r1=981688&r2=981689&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/render/SanitizingProxyUriManagerTest.java (original)
+++ shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/render/SanitizingProxyUriManagerTest.java Mon Aug 2 21:14:02 2010
@@ -30,9 +30,9 @@ import static org.junit.Assert.assertSam
import org.apache.shindig.common.uri.Uri;
import org.apache.shindig.common.uri.UriBuilder;
-import org.apache.shindig.gadgets.servlet.ProxyBase;
import org.apache.shindig.gadgets.uri.ProxyUriManager;
import org.apache.shindig.gadgets.uri.ProxyUriManager.ProxyUri;
+import org.apache.shindig.gadgets.uri.UriCommon.Param;
import org.easymock.Capture;
import org.junit.Before;
@@ -86,8 +86,8 @@ public class SanitizingProxyUriManagerTe
assertSame(uriCapture.getValue(), input);
assertSame(intCapture.getValue(), refresh);
assertEquals(1, returned.size());
- assertEquals("1", returned.get(0).getQueryParameter(ProxyBase.SANITIZE_CONTENT_PARAM));
- assertNull(returned.get(0).getQueryParameter(ProxyBase.REWRITE_MIME_TYPE_PARAM));
+ assertEquals("1", returned.get(0).getQueryParameter(Param.SANITIZE.getKey()));
+ assertNull(returned.get(0).getQueryParameter(Param.REWRITE_MIME_TYPE.getKey()));
}
@Test
@@ -109,8 +109,8 @@ public class SanitizingProxyUriManagerTe
assertSame(uriCapture.getValue(), input);
assertSame(intCapture.getValue(), refresh);
assertEquals(1, returned.size());
- assertEquals("1", returned.get(0).getQueryParameter(ProxyBase.SANITIZE_CONTENT_PARAM));
- assertEquals(mime, returned.get(0).getQueryParameter(ProxyBase.REWRITE_MIME_TYPE_PARAM));
+ assertEquals("1", returned.get(0).getQueryParameter(Param.SANITIZE.getKey()));
+ assertEquals(mime, returned.get(0).getQueryParameter(Param.REWRITE_MIME_TYPE.getKey()));
}
@Test
@@ -133,10 +133,10 @@ public class SanitizingProxyUriManagerTe
assertSame(uriCapture.getValue(), input);
assertSame(intCapture.getValue(), refresh);
assertEquals(2, returned.size());
- assertEquals("1", returned.get(0).getQueryParameter(ProxyBase.SANITIZE_CONTENT_PARAM));
- assertEquals(mime, returned.get(0).getQueryParameter(ProxyBase.REWRITE_MIME_TYPE_PARAM));
- assertEquals("1", returned.get(1).getQueryParameter(ProxyBase.SANITIZE_CONTENT_PARAM));
- assertEquals(mime, returned.get(1).getQueryParameter(ProxyBase.REWRITE_MIME_TYPE_PARAM));
+ assertEquals("1", returned.get(0).getQueryParameter(Param.SANITIZE.getKey()));
+ assertEquals(mime, returned.get(0).getQueryParameter(Param.REWRITE_MIME_TYPE.getKey()));
+ assertEquals("1", returned.get(1).getQueryParameter(Param.SANITIZE.getKey()));
+ assertEquals(mime, returned.get(1).getQueryParameter(Param.REWRITE_MIME_TYPE.getKey()));
}
private SanitizingProxyUriManager makeRewriter(String mime) {
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=981689&r1=981688&r2=981689&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 Mon Aug 2 21:14:02 2010
@@ -34,8 +34,8 @@ import org.apache.shindig.gadgets.rewrit
import org.apache.shindig.gadgets.rewrite.GadgetRewriter;
import org.apache.shindig.gadgets.rewrite.MutableContent;
import org.apache.shindig.gadgets.rewrite.old.BaseRewriterTestCase;
-import org.apache.shindig.gadgets.servlet.ProxyBase;
import org.apache.shindig.gadgets.spec.GadgetSpec;
+import org.apache.shindig.gadgets.uri.UriCommon.Param;
import org.junit.Before;
import org.junit.Test;
import org.w3c.dom.Document;
@@ -53,7 +53,7 @@ public class SanitizingGadgetRewriterTes
private final GadgetContext sanitaryGadgetContext = new GadgetContext() {
@Override
public String getParameter(String name) {
- return ProxyBase.SANITIZE_CONTENT_PARAM.equals(name) ? "1" : null;
+ return Param.SANITIZE.getKey().equals(name) ? "1" : null;
}
@Override
Modified: shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/GadgetRenderingServletTest.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/GadgetRenderingServletTest.java?rev=981689&r1=981688&r2=981689&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/GadgetRenderingServletTest.java (original)
+++ shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/GadgetRenderingServletTest.java Mon Aug 2 21:14:02 2010
@@ -31,6 +31,7 @@ import org.apache.shindig.gadgets.render
import org.apache.shindig.gadgets.render.RenderingResults;
import org.apache.shindig.gadgets.uri.IframeUriManager;
import org.apache.shindig.gadgets.uri.UriStatus;
+import org.apache.shindig.gadgets.uri.UriCommon.Param;
import org.easymock.IMocksControl;
import org.easymock.EasyMock;
@@ -74,7 +75,7 @@ public class GadgetRenderingServletTest
servlet.setRenderer(renderer);
expect(renderer.render(isA(GadgetContext.class)))
.andReturn(RenderingResults.ok("working"));
- expect(request.getParameter(ProxyBase.REFRESH_PARAM)).andReturn("120");
+ expect(request.getParameter(Param.REFRESH.getKey())).andReturn("120");
control.replay();
servlet.doGet(request, recorder);
assertEquals("private,max-age=120", recorder.getHeader("Cache-Control"));
@@ -85,7 +86,7 @@ public class GadgetRenderingServletTest
servlet.setRenderer(renderer);
expect(renderer.render(isA(GadgetContext.class)))
.andReturn(RenderingResults.ok("working"));
- expect(request.getParameter(ProxyBase.REFRESH_PARAM)).andReturn("");
+ expect(request.getParameter(Param.REFRESH.getKey())).andReturn("");
control.replay();
servlet.doGet(request, recorder);
assertEquals("private,max-age=300", recorder.getHeader("Cache-Control"));