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/08/10 12:48:56 UTC
svn commit: r983923 - in /shindig/trunk/java/gadgets/src:
main/java/org/apache/shindig/gadgets/uri/
test/java/org/apache/shindig/gadgets/rewrite/
test/java/org/apache/shindig/gadgets/uri/
Author: lindner
Date: Tue Aug 10 10:48:56 2010
New Revision: 983923
URL: http://svn.apache.org/viewvc?rev=983923&view=rev
Log:
add scheme to proxy uris for the time being
Modified:
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/rewrite/StyleTagProxyEmbeddedUrlsVisitorTest.java
shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/uri/DefaultAccelUriManagerTest.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=983923&r1=983922&r2=983923&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 Aug 10 10:48:56 2010
@@ -32,6 +32,7 @@ import org.apache.shindig.gadgets.http.H
import org.apache.shindig.gadgets.uri.UriCommon.Param;
import javax.annotation.Nullable;
+import java.util.Collections;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
@@ -80,20 +81,21 @@ public class DefaultProxyUriManager impl
}
public List<Uri> make(List<ProxyUri> resources, Integer forcedRefresh) {
- List<Uri> result = Lists.newArrayListWithCapacity(resources.size());
-
if (resources.isEmpty()) {
- return result;
+ return Collections.emptyList();
}
-
+
List<Uri> resourceUris = Lists.newArrayListWithCapacity(resources.size());
for (ProxyUri puc : resources) {
resourceUris.add(puc.getResource());
}
- Map<Uri, String> versions = Maps.newHashMap();
- if (versioner != null) {
+ Map<Uri, String> versions;
+ if (versioner == null) {
+ versions = Collections.emptyMap();
+ } else {
+ versions = Maps.newHashMapWithExpectedSize(resources.size());
List<String> versionList = versioner.version(resourceUris, resources.get(0).getContainer());
if (versionList != null && versionList.size() == resources.size()) {
// This should always be the case.
@@ -105,6 +107,7 @@ public class DefaultProxyUriManager impl
}
}
+ List<Uri> result = Lists.newArrayListWithCapacity(resources.size());
for (ProxyUri puc : resources) {
result.add(makeProxiedUri(puc, forcedRefresh, versions.get(puc.getResource())));
}
@@ -117,6 +120,8 @@ public class DefaultProxyUriManager impl
String container = puc.getContainer();
UriBuilder uri = new UriBuilder();
+ // TODO need to decide http vs https
+ uri.setScheme("http");
uri.setAuthority(getReqConfig(container, PROXY_HOST_PARAM));
// Chained vs. query-style syntax is determined by the presence of CHAINED_PARAMS_TOKEN
Modified: shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/StyleTagProxyEmbeddedUrlsVisitorTest.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/StyleTagProxyEmbeddedUrlsVisitorTest.java?rev=983923&r1=983922&r2=983923&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/StyleTagProxyEmbeddedUrlsVisitorTest.java (original)
+++ shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/StyleTagProxyEmbeddedUrlsVisitorTest.java Tue Aug 10 10:48:56 2010
@@ -72,12 +72,12 @@ public class StyleTagProxyEmbeddedUrlsVi
String expected =
"<html><head>"
+ "<style>"
- + "@import url('//localhost:8080/gadgets/proxy?container=default&"
+ + "@import url('http://localhost:8080/gadgets/proxy?container=default&"
+ "gadget=http%3A%2F%2F1.com%2F&debug=0&nocache=0"
+ "&url=http%3A%2F%2F1.com%2F1.css');\n"
+ "P {color:blue;}"
+ "P {color:red;}"
- + "A {background: url('//localhost:8080/gadgets/proxy?container=default"
+ + "A {background: url('http://localhost:8080/gadgets/proxy?container=default"
+ "&gadget=http%3A%2F%2F1.com%2F&debug=0&nocache=0"
+ "&url=http%3A%2F%2F1.com%2F2.jpg');}"
+ "</style></head>"
Modified: shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/uri/DefaultAccelUriManagerTest.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/uri/DefaultAccelUriManagerTest.java?rev=983923&r1=983922&r2=983923&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/uri/DefaultAccelUriManagerTest.java (original)
+++ shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/uri/DefaultAccelUriManagerTest.java Tue Aug 10 10:48:56 2010
@@ -59,7 +59,7 @@ public class DefaultAccelUriManagerTest
@Test
public void testParseAndNormalizeNonAccelUri() throws Exception {
Uri uri = Uri.parse("http://www.example.org/index.html");
- assertEquals(Uri.parse("//apache.org/gadgets/accel?container=default"
+ assertEquals(Uri.parse("http://apache.org/gadgets/accel?container=default"
+ "&gadget=http%3A%2F%2Fwww.example.org%2Findex.html"
+ "&debug=0&nocache=0&refresh=0"
+ "&url=http%3A%2F%2Fwww.example.org%2Findex.html"),
@@ -71,7 +71,7 @@ public class DefaultAccelUriManagerTest
Uri uri = Uri.parse("http://apache.org/gadgets/accel?container=proxy"
+ "&gadget=http%3A%2F%2Fwww.1.com%2Fa.html"
+ "&url=http%3A%2F%2Fwww.example.org%2Findex.html");
- assertEquals(Uri.parse("//apache.org/gadgets/accel?container=proxy"
+ assertEquals(Uri.parse("http://apache.org/gadgets/accel?container=proxy"
+ "&gadget=http%3A%2F%2Fwww.1.com%2Fa.html"
+ "&debug=0&nocache=0&refresh=0"
+ "&url=http%3A%2F%2Fwww.example.org%2Findex.html"),