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/03/20 11:10:56 UTC
svn commit: r925571 - in /shindig/trunk/java:
common/src/main/java/org/apache/shindig/protocol/
common/src/test/java/org/apache/shindig/common/
common/src/test/java/org/apache/shindig/common/testing/
gadgets/src/main/java/org/apache/shindig/gadgets/ ga...
Author: lindner
Date: Sat Mar 20 10:10:55 2010
New Revision: 925571
URL: http://svn.apache.org/viewvc?rev=925571&view=rev
Log:
Performance Opts/Cleanups
- Use StringUtils.split/replace methods to avoid regexes
- Use single chars for strings with length==1
- use isEmpty() syntax where it makes sense
Modified:
shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/DefaultHandlerRegistry.java
shindig/trunk/java/common/src/test/java/org/apache/shindig/common/JsonSerializerTest.java
shindig/trunk/java/common/src/test/java/org/apache/shindig/common/testing/FakeHttpServletRequest.java
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/FetchResponseUtils.java
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/features/BrowserSpecificFeatureResource.java
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/features/FeatureRegistry.java
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/BasicHttpFetcher.java
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/parse/GadgetHtmlParser.java
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/parse/caja/CajaHtmlParser.java
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/parse/nekohtml/NekoSimplifiedHtmlParser.java
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/render/RenderingGadgetRewriter.java
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/StyleTagExtractorVisitor.java
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/TemplateRewriter.java
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/image/BaseOptimizer.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/ConcatProxyServlet.java
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/JsonRpcHandler.java
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/OAuthCallbackServlet.java
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/spec/Icon.java
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/templates/XmlTemplateLibrary.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/DefaultIframeUriManager.java
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/uri/DefaultJsUriManager.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/parse/AbstractParsingTestBase.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/servlet/ConcatProxyServletTest.java
shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/ProxyHandlerTest.java
shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/templates/tags/FlashTagHandlerTest.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/DefaultJsUriManagerTest.java
Modified: shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/DefaultHandlerRegistry.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/DefaultHandlerRegistry.java?rev=925571&r1=925570&r2=925571&view=diff
==============================================================================
--- shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/DefaultHandlerRegistry.java (original)
+++ shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/DefaultHandlerRegistry.java Sat Mar 20 10:10:55 2010
@@ -144,7 +144,7 @@ public class DefaultHandlerRegistry impl
if (path.startsWith("/")) {
path = path.substring(1);
}
- String[] pathParts = path.split("/");
+ String[] pathParts = StringUtils.splitPreserveAllTokens(path, '/');
Map<String, SortedSet<RestPath>> methods = serviceMethodPathMap.get(pathParts[0]);
if (methods != null) {
SortedSet<RestPath> paths = methods.get(method);
@@ -551,7 +551,7 @@ public class DefaultHandlerRegistry impl
int tmpConstCount = 0;
int tmpConstIndex = -1;
this.operationPath = path;
- String[] partArr = path.substring(1).split("/");
+ String[] partArr = StringUtils.split(path.substring(1), '/');
parts = Lists.newArrayList();
for (int i = 0; i < partArr.length; i++) {
String part = partArr[i];
@@ -606,7 +606,7 @@ public class DefaultHandlerRegistry impl
}
parsedParams.put(parts.get(i).partName, new String[]{requestPathParts[i]});
} else if (parts.get(i).type == PartType.PLURAL_PARAM) {
- parsedParams.put(parts.get(i).partName, requestPathParts[i].split(","));
+ parsedParams.put(parts.get(i).partName, StringUtils.splitPreserveAllTokens(requestPathParts[i], ','));
}
}
return new RestInvocationWrapper(parsedParams, handler);
Modified: shindig/trunk/java/common/src/test/java/org/apache/shindig/common/JsonSerializerTest.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/common/src/test/java/org/apache/shindig/common/JsonSerializerTest.java?rev=925571&r1=925570&r2=925571&view=diff
==============================================================================
--- shindig/trunk/java/common/src/test/java/org/apache/shindig/common/JsonSerializerTest.java (original)
+++ shindig/trunk/java/common/src/test/java/org/apache/shindig/common/JsonSerializerTest.java Sat Mar 20 10:10:55 2010
@@ -219,7 +219,7 @@ public class JsonSerializerTest {
assertEquals("\"Hello\\u003cworld\\u003efoo \\u003c bar\"", builder.toString());
// Quick sanity check to make sure that this converts back cleanly.
- JSONObject obj = new JSONObject("{foo:" + builder.toString() + '}');
+ JSONObject obj = new JSONObject("{foo:" + builder + '}');
assertEquals("Hello<world>foo < bar", obj.get("foo"));
}
Modified: shindig/trunk/java/common/src/test/java/org/apache/shindig/common/testing/FakeHttpServletRequest.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/common/src/test/java/org/apache/shindig/common/testing/FakeHttpServletRequest.java?rev=925571&r1=925570&r2=925571&view=diff
==============================================================================
--- shindig/trunk/java/common/src/test/java/org/apache/shindig/common/testing/FakeHttpServletRequest.java (original)
+++ shindig/trunk/java/common/src/test/java/org/apache/shindig/common/testing/FakeHttpServletRequest.java Sat Mar 20 10:10:55 2010
@@ -21,6 +21,7 @@ package org.apache.shindig.common.testin
import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
import com.google.common.collect.Sets;
+import org.apache.commons.lang.StringUtils;
import java.io.BufferedReader;
import java.io.ByteArrayInputStream;
@@ -465,22 +466,22 @@ public class FakeHttpServletRequest impl
if (queryString == null && !parameters.isEmpty()) {
boolean hasPrevious = false;
StringBuilder queryString = new StringBuilder();
- for (Map.Entry<String, String[]> stringEntry : parameters.entrySet()) {
+ for (Map.Entry<String, String[]> entry : parameters.entrySet()) {
// We're not interested in blank keys
- if (stringEntry.getKey() == null || stringEntry.getKey().equals("") || postParameters.contains(stringEntry.getKey())) {
+ if (StringUtils.isBlank(entry.getKey()) || postParameters.contains(entry.getKey())) {
continue;
}
if (hasPrevious) {
queryString.append('&');
}
- String[] values = stringEntry.getValue();
+ String[] values = entry.getValue();
// Append the parameters to the query string
if (values.length == 0) {
- queryString.append(URLEncoder.encode(stringEntry.getKey(), "UTF-8"));
+ queryString.append(URLEncoder.encode(entry.getKey(), "UTF-8"));
} else {
for (int i = 0; i < values.length; i++) {
- queryString.append(URLEncoder.encode(stringEntry.getKey(), "UTF-8")).append('=').append(
+ queryString.append(URLEncoder.encode(entry.getKey(), "UTF-8")).append('=').append(
URLEncoder.encode(values[i], "UTF-8"));
if (i < values.length - 1) {
queryString.append('&');
@@ -508,7 +509,7 @@ public class FakeHttpServletRequest impl
public String getRequestURI() {
StringBuilder buf = new StringBuilder();
- if (!contextPath.equals("")) {
+ if (StringUtils.isNotBlank(contextPath)) {
buf.append(contextPath);
}
Modified: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/FetchResponseUtils.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/FetchResponseUtils.java?rev=925571&r1=925570&r2=925571&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/FetchResponseUtils.java (original)
+++ shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/FetchResponseUtils.java Sat Mar 20 10:10:55 2010
@@ -57,7 +57,7 @@ public class FetchResponseUtils {
Map<String, Collection<String>> headers = Maps.newHashMap();
addHeaders(headers, response, "set-cookie");
addHeaders(headers, response, "location");
- if (headers.size() > 0) {
+ if (!headers.isEmpty()) {
resp.put("headers", headers);
}
// Merge in additional response data
Modified: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/features/BrowserSpecificFeatureResource.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/features/BrowserSpecificFeatureResource.java?rev=925571&r1=925570&r2=925571&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/features/BrowserSpecificFeatureResource.java (original)
+++ shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/features/BrowserSpecificFeatureResource.java Sat Mar 20 10:10:55 2010
@@ -93,7 +93,7 @@ public class BrowserSpecificFeatureResou
// If browser-specific (ie. browserMatch has some qualifiers in it), not proxy cacheable
// (since the vast majority of browsers don't support Vary: User-Agent, we just say "false")
// Otherwise, delegate this call.
- return browserMatch.size() > 0 ? false : delegate.isProxyCacheable();
+ return browserMatch.isEmpty() ? delegate.isProxyCacheable() : false;
}
private boolean browserMatches() {
Modified: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/features/FeatureRegistry.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/features/FeatureRegistry.java?rev=925571&r1=925570&r2=925571&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/features/FeatureRegistry.java (original)
+++ shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/features/FeatureRegistry.java Sat Mar 20 10:10:55 2010
@@ -345,7 +345,7 @@ public class FeatureRegistry {
private boolean containerMatch(String containerAttrib, String container) {
Set<String> containers = Sets.newHashSet();
- for (String attr : containerAttrib.split(",")) {
+ for (String attr : StringUtils.split(containerAttrib, ',')) {
containers.add(attr.trim());
}
return containers.contains(container);
@@ -384,7 +384,7 @@ public class FeatureRegistry {
}
}
- if (problems.size() > 0) {
+ if (!problems.isEmpty()) {
StringBuilder sb = new StringBuilder();
sb.append("Problems found processing features:\n");
for (String problem : problems) {
Modified: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/BasicHttpFetcher.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/BasicHttpFetcher.java?rev=925571&r1=925570&r2=925571&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/BasicHttpFetcher.java (original)
+++ shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/BasicHttpFetcher.java Sat Mar 20 10:10:55 2010
@@ -271,7 +271,7 @@ public class BasicHttpFetcher implements
"Missing schema for request: " + uri,
HttpServletResponse.SC_BAD_REQUEST);
}
- String[] hostparts = uri.getAuthority().split(":");
+ String[] hostparts = StringUtils.splitPreserveAllTokens(uri.getAuthority(),':');
int port = -1; // default port
if (hostparts.length > 2) {
throw new GadgetException(GadgetException.Code.INVALID_USER_DATA,
@@ -290,7 +290,7 @@ public class BasicHttpFetcher implements
HttpHost host = new HttpHost(hostparts[0], port, uri.getScheme());
String requestUri = uri.getPath();
if (uri.getQuery() != null) {
- requestUri += "?" + uri.getQuery();
+ requestUri += '?' + uri.getQuery();
}
try {
Modified: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/parse/GadgetHtmlParser.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/parse/GadgetHtmlParser.java?rev=925571&r1=925570&r2=925571&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/parse/GadgetHtmlParser.java (original)
+++ shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/parse/GadgetHtmlParser.java Sat Mar 20 10:10:55 2010
@@ -220,7 +220,7 @@ public abstract class GadgetHtmlParser {
}
protected void prependToNode(Node to, LinkedList<Node> from) {
- while (from.size() > 0) {
+ while (!from.isEmpty()) {
to.insertBefore(from.removeLast(), to.getFirstChild());
}
}
Modified: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/parse/caja/CajaHtmlParser.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/parse/caja/CajaHtmlParser.java?rev=925571&r1=925570&r2=925571&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/parse/caja/CajaHtmlParser.java (original)
+++ shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/parse/caja/CajaHtmlParser.java Sat Mar 20 10:10:55 2010
@@ -94,7 +94,7 @@ public class CajaHtmlParser extends Gadg
if (mq.hasMessageAtLevel(MessageLevel.ERROR)) {
StringBuilder err = new StringBuilder();
for (Message m : mq.getMessages()) {
- err.append(m.toString()).append("\n");
+ err.append(m.toString()).append('\n');
}
throw new GadgetException(GadgetException.Code.HTML_PARSE_ERROR, err.toString(),
HttpResponse.SC_BAD_REQUEST);
Modified: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/parse/nekohtml/NekoSimplifiedHtmlParser.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/parse/nekohtml/NekoSimplifiedHtmlParser.java?rev=925571&r1=925570&r2=925571&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/parse/nekohtml/NekoSimplifiedHtmlParser.java (original)
+++ shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/parse/nekohtml/NekoSimplifiedHtmlParser.java Sat Mar 20 10:10:55 2010
@@ -203,7 +203,7 @@ public class NekoSimplifiedHtmlParser ex
html.insertBefore(body, head.getNextSibling());
}
Node bodyFirst = body.getFirstChild();
- while (headScripts.size() > 0) {
+ while (!headScripts.isEmpty()) {
Node headScript = headScripts.pop();
head.removeChild(headScript);
body.insertBefore(headScript, bodyFirst);
@@ -490,7 +490,7 @@ public class NekoSimplifiedHtmlParser ex
* force it to be reparsed.
* -
*/
- private class NormalizingTagBalancer extends HTMLTagBalancer {
+ private static class NormalizingTagBalancer extends HTMLTagBalancer {
private StringBuilder scriptContent;
Modified: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/render/RenderingGadgetRewriter.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/render/RenderingGadgetRewriter.java?rev=925571&r1=925570&r2=925571&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/render/RenderingGadgetRewriter.java (original)
+++ shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/render/RenderingGadgetRewriter.java Sat Mar 20 10:10:55 2010
@@ -284,7 +284,7 @@ public class RenderingGadgetRewriter imp
if (!externGadgetLibs.isEmpty()) {
String jsUrl = urlGenerator.getBundledJsUrl(externGadgetLibs, context);
Element libsTag = headTag.getOwnerDocument().createElement("script");
- libsTag.setAttribute("src", jsUrl.replaceAll("&", "&"));
+ libsTag.setAttribute("src", StringUtils.replace(jsUrl, "&", "&"));
headTag.appendChild(libsTag);
}
} else {
@@ -329,7 +329,7 @@ public class RenderingGadgetRewriter imp
inlineJs.setLength(0);
}
Element referenceTag = headTag.getOwnerDocument().createElement("script");
- referenceTag.setAttribute("src", theContent.replaceAll("&", "&"));
+ referenceTag.setAttribute("src", StringUtils.replace(theContent, "&", "&"));
headTag.appendChild(referenceTag);
} else {
inlineJs.append(theContent).append(";\n");
Modified: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/StyleTagExtractorVisitor.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/StyleTagExtractorVisitor.java?rev=925571&r1=925570&r2=925571&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/StyleTagExtractorVisitor.java (original)
+++ shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/StyleTagExtractorVisitor.java Sat Mar 20 10:10:55 2010
@@ -58,7 +58,7 @@ public class StyleTagExtractorVisitor im
public boolean revisit(Gadget gadget, List<Node> nodes)
throws RewritingException {
boolean mutated = false;
- if (nodes.size() == 0) {
+ if (nodes.isEmpty()) {
return mutated;
}
Modified: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/TemplateRewriter.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/TemplateRewriter.java?rev=925571&r1=925570&r2=925571&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/TemplateRewriter.java (original)
+++ shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/TemplateRewriter.java Sat Mar 20 10:10:55 2010
@@ -294,8 +294,7 @@ public class TemplateRewriter implements
continue;
}
- // TODO: split() is a regex compile, and should be avoided
- String [] nameParts = template.getAttribute("tag").split(":");
+ String [] nameParts = StringUtils.splitPreserveAllTokens(template.getAttribute("tag"), ':');
// At this time, we only support
if (nameParts.length != 2) {
continue;
Modified: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/image/BaseOptimizer.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/image/BaseOptimizer.java?rev=925571&r1=925570&r2=925571&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/image/BaseOptimizer.java (original)
+++ shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/image/BaseOptimizer.java Sat Mar 20 10:10:55 2010
@@ -106,7 +106,7 @@ abstract class BaseOptimizer {
rewriteImpl(image);
time = System.currentTimeMillis() - time;
if (minBytes != null && minBytes.length != 0) {
- StringBuilder rewriteMsg = new StringBuilder();
+ StringBuilder rewriteMsg = new StringBuilder(24);
rewriteMsg.append("c=").append(
((minBytes.length * 100) / originalResponse.getContentLength()));
if (!getOutputContentType().equals(getOriginalContentType())) {
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=925571&r1=925570&r2=925571&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 Sat Mar 20 10:10:55 2010
@@ -80,7 +80,7 @@ public class ConcatLinkRewriter {
if (paramIndex == 1) {
builder = new StringBuilder(concatBase);
- builder.append("container=").append(container).append("&");
+ builder.append("container=").append(container).append('&');
if (debug)
builder.append("debug=1&");
if (ignoreCache)
Modified: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/ConcatProxyServlet.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/ConcatProxyServlet.java?rev=925571&r1=925570&r2=925571&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/ConcatProxyServlet.java (original)
+++ shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/ConcatProxyServlet.java Sat Mar 20 10:10:55 2010
@@ -149,7 +149,7 @@ public class ConcatProxyServlet extends
err.append(errorMessage);
}
if (uri != null) {
- err.append(" (").append(uri.toString()).append(")");
+ err.append(" (").append(uri.toString()).append(')');
}
err.append(" ---- */");
Modified: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/JsonRpcHandler.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/JsonRpcHandler.java?rev=925571&r1=925570&r2=925571&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/JsonRpcHandler.java (original)
+++ shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/JsonRpcHandler.java Sat Mar 20 10:10:55 2010
@@ -162,7 +162,7 @@ public class JsonRpcHandler {
.put("preferredHeight", view.getPreferredHeight())
.put("preferredWidth", view.getPreferredWidth());
Map<String, String> vattrs = view.getAttributes();
- if(vattrs.size()>0){
+ if (!vattrs.isEmpty()){
JSONObject ja = new JSONObject(vattrs);
jv.put("attributes", ja);
}
Modified: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/OAuthCallbackServlet.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/OAuthCallbackServlet.java?rev=925571&r1=925570&r2=925571&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/OAuthCallbackServlet.java (original)
+++ shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/OAuthCallbackServlet.java Sat Mar 20 10:10:55 2010
@@ -94,8 +94,8 @@ public class OAuthCallbackServlet extend
// Copy the query parameters from this URL over to the real URL.
UriBuilder realUri = UriBuilder.parse(callbackState.getRealCallbackUrl());
Map<String, List<String>> params = UriBuilder.splitParameters(req.getQueryString());
- for (String param : params.keySet()) {
- realUri.putQueryParameter(param, params.get(param));
+ for (Map.Entry<String, List<String>> entry : params.entrySet()) {
+ realUri.putQueryParameter(entry.getKey(), entry.getValue());
}
realUri.removeQueryParameter(CALLBACK_STATE_PARAM);
HttpUtil.setCachingHeaders(resp, ONE_HOUR_IN_SECONDS, true);
Modified: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/spec/Icon.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/spec/Icon.java?rev=925571&r1=925570&r2=925571&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/spec/Icon.java (original)
+++ shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/spec/Icon.java Sat Mar 20 10:10:55 2010
@@ -71,7 +71,7 @@ public class Icon {
@Override
public String toString() {
- StringBuilder buf = new StringBuilder();
+ StringBuilder buf = new StringBuilder(32 + type.length() + content.length());
buf.append("<Icon type='").append(type).append('\'');
if (mode != null) {
buf.append(" mode='").append(mode).append('\'');
Modified: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/templates/XmlTemplateLibrary.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/templates/XmlTemplateLibrary.java?rev=925571&r1=925570&r2=925571&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/templates/XmlTemplateLibrary.java (original)
+++ shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/templates/XmlTemplateLibrary.java Sat Mar 20 10:10:55 2010
@@ -21,6 +21,7 @@ package org.apache.shindig.gadgets.templ
import com.google.common.collect.ImmutableSet;
import com.google.common.collect.ImmutableSet.Builder;
+import org.apache.commons.lang.StringUtils;
import org.apache.shindig.common.uri.Uri;
import org.apache.shindig.common.xml.DomUtil;
import org.apache.shindig.gadgets.GadgetException;
@@ -230,7 +231,7 @@ public class XmlTemplateLibrary implemen
private TagHandler createHandler(String tagName, Element template,
Set<TemplateResource> resources)
throws TemplateParserException {
- String [] nameParts = tagName.split(":");
+ String [] nameParts = StringUtils.splitPreserveAllTokens(tagName, ':');
// At this time, we only support namespaced tags
if (nameParts.length != 2) {
return null;
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=925571&r1=925570&r2=925571&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 Sat Mar 20 10:10:55 2010
@@ -64,7 +64,7 @@ public class DefaultConcatUriManager imp
boolean isAdjacent) {
List<ConcatData> concatUris = Lists.newArrayListWithCapacity(resourceUris.size());
- if (resourceUris.size() == 0) {
+ if (resourceUris.isEmpty()) {
return concatUris;
}
Modified: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/uri/DefaultIframeUriManager.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/uri/DefaultIframeUriManager.java?rev=925571&r1=925570&r2=925571&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/uri/DefaultIframeUriManager.java (original)
+++ shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/uri/DefaultIframeUriManager.java Sat Mar 20 10:10:55 2010
@@ -224,7 +224,7 @@ public class DefaultIframeUriManager imp
}
public static final String tplKey(String key) {
- return "%" + key + "%";
+ return '%' + key + '%';
}
/** Overridable methods for custom behavior */
Modified: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/uri/DefaultJsUriManager.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/uri/DefaultJsUriManager.java?rev=925571&r1=925570&r2=925571&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/uri/DefaultJsUriManager.java (original)
+++ shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/uri/DefaultJsUriManager.java Sat Mar 20 10:10:55 2010
@@ -63,7 +63,7 @@ public class DefaultJsUriManager impleme
// Add JS info to path and set it in URI.
StringBuilder jsPath = new StringBuilder(jsPathBase);
if (!jsPathBase.endsWith("/")) {
- jsPath.append("/");
+ jsPath.append('/');
}
jsPath.append(addJsLibs(extern));
jsPath.append(JS_SUFFIX);
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=925571&r1=925570&r2=925571&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 Sat Mar 20 10:10:55 2010
@@ -82,7 +82,7 @@ public class DefaultProxyUriManager impl
public List<Uri> make(List<ProxyUri> resources, Integer forcedRefresh) {
List<Uri> result = Lists.newArrayListWithCapacity(resources.size());
- if (resources.size() == 0) {
+ if (resources.isEmpty()) {
return result;
}
@@ -166,7 +166,7 @@ public class DefaultProxyUriManager impl
queryUri = uriIn;
} else {
// Check for chained query string in the path.
- String containerStr = Param.CONTAINER.getKey() + "=";
+ String containerStr = Param.CONTAINER.getKey() + '=';
String path = uriIn.getPath();
int start = path.indexOf(containerStr);
if (start > 0) {
@@ -182,7 +182,7 @@ public class DefaultProxyUriManager impl
if (container != null) {
String proxyPath = config.getString(container, PROXY_PATH_PARAM);
if (proxyPath != null) {
- String[] chainedChunks = proxyPath.split(CHAINED_PARAMS_TOKEN);
+ String[] chainedChunks = StringUtils.splitByWholeSeparatorPreserveAllTokens(proxyPath, CHAINED_PARAMS_TOKEN);
// Parse out the URI of the actual resource. This URI is found as the
// substring of the "full" URI, after the chained proxy prefix. We
@@ -190,7 +190,7 @@ public class DefaultProxyUriManager impl
// ContainerConfig value, and take the URI as everything beyond that point.
String startToken = chainedChunks[0];
String endToken = "/";
- if (chainedChunks.length == 2) {
+ if (chainedChunks.length == 2 && chainedChunks[1].length() > 0) {
endToken = chainedChunks[1];
}
@@ -221,8 +221,8 @@ public class DefaultProxyUriManager impl
if (StringUtils.isEmpty(uriStr) || StringUtils.isEmpty(container)) {
throw new GadgetException(GadgetException.Code.MISSING_PARAMETER,
"Missing required parameter(s):" +
- (StringUtils.isEmpty(uriStr) ? " " + Param.URL.getKey() : "") +
- (StringUtils.isEmpty(container) ? " " + Param.CONTAINER.getKey() : ""),
+ (StringUtils.isEmpty(uriStr) ? ' ' + Param.URL.getKey() : "") +
+ (StringUtils.isEmpty(container) ? ' ' + Param.CONTAINER.getKey() : ""),
HttpResponse.SC_BAD_REQUEST);
}
Modified: shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/parse/AbstractParsingTestBase.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/parse/AbstractParsingTestBase.java?rev=925571&r1=925570&r2=925571&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/parse/AbstractParsingTestBase.java (original)
+++ shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/parse/AbstractParsingTestBase.java Sat Mar 20 10:10:55 2010
@@ -64,14 +64,14 @@ public abstract class AbstractParsingTes
// care about, such as whitespace deltas and differently-computed escape sequences.
diff_match_patch dmp = new diff_match_patch();
LinkedList<Diff> diffs = dmp.diff_main(expected, serialized);
- while (diffs.size() > 0) {
+ while (!diffs.isEmpty()) {
Diff cur = diffs.removeFirst();
switch (cur.operation) {
case DELETE:
if (StringUtils.isBlank(cur.text) || "amp;".equalsIgnoreCase(cur.text)) {
continue;
}
- if (diffs.size() == 0) {
+ if (diffs.isEmpty()) {
// End of the set: assert known failure.
assertEquals(expected, serialized);
}
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=925571&r1=925570&r2=925571&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 Sat Mar 20 10:10:55 2010
@@ -421,7 +421,7 @@ public class ConcatVisitorTest extends D
assertEquals(7, parent.getChildNodes().getLength());
Element jsConcat = (Element)parent.getChildNodes().item(1);
assertEquals("script", jsConcat.getTagName());
- Uri concatUri = Uri.parse(jsConcat.getAttribute("src").replaceAll("&", "&"));
+ Uri concatUri = Uri.parse(StringUtils.replace(jsConcat.getAttribute("src"), "&", "&"));
assertEquals(CONCAT_BASE_URI.getScheme(), concatUri.getScheme());
assertEquals(CONCAT_BASE_URI.getAuthority(), concatUri.getAuthority());
assertEquals(CONCAT_BASE_URI.getPath(), concatUri.getPath());
Modified: shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/ConcatProxyServletTest.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/ConcatProxyServletTest.java?rev=925571&r1=925570&r2=925571&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/ConcatProxyServletTest.java (original)
+++ shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/ConcatProxyServletTest.java Sat Mar 20 10:10:55 2010
@@ -101,7 +101,7 @@ public class ConcatProxyServletTest exte
* @return simulated hash mapping
*/
private String addVar(String url, String data) {
- return "\"" + url + "\":\"" + data +"\",\r\n";
+ return '\"' + url + "\":\"" + data +"\",\r\n";
}
Modified: shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/ProxyHandlerTest.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/ProxyHandlerTest.java?rev=925571&r1=925570&r2=925571&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/ProxyHandlerTest.java (original)
+++ shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/ProxyHandlerTest.java Sat Mar 20 10:10:55 2010
@@ -73,12 +73,12 @@ public class ProxyHandlerTest extends Se
throws Exception {
setupProxyRequestBase(host);
expect(request.getHeader("Host")).andReturn(host);
- String query = (url != null ? "url=" + Utf8UrlCoder.encode(url) + "&" : "")
+ String query = (url != null ? "url=" + Utf8UrlCoder.encode(url) + '&' : "")
+ "container=default";
String[] params = extraParams;
if (params != null && params.length > 0) {
for (int i = 0; i < params.length; i += 2) {
- query += "&" + params[i] + "=" + Utf8UrlCoder.encode(params[i+1]);
+ query += '&' + params[i] + '=' + Utf8UrlCoder.encode(params[i+1]);
}
}
expect(request.getQueryString()).andReturn(query);
Modified: shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/templates/tags/FlashTagHandlerTest.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/templates/tags/FlashTagHandlerTest.java?rev=925571&r1=925570&r2=925571&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/templates/tags/FlashTagHandlerTest.java (original)
+++ shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/templates/tags/FlashTagHandlerTest.java Sat Mar 20 10:10:55 2010
@@ -253,7 +253,7 @@ public class FlashTagHandlerTest extends
assertTrue(wrapper.getValue("/html/body/span").startsWith("Failed to process os:Flash tag"));
}
- private class MyTemplateProcessor implements TemplateProcessor {
+ private static class MyTemplateProcessor implements TemplateProcessor {
public TemplateContext context;
public DocumentFragment processTemplate(Element template, TemplateContext templateContext,
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=925571&r1=925570&r2=925571&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 Sat Mar 20 10:10:55 2010
@@ -224,7 +224,7 @@ public class DefaultConcatUriManagerTest
manager.setUseStrictParsing("true");
ConcatUriManager.ConcatUri validated =
manager.process(Uri.parse("http://another.com/path?" +
- Param.CONTAINER.getKey() + "=" + CONTAINER + "&type=css"));
+ Param.CONTAINER.getKey() + '=' + CONTAINER + "&type=css"));
assertEquals(UriStatus.BAD_URI, validated.getStatus());
}
@@ -234,7 +234,7 @@ public class DefaultConcatUriManagerTest
manager.setUseStrictParsing("true");
ConcatUriManager.ConcatUri validated =
manager.process(Uri.parse("http://host.com/another?" +
- Param.CONTAINER.getKey() + "=" + CONTAINER + "&type=css"));
+ Param.CONTAINER.getKey() + '=' + CONTAINER + "&type=css"));
assertEquals(UriStatus.BAD_URI, validated.getStatus());
}
@@ -243,7 +243,7 @@ public class DefaultConcatUriManagerTest
DefaultConcatUriManager manager = makeManager("host.com", "/path", null, null);
ConcatUriManager.ConcatUri validated =
manager.process(
- Uri.parse("http://host.com/path?" + Param.CONTAINER.getKey() + "=" + CONTAINER +
+ Uri.parse("http://host.com/path?" + Param.CONTAINER.getKey() + '=' + CONTAINER +
"&1=!!!"));
assertEquals(UriStatus.BAD_URI, validated.getStatus());
}
@@ -253,7 +253,7 @@ public class DefaultConcatUriManagerTest
DefaultConcatUriManager manager = makeManager("host.com", "/path", null, null);
ConcatUriManager.ConcatUri validated =
manager.process(
- Uri.parse("http://host.com/path?" + Param.CONTAINER.getKey() + "=" + CONTAINER +
+ Uri.parse("http://host.com/path?" + Param.CONTAINER.getKey() + '=' + CONTAINER +
"&1=http://legit.com/1.dat"));
assertEquals(UriStatus.BAD_URI, validated.getStatus());
}
@@ -263,7 +263,7 @@ public class DefaultConcatUriManagerTest
DefaultConcatUriManager manager = makeManager("host.com", "/path", null, null);
ConcatUriManager.ConcatUri validated =
manager.process(
- Uri.parse("http://host.com/path?" + Param.CONTAINER.getKey() + "=" + CONTAINER +
+ Uri.parse("http://host.com/path?" + Param.CONTAINER.getKey() + '=' + CONTAINER +
"&1=http://legit.com/1.dat&" + Param.TYPE.getKey() + "=NOTATYPE"));
assertEquals(UriStatus.BAD_URI, validated.getStatus());
}
@@ -273,7 +273,7 @@ public class DefaultConcatUriManagerTest
DefaultConcatUriManager manager = makeManager("host.com", "/path", null, null);
ConcatUriManager.ConcatUri validated =
manager.process(
- Uri.parse("http://host.com/path?" + Param.CONTAINER.getKey() + "=" + CONTAINER +
+ Uri.parse("http://host.com/path?" + Param.CONTAINER.getKey() + '=' + CONTAINER +
"&1=http://legit.com/1.dat&" + Param.TYPE.getKey() + "=NOTATYPE&rewriteMime=text/css"));
assertEquals(UriStatus.VALID_UNVERSIONED, validated.getStatus());
assertEquals(ConcatUriManager.Type.CSS, validated.getType());
@@ -315,9 +315,9 @@ public class DefaultConcatUriManagerTest
DefaultConcatUriManager manager = makeManager("host.com", "/path", null, versioner);
ConcatUriManager.ConcatUri validated =
manager.process(
- Uri.parse("http://host.com/path?" + Param.CONTAINER.getKey() + "=" + CONTAINER +
+ Uri.parse("http://host.com/path?" + Param.CONTAINER.getKey() + '=' + CONTAINER +
"&1=http://legit.com/1.dat&2=http://another.com/2.dat&" + Param.TYPE.getKey() +
- "=" + type.getType() + "&" + Param.JSON.getKey() +
+ '=' + type.getType() + '&' + Param.JSON.getKey() +
"=split&" + Param.GADGET.getKey() + "=http://www.gadget.com/g.xml&" +
Param.REFRESH.getKey() + "=123"));
assertEquals(UriStatus.VALID_UNVERSIONED, validated.getStatus());
@@ -336,9 +336,9 @@ public class DefaultConcatUriManagerTest
DefaultConcatUriManager manager = makeManager("host.com", "/path", null, versioner);
ConcatUriManager.ConcatUri validated =
manager.process(
- Uri.parse("http://host.com/path?" + Param.CONTAINER.getKey() + "=" + CONTAINER +
- "&1=http://legit.com/1.dat&2=http://another.com/2.dat&" + Param.TYPE.getKey() + "="
- + type.getType() + "&" + Param.VERSION.getKey() + "=something&" + Param.JSON.getKey() +
+ Uri.parse("http://host.com/path?" + Param.CONTAINER.getKey() + '=' + CONTAINER +
+ "&1=http://legit.com/1.dat&2=http://another.com/2.dat&" + Param.TYPE.getKey() + '='
+ + type.getType() + '&' + Param.VERSION.getKey() + "=something&" + Param.JSON.getKey() +
"=split&" + Param.GADGET.getKey() + "=http://www.gadget.com/g.xml&" +
Param.REFRESH.getKey() + "=123"));
assertEquals(status, validated.getStatus());
Modified: shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/uri/DefaultJsUriManagerTest.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/uri/DefaultJsUriManagerTest.java?rev=925571&r1=925570&r2=925571&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/uri/DefaultJsUriManagerTest.java (original)
+++ shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/uri/DefaultJsUriManagerTest.java Sat Mar 20 10:10:55 2010
@@ -161,8 +161,8 @@ public class DefaultJsUriManagerTest {
String targetHost = "target-host.org";
ContainerConfig config = mockConfig("http://" + targetHost, "/gadgets/js");
TestDefaultJsUriManager manager = makeManager(config, null);
- Uri testUri = Uri.parse("http://other-host.org/gadgets/js/feature" + JS_SUFFIX + "?" +
- Param.CONTAINER.getKey() + "=" + CONTAINER);
+ Uri testUri = Uri.parse("http://other-host.org/gadgets/js/feature" + JS_SUFFIX + '?' +
+ Param.CONTAINER.getKey() + '=' + CONTAINER);
JsUri jsUri = manager.processExternJsUri(testUri);
assertTrue(manager.hadError());
assertEquals(jsUri.getStatus(), UriStatus.BAD_URI);
@@ -174,8 +174,8 @@ public class DefaultJsUriManagerTest {
String targetHost = "target-host.org";
ContainerConfig config = mockConfig("http://" + targetHost, "/gadgets/js");
TestDefaultJsUriManager manager = makeManager(config, null);
- Uri testUri = Uri.parse("http://target-host.org/gadgets/other-js/feature" + JS_SUFFIX + "?" +
- Param.CONTAINER.getKey() + "=" + CONTAINER);
+ Uri testUri = Uri.parse("http://target-host.org/gadgets/other-js/feature" + JS_SUFFIX + '?' +
+ Param.CONTAINER.getKey() + '=' + CONTAINER);
JsUri jsUri = manager.processExternJsUri(testUri);
assertTrue(manager.hadError());
assertEquals(jsUri.getStatus(), UriStatus.BAD_URI);
@@ -188,7 +188,7 @@ public class DefaultJsUriManagerTest {
ContainerConfig config = mockConfig("http://" + targetHost, "/gadgets/js");
TestDefaultJsUriManager manager = makeManager(config, null);
Uri testUri = Uri.parse("http://target-host.org/gadgets/js/feature.gif?" +
- Param.CONTAINER.getKey() + "=" + CONTAINER);
+ Param.CONTAINER.getKey() + '=' + CONTAINER);
JsUri jsUri = manager.processExternJsUri(testUri);
assertTrue(manager.hadError());
assertEquals(jsUri.getStatus(), UriStatus.BAD_URI);
@@ -203,8 +203,8 @@ public class DefaultJsUriManagerTest {
String version = "verstring";
TestDefaultJsUriManager manager = makeManager(config, null);
Uri testUri = Uri.parse("http://target-host.org/gadgets/js/" + addJsLibs(extern) +
- JS_SUFFIX + "?" + Param.CONTAINER.getKey() + "=" + CONTAINER + "&" +
- Param.VERSION.getKey() + "=" + version);
+ JS_SUFFIX + '?' + Param.CONTAINER.getKey() + '=' + CONTAINER + '&' +
+ Param.VERSION.getKey() + '=' + version);
JsUri jsUri = manager.processExternJsUri(testUri);
assertFalse(manager.hadError());
assertEquals(jsUri.getStatus(), UriStatus.VALID_UNVERSIONED);
@@ -221,8 +221,8 @@ public class DefaultJsUriManagerTest {
Versioner versioner = mockVersioner(extern, version, badVersion);
TestDefaultJsUriManager manager = makeManager(config, versioner);
Uri testUri = Uri.parse("http://target-host.org/gadgets/js/" + addJsLibs(extern) +
- JS_SUFFIX + "?" + Param.CONTAINER.getKey() + "=" + CONTAINER + "&" +
- Param.VERSION.getKey() + "=" + badVersion);
+ JS_SUFFIX + '?' + Param.CONTAINER.getKey() + '=' + CONTAINER + '&' +
+ Param.VERSION.getKey() + '=' + badVersion);
JsUri jsUri = manager.processExternJsUri(testUri);
assertFalse(manager.hadError());
assertEquals(jsUri.getStatus(), UriStatus.INVALID_VERSION);
@@ -238,7 +238,7 @@ public class DefaultJsUriManagerTest {
Versioner versioner = mockVersioner(extern, version, version);
TestDefaultJsUriManager manager = makeManager(config, versioner);
Uri testUri = Uri.parse("http://target-host.org/gadgets/js/" + addJsLibs(extern) +
- JS_SUFFIX + "?" + Param.CONTAINER.getKey() + "=" + CONTAINER);
+ JS_SUFFIX + '?' + Param.CONTAINER.getKey() + '=' + CONTAINER);
JsUri jsUri = manager.processExternJsUri(testUri);
assertFalse(manager.hadError());
assertEquals(jsUri.getStatus(), UriStatus.VALID_UNVERSIONED);
@@ -254,8 +254,8 @@ public class DefaultJsUriManagerTest {
Versioner versioner = mockVersioner(extern, version, version);
TestDefaultJsUriManager manager = makeManager(config, versioner);
Uri testUri = Uri.parse("http://target-host.org/gadgets/js/" + addJsLibs(extern) +
- JS_SUFFIX + "?" + Param.CONTAINER.getKey() + "=" + CONTAINER + "&" +
- Param.VERSION.getKey() + "=" + version);
+ JS_SUFFIX + '?' + Param.CONTAINER.getKey() + '=' + CONTAINER + '&' +
+ Param.VERSION.getKey() + '=' + version);
JsUri jsUri = manager.processExternJsUri(testUri);
assertFalse(manager.hadError());
assertEquals(jsUri.getStatus(), UriStatus.VALID_VERSIONED);