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/08/11 01:38:46 UTC

svn commit: r984266 - in /shindig/trunk: extras/src/main/java/org/apache/shindig/extras/as/opensocial/service/ java/common/src/main/java/org/apache/shindig/auth/ java/common/src/main/java/org/apache/shindig/common/uri/ java/common/src/main/java/org/apa...

Author: lindner
Date: Tue Aug 10 23:38:45 2010
New Revision: 984266

URL: http://svn.apache.org/viewvc?rev=984266&view=rev
Log:
java code hygiene

Modified:
    shindig/trunk/extras/src/main/java/org/apache/shindig/extras/as/opensocial/service/ActivityStreamsHandler.java
    shindig/trunk/java/common/src/main/java/org/apache/shindig/auth/AuthenticationServletFilter.java
    shindig/trunk/java/common/src/main/java/org/apache/shindig/common/uri/Uri.java
    shindig/trunk/java/common/src/main/java/org/apache/shindig/common/uri/UriBuilder.java
    shindig/trunk/java/common/src/main/java/org/apache/shindig/common/util/CharsetUtil.java
    shindig/trunk/java/common/src/main/java/org/apache/shindig/expressions/Expressions.java
    shindig/trunk/java/common/src/main/java/org/apache/shindig/expressions/jasper/JasperConversionModule.java
    shindig/trunk/java/common/src/main/java/org/apache/shindig/expressions/juel/JuelModule.java
    shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/conversion/BeanFilter.java
    shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/DefaultGadgetSpecFactory.java
    shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/GadgetContext.java
    shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/features/BrowserSpecificFeatureResource.java
    shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/features/FeatureResourceLoader.java
    shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/parse/SocialDataTags.java
    shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/render/GadgetRewritersProvider.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/BaseTagRemoverRewriter.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/DomWalker.java
    shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/image/BaseOptimizer.java
    shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/ProxyServlet.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/ModulePrefs.java
    shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/uri/UriUtils.java
    shindig/trunk/java/server/src/main/java/org/apache/shindig/sample/container/SampleContainerGuiceModule.java
    shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/util/atom/AtomSource.java
    shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/service/ActivityHandler.java
    shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/service/PersonHandler.java

Modified: shindig/trunk/extras/src/main/java/org/apache/shindig/extras/as/opensocial/service/ActivityStreamsHandler.java
URL: http://svn.apache.org/viewvc/shindig/trunk/extras/src/main/java/org/apache/shindig/extras/as/opensocial/service/ActivityStreamsHandler.java?rev=984266&r1=984265&r2=984266&view=diff
==============================================================================
--- shindig/trunk/extras/src/main/java/org/apache/shindig/extras/as/opensocial/service/ActivityStreamsHandler.java (original)
+++ shindig/trunk/extras/src/main/java/org/apache/shindig/extras/as/opensocial/service/ActivityStreamsHandler.java Tue Aug 10 23:38:45 2010
@@ -34,7 +34,6 @@ import org.apache.shindig.social.opensoc
 import org.apache.shindig.social.opensocial.spi.UserId;
 
 import com.google.common.base.Objects;
-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/common/src/main/java/org/apache/shindig/auth/AuthenticationServletFilter.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/common/src/main/java/org/apache/shindig/auth/AuthenticationServletFilter.java?rev=984266&r1=984265&r2=984266&view=diff
==============================================================================
--- shindig/trunk/java/common/src/main/java/org/apache/shindig/auth/AuthenticationServletFilter.java (original)
+++ shindig/trunk/java/common/src/main/java/org/apache/shindig/auth/AuthenticationServletFilter.java Tue Aug 10 23:38:45 2010
@@ -22,7 +22,6 @@ import com.google.common.base.Preconditi
 import com.google.inject.Inject;
 
 import org.apache.shindig.common.servlet.InjectedFilter;
-import org.apache.shindig.common.util.CharsetUtil;
 
 import java.io.BufferedReader;
 import java.io.ByteArrayInputStream;

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=984266&r1=984265&r2=984266&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 Tue Aug 10 23:38:45 2010
@@ -176,7 +176,7 @@ public final class Uri {
       result = new UriBuilder(this);
       result.setFragment(relative.fragment);
       result.setQuery(relative.query);
-      String relativePath = Objects.firstNonNull(relative.path, "");;
+      String relativePath = Objects.firstNonNull(relative.path, "");
       if (relativePath.startsWith("/")) { //$NON-NLS-1$
         result.setPath(relativePath);
       } else {

Modified: shindig/trunk/java/common/src/main/java/org/apache/shindig/common/uri/UriBuilder.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/common/src/main/java/org/apache/shindig/common/uri/UriBuilder.java?rev=984266&r1=984265&r2=984266&view=diff
==============================================================================
--- shindig/trunk/java/common/src/main/java/org/apache/shindig/common/uri/UriBuilder.java (original)
+++ shindig/trunk/java/common/src/main/java/org/apache/shindig/common/uri/UriBuilder.java Tue Aug 10 23:38:45 2010
@@ -337,7 +337,7 @@ public final class UriBuilder {
     return toString().equals(obj.toString());
   }
   
-  private static class ParamString {
+  private static final class ParamString {
     private final Map<String, List<String>> params;
     private String str;
     

Modified: shindig/trunk/java/common/src/main/java/org/apache/shindig/common/util/CharsetUtil.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/common/src/main/java/org/apache/shindig/common/util/CharsetUtil.java?rev=984266&r1=984265&r2=984266&view=diff
==============================================================================
--- shindig/trunk/java/common/src/main/java/org/apache/shindig/common/util/CharsetUtil.java (original)
+++ shindig/trunk/java/common/src/main/java/org/apache/shindig/common/util/CharsetUtil.java Tue Aug 10 23:38:45 2010
@@ -23,7 +23,6 @@ import com.google.common.base.Charsets;
 import org.apache.commons.lang.ArrayUtils;
 
 import java.nio.ByteBuffer;
-import java.nio.charset.Charset;
 
 /**
  * Utilities for dealing with character set encoding.

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=984266&r1=984265&r2=984266&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 Tue Aug 10 23:38:45 2010
@@ -198,7 +198,7 @@ public class Expressions {
     
   }
   
-  private class ValueExpressionWrapper extends ValueExpression {
+  private static class ValueExpressionWrapper extends ValueExpression {
 
     private static final long serialVersionUID = 2135607228206570229L;
     private ValueExpression expression = null;

Modified: shindig/trunk/java/common/src/main/java/org/apache/shindig/expressions/jasper/JasperConversionModule.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/common/src/main/java/org/apache/shindig/expressions/jasper/JasperConversionModule.java?rev=984266&r1=984265&r2=984266&view=diff
==============================================================================
--- shindig/trunk/java/common/src/main/java/org/apache/shindig/expressions/jasper/JasperConversionModule.java (original)
+++ shindig/trunk/java/common/src/main/java/org/apache/shindig/expressions/jasper/JasperConversionModule.java Tue Aug 10 23:38:45 2010
@@ -30,6 +30,6 @@ import com.google.inject.Scopes;
 public class JasperConversionModule extends AbstractModule {
   @Override
   protected void configure() {
-    bind(ELTypeConverter.class).to(JasperTypeConverter.class).in(Scopes.SINGLETON);;
+    bind(ELTypeConverter.class).to(JasperTypeConverter.class).in(Scopes.SINGLETON);
   }
 }

Modified: shindig/trunk/java/common/src/main/java/org/apache/shindig/expressions/juel/JuelModule.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/common/src/main/java/org/apache/shindig/expressions/juel/JuelModule.java?rev=984266&r1=984265&r2=984266&view=diff
==============================================================================
--- shindig/trunk/java/common/src/main/java/org/apache/shindig/expressions/juel/JuelModule.java (original)
+++ shindig/trunk/java/common/src/main/java/org/apache/shindig/expressions/juel/JuelModule.java Tue Aug 10 23:38:45 2010
@@ -29,6 +29,6 @@ import com.google.inject.Scopes;
 public class JuelModule extends AbstractModule {
   @Override
   protected void configure() {
-    bind(ExpressionProvider.class).to(JuelProvider.class).in(Scopes.SINGLETON);;
+    bind(ExpressionProvider.class).to(JuelProvider.class).in(Scopes.SINGLETON);
   }
 }

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=984266&r1=984265&r2=984266&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 Tue Aug 10 23:38:45 2010
@@ -24,7 +24,6 @@ import com.google.common.collect.Maps;
 
 import org.apache.commons.lang.StringUtils;
 
-import java.lang.annotation.Annotation;
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;

Modified: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/DefaultGadgetSpecFactory.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/DefaultGadgetSpecFactory.java?rev=984266&r1=984265&r2=984266&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/DefaultGadgetSpecFactory.java (original)
+++ shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/DefaultGadgetSpecFactory.java Tue Aug 10 23:38:45 2010
@@ -28,7 +28,6 @@ import org.apache.shindig.common.uri.Uri
 import org.apache.shindig.common.xml.XmlException;
 import org.apache.shindig.common.xml.XmlUtil;
 import org.apache.shindig.gadgets.http.RequestPipeline;
-import org.apache.shindig.gadgets.servlet.HtmlAccelServlet;
 import org.apache.shindig.gadgets.spec.GadgetSpec;
 import org.apache.shindig.gadgets.spec.SpecParserException;
 import org.w3c.dom.Element;

Modified: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/GadgetContext.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/GadgetContext.java?rev=984266&r1=984265&r2=984266&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/GadgetContext.java (original)
+++ shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/GadgetContext.java Tue Aug 10 23:38:45 2010
@@ -17,7 +17,6 @@
  */
 package org.apache.shindig.gadgets;
 
-import com.google.common.base.Objects;
 import org.apache.shindig.auth.SecurityToken;
 import org.apache.shindig.common.uri.Uri;
 import org.apache.shindig.config.ContainerConfig;

Modified: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/features/BrowserSpecificFeatureResource.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/features/BrowserSpecificFeatureResource.java?rev=984266&r1=984265&r2=984266&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/features/BrowserSpecificFeatureResource.java (original)
+++ shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/features/BrowserSpecificFeatureResource.java Tue Aug 10 23:38:45 2010
@@ -156,7 +156,7 @@ public class BrowserSpecificFeatureResou
     }
   }
   
-  private static class VersionMatcher {
+  private static final class VersionMatcher {
     private static final Op[] OPS = {
       new Op("^") {
         public boolean match(String in, String key) {
@@ -214,7 +214,7 @@ public class BrowserSpecificFeatureResou
       return false;
     }
     
-    private static VersionNumber num(String str) {
+    private static final VersionNumber num(String str) {
       return new VersionNumber(str);
     }
     

Modified: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/features/FeatureResourceLoader.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/features/FeatureResourceLoader.java?rev=984266&r1=984265&r2=984266&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/features/FeatureResourceLoader.java (original)
+++ shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/features/FeatureResourceLoader.java Tue Aug 10 23:38:45 2010
@@ -155,7 +155,7 @@ public class FeatureResourceLoader {
       return dbg != null ? dbg : optContent.get();
     }
     
-    private class FileContent {
+    private final class FileContent {
       private final String filePath;
       private long lastModified;
       private long lastUpdateCheckTime;
@@ -195,7 +195,7 @@ public class FeatureResourceLoader {
     }
   }
   
-  private static class DualModeStaticResource extends FeatureResource.Default {
+  private static final class DualModeStaticResource extends FeatureResource.Default {
     private final String content;
     private final String debugContent;
     
@@ -214,7 +214,7 @@ public class FeatureResourceLoader {
     }
   }
   
-  private static class UriResource implements FeatureResource {
+  private static final class UriResource implements FeatureResource {
     private final HttpFetcher fetcher;
     private final Uri uri;
     private final boolean isInline;

Modified: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/parse/SocialDataTags.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/parse/SocialDataTags.java?rev=984266&r1=984265&r2=984266&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/parse/SocialDataTags.java (original)
+++ shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/parse/SocialDataTags.java Tue Aug 10 23:38:45 2010
@@ -40,7 +40,7 @@ import org.w3c.dom.Document;
  * irrespective whether this conversion occurred, ensuring that
  * data pipelining and templating can work with any parser.
  */
-public class SocialDataTags {
+public final class SocialDataTags {
   private SocialDataTags() { }
   
   /**

Modified: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/render/GadgetRewritersProvider.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/render/GadgetRewritersProvider.java?rev=984266&r1=984265&r2=984266&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/render/GadgetRewritersProvider.java (original)
+++ shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/render/GadgetRewritersProvider.java Tue Aug 10 23:38:45 2010
@@ -24,7 +24,6 @@ import com.google.inject.name.Named;
 
 import org.apache.shindig.gadgets.GadgetContext;
 import org.apache.shindig.gadgets.rewrite.GadgetRewriter;
-import org.apache.shindig.gadgets.servlet.HtmlAccelServlet;
 
 import java.util.List;
 

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=984266&r1=984265&r2=984266&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 Tue Aug 10 23:38:45 2010
@@ -44,7 +44,6 @@ import org.apache.commons.lang.StringUti
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
 import org.w3c.dom.Text;
 
 import java.util.Arrays;

Modified: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/BaseTagRemoverRewriter.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/BaseTagRemoverRewriter.java?rev=984266&r1=984265&r2=984266&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/BaseTagRemoverRewriter.java (original)
+++ shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/BaseTagRemoverRewriter.java Tue Aug 10 23:38:45 2010
@@ -32,7 +32,7 @@ import java.util.logging.Logger;
  * Simple rewriter that deletes the base tag from the html document.
  */
 public class BaseTagRemoverRewriter implements GadgetRewriter, ResponseRewriter {
-  private static Logger logger = Logger.getLogger(BaseTagRemoverRewriter.class.getName());
+  private static final Logger logger = Logger.getLogger(BaseTagRemoverRewriter.class.getName());
 
   public void rewrite(Gadget gadget, MutableContent mc) {
     Document doc = mc.getDocument();

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=984266&r1=984265&r2=984266&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 Tue Aug 10 23:38:45 2010
@@ -207,7 +207,7 @@ public class CssResponseRewriter impleme
     return new UriMaker(wrapped, config);
   }
   
-  public static class UriMaker {
+  public static final class UriMaker {
     private final ProxyUriManager wrapped;
     private final ContentRewriterFeature.Config config;
     

Modified: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/DomWalker.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/DomWalker.java?rev=984266&r1=984265&r2=984266&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/DomWalker.java (original)
+++ shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/DomWalker.java Tue Aug 10 23:38:45 2010
@@ -28,7 +28,6 @@ import org.apache.shindig.gadgets.http.H
 import org.apache.shindig.gadgets.http.HttpResponseBuilder;
 import org.apache.shindig.gadgets.spec.GadgetSpec;
 import org.apache.shindig.gadgets.uri.UriCommon.Param;
-import org.apache.commons.lang.StringUtils;
 
 import org.w3c.dom.Document;
 import org.w3c.dom.Node;

Modified: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/image/BaseOptimizer.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/image/BaseOptimizer.java?rev=984266&r1=984265&r2=984266&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/image/BaseOptimizer.java (original)
+++ shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/image/BaseOptimizer.java Tue Aug 10 23:38:45 2010
@@ -25,7 +25,6 @@ import org.apache.shindig.gadgets.http.H
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.Maps;
 import com.google.common.base.Objects;
-import com.google.common.base.Preconditions;
 
 import java.awt.image.BufferedImage;
 import java.io.ByteArrayOutputStream;

Modified: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/ProxyServlet.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/ProxyServlet.java?rev=984266&r1=984265&r2=984266&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/ProxyServlet.java (original)
+++ shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/ProxyServlet.java Tue Aug 10 23:38:45 2010
@@ -18,7 +18,6 @@
  */
 package org.apache.shindig.gadgets.servlet;
 
-import com.google.common.base.Preconditions;
 import org.apache.shindig.common.servlet.InjectedServlet;
 import org.apache.shindig.common.uri.Uri;
 import org.apache.shindig.common.uri.UriBuilder;

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=984266&r1=984265&r2=984266&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 Tue Aug 10 23:38:45 2010
@@ -44,7 +44,9 @@ import javax.servlet.http.HttpServletRes
 public class ServletUtil {
   public static final String REMOTE_ADDR_KEY = "RemoteAddress";
   public static final String DATA_URI_KEY = "dataUri";
-  
+
+  private ServletUtil() {}
+
   public static HttpRequest fromHttpServletRequest(HttpServletRequest servletReq) throws IOException {
     HttpRequest req = new HttpRequest(new UriBuilder(servletReq).toUri());
     Enumeration<?> headerNames = servletReq.getHeaderNames();

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=984266&r1=984265&r2=984266&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 Tue Aug 10 23:38:45 2010
@@ -23,7 +23,6 @@ import org.apache.shindig.common.util.Ha
 import org.apache.shindig.common.xml.XmlUtil;
 import org.apache.shindig.gadgets.variables.Substitutions;
 
-import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.Lists;
 import com.google.common.collect.MapMaker;

Modified: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/spec/ModulePrefs.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/spec/ModulePrefs.java?rev=984266&r1=984265&r2=984266&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/spec/ModulePrefs.java (original)
+++ shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/spec/ModulePrefs.java Tue Aug 10 23:38:45 2010
@@ -637,7 +637,7 @@ public class ModulePrefs {
   /**
    * Process ModulePrefs/OAuth
    */
-  private class OAuthVisitor implements ElementVisitor {
+  private final class OAuthVisitor implements ElementVisitor {
     private OAuthSpec oauthSpec = null;
     private final MutableBoolean oauthMarker;
     
@@ -665,7 +665,7 @@ public class ModulePrefs {
   /**
    * Processes ModulePrefs/Require and ModulePrefs/Optional
    */
-  private static class FeatureVisitor implements ElementVisitor {
+  private static final class FeatureVisitor implements ElementVisitor {
     private final Map<String, Feature> features = Maps.newHashMap();
     private final MutableBoolean oauthMarker;
     private boolean coreIncluded = false;

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=984266&r1=984265&r2=984266&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 Tue Aug 10 23:38:45 2010
@@ -37,6 +37,9 @@ import java.util.Set;
  */
 public class UriUtils {
   private static final Logger LOG = Logger.getLogger(UriUtils.class.getName());
+
+  private UriUtils() {}
+  
   /**
    * Enum of disallowed response headers that should not be passed on as is to
    * the user. The webserver serving out the response should be responsible
@@ -214,7 +217,7 @@ public class UriUtils {
                                      HttpRequest req) throws GadgetException {
     req.setMethod(origRequest.getMethod());
     try {
-      if (origRequest.getMethod().toLowerCase().equals("post")) {
+      if (origRequest.getMethod().equalsIgnoreCase("post")) {
         req.setPostBody(origRequest.getPostBody());
       }
     } catch (IOException e) {

Modified: shindig/trunk/java/server/src/main/java/org/apache/shindig/sample/container/SampleContainerGuiceModule.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/server/src/main/java/org/apache/shindig/sample/container/SampleContainerGuiceModule.java?rev=984266&r1=984265&r2=984266&view=diff
==============================================================================
--- shindig/trunk/java/server/src/main/java/org/apache/shindig/sample/container/SampleContainerGuiceModule.java (original)
+++ shindig/trunk/java/server/src/main/java/org/apache/shindig/sample/container/SampleContainerGuiceModule.java Tue Aug 10 23:38:45 2010
@@ -19,7 +19,6 @@ package org.apache.shindig.sample.contai
 import com.google.inject.AbstractModule;
 import com.google.inject.multibindings.Multibinder;
 import com.google.inject.name.Names;
-import org.apache.shindig.sample.shiro.SampleShiroRealm;
 
 public class SampleContainerGuiceModule extends AbstractModule {
 

Modified: shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/util/atom/AtomSource.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/util/atom/AtomSource.java?rev=984266&r1=984265&r2=984266&view=diff
==============================================================================
--- shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/util/atom/AtomSource.java (original)
+++ shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/util/atom/AtomSource.java Tue Aug 10 23:38:45 2010
@@ -19,7 +19,6 @@ package org.apache.shindig.social.core.u
 
 import org.apache.shindig.social.opensocial.model.Activity;
 import com.google.common.base.Objects;
-import com.google.common.base.Preconditions;
 
 /**
  * This represents atom:entry/atom:source for the Activity object.

Modified: shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/service/ActivityHandler.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/service/ActivityHandler.java?rev=984266&r1=984265&r2=984266&view=diff
==============================================================================
--- shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/service/ActivityHandler.java (original)
+++ shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/service/ActivityHandler.java Tue Aug 10 23:38:45 2010
@@ -29,7 +29,6 @@ import org.apache.shindig.social.opensoc
 import org.apache.shindig.social.opensocial.spi.UserId;
 
 import com.google.common.base.Objects;
-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/PersonHandler.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/service/PersonHandler.java?rev=984266&r1=984265&r2=984266&view=diff
==============================================================================
--- shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/service/PersonHandler.java (original)
+++ shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/service/PersonHandler.java Tue Aug 10 23:38:45 2010
@@ -36,7 +36,6 @@ import org.apache.shindig.social.opensoc
 import org.apache.shindig.social.opensocial.spi.UserId;
 
 import com.google.common.base.Objects;
-import com.google.common.base.Preconditions;
 import com.google.common.collect.ImmutableSet;
 import com.google.inject.Inject;