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/09/01 18:11:25 UTC
svn commit: r991585 - in /shindig/trunk/java:
common/src/main/java/org/apache/shindig/common/
common/src/main/java/org/apache/shindig/common/cache/ehcache/
gadgets/src/main/java/org/apache/shindig/gadgets/
gadgets/src/main/java/org/apache/shindig/gadge...
Author: lindner
Date: Wed Sep 1 16:11:24 2010
New Revision: 991585
URL: http://svn.apache.org/viewvc?rev=991585&view=rev
Log:
cleanup: unused imports, excess parens, deprecated caja calls, final util classes, etc.
Modified:
shindig/trunk/java/common/src/main/java/org/apache/shindig/common/PropertiesModule.java
shindig/trunk/java/common/src/main/java/org/apache/shindig/common/cache/ehcache/EhCacheCacheProvider.java
shindig/trunk/java/common/src/main/java/org/apache/shindig/common/cache/ehcache/EhConfiguredCache.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/http/BasicHttpFetcher.java
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/parse/ParseModule.java
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/render/CajaResponseRewriter.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/ResourceMutateVisitor.java
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/StyleAdjacencyVisitor.java
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/CajaContentRewriter.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/ServletUtil.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/OAuthService.java
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/uri/UriUtils.java
shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/service/AlbumHandler.java
shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/service/MediaItemHandler.java
shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/sample/spi/JsonDbOpensocialService.java
Modified: shindig/trunk/java/common/src/main/java/org/apache/shindig/common/PropertiesModule.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/common/src/main/java/org/apache/shindig/common/PropertiesModule.java?rev=991585&r1=991584&r2=991585&view=diff
==============================================================================
--- shindig/trunk/java/common/src/main/java/org/apache/shindig/common/PropertiesModule.java (original)
+++ shindig/trunk/java/common/src/main/java/org/apache/shindig/common/PropertiesModule.java Wed Sep 1 16:11:24 2010
@@ -43,6 +43,7 @@ public class PropertiesModule extends Ab
private final Properties properties;
public PropertiesModule() {
+ super();
this.properties = readPropertyFile(getDefaultPropertiesPath());
}
Modified: shindig/trunk/java/common/src/main/java/org/apache/shindig/common/cache/ehcache/EhCacheCacheProvider.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/common/src/main/java/org/apache/shindig/common/cache/ehcache/EhCacheCacheProvider.java?rev=991585&r1=991584&r2=991585&view=diff
==============================================================================
--- shindig/trunk/java/common/src/main/java/org/apache/shindig/common/cache/ehcache/EhCacheCacheProvider.java (original)
+++ shindig/trunk/java/common/src/main/java/org/apache/shindig/common/cache/ehcache/EhCacheCacheProvider.java Wed Sep 1 16:11:24 2010
@@ -35,7 +35,6 @@ import javax.management.MBeanServer;
import java.io.IOException;
import java.io.InputStream;
import java.lang.management.ManagementFactory;
-import java.util.Map;
import java.util.concurrent.ConcurrentMap;
import java.util.logging.Level;
import java.util.logging.Logger;
Modified: shindig/trunk/java/common/src/main/java/org/apache/shindig/common/cache/ehcache/EhConfiguredCache.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/common/src/main/java/org/apache/shindig/common/cache/ehcache/EhConfiguredCache.java?rev=991585&r1=991584&r2=991585&view=diff
==============================================================================
--- shindig/trunk/java/common/src/main/java/org/apache/shindig/common/cache/ehcache/EhConfiguredCache.java (original)
+++ shindig/trunk/java/common/src/main/java/org/apache/shindig/common/cache/ehcache/EhConfiguredCache.java Wed Sep 1 16:11:24 2010
@@ -19,7 +19,6 @@
package org.apache.shindig.common.cache.ehcache;
import com.google.common.base.Preconditions;
-import net.sf.ehcache.ObjectExistsException;
import org.apache.shindig.common.cache.Cache;
import net.sf.ehcache.CacheManager;
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=991585&r1=991584&r2=991585&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 Wed Sep 1 16:11:24 2010
@@ -50,7 +50,6 @@ import org.apache.shindig.gadgets.variab
import java.util.List;
import java.util.Set;
-import java.util.concurrent.Executor;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
import java.util.concurrent.ThreadFactory;
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=991585&r1=991584&r2=991585&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 Wed Sep 1 16:11:24 2010
@@ -381,7 +381,7 @@ public class BasicHttpFetcher implements
// cleanup any outstanding resources..
if (httpMethod != null) try {
httpMethod.abort();
- } catch (Exception e) {
+ } catch (UnsupportedOperationException e) {
// ignore
}
}
Modified: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/parse/ParseModule.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/parse/ParseModule.java?rev=991585&r1=991584&r2=991585&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/parse/ParseModule.java (original)
+++ shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/parse/ParseModule.java Wed Sep 1 16:11:24 2010
@@ -50,7 +50,11 @@ public class ParseModule extends Abstrac
DOMImplementationRegistry registry = DOMImplementationRegistry.newInstance();
// Require the traversal API
domImpl = registry.getDOMImplementation("XML 1.0 Traversal 2.0");
- } catch (Exception e) {
+ } catch (ClassNotFoundException e) {
+ // Try another
+ } catch (InstantiationException e) {
+ // Try another
+ } catch (IllegalAccessException e) {
// Try another
}
// This is ugly but effective
Modified: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/render/CajaResponseRewriter.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/render/CajaResponseRewriter.java?rev=991585&r1=991584&r2=991585&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/render/CajaResponseRewriter.java (original)
+++ shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/render/CajaResponseRewriter.java Wed Sep 1 16:11:24 2010
@@ -109,7 +109,7 @@ public class CajaResponseRewriter implem
ParseTreeNode input = new Parser(tq, mq).parse();
tq.expectEmpty();
- compiler.addInput(AncestorChain.instance(input), contextUri.toJavaUri());
+ compiler.addInput(AncestorChain.instance(input).node, contextUri.toJavaUri());
} catch (ParseException e) {
// Don't bother continuing.
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=991585&r1=991584&r2=991585&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 Wed Sep 1 16:11:24 2010
@@ -121,7 +121,7 @@ public class AbsolutePathReferenceVisito
String nodeName = node.getNodeName().toLowerCase();
if (node.getNodeType() == Node.ELEMENT_NODE &&
resourceTags.containsKey(nodeName)) {
- if (nodeName.equals("link")) {
+ if ("link".equals(nodeName)) {
// Rewrite link only when it is for css.
String type = ((Element)node).getAttribute("type");
String rel = ((Element)node).getAttribute("rel");
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=991585&r1=991584&r2=991585&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 Wed Sep 1 16:11:24 2010
@@ -97,7 +97,7 @@ public abstract class ResourceMutateVisi
if (node.getNodeType() == Node.ELEMENT_NODE &&
resourceTags.containsKey(nodeName) &&
featureConfig.shouldRewriteTag(nodeName)) {
- if (nodeName.equals("link")) {
+ if ("link".equals(nodeName)) {
// Rewrite link only when it is for css.
String type = ((Element)node).getAttribute("type");
String rel = ((Element)node).getAttribute("rel");
Modified: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/StyleAdjacencyVisitor.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/StyleAdjacencyVisitor.java?rev=991585&r1=991584&r2=991585&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/StyleAdjacencyVisitor.java (original)
+++ shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/StyleAdjacencyVisitor.java Wed Sep 1 16:11:24 2010
@@ -19,7 +19,6 @@
package org.apache.shindig.gadgets.rewrite;
import com.google.common.base.Objects;
-import com.google.common.collect.Iterables;
import org.apache.shindig.common.xml.DomUtil;
import org.apache.shindig.gadgets.Gadget;
import org.apache.shindig.gadgets.rewrite.DomWalker.Visitor;
@@ -76,8 +75,9 @@ public class StyleAdjacencyVisitor imple
} else {
// existing nodes in head, inject all nodes before the first one
Node firstChild = head.getFirstChild();
- for (Node n : nodes)
+ for (Node n : nodes) {
head.insertBefore(n, firstChild);
+ }
}
return true;
Modified: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/CajaContentRewriter.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/CajaContentRewriter.java?rev=991585&r1=991584&r2=991585&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/CajaContentRewriter.java (original)
+++ shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/CajaContentRewriter.java Wed Sep 1 16:11:24 2010
@@ -27,7 +27,6 @@ import com.google.caja.opensocial.Gadget
import com.google.caja.parser.html.Dom;
import com.google.caja.parser.html.Namespaces;
import com.google.caja.parser.js.CajoledModule;
-import com.google.caja.plugin.PipelineMaker;
import com.google.caja.plugin.PluginCompiler;
import com.google.caja.plugin.PluginMeta;
import com.google.caja.plugin.UriFetcher;
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=991585&r1=991584&r2=991585&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 Wed Sep 1 16:11:24 2010
@@ -42,7 +42,6 @@ import java.util.ArrayList;
import java.util.List;
import java.util.concurrent.Callable;
import java.util.concurrent.ExecutionException;
-import java.util.concurrent.Executor;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
import java.util.concurrent.FutureTask;
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=991585&r1=991584&r2=991585&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 Wed Sep 1 16:11:24 2010
@@ -40,7 +40,7 @@ import java.io.PrintWriter;
import java.util.Enumeration;
import java.util.Map;
-public class ServletUtil {
+public final class ServletUtil {
public static final String REMOTE_ADDR_KEY = "RemoteAddress";
public static final String DATA_URI_KEY = "dataUri";
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=991585&r1=991584&r2=991585&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 Wed Sep 1 16:11:24 2010
@@ -32,7 +32,6 @@ import org.w3c.dom.Element;
import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
-import java.util.Collections;
import java.util.List;
import java.util.Locale;
import java.util.Map;
Modified: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/spec/OAuthService.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/spec/OAuthService.java?rev=991585&r1=991584&r2=991585&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/spec/OAuthService.java (original)
+++ shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/spec/OAuthService.java Wed Sep 1 16:11:24 2010
@@ -151,7 +151,7 @@ public class OAuthService {
URL("uri-query"),
BODY("post-body");
- private static Map<String, Location> LOCATIONS;
+ private static final Map<String, Location> LOCATIONS;
static {
LOCATIONS = Maps.newHashMap();
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=991585&r1=991584&r2=991585&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 Wed Sep 1 16:11:24 2010
@@ -35,7 +35,7 @@ import java.util.logging.Logger;
/**
* Utility functions related to URI and Http servlet response management.
*/
-public class UriUtils {
+public final class UriUtils {
public static final String CHARSET = "charset";
private static final Logger LOG = Logger.getLogger(UriUtils.class.getName());
Modified: shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/service/AlbumHandler.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/service/AlbumHandler.java?rev=991585&r1=991584&r2=991585&view=diff
==============================================================================
--- shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/service/AlbumHandler.java (original)
+++ shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/service/AlbumHandler.java Wed Sep 1 16:11:24 2010
@@ -33,7 +33,6 @@ import org.apache.shindig.social.opensoc
import org.apache.shindig.social.opensocial.spi.CollectionOptions;
import org.apache.shindig.social.opensocial.spi.UserId;
-import com.google.common.base.Preconditions;
import com.google.common.collect.ImmutableSet;
import com.google.common.collect.Iterables;
import com.google.inject.Inject;
Modified: shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/service/MediaItemHandler.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/service/MediaItemHandler.java?rev=991585&r1=991584&r2=991585&view=diff
==============================================================================
--- shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/service/MediaItemHandler.java (original)
+++ shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/service/MediaItemHandler.java Wed Sep 1 16:11:24 2010
@@ -16,7 +16,6 @@ import org.apache.shindig.social.opensoc
import org.apache.shindig.social.opensocial.spi.MediaItemService;
import org.apache.shindig.social.opensocial.spi.UserId;
-import com.google.common.base.Preconditions;
import com.google.common.collect.ImmutableSet;
import com.google.common.collect.Iterables;
import com.google.inject.Inject;
Modified: shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/sample/spi/JsonDbOpensocialService.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/sample/spi/JsonDbOpensocialService.java?rev=991585&r1=991584&r2=991585&view=diff
==============================================================================
--- shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/sample/spi/JsonDbOpensocialService.java (original)
+++ shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/sample/spi/JsonDbOpensocialService.java Wed Sep 1 16:11:24 2010
@@ -645,7 +645,7 @@ public class JsonDbOpensocialService imp
String albumId, SecurityToken token) throws ProtocolException {
try {
// First ensure user has a table
- String user = userId.getUserId((token));
+ String user = userId.getUserId(token);
if (db.getJSONObject(ALBUMS_TABLE).has(user)) {
// Retrieve user's albums
JSONArray userAlbums = db.getJSONObject(ALBUMS_TABLE).getJSONArray(user);
@@ -865,7 +865,7 @@ public class JsonDbOpensocialService imp
SecurityToken token) throws ProtocolException {
try {
// First ensure user has a table
- String user = userId.getUserId((token));
+ String user = userId.getUserId(token);
if (db.getJSONObject(MEDIAITEMS_TABLE).has(user)) {
// Retrieve user's MediaItems
JSONArray userMediaItems = db.getJSONObject(MEDIAITEMS_TABLE).getJSONArray(user);