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 2009/12/18 21:19:34 UTC
svn commit: r892365 - in /incubator/shindig/trunk/java:
common/src/main/java/org/apache/shindig/auth/
common/src/main/java/org/apache/shindig/common/crypto/
common/src/main/java/org/apache/shindig/common/servlet/
common/src/main/java/org/apache/shindig...
Author: lindner
Date: Fri Dec 18 20:18:56 2009
New Revision: 892365
URL: http://svn.apache.org/viewvc?rev=892365&view=rev
Log:
perf improvements
Modified:
incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/auth/BlobCrypterSecurityTokenDecoder.java
incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/common/crypto/BasicBlobCrypter.java
incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/common/servlet/GuiceServletContextListener.java
incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/common/servlet/UserAgent.java
incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/common/uri/Uri.java
incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/common/util/JsonConversionUtil.java
incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/ApiServlet.java
incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/BaseRequestItem.java
incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/HandlerExecutionListener.java
incubator/shindig/trunk/java/common/src/test/java/org/apache/shindig/auth/BlobCrypterSecurityTokenTest.java
incubator/shindig/trunk/java/common/src/test/java/org/apache/shindig/common/JsonSerializerTest.java
incubator/shindig/trunk/java/common/src/test/java/org/apache/shindig/common/util/JsonConversionUtilTest.java
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/BasicGadgetBlacklist.java
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/features/BrowserSpecificFeatureResource.java
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/features/FeatureRegistry.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/parse/nekohtml/NekoSimplifiedHtmlParser.java
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/render/RenderingGadgetRewriter.java
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/ContentRewriterFeature.java
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/TemplateRewriter.java
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/CajaContentRewriter.java
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/JsServlet.java
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/MakeRequestHandler.java
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/spec/GadgetSpec.java
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/templates/XmlTemplateLibrary.java
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/templates/tags/FlashTagHandler.java
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/DefaultMessageBundleFactoryTest.java
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/features/FeatureRegistryTest.java
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/http/EchoServer.java
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/oauth/GadgetOAuthCallbackGeneratorTest.java
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/preload/PipelineExecutorTest.java
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/preload/PipelinedDataPreloaderTest.java
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/process/ProcessorTest.java
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/render/SanitizingRequestRewriterTest.java
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/PipelineDataGadgetRewriterTest.java
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/TemplateRewriterTest.java
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/templates/DefaultTemplateProcessorTest.java
incubator/shindig/trunk/java/samples/src/main/java/org/apache/shindig/social/opensocial/jpa/api/FilterSpecification.java
incubator/shindig/trunk/java/samples/src/main/java/org/apache/shindig/social/opensocial/jpa/spi/AppDataServiceDb.java
incubator/shindig/trunk/java/samples/src/main/java/org/apache/shindig/social/opensocial/jpa/spi/JPQLUtils.java
incubator/shindig/trunk/java/samples/src/main/java/org/apache/shindig/social/opensocial/jpa/spi/PersonServiceDb.java
incubator/shindig/trunk/java/samples/src/main/java/org/apache/shindig/social/opensocial/jpa/spi/SPIUtils.java
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/service/MessageHandler.java
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/sample/spi/JsonDbOpensocialService.java
Modified: incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/auth/BlobCrypterSecurityTokenDecoder.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/auth/BlobCrypterSecurityTokenDecoder.java?rev=892365&r1=892364&r2=892365&view=diff
==============================================================================
--- incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/auth/BlobCrypterSecurityTokenDecoder.java (original)
+++ incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/auth/BlobCrypterSecurityTokenDecoder.java Fri Dec 18 20:18:56 2009
@@ -18,6 +18,7 @@
*/
package org.apache.shindig.auth;
+import org.apache.commons.lang.StringUtils;
import org.apache.shindig.common.crypto.BasicBlobCrypter;
import org.apache.shindig.common.crypto.BlobCrypter;
import org.apache.shindig.common.crypto.BlobCrypterException;
@@ -98,7 +99,7 @@
// No token is present, assume anonymous access
return new AnonymousSecurityToken();
}
- String[] fields = token.split(":");
+ String[] fields = StringUtils.split(token, ':');
if (fields.length != 2) {
throw new SecurityTokenException("Invalid security token " + token);
}
Modified: incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/common/crypto/BasicBlobCrypter.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/common/crypto/BasicBlobCrypter.java?rev=892365&r1=892364&r2=892365&view=diff
==============================================================================
--- incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/common/crypto/BasicBlobCrypter.java (original)
+++ incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/common/crypto/BasicBlobCrypter.java Fri Dec 18 20:18:56 2009
@@ -21,6 +21,7 @@
import com.google.common.collect.Maps;
import com.google.common.base.Preconditions;
+import org.apache.commons.lang.StringUtils;
import org.apache.shindig.common.util.CharsetUtil;
import org.apache.shindig.common.util.TimeSource;
@@ -204,7 +205,8 @@
private Map<String, String> deserialize(byte[] plain)
throws UnsupportedEncodingException {
String base = new String(plain, UTF8);
- String[] items = base.split("[&=]");
+ // replaces [&=] regex
+ String[] items = StringUtils.splitPreserveAllTokens(base, "&=");
Map<String, String> map = Maps.newHashMapWithExpectedSize(items.length);
for (int i=0; i < items.length; ) {
String key = URLDecoder.decode(items[i++], UTF8);
Modified: incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/common/servlet/GuiceServletContextListener.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/common/servlet/GuiceServletContextListener.java?rev=892365&r1=892364&r2=892365&view=diff
==============================================================================
--- incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/common/servlet/GuiceServletContextListener.java (original)
+++ incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/common/servlet/GuiceServletContextListener.java Fri Dec 18 20:18:56 2009
@@ -25,6 +25,7 @@
import com.google.inject.Module;
import com.google.inject.Stage;
import com.google.inject.tools.jmx.Manager;
+import org.apache.commons.lang.StringUtils;
import java.util.List;
@@ -46,7 +47,7 @@
String moduleNames = context.getInitParameter(MODULES_ATTRIBUTE);
List<Module> modules = Lists.newLinkedList();
if (moduleNames != null) {
- for (String moduleName : moduleNames.split(":")) {
+ for (String moduleName : StringUtils.split(moduleNames, ':')) {
try {
moduleName = moduleName.trim();
if (moduleName.length() > 0) {
Modified: incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/common/servlet/UserAgent.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/common/servlet/UserAgent.java?rev=892365&r1=892364&r2=892365&view=diff
==============================================================================
--- incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/common/servlet/UserAgent.java (original)
+++ incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/common/servlet/UserAgent.java Fri Dec 18 20:18:56 2009
@@ -74,6 +74,6 @@
WEBKIT,
CHROME,
OPERA,
- OTHER;
+ OTHER
}
}
Modified: incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/common/uri/Uri.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/common/uri/Uri.java?rev=892365&r1=892364&r2=892365&view=diff
==============================================================================
--- incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/common/uri/Uri.java (original)
+++ incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/common/uri/Uri.java Fri Dec 18 20:18:56 2009
@@ -72,7 +72,7 @@
out.append("//").append(authority);
// insure that there's a separator between authority/path
if (path != null && path.length() > 1 && !path.startsWith("/")) {
- out.append("/");
+ out.append('/');
}
}
if (path != null) {
Modified: incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/common/util/JsonConversionUtil.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/common/util/JsonConversionUtil.java?rev=892365&r1=892364&r2=892365&view=diff
==============================================================================
--- incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/common/util/JsonConversionUtil.java (original)
+++ incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/common/util/JsonConversionUtil.java Fri Dec 18 20:18:56 2009
@@ -20,6 +20,7 @@
import com.google.common.collect.ImmutableSet;
import com.google.common.collect.Maps;
+import org.apache.commons.lang.StringUtils;
import org.json.JSONArray;
import org.json.JSONException;
import org.json.JSONObject;
@@ -54,7 +55,7 @@
JSONObject paramsRoot = new JSONObject();
for (Map.Entry<String, String[]> entry : params.entrySet()) {
if (!RESERVED_PARAMS.contains(entry.getKey().toLowerCase())) {
- String[] path = entry.getKey().split("\\.");
+ String[] path = StringUtils.splitPreserveAllTokens(entry.getKey(), '.');
JSONObject holder = buildHolder(paramsRoot, path, 0);
holder.put(path[path.length - 1], convertToJsonValue(entry.getValue()[0]));
}
@@ -129,7 +130,7 @@
JSONObject root = new JSONObject();
for (Map.Entry<String, String> entry : params.entrySet()) {
- String[] path = entry.getKey().split("\\.");
+ String[] path = StringUtils.splitPreserveAllTokens(entry.getKey(), '.');
JSONObject holder = buildHolder(root, path, 0);
if (path.length > 1) {
holder.put(path[path.length - 1], convertToJsonValue(entry.getValue()));
Modified: incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/ApiServlet.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/ApiServlet.java?rev=892365&r1=892364&r2=892365&view=diff
==============================================================================
--- incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/ApiServlet.java (original)
+++ incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/ApiServlet.java Fri Dec 18 20:18:56 2009
@@ -124,20 +124,17 @@
}
protected ResponseItem getResponseItem(Future<?> future) {
- ResponseItem response;
try {
// TODO: use timeout methods?
Object result = future != null ? future.get() : null;
// TODO: null is now a supported return value for post/delete, but
// is bad for get().
- response = new ResponseItem(result != null ? result : Collections.emptyMap());
+ return new ResponseItem(result != null ? result : Collections.emptyMap());
} catch (InterruptedException ie) {
- response = responseItemFromException(ie);
+ return responseItemFromException(ie);
} catch (ExecutionException ee) {
- response = responseItemFromException(ee.getCause());
+ return responseItemFromException(ee.getCause());
}
-
- return response;
}
protected ResponseItem responseItemFromException(Throwable t) {
Modified: incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/BaseRequestItem.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/BaseRequestItem.java?rev=892365&r1=892364&r2=892365&view=diff
==============================================================================
--- incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/BaseRequestItem.java (original)
+++ incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/BaseRequestItem.java Fri Dec 18 20:18:56 2009
@@ -17,6 +17,7 @@
*/
package org.apache.shindig.protocol;
+import org.apache.commons.lang.StringUtils;
import org.apache.shindig.auth.SecurityToken;
import org.apache.shindig.protocol.conversion.BeanConverter;
import org.apache.shindig.protocol.conversion.BeanJsonConverter;
@@ -243,7 +244,7 @@
return Collections.emptyList();
}
if (param instanceof String && ((String)param).indexOf(',') != -1) {
- List<String> listParam = Arrays.asList(((String)param).split(","));
+ List<String> listParam = Arrays.asList(StringUtils.split((String)param, ','));
this.parameters.put(paramName, listParam);
return listParam;
}
Modified: incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/HandlerExecutionListener.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/HandlerExecutionListener.java?rev=892365&r1=892364&r2=892365&view=diff
==============================================================================
--- incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/HandlerExecutionListener.java (original)
+++ incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/HandlerExecutionListener.java Fri Dec 18 20:18:56 2009
@@ -62,10 +62,10 @@
public static final Logger LOG = Logger.getLogger(HandlerExecutionListener.class.toString());
public void executing(String service, String operation, RequestItem request) {
- LOG.info("start - " + service + " " + operation);
+ LOG.info("start - " + service + ' ' + operation);
}
public void executed(String service, String operation, RequestItem request) {
- LOG.info(" end - " + service + " " + operation);
+ LOG.info(" end - " + service + ' ' + operation);
}
}
}
Modified: incubator/shindig/trunk/java/common/src/test/java/org/apache/shindig/auth/BlobCrypterSecurityTokenTest.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/common/src/test/java/org/apache/shindig/auth/BlobCrypterSecurityTokenTest.java?rev=892365&r1=892364&r2=892365&view=diff
==============================================================================
--- incubator/shindig/trunk/java/common/src/test/java/org/apache/shindig/auth/BlobCrypterSecurityTokenTest.java (original)
+++ incubator/shindig/trunk/java/common/src/test/java/org/apache/shindig/auth/BlobCrypterSecurityTokenTest.java Fri Dec 18 20:18:56 2009
@@ -18,6 +18,7 @@
*/
package org.apache.shindig.auth;
+import org.apache.commons.lang.StringUtils;
import org.apache.shindig.common.crypto.BasicBlobCrypter;
import org.apache.shindig.common.crypto.BlobExpiredException;
import org.apache.shindig.common.crypto.Crypto;
@@ -52,7 +53,7 @@
BlobCrypterSecurityToken t = new BlobCrypterSecurityToken(crypter, CONTAINER, DOMAIN);
String token = t.encrypt();
assertTrue("should start with container: " + token, token.startsWith("container:"));
- String[] fields = token.split(":");
+ String[] fields = StringUtils.split(token, ':');
BlobCrypterSecurityToken t2 =
BlobCrypterSecurityToken.decrypt(crypter, CONTAINER, DOMAIN, fields[1], null);
assertNull(t2.getAppId(), t2.getAppId());
@@ -82,7 +83,7 @@
t.setTrustedJson("trusted");
String token = t.encrypt();
assertTrue("should start with container: " + token, token.startsWith("container:"));
- String[] fields = token.split(":");
+ String[] fields = StringUtils.split(token, ':');
BlobCrypterSecurityToken t2 =
BlobCrypterSecurityToken.decrypt(crypter, CONTAINER, DOMAIN, fields[1], "active");
assertEquals("http://www.example.com/gadget.xml", t2.getAppId());
@@ -102,7 +103,7 @@
String token = t.encrypt();
// one hour plus clock skew
timeSource.incrementSeconds(3600 + 181);
- String[] fields = token.split(":");
+ String[] fields = StringUtils.split(token, ':');
try {
BlobCrypterSecurityToken.decrypt(crypter, CONTAINER, DOMAIN, fields[1], "active");
fail("Token should have expired");
Modified: incubator/shindig/trunk/java/common/src/test/java/org/apache/shindig/common/JsonSerializerTest.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/common/src/test/java/org/apache/shindig/common/JsonSerializerTest.java?rev=892365&r1=892364&r2=892365&view=diff
==============================================================================
--- incubator/shindig/trunk/java/common/src/test/java/org/apache/shindig/common/JsonSerializerTest.java (original)
+++ incubator/shindig/trunk/java/common/src/test/java/org/apache/shindig/common/JsonSerializerTest.java Fri Dec 18 20:18:56 2009
@@ -213,7 +213,7 @@
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.toString() + '}');
assertEquals("Hello<world>foo < bar", obj.get("foo"));
}
Modified: incubator/shindig/trunk/java/common/src/test/java/org/apache/shindig/common/util/JsonConversionUtilTest.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/common/src/test/java/org/apache/shindig/common/util/JsonConversionUtilTest.java?rev=892365&r1=892364&r2=892365&view=diff
==============================================================================
--- incubator/shindig/trunk/java/common/src/test/java/org/apache/shindig/common/util/JsonConversionUtilTest.java (original)
+++ incubator/shindig/trunk/java/common/src/test/java/org/apache/shindig/common/util/JsonConversionUtilTest.java Fri Dec 18 20:18:56 2009
@@ -125,7 +125,7 @@
assertEquals(expectedObject.names().length(), actualObject.names().length());
for (String key : JSONObject.getNames(expectedObject)) {
- assertTrue(actualObject.has(key));
+ assertTrue("missing key " + key, actualObject.has(key));
assertJsonEquals(expectedObject.get(key), actualObject.get(key));
}
} else if (expected instanceof JSONArray) {
Modified: incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/BasicGadgetBlacklist.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/BasicGadgetBlacklist.java?rev=892365&r1=892364&r2=892365&view=diff
==============================================================================
--- incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/BasicGadgetBlacklist.java (original)
+++ incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/BasicGadgetBlacklist.java Fri Dec 18 20:18:56 2009
@@ -17,6 +17,7 @@
*/
package org.apache.shindig.gadgets;
+import org.apache.commons.lang.StringUtils;
import org.apache.shindig.common.uri.Uri;
import com.google.common.collect.Lists;
@@ -96,8 +97,8 @@
if (line.length() == 0 || line.charAt(0) == COMMENT_MARKER) {
continue;
}
-
- String[] parts = line.split("\\s+");
+ // replaces regex \\s+
+ String[] parts = StringUtils.split(line);
if (parts.length == 1) {
exactMatches.add(line.toLowerCase());
} else if (parts.length == 2
Modified: incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/features/BrowserSpecificFeatureResource.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/features/BrowserSpecificFeatureResource.java?rev=892365&r1=892364&r2=892365&view=diff
==============================================================================
--- incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/features/BrowserSpecificFeatureResource.java (original)
+++ incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/features/BrowserSpecificFeatureResource.java Fri Dec 18 20:18:56 2009
@@ -22,6 +22,7 @@
import com.google.inject.Inject;
import com.google.inject.Provider;
+import org.apache.commons.lang.StringUtils;
import org.apache.shindig.common.servlet.UserAgent;
import org.apache.shindig.common.uri.Uri;
import org.apache.shindig.gadgets.GadgetException;
@@ -96,7 +97,7 @@
}
private boolean browserMatches() {
- if (browserMatch.size() == 0) {
+ if (browserMatch.isEmpty()) {
// Not browser-sensitive.
return true;
}
@@ -116,10 +117,10 @@
}
// Comma-delimited list of <browser>-<versionKey> pairs.
- String[] entries = browserKey.split(",");
+ String[] entries = StringUtils.split(browserKey, ',');
for (String entry : entries) {
entry = entry.trim();
- String[] browserAndVersion = entry.split("-");
+ String[] browserAndVersion = StringUtils.split(entry, '-');
String browser = browserAndVersion[0];
String versionKey = browserAndVersion.length == 2 ? browserAndVersion[1] : null;
@@ -237,7 +238,7 @@
private final int[] parts;
private VersionNumber(String str) {
- String[] strParts = str.split("\\.");
+ String[] strParts = StringUtils.split(str, '.');
int[] intParts = new int[strParts.length];
try {
for (int i = 0; i < strParts.length; ++i) {
Modified: incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/features/FeatureRegistry.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/features/FeatureRegistry.java?rev=892365&r1=892364&r2=892365&view=diff
==============================================================================
--- incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/features/FeatureRegistry.java (original)
+++ incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/features/FeatureRegistry.java Fri Dec 18 20:18:56 2009
@@ -388,7 +388,7 @@
StringBuilder sb = new StringBuilder();
sb.append("Problems found processing features:\n");
for (String problem : problems) {
- sb.append(problem).append("\n");
+ sb.append(problem).append('\n');
}
throw new GadgetException(GadgetException.Code.INVALID_CONFIG, sb.toString());
}
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=892365&r1=892364&r2=892365&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 Fri Dec 18 20:18:56 2009
@@ -362,7 +362,7 @@
}
String cacheControl = getHeader("Cache-Control");
if (cacheControl != null) {
- String[] directives = cacheControl.split(",");
+ String[] directives = StringUtils.split(cacheControl, ',');
for (String directive : directives) {
directive = directive.trim();
if (directive.equalsIgnoreCase("no-cache")
@@ -401,11 +401,11 @@
private long getCacheControlMaxAge() {
String cacheControl = getHeader("Cache-Control");
if (cacheControl != null) {
- String[] directives = cacheControl.split(",");
+ String[] directives = StringUtils.split(cacheControl, ',');
for (String directive : directives) {
directive = directive.trim();
if (directive.startsWith("max-age")) {
- String[] parts = directive.split("=");
+ String[] parts = StringUtils.split(directive, '=');
if (parts.length == 2) {
try {
return Long.parseLong(parts[1]) * 1000;
@@ -456,7 +456,7 @@
Collection<String> values = headers.get("Content-Type");
if (!values.isEmpty()) {
String contentType = values.iterator().next();
- String[] parts = contentType.split(";");
+ String[] parts = StringUtils.split(contentType, ';');
if (BINARY_CONTENT_TYPES.contains(parts[0])) {
return DEFAULT_ENCODING;
}
Modified: incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/parse/nekohtml/NekoSimplifiedHtmlParser.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/parse/nekohtml/NekoSimplifiedHtmlParser.java?rev=892365&r1=892364&r2=892365&view=diff
==============================================================================
--- incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/parse/nekohtml/NekoSimplifiedHtmlParser.java (original)
+++ incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/parse/nekohtml/NekoSimplifiedHtmlParser.java Fri Dec 18 20:18:56 2009
@@ -350,7 +350,7 @@
sb.append("Around ...<");
if (qName.prefix != null) {
sb.append(qName.prefix);
- sb.append(":");
+ sb.append(':');
}
sb.append(qName.localpart);
for (int j = 0; j < xmlAttributes.getLength(); j++) {
Modified: incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/render/RenderingGadgetRewriter.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/render/RenderingGadgetRewriter.java?rev=892365&r1=892364&r2=892365&view=diff
==============================================================================
--- incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/render/RenderingGadgetRewriter.java (original)
+++ incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/render/RenderingGadgetRewriter.java Fri Dec 18 20:18:56 2009
@@ -121,7 +121,7 @@
@Inject
public void setDefaultForcedLibs(@Named("shindig.gadget-rewrite.default-forced-libs")String forcedLibs) {
if (StringUtils.isNotBlank(forcedLibs)) {
- defaultExternLibs = ImmutableSortedSet.copyOf(Arrays.asList(forcedLibs.split(":")));
+ defaultExternLibs = ImmutableSortedSet.of(StringUtils.split(forcedLibs, ':'));
}
}
@@ -230,7 +230,7 @@
// gather the libraries we'll need to generate the extern libs
String externParam = context.getParameter("libs");
if (StringUtils.isNotBlank(externParam)) {
- externForcedLibs = Sets.newTreeSet(Arrays.asList(externParam.split(":")));
+ externForcedLibs = Sets.newTreeSet(Arrays.asList(StringUtils.split(externParam, ':')));
}
if (!externForcedLibs.isEmpty()) {
Modified: incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/ContentRewriterFeature.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/ContentRewriterFeature.java?rev=892365&r1=892364&r2=892365&view=diff
==============================================================================
--- incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/ContentRewriterFeature.java (original)
+++ incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/ContentRewriterFeature.java Fri Dec 18 20:18:56 2009
@@ -21,6 +21,7 @@
import com.google.common.collect.Lists;
import com.google.common.collect.Sets;
+import org.apache.commons.lang.StringUtils;
import org.apache.shindig.gadgets.spec.Feature;
import org.apache.shindig.gadgets.spec.GadgetSpec;
@@ -59,7 +60,7 @@
protected enum PATTERNS {
ALL, NONE, REGEX, STRINGS
- };
+ }
protected PATTERNS includePatterns;
protected PATTERNS excludePatterns;
@@ -149,7 +150,7 @@
String includeTagList = f.getParam(INCLUDE_TAGS);
if (includeTagList != null) {
Set<String> tags = Sets.newTreeSet();
- for (String tag : includeTagList.split(",")) {
+ for (String tag : StringUtils.split(includeTagList, ',')) {
if (tag != null) {
tags.add(tag.trim().toLowerCase());
}
@@ -178,7 +179,7 @@
}
Collection<String> includeUrls = f.getParamCollection(INCLUDE_URL);
- if (includeUrls.size() == 0) {
+ if (includeUrls.isEmpty()) {
includes = Collections.emptyList();
} else if (includeUrls.contains("*")) {
includes = Collections.singleton("*");
@@ -193,7 +194,7 @@
includes = Collections.emptyList();
}
- if (includes.size() == 0
+ if (includes.isEmpty()
&& (includeRegex == null || "".equals(includeRegex))) {
includePatterns = PATTERNS.NONE;
} else if (includes.size() > 0) {
@@ -225,7 +226,7 @@
}
Collection<String> excludeUrls = f.getParamCollection(EXCLUDE_URL);
- if (excludeUrls.size() == 0) {
+ if (excludeUrls.isEmpty()) {
excludes = Collections.emptyList();
} else if (excludeUrls.contains("*")) {
excludes = Collections.singleton("*");
@@ -242,7 +243,7 @@
excludes = Collections.emptyList();
}
- if (excludes.size() == 0
+ if (excludes.isEmpty()
&& (excludeRegex == null || "".equals(excludeRegex))) {
excludePatterns = PATTERNS.NONE;
} else if (excludes.size() > 0) {
Modified: incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/TemplateRewriter.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/TemplateRewriter.java?rev=892365&r1=892364&r2=892365&view=diff
==============================================================================
--- incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/TemplateRewriter.java (original)
+++ incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/TemplateRewriter.java Fri Dec 18 20:18:56 2009
@@ -275,7 +275,7 @@
StringBuilder buffer = new StringBuilder();
buffer.append("opensocial.template.Loader.loadContent(");
JsonSerializer.appendString(buffer, library.serialize());
- buffer.append(",");
+ buffer.append(',');
JsonSerializer.appendString(buffer, library.getLibraryUri().toString());
buffer.append(");");
scriptElement.setTextContent(buffer.toString());
Modified: incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/CajaContentRewriter.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/CajaContentRewriter.java?rev=892365&r1=892364&r2=892365&view=diff
==============================================================================
--- incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/CajaContentRewriter.java (original)
+++ incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/CajaContentRewriter.java Fri Dec 18 20:18:56 2009
@@ -191,11 +191,11 @@
if (MessageLevel.LINT.compareTo(msg.getMessageLevel()) <= 0) {
String snippet = sp.getSnippet(msg);
messageText.append(msg.getMessageLevel().name())
- .append(" ")
+ .append(' ')
.append(html(msg.format(mc)));
if (!StringUtils.isEmpty(snippet)) {
- messageText.append("\n").append(snippet);
+ messageText.append('\n').append(snippet);
}
}
}
Modified: incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/JsServlet.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/JsServlet.java?rev=892365&r1=892364&r2=892365&view=diff
==============================================================================
--- incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/JsServlet.java (original)
+++ incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/JsServlet.java Fri Dec 18 20:18:56 2009
@@ -19,6 +19,7 @@
import com.google.common.collect.ImmutableSet;
+import org.apache.commons.lang.StringUtils;
import org.apache.shindig.common.servlet.HttpUtil;
import org.apache.shindig.common.servlet.InjectedServlet;
import org.apache.shindig.config.ContainerConfig;
@@ -81,7 +82,7 @@
0, resourceName.length() - ".js".length());
}
- Set<String> needed = ImmutableSet.of(resourceName.split(":"));
+ Set<String> needed = ImmutableSet.of(StringUtils.split(resourceName, ':'));
String debugStr = req.getParameter("debug");
String containerParam = req.getParameter("container");
Modified: incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/MakeRequestHandler.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/MakeRequestHandler.java?rev=892365&r1=892364&r2=892365&view=diff
==============================================================================
--- incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/MakeRequestHandler.java (original)
+++ incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/MakeRequestHandler.java Fri Dec 18 20:18:56 2009
@@ -21,6 +21,7 @@
import com.google.inject.Inject;
import com.google.inject.Singleton;
+import org.apache.commons.lang.StringUtils;
import org.apache.shindig.auth.AuthInfo;
import org.apache.shindig.auth.SecurityToken;
import org.apache.shindig.common.JsonSerializer;
@@ -125,9 +126,9 @@
String headerData = getParameter(request, HEADERS_PARAM, "");
if (headerData.length() > 0) {
- String[] headerList = headerData.split("&");
+ String[] headerList = StringUtils.split(headerData, '&');
for (String header : headerList) {
- String[] parts = header.split("=");
+ String[] parts = StringUtils.splitPreserveAllTokens(header, '=');
if (parts.length != 2) {
throw new GadgetException(GadgetException.Code.INTERNAL_SERVER_ERROR,
"Malformed header specified,");
Modified: incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/spec/GadgetSpec.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/spec/GadgetSpec.java?rev=892365&r1=892364&r2=892365&view=diff
==============================================================================
--- incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/spec/GadgetSpec.java (original)
+++ incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/spec/GadgetSpec.java Fri Dec 18 20:18:56 2009
@@ -17,6 +17,7 @@
*/
package org.apache.shindig.gadgets.spec;
+import org.apache.commons.lang.StringUtils;
import org.apache.shindig.common.uri.Uri;
import org.apache.shindig.common.util.HashUtil;
import org.apache.shindig.common.xml.XmlUtil;
@@ -85,7 +86,7 @@
}
if ("Content".equals(name)) {
String viewNames = XmlUtil.getAttribute(element, "view", "default");
- for (String view : viewNames.split(",")) {
+ for (String view : StringUtils.split(viewNames, ',')) {
view = view.trim();
List<Element> viewElements = views.get(view);
if (viewElements == null) {
Modified: incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/templates/XmlTemplateLibrary.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/templates/XmlTemplateLibrary.java?rev=892365&r1=892364&r2=892365&view=diff
==============================================================================
--- incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/templates/XmlTemplateLibrary.java (original)
+++ incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/templates/XmlTemplateLibrary.java Fri Dec 18 20:18:56 2009
@@ -199,7 +199,7 @@
if (style == null) {
style = element.getTextContent();
} else {
- style = style + "\n" + element.getTextContent();
+ style = style + '\n' + element.getTextContent();
}
}
@@ -207,7 +207,7 @@
if (javaScript == null) {
javaScript = element.getTextContent();
} else {
- javaScript = javaScript + "\n" + element.getTextContent();
+ javaScript = javaScript + '\n' + element.getTextContent();
}
}
Modified: incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/templates/tags/FlashTagHandler.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/templates/tags/FlashTagHandler.java?rev=892365&r1=892364&r2=892365&view=diff
==============================================================================
--- incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/templates/tags/FlashTagHandler.java (original)
+++ incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/templates/tags/FlashTagHandler.java Fri Dec 18 20:18:56 2009
@@ -94,7 +94,7 @@
if (StringUtils.isEmpty(config.flashvars)) {
config.flashvars = stVar;
} else {
- config.flashvars += "&" + stVar;
+ config.flashvars += '&' + stVar;
}
}
@@ -151,12 +151,12 @@
builder.append(altContentId);
builder.append("\",");
JsonSerializer.appendString(builder, config.width);
- builder.append(",");
+ builder.append(',');
JsonSerializer.appendString(builder, config.height);
- builder.append(",\"" + flashMinVersion + "\",");
+ builder.append(",\"").append(flashMinVersion).append("\",");
builder.append("null,null,");
JsonSerializer.appendMap(builder, config.getParams());
- builder.append(",");
+ builder.append(',');
JsonSerializer.appendMap(builder, config.getAttributes());
builder.append(");");
return builder.toString();
Modified: incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/DefaultMessageBundleFactoryTest.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/DefaultMessageBundleFactoryTest.java?rev=892365&r1=892364&r2=892365&view=diff
==============================================================================
--- incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/DefaultMessageBundleFactoryTest.java (original)
+++ incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/DefaultMessageBundleFactoryTest.java Fri Dec 18 20:18:56 2009
@@ -119,7 +119,7 @@
= "<Module>" +
"<ModulePrefs title='foo'>" +
" <Locale messages='" + BUNDLE_URI + "'/>" +
- " <Locale country='" + LOCALE.getCountry() + "'" +
+ " <Locale country='" + LOCALE.getCountry() + '\'' +
" messages='" + COUNTRY_BUNDLE_URI + "'/>" +
" <Locale lang='" + LOCALE.getLanguage() + "' messages='" + LANG_BUNDLE_URI + "'/>" +
" <Locale lang='" + LOCALE.getLanguage() + "' country='" + LOCALE.getCountry() + "' " +
Modified: incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/features/FeatureRegistryTest.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/features/FeatureRegistryTest.java?rev=892365&r1=892364&r2=892365&view=diff
==============================================================================
--- incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/features/FeatureRegistryTest.java (original)
+++ incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/features/FeatureRegistryTest.java Fri Dec 18 20:18:56 2009
@@ -117,7 +117,7 @@
File tmpFile = File.createTempFile("dummy", ".dat");
tmpFile.deleteOnExit();
File parentDir = tmpFile.getParentFile();
- String childDirName = "" + Math.random();
+ String childDirName = String.valueOf(Math.random());
File childDir = new File(parentDir, childDirName);
childDir.mkdirs();
childDir.deleteOnExit();
Modified: incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/http/EchoServer.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/http/EchoServer.java?rev=892365&r1=892364&r2=892365&view=diff
==============================================================================
--- incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/http/EchoServer.java (original)
+++ incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/http/EchoServer.java Fri Dec 18 20:18:56 2009
@@ -18,6 +18,7 @@
*/
package org.apache.shindig.gadgets.http;
+import org.apache.commons.lang.StringUtils;
import org.mortbay.jetty.servlet.ServletHolder;
import javax.servlet.ServletException;
@@ -67,7 +68,7 @@
String[] headers = req.getParameterValues(HEADER_PARAM);
if (headers != null) {
for (String header : headers) {
- String[] nameAndValue = header.split("=", 2);
+ String[] nameAndValue = StringUtils.splitPreserveAllTokens(header, "=", 2);
resp.setHeader(nameAndValue[0], nameAndValue[1]);
}
}
Modified: incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/oauth/GadgetOAuthCallbackGeneratorTest.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/oauth/GadgetOAuthCallbackGeneratorTest.java?rev=892365&r1=892364&r2=892365&view=diff
==============================================================================
--- incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/oauth/GadgetOAuthCallbackGeneratorTest.java (original)
+++ incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/oauth/GadgetOAuthCallbackGeneratorTest.java Fri Dec 18 20:18:56 2009
@@ -251,7 +251,7 @@
}
public void appendTo(StringBuffer buffer) {
- buffer.append("GadgetContextMatcher(" + securityToken + ", " + arguments + ")");
+ buffer.append("GadgetContextMatcher(" + securityToken + ", " + arguments + ')');
}
}
}
Modified: incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/preload/PipelineExecutorTest.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/preload/PipelineExecutorTest.java?rev=892365&r1=892364&r2=892365&view=diff
==============================================================================
--- incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/preload/PipelineExecutorTest.java (original)
+++ incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/preload/PipelineExecutorTest.java Fri Dec 18 20:18:56 2009
@@ -299,7 +299,7 @@
}
public void appendTo(StringBuffer buffer) {
- buffer.append("eqBuffer[social=" + socialCount + ",http=" + httpCount + "]");
+ buffer.append("eqBuffer[social=" + socialCount + ",http=" + httpCount + ']');
}
public boolean matches(Object obj) {
Modified: incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/preload/PipelinedDataPreloaderTest.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/preload/PipelinedDataPreloaderTest.java?rev=892365&r1=892364&r2=892365&view=diff
==============================================================================
--- incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/preload/PipelinedDataPreloaderTest.java (original)
+++ incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/preload/PipelinedDataPreloaderTest.java Fri Dec 18 20:18:56 2009
@@ -433,7 +433,7 @@
assertEquals(1, pipeline.requests.size());
HttpRequest request = pipeline.requests.get(0);
- assertEquals(HTTP_REQUEST_URL + "?" + PARAMS, request.getUri().toString());
+ assertEquals(HTTP_REQUEST_URL + '?' + PARAMS, request.getUri().toString());
assertEquals("GET", request.getMethod());
}
Modified: incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/process/ProcessorTest.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/process/ProcessorTest.java?rev=892365&r1=892364&r2=892365&view=diff
==============================================================================
--- incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/process/ProcessorTest.java (original)
+++ incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/process/ProcessorTest.java Fri Dec 18 20:18:56 2009
@@ -58,7 +58,7 @@
@Before
public void setUp() throws Exception {
- JSONObject config = new JSONObject("{" + ContainerConfig.DEFAULT_CONTAINER + ":" +
+ JSONObject config = new JSONObject('{' + ContainerConfig.DEFAULT_CONTAINER + ':' +
"{'gadgets.features':{views:" +
"{aliased: {aliases: ['some-alias', 'alias']}}" +
"}}}");
Modified: incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/render/SanitizingRequestRewriterTest.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/render/SanitizingRequestRewriterTest.java?rev=892365&r1=892364&r2=892365&view=diff
==============================================================================
--- incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/render/SanitizingRequestRewriterTest.java (original)
+++ incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/render/SanitizingRequestRewriterTest.java Fri Dec 18 20:18:56 2009
@@ -82,7 +82,7 @@
+ "&fp=45508&sanitize=1&rewriteMime=text%2Fcss');\n"
+ "A {\n"
+ " font: BOLD\n"
- + "}";
+ + '}';
String rewritten = rewrite(req, response);
assertEquals(sanitized, rewritten);
}
@@ -102,7 +102,7 @@
+ "&fp=45508&nocache=1&sanitize=1&rewriteMime=text%2Fcss');\n"
+ "A {\n"
+ " font: BOLD\n"
- + "}";
+ + '}';
String rewritten = rewrite(req, response);
assertEquals(sanitized, rewritten);
}
Modified: incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/PipelineDataGadgetRewriterTest.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/PipelineDataGadgetRewriterTest.java?rev=892365&r1=892364&r2=892365&view=diff
==============================================================================
--- incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/PipelineDataGadgetRewriterTest.java (original)
+++ incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/PipelineDataGadgetRewriterTest.java Fri Dec 18 20:18:56 2009
@@ -183,7 +183,7 @@
}
public void appendTo(StringBuffer buffer) {
- buffer.append("eqBuffer[social=" + socialCount + ",http=" + httpCount + "]");
+ buffer.append("eqBuffer[social=" + socialCount + ",http=" + httpCount + ']');
}
public boolean matches(Object obj) {
Modified: incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/TemplateRewriterTest.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/TemplateRewriterTest.java?rev=892365&r1=892364&r2=892365&view=diff
==============================================================================
--- incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/TemplateRewriterTest.java (original)
+++ incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/TemplateRewriterTest.java Fri Dec 18 20:18:56 2009
@@ -100,13 +100,13 @@
private static final String TEMPLATE_LIBRARY_URI = "http://example.org/library.xml";
private static final String CONTENT_WITH_TAG_FROM_LIBRARY =
- "<script type='text/os-template' xmlns:my='#my'><my:Tag4/></script>"; ;
-
+ "<script type='text/os-template' xmlns:my='#my'><my:Tag4/></script>";
+
private static final String CONTENT_TESTING_PRECEDENCE_RULES =
"<script type='text/os-template' xmlns:my='#my' tag='my:Tag1'>inline1</script>" +
"<script type='text/os-template' xmlns:my='#my' tag='my:Tag2'>inline2</script>" +
"<script type='text/os-template' xmlns:my='#my' tag='my:Tag3'>inline3</script>" +
- "<script type='text/os-template' xmlns:my='#my'><my:Tag1/><my:Tag2/><my:Tag3/><my:Tag4/></script>"; ;
+ "<script type='text/os-template' xmlns:my='#my'><my:Tag1/><my:Tag2/><my:Tag3/><my:Tag4/></script>";
@Before
public void setUp() {
@@ -263,18 +263,18 @@
private void testExpectingTransform(String code, String condition) throws Exception {
setupGadget(code);
rewriter.rewrite(gadget, content);
- assertTrue("Template wasn't transformed (" + condition + ")",
+ assertTrue("Template wasn't transformed (" + condition + ')',
content.getContent().indexOf("Hello, John") > 0);
- assertTrue("Template tag wasn't removed (" + condition + ")",
+ assertTrue("Template tag wasn't removed (" + condition + ')',
!content.getContent().contains("text/os-template"));
}
private void testExpectingNoTransform(String code, String condition) throws Exception {
setupGadget(code);
rewriter.rewrite(gadget, content);
- assertTrue("Template was transformed (" + condition + ")",
+ assertTrue("Template was transformed (" + condition + ')',
content.getContent().indexOf("${user.name}") > 0);
- assertTrue("Template tag was removed (" + condition + ")",
+ assertTrue("Template tag was removed (" + condition + ')',
content.getContent().indexOf("text/os-template") > 0);
}
Modified: incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/templates/DefaultTemplateProcessorTest.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/templates/DefaultTemplateProcessorTest.java?rev=892365&r1=892364&r2=892365&view=diff
==============================================================================
--- incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/templates/DefaultTemplateProcessorTest.java (original)
+++ incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/templates/DefaultTemplateProcessorTest.java Fri Dec 18 20:18:56 2009
@@ -134,7 +134,7 @@
@Test
public void testTextNodeEscaping() throws Exception {
String output = executeTemplate("${xss.script}");
- assertFalse("Escaping not performed: \"" + output + "\"", output.contains("<script>alert("));
+ assertFalse("Escaping not performed: \"" + output + '\"', output.contains("<script>alert("));
}
@Test
@@ -201,7 +201,7 @@
@Test
public void testCustomTag() throws Exception {
String output = executeTemplate("<test:Foo text='${foo.title}' data='${user}'/>",
- "xmlns:test='" + TEST_NS + "'");
+ "xmlns:test='" + TEST_NS + '\'');
assertEquals("<b>BAR</b>", output);
}
@@ -238,8 +238,8 @@
@Test
public void testSafeCrossDocumentCloning() throws Exception {
String template = "<test:Bar text='${foo.title}' data='${user}'/>";
- executeTemplate(template, "xmlns:test='" + TEST_NS + "'");
- executeTemplate(template, "xmlns:test='" + TEST_NS + "'");
+ executeTemplate(template, "xmlns:test='" + TEST_NS + '\'');
+ executeTemplate(template, "xmlns:test='" + TEST_NS + '\'');
// This is a little hacky but is fine for testing purposes. Assumes that DOM implementation
// is based on Xerces which will always has a userData hashtable
@@ -277,7 +277,7 @@
}
private Element prepareTemplate(String markup, String extra) throws GadgetException {
- String content = "<script type=\"text/os-template\"" + extra + ">" + markup + "</script>";
+ String content = "<script type=\"text/os-template\"" + extra + '>' + markup + "</script>";
Document document = parser.parseDom(content);
return (Element) document.getElementsByTagName(GadgetHtmlParser.OSML_TEMPLATE_TAG).item(0);
}
Modified: incubator/shindig/trunk/java/samples/src/main/java/org/apache/shindig/social/opensocial/jpa/api/FilterSpecification.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/samples/src/main/java/org/apache/shindig/social/opensocial/jpa/api/FilterSpecification.java?rev=892365&r1=892364&r2=892365&view=diff
==============================================================================
--- incubator/shindig/trunk/java/samples/src/main/java/org/apache/shindig/social/opensocial/jpa/api/FilterSpecification.java (original)
+++ incubator/shindig/trunk/java/samples/src/main/java/org/apache/shindig/social/opensocial/jpa/api/FilterSpecification.java Fri Dec 18 20:18:56 2009
@@ -76,7 +76,7 @@
* @param finalProp the final property
* @return true if special
*/
- public static final boolean isSpecial(String finalProp) {
+ public static boolean isSpecial(String finalProp) {
return SPECIAL_OPERATION.equals(finalProp);
}
@@ -85,7 +85,7 @@
* @param finalProp the final property
* @return true if valid.
*/
- public static final boolean isValid(String finalProp) {
+ public static boolean isValid(String finalProp) {
return (finalProp != null);
}
Modified: incubator/shindig/trunk/java/samples/src/main/java/org/apache/shindig/social/opensocial/jpa/spi/AppDataServiceDb.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/samples/src/main/java/org/apache/shindig/social/opensocial/jpa/spi/AppDataServiceDb.java?rev=892365&r1=892364&r2=892365&view=diff
==============================================================================
--- incubator/shindig/trunk/java/samples/src/main/java/org/apache/shindig/social/opensocial/jpa/spi/AppDataServiceDb.java (original)
+++ incubator/shindig/trunk/java/samples/src/main/java/org/apache/shindig/social/opensocial/jpa/spi/AppDataServiceDb.java Fri Dec 18 20:18:56 2009
@@ -148,7 +148,7 @@
case friends:
sb.append(ApplicationDataMapDb.FINDBY_FRIENDS_GROUP);
lastParam = JPQLUtils.addInClause(sb, "p", "id", lastParam, paramList.size());
- sb.append(")");
+ sb.append(')');
// userId translates into all friends
break;
case groupId:
@@ -176,7 +176,7 @@
Map<String, Map<String, String>> results = new HashMap<String, Map<String, String>>();
// only add in the fields
- if (fields == null || fields.size() == 0) {
+ if (fields == null || fields.isEmpty()) {
for (ApplicationDataMapDb adm : dataMaps) {
results.put(adm.getPersonId(), adm.getValues());
}
Modified: incubator/shindig/trunk/java/samples/src/main/java/org/apache/shindig/social/opensocial/jpa/spi/JPQLUtils.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/samples/src/main/java/org/apache/shindig/social/opensocial/jpa/spi/JPQLUtils.java?rev=892365&r1=892364&r2=892365&view=diff
==============================================================================
--- incubator/shindig/trunk/java/samples/src/main/java/org/apache/shindig/social/opensocial/jpa/spi/JPQLUtils.java (original)
+++ incubator/shindig/trunk/java/samples/src/main/java/org/apache/shindig/social/opensocial/jpa/spi/JPQLUtils.java Fri Dec 18 20:18:56 2009
@@ -41,14 +41,14 @@
*/
public static int addInClause(StringBuilder sb, String alias, String inField, int firstField,
int nfields) {
- sb.append(alias).append(".").append(inField).append(" in (");
+ sb.append(alias).append('.').append(inField).append(" in (");
for (int i = firstField; i < (firstField + nfields); i++) {
if (i != firstField) {
sb.append(", ");
}
- sb.append("?").append(i);
+ sb.append('?').append(i);
}
- sb.append(")");
+ sb.append(')');
return firstField + nfields;
}
@@ -91,7 +91,7 @@
fromIndex = queryInUpperCase.indexOf(" FROM ");
if (fromIndex == -1) {
// Couldn't find the FROM keyword in the query
- throw new ProtocolException(HttpServletResponse.SC_INTERNAL_SERVER_ERROR, "Invalid query [" + query + "]");
+ throw new ProtocolException(HttpServletResponse.SC_INTERNAL_SERVER_ERROR, "Invalid query [" + query + ']');
}
}
query = "select count(*) " + query.substring(fromIndex, query.length());
Modified: incubator/shindig/trunk/java/samples/src/main/java/org/apache/shindig/social/opensocial/jpa/spi/PersonServiceDb.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/samples/src/main/java/org/apache/shindig/social/opensocial/jpa/spi/PersonServiceDb.java?rev=892365&r1=892364&r2=892365&view=diff
==============================================================================
--- incubator/shindig/trunk/java/samples/src/main/java/org/apache/shindig/social/opensocial/jpa/spi/PersonServiceDb.java (original)
+++ incubator/shindig/trunk/java/samples/src/main/java/org/apache/shindig/social/opensocial/jpa/spi/PersonServiceDb.java Fri Dec 18 20:18:56 2009
@@ -121,7 +121,7 @@
if (GroupId.Type.self.equals(groupId.getType())) {
plist = JPQLUtils.getListQuery(entiyManager, sb.toString(), paramList, collectionOptions);
totalResults = Long.valueOf(1);
- if (0 == plist.size()) {
+ if (plist.isEmpty()) {
throw new ProtocolException(HttpServletResponse.SC_BAD_REQUEST, "Person not found");
}
} else {
@@ -215,7 +215,7 @@
case contains:
filterPos = lastPos + 1;
sb.append(" like ").append(" ?").append(filterPos);
- filterValue = "%" + filterValue + "%";
+ filterValue = '%' + filterValue + '%';
collectionOptions.setFilter(filterValue);
break;
case equals:
@@ -228,7 +228,7 @@
case startsWith:
filterPos = lastPos + 1;
sb.append(" like ").append(" ?").append(filterPos);
- filterValue = "%" + filterValue + "%";
+ filterValue = '%' + filterValue + '%';
collectionOptions.setFilter(filterValue);
break;
}
@@ -256,7 +256,7 @@
// If sortBy is name then order by p.name.familyName, p.name.givenName.
sb.append(" order by p.name.familyName, p.name.givenName ");
} else {
- sb.append(" order by p." + sortBy);
+ sb.append(" order by p.").append(sortBy);
}
switch (collectionOptions.getSortOrder()) {
case ascending:
Modified: incubator/shindig/trunk/java/samples/src/main/java/org/apache/shindig/social/opensocial/jpa/spi/SPIUtils.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/samples/src/main/java/org/apache/shindig/social/opensocial/jpa/spi/SPIUtils.java?rev=892365&r1=892364&r2=892365&view=diff
==============================================================================
--- incubator/shindig/trunk/java/samples/src/main/java/org/apache/shindig/social/opensocial/jpa/spi/SPIUtils.java (original)
+++ incubator/shindig/trunk/java/samples/src/main/java/org/apache/shindig/social/opensocial/jpa/spi/SPIUtils.java Fri Dec 18 20:18:56 2009
@@ -66,7 +66,7 @@
}
public static <T> List<T> toList(Set<T> s) {
- List<T> l = new ArrayList<T>();
+ List<T> l = new ArrayList<T>(s.size());
l.addAll(s);
return l;
}
Modified: incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/service/MessageHandler.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/service/MessageHandler.java?rev=892365&r1=892364&r2=892365&view=diff
==============================================================================
--- incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/service/MessageHandler.java (original)
+++ incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/service/MessageHandler.java Fri Dec 18 20:18:56 2009
@@ -146,7 +146,7 @@
"A message collection is required");
}
- if (messageIds.size() == 0) {
+ if (messageIds.isEmpty()) {
// No message IDs specified, this is a PUT to a message collection
MessageCollection msgCollection = request.getTypedParameter("entity", MessageCollection.class);
if (msgCollection == null) {
Modified: incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/sample/spi/JsonDbOpensocialService.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/sample/spi/JsonDbOpensocialService.java?rev=892365&r1=892364&r2=892365&view=diff
==============================================================================
--- incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/sample/spi/JsonDbOpensocialService.java (original)
+++ incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/sample/spi/JsonDbOpensocialService.java Fri Dec 18 20:18:56 2009
@@ -342,7 +342,7 @@
appData.put(key, personData.get(key));
}
} else {
- String appDataPrefix = Person.Field.APP_DATA.toString() + ".";
+ String appDataPrefix = Person.Field.APP_DATA.toString() + '.';
for (String field : fields) {
if (field.startsWith(appDataPrefix)) {
if (appData == null) {