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 2011/01/24 14:37:19 UTC
svn commit: r1062768 - in /shindig/trunk/java:
common/src/main/java/org/apache/shindig/auth/
common/src/main/java/org/apache/shindig/common/servlet/
common/src/main/java/org/apache/shindig/config/
common/src/main/java/org/apache/shindig/expressions/ co...
Author: lindner
Date: Mon Jan 24 13:37:18 2011
New Revision: 1062768
URL: http://svn.apache.org/viewvc?rev=1062768&view=rev
Log:
more guavafication
Modified:
shindig/trunk/java/common/src/main/java/org/apache/shindig/auth/AuthInfoUtil.java
shindig/trunk/java/common/src/main/java/org/apache/shindig/common/servlet/GuiceServletContextListener.java
shindig/trunk/java/common/src/main/java/org/apache/shindig/config/JsonContainerConfigLoader.java
shindig/trunk/java/common/src/main/java/org/apache/shindig/expressions/Expressions.java
shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/BaseRequestItem.java
shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/ContentTypes.java
shindig/trunk/java/common/src/test/java/org/apache/shindig/auth/UrlParameterAuthenticationHandlerTest.java
shindig/trunk/java/common/src/test/java/org/apache/shindig/common/servlet/HttpServletResponseRecorder.java
shindig/trunk/java/common/src/test/java/org/apache/shindig/common/util/HashUtilTest.java
shindig/trunk/java/common/src/test/java/org/apache/shindig/expressions/jasper/JasperExpressionsTest.java
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/DefaultGuiceModule.java
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/features/FeatureRegistry.java
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/BasicHttpFetcher.java
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/HttpResponse.java
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth/GadgetOAuthTokenStore.java
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth/OAuthArguments.java
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth/OAuthRequest.java
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/parse/caja/VanillaCajaHtmlSerializer.java
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/render/RenderingGadgetRewriter.java
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/ContentRewriterFeature.java
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/ImageResizeRewriter.java
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/TemplateRewriter.java
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/image/JpegImageUtils.java
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/JsServlet.java
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/spec/GadgetSpec.java
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/spec/Preload.java
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/uri/DefaultIframeUriManager.java
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/uri/DefaultJsUriManager.java
shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/http/DefaultInvalidationServiceTest.java
shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/http/HttpResponseBuilderTest.java
shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/AbsolutePathReferenceVisitorTest.java
shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/BaseRewriterTestCase.java
shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/ConcatVisitorTest.java
shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/MutableContentTest.java
shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/RewriterTestBase.java
shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/StyleAdjacencyVisitorTest.java
shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/ConcatProxyServletTest.java
shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/spec/PreloadTest.java
shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/dataservice/integration/RestfulJsonPeopleTest.java
shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/service/AlbumHandlerTest.java
shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/service/MediaItemHandlerTest.java
Modified: shindig/trunk/java/common/src/main/java/org/apache/shindig/auth/AuthInfoUtil.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/common/src/main/java/org/apache/shindig/auth/AuthInfoUtil.java?rev=1062768&r1=1062767&r2=1062768&view=diff
==============================================================================
--- shindig/trunk/java/common/src/main/java/org/apache/shindig/auth/AuthInfoUtil.java (original)
+++ shindig/trunk/java/common/src/main/java/org/apache/shindig/auth/AuthInfoUtil.java Mon Jan 24 13:37:18 2011
@@ -17,6 +17,8 @@
*/
package org.apache.shindig.auth;
+import com.google.common.annotations.VisibleForTesting;
+
import javax.servlet.http.HttpServletRequest;
/**
@@ -31,9 +33,8 @@ public final class AuthInfoUtil {
/**
* Constants for request attribute keys
- *
- * This is only public for testing.
*/
+ @VisibleForTesting
public enum Attribute {
/** The security token */
SECURITY_TOKEN,
Modified: shindig/trunk/java/common/src/main/java/org/apache/shindig/common/servlet/GuiceServletContextListener.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/common/src/main/java/org/apache/shindig/common/servlet/GuiceServletContextListener.java?rev=1062768&r1=1062767&r2=1062768&view=diff
==============================================================================
--- shindig/trunk/java/common/src/main/java/org/apache/shindig/common/servlet/GuiceServletContextListener.java (original)
+++ shindig/trunk/java/common/src/main/java/org/apache/shindig/common/servlet/GuiceServletContextListener.java Mon Jan 24 13:37:18 2011
@@ -18,6 +18,7 @@
*/
package org.apache.shindig.common.servlet;
+import com.google.common.base.Splitter;
import com.google.common.collect.Lists;
import com.google.inject.Guice;
@@ -54,7 +55,7 @@ public class GuiceServletContextListener
String moduleNames = context.getInitParameter(MODULES_ATTRIBUTE);
List<Module> modules = Lists.newLinkedList();
if (moduleNames != null) {
- for (String moduleName : StringUtils.split(moduleNames, ':')) {
+ for (String moduleName : Splitter.on(':').split(moduleNames)) {
try {
moduleName = moduleName.trim();
if (moduleName.length() > 0) {
@@ -102,13 +103,13 @@ public class GuiceServletContextListener
String key=null;
String value=null;
if(systemProperties!=null && systemProperties.trim().length()>0){
- for (String prop : StringUtils.split(systemProperties, '\n')){
- String[] keyAndvalue = StringUtils.split(prop.trim(), "=",2);
+ for (String prop : Splitter.on('\n').trimResults().split(systemProperties)){
+ String[] keyAndvalue = StringUtils.split(prop, "=", 2);
if(keyAndvalue.length==2){
- key=keyAndvalue[0];
+ key=keyAndvalue[0];
value=keyAndvalue[1];
//set the system property if they are not empty
- if(key!=null && key.trim().length()>0 && value!=null && value.trim().length()>0){
+ if (key!=null && key.trim().length()>0 && value!=null && value.trim().length()>0){
System.setProperty(key,value);
}
}
Modified: shindig/trunk/java/common/src/main/java/org/apache/shindig/config/JsonContainerConfigLoader.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/common/src/main/java/org/apache/shindig/config/JsonContainerConfigLoader.java?rev=1062768&r1=1062767&r2=1062768&view=diff
==============================================================================
--- shindig/trunk/java/common/src/main/java/org/apache/shindig/config/JsonContainerConfigLoader.java (original)
+++ shindig/trunk/java/common/src/main/java/org/apache/shindig/config/JsonContainerConfigLoader.java Mon Jan 24 13:37:18 2011
@@ -19,10 +19,11 @@
package org.apache.shindig.config;
+import com.google.common.base.Splitter;
+import com.google.common.collect.ImmutableList;
import com.google.common.collect.Lists;
-import com.google.common.collect.Maps;
-import org.apache.commons.lang.StringUtils;
+import com.google.common.collect.Maps;
import org.apache.shindig.common.logging.i18n.MessageKeys;
import org.apache.shindig.common.util.ResourceLoader;
import org.apache.shindig.config.ContainerConfig.Transaction;
@@ -32,7 +33,6 @@ import org.json.JSONObject;
import java.io.File;
import java.io.IOException;
-import java.util.ArrayList;
import java.util.Collections;
import java.util.HashMap;
import java.util.List;
@@ -40,7 +40,6 @@ import java.util.Locale;
import java.util.Map;
import java.util.logging.Level;
import java.util.logging.Logger;
-import java.util.regex.Pattern;
/**
* A class to build container configurations from JSON notation.
@@ -57,8 +56,8 @@ import java.util.regex.Pattern;
public class JsonContainerConfigLoader {
private static final String classname = JsonContainerConfigLoader.class.getName();
- private static final Logger LOG = Logger.getLogger(classname,MessageKeys.MESSAGES);
- private static final Pattern CRLF_PATTERN = Pattern.compile("[\r\n]+");
+ private static final Logger LOG = Logger.getLogger(classname, MessageKeys.MESSAGES);
+ private static final Splitter CRLF_SPLITTER = Splitter.onPattern("[\r\n]+");
public static final char FILE_SEPARATOR = ',';
public static final String SERVER_PORT = "SERVER_PORT";
@@ -138,16 +137,16 @@ public class JsonContainerConfigLoader {
throws ContainerConfigException {
List<Map<String, Object>> all = Lists.newArrayList();
try {
- for (String location : StringUtils.split(path, FILE_SEPARATOR)) {
+ for (String location : Splitter.on(FILE_SEPARATOR).split(path)) {
if (location.startsWith("res://")) {
location = location.substring(6);
if (LOG.isLoggable(Level.INFO)) {
LOG.logp(Level.INFO, classname, "loadContainers", MessageKeys.LOAD_RESOURCES_FROM, new Object[] {location});
}
if (path.endsWith(".txt")) {
- loadResources(CRLF_PATTERN.split(ResourceLoader.getContent(location)), all);
+ loadResources(CRLF_SPLITTER.split(ResourceLoader.getContent(location)), all);
} else {
- loadResources(new String[] {location}, all);
+ loadResources(ImmutableList.of(location), all);
}
} else {
if (LOG.isLoggable(Level.INFO)) {
@@ -170,7 +169,7 @@ public class JsonContainerConfigLoader {
* Only files with a .js or .json extension will be loaded.
*
* @param files The files to examine.
- * @throws ContainerConfigException
+ * @throws ContainerConfigException when IO exceptions occur
*/
private static void loadFiles(File[] files, List<Map<String, Object>> all)
throws ContainerConfigException {
@@ -204,9 +203,9 @@ public class JsonContainerConfigLoader {
* Loads resources recursively.
*
* @param files The base paths to look for container.xml
- * @throws ContainerConfigException
+ * @throws ContainerConfigException when IO errors occur
*/
- private static void loadResources(String[] files, List<Map<String, Object>> all)
+ private static void loadResources(Iterable<String> files, List<Map<String, Object>> all)
throws ContainerConfigException {
try {
for (String entry : files) {
@@ -226,8 +225,8 @@ public class JsonContainerConfigLoader {
/**
* Processes a container file.
*
- * @param json
- * @throws ContainerConfigException
+ * @param json json to parse and load
+ * @throws ContainerConfigException when invalid json is encountered
*/
private static Map<String, Object> loadFromString(String json) throws ContainerConfigException {
try {
@@ -250,11 +249,11 @@ public class JsonContainerConfigLoader {
return json.toString();
} else if (json instanceof JSONArray) {
JSONArray jsonArray = (JSONArray) json;
- List<Object> values = new ArrayList<Object>(jsonArray.length());
+ ImmutableList.Builder<Object> values = ImmutableList.builder();
for (int i = 0, j = jsonArray.length(); i < j; ++i) {
values.add(jsonToConfig(jsonArray.opt(i)));
}
- return Collections.unmodifiableList(values);
+ return values.build();
} else if (json instanceof JSONObject) {
return jsonToMap((JSONObject) json);
}
Modified: shindig/trunk/java/common/src/main/java/org/apache/shindig/expressions/Expressions.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/common/src/main/java/org/apache/shindig/expressions/Expressions.java?rev=1062768&r1=1062767&r2=1062768&view=diff
==============================================================================
--- shindig/trunk/java/common/src/main/java/org/apache/shindig/expressions/Expressions.java (original)
+++ shindig/trunk/java/common/src/main/java/org/apache/shindig/expressions/Expressions.java Mon Jan 24 13:37:18 2011
@@ -18,6 +18,7 @@
*/
package org.apache.shindig.expressions;
+import com.google.common.annotations.VisibleForTesting;
import org.apache.shindig.common.cache.CacheProvider;
import org.apache.shindig.expressions.juel.JuelProvider;
import org.apache.shindig.expressions.juel.JuelTypeConverter;
@@ -59,6 +60,7 @@ public class Expressions {
* Returns an instance of Expressions that doesn't require
* any functions or perform any caching. Use only for testing.
*/
+ @VisibleForTesting
public static Expressions forTesting(Functions functions) {
return new Expressions(functions, null, new JuelTypeConverter(), new JuelProvider());
}
@@ -67,6 +69,7 @@ public class Expressions {
* Returns an instance of Expressions that doesn't require
* any functions or perform any caching. Use only for testing.
*/
+ @VisibleForTesting
public static Expressions forTesting() {
return new Expressions(null, null, new JuelTypeConverter(), new JuelProvider());
}
Modified: shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/BaseRequestItem.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/BaseRequestItem.java?rev=1062768&r1=1062767&r2=1062768&view=diff
==============================================================================
--- shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/BaseRequestItem.java (original)
+++ shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/BaseRequestItem.java Mon Jan 24 13:37:18 2011
@@ -17,8 +17,10 @@
*/
package org.apache.shindig.protocol;
+import com.google.common.annotations.VisibleForTesting;
import com.google.common.base.Objects;
-import org.apache.commons.lang.StringUtils;
+import com.google.common.base.Splitter;
+import com.google.common.collect.ImmutableList;
import org.apache.shindig.auth.SecurityToken;
import org.apache.shindig.protocol.conversion.BeanConverter;
import org.apache.shindig.protocol.conversion.BeanJsonConverter;
@@ -35,7 +37,6 @@ import org.json.JSONArray;
import org.json.JSONException;
import org.json.JSONObject;
-import java.util.Arrays;
import java.util.Collections;
import java.util.Date;
import java.util.Iterator;
@@ -249,7 +250,7 @@ public class BaseRequestItem implements
return Collections.emptyList();
}
if (param instanceof String && ((String)param).indexOf(',') != -1) {
- List<String> listParam = Arrays.asList(StringUtils.split((String)param, ','));
+ List<String> listParam = ImmutableList.copyOf(Splitter.on(',').split((String) param));
this.parameters.put(paramName, listParam);
return listParam;
}
@@ -273,8 +274,7 @@ public class BaseRequestItem implements
}
}
-
- // Exposed for testing only
+ @VisibleForTesting
public void setParameter(String paramName, Object paramValue) {
if (paramValue instanceof String[]) {
String[] arr = (String[])paramValue;
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=1062768&r1=1062767&r2=1062768&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 Mon Jan 24 13:37:18 2011
@@ -19,7 +19,7 @@
package org.apache.shindig.protocol;
import com.google.common.base.Strings;
-import org.apache.commons.lang.StringUtils;
+import com.google.common.base.Joiner;
import com.google.common.collect.ImmutableSet;
@@ -87,7 +87,7 @@ public final class ContentTypes {
if (Strings.isNullOrEmpty(contentType)) {
throw new InvalidContentTypeException(
"No Content-Type specified. One of "
- + StringUtils.join(allowedContentTypes, ", ") + " is required");
+ + Joiner.on(", ").join(allowedContentTypes) + " is required");
}
contentType = ContentTypes.extractMimePart(contentType);
@@ -103,7 +103,7 @@ public final class ContentTypes {
"Unsupported Content-Type "
+ contentType
+ ". One of "
- + StringUtils.join(allowedContentTypes, ", ")
+ + Joiner.on(", ").join(allowedContentTypes)
+ " is required");
}
Modified: shindig/trunk/java/common/src/test/java/org/apache/shindig/auth/UrlParameterAuthenticationHandlerTest.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/common/src/test/java/org/apache/shindig/auth/UrlParameterAuthenticationHandlerTest.java?rev=1062768&r1=1062767&r2=1062768&view=diff
==============================================================================
--- shindig/trunk/java/common/src/test/java/org/apache/shindig/auth/UrlParameterAuthenticationHandlerTest.java (original)
+++ shindig/trunk/java/common/src/test/java/org/apache/shindig/auth/UrlParameterAuthenticationHandlerTest.java Mon Jan 24 13:37:18 2011
@@ -1,8 +1,6 @@
package org.apache.shindig.auth;
-import com.google.common.collect.ImmutableMap;
import org.apache.shindig.common.testing.FakeHttpServletRequest;
-import org.easymock.EasyMock;
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
Modified: shindig/trunk/java/common/src/test/java/org/apache/shindig/common/servlet/HttpServletResponseRecorder.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/common/src/test/java/org/apache/shindig/common/servlet/HttpServletResponseRecorder.java?rev=1062768&r1=1062767&r2=1062768&view=diff
==============================================================================
--- shindig/trunk/java/common/src/test/java/org/apache/shindig/common/servlet/HttpServletResponseRecorder.java (original)
+++ shindig/trunk/java/common/src/test/java/org/apache/shindig/common/servlet/HttpServletResponseRecorder.java Mon Jan 24 13:37:18 2011
@@ -20,8 +20,6 @@ package org.apache.shindig.common.servle
import org.apache.shindig.common.util.DateUtil;
-import com.google.common.collect.Maps;
-
import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.io.OutputStreamWriter;
Modified: shindig/trunk/java/common/src/test/java/org/apache/shindig/common/util/HashUtilTest.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/common/src/test/java/org/apache/shindig/common/util/HashUtilTest.java?rev=1062768&r1=1062767&r2=1062768&view=diff
==============================================================================
--- shindig/trunk/java/common/src/test/java/org/apache/shindig/common/util/HashUtilTest.java (original)
+++ shindig/trunk/java/common/src/test/java/org/apache/shindig/common/util/HashUtilTest.java Mon Jan 24 13:37:18 2011
@@ -21,8 +21,6 @@ package org.apache.shindig.common.util;
import org.junit.Test;
-import java.util.List;
-
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
Modified: shindig/trunk/java/common/src/test/java/org/apache/shindig/expressions/jasper/JasperExpressionsTest.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/common/src/test/java/org/apache/shindig/expressions/jasper/JasperExpressionsTest.java?rev=1062768&r1=1062767&r2=1062768&view=diff
==============================================================================
--- shindig/trunk/java/common/src/test/java/org/apache/shindig/expressions/jasper/JasperExpressionsTest.java (original)
+++ shindig/trunk/java/common/src/test/java/org/apache/shindig/expressions/jasper/JasperExpressionsTest.java Mon Jan 24 13:37:18 2011
@@ -38,6 +38,7 @@ public class JasperExpressionsTest exte
}
@Ignore
+ @Test
public void booleanCoercionOfStringsFails() throws Exception{
// Case-sensitive coercion: FALSE is true
// Test fails because Jasper type conversion routines does not recognize FALSE.
@@ -49,7 +50,8 @@ public class JasperExpressionsTest exte
assertFalse(evaluate("${!bool}", Boolean.class));
}
- @Ignore
+ @Ignore
+ @Test
public void booleanCoercionOfNumbersFails() throws Exception {
// These test cases will not pass with Jasper due to ELSupport exceptions
// thrown when coercing Integer to Boolean
Modified: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/DefaultGuiceModule.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/DefaultGuiceModule.java?rev=1062768&r1=1062767&r2=1062768&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/DefaultGuiceModule.java (original)
+++ shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/DefaultGuiceModule.java Mon Jan 24 13:37:18 2011
@@ -18,6 +18,7 @@
*/
package org.apache.shindig.gadgets;
+import com.google.common.base.Splitter;
import com.google.common.collect.ImmutableList;
import com.google.inject.AbstractModule;
@@ -28,8 +29,6 @@ import com.google.inject.multibindings.M
import com.google.inject.name.Named;
import com.google.inject.name.Names;
-import org.apache.commons.lang.StringUtils;
-
import org.apache.shindig.common.servlet.GuiceServletContextListener;
import org.apache.shindig.gadgets.config.DefaultConfigContributorModule;
import org.apache.shindig.gadgets.http.HttpResponse;
@@ -113,7 +112,10 @@ public class DefaultGuiceModule extends
@Named("org.apache.shindig.features")
protected List<String> defaultFeatures(@Named("shindig.features.default")String features,
@Named("org.apache.shindig.features-extended")Set<String> extended) {
- return ImmutableList.<String>builder().addAll(extended).add(StringUtils.split(features, ',')).build();
+ return ImmutableList.<String>builder()
+ .addAll(extended)
+ .addAll(Splitter.on(',').split(features))
+ .build();
}
/**
Modified: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/features/FeatureRegistry.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/features/FeatureRegistry.java?rev=1062768&r1=1062767&r2=1062768&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/features/FeatureRegistry.java (original)
+++ shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/features/FeatureRegistry.java Mon Jan 24 13:37:18 2011
@@ -19,6 +19,7 @@ package org.apache.shindig.gadgets.featu
import com.google.common.base.Joiner;
import com.google.common.base.Objects;
+import com.google.common.base.Splitter;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableMap;
import com.google.common.collect.Lists;
@@ -38,8 +39,6 @@ import org.apache.shindig.gadgets.Gadget
import org.apache.shindig.gadgets.GadgetException;
import org.apache.shindig.gadgets.RenderingContext;
-import org.apache.commons.lang.StringUtils;
-
import java.io.File;
import java.io.IOException;
import java.util.Collection;
@@ -62,6 +61,7 @@ import java.util.logging.Level;
public class FeatureRegistry {
public static final String RESOURCE_SCHEME = "res";
public static final String FILE_SCHEME = "file";
+ public static final Splitter CRLF_SPLITTER = Splitter.onPattern("[\r\n]+").trimResults().omitEmptyStrings();
//class name for logging purpose
private static final String classname = FeatureRegistry.class.getName();
@@ -145,11 +145,10 @@ public class FeatureRegistry {
}
if (location.endsWith(".txt")) {
// Text file contains a list of other resource files to load
- for (String resource : resourceLoader.getResourceContent(location).split("[\r\n]+")) {
- resource = resource.trim();
- if (resource.length () > 0 && resource.charAt(0) != '#') {
- // Skip blank/commented lines.
- resource = getComponentUri(resource.trim()).getPath();
+ for (String resource : CRLF_SPLITTER.split(resourceLoader.getResourceContent(location))) {
+ if (resource.charAt(0) != '#') {
+ // Skip commented lines.
+ resource = getComponentUri(resource).getPath();
resources.add(resource);
}
}
@@ -354,8 +353,8 @@ public class FeatureRegistry {
}
private boolean containerMatch(String containerAttrib, String container) {
- for (String attr : StringUtils.split(containerAttrib, ',')) {
- if (attr.trim().equals(container)) return true;
+ for (String attr : Splitter.on(',').trimResults().split(containerAttrib)) {
+ if (attr.equals(container)) return true;
}
return false;
}
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=1062768&r1=1062767&r2=1062768&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 Mon Jan 24 13:37:18 2011
@@ -17,6 +17,7 @@
*/
package org.apache.shindig.gadgets.http;
+import com.google.common.base.Joiner;
import com.google.common.base.Preconditions;
import com.google.common.base.Strings;
import com.google.common.collect.ImmutableSet;
@@ -345,7 +346,7 @@ public class BasicHttpFetcher implements
httpMethod = new HttpDelete(requestUri);
}
for (Map.Entry<String, List<String>> entry : request.getHeaders().entrySet()) {
- httpMethod.addHeader(entry.getKey(), StringUtils.join(entry.getValue(), ','));
+ httpMethod.addHeader(entry.getKey(), Joiner.on(',').join(entry.getValue()));
}
// Disable following redirects.
Modified: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/HttpResponse.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/HttpResponse.java?rev=1062768&r1=1062767&r2=1062768&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/HttpResponse.java (original)
+++ shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/HttpResponse.java Mon Jan 24 13:37:18 2011
@@ -18,13 +18,7 @@
package org.apache.shindig.gadgets.http;
import com.google.common.base.Supplier;
-import com.google.common.collect.ImmutableList;
-import com.google.common.collect.ImmutableSet;
-import com.google.common.collect.Lists;
-import com.google.common.collect.MapMaker;
-import com.google.common.collect.Maps;
-import com.google.common.collect.Multimap;
-import com.google.common.collect.Multimaps;
+import com.google.common.collect.*;
import com.google.inject.Inject;
import com.google.inject.name.Named;
@@ -181,8 +175,7 @@ public final class HttpResponse implemen
// Copy headers after builder.getResponse(), since that can modify Content-Type.
headerCopy.putAll(builder.getHeaders());
- Map<String, String> metadataCopy = Maps.newHashMap(builder.getMetadata());
- metadata = Collections.unmodifiableMap(metadataCopy);
+ metadata = ImmutableMap.copyOf(builder.getMetadata());
// We want to modify the headers to ensure that the proper Content-Type and Date headers
// have been set. This allows us to avoid these expensive calculations from the cache.
Modified: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth/GadgetOAuthTokenStore.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth/GadgetOAuthTokenStore.java?rev=1062768&r1=1062767&r2=1062768&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth/GadgetOAuthTokenStore.java (original)
+++ shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth/GadgetOAuthTokenStore.java Mon Jan 24 13:37:18 2011
@@ -34,11 +34,10 @@ import org.apache.shindig.gadgets.spec.O
import org.apache.shindig.gadgets.spec.OAuthService.Method;
import com.google.inject.Inject;
+import com.google.common.base.Joiner;
import net.oauth.OAuthServiceProvider;
-import org.apache.commons.lang.StringUtils;
-
/**
* Higher-level interface that allows callers to store and retrieve
* OAuth-related data directly from {@code GadgetSpec}s, {@code GadgetContext}s,
@@ -138,7 +137,7 @@ public class GadgetOAuthTokenStore {
throw new OAuthRequestException(OAuthError.BAD_OAUTH_CONFIGURATION,
"Failed to retrieve OAuth URLs, spec for gadget does not contain OAuth service " +
arguments.getServiceName() + ". Known services: " +
- StringUtils.join(oauthSpec.getServices().keySet(), ',') + '.');
+ Joiner.on(',').join(oauthSpec.getServices().keySet()) + '.');
}
// In theory some one could specify different parameter locations for request token and
// access token requests, but that's probably not useful. We just use the request token
Modified: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth/OAuthArguments.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth/OAuthArguments.java?rev=1062768&r1=1062767&r2=1062768&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth/OAuthArguments.java (original)
+++ shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth/OAuthArguments.java Mon Jan 24 13:37:18 2011
@@ -18,7 +18,7 @@
*/
package org.apache.shindig.gadgets.oauth;
-import org.apache.commons.lang.StringUtils;
+import com.google.common.base.Objects;
import org.apache.shindig.gadgets.AuthType;
import org.apache.shindig.gadgets.GadgetException;
import org.apache.shindig.gadgets.http.HttpResponse;
@@ -360,17 +360,10 @@ public class OAuthArguments {
@Override
public int hashCode() {
- int result = (bypassSpecCache ? 1231 : 1237);
- result = 31 * result + ((origClientState == null) ? 0 : origClientState.hashCode());
- result = 31 * result + (proxiedContentRequest ? 1231 : 1237);
- result = 31 * result + ((requestToken == null) ? 0 : requestToken.hashCode());
- result = 31 * result + ((requestTokenSecret == null) ? 0 : requestTokenSecret.hashCode());
- result = 31 * result + ((serviceName == null) ? 0 : serviceName.hashCode());
- result = 31 * result + (signOwner ? 1231 : 1237);
- result = 31 * result + (signViewer ? 1231 : 1237);
- result = 31 * result + ((tokenName == null) ? 0 : tokenName.hashCode());
- result = 31 * result + ((useToken == null) ? 0 : useToken.hashCode());
- return result;
+ return Objects.hashCode(bypassSpecCache, origClientState, origClientState,
+ proxiedContentRequest, requestToken, requestTokenSecret, requestTokenSecret,
+ serviceName, serviceName, signOwner,
+ signViewer, tokenName, useToken);
}
@Override
@@ -384,11 +377,11 @@ public class OAuthArguments {
OAuthArguments other = (OAuthArguments) obj;
return (bypassSpecCache == other.bypassSpecCache
- && StringUtils.equals(origClientState, other.origClientState)
+ && Objects.equal(origClientState, other.origClientState)
&& proxiedContentRequest == other.proxiedContentRequest
- && StringUtils.equals(requestToken, other.requestToken)
- && StringUtils.equals(requestTokenSecret, other.requestTokenSecret)
- && StringUtils.equals(tokenName, other.tokenName)
+ && Objects.equal(requestToken, other.requestToken)
+ && Objects.equal(requestTokenSecret, other.requestTokenSecret)
+ && Objects.equal(tokenName, other.tokenName)
&& signViewer == other.signViewer
&& useToken == other.useToken);
}
Modified: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth/OAuthRequest.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth/OAuthRequest.java?rev=1062768&r1=1062767&r2=1062768&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth/OAuthRequest.java (original)
+++ shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth/OAuthRequest.java Mon Jan 24 13:37:18 2011
@@ -53,8 +53,6 @@ import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
-import java.util.logging.Level;
-import java.util.logging.Logger;
import java.util.regex.Pattern;
/**
Modified: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/parse/caja/VanillaCajaHtmlSerializer.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/parse/caja/VanillaCajaHtmlSerializer.java?rev=1062768&r1=1062767&r2=1062768&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/parse/caja/VanillaCajaHtmlSerializer.java (original)
+++ shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/parse/caja/VanillaCajaHtmlSerializer.java Mon Jan 24 13:37:18 2011
@@ -20,7 +20,6 @@ package org.apache.shindig.gadgets.parse
import com.google.caja.parser.html.Nodes;
import com.google.caja.render.Concatenator;
import com.google.caja.reporting.RenderContext;
-import org.apache.shindig.gadgets.parse.DefaultHtmlSerializer;
import org.apache.shindig.gadgets.parse.HtmlSerialization;
import org.apache.shindig.gadgets.parse.HtmlSerializer;
import org.w3c.dom.Document;
Modified: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/render/RenderingGadgetRewriter.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/render/RenderingGadgetRewriter.java?rev=1062768&r1=1062767&r2=1062768&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/render/RenderingGadgetRewriter.java (original)
+++ shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/render/RenderingGadgetRewriter.java Mon Jan 24 13:37:18 2011
@@ -18,6 +18,7 @@
*/
package org.apache.shindig.gadgets.render;
+import com.google.common.base.Splitter;
import org.apache.shindig.common.JsonSerializer;
import org.apache.shindig.common.logging.i18n.MessageKeys;
import org.apache.shindig.common.uri.Uri;
@@ -48,7 +49,6 @@ import org.w3c.dom.Element;
import org.w3c.dom.Node;
import org.w3c.dom.Text;
-import java.util.Arrays;
import java.util.Collection;
import java.util.List;
import java.util.Map;
@@ -125,7 +125,7 @@ public class RenderingGadgetRewriter imp
@Inject
public void setDefaultForcedLibs(@Named("shindig.gadget-rewrite.default-forced-libs")String forcedLibs) {
if (StringUtils.isNotBlank(forcedLibs)) {
- defaultExternLibs = ImmutableSortedSet.copyOf(StringUtils.split(forcedLibs, ':'));
+ defaultExternLibs = ImmutableSortedSet.copyOf(Splitter.on(':').split(forcedLibs));
}
}
@@ -228,7 +228,7 @@ public class RenderingGadgetRewriter imp
// 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(StringUtils.split(externParam, ':')));
+ externForcedLibs = Sets.newTreeSet(Splitter.on(':').split(externParam));
}
if (!externForcedLibs.isEmpty()) {
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=1062768&r1=1062767&r2=1062768&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 Mon Jan 24 13:37:18 2011
@@ -17,6 +17,7 @@
*/
package org.apache.shindig.gadgets.rewrite;
+import com.google.common.base.Splitter;
import com.google.common.base.Strings;
import com.google.common.collect.ImmutableSet;
import com.google.common.collect.ImmutableSortedSet;
@@ -27,7 +28,6 @@ import com.google.inject.Provider;
import com.google.inject.Singleton;
import com.google.inject.name.Named;
-import org.apache.commons.lang.StringUtils;
import org.apache.shindig.common.uri.Uri;
import org.apache.shindig.gadgets.GadgetContext;
import org.apache.shindig.gadgets.GadgetException;
@@ -187,10 +187,8 @@ public class ContentRewriterFeature {
// Parse includeTags
ImmutableSet.Builder<String> includeTagsBuilder = ImmutableSet.builder();
- for (String s : COMMA_WHITESPACE_PATTERN.split(paramTrim(defaultTags).toLowerCase())) {
- if (s != null && s.length() > 0) {
- includeTagsBuilder.add(s);
- }
+ for (String s : Splitter.on(',').trimResults().omitEmptyStrings().split(defaultTags.toLowerCase())) {
+ includeTagsBuilder.add(s);
}
this.includeTags = includeTagsBuilder.build();
@@ -252,10 +250,8 @@ public class ContentRewriterFeature {
Set<String> tagsVal = null;
if (f != null && f.getParams().containsKey(INCLUDE_TAGS)) {
tagsVal = Sets.newTreeSet();
- for (String tag : StringUtils.split(f.getParam(INCLUDE_TAGS), ',')) {
- if (!Strings.isNullOrEmpty(tag)) {
- tagsVal.add(tag.trim().toLowerCase());
- }
+ for (String tag : Splitter.on(',').trimResults().omitEmptyStrings().split(f.getParam(INCLUDE_TAGS))) {
+ tagsVal.add(tag.toLowerCase());
}
if (onlyAllowExcludes) {
// Only excludes are allowed. Keep only subset of
Modified: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/ImageResizeRewriter.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/ImageResizeRewriter.java?rev=1062768&r1=1062767&r2=1062768&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/ImageResizeRewriter.java (original)
+++ shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/ImageResizeRewriter.java Mon Jan 24 13:37:18 2011
@@ -19,6 +19,8 @@
package org.apache.shindig.gadgets.rewrite;
import com.google.inject.Inject;
+
+import com.google.common.base.Splitter;
import com.google.common.collect.Lists;
import org.apache.shindig.gadgets.Gadget;
@@ -129,7 +131,7 @@ public class ImageResizeRewriter extends
if (!"".equals(imgElement.getAttribute("style"))) {
String styleStr = imgElement.getAttribute("style");
- for (String attr : styleStr.split(";")) {
+ for (String attr : Splitter.on(';').split(styleStr)) {
String[] splits = attr.split(":");
if (splits.length != 2) {
continue;
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=1062768&r1=1062767&r2=1062768&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 Mon Jan 24 13:37:18 2011
@@ -17,14 +17,15 @@
*/
package org.apache.shindig.gadgets.rewrite;
+import com.google.common.base.Splitter;
import com.google.common.base.Strings;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableSet;
+import com.google.common.collect.Iterables;
import com.google.common.collect.Lists;
import com.google.inject.Inject;
import com.google.inject.Provider;
-import org.apache.commons.lang.StringUtils;
import org.apache.shindig.common.JsonSerializer;
import org.apache.shindig.common.logging.i18n.MessageKeys;
import org.apache.shindig.common.uri.Uri;
@@ -307,14 +308,14 @@ public class TemplateRewriter implements
continue;
}
- String [] nameParts = StringUtils.splitPreserveAllTokens(template.getAttribute("tag"), ':');
+ Iterable<String> nameParts = Splitter.on(':').split(template.getAttribute("tag"));
// At this time, we only support
- if (nameParts.length != 2) {
+ if (Iterables.size(nameParts) != 2) {
continue;
}
- String namespaceUri = template.lookupNamespaceURI(nameParts[0]);
+ String namespaceUri = template.lookupNamespaceURI(Iterables.get(nameParts, 0));
if (namespaceUri != null) {
- handlers.add(new TemplateBasedTagHandler(template, namespaceUri, nameParts[1]));
+ handlers.add(new TemplateBasedTagHandler(template, namespaceUri, Iterables.get(nameParts, 1)));
}
}
Modified: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/image/JpegImageUtils.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/image/JpegImageUtils.java?rev=1062768&r1=1062767&r2=1062768&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/image/JpegImageUtils.java (original)
+++ shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/image/JpegImageUtils.java Mon Jan 24 13:37:18 2011
@@ -24,7 +24,6 @@ import org.apache.sanselan.common.byteSo
import org.apache.sanselan.formats.jpeg.JpegUtils;
import org.apache.sanselan.formats.jpeg.JpegConstants;
-import java.util.Arrays;
import java.util.logging.Level;
import java.util.logging.Logger;
import java.io.ByteArrayInputStream;
Modified: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/JsServlet.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/JsServlet.java?rev=1062768&r1=1062767&r2=1062768&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/JsServlet.java (original)
+++ shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/JsServlet.java Mon Jan 24 13:37:18 2011
@@ -204,7 +204,7 @@ public class JsServlet extends InjectedS
@VisibleForTesting
String createJsloadScript(Uri uri) {
String uriString = uri.toString();
- return String.format(JSLOAD_JS_TPL, uriString, uriString);
+ return String.format(JSLOAD_JS_TPL, uriString);
}
/**
Modified: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/spec/GadgetSpec.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/spec/GadgetSpec.java?rev=1062768&r1=1062767&r2=1062768&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/spec/GadgetSpec.java (original)
+++ shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/spec/GadgetSpec.java Mon Jan 24 13:37:18 2011
@@ -17,7 +17,8 @@
*/
package org.apache.shindig.gadgets.spec;
-import org.apache.commons.lang.StringUtils;
+import com.google.common.annotations.VisibleForTesting;
+import com.google.common.base.Splitter;
import org.apache.shindig.common.uri.Uri;
import org.apache.shindig.common.util.HashUtil;
import org.apache.shindig.common.xml.XmlUtil;
@@ -86,8 +87,7 @@ public class GadgetSpec {
}
if ("Content".equals(name)) {
String viewNames = XmlUtil.getAttribute(element, "view", "default");
- for (String view : StringUtils.split(viewNames, ',')) {
- view = view.trim();
+ for (String view : Splitter.on(',').trimResults().split(viewNames)) {
List<Element> viewElements = views.get(view);
if (viewElements == null) {
viewElements = Lists.newLinkedList();
@@ -120,6 +120,7 @@ public class GadgetSpec {
/**
* Use for testing.
*/
+ @VisibleForTesting
public GadgetSpec(Uri url, String xml) throws SpecParserException {
this(url, XmlUtil.parseSilent(xml), xml);
}
Modified: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/spec/Preload.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/spec/Preload.java?rev=1062768&r1=1062767&r2=1062768&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/spec/Preload.java (original)
+++ shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/spec/Preload.java Mon Jan 24 13:37:18 2011
@@ -22,10 +22,10 @@ import org.apache.shindig.common.xml.Xml
import org.apache.shindig.gadgets.AuthType;
import org.apache.shindig.gadgets.variables.Substitutions;
+import com.google.common.base.Joiner;
import com.google.common.collect.ImmutableSet;
import com.google.common.collect.Maps;
-import org.apache.commons.lang.StringUtils;
import org.w3c.dom.Element;
import org.w3c.dom.NamedNodeMap;
import org.w3c.dom.Node;
@@ -153,7 +153,10 @@ public class Preload implements RequestA
StringBuilder buf = new StringBuilder();
buf.append("<Preload href='").append(href).append('\'')
.append(" authz='").append(auth.toString().toLowerCase()).append('\'')
- .append(" views='").append(StringUtils.join(views, ',')).append('\'');
+ .append(" views='");
+ Joiner.on(',').appendTo(buf, views);
+ buf.append('\'');
+
for (Map.Entry<String, String> entry : attributes.entrySet()) {
buf.append(' ').append(entry.getKey()).append("='").append(entry.getValue())
.append('\'');
Modified: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/uri/DefaultIframeUriManager.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/uri/DefaultIframeUriManager.java?rev=1062768&r1=1062767&r2=1062768&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/uri/DefaultIframeUriManager.java (original)
+++ shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/uri/DefaultIframeUriManager.java Mon Jan 24 13:37:18 2011
@@ -18,7 +18,7 @@
*/
package org.apache.shindig.gadgets.uri;
-import com.google.common.collect.Lists;
+import com.google.common.collect.ImmutableList;
import com.google.inject.ImplementedBy;
import com.google.inject.Inject;
import com.google.inject.name.Named;
@@ -38,7 +38,6 @@ import org.apache.shindig.gadgets.spec.V
import org.apache.shindig.gadgets.uri.UriCommon.Param;
import java.util.Collection;
-import java.util.Collections;
import java.util.List;
import java.util.Set;
@@ -81,11 +80,11 @@ public class DefaultIframeUriManager imp
public void containersChanged(
ContainerConfig config, Collection<String> changed, Collection<String> removed) {
Collection<String> containers = config.getContainers();
- List<String> ldSuffixes = Lists.newArrayListWithCapacity(containers.size());
+ ImmutableList.Builder<String> ldSuffixes = ImmutableList.builder();
for (String container : containers) {
ldSuffixes.add(getReqVal(container, LOCKED_DOMAIN_SUFFIX_KEY));
}
- this.ldSuffixes = Collections.unmodifiableList(ldSuffixes);
+ this.ldSuffixes = ldSuffixes.build();
}
@Inject(optional = true)
Modified: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/uri/DefaultJsUriManager.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/uri/DefaultJsUriManager.java?rev=1062768&r1=1062767&r2=1062768&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/uri/DefaultJsUriManager.java (original)
+++ shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/uri/DefaultJsUriManager.java Mon Jan 24 13:37:18 2011
@@ -18,20 +18,20 @@
*/
package org.apache.shindig.gadgets.uri;
+import com.google.common.base.Joiner;
+import com.google.common.base.Splitter;
+import com.google.common.collect.ImmutableList;
import com.google.common.collect.Lists;
import com.google.inject.Inject;
-import org.apache.commons.lang.StringUtils;
import org.apache.shindig.common.uri.Uri;
import org.apache.shindig.common.uri.UriBuilder;
import org.apache.shindig.config.ContainerConfig;
import org.apache.shindig.gadgets.GadgetException;
-import org.apache.shindig.gadgets.RenderingContext;
import org.apache.shindig.gadgets.GadgetException.Code;
import org.apache.shindig.gadgets.http.HttpResponse;
import org.apache.shindig.gadgets.uri.UriCommon.Param;
-import java.util.Arrays;
import java.util.Collection;
/**
@@ -163,11 +163,13 @@ public class DefaultJsUriManager impleme
}
static String addJsLibs(Collection<String> extern) {
- return StringUtils.join(extern, JS_DELIMITER);
+ return Joiner.on(JS_DELIMITER).join(extern);
}
static Collection<String> getJsLibs(String path) {
- return Arrays.asList(StringUtils.split(path, JS_DELIMITER));
+ return ImmutableList.copyOf(Splitter.on(JS_DELIMITER)
+ .trimResults()
+ .omitEmptyStrings().split(path));
}
private String getReqConfig(String container, String key) {
Modified: shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/http/DefaultInvalidationServiceTest.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/http/DefaultInvalidationServiceTest.java?rev=1062768&r1=1062767&r2=1062768&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/http/DefaultInvalidationServiceTest.java (original)
+++ shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/http/DefaultInvalidationServiceTest.java Mon Jan 24 13:37:18 2011
@@ -25,7 +25,6 @@ import org.apache.shindig.common.uri.Uri
import org.apache.shindig.gadgets.AuthType;
import org.apache.shindig.gadgets.oauth.OAuthArguments;
import org.apache.shindig.gadgets.rewrite.DefaultResponseRewriterRegistry;
-import org.easymock.EasyMock;
import org.easymock.IMocksControl;
import org.junit.Assert;
import org.junit.Before;
Modified: shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/http/HttpResponseBuilderTest.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/http/HttpResponseBuilderTest.java?rev=1062768&r1=1062767&r2=1062768&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/http/HttpResponseBuilderTest.java (original)
+++ shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/http/HttpResponseBuilderTest.java Mon Jan 24 13:37:18 2011
@@ -32,7 +32,6 @@ import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
import com.google.common.collect.Multimap;
-import org.apache.shindig.common.util.CharsetUtil;
import org.junit.Test;
import java.util.Arrays;
Modified: shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/AbsolutePathReferenceVisitorTest.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/AbsolutePathReferenceVisitorTest.java?rev=1062768&r1=1062767&r2=1062768&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/AbsolutePathReferenceVisitorTest.java (original)
+++ shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/AbsolutePathReferenceVisitorTest.java Mon Jan 24 13:37:18 2011
@@ -22,7 +22,7 @@ import org.apache.shindig.common.uri.Uri
import org.apache.shindig.gadgets.rewrite.DomWalker.Visitor.VisitStatus;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNull;
+
import org.junit.Test;
import org.w3c.dom.Comment;
import org.w3c.dom.Element;
Modified: shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/BaseRewriterTestCase.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/BaseRewriterTestCase.java?rev=1062768&r1=1062767&r2=1062768&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/BaseRewriterTestCase.java (original)
+++ shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/BaseRewriterTestCase.java Mon Jan 24 13:37:18 2011
@@ -17,6 +17,7 @@
*/
package org.apache.shindig.gadgets.rewrite;
+import com.google.common.base.Joiner;
import com.google.inject.util.Providers;
import org.apache.shindig.common.PropertiesModule;
import org.apache.shindig.common.uri.Uri;
@@ -31,9 +32,6 @@ import org.apache.shindig.gadgets.http.R
import org.apache.shindig.gadgets.parse.GadgetHtmlParser;
import org.apache.shindig.gadgets.parse.ParseModule;
import org.apache.shindig.gadgets.parse.nekohtml.NekoSimplifiedHtmlParser;
-import org.apache.shindig.gadgets.rewrite.ContentRewriterFeature;
-import org.apache.shindig.gadgets.rewrite.GadgetRewriter;
-import org.apache.shindig.gadgets.rewrite.MutableContent;
import org.apache.shindig.gadgets.spec.GadgetSpec;
import com.google.inject.AbstractModule;
@@ -42,7 +40,6 @@ import com.google.inject.Injector;
import com.google.inject.Module;
import com.google.inject.util.Modules;
-import org.apache.commons.lang.StringUtils;
import org.easymock.EasyMock;
import org.easymock.IMocksControl;
import org.junit.Before;
@@ -111,7 +108,7 @@ public abstract class BaseRewriterTestCa
if(exclude != null)
xml.append(" <Param name=\"exclude-urls\">" + exclude + "</Param>\n");
if(tags != null)
- xml.append(" <Param name=\"include-tags\">" + StringUtils.join(tags, ",") + "</Param>\n");
+ xml.append(" <Param name=\"include-tags\">" + Joiner.on(',').join(tags) + "</Param>\n");
xml.append("</Optional>");
xml.append("</ModulePrefs>");
xml.append("<Content type=\"html\">Hello!</Content>");
@@ -136,7 +133,7 @@ public abstract class BaseRewriterTestCa
xml.append(" <Param name=\"exclude-url\">" + exclude + "</Param>\n");
}
if(tags != null)
- xml.append(" <Param name=\"include-tags\">" + StringUtils.join(tags, ",") + "</Param>\n");
+ xml.append(" <Param name=\"include-tags\">" + Joiner.on(',').join(tags) + "</Param>\n");
xml.append("</Optional>");
xml.append("</ModulePrefs>");
xml.append("<Content type=\"html\">Hello!</Content>");
Modified: shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/ConcatVisitorTest.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/ConcatVisitorTest.java?rev=1062768&r1=1062767&r2=1062768&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/ConcatVisitorTest.java (original)
+++ shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/ConcatVisitorTest.java Mon Jan 24 13:37:18 2011
@@ -27,7 +27,6 @@ import static org.junit.Assert.assertFal
import com.google.common.collect.ImmutableList;
import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
-import org.apache.commons.lang.StringUtils;
import org.apache.shindig.common.uri.Uri;
import org.apache.shindig.common.uri.UriBuilder;
Modified: shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/MutableContentTest.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/MutableContentTest.java?rev=1062768&r1=1062767&r2=1062768&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/MutableContentTest.java (original)
+++ shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/MutableContentTest.java Mon Jan 24 13:37:18 2011
@@ -21,7 +21,6 @@ package org.apache.shindig.gadgets.rewri
import com.google.common.base.Charsets;
import org.apache.commons.io.IOUtils;
import org.apache.shindig.common.PropertiesModule;
-import org.apache.shindig.common.util.CharsetUtil;
import org.apache.shindig.gadgets.parse.GadgetHtmlParser;
import org.apache.shindig.gadgets.parse.ParseModule;
Modified: shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/RewriterTestBase.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/RewriterTestBase.java?rev=1062768&r1=1062767&r2=1062768&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/RewriterTestBase.java (original)
+++ shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/RewriterTestBase.java Mon Jan 24 13:37:18 2011
@@ -17,6 +17,7 @@
*/
package org.apache.shindig.gadgets.rewrite;
+import com.google.common.base.Joiner;
import com.google.inject.util.Providers;
import org.apache.shindig.common.PropertiesModule;
import org.apache.shindig.common.uri.Uri;
@@ -39,7 +40,6 @@ import com.google.inject.Injector;
import com.google.inject.Module;
import com.google.inject.util.Modules;
-import org.apache.commons.lang.StringUtils;
import org.easymock.EasyMock;
import org.easymock.IMocksControl;
import org.junit.Before;
@@ -108,7 +108,7 @@ public abstract class RewriterTestBase {
if(exclude != null)
xml.append(" <Param name=\"exclude-urls\">" + exclude + "</Param>\n");
if(tags != null)
- xml.append(" <Param name=\"include-tags\">" + StringUtils.join(tags, ",") + "</Param>\n");
+ xml.append(" <Param name=\"include-tags\">" + Joiner.on(',').join(tags) + "</Param>\n");
xml.append("</Optional>");
xml.append("</ModulePrefs>");
xml.append("<Content type=\"html\">Hello!</Content>");
@@ -133,7 +133,7 @@ public abstract class RewriterTestBase {
xml.append(" <Param name=\"exclude-url\">" + exclude + "</Param>\n");
}
if(tags != null)
- xml.append(" <Param name=\"include-tags\">" + StringUtils.join(tags, ",") + "</Param>\n");
+ xml.append(" <Param name=\"include-tags\">" + Joiner.on(',').join(tags) + "</Param>\n");
xml.append("</Optional>");
xml.append("</ModulePrefs>");
xml.append("<Content type=\"html\">Hello!</Content>");
Modified: shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/StyleAdjacencyVisitorTest.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/StyleAdjacencyVisitorTest.java?rev=1062768&r1=1062767&r2=1062768&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/StyleAdjacencyVisitorTest.java (original)
+++ shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/StyleAdjacencyVisitorTest.java Mon Jan 24 13:37:18 2011
@@ -23,7 +23,6 @@ import static org.junit.Assert.assertFal
import static org.junit.Assert.assertSame;
import static org.junit.Assert.assertTrue;
-import org.apache.shindig.gadgets.Gadget;
import org.apache.shindig.gadgets.rewrite.DomWalker.Visitor.VisitStatus;
import org.w3c.dom.Node;
Modified: shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/ConcatProxyServletTest.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/ConcatProxyServletTest.java?rev=1062768&r1=1062767&r2=1062768&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/ConcatProxyServletTest.java (original)
+++ shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/ConcatProxyServletTest.java Mon Jan 24 13:37:18 2011
@@ -37,10 +37,8 @@ import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
import java.util.Map;
-import java.util.concurrent.AbstractExecutorService;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
-import java.util.concurrent.TimeUnit;
public class ConcatProxyServletTest extends ServletTestFixture {
private static final String REQUEST_DOMAIN = "example.org";
Modified: shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/spec/PreloadTest.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/spec/PreloadTest.java?rev=1062768&r1=1062767&r2=1062768&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/spec/PreloadTest.java (original)
+++ shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/spec/PreloadTest.java Mon Jan 24 13:37:18 2011
@@ -21,6 +21,7 @@ package org.apache.shindig.gadgets.spec;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
+import com.google.common.base.Joiner;
import com.google.common.collect.ImmutableSet;
import org.apache.shindig.common.uri.Uri;
@@ -28,7 +29,6 @@ import org.apache.shindig.common.xml.Xml
import org.apache.shindig.gadgets.AuthType;
import org.apache.shindig.gadgets.variables.Substitutions;
-import org.apache.commons.lang.StringUtils;
import org.junit.Test;
import java.util.Set;
@@ -86,7 +86,7 @@ public class PreloadTest {
@Test
public void multipleViews() throws Exception {
String xml = "<Preload href='" + HREF + '\'' +
- " views='" + StringUtils.join(VIEWS, ',') + "'/>";
+ " views='" + Joiner.on(',').join(VIEWS) + "'/>";
Preload preload = new Preload(XmlUtil.parse(xml), SPEC_URL);
@@ -135,7 +135,7 @@ public class PreloadTest {
String xml = "<Preload" +
" href='" + HREF + '\'' +
" authz='signed'" +
- " views='" + StringUtils.join(VIEWS, ',') + '\'' +
+ " views='" + Joiner.on(',').join(VIEWS) + '\'' +
" some_attribute='yes' />";
Preload preload = new Preload(XmlUtil.parse(xml), SPEC_URL);
Modified: shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/dataservice/integration/RestfulJsonPeopleTest.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/dataservice/integration/RestfulJsonPeopleTest.java?rev=1062768&r1=1062767&r2=1062768&view=diff
==============================================================================
--- shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/dataservice/integration/RestfulJsonPeopleTest.java (original)
+++ shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/dataservice/integration/RestfulJsonPeopleTest.java Mon Jan 24 13:37:18 2011
@@ -17,10 +17,10 @@
*/
package org.apache.shindig.social.dataservice.integration;
+import com.google.common.base.Joiner;
import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
-import org.apache.commons.lang.StringUtils;
import org.apache.shindig.protocol.ContentTypes;
import org.apache.shindig.protocol.model.Enum;
import org.apache.shindig.protocol.model.EnumImpl;
@@ -213,7 +213,7 @@ public class RestfulJsonPeopleTest exten
// TODO(doll): Test all of the date fields
Map<String, String> extraParams = Maps.newHashMap();
- extraParams.put("fields", StringUtils.join(Person.Field.ALL_FIELDS, ','));
+ extraParams.put("fields", Joiner.on(',').join(Person.Field.ALL_FIELDS));
// Currently, for Shindig {pid}/@all/{uid} == {uid}/@self
String resp = getResponse("/people/canonical/@self", "GET", extraParams, null,
Modified: shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/service/AlbumHandlerTest.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/service/AlbumHandlerTest.java?rev=1062768&r1=1062767&r2=1062768&view=diff
==============================================================================
--- shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/service/AlbumHandlerTest.java (original)
+++ shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/service/AlbumHandlerTest.java Mon Jan 24 13:37:18 2011
@@ -31,12 +31,10 @@ import org.apache.shindig.protocol.RestH
import org.apache.shindig.protocol.conversion.BeanJsonConverter;
import org.apache.shindig.social.opensocial.spi.AlbumService;
import org.json.JSONObject;
-import org.junit.After;
import org.junit.Before;
import org.junit.Test;
import java.util.List;
-import java.util.Map;
public class AlbumHandlerTest extends EasyMockTestCase {
private AlbumService albumService;
Modified: shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/service/MediaItemHandlerTest.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/service/MediaItemHandlerTest.java?rev=1062768&r1=1062767&r2=1062768&view=diff
==============================================================================
--- shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/service/MediaItemHandlerTest.java (original)
+++ shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/service/MediaItemHandlerTest.java Mon Jan 24 13:37:18 2011
@@ -29,7 +29,6 @@ import org.apache.shindig.protocol.Handl
import org.apache.shindig.protocol.HandlerRegistry;
import org.apache.shindig.protocol.RestHandler;
import org.apache.shindig.protocol.conversion.BeanJsonConverter;
-import org.apache.shindig.social.opensocial.spi.AlbumService;
import org.apache.shindig.social.opensocial.spi.MediaItemService;
import org.json.JSONObject;
import org.junit.Before;