Author: lindner
Date: Thu Jul 10 12:27:37 2008
New Revision: 675689
URL: http://svn.apache.org/viewvc?rev=675689&view=rev
Log:
Many small cleanups-
* Use chars instead of strings of length 1
* Avoid instantiating lots of empty byte arrays
* Use Java 1.5 for loops in a few places
* lightgrey vs lightgray
Modified:
incubator/shindig/trunk/features/core/config.js
incubator/shindig/trunk/java/common/pom.xml
incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/common/testing/FakeHttpServletRequest.java
incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/common/util/StringEncoding.java
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/FeedProcessor.java
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/GadgetFeatureRegistry.java
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/GadgetServer.java
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/BasicHttpFetcher.java
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/HttpRequest.java
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/HttpResponse.java
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth/GadgetOAuthTokenStore.java
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/JavascriptTagMerger.java
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/ConcatProxyServlet.java
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/GadgetRenderingTask.java
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/spec/Feature.java
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/spec/LocaleSpec.java
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/spec/ModulePrefs.java
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/spec/OAuthService.java
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/spec/Preload.java
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/http/BasicHttpCacheTest.java
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/oauth/FakeOAuthServiceProvider.java
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/oauth/GadgetTokenStoreTest.java
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/GadgetRenderingTaskTest.java
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/JsonRpcHandlerTest.java
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/UrlGeneratorTest.java
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/spec/PreloadTest.java
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/spec/ViewTest.java
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/abdera/json/JSONFilter.java
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/dataservice/DataServiceServlet.java
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/dataservice/RequestItem.java
incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/dataservice/DataServiceServletTest.java
incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/dataservice/integration/RestfulBatchTest.java
incubator/shindig/trunk/site/index.html
Modified: incubator/shindig/trunk/features/core/config.js
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/features/core/config.js?rev=675689&r1=675688&r2=675689&view=diff
==============================================================================
--- incubator/shindig/trunk/features/core/config.js (original)
+++ incubator/shindig/trunk/features/core/config.js Thu Jul 10 12:27:37 2008
@@ -160,7 +160,6 @@
}
}
}
- return false;
},
/**
Modified: incubator/shindig/trunk/java/common/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/common/pom.xml?rev=675689&r1=675688&r2=675689&view=diff
==============================================================================
--- incubator/shindig/trunk/java/common/pom.xml (original)
+++ incubator/shindig/trunk/java/common/pom.xml Thu Jul 10 12:27:37 2008
@@ -53,11 +53,15 @@
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
</dependency>
- <dependency>
+ <dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
</dependency>
- <dependency>
+ <dependency>
+ <artifactId>commons-lang</artifactId>
+ <groupId>commons-lang</groupId>
+ </dependency>
+ <dependency>
<groupId>org.hamcrest</groupId>
<artifactId>hamcrest-all</artifactId>
</dependency>
Modified:
incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/common/testing/FakeHttpServletRequest.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/common/testing/FakeHttpServletRequest.java?rev=675689&r1=675688&r2=675689&view=diff
==============================================================================
---
incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/common/testing/FakeHttpServletRequest.java
(original)
+++
incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/common/testing/FakeHttpServletRequest.java
Thu Jul 10 12:27:37 2008
@@ -154,7 +154,7 @@
} else {
// Look for the second slash which separates the servlet path from the
// context path. e.g. "/foo/bar"
- int secondSlash = path.indexOf("/", 1);
+ int secondSlash = path.indexOf('/', 1);
if (secondSlash < 0) {
// No second slash
contextPath = path;
@@ -212,11 +212,11 @@
public FakeHttpServletRequest setHeader(String name, String value) {
if (name.equals(COOKIE_HEADER)) {
String[] pairs = splitAndTrim(value, ";");
- for (int i = 0; i < pairs.length; i++) {
- int equalsPos = pairs[i].indexOf('=');
+ for (String pair : pairs) {
+ int equalsPos = pair.indexOf('=');
if (equalsPos != -1) {
- String cookieName = pairs[i].substring(0, equalsPos);
- String cookieValue = pairs[i].substring(equalsPos + 1);
+ String cookieName = pair.substring(0, equalsPos);
+ String cookieValue = pair.substring(equalsPos + 1);
addToCookieMap(new Cookie(cookieName, cookieValue));
}
}
@@ -276,7 +276,7 @@
sb.append("; ");
}
sb.append(c.getName());
- sb.append("=");
+ sb.append('=');
sb.append(c.getValue());
isFirst = false;
}
@@ -413,7 +413,7 @@
return format.parse(value).getTime();
} catch (ParseException e) {
throw new IllegalArgumentException("Cannot parse number from header "
- + name + ":" + value, e);
+ + name + ':' + value, e);
}
}
@@ -468,32 +468,30 @@
if (queryString == null && !parameters.isEmpty()) {
boolean hasPrevious = false;
StringBuilder queryString = new StringBuilder();
- for (Iterator<String> it = parameters.keySet().iterator();
it.hasNext();) {
- String key = it.next();
-
+ for (String key : parameters.keySet()) {
// We're not interested in blank keys
if (key == null || key.equals("") || postParameters.contains(key)) {
continue;
}
if (hasPrevious) {
- queryString.append("&");
+ queryString.append('&');
}
-
+
String[] values = parameters.get(key);
// Append the parameters to the query string
if (values.length == 0) {
queryString.append(URLEncoder.encode(key, "UTF-8"));
} else {
for (int i = 0; i < values.length; i++) {
- queryString.append(URLEncoder.encode(key,
"UTF-8")).append("=").append(
- URLEncoder.encode(values[i], "UTF-8"));
+ queryString.append(URLEncoder.encode(key,
"UTF-8")).append('=').append(
+ URLEncoder.encode(values[i], "UTF-8"));
if (i < values.length - 1) {
- queryString.append("&");
+ queryString.append('&');
}
}
}
hasPrevious = true;
-
+
}
this.queryString = queryString.toString();
}
@@ -512,7 +510,7 @@
}
public String getRequestURI() {
- StringBuffer buf = new StringBuffer();
+ StringBuilder buf = new StringBuilder();
if (!contextPath.equals("")) {
buf.append(contextPath);
}
Modified:
incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/common/util/StringEncoding.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/common/util/StringEncoding.java?rev=675689&r1=675688&r2=675689&view=diff
==============================================================================
---
incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/common/util/StringEncoding.java
(original)
+++
incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/common/util/StringEncoding.java
Thu Jul 10 12:27:37 2008
@@ -18,6 +18,8 @@
*/
package org.apache.shindig.common.util;
+import org.apache.commons.lang.ArrayUtils;
+
import java.util.Arrays;
import java.util.TreeSet;
@@ -80,7 +82,7 @@
/** Decodes the given encoded string and returns the original raw bytes. */
public byte[] decode(String encoded) {
if (encoded.length() == 0) {
- return new byte[0];
+ return ArrayUtils.EMPTY_BYTE_ARRAY;
}
int encodedLength = encoded.length();
int outLength = encodedLength * SHIFT / 8;
Modified:
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/FeedProcessor.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/FeedProcessor.java?rev=675689&r1=675688&r2=675689&view=diff
==============================================================================
---
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/FeedProcessor.java
(original)
+++
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/FeedProcessor.java
Thu Jul 10 12:27:37 2008
@@ -58,7 +58,7 @@
List<SyndPerson> authors = feed.getAuthors();
String jsonAuthor = null;
- if (authors != null && authors.size() > 0) {
+ if (authors != null && !authors.isEmpty()) {
SyndPerson author = authors.get(0);
if (author.getName() != null) {
jsonAuthor = author.getName();
Modified:
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/GadgetFeatureRegistry.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/GadgetFeatureRegistry.java?rev=675689&r1=675688&r2=675689&view=diff
==============================================================================
---
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/GadgetFeatureRegistry.java
(original)
+++
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/GadgetFeatureRegistry.java
Thu Jul 10 12:27:37 2008
@@ -144,7 +144,7 @@
}
}
}
- if (unsupported == null || unsupported.size() == 0) {
+ if (unsupported == null || unsupported.isEmpty()) {
cache.put(needed, Collections.unmodifiableList(ret));
}
return ret;
Modified:
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/GadgetServer.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/GadgetServer.java?rev=675689&r1=675688&r2=675689&view=diff
==============================================================================
---
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/GadgetServer.java
(original)
+++
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/GadgetServer.java
Thu Jul 10 12:27:37 2008
@@ -171,7 +171,7 @@
Set<String> needed = features.keySet();
Set<String> unsupported = new HashSet<String>();
Collection<GadgetFeature> feats = registry.getFeatures(needed,
unsupported);
- if (unsupported.size() > 0) {
+ if (!unsupported.isEmpty()) {
for (String missing : unsupported) {
if (features.get(missing).getRequired()) {
throw new UnsupportedFeatureException(missing);
Modified:
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/BasicHttpFetcher.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/BasicHttpFetcher.java?rev=675689&r1=675688&r2=675689&view=diff
==============================================================================
---
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/BasicHttpFetcher.java
(original)
+++
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/BasicHttpFetcher.java
Thu Jul 10 12:27:37 2008
@@ -21,6 +21,7 @@
import com.google.inject.Singleton;
import org.apache.commons.io.IOUtils;
+import org.apache.commons.lang.ArrayUtils;
import java.io.ByteArrayInputStream;
import java.io.IOException;
@@ -123,7 +124,7 @@
}
if (baseIs == null) {
// Fall back to zero length response.
- baseIs = new ByteArrayInputStream(new byte[0]);
+ baseIs = new ByteArrayInputStream(ArrayUtils.EMPTY_BYTE_ARRAY);
}
String encoding = fetcher.getContentEncoding();
Modified:
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/HttpRequest.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/HttpRequest.java?rev=675689&r1=675688&r2=675689&view=diff
==============================================================================
---
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/HttpRequest.java
(original)
+++
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/HttpRequest.java
Thu Jul 10 12:27:37 2008
@@ -20,6 +20,7 @@
package org.apache.shindig.gadgets.http;
import org.apache.shindig.gadgets.rewrite.ContentRewriter;
+import org.apache.commons.lang.ArrayUtils;
import java.io.ByteArrayInputStream;
import java.io.InputStream;
@@ -188,7 +189,7 @@
this.headers = Collections.unmodifiableMap(tmpHeaders);
}
if (postBody == null) {
- this.postBody = new byte[0];
+ this.postBody = ArrayUtils.EMPTY_BYTE_ARRAY;
} else {
this.postBody = new byte[postBody.length];
System.arraycopy(postBody, 0, this.postBody, 0, postBody.length);
Modified:
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/HttpResponse.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/HttpResponse.java?rev=675689&r1=675688&r2=675689&view=diff
==============================================================================
---
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/HttpResponse.java
(original)
+++
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/HttpResponse.java
Thu Jul 10 12:27:37 2008
@@ -18,6 +18,7 @@
package org.apache.shindig.gadgets.http;
import org.apache.shindig.common.util.DateUtil;
+import org.apache.commons.lang.ArrayUtils;
import com.google.inject.Inject;
import com.google.inject.name.Named;
@@ -91,7 +92,7 @@
* Create a dummy empty map. Access via HttpResponse.ERROR
*/
public HttpResponse(int statusCode) {
- this(statusCode, new byte[0], null);
+ this(statusCode, ArrayUtils.EMPTY_BYTE_ARRAY, null);
}
/**
@@ -103,7 +104,7 @@
Map<String, List<String>> headers) {
this.httpStatusCode = httpStatusCode;
if (responseBytes == null) {
- this.responseBytes = new byte[0];
+ this.responseBytes = ArrayUtils.EMPTY_BYTE_ARRAY;
} else {
this.responseBytes = new byte[responseBytes.length];
System.arraycopy(
Modified:
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth/GadgetOAuthTokenStore.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth/GadgetOAuthTokenStore.java?rev=675689&r1=675688&r2=675689&view=diff
==============================================================================
---
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth/GadgetOAuthTokenStore.java
(original)
+++
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth/GadgetOAuthTokenStore.java
Thu Jul 10 12:27:37 2008
@@ -210,9 +210,9 @@
message.append("'. Known services: ");
Iterator<String> known = oauthSpec.getServices().keySet().iterator();
while (known.hasNext()) {
- message.append("'");
+ message.append('\'');
message.append(known.next());
- message.append("'");
+ message.append('\'');
if (known.hasNext()) {
message.append(", ");
}
Modified:
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/JavascriptTagMerger.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/JavascriptTagMerger.java?rev=675689&r1=675688&r2=675689&view=diff
==============================================================================
---
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/JavascriptTagMerger.java
(original)
+++
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/JavascriptTagMerger.java
Thu Jul 10 12:27:37 2008
@@ -42,7 +42,7 @@
private final static int MAX_URL_LENGTH = 1500;
- private final List scripts = new ArrayList();
+ private final List<Object> scripts = new ArrayList<Object>();
private final String concatBase;
@@ -66,7 +66,7 @@
+ Utf8UrlCoder.encode(spec.getUrl().toString())
+ "&fp="
+ rewriterFeature.getFingerprint()
- + "&";
+ + '&';
this.relativeUrlBase = relativeUrlBase;
}
Modified:
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/ConcatProxyServlet.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/ConcatProxyServlet.java?rev=675689&r1=675688&r2=675689&view=diff
==============================================================================
---
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/ConcatProxyServlet.java
(original)
+++
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/ConcatProxyServlet.java
Thu Jul 10 12:27:37 2008
@@ -43,7 +43,7 @@
private static final Logger logger
= Logger.getLogger(ConcatProxyServlet.class.getName());
- private ProxyHandler proxyHandler;
+ private transient ProxyHandler proxyHandler;
@Inject
public void setProxyHandler(ProxyHandler proxyHandler) {
@@ -95,7 +95,7 @@
}
/** Simple request wrapper to make repeated calls to ProxyHandler */
- private class RequestWrapper extends HttpServletRequestWrapper {
+ private static class RequestWrapper extends HttpServletRequestWrapper {
private final String url;
@@ -117,7 +117,7 @@
* Wrap the response to prevent writing through of the status code and
* to hold a reference to the stream across multiple proxied parts
*/
- private class ResponseWrapper extends HttpServletResponseWrapper {
+ private static class ResponseWrapper extends HttpServletResponseWrapper {
private ServletOutputStream outputStream;
Modified:
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/GadgetRenderingTask.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/GadgetRenderingTask.java?rev=675689&r1=675688&r2=675689&view=diff
==============================================================================
---
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/GadgetRenderingTask.java
(original)
+++
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/GadgetRenderingTask.java
Thu Jul 10 12:27:37 2008
@@ -359,11 +359,11 @@
// Necessary to avoid double-URL-encoding of the JavaScript bundle portion
of the query.
StringBuilder redirectHref = new StringBuilder(href.toString());
if (query.toString() != null ) {
- redirectHref.append("?");
+ redirectHref.append('?');
redirectHref.append(query.toString());
}
if (fragment != null) {
- redirectHref.append("#");
+ redirectHref.append('#');
redirectHref.append(fragment);
}
response.sendRedirect(redirectHref.toString());
Modified:
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/spec/Feature.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/spec/Feature.java?rev=675689&r1=675688&r2=675689&view=diff
==============================================================================
---
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/spec/Feature.java
(original)
+++
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/spec/Feature.java
Thu Jul 10 12:27:37 2008
@@ -96,7 +96,7 @@
this.name = name;
NodeList children = feature.getElementsByTagName("Param");
if (children.getLength() > 0) {
- Map<String, String> params = new HashMap<String, String>();
+ Map<String, String> params = new HashMap<String,
String>(children.getLength(),1);
for (int i = 0, j = children.getLength(); i < j; ++i) {
Element param = (Element)children.item(i);
String paramName = XmlUtil.getAttribute(param, "name");
Modified:
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/spec/LocaleSpec.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/spec/LocaleSpec.java?rev=675689&r1=675688&r2=675689&view=diff
==============================================================================
---
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/spec/LocaleSpec.java
(original)
+++
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/spec/LocaleSpec.java
Thu Jul 10 12:27:37 2008
@@ -81,9 +81,9 @@
public String toString() {
StringBuilder buf = new StringBuilder();
buf.append("<Locale")
- .append(" lang='").append(language).append("'")
- .append(" country='").append(country).append("'")
- .append(" language_direction='").append(languageDirection).append("'")
+ .append(" lang='").append(language).append('\'')
+ .append(" country='").append(country).append('\'')
+ .append(" language_direction='").append(languageDirection).append('\'')
.append(" messages='").append(messages).append("'>\n");
for (Map.Entry<String, String> entry :
messageBundle.getMessages().entrySet()) {
buf.append("<msg name='").append(entry.getKey()).append("'>")
Modified:
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/spec/ModulePrefs.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/spec/ModulePrefs.java?rev=675689&r1=675688&r2=675689&view=diff
==============================================================================
---
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/spec/ModulePrefs.java
(original)
+++
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/spec/ModulePrefs.java
Thu Jul 10 12:27:37 2008
@@ -428,7 +428,7 @@
buf.append("<ModulePrefs");
for (Map.Entry<String, String> attr : attributes.entrySet()) {
- buf.append(" ").append(attr.getKey()).append("=\"")
+ buf.append(' ').append(attr.getKey()).append("=\"")
.append(attr.getValue()).append('\"');
}
buf.append(">\n");
Modified:
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/spec/OAuthService.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/spec/OAuthService.java?rev=675689&r1=675688&r2=675689&view=diff
==============================================================================
---
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/spec/OAuthService.java
(original)
+++
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/spec/OAuthService.java
Thu Jul 10 12:27:37 2008
@@ -151,7 +151,7 @@
}
public String toString(String element) {
- return "<" + element + " url='" + url.toString() + "' " +
+ return '<' + element + " url='" + url.toString() + "' " +
"method='" + method + "' param_location='" + location + "'/>";
}
}
Modified:
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/spec/Preload.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/spec/Preload.java?rev=675689&r1=675688&r2=675689&view=diff
==============================================================================
---
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/spec/Preload.java
(original)
+++
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/spec/Preload.java
Thu Jul 10 12:27:37 2008
@@ -86,10 +86,10 @@
@Override
public String toString() {
StringBuilder buf = new StringBuilder();
- buf.append("<Preload href='").append(href).append("'")
- .append(" authz='").append(auth.toString().toLowerCase()).append("'")
- .append(" sign_owner='").append(signOwner).append("'")
- .append(" sign_viewer='").append(signViewer).append("'")
+ buf.append("<Preload href='").append(href).append('\'')
+ .append(" authz='").append(auth.toString().toLowerCase()).append('\'')
+ .append(" sign_owner='").append(signOwner).append('\'')
+ .append(" sign_viewer='").append(signViewer).append('\'')
.append(" views='").append(StringUtils.join(views, ',')).append("'/>");
return buf.toString();
}
Modified:
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/http/BasicHttpCacheTest.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/http/BasicHttpCacheTest.java?rev=675689&r1=675688&r2=675689&view=diff
==============================================================================
---
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/http/BasicHttpCacheTest.java
(original)
+++
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/http/BasicHttpCacheTest.java
Thu Jul 10 12:27:37 2008
@@ -18,6 +18,7 @@
package org.apache.shindig.gadgets.http;
import org.apache.shindig.common.util.DateUtil;
+import org.apache.commons.lang.ArrayUtils;
import junit.framework.TestCase;
@@ -50,7 +51,7 @@
private HttpRequest createRequest(String method) {
HttpRequest req = new HttpRequest(method,
URI.create("http://www.here.com";), new HashMap<String, List<String>>(),
- new byte[0], new HttpRequest.Options());
+ ArrayUtils.EMPTY_BYTE_ARRAY, new HttpRequest.Options());
return req;
}
@@ -60,7 +61,7 @@
if (header != null) {
headers.put(header, Arrays.asList(headerValue));
}
- HttpResponse resp = new HttpResponse(statusCode, new byte[0], headers);
+ HttpResponse resp = new HttpResponse(statusCode,
ArrayUtils.EMPTY_BYTE_ARRAY, headers);
return resp;
}
Modified:
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/oauth/FakeOAuthServiceProvider.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/oauth/FakeOAuthServiceProvider.java?rev=675689&r1=675688&r2=675689&view=diff
==============================================================================
---
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/oauth/FakeOAuthServiceProvider.java
(original)
+++
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/oauth/FakeOAuthServiceProvider.java
Thu Jul 10 12:27:37 2008
@@ -183,7 +183,7 @@
Map<String, List<String>> headers = new HashMap<String, List<String>>();
headers.put(
"WWW-Authenticate",
- Arrays.asList(new String[] { msg.getAuthorizationHeader("realm") }));
+ Arrays.asList(msg.getAuthorizationHeader("realm")));
HttpResponse response = new HttpResponse(403, null, headers);
return response;
}
@@ -270,7 +270,7 @@
state.setUserData(parsed.getQueryParam("user_data"));
}
- public class TokenPair {
+ public static class TokenPair {
public final String token;
public final String secret;
@@ -302,9 +302,7 @@
* @throws Exception
*/
public void revokeAllAccessTokens() throws Exception {
- Iterator<TokenState> it = tokenState.values().iterator();
- while (it.hasNext()) {
- TokenState state = it.next();
+ for (TokenState state : tokenState.values()) {
state.setState(TokenState.State.REVOKED);
}
}
Modified:
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/oauth/GadgetTokenStoreTest.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/oauth/GadgetTokenStoreTest.java?rev=675689&r1=675688&r2=675689&view=diff
==============================================================================
---
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/oauth/GadgetTokenStoreTest.java
(original)
+++
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/oauth/GadgetTokenStoreTest.java
Thu Jul 10 12:27:37 2008
@@ -46,17 +46,17 @@
" <OAuth>\n" +
" <Service name='testservice'>" +
" <Access " +
- " url='" + FakeOAuthServiceProvider.ACCESS_TOKEN_URL + "'" +
+ " url='" + FakeOAuthServiceProvider.ACCESS_TOKEN_URL + '\'' +
" param_location='uri-query' " +
" method='GET'" +
" />" +
" <Request " +
- " url='" + FakeOAuthServiceProvider.REQUEST_TOKEN_URL + "'" +
+ " url='" + FakeOAuthServiceProvider.REQUEST_TOKEN_URL + '\'' +
" param_location='uri-query' " +
" method='GET'" +
" />" +
" <Authorization " +
- " url='" + FakeOAuthServiceProvider.APPROVAL_URL + "'" +
+ " url='" + FakeOAuthServiceProvider.APPROVAL_URL + '\'' +
" />" +
" </Service>" +
" </OAuth>\n" +
Modified:
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/GadgetRenderingTaskTest.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/GadgetRenderingTaskTest.java?rev=675689&r1=675688&r2=675689&view=diff
==============================================================================
---
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/GadgetRenderingTaskTest.java
(original)
+++
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/GadgetRenderingTaskTest.java
Thu Jul 10 12:27:37 2008
@@ -284,7 +284,7 @@
expect(fetcher.fetch(SPEC_REQUEST)).andReturn(new HttpResponse(gadgetXml));
expect(urlGenerator.getBundledJsParam(isA(Collection.class),
isA(GadgetContext.class)))
.andReturn(jsUrl);
- response.sendRedirect(contentUrl + "?" + libsUrl +
Utf8UrlCoder.encode(jsUrl));
+ response.sendRedirect(contentUrl + '?' + libsUrl +
Utf8UrlCoder.encode(jsUrl));
expectLastCall().once();
replay();
Modified:
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/JsonRpcHandlerTest.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/JsonRpcHandlerTest.java?rev=675689&r1=675688&r2=675689&view=diff
==============================================================================
---
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/JsonRpcHandlerTest.java
(original)
+++
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/JsonRpcHandlerTest.java
Thu Jul 10 12:27:37 2008
@@ -51,8 +51,8 @@
" <Link rel='" + LINK_REL + "' href='" + LINK_HREF + "'/>" +
"</ModulePrefs>" +
"<Content type=\"html\"" +
- " preferred_height = \"" + PREFERRED_HEIGHT + "\"" +
- " preferred_width = \"" + PREFERRED_WIDTH + "\"" +
+ " preferred_height = \"" + PREFERRED_HEIGHT + '\"' +
+ " preferred_width = \"" + PREFERRED_WIDTH + '\"' +
">Hello, world</Content>" +
"</Module>";
private static final String SPEC_XML2
Modified:
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/UrlGeneratorTest.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/UrlGeneratorTest.java?rev=675689&r1=675688&r2=675689&view=diff
==============================================================================
---
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/UrlGeneratorTest.java
(original)
+++
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/UrlGeneratorTest.java
Thu Jul 10 12:27:37 2008
@@ -154,7 +154,7 @@
assertEquals(IFR_PREFIX, iframeUrl.getPath() + '?');
StringAssert.assertContains("container=" + CONTAINER,
iframeUrl.getQuery());
- StringAssert.assertContains("up_" + UP_NAME + "=" + UP_VALUE,
iframeUrl.getQuery());
+ StringAssert.assertContains("up_" + UP_NAME + '=' + UP_VALUE,
iframeUrl.getQuery());
StringAssert.assertContains("mid=" + MODULE_ID, iframeUrl.getQuery());
StringAssert.assertContains("view=" + VIEW, iframeUrl.getQuery());
}
@@ -177,7 +177,7 @@
assertEquals(TYPE_URL_HREF_PATH, iframeUrl.getPath());
StringAssert.assertContains(TYPE_URL_HREF_QUERY, iframeUrl.getQuery());
StringAssert.assertContains("container=" + CONTAINER,
iframeUrl.getQuery());
- StringAssert.assertContains("up_" + UP_NAME + "=" + UP_VALUE,
iframeUrl.getQuery());
+ StringAssert.assertContains("up_" + UP_NAME + '=' + UP_VALUE,
iframeUrl.getQuery());
StringAssert.assertContains("mid=" + MODULE_ID, iframeUrl.getQuery());
}
}
Modified:
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/spec/PreloadTest.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/spec/PreloadTest.java?rev=675689&r1=675688&r2=675689&view=diff
==============================================================================
---
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/spec/PreloadTest.java
(original)
+++
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/spec/PreloadTest.java
Thu Jul 10 12:27:37 2008
@@ -83,7 +83,7 @@
@Test
public void multipleViews() throws Exception {
- String xml = "<Preload href='" + HREF + "'" +
+ String xml = "<Preload href='" + HREF + '\'' +
" views='" + StringUtils.join(VIEWS, ',') + "'/>";
Preload preload = new Preload(XmlUtil.parse(xml));
@@ -124,7 +124,7 @@
@Test
public void toStringIsSane() throws Exception {
String xml = "<Preload" +
- " href='" + HREF + "'" +
+ " href='" + HREF + '\'' +
" sign_owner='false'" +
" views='" + StringUtils.join(VIEWS, ',') + "'/>";
Modified:
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/spec/ViewTest.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/spec/ViewTest.java?rev=675689&r1=675688&r2=675689&view=diff
==============================================================================
---
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/spec/ViewTest.java
(original)
+++
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/spec/ViewTest.java
Thu Jul 10 12:27:37 2008
@@ -62,7 +62,7 @@
public void testNonStandardContentType() throws Exception {
String contentType = "html-inline";
String xml = "<Content" +
- " type=\"" + contentType + "\"" +
+ " type=\"" + contentType + '\"' +
" quirks=\"false\"><![CDATA[blah]]></Content>";
View view = new View("default", Arrays.asList(XmlUtil.parse(xml)));
Modified:
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/abdera/json/JSONFilter.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/abdera/json/JSONFilter.java?rev=675689&r1=675688&r2=675689&view=diff
==============================================================================
---
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/abdera/json/JSONFilter.java
(original)
+++
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/abdera/json/JSONFilter.java
Thu Jul 10 12:27:37 2008
@@ -75,7 +75,7 @@
return new JsonResponseContext(resp, request.getAbdera(), request);
}
- private class JsonResponseContext extends ResponseContextWrapper {
+ private static class JsonResponseContext extends ResponseContextWrapper {
private final Abdera abdera;
private final RequestContext request;
Modified:
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/dataservice/DataServiceServlet.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/dataservice/DataServiceServlet.java?rev=675689&r1=675688&r2=675689&view=diff
==============================================================================
---
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/dataservice/DataServiceServlet.java
(original)
+++
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/dataservice/DataServiceServlet.java
Thu Jul 10 12:27:37 2008
@@ -63,11 +63,12 @@
private static final Logger logger = Logger.getLogger(
"org.apache.shindig.social.dataservice");
- private SecurityTokenDecoder securityTokenDecoder;
- private Map<String, Class<? extends DataRequestHandler>> handlers;
- private BeanJsonConverter jsonConverter;
- private BeanXmlConverter xmlConverter;
- private ParameterFetcher parameterFetcher;
+ private transient SecurityTokenDecoder securityTokenDecoder;
+ private transient Map<String, Class<? extends DataRequestHandler>> handlers;
+ private transient BeanJsonConverter jsonConverter;
+ private transient BeanXmlConverter xmlConverter;
+ private transient ParameterFetcher parameterFetcher;
+
private static final String JSON_BATCH_ROUTE = "jsonBatch";
@Inject
@@ -252,7 +253,7 @@
String getRouteFromParameter(String pathInfo) {
pathInfo = pathInfo.substring(1);
- int indexOfNextPathSeparator = pathInfo.indexOf("/");
+ int indexOfNextPathSeparator = pathInfo.indexOf('/');
return indexOfNextPathSeparator != -1 ?
pathInfo.substring(0, indexOfNextPathSeparator) :
pathInfo;
Modified:
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/dataservice/RequestItem.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/dataservice/RequestItem.java?rev=675689&r1=675688&r2=675689&view=diff
==============================================================================
---
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/dataservice/RequestItem.java
(original)
+++
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/dataservice/RequestItem.java
Thu Jul 10 12:27:37 2008
@@ -101,7 +101,7 @@
}
String fullUrl = this.url;
- int queryParamIndex = fullUrl.indexOf("?");
+ int queryParamIndex = fullUrl.indexOf('?');
if (queryParamIndex != -1) {
this.url = fullUrl.substring(0, queryParamIndex);
Modified:
incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/dataservice/DataServiceServletTest.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/dataservice/DataServiceServletTest.java?rev=675689&r1=675688&r2=675689&view=diff
==============================================================================
---
incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/dataservice/DataServiceServletTest.java
(original)
+++
incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/dataservice/DataServiceServletTest.java
Thu Jul 10 12:27:37 2008
@@ -96,22 +96,22 @@
}
public void testPeopleUriRecognition() throws Exception {
- verifyHandlerWasFoundForPathInfo("/"
+ verifyHandlerWasFoundForPathInfo('/'
+ DataServiceServlet.PEOPLE_ROUTE + "/5/@self", peopleHandler);
}
public void testActivitiesUriRecognition() throws Exception {
- verifyHandlerWasFoundForPathInfo("/"
+ verifyHandlerWasFoundForPathInfo('/'
+ DataServiceServlet.ACTIVITY_ROUTE + "/5/@self", activityHandler);
}
public void testAppDataUriRecognition() throws Exception {
- verifyHandlerWasFoundForPathInfo("/"
+ verifyHandlerWasFoundForPathInfo('/'
+ DataServiceServlet.APPDATA_ROUTE + "/5/@self", appDataHandler);
}
public void testMethodOverride() throws Exception {
- String route = "/" + DataServiceServlet.APPDATA_ROUTE;
+ String route = '/' + DataServiceServlet.APPDATA_ROUTE;
verifyHandlerWasFoundForPathInfo(route, appDataHandler, "POST", "GET",
"GET");
verifyHandlerWasFoundForPathInfo(route, appDataHandler, "POST", "",
"POST");
verifyHandlerWasFoundForPathInfo(route, appDataHandler, "POST", null,
"POST");
@@ -123,7 +123,7 @@
/** Tests a data handler that returns a failed Future */
public void testFailedRequest() throws Exception {
- String route = "/" + DataServiceServlet.APPDATA_ROUTE;
+ String route = '/' + DataServiceServlet.APPDATA_ROUTE;
setupRequest(route, "GET", null);
EasyMock.expect(injector.getInstance(AppDataHandler.class)).andStubReturn(appDataHandler);
setupInjector();
@@ -292,7 +292,7 @@
public ResponseItem get(long timeout, TimeUnit unit)
throws InterruptedException, ExecutionException, TimeoutException {
- return null; //To change body of implemented methods use File |
Settings | File Templates.
+ return null;
}
}
}
Modified:
incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/dataservice/integration/RestfulBatchTest.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/dataservice/integration/RestfulBatchTest.java?rev=675689&r1=675688&r2=675689&view=diff
==============================================================================
---
incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/dataservice/integration/RestfulBatchTest.java
(original)
+++
incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/dataservice/integration/RestfulBatchTest.java
Thu Jul 10 12:27:37 2008
@@ -47,11 +47,11 @@
*/
@Test
public void testGetBatchRequest() throws Exception {
- String postData = "{"
+ String postData = '{'
+ "friends : {url : '/people/john.doe/@friends', method : 'GET'}, "
+ "john : {url : '/people/john.doe/@self', method : 'GET'}, "
+ "updateData : {url : '/appdata/john.doe/@self/a', method : 'POST',
postData : {count : 1}}}"
- + "}";
+ + '}';
String resp = getJsonResponse("jsonBatch", "POST", postData);
JSONObject result = getJson(resp);
Modified: incubator/shindig/trunk/site/index.html
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/site/index.html?rev=675689&r1=675688&r2=675689&view=diff
==============================================================================
--- incubator/shindig/trunk/site/index.html (original)
+++ incubator/shindig/trunk/site/index.html Thu Jul 10 12:27:37 2008
@@ -25,11 +25,11 @@
font-family: arial, sans-serif;
margin: 2em 5em;
padding: 0.5em;
- border: 1px solid lightgrey;
+ border: 1px solid lightgray;
}
.tabbar {
- border-top: 5px solid lightgrey;
+ border-top: 5px solid lightgray;
clear: both;
}
@@ -43,7 +43,7 @@
}
.selectedTab {
- background-color: lightgrey;
+ background-color: lightgray;
color: black;
}
