You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@shindig.apache.org by li...@apache.org on 2010/12/03 17:34:47 UTC
svn commit: r1041901 - in /shindig/trunk/java:
common/src/main/java/org/apache/shindig/common/uri/
common/src/main/java/org/apache/shindig/protocol/
common/src/main/java/org/apache/shindig/protocol/conversion/
common/src/test/java/org/apache/shindig/co...
Author: lindner
Date: Fri Dec 3 16:34:45 2010
New Revision: 1041901
URL: http://svn.apache.org/viewvc?rev=1041901&view=rev
Log:
use Strings instead of StringUtils
Modified:
shindig/trunk/java/common/src/main/java/org/apache/shindig/common/uri/Uri.java
shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/ContentTypes.java
shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/DefaultHandlerRegistry.java
shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/JsonRpcServlet.java
shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/conversion/BeanFilter.java
shindig/trunk/java/common/src/test/java/org/apache/shindig/common/JsonSerializerTest.java
shindig/trunk/java/common/src/test/java/org/apache/shindig/protocol/DataServiceServletTest.java
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/BasicHttpFetcher.java
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/DefaultInvalidationService.java
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/InvalidationHandler.java
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth/GadgetOAuthCallbackGenerator.java
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/parse/caja/CajaCssSanitizer.java
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/render/SanitizingResponseRewriter.java
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/AbsolutePathReferenceVisitor.java
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/ConcatVisitor.java
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/ContentRewriterFeature.java
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/CssResponseRewriter.java
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/OsTemplateXmlLoaderRewriter.java
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/ResourceMutateVisitor.java
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/TemplateRewriter.java
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/AccelHandler.java
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/ConcatProxyServlet.java
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/GadgetRenderingServlet.java
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/GadgetsHandler.java
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/ProxyHandler.java
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/ServletUtil.java
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/templates/ContainerTagLibraryFactory.java
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/templates/tags/FlashTagHandler.java
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/uri/DefaultAccelUriManager.java
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/uri/DefaultProxyUriManager.java
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/uri/ProxyUriBase.java
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/uri/UriUtils.java
shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/parse/AbstractSocialMarkupHtmlParserTest.java
shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/HtmlAccelServletTest.java
shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/variables/SubstitutionsTest.java
shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/oauth/OAuthAuthenticationHandler.java
shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/core/oauth/FakeOAuthRequest.java
Modified: shindig/trunk/java/common/src/main/java/org/apache/shindig/common/uri/Uri.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/common/src/main/java/org/apache/shindig/common/uri/Uri.java?rev=1041901&r1=1041900&r2=1041901&view=diff
==============================================================================
--- shindig/trunk/java/common/src/main/java/org/apache/shindig/common/uri/Uri.java (original)
+++ shindig/trunk/java/common/src/main/java/org/apache/shindig/common/uri/Uri.java Fri Dec 3 16:34:45 2010
@@ -18,7 +18,7 @@
*/
package org.apache.shindig.common.uri;
-import org.apache.commons.lang.StringUtils;
+import com.google.common.base.Strings;
import com.google.common.base.Objects;
import com.google.common.collect.Maps;
@@ -152,7 +152,7 @@ public final class Uri {
}
UriBuilder result;
- if (StringUtils.isEmpty(relative.path) && relative.scheme == null
+ if (Strings.isNullOrEmpty(relative.path) && relative.scheme == null
&& relative.authority == null && relative.query == null
&& relative.fragment != null) {
// if the relative URI only consists of fragment,
@@ -192,9 +192,9 @@ public final class Uri {
}
private static void validate(Uri uri) {
- if (StringUtils.isEmpty(uri.authority) &&
- StringUtils.isEmpty(uri.path) &&
- StringUtils.isEmpty(uri.query)) {
+ if (Strings.isNullOrEmpty(uri.authority) &&
+ Strings.isNullOrEmpty(uri.path) &&
+ Strings.isNullOrEmpty(uri.query)) {
throw new UriException("Invalid scheme-specific part");
}
}
Modified: shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/ContentTypes.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/ContentTypes.java?rev=1041901&r1=1041900&r2=1041901&view=diff
==============================================================================
--- shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/ContentTypes.java (original)
+++ shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/ContentTypes.java Fri Dec 3 16:34:45 2010
@@ -18,6 +18,7 @@
*/
package org.apache.shindig.protocol;
+import com.google.common.base.Strings;
import org.apache.commons.lang.StringUtils;
import com.google.common.collect.ImmutableSet;
@@ -83,7 +84,7 @@ public final class ContentTypes {
public static void checkContentTypes(Set<String> allowedContentTypes,
String contentType) throws InvalidContentTypeException {
- if (StringUtils.isEmpty(contentType)) {
+ if (Strings.isNullOrEmpty(contentType)) {
throw new InvalidContentTypeException(
"No Content-Type specified. One of "
+ StringUtils.join(allowedContentTypes, ", ") + " is required");
Modified: shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/DefaultHandlerRegistry.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/DefaultHandlerRegistry.java?rev=1041901&r1=1041900&r2=1041901&view=diff
==============================================================================
--- shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/DefaultHandlerRegistry.java (original)
+++ shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/DefaultHandlerRegistry.java Fri Dec 3 16:34:45 2010
@@ -19,6 +19,7 @@
package org.apache.shindig.protocol;
import com.google.common.base.Preconditions;
+import com.google.common.base.Strings;
import org.apache.commons.io.IOUtils;
import org.apache.commons.lang.StringUtils;
import org.apache.shindig.auth.SecurityToken;
@@ -184,7 +185,7 @@ public class DefaultHandlerRegistry impl
try {
MethodCaller methodCaller = new MethodCaller(m, true);
String opName = m.getName();
- if (!StringUtils.isEmpty(op.name())) {
+ if (!Strings.isNullOrEmpty(op.name())) {
opName = op.name();
}
RestInvocationHandler restHandler = new RestInvocationHandler(op, methodCaller,
@@ -199,7 +200,7 @@ public class DefaultHandlerRegistry impl
}
for (String httpMethod : op.httpMethods()) {
- if (!StringUtils.isEmpty(httpMethod)) {
+ if (!Strings.isNullOrEmpty(httpMethod)) {
httpMethod = httpMethod.toUpperCase();
SortedSet<RestPath> sortedSet = methods.get(httpMethod);
if (sortedSet == null) {
@@ -207,7 +208,7 @@ public class DefaultHandlerRegistry impl
methods.put(httpMethod, sortedSet);
}
- if (StringUtils.isEmpty(op.path())) {
+ if (Strings.isNullOrEmpty(op.path())) {
sortedSet.add(new RestPath('/' + serviceName + service.path(), restHandler));
} else {
// Use the standard service name and constant prefix as the key
Modified: shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/JsonRpcServlet.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/JsonRpcServlet.java?rev=1041901&r1=1041900&r2=1041901&view=diff
==============================================================================
--- shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/JsonRpcServlet.java (original)
+++ shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/JsonRpcServlet.java Fri Dec 3 16:34:45 2010
@@ -17,6 +17,7 @@
*/
package org.apache.shindig.protocol;
+import com.google.common.base.Strings;
import org.apache.commons.io.IOUtils;
import org.apache.commons.lang.StringUtils;
import org.apache.shindig.auth.SecurityToken;
@@ -156,7 +157,7 @@ public class JsonRpcServlet extends ApiS
// with field name as "request". It will contain the json request. Any further form
// field or file item will not be parsed out, but will be exposed via getFormItem
// method of RequestItem.
- if (!StringUtils.isEmpty(item.getContentType())) {
+ if (!Strings.isNullOrEmpty(item.getContentType())) {
ContentTypes.checkContentTypes(ContentTypes.ALLOWED_JSON_CONTENT_TYPES, item.getContentType());
}
content = item.getAsString();
Modified: shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/conversion/BeanFilter.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/conversion/BeanFilter.java?rev=1041901&r1=1041900&r2=1041901&view=diff
==============================================================================
--- shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/conversion/BeanFilter.java (original)
+++ shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/conversion/BeanFilter.java Fri Dec 3 16:34:45 2010
@@ -18,12 +18,11 @@
*/
package org.apache.shindig.protocol.conversion;
+import com.google.common.base.Strings;
import com.google.common.collect.ImmutableSet;
import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
-import org.apache.commons.lang.StringUtils;
-
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
@@ -123,7 +122,7 @@ public class BeanFilter {
FilterInvocationHandler(Object origData, Set<String> fields, String fieldName) {
this.fields = fields;
- this.prefix = StringUtils.isEmpty(fieldName) ? "" : fieldName + DELIMITER;
+ this.prefix = Strings.isNullOrEmpty(fieldName) ? "" : fieldName + DELIMITER;
this.origData = origData;
}
Modified: shindig/trunk/java/common/src/test/java/org/apache/shindig/common/JsonSerializerTest.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/common/src/test/java/org/apache/shindig/common/JsonSerializerTest.java?rev=1041901&r1=1041900&r2=1041901&view=diff
==============================================================================
--- shindig/trunk/java/common/src/test/java/org/apache/shindig/common/JsonSerializerTest.java (original)
+++ shindig/trunk/java/common/src/test/java/org/apache/shindig/common/JsonSerializerTest.java Fri Dec 3 16:34:45 2010
@@ -21,7 +21,8 @@ package org.apache.shindig.common;
import static org.apache.shindig.common.JsonAssert.assertJsonEquals;
import static org.junit.Assert.assertEquals;
-import org.apache.commons.lang.StringUtils;
+import com.google.common.base.Strings;
+
import org.json.JSONArray;
import org.json.JSONObject;
import org.junit.Test;
@@ -282,7 +283,7 @@ public class JsonSerializerTest {
public static Map<String, Object> perfComparison100LargeValues() {
Map<String, Object> data = Maps.newHashMap();
for (int i = 0; i < 100; ++i) {
- data.put("key-" + i, StringUtils.repeat("small value", 100));
+ data.put("key-" + i, Strings.repeat("small value", 100));
}
return data;
}
@@ -290,7 +291,7 @@ public class JsonSerializerTest {
public static Map<String, Object> perfComparison10LargeValuesAndEscapes() {
Map<String, Object> data = Maps.newHashMap();
for (int i = 0; i < 10; ++i) {
- data.put("key-" + i, StringUtils.repeat("\tsmall\r value \\foo\b\uFFFF\uBCAD\n\u0083", 100));
+ data.put("key-" + i, Strings.repeat("\tsmall\r value \\foo\b\uFFFF\uBCAD\n\u0083", 100));
}
return data;
}
Modified: shindig/trunk/java/common/src/test/java/org/apache/shindig/protocol/DataServiceServletTest.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/common/src/test/java/org/apache/shindig/protocol/DataServiceServletTest.java?rev=1041901&r1=1041900&r2=1041901&view=diff
==============================================================================
--- shindig/trunk/java/common/src/test/java/org/apache/shindig/protocol/DataServiceServletTest.java (original)
+++ shindig/trunk/java/common/src/test/java/org/apache/shindig/protocol/DataServiceServletTest.java Fri Dec 3 16:34:45 2010
@@ -23,7 +23,7 @@ import java.io.PrintWriter;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import org.apache.commons.lang.StringUtils;
+import com.google.common.base.Strings;
import org.apache.shindig.auth.AuthInfoUtil;
import org.apache.shindig.common.testing.FakeGadgetToken;
import org.apache.shindig.common.testing.FakeHttpServletRequest;
@@ -96,7 +96,7 @@ public class DataServiceServletTest exte
String actualMethod, String overrideMethod) throws Exception {
setupRequest(pathInfo, actualMethod, overrideMethod);
- String method = StringUtils.isEmpty(overrideMethod) ? actualMethod : overrideMethod;
+ String method = Strings.isNullOrEmpty(overrideMethod) ? actualMethod : overrideMethod;
EasyMock.expect(jsonConverter.convertToString(
ImmutableMap.of("entry", TestHandler.REST_RESULTS.get(method))))
Modified: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/BasicHttpFetcher.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/BasicHttpFetcher.java?rev=1041901&r1=1041900&r2=1041901&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/BasicHttpFetcher.java (original)
+++ shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/BasicHttpFetcher.java Fri Dec 3 16:34:45 2010
@@ -18,6 +18,7 @@
package org.apache.shindig.gadgets.http;
import com.google.common.base.Preconditions;
+import com.google.common.base.Strings;
import com.google.common.collect.ImmutableSet;
import com.google.inject.Inject;
import com.google.inject.Singleton;
@@ -172,7 +173,7 @@ public class BasicHttpFetcher implements
DefaultHttpClient client = new DefaultHttpClient(cm, params);
// Set proxy if set via guice.
- if (!StringUtils.isEmpty(basicHttpFetcherProxy)) {
+ if (!Strings.isNullOrEmpty(basicHttpFetcherProxy)) {
String[] splits = basicHttpFetcherProxy.split(":");
ConnRouteParams.setDefaultProxy(
client.getParams(), new HttpHost(splits[0], Integer.parseInt(splits[1]), "http"));
@@ -221,7 +222,7 @@ public class BasicHttpFetcher implements
client.removeResponseInterceptorByClass(ResponseProcessCookies.class);
// Use Java's built-in proxy logic in case no proxy set via guice.
- if (StringUtils.isEmpty(basicHttpFetcherProxy)) {
+ if (Strings.isNullOrEmpty(basicHttpFetcherProxy)) {
ProxySelectorRoutePlanner routePlanner = new ProxySelectorRoutePlanner(
client.getConnectionManager().getSchemeRegistry(),
ProxySelector.getDefault());
@@ -284,12 +285,12 @@ public class BasicHttpFetcher implements
// Break the request Uri to its components:
Uri uri = request.getUri();
- if (StringUtils.isEmpty(uri.getAuthority())) {
+ if (Strings.isNullOrEmpty(uri.getAuthority())) {
throw new GadgetException(GadgetException.Code.INVALID_USER_DATA,
"Missing domain name for request: " + uri,
HttpServletResponse.SC_BAD_REQUEST);
}
- if (StringUtils.isEmpty(uri.getScheme())) {
+ if (Strings.isNullOrEmpty(uri.getScheme())) {
throw new GadgetException(GadgetException.Code.INVALID_USER_DATA,
"Missing schema for request: " + uri,
HttpServletResponse.SC_BAD_REQUEST);
Modified: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/DefaultInvalidationService.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/DefaultInvalidationService.java?rev=1041901&r1=1041900&r2=1041901&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/DefaultInvalidationService.java (original)
+++ shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/DefaultInvalidationService.java Fri Dec 3 16:34:45 2010
@@ -17,7 +17,7 @@
*/
package org.apache.shindig.gadgets.http;
-import org.apache.commons.lang.StringUtils;
+import com.google.common.base.Strings;
import org.apache.shindig.auth.SecurityToken;
import org.apache.shindig.common.cache.Cache;
import org.apache.shindig.common.cache.CacheProvider;
@@ -125,7 +125,7 @@ public class DefaultInvalidationService
// Assume the container is consistent in its use of either appId or appUrl.
// Use appId
- if (!StringUtils.isEmpty(token.getAppId())) {
+ if (!Strings.isNullOrEmpty(token.getAppId())) {
return TOKEN_PREFIX + token.getAppId() + ':' + userId;
}
return TOKEN_PREFIX + token.getAppUrl() + ':' + userId;
Modified: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/InvalidationHandler.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/InvalidationHandler.java?rev=1041901&r1=1041900&r2=1041901&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/InvalidationHandler.java (original)
+++ shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/InvalidationHandler.java Fri Dec 3 16:34:45 2010
@@ -17,7 +17,7 @@
*/
package org.apache.shindig.gadgets.http;
-import org.apache.commons.lang.StringUtils;
+import com.google.common.base.Strings;
import org.apache.shindig.auth.AuthenticationMode;
import org.apache.shindig.common.uri.Uri;
import org.apache.shindig.protocol.BaseRequestItem;
@@ -54,8 +54,8 @@ public class InvalidationHandler {
@Operation(httpMethods = {"POST","GET"}, path = "/invalidate")
public void invalidate(BaseRequestItem request) {
- if (StringUtils.isEmpty(request.getToken().getAppId()) &&
- StringUtils.isEmpty(request.getToken().getAppUrl())) {
+ if (Strings.isNullOrEmpty(request.getToken().getAppId()) &&
+ Strings.isNullOrEmpty(request.getToken().getAppUrl())) {
throw new ProtocolException(HttpServletResponse.SC_BAD_REQUEST,
"Cannot invalidate content without specifying application");
}
@@ -70,7 +70,7 @@ public class InvalidationHandler {
Set<Uri> resources = Sets.newHashSet();
// Assume the the viewer content is being invalidated if it is available
- if (!StringUtils.isEmpty(request.getToken().getViewerId())) {
+ if (!Strings.isNullOrEmpty(request.getToken().getViewerId())) {
userIds.add(request.getToken().getViewerId());
}
if (keys != null) {
Modified: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth/GadgetOAuthCallbackGenerator.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth/GadgetOAuthCallbackGenerator.java?rev=1041901&r1=1041900&r2=1041901&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth/GadgetOAuthCallbackGenerator.java (original)
+++ shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth/GadgetOAuthCallbackGenerator.java Fri Dec 3 16:34:45 2010
@@ -18,10 +18,10 @@
*/
package org.apache.shindig.gadgets.oauth;
+import com.google.common.base.Strings;
import com.google.inject.Inject;
import com.google.inject.name.Named;
-import org.apache.commons.lang.StringUtils;
import org.apache.shindig.auth.SecurityToken;
import org.apache.shindig.common.crypto.BlobCrypter;
import org.apache.shindig.common.crypto.BlobCrypterException;
@@ -133,7 +133,7 @@ public class GadgetOAuthCallbackGenerato
if (gadgetCallback == null) {
return null;
}
- if (StringUtils.isEmpty(gadgetCallback.getScheme())) {
+ if (Strings.isNullOrEmpty(gadgetCallback.getScheme())) {
gadgetCallback = new UriBuilder(gadgetCallback).setScheme(activeUrl.getScheme()).toUri();
}
return gadgetCallback.toString();
Modified: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/parse/caja/CajaCssSanitizer.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/parse/caja/CajaCssSanitizer.java?rev=1041901&r1=1041900&r2=1041901&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/parse/caja/CajaCssSanitizer.java (original)
+++ shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/parse/caja/CajaCssSanitizer.java Fri Dec 3 16:34:45 2010
@@ -17,7 +17,7 @@
*/
package org.apache.shindig.gadgets.parse.caja;
-import org.apache.commons.lang.StringUtils;
+import com.google.common.base.Strings;
import org.apache.shindig.common.uri.Uri;
import org.apache.shindig.gadgets.GadgetContext;
import org.apache.shindig.gadgets.GadgetException;
@@ -110,7 +110,7 @@ public class CajaCssSanitizer {
// Failed to parse stylesheet so log and continue
LOG.log(Level.INFO, "Failed to parse stylesheet", ge);
}
- if (StringUtils.isEmpty(content)) {
+ if (Strings.isNullOrEmpty(content)) {
// Remove the owning node
styleElem.getParentNode().removeChild(styleElem);
} else {
@@ -208,7 +208,7 @@ public class CajaCssSanitizer {
private boolean isValidUri(String uri) {
try {
String scheme = Uri.parse(uri).getScheme();
- return StringUtils.isEmpty(scheme) ||
+ return Strings.isNullOrEmpty(scheme) ||
ALLOWED_URI_SCHEMES.contains(scheme.toLowerCase());
} catch (RuntimeException re) {
if (LOG.isLoggable(Level.FINE)) {
Modified: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/render/SanitizingResponseRewriter.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/render/SanitizingResponseRewriter.java?rev=1041901&r1=1041900&r2=1041901&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/render/SanitizingResponseRewriter.java (original)
+++ shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/render/SanitizingResponseRewriter.java Fri Dec 3 16:34:45 2010
@@ -18,7 +18,7 @@
*/
package org.apache.shindig.gadgets.render;
-import org.apache.commons.lang.StringUtils;
+import com.google.common.base.Strings;
import org.apache.sanselan.ImageFormat;
import org.apache.sanselan.ImageReadException;
import org.apache.sanselan.Sanselan;
@@ -64,7 +64,7 @@ public class SanitizingResponseRewriter
// Content fetched through the proxy can stipulate that it must be sanitized.
if (request.isSanitizationRequested() &&
featureConfigFactory.get(request).shouldRewriteURL(request.getUri().toString())) {
- if (StringUtils.isEmpty(request.getRewriteMimeType())) {
+ if (Strings.isNullOrEmpty(request.getRewriteMimeType())) {
LOG.log(Level.WARNING, "Request to sanitize without content type for "
+ request.getUri());
resp.setContent("");
Modified: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/AbsolutePathReferenceVisitor.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/AbsolutePathReferenceVisitor.java?rev=1041901&r1=1041900&r2=1041901&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/AbsolutePathReferenceVisitor.java (original)
+++ shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/AbsolutePathReferenceVisitor.java Fri Dec 3 16:34:45 2010
@@ -19,10 +19,10 @@
package org.apache.shindig.gadgets.rewrite;
import com.google.common.annotations.VisibleForTesting;
+import com.google.common.base.Strings;
import com.google.common.collect.ImmutableMap;
import com.google.inject.Inject;
-import org.apache.commons.lang.StringUtils;
import org.apache.shindig.common.uri.Uri;
import org.apache.shindig.gadgets.Gadget;
import org.apache.shindig.gadgets.rewrite.DomWalker.Visitor;
@@ -137,7 +137,7 @@ public class AbsolutePathReferenceVisito
Attr attr = (Attr) node.getAttributes().getNamedItem(
resourceTags.get(nodeName));
String nodeUri = attr != null ? attr.getValue() : null;
- if (!StringUtils.isEmpty(nodeUri)) {
+ if (!Strings.isNullOrEmpty(nodeUri)) {
return attr;
}
}
Modified: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/ConcatVisitor.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/ConcatVisitor.java?rev=1041901&r1=1041900&r2=1041901&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/ConcatVisitor.java (original)
+++ shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/ConcatVisitor.java Fri Dec 3 16:34:45 2010
@@ -18,7 +18,7 @@
*/
package org.apache.shindig.gadgets.rewrite;
-import org.apache.commons.lang.StringUtils;
+import com.google.common.base.Strings;
import org.apache.shindig.common.uri.Uri;
import org.apache.shindig.gadgets.Gadget;
import org.apache.shindig.gadgets.uri.ConcatUriManager;
@@ -199,7 +199,7 @@ public class ConcatVisitor implements Do
for (Element elem : sourceBatch) {
Uri elemOrigUri = uriIt.next();
String snippet = concatUri.getSnippet(elemOrigUri);
- if (!StringUtils.isEmpty(snippet)) {
+ if (!Strings.isNullOrEmpty(snippet)) {
Node scriptNode = elem.getOwnerDocument().createElement("script");
scriptNode.setTextContent(snippet);
elem.getParentNode().insertBefore(scriptNode, elem);
@@ -223,7 +223,7 @@ public class ConcatVisitor implements Do
Multimap<String, Element> mediaBatchMap = LinkedHashMultimap.create();
for (Element element : elements) {
String mediaType = element.getAttribute("media");
- mediaBatchMap.put(StringUtils.isEmpty(mediaType) ? "screen" : mediaType, element);
+ mediaBatchMap.put(Strings.isNullOrEmpty(mediaType) ? "screen" : mediaType, element);
}
Set<String> mediaTypes = mediaBatchMap.keySet();
for (String mediaType : mediaTypes) {
@@ -234,7 +234,7 @@ public class ConcatVisitor implements Do
private boolean isRewritableExternData(Element elem) {
String uriStr = elem != null ? elem.getAttribute(type.getSrcAttrib()) : null;
- if (StringUtils.isEmpty(uriStr) ||
+ if (Strings.isNullOrEmpty(uriStr) ||
!config.shouldRewriteURL(uriStr)) {
return false;
}
Modified: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/ContentRewriterFeature.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/ContentRewriterFeature.java?rev=1041901&r1=1041900&r2=1041901&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/ContentRewriterFeature.java (original)
+++ shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/ContentRewriterFeature.java Fri Dec 3 16:34:45 2010
@@ -17,6 +17,7 @@
*/
package org.apache.shindig.gadgets.rewrite;
+import com.google.common.base.Strings;
import com.google.common.collect.ImmutableSet;
import com.google.common.collect.ImmutableSortedSet;
import com.google.common.collect.Lists;
@@ -252,7 +253,7 @@ public class ContentRewriterFeature {
if (f != null && f.getParams().containsKey(INCLUDE_TAGS)) {
tagsVal = Sets.newTreeSet();
for (String tag : StringUtils.split(f.getParam(INCLUDE_TAGS), ',')) {
- if (!StringUtils.isEmpty(tag)) {
+ if (!Strings.isNullOrEmpty(tag)) {
tagsVal.add(tag.trim().toLowerCase());
}
}
@@ -298,7 +299,7 @@ public class ContentRewriterFeature {
bundle.param = regex;
bundle.matches = matches;
- if (bundle.matches.isEmpty() && StringUtils.isEmpty(bundle.param)) {
+ if (bundle.matches.isEmpty() && Strings.isNullOrEmpty(bundle.param)) {
bundle.options = PatternOptions.NONE;
} else if (bundle.matches.size() == 1) {
String firstVal = bundle.matches.iterator().next();
Modified: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/CssResponseRewriter.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/CssResponseRewriter.java?rev=1041901&r1=1041900&r2=1041901&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/CssResponseRewriter.java (original)
+++ shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/CssResponseRewriter.java Fri Dec 3 16:34:45 2010
@@ -17,6 +17,7 @@
*/
package org.apache.shindig.gadgets.rewrite;
+import com.google.common.base.Strings;
import org.apache.commons.io.IOUtils;
import org.apache.commons.lang.StringUtils;
import org.apache.shindig.common.uri.Uri;
@@ -138,7 +139,7 @@ public class CssResponseRewriter impleme
List<String> imports = rewrite(stylesheet, source, uriMaker, extractImports, gadgetContext);
// Write the rewritten CSS back into the element
String content = cssParser.serialize(stylesheet);
- if (StringUtils.isEmpty(content) || StringUtils.isWhitespace(content)) {
+ if (Strings.isNullOrEmpty(content) || StringUtils.isWhitespace(content)) {
// Remove the owning node
styleNode.getParentNode().removeChild(styleNode);
} else {
Modified: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/OsTemplateXmlLoaderRewriter.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/OsTemplateXmlLoaderRewriter.java?rev=1041901&r1=1041900&r2=1041901&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/OsTemplateXmlLoaderRewriter.java (original)
+++ shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/OsTemplateXmlLoaderRewriter.java Fri Dec 3 16:34:45 2010
@@ -18,9 +18,9 @@
*/
package org.apache.shindig.gadgets.rewrite;
+import com.google.common.base.Strings;
import com.google.inject.Inject;
-import org.apache.commons.lang.StringUtils;
import org.apache.shindig.common.xml.DomUtil;
import org.apache.shindig.gadgets.Gadget;
import org.apache.shindig.gadgets.GadgetException;
@@ -82,8 +82,8 @@ public class OsTemplateXmlLoaderRewriter
if (node.getNodeType() == Node.ELEMENT_NODE &&
"div".equalsIgnoreCase(((Element)node).getTagName()) &&
OS_TEMPLATE_MIME.equalsIgnoreCase(((Element)node).getAttribute("type")) &&
- (!StringUtils.isEmpty(((Element)node).getAttribute("id")) ||
- !StringUtils.isEmpty(((Element)node).getAttribute("name")))) {
+ (!Strings.isNullOrEmpty(((Element) node).getAttribute("id")) ||
+ !Strings.isNullOrEmpty(((Element)node).getAttribute("name")))) {
return VisitStatus.RESERVE_NODE;
}
return VisitStatus.BYPASS;
@@ -113,7 +113,7 @@ public class OsTemplateXmlLoaderRewriter
Element elem = (Element)node;
String value = elem.getTextContent();
String id = elem.getAttribute("name");
- if (StringUtils.isEmpty(id)) {
+ if (Strings.isNullOrEmpty(id)) {
id = elem.getAttribute("id");
}
Modified: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/ResourceMutateVisitor.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/ResourceMutateVisitor.java?rev=1041901&r1=1041900&r2=1041901&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/ResourceMutateVisitor.java (original)
+++ shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/ResourceMutateVisitor.java Fri Dec 3 16:34:45 2010
@@ -18,9 +18,9 @@
*/
package org.apache.shindig.gadgets.rewrite;
+import com.google.common.base.Strings;
import com.google.common.collect.ImmutableMap;
import com.google.common.collect.Maps;
-import org.apache.commons.lang.StringUtils;
import org.apache.shindig.common.Pair;
import org.apache.shindig.common.uri.Uri;
import org.apache.shindig.gadgets.Gadget;
@@ -112,7 +112,7 @@ public abstract class ResourceMutateVisi
resourceTags.get(nodeName));
if (attr != null) {
String urlValue = attr.getValue();
- if (!StringUtils.isEmpty(urlValue) && featureConfig.shouldRewriteURL(urlValue)) {
+ if (!Strings.isNullOrEmpty(urlValue) && featureConfig.shouldRewriteURL(urlValue)) {
return VisitStatus.RESERVE_NODE;
}
}
Modified: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/TemplateRewriter.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/TemplateRewriter.java?rev=1041901&r1=1041900&r2=1041901&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/TemplateRewriter.java (original)
+++ shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/TemplateRewriter.java Fri Dec 3 16:34:45 2010
@@ -17,6 +17,7 @@
*/
package org.apache.shindig.gadgets.rewrite;
+import com.google.common.base.Strings;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableSet;
import com.google.common.collect.Lists;
@@ -269,7 +270,7 @@ public class TemplateRewriter implements
private void injectTemplateLibrary(TemplateLibrary library, Element head) {
try {
String libraryContent = library.serialize();
- if (StringUtils.isEmpty(libraryContent)) {
+ if (Strings.isNullOrEmpty(libraryContent)) {
return;
}
Modified: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/AccelHandler.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/AccelHandler.java?rev=1041901&r1=1041900&r2=1041901&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/AccelHandler.java (original)
+++ shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/AccelHandler.java Fri Dec 3 16:34:45 2010
@@ -17,12 +17,12 @@
*/
package org.apache.shindig.gadgets.servlet;
+import com.google.common.base.Strings;
import com.google.inject.Inject;
import com.google.inject.Singleton;
import com.google.inject.name.Named;
import org.apache.commons.io.IOUtils;
-import org.apache.commons.lang.StringUtils;
import org.apache.shindig.common.uri.Uri;
import org.apache.shindig.gadgets.Gadget;
import org.apache.shindig.gadgets.GadgetException;
@@ -160,7 +160,7 @@ public class AccelHandler {
*/
protected boolean isRecoverable(HttpRequest req, HttpResponse results,
RewritingException exception) {
- return !(StringUtils.isEmpty(results.getResponseAsString()) &&
+ return !(Strings.isNullOrEmpty(results.getResponseAsString()) &&
results.getHeaders() == null);
}
Modified: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/ConcatProxyServlet.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/ConcatProxyServlet.java?rev=1041901&r1=1041900&r2=1041901&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/ConcatProxyServlet.java (original)
+++ shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/ConcatProxyServlet.java Fri Dec 3 16:34:45 2010
@@ -18,12 +18,12 @@
package org.apache.shindig.gadgets.servlet;
+import com.google.common.base.Strings;
import com.google.inject.Inject;
import com.google.inject.name.Named;
import com.google.common.collect.Lists;
import org.apache.commons.lang.StringEscapeUtils;
-import org.apache.commons.lang.StringUtils;
import org.apache.shindig.common.servlet.HttpUtil;
import org.apache.shindig.common.servlet.InjectedServlet;
import org.apache.shindig.common.Pair;
@@ -245,7 +245,7 @@ public class ConcatProxyServlet extends
StringBuilder err = new StringBuilder();
err.append("/* ---- Error ");
err.append(status);
- if (!StringUtils.isEmpty(errorMessage)) {
+ if (!Strings.isNullOrEmpty(errorMessage)) {
err.append(", ");
err.append(errorMessage);
}
Modified: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/GadgetRenderingServlet.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/GadgetRenderingServlet.java?rev=1041901&r1=1041900&r2=1041901&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/GadgetRenderingServlet.java (original)
+++ shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/GadgetRenderingServlet.java Fri Dec 3 16:34:45 2010
@@ -17,6 +17,7 @@
*/
package org.apache.shindig.gadgets.servlet;
+import com.google.common.base.Strings;
import org.apache.shindig.common.servlet.HttpUtil;
import org.apache.shindig.common.servlet.InjectedServlet;
import org.apache.shindig.common.uri.UriBuilder;
@@ -31,7 +32,6 @@ import org.apache.shindig.gadgets.uri.Ur
import com.google.inject.Inject;
import org.apache.commons.lang.StringEscapeUtils;
-import org.apache.commons.lang.StringUtils;
import java.io.IOException;
import java.util.logging.Logger;
@@ -139,7 +139,7 @@ public class GadgetRenderingServlet exte
// with a query parameter.
int ttl = DEFAULT_CACHE_TTL;
String ttlStr = params.getRequest().getParameter(Param.REFRESH.getKey());
- if (!StringUtils.isEmpty(ttlStr)) {
+ if (!Strings.isNullOrEmpty(ttlStr)) {
try {
ttl = Integer.parseInt(ttlStr);
} catch (NumberFormatException e) {
Modified: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/GadgetsHandler.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/GadgetsHandler.java?rev=1041901&r1=1041900&r2=1041901&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/GadgetsHandler.java (original)
+++ shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/GadgetsHandler.java Fri Dec 3 16:34:45 2010
@@ -19,12 +19,12 @@
package org.apache.shindig.gadgets.servlet;
import com.google.common.annotations.VisibleForTesting;
+import com.google.common.base.Strings;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableMap;
import com.google.common.collect.ImmutableSet;
import com.google.inject.Inject;
-import org.apache.commons.lang.StringUtils;
import org.apache.shindig.common.uri.Uri;
import org.apache.shindig.common.uri.Uri.UriException;
import org.apache.shindig.gadgets.http.HttpResponse;
@@ -197,7 +197,7 @@ public class GadgetsHandler {
return ImmutableMap.of();
}
- if (StringUtils.isEmpty(request.getParameter("container"))) {
+ if (Strings.isNullOrEmpty(request.getParameter("container"))) {
throw new ProtocolException(HttpServletResponse.SC_BAD_REQUEST,
"Missing container for request.");
}
Modified: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/ProxyHandler.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/ProxyHandler.java?rev=1041901&r1=1041900&r2=1041901&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/ProxyHandler.java (original)
+++ shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/ProxyHandler.java Fri Dec 3 16:34:45 2010
@@ -18,12 +18,12 @@
*/
package org.apache.shindig.gadgets.servlet;
+import com.google.common.base.Strings;
import com.google.inject.Inject;
import com.google.inject.Singleton;
import com.google.inject.name.Named;
import org.apache.commons.io.IOUtils;
-import org.apache.commons.lang.StringUtils;
import org.apache.shindig.common.uri.Uri;
import org.apache.shindig.gadgets.GadgetException;
import org.apache.shindig.gadgets.http.HttpRequest;
@@ -161,7 +161,7 @@ public class ProxyHandler {
* @return True if the error is recoverable, false otherwise.
*/
public boolean isRecoverable(HttpResponse results) {
- return !(StringUtils.isEmpty(results.getResponseAsString()) &&
+ return !(Strings.isNullOrEmpty(results.getResponseAsString()) &&
results.getHeaders() == null);
}
}
Modified: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/ServletUtil.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/ServletUtil.java?rev=1041901&r1=1041900&r2=1041901&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/ServletUtil.java (original)
+++ shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/ServletUtil.java Fri Dec 3 16:34:45 2010
@@ -18,6 +18,7 @@
*/
package org.apache.shindig.gadgets.servlet;
+import com.google.common.base.Strings;
import org.apache.commons.codec.binary.Base64InputStream;
import org.apache.commons.io.IOUtils;
import org.apache.commons.lang.StringEscapeUtils;
@@ -153,8 +154,8 @@ public final class ServletUtil {
}
private static String getXForwardedForHeader(String origValue, String remoteAddr) {
- if (!StringUtils.isEmpty(remoteAddr)) {
- if (StringUtils.isEmpty(origValue)) {
+ if (!Strings.isNullOrEmpty(remoteAddr)) {
+ if (Strings.isNullOrEmpty(origValue)) {
origValue = remoteAddr;
} else {
origValue = remoteAddr + ", " + origValue;
Modified: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/templates/ContainerTagLibraryFactory.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/templates/ContainerTagLibraryFactory.java?rev=1041901&r1=1041900&r2=1041901&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/templates/ContainerTagLibraryFactory.java (original)
+++ shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/templates/ContainerTagLibraryFactory.java Fri Dec 3 16:34:45 2010
@@ -18,7 +18,7 @@
*/
package org.apache.shindig.gadgets.templates;
-import org.apache.commons.lang.StringUtils;
+import com.google.common.base.Strings;
import org.apache.shindig.common.uri.Uri;
import org.apache.shindig.common.util.ResourceLoader;
import org.apache.shindig.common.xml.XmlException;
@@ -68,7 +68,7 @@ public class ContainerTagLibraryFactory
private TemplateLibrary getOsmlLibrary(String container) {
String library = config.getString(container,
"${Cur['gadgets.features'].osml.library}");
- if (StringUtils.isEmpty(library)) {
+ if (Strings.isNullOrEmpty(library)) {
return NullTemplateLibrary.INSTANCE;
}
Modified: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/templates/tags/FlashTagHandler.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/templates/tags/FlashTagHandler.java?rev=1041901&r1=1041900&r2=1041901&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/templates/tags/FlashTagHandler.java (original)
+++ shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/templates/tags/FlashTagHandler.java Fri Dec 3 16:34:45 2010
@@ -18,12 +18,12 @@
*/
package org.apache.shindig.gadgets.templates.tags;
+import com.google.common.base.Strings;
import com.google.common.collect.Maps;
import com.google.common.collect.ImmutableSet;
import com.google.inject.Inject;
import com.google.inject.name.Named;
-import org.apache.commons.lang.StringUtils;
import org.apache.commons.lang.StringEscapeUtils;
import org.apache.shindig.common.uri.Uri;
import org.apache.shindig.common.xml.DomUtil;
@@ -89,9 +89,9 @@ public class FlashTagHandler extends Abs
// Bind the security token to the flashvars if its available
String st = processor.getTemplateContext().getGadget()
.getContext().getParameter("st");
- if (!StringUtils.isEmpty(st)) {
+ if (!Strings.isNullOrEmpty(st)) {
String stVar = "st=" + Utf8UrlCoder.encode(st);
- if (StringUtils.isEmpty(config.flashvars)) {
+ if (Strings.isNullOrEmpty(config.flashvars)) {
config.flashvars = stVar;
} else {
config.flashvars += '&' + stVar;
Modified: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/uri/DefaultAccelUriManager.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/uri/DefaultAccelUriManager.java?rev=1041901&r1=1041900&r2=1041901&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/uri/DefaultAccelUriManager.java (original)
+++ shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/uri/DefaultAccelUriManager.java Fri Dec 3 16:34:45 2010
@@ -18,10 +18,10 @@
*/
package org.apache.shindig.gadgets.uri;
+import com.google.common.base.Strings;
import com.google.common.collect.ImmutableList;
import com.google.inject.Inject;
-import org.apache.commons.lang.StringUtils;
import org.apache.shindig.common.uri.Uri;
import org.apache.shindig.config.ContainerConfig;
import org.apache.shindig.gadgets.Gadget;
@@ -84,7 +84,7 @@ public class DefaultAccelUriManager impl
protected boolean looksLikeAccelUri(Uri requestUri) {
return accelHost.equals(requestUri.getAuthority()) &&
accelPath.equals(requestUri.getPath()) &&
- !StringUtils.isEmpty(requestUri.getQueryParameter(
- UriCommon.Param.URL.getKey()));
+ !Strings.isNullOrEmpty(requestUri.getQueryParameter(
+ UriCommon.Param.URL.getKey()));
}
}
Modified: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/uri/DefaultProxyUriManager.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/uri/DefaultProxyUriManager.java?rev=1041901&r1=1041900&r2=1041901&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/uri/DefaultProxyUriManager.java (original)
+++ shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/uri/DefaultProxyUriManager.java Fri Dec 3 16:34:45 2010
@@ -18,6 +18,7 @@
*/
package org.apache.shindig.gadgets.uri;
+import com.google.common.base.Strings;
import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
import com.google.inject.Inject;
@@ -221,18 +222,18 @@ public class DefaultProxyUriManager impl
}
}
- if (!strictParsing && container != null && StringUtils.isEmpty(uriStr)) {
+ if (!strictParsing && container != null && Strings.isNullOrEmpty(uriStr)) {
// Query-style despite the container being configured for chained style.
uriStr = uriIn.getQueryParameter(Param.URL.getKey());
queryUri = uriIn;
}
// Parameter validation.
- if (StringUtils.isEmpty(uriStr) || StringUtils.isEmpty(container)) {
+ if (Strings.isNullOrEmpty(uriStr) || Strings.isNullOrEmpty(container)) {
throw new GadgetException(GadgetException.Code.MISSING_PARAMETER,
"Missing required parameter(s):" +
- (StringUtils.isEmpty(uriStr) ? ' ' + Param.URL.getKey() : "") +
- (StringUtils.isEmpty(container) ? ' ' + Param.CONTAINER.getKey() : ""),
+ (Strings.isNullOrEmpty(uriStr) ? ' ' + Param.URL.getKey() : "") +
+ (Strings.isNullOrEmpty(container) ? ' ' + Param.CONTAINER.getKey() : ""),
HttpResponse.SC_BAD_REQUEST);
}
Modified: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/uri/ProxyUriBase.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/uri/ProxyUriBase.java?rev=1041901&r1=1041900&r2=1041901&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/uri/ProxyUriBase.java (original)
+++ shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/uri/ProxyUriBase.java Fri Dec 3 16:34:45 2010
@@ -20,7 +20,7 @@ package org.apache.shindig.gadgets.uri;
import com.google.common.base.Objects;
-import org.apache.commons.lang.StringUtils;
+import com.google.common.base.Strings;
import org.apache.commons.lang.math.NumberUtils;
import org.apache.shindig.common.uri.Uri;
import org.apache.shindig.common.uri.UriBuilder;
@@ -180,7 +180,7 @@ public class ProxyUriBase {
HttpRequest req = new HttpRequest(targetUri)
.setIgnoreCache(isNoCache())
.setContainer(getContainer());
- if (!StringUtils.isEmpty(getGadget())) {
+ if (!Strings.isNullOrEmpty(getGadget())) {
try {
req.setGadget(Uri.parse(getGadget()));
} catch (IllegalArgumentException e) {
Modified: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/uri/UriUtils.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/uri/UriUtils.java?rev=1041901&r1=1041900&r2=1041901&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/uri/UriUtils.java (original)
+++ shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/uri/UriUtils.java Fri Dec 3 16:34:45 2010
@@ -18,6 +18,7 @@
*/
package org.apache.shindig.gadgets.uri;
+import com.google.common.base.Strings;
import com.google.common.collect.ImmutableSet;
import org.apache.commons.lang.StringUtils;
import org.apache.shindig.gadgets.GadgetException;
@@ -239,9 +240,9 @@ public final class UriUtils {
public static void maybeRewriteContentType(HttpRequest req, HttpResponseBuilder response) {
String responseType = response.getHeader("Content-Type");
String requiredType = req.getRewriteMimeType();
- if (!StringUtils.isEmpty(requiredType)) {
+ if (!Strings.isNullOrEmpty(requiredType)) {
// Use a 'Vary' style check on the response
- if (requiredType.endsWith("/*") && !StringUtils.isEmpty(responseType)) {
+ if (requiredType.endsWith("/*") && !Strings.isNullOrEmpty(responseType)) {
String requiredTypePrefix = requiredType.substring(0, requiredType.length() - 1);
if (!responseType.toLowerCase().startsWith(requiredTypePrefix.toLowerCase())) {
// TODO: We are currently setting the content type to something like x/* (e.g. text/*)
Modified: shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/parse/AbstractSocialMarkupHtmlParserTest.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/parse/AbstractSocialMarkupHtmlParserTest.java?rev=1041901&r1=1041900&r2=1041901&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/parse/AbstractSocialMarkupHtmlParserTest.java (original)
+++ shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/parse/AbstractSocialMarkupHtmlParserTest.java Fri Dec 3 16:34:45 2010
@@ -21,6 +21,7 @@ package org.apache.shindig.gadgets.parse
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
+import com.google.common.base.Strings;
import org.apache.commons.lang.StringUtils;
import org.apache.shindig.gadgets.spec.PipelinedData;
import org.junit.Before;
@@ -152,7 +153,7 @@ public abstract class AbstractSocialMark
private void assertEmpty(Node n) {
if (n.getChildNodes().getLength() != 0) {
- assertTrue(StringUtils.isEmpty(n.getTextContent()) ||
+ assertTrue(Strings.isNullOrEmpty(n.getTextContent()) ||
StringUtils.isWhitespace(n.getTextContent()));
}
}
Modified: shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/HtmlAccelServletTest.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/HtmlAccelServletTest.java?rev=1041901&r1=1041900&r2=1041901&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/HtmlAccelServletTest.java (original)
+++ shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/HtmlAccelServletTest.java Fri Dec 3 16:34:45 2010
@@ -18,8 +18,8 @@
*/
package org.apache.shindig.gadgets.servlet;
+import com.google.common.base.Strings;
import com.google.common.collect.ImmutableMap;
-import org.apache.commons.lang.StringUtils;
import org.apache.shindig.common.uri.Uri;
import org.apache.shindig.config.BasicContainerConfig;
import org.apache.shindig.config.ContainerConfig;
@@ -70,7 +70,7 @@ public class HtmlAccelServletTest extend
@Override
public void rewrite(HttpRequest request, HttpResponseBuilder original) {
super.rewrite(request, original);
- if (!StringUtils.isEmpty(contentToRewrite)) {
+ if (!Strings.isNullOrEmpty(contentToRewrite)) {
original.setResponse(contentToRewrite.getBytes());
}
}
Modified: shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/variables/SubstitutionsTest.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/variables/SubstitutionsTest.java?rev=1041901&r1=1041900&r2=1041901&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/variables/SubstitutionsTest.java (original)
+++ shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/variables/SubstitutionsTest.java Fri Dec 3 16:34:45 2010
@@ -18,10 +18,9 @@
*/
package org.apache.shindig.gadgets.variables;
+import com.google.common.base.Strings;
import org.apache.shindig.gadgets.variables.Substitutions.Type;
-import org.apache.commons.lang.StringUtils;
-
import org.junit.Assert;
import org.junit.Before;
import org.junit.Ignore;
@@ -136,9 +135,9 @@ public class SubstitutionsTest extends A
subst.addSubstitution(Type.USER_PREF, "bar", "BAR!!!");
// Most real-world content contains very few substitutions.
- msg += StringUtils.repeat("foo ", 1000);
+ msg += Strings.repeat("foo ", 1000);
- String message = StringUtils.repeat(msg, 1000);
+ String message = Strings.repeat(msg, 1000);
long now = System.nanoTime();
int cnt = 1000;
Modified: shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/oauth/OAuthAuthenticationHandler.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/oauth/OAuthAuthenticationHandler.java?rev=1041901&r1=1041900&r2=1041901&view=diff
==============================================================================
--- shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/oauth/OAuthAuthenticationHandler.java (original)
+++ shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/oauth/OAuthAuthenticationHandler.java Fri Dec 3 16:34:45 2010
@@ -17,6 +17,7 @@
*/
package org.apache.shindig.social.core.oauth;
+import com.google.common.base.Strings;
import com.google.inject.Inject;
import net.oauth.OAuth;
@@ -72,12 +73,12 @@ public class OAuthAuthenticationHandler
public SecurityToken getSecurityTokenFromRequest(HttpServletRequest request)
throws InvalidAuthenticationException {
OAuthMessage message = OAuthServlet.getMessage(request, null);
- if (StringUtils.isEmpty(getParameter(message, OAuth.OAUTH_SIGNATURE))) {
+ if (Strings.isNullOrEmpty(getParameter(message, OAuth.OAUTH_SIGNATURE))) {
// Is not an oauth request
return null;
}
String bodyHash = getParameter(message, OAuthConstants.OAUTH_BODY_HASH);
- if (!StringUtils.isEmpty(bodyHash)) {
+ if (!Strings.isNullOrEmpty(bodyHash)) {
verifyBodyHash(request, bodyHash);
}
try {
@@ -123,7 +124,7 @@ public class OAuthAuthenticationHandler
protected OAuthEntry getOAuthEntry(OAuthMessage message) throws OAuthProblemException {
OAuthEntry entry = null;
String token = getParameter(message, OAuth.OAUTH_TOKEN);
- if (!StringUtils.isEmpty(token)) {
+ if (!Strings.isNullOrEmpty(token)) {
entry = store.getEntry(token);
if (entry == null) {
OAuthProblemException e = new OAuthProblemException(OAuth.Problems.TOKEN_REJECTED);
Modified: shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/core/oauth/FakeOAuthRequest.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/core/oauth/FakeOAuthRequest.java?rev=1041901&r1=1041900&r2=1041901&view=diff
==============================================================================
--- shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/core/oauth/FakeOAuthRequest.java (original)
+++ shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/core/oauth/FakeOAuthRequest.java Fri Dec 3 16:34:45 2010
@@ -17,6 +17,7 @@
*/
package org.apache.shindig.social.core.oauth;
+import com.google.common.base.Strings;
import com.google.common.collect.Lists;
import net.oauth.OAuth;
@@ -26,7 +27,6 @@ import net.oauth.OAuthMessage;
import org.apache.commons.codec.binary.Base64;
import org.apache.commons.codec.digest.DigestUtils;
-import org.apache.commons.lang.StringUtils;
import org.apache.shindig.auth.OAuthConstants;
import org.apache.shindig.common.testing.FakeHttpServletRequest;
@@ -108,7 +108,7 @@ public class FakeOAuthRequest {
OAuthConsumer consumer = new OAuthConsumer(null,consumerKey,consumerSecret, null);
OAuthAccessor accessor = new OAuthAccessor(consumer);
- if (!StringUtils.isEmpty(token)) {
+ if (!Strings.isNullOrEmpty(token)) {
accessor.accessToken = token;
accessor.tokenSecret = tokenSecret;
}