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/04/05 23:58:06 UTC
svn commit: r930972 - in /shindig/trunk/java/gadgets/src:
main/java/org/apache/shindig/gadgets/uri/
test/java/org/apache/shindig/gadgets/uri/
Author: johnh
Date: Mon Apr 5 21:58:05 2010
New Revision: 930972
URL: http://svn.apache.org/viewvc?rev=930972&view=rev
Log:
Support "synd" as fallback to "container".
Modified:
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/uri/DefaultProxyUriManager.java
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/uri/ProxyUriBase.java
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/uri/UriCommon.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/uri/DefaultProxyUriManager.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/uri/DefaultProxyUriManager.java?rev=930972&r1=930971&r2=930972&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 Mon Apr 5 21:58:05 2010
@@ -144,6 +144,9 @@ public class DefaultProxyUriManager impl
// First determine if the URI is chained-syntax or query-style.
String container = uriIn.getQueryParameter(Param.CONTAINER.getKey());
+ if (container == null) {
+ container = uriIn.getQueryParameter(Param.SYND.getKey());
+ }
String uriStr = null;
Uri queryUri = null;
if (container != null &&
Modified: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/uri/ProxyUriBase.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/uri/ProxyUriBase.java?rev=930972&r1=930971&r2=930972&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/uri/ProxyUriBase.java (original)
+++ shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/uri/ProxyUriBase.java Mon Apr 5 21:58:05 2010
@@ -73,6 +73,10 @@ public class ProxyUriBase {
debug = getBooleanValue(uri.getQueryParameter(Param.DEBUG.getKey()));
noCache = getBooleanValue(uri.getQueryParameter(Param.NO_CACHE.getKey()));
container = uri.getQueryParameter(Param.CONTAINER.getKey());
+ if (container == null) {
+ // Support "synd" for legacy purposes.
+ container = uri.getQueryParameter(Param.SYND.getKey());
+ }
gadget = uri.getQueryParameter(Param.GADGET.getKey());
rewriteMimeType = uri.getQueryParameter(Param.REWRITE_MIME_TYPE.getKey());
sanitizeContent = getBooleanValue(uri.getQueryParameter(Param.SANITIZE.getKey()));
Modified: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/uri/UriCommon.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/uri/UriCommon.java?rev=930972&r1=930971&r2=930972&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/uri/UriCommon.java (original)
+++ shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/uri/UriCommon.java Mon Apr 5 21:58:05 2010
@@ -44,7 +44,11 @@ public interface UriCommon {
RESIZE_WIDTH("resize_w"),
RESIZE_QUALITY("resize_q"),
NO_EXPAND("no_expand"),
- FALLBACK_URL_PARAM("fallback_url");
+ FALLBACK_URL_PARAM("fallback_url"),
+
+ // This is a legacy param, superseded by container.
+ @Deprecated
+ SYND("synd");
private final String key;
private Param(String key) {
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=930972&r1=930971&r2=930972&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 Mon Apr 5 21:58:05 2010
@@ -85,7 +85,6 @@ public class DefaultProxyUriManagerTest
String path = "/proxy/path";
ProxyUriManager.Versioner versioner = makeVersioner(null, version);
DefaultProxyUriManager manager = makeManager(host, path, versioner);
- Gadget gadget = mockGadget(debug, noCache);
List<ProxyUri> proxyUris = Lists.newLinkedList();
proxyUris.add(new ProxyUri(refresh, debug, noCache, CONTAINER, SPEC_URI.toString(),
RESOURCE_1));
@@ -102,7 +101,6 @@ public class DefaultProxyUriManagerTest
String path = "/proxy/path";
ProxyUriManager.Versioner versioner = makeVersioner(null, "version1", "version2");
DefaultProxyUriManager manager = makeManager(host, path, versioner);
- Gadget gadget = mockGadget(false, true);
List<ProxyUri> proxyUris = Lists.newLinkedList();
ProxyUri pUri = new ProxyUri(null, false, true, CONTAINER, SPEC_URI.toString(),
RESOURCE_1);
@@ -135,7 +133,6 @@ public class DefaultProxyUriManagerTest
String path = "/proxy/" + DefaultProxyUriManager.CHAINED_PARAMS_TOKEN + "/path";
ProxyUriManager.Versioner versioner = makeVersioner(null, "version");
DefaultProxyUriManager manager = makeManager(host, path, versioner);
- Gadget gadget = mockGadget(false, true);
List<ProxyUri> proxyUris = Lists.newLinkedList();
ProxyUri pUri = new ProxyUri(null, false, true, CONTAINER, SPEC_URI.toString(),
RESOURCE_1);
@@ -278,6 +275,26 @@ public class DefaultProxyUriManagerTest
assertEquals(false, proxyUri.isNoCache());
}
+ @Test
+ public void containerFallsBackToSynd() throws Exception {
+ String host = "host.com";
+ String path = "/path";
+ DefaultProxyUriManager manager = makeManager(host, path, null);
+ UriBuilder uriBuilder = new UriBuilder();
+ uriBuilder.setScheme("http").setAuthority(host).setPath(path);
+ uriBuilder.addQueryParameter(Param.URL.getKey(), RESOURCE_1.toString());
+ uriBuilder.addQueryParameter("synd", CONTAINER);
+ uriBuilder.addQueryParameter(Param.GADGET.getKey(), SPEC_URI.toString());
+ uriBuilder.addQueryParameter(Param.REFRESH.getKey(), "321");
+ ProxyUriManager.ProxyUri proxyUri = manager.process(uriBuilder.toUri());
+ assertEquals(RESOURCE_1, proxyUri.getResource());
+ assertEquals(CONTAINER, proxyUri.getContainer());
+ assertEquals(SPEC_URI.toString(), proxyUri.getGadget());
+ assertEquals(321, (int)proxyUri.getRefresh());
+ assertEquals(false, proxyUri.isDebug());
+ assertEquals(false, proxyUri.isNoCache());
+ }
+
@Test(expected = GadgetException.class)
public void mismatchedHostStrict() throws Exception {
String host = "host.com";