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/10 10:45:28 UTC

svn commit: r983884 - in /shindig/trunk: ./ extras/src/main/java/org/apache/shindig/extras/as/opensocial/service/ java/common/ java/common/src/main/java/org/apache/shindig/auth/ java/common/src/main/java/org/apache/shindig/common/crypto/ java/common/sr...

Author: lindner
Date: Tue Aug 10 08:45:27 2010
New Revision: 983884

URL: http://svn.apache.org/viewvc?rev=983884&view=rev
Log:
SHINDIG-1406 | replace google-collections with guava

Modified:
    shindig/trunk/UPGRADING
    shindig/trunk/extras/src/main/java/org/apache/shindig/extras/as/opensocial/service/ActivityStreamsHandler.java
    shindig/trunk/java/common/pom.xml
    shindig/trunk/java/common/src/main/java/org/apache/shindig/auth/AuthenticationServletFilter.java
    shindig/trunk/java/common/src/main/java/org/apache/shindig/common/crypto/BasicBlobCrypter.java
    shindig/trunk/java/common/src/main/java/org/apache/shindig/common/servlet/HttpUtil.java
    shindig/trunk/java/common/src/main/java/org/apache/shindig/common/servlet/InjectedServlet.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/util/CharsetUtil.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/DefaultHandlerRegistry.java
    shindig/trunk/java/gadgets/pom.xml
    shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/Gadget.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/encoding/EncodingDetector.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/features/FeatureResourceLoader.java
    shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/AbstractHttpCache.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/HttpResponseBuilder.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/render/RenderingGadgetRewriter.java
    shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/MutableContent.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/ConcatProxyServlet.java
    shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/GadgetRenderingServlet.java
    shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/HtmlAccelServlet.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/servlet/MakeRequestServlet.java
    shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/OAuthCallbackServlet.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/RpcServlet.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/spec/View.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/MutableContentTest.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/GadgetsHandlerTest.java
    shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/uri/DefaultConcatUriManagerTest.java
    shindig/trunk/java/samples/pom.xml
    shindig/trunk/java/server/pom.xml
    shindig/trunk/java/social-api/pom.xml
    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/core/util/xstream/XStream081Configuration.java
    shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/EnumUtil.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
    shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/service/SocialRequestItem.java
    shindig/trunk/pom.xml

Modified: shindig/trunk/UPGRADING
URL: http://svn.apache.org/viewvc/shindig/trunk/UPGRADING?rev=983884&r1=983883&r2=983884&view=diff
==============================================================================
--- shindig/trunk/UPGRADING (original)
+++ shindig/trunk/UPGRADING Tue Aug 10 08:45:27 2010
@@ -22,7 +22,8 @@ The default RPC endpoints used for json-
 Too many to mention.  Check the top-level pom.xml for all the new versions.
 Here are some highlights:
 
-* caja r3034 -> r4067
+* guava replaces google-collections
+* caja r3034 -> r4209
 * guice 1.0->2.0
 * guice-multibindings (NEW)
 * nekohtml 1.9.9 -> 1.9.13

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=983884&r1=983883&r2=983884&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 08:45:27 2010
@@ -33,6 +33,7 @@ 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.Objects;
 import com.google.common.base.Preconditions;
 import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.Iterables;
@@ -146,12 +147,8 @@ public class ActivityStreamsHandler {
   @Operation(httpMethods = "GET", path="/@supportedFields")
   public List<Object> supportedFields(RequestItem request) {
     // TODO: Would be nice if name in config matched name of service.
-    String container = firstNonNull(request.getToken().getContainer(), ContainerConfig.DEFAULT_CONTAINER);
+    String container = Objects.firstNonNull(request.getToken().getContainer(), ContainerConfig.DEFAULT_CONTAINER);
     return config.getList(container,
         "${Cur['gadgets.features'].opensocial.supportedFields.activitystream}");
   }
-
-  private static <T> T firstNonNull(T first, T second) {
-    return first != null ? first : Preconditions.checkNotNull(second);
-  }
 }

Modified: shindig/trunk/java/common/pom.xml
URL: http://svn.apache.org/viewvc/shindig/trunk/java/common/pom.xml?rev=983884&r1=983883&r2=983884&view=diff
==============================================================================
--- shindig/trunk/java/common/pom.xml (original)
+++ shindig/trunk/java/common/pom.xml Tue Aug 10 08:45:27 2010
@@ -101,10 +101,9 @@
       <groupId>com.google.inject.extensions</groupId>
       <artifactId>guice-jmx</artifactId>
     </dependency>
-
     <dependency>
-      <groupId>com.google.collections</groupId>
-      <artifactId>google-collections</artifactId>
+      <groupId>com.google.guava</groupId>
+      <artifactId>guava</artifactId>
     </dependency>
     <dependency>
       <groupId>commons-codec</groupId>

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=983884&r1=983883&r2=983884&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 08:45:27 2010
@@ -17,6 +17,8 @@
  */
 package org.apache.shindig.auth;
 
+import com.google.common.base.Charsets;
+import com.google.common.base.Preconditions;
 import com.google.inject.Inject;
 
 import org.apache.shindig.common.servlet.InjectedFilter;
@@ -139,10 +141,8 @@ public class AuthenticationServletFilter
 
     @Override
     public ServletInputStream getInputStream() throws IOException {
-      if (reader != null) {
-        throw new IllegalStateException(
-            "The methods getInputStream() and getReader() are mutually exclusive.");
-      }
+      Preconditions.checkState(reader == null, "The methods getInputStream() and getReader() are mutually exclusive.");
+
       if (stream == null) {
         stream = new ServletInputStream() {
           public int read() throws IOException {
@@ -155,14 +155,12 @@ public class AuthenticationServletFilter
 
     @Override
     public BufferedReader getReader() throws IOException {
-      if (stream != null) {
-        throw new IllegalStateException(
-            "The methods getInputStream() and getReader() are mutually exclusive.");
-      }
+      Preconditions.checkState(stream == null, "The methods getInputStream() and getReader() are mutually exclusive.");
+
       if (reader == null) {
         Charset charset = Charset.forName(getCharacterEncoding());
         if (charset == null) {
-          charset =  CharsetUtil.UTF8;
+          charset =  Charsets.UTF_8;
         }
         reader = new BufferedReader(new InputStreamReader(rawStream, charset));
       }

Modified: shindig/trunk/java/common/src/main/java/org/apache/shindig/common/crypto/BasicBlobCrypter.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/common/src/main/java/org/apache/shindig/common/crypto/BasicBlobCrypter.java?rev=983884&r1=983883&r2=983884&view=diff
==============================================================================
--- shindig/trunk/java/common/src/main/java/org/apache/shindig/common/crypto/BasicBlobCrypter.java (original)
+++ shindig/trunk/java/common/src/main/java/org/apache/shindig/common/crypto/BasicBlobCrypter.java Tue Aug 10 08:45:27 2010
@@ -18,6 +18,7 @@
  */
 package org.apache.shindig.common.crypto;
 
+import com.google.common.base.Charsets;
 import com.google.common.collect.Maps;
 import com.google.common.base.Preconditions;
 
@@ -79,7 +80,7 @@ public class BasicBlobCrypter implements
     try {
       FileInputStream openFile = new FileInputStream(keyfile);
       reader = new BufferedReader(
-          new InputStreamReader(openFile, CharsetUtil.UTF8));
+          new InputStreamReader(openFile, Charsets.UTF_8));
       String line = reader.readLine();
       if (line == null) {
         throw new IOException("Unexpectedly empty keyfile:" + keyfile);

Modified: shindig/trunk/java/common/src/main/java/org/apache/shindig/common/servlet/HttpUtil.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/common/src/main/java/org/apache/shindig/common/servlet/HttpUtil.java?rev=983884&r1=983883&r2=983884&view=diff
==============================================================================
--- shindig/trunk/java/common/src/main/java/org/apache/shindig/common/servlet/HttpUtil.java (original)
+++ shindig/trunk/java/common/src/main/java/org/apache/shindig/common/servlet/HttpUtil.java Tue Aug 10 08:45:27 2010
@@ -18,6 +18,7 @@
  */
 package org.apache.shindig.common.servlet;
 
+import com.google.common.base.Preconditions;
 import org.apache.shindig.common.Pair;
 import org.apache.shindig.common.util.DateUtil;
 import org.apache.shindig.common.util.TimeSource;
@@ -145,10 +146,10 @@ public final class HttpUtil {
     // No callback specified
     if (callback == null) return false;
 
-    if (!GET_REQUEST_CALLBACK_PATTERN.matcher(callback).matches()) {
-       throw new IllegalArgumentException("Wrong format for parameter 'callback' specified. Must match: " +
+    Preconditions.checkArgument(GET_REQUEST_CALLBACK_PATTERN.matcher(callback).matches(),
+        "Wrong format for parameter 'callback' specified. Must match: " +
             GET_REQUEST_CALLBACK_PATTERN.toString());
-    }
+
     return true;
   }
 

Modified: shindig/trunk/java/common/src/main/java/org/apache/shindig/common/servlet/InjectedServlet.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/common/src/main/java/org/apache/shindig/common/servlet/InjectedServlet.java?rev=983884&r1=983883&r2=983884&view=diff
==============================================================================
--- shindig/trunk/java/common/src/main/java/org/apache/shindig/common/servlet/InjectedServlet.java (original)
+++ shindig/trunk/java/common/src/main/java/org/apache/shindig/common/servlet/InjectedServlet.java Tue Aug 10 08:45:27 2010
@@ -18,6 +18,7 @@
  */
 package org.apache.shindig.common.servlet;
 
+import com.google.common.base.Preconditions;
 import com.google.inject.Injector;
 
 import javax.servlet.ServletConfig;
@@ -32,21 +33,29 @@ import javax.servlet.http.HttpServlet;
  */
 public abstract class InjectedServlet extends HttpServlet {
   protected Injector injector;
+  protected transient boolean initialized = false;
 
-  @Override public void init(ServletConfig config) throws ServletException {
-   super.init(config);
-   ServletContext context = config.getServletContext();
-    injector = (Injector)
-       context.getAttribute(GuiceServletContextListener.INJECTOR_ATTRIBUTE);
-   if (injector == null) {
-     injector = (Injector)
-       context.getAttribute(GuiceServletContextListener.INJECTOR_NAME);
-     if (injector == null) {
-       throw new UnavailableException(
-           "Guice Injector not found! Make sure you registered " +
-           GuiceServletContextListener.class.getName() + " as a listener");
-     }
-   }
-   injector.injectMembers(this);
- }
+  @Override
+  public void init(ServletConfig config) throws ServletException {
+    super.init(config);
+    ServletContext context = config.getServletContext();
+    injector = (Injector) context.getAttribute(GuiceServletContextListener.INJECTOR_ATTRIBUTE);
+    if (injector == null) {
+      injector = (Injector) context.getAttribute(GuiceServletContextListener.INJECTOR_NAME);
+      if (injector == null) {
+        throw new UnavailableException(
+            "Guice Injector not found! Make sure you registered " +
+                GuiceServletContextListener.class.getName() + " as a listener");
+      }
+    }
+    injector.injectMembers(this);
+    initialized = true;
+  }
+
+  /**
+   * Called in each guice injected method to insure we are not initialized twice
+   */
+  protected void checkInitialized() {
+    Preconditions.checkState(!initialized, "Servlet already initialized");
+  }
 }

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=983884&r1=983883&r2=983884&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 08:45:27 2010
@@ -176,7 +176,7 @@ public final class Uri {
       result = new UriBuilder(this);
       result.setFragment(relative.fragment);
       result.setQuery(relative.query);
-      String relativePath = (relative.path == null) ? "" : 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/util/CharsetUtil.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/common/src/main/java/org/apache/shindig/common/util/CharsetUtil.java?rev=983884&r1=983883&r2=983884&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 08:45:27 2010
@@ -19,6 +19,7 @@
 
 package org.apache.shindig.common.util;
 
+import com.google.common.base.Charsets;
 import org.apache.commons.lang.ArrayUtils;
 
 import java.nio.ByteBuffer;
@@ -31,18 +32,13 @@ public final class CharsetUtil {
   private CharsetUtil() {}
   
   /**
-   * UTF-8 Charset.
-   */
-  public static final Charset UTF8 = Charset.forName("UTF-8");
-
-  /**
    * @return UTF-8 byte array for the input string.
    */
   public static byte[] getUtf8Bytes(String s) {
     if (s == null) {
       return ArrayUtils.EMPTY_BYTE_ARRAY;
     }
-    ByteBuffer bb = UTF8.encode(s);
+    ByteBuffer bb = Charsets.UTF_8.encode(s);
     return ArrayUtils.subarray(bb.array(), 0, bb.limit());
     
   }

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=983884&r1=983883&r2=983884&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 Tue Aug 10 08:45:27 2010
@@ -17,6 +17,7 @@
  */
 package org.apache.shindig.protocol;
 
+import com.google.common.base.Objects;
 import org.apache.commons.lang.StringUtils;
 import org.apache.shindig.auth.SecurityToken;
 import org.apache.shindig.protocol.conversion.BeanConverter;
@@ -174,7 +175,7 @@ public class BaseRequestItem implements 
 
   public String getFilterValue() {
     String filterValue = getParameter(FILTER_VALUE);
-    return filterValue == null ? "" : filterValue;
+    return Objects.firstNonNull(filterValue, "");
   }
 
   public Set<String> getFields() {

Modified: shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/DefaultHandlerRegistry.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/DefaultHandlerRegistry.java?rev=983884&r1=983883&r2=983884&view=diff
==============================================================================
--- shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/DefaultHandlerRegistry.java (original)
+++ shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/DefaultHandlerRegistry.java Tue Aug 10 08:45:27 2010
@@ -18,6 +18,7 @@
  */
 package org.apache.shindig.protocol;
 
+import com.google.common.base.Preconditions;
 import org.apache.commons.io.IOUtils;
 import org.apache.commons.lang.StringUtils;
 import org.apache.shindig.auth.SecurityToken;
@@ -102,10 +103,9 @@ public class DefaultHandlerRegistry impl
           }
         };
       }
-      if (!handlerType.isAnnotationPresent(Service.class)) {
-        throw new IllegalStateException("Attempt to bind unannotated service implementation " +
-            handlerType.getName());
-      }
+      Preconditions.checkState(handlerType.isAnnotationPresent(Service.class),
+          "Attempt to bind unannotated service implementation %s",handlerType.getName());
+
       Service service = handlerType.getAnnotation(Service.class);
 
       for (Method m : handlerType.getMethods()) {

Modified: shindig/trunk/java/gadgets/pom.xml
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/pom.xml?rev=983884&r1=983883&r2=983884&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/pom.xml (original)
+++ shindig/trunk/java/gadgets/pom.xml Tue Aug 10 08:45:27 2010
@@ -176,8 +176,8 @@
       <artifactId>jsr305</artifactId>
     </dependency>
     <dependency>
-      <groupId>com.google.collections</groupId>
-      <artifactId>google-collections</artifactId>
+      <groupId>com.google.guava</groupId>
+      <artifactId>guava</artifactId>
     </dependency>
     <dependency>
       <groupId>com.google.inject</groupId>

Modified: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/Gadget.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/Gadget.java?rev=983884&r1=983883&r2=983884&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/Gadget.java (original)
+++ shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/Gadget.java Tue Aug 10 08:45:27 2010
@@ -17,6 +17,7 @@
  */
 package org.apache.shindig.gadgets;
 
+import com.google.common.base.Preconditions;
 import org.apache.shindig.gadgets.features.FeatureRegistry;
 import org.apache.shindig.gadgets.preload.PreloadedData;
 import org.apache.shindig.gadgets.spec.GadgetSpec;
@@ -97,12 +98,8 @@ public class Gadget {
   private List<String> allGadgetFeatures;
   public synchronized List<String> getAllFeatures() {
     if (allGadgetFeatures == null) {
-      if (featureRegistry != null) {
-        allGadgetFeatures = featureRegistry.getFeatures(Lists.newArrayList(directFeatureDeps));
-      } else {
-        throw new IllegalStateException(
-            "setGadgetFeatureRegistry must be called before Gadget.getAllFeatures()");
-      }
+      Preconditions.checkState(featureRegistry != null, "setGadgetFeatureRegistry must be called before Gadget.getAllFeatures()");
+      allGadgetFeatures = featureRegistry.getFeatures(Lists.newArrayList(directFeatureDeps));
     }
     return allGadgetFeatures;
   }

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=983884&r1=983883&r2=983884&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 08:45:27 2010
@@ -17,6 +17,7 @@
  */
 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/encoding/EncodingDetector.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/encoding/EncodingDetector.java?rev=983884&r1=983883&r2=983884&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/encoding/EncodingDetector.java (original)
+++ shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/encoding/EncodingDetector.java Tue Aug 10 08:45:27 2010
@@ -20,6 +20,7 @@ package org.apache.shindig.gadgets.encod
 
 import java.nio.charset.Charset;
 
+import com.google.common.base.Charsets;
 import com.ibm.icu.text.CharsetDetector;
 import com.ibm.icu.text.CharsetMatch;
 
@@ -31,10 +32,6 @@ import com.ibm.icu.text.CharsetMatch;
 public final class EncodingDetector {
   private EncodingDetector() {}
   
-  private static final Charset UTF_8 = Charset.forName("UTF-8");
-  private static final Charset ISO_8859_1 = Charset.forName("ISO-8859-1");
-
-
   public static class FallbackEncodingDetector {
     public Charset detectEncoding(byte[] input) {
       // Fall back to the incredibly slow ICU. It might be better to just skip this entirely.
@@ -60,11 +57,11 @@ public final class EncodingDetector {
   public static Charset detectEncoding(byte[] input, boolean assume88591IfNotUtf8,
       FallbackEncodingDetector alternateDecoder) {
     if (looksLikeValidUtf8(input)) {
-      return UTF_8;
+      return Charsets.UTF_8;
     }
 
     if (assume88591IfNotUtf8) {
-      return ISO_8859_1;
+      return Charsets.ISO_8859_1;
     }
 
     // Fall back encoding:

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=983884&r1=983883&r2=983884&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 Tue Aug 10 08:45:27 2010
@@ -17,6 +17,7 @@
  */
 package org.apache.shindig.gadgets.features;
 
+import com.google.common.base.Joiner;
 import com.google.common.base.Objects;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
@@ -384,9 +385,7 @@ public class FeatureRegistry {
     if (!problems.isEmpty()) {
       StringBuilder sb = new StringBuilder();
       sb.append("Problems found processing features:\n");
-      for (String problem : problems) {
-        sb.append(problem).append('\n');
-      }
+      Joiner.on('\n').appendTo(sb, problems);
       throw new GadgetException(GadgetException.Code.INVALID_CONFIG, sb.toString());
     }
   }

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=983884&r1=983883&r2=983884&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 08:45:27 2010
@@ -17,6 +17,7 @@
  */
 package org.apache.shindig.gadgets.features;
 
+import com.google.common.base.Preconditions;
 import com.google.inject.Inject;
 import com.google.inject.name.Named;
 
@@ -140,9 +141,8 @@ public class FeatureResourceLoader {
     protected DualModeFileResource(String optFilePath, String dbgFilePath) {
       this.optContent = new FileContent(optFilePath);
       this.dbgContent = new FileContent(dbgFilePath);
-      if (optContent.get() == null && dbgContent.get() == null) {
-        throw new IllegalArgumentException("Problems reading resource: " + dbgFilePath);
-      }
+      Preconditions.checkArgument(optContent.get() != null || dbgContent.get() != null,
+        "Problems reading resource: %s", dbgFilePath);
     }
 
     public String getContent() {
@@ -202,9 +202,7 @@ public class FeatureResourceLoader {
     private DualModeStaticResource(String path, String content, String debugContent) {
       this.content = content != null ? content : debugContent;
       this.debugContent = debugContent != null ? debugContent : content;
-      if (this.content == null) {
-        throw new IllegalArgumentException("Problems reading resource: " + path);
-      }
+      Preconditions.checkArgument(this.content != null, "Problems reading resource: %s", path);
     }
 
     public String getContent() {

Modified: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/AbstractHttpCache.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/AbstractHttpCache.java?rev=983884&r1=983883&r2=983884&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/AbstractHttpCache.java (original)
+++ shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/AbstractHttpCache.java Tue Aug 10 08:45:27 2010
@@ -17,6 +17,8 @@
  */
 package org.apache.shindig.gadgets.http;
 
+import com.google.common.base.Objects;
+import com.google.common.base.Preconditions;
 import org.apache.shindig.auth.SecurityToken;
 import org.apache.shindig.gadgets.AuthType;
 import org.apache.shindig.gadgets.uri.UriCommon;
@@ -155,10 +157,9 @@ public abstract class AbstractHttpCache 
   protected static String getOwnerId(HttpRequest request) {
     if (request.getAuthType() != AuthType.NONE &&
         request.getOAuthArguments().getSignOwner()) {
-      if (request.getSecurityToken() == null)
-        throw new IllegalArgumentException("No Security Token set for request");
+      Preconditions.checkState(request.getSecurityToken() != null, "No Security Token set for request");
       String ownerId = request.getSecurityToken().getOwnerId();
-      return ownerId == null ? "" : ownerId;
+      return Objects.firstNonNull(ownerId, "");
     }
     // Requests that don't use authentication can share the result.
     return null;
@@ -167,10 +168,9 @@ public abstract class AbstractHttpCache 
   protected static String getViewerId(HttpRequest request) {
     if (request.getAuthType() != AuthType.NONE &&
         request.getOAuthArguments().getSignViewer()) {
-      if (request.getSecurityToken() == null)
-        throw new IllegalArgumentException("No Security Token set for request");
+      Preconditions.checkState(request.getSecurityToken() != null, "No Security Token set for request");
       String viewerId = request.getSecurityToken().getViewerId();
-      return viewerId == null ? "" : viewerId;
+      return Objects.firstNonNull(viewerId, "");
     }
     // Requests that don't use authentication can share the result.
     return null;

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=983884&r1=983883&r2=983884&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 Tue Aug 10 08:45:27 2010
@@ -491,9 +491,7 @@ public class BasicHttpFetcher implements
     if (instream == null) {
       return new byte[] {};
     }
-    if (entity.getContentLength() > Integer.MAX_VALUE) {
-      throw new IllegalArgumentException("HTTP entity too large to be buffered in memory");
-    }
+    Preconditions.checkArgument(entity.getContentLength() < Integer.MAX_VALUE, "HTTP entity too large to be buffered in memory");
 
     // The raw data stream (inside JDK) is read in a buffer of size '512'. The original code
     // org.apache.http.util.EntityUtils.toByteArray reads the unzipped data in a buffer of

Modified: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/HttpResponseBuilder.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/HttpResponseBuilder.java?rev=983884&r1=983883&r2=983884&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/HttpResponseBuilder.java (original)
+++ shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/HttpResponseBuilder.java Tue Aug 10 08:45:27 2010
@@ -17,6 +17,7 @@
  */
 package org.apache.shindig.gadgets.http;
 
+import com.google.common.base.Charsets;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
@@ -94,7 +95,7 @@ public class HttpResponseBuilder extends
    * @param body The response string.  Converted to UTF-8 bytes and copied when set.
    */
   public HttpResponseBuilder setResponseString(String body) {
-    setContentBytes(CharsetUtil.getUtf8Bytes(body), CharsetUtil.UTF8);
+    setContentBytes(CharsetUtil.getUtf8Bytes(body), Charsets.UTF_8);
     return this;
   }
 

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=983884&r1=983883&r2=983884&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 Tue Aug 10 08:45:27 2010
@@ -16,6 +16,7 @@
  */
 package org.apache.shindig.gadgets.oauth;
 
+import com.google.common.base.Charsets;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
 
@@ -533,7 +534,7 @@ public class OAuthRequest {
         try {
           byte[] body = IOUtils.toByteArray(base.getPostBody());
           byte[] hash = DigestUtils.sha(body);
-          String b64 = new String(Base64.encodeBase64(hash), CharsetUtil.UTF8.name());
+          String b64 = new String(Base64.encodeBase64(hash), Charsets.UTF_8.name());
           params.add(new Parameter(OAuthConstants.OAUTH_BODY_HASH, b64));
         } catch (IOException e) {
           throw new OAuthRequestException(OAuthError.UNKNOWN_PROBLEM,

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=983884&r1=983883&r2=983884&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 08:45:27 2010
@@ -122,7 +122,7 @@ public class RenderingGadgetRewriter imp
   @Inject
   public void setDefaultForcedLibs(@Named("shindig.gadget-rewrite.default-forced-libs")String forcedLibs) {
     if (StringUtils.isNotBlank(forcedLibs)) {
-      defaultExternLibs = ImmutableSortedSet.of(StringUtils.split(forcedLibs, ':'));
+      defaultExternLibs = ImmutableSortedSet.copyOf(StringUtils.split(forcedLibs, ':'));
     }
   }
 

Modified: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/MutableContent.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/MutableContent.java?rev=983884&r1=983883&r2=983884&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/MutableContent.java (original)
+++ shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/MutableContent.java Tue Aug 10 08:45:27 2010
@@ -17,6 +17,7 @@
  */
 package org.apache.shindig.gadgets.rewrite;
 
+import com.google.common.base.Charsets;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.Maps;
 
@@ -77,7 +78,7 @@ public class MutableContent {
     this.contentParser = contentParser;
     this.content = content;
     this.numChanges = 0;
-    this.contentEncoding = CharsetUtil.UTF8;
+    this.contentEncoding = Charsets.UTF_8;
   }
 
   /**
@@ -111,7 +112,7 @@ public class MutableContent {
       } else if (document != null) {
         content = HtmlSerialization.serialize(document);
       } else if (contentBytes != null) {
-        Charset useEncoding = contentEncoding != null ? contentEncoding : CharsetUtil.UTF8;
+        Charset useEncoding = contentEncoding != null ? contentEncoding : Charsets.UTF_8;
         content = useEncoding.decode(ByteBuffer.wrap(contentBytes)).toString();
       }
     }
@@ -158,10 +159,10 @@ public class MutableContent {
         // In the case of HttpResponseBuilder, this re-sets charset in Content-Type
         // to UTF-8 rather than whatever it was before. We do this to standardize
         // on UTF-8 for all String handling.
-        setContentBytesState(CharsetUtil.getUtf8Bytes(content), CharsetUtil.UTF8);
+        setContentBytesState(CharsetUtil.getUtf8Bytes(content), Charsets.UTF_8);
       } else if (document != null) {
         setContentBytesState(
-            CharsetUtil.getUtf8Bytes(HtmlSerialization.serialize(document)), CharsetUtil.UTF8);
+            CharsetUtil.getUtf8Bytes(HtmlSerialization.serialize(document)), Charsets.UTF_8);
       }
     }
     return contentBytes;

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=983884&r1=983883&r2=983884&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 08:45:27 2010
@@ -24,6 +24,7 @@ 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;
@@ -151,7 +152,7 @@ abstract class BaseOptimizer {
     ImageWriteParam writeParam;
     public ImageIOOutputter(ImageWriter writer, ImageWriteParam writeParam) {
       this.writer = writer;
-      this.writeParam = firstNonNull(writeParam, writer.getDefaultWriteParam());
+      this.writeParam = Objects.firstNonNull(writeParam, writer.getDefaultWriteParam());
     }
 
     public byte[] toBytes(BufferedImage image) throws IOException {
@@ -195,7 +196,4 @@ abstract class BaseOptimizer {
       }
     }
   }
-  private static <T> T firstNonNull(T first, T second) {
-    return first != null ? first : Preconditions.checkNotNull(second);
-  }
 }

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=983884&r1=983883&r2=983884&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 Tue Aug 10 08:45:27 2010
@@ -75,7 +75,6 @@ public class ConcatProxyServlet extends 
   private transient RequestPipeline requestPipeline;
   private transient ConcatUriManager concatUriManager;
   private transient ResponseRewriterRegistry contentRewriterRegistry;
-  private transient boolean initialized;
 
   private transient Executor executor = new Executor() {
     public void execute(Runnable r) {
@@ -86,33 +85,25 @@ public class ConcatProxyServlet extends 
 
   @Inject
   public void setRequestPipeline(RequestPipeline requestPipeline) {
-    if (initialized) {
-      throw new IllegalStateException("Servlet already initialized");
-    }
+    checkInitialized();
     this.requestPipeline = requestPipeline;
   }
   
   @Inject
   public void setConcatUriManager(ConcatUriManager concatUriManager) {
-    if (initialized) {
-      throw new IllegalStateException("Servlet already initialized");
-    }
+    checkInitialized();
     this.concatUriManager = concatUriManager;
   }
 
   @Inject
   public void setContentRewriterRegistry(ResponseRewriterRegistry contentRewriterRegistry) {
-    if (initialized) {
-      throw new IllegalStateException("Servlet already initialized");
-    }
+    checkInitialized();
     this.contentRewriterRegistry = contentRewriterRegistry;
   }
   
   @Inject
   public void setExecutor(@Named("shindig.concat.executor") Executor executor) {
-    if (initialized) {
-      throw new IllegalStateException("Servlet already initialized");
-    }
+    checkInitialized();
     // Executor is independently named to allow separate configuration of
     // concat fetch parallelism and other Shindig job execution.
     this.executor = executor;
@@ -121,7 +112,6 @@ public class ConcatProxyServlet extends 
   @Override
   public void init(ServletConfig config) throws ServletException {
     super.init(config);
-    initialized = true;
   }
 
   @SuppressWarnings("boxing")

Modified: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/GadgetRenderingServlet.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/GadgetRenderingServlet.java?rev=983884&r1=983883&r2=983884&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/GadgetRenderingServlet.java (original)
+++ shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/GadgetRenderingServlet.java Tue Aug 10 08:45:27 2010
@@ -54,28 +54,22 @@ public class GadgetRenderingServlet exte
 
   private transient Renderer renderer;
   private transient IframeUriManager iframeUriManager;
-  private transient boolean initialized;
 
   @Inject
   public void setRenderer(Renderer renderer) {
-    if (initialized) {
-      throw new IllegalStateException("Servlet already initialized");
-    }
+    checkInitialized();
     this.renderer = renderer;
   }
   
   @Inject
   public void setIframeUriManager(IframeUriManager iframeUriManager) {
-    if (initialized) {
-      throw new IllegalStateException("Servlet already initialized");
-    }
+    checkInitialized();
     this.iframeUriManager = iframeUriManager;
   }
 
   @Override
   public void init(ServletConfig config) throws ServletException {
     super.init(config);
-    initialized = true;
   }
 
   @Override

Modified: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/HtmlAccelServlet.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/HtmlAccelServlet.java?rev=983884&r1=983883&r2=983884&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/HtmlAccelServlet.java (original)
+++ shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/HtmlAccelServlet.java Tue Aug 10 08:45:27 2010
@@ -41,20 +41,16 @@ public class HtmlAccelServlet extends In
   private static final Logger logger = Logger.getLogger(
       HtmlAccelServlet.class.getName());
   private transient AccelHandler accelHandler;
-  private transient boolean initialized;
 
   @Inject
   public void setHandler(AccelHandler accelHandler) {
-    if (initialized) {
-      throw new IllegalStateException("Servlet already initialized");
-    }
+    checkInitialized();
     this.accelHandler = accelHandler;
   }
 
   @Override
   public void init(ServletConfig config) throws ServletException {
     super.init(config);
-    initialized = true;
   }
 
   @Override

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=983884&r1=983883&r2=983884&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 Tue Aug 10 08:45:27 2010
@@ -70,44 +70,34 @@ public class JsServlet extends InjectedS
   private transient JsUriManager jsUriManager;
   private transient ContainerConfig containerConfig;
   private transient Map<String, ConfigContributor> configContributors;
-  private transient boolean initialized;
 
   @Inject
   public void setRegistry(FeatureRegistry registry) {
-    if (initialized) {
-      throw new IllegalStateException("Servlet already initialized");
-    }
+    checkInitialized();
     this.registry = registry;
   }
 
   @Inject
   public void setUrlGenerator(JsUriManager jsUriManager) {
-    if (initialized) {
-      throw new IllegalStateException("Servlet already initialized");
-    }
+    checkInitialized();
     this.jsUriManager = jsUriManager;
   }
 
   @Inject
   public void setContainerConfig(ContainerConfig containerConfig) {
-    if (initialized) {
-      throw new IllegalStateException("Servlet already initialized");
-    }
+    checkInitialized();
     this.containerConfig = containerConfig;
   }
 
   @Inject
   public void setConfigContributors(Map<String, ConfigContributor> configContributors) {
-    if (initialized) {
-      throw new IllegalStateException("Servlet already initialized");
-    }
+    checkInitialized();
     this.configContributors = configContributors;
   }
 
   @Override
   public void init(ServletConfig config) throws ServletException {
     super.init(config);
-    initialized = true;
   }
 
   @Override
@@ -140,7 +130,7 @@ public class JsServlet extends InjectedS
           0, resourceName.length() - ".js".length());
     }
 
-    Set<String> needed = ImmutableSet.of(StringUtils.split(resourceName, ':'));
+    Set<String> needed = ImmutableSet.copyOf(StringUtils.split(resourceName, ':'));
 
     String debugStr = req.getParameter("debug");
     String containerParam = req.getParameter("container");

Modified: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/MakeRequestServlet.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/MakeRequestServlet.java?rev=983884&r1=983883&r2=983884&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/MakeRequestServlet.java (original)
+++ shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/MakeRequestServlet.java Tue Aug 10 08:45:27 2010
@@ -43,20 +43,16 @@ public class MakeRequestServlet extends 
   private static final long serialVersionUID = -8298705081500283786L;
   
   private transient MakeRequestHandler makeRequestHandler;
-  private transient boolean initialized;
 
   @Inject
   public void setMakeRequestHandler(MakeRequestHandler makeRequestHandler) {
-    if (initialized) {
-      throw new IllegalStateException("Servlet already initialized");
-    }
+    checkInitialized();
     this.makeRequestHandler = makeRequestHandler;
   }
 
   @Override
   public void init(ServletConfig config) throws ServletException {
     super.init(config);
-    initialized = true;
   }
 
   @Override

Modified: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/OAuthCallbackServlet.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/OAuthCallbackServlet.java?rev=983884&r1=983883&r2=983884&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/OAuthCallbackServlet.java (original)
+++ shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/OAuthCallbackServlet.java Tue Aug 10 08:45:27 2010
@@ -81,21 +81,16 @@ public class OAuthCallbackServlet extend
     "</html>\n";
 
   private transient BlobCrypter stateCrypter;
-  private transient boolean initialized;
-  
+
   @Inject
-  public void setStateCrypter(
-      @Named(OAuthFetcherConfig.OAUTH_STATE_CRYPTER) BlobCrypter stateCrypter) {
-    if (initialized) {
-      throw new IllegalStateException("Servlet already initialized");
-    }
+  public void setStateCrypter(@Named(OAuthFetcherConfig.OAUTH_STATE_CRYPTER) BlobCrypter stateCrypter) {
+    checkInitialized();
     this.stateCrypter = stateCrypter;
   }
 
   @Override
   public void init(ServletConfig config) throws ServletException {
     super.init(config);
-    initialized = true;
   }
 
   @Override

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=983884&r1=983883&r2=983884&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 08:45:27 2010
@@ -18,6 +18,7 @@
  */
 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;
@@ -48,7 +49,6 @@ public class ProxyServlet extends Inject
   private transient ProxyUriManager proxyUriManager;
   private transient LockedDomainService lockedDomainService;
   private transient ProxyHandler proxyHandler;
-  private transient boolean initialized;
 
   @Inject
   public void setProxyHandler(ProxyHandler proxyHandler) {
@@ -71,15 +71,8 @@ public class ProxyServlet extends Inject
   @Override
   public void init(ServletConfig config) throws ServletException {
     super.init(config);
-    initialized = true;
   }
   
-  private void checkInitialized() {
-    if (initialized) {
-      throw new IllegalStateException("Servlet already initialized");
-    }
-  }
-
   @Override
   protected void doGet(HttpServletRequest request, HttpServletResponse servletResponse)
       throws IOException {

Modified: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/RpcServlet.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/RpcServlet.java?rev=983884&r1=983883&r2=983884&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/RpcServlet.java (original)
+++ shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/RpcServlet.java Tue Aug 10 08:45:27 2010
@@ -18,6 +18,7 @@
  */
 package org.apache.shindig.gadgets.servlet;
 
+import com.google.common.base.Preconditions;
 import org.apache.commons.io.IOUtils;
 import org.apache.shindig.common.servlet.HttpUtil;
 import org.apache.shindig.common.servlet.InjectedServlet;
@@ -50,20 +51,16 @@ public class RpcServlet extends Injected
   private static final Logger LOG = Logger.getLogger("org.apache.shindig.gadgets");
 
   private transient JsonRpcHandler jsonHandler;
-  private transient boolean initialized;
 
   @Inject
   public void setJsonRpcHandler(JsonRpcHandler jsonHandler) {
-    if (initialized) {
-      throw new IllegalStateException("Servlet already initialized");
-    }
+    checkInitialized();
     this.jsonHandler = jsonHandler;
   }
 
   @Override
   public void init(ServletConfig config) throws ServletException {
     super.init(config);
-    initialized = true;
   }
 
   @Override
@@ -107,9 +104,7 @@ public class RpcServlet extends Injected
   private String validateParameterValue(HttpServletRequest request, String parameter)
       throws IllegalArgumentException {
     String result = request.getParameter(parameter);
-    if (result == null) {
-      throw new IllegalArgumentException("No parameter '" + parameter + "' specified.");
-    }
+    Preconditions.checkArgument(result != null, "No parameter '%s' specified", parameter);
     return result;
   }
 

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=983884&r1=983883&r2=983884&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 Tue Aug 10 08:45:27 2010
@@ -62,7 +62,7 @@ public class Preload implements RequestA
     if (viewNames.length() == 0) {
       this.views = ImmutableSet.of();
     } else {
-      this.views = ImmutableSet.of(viewNames.trim().split("\\s*,+\\s*"));
+      this.views = ImmutableSet.copyOf(viewNames.trim().split("\\s*,+\\s*"));
     }
 
     auth = AuthType.parse(XmlUtil.getAttribute(preload, "authz"));

Modified: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/spec/View.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/spec/View.java?rev=983884&r1=983883&r2=983884&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/spec/View.java (original)
+++ shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/spec/View.java Tue Aug 10 08:45:27 2010
@@ -17,6 +17,7 @@
  */
 package org.apache.shindig.gadgets.spec;
 
+import com.google.common.base.Objects;
 import org.apache.shindig.common.uri.Uri;
 import org.apache.shindig.common.xml.XmlUtil;
 import org.apache.shindig.gadgets.AuthType;
@@ -112,8 +113,8 @@ public class View implements RequestAuth
     this.needsUserPrefSubstitution = this.content.contains("__UP_");
     this.quirks = quirks;
     this.href = href;
-    this.rawType = contentType == null ? "html" : contentType;
-    this.type = type == null ? ContentType.HTML : type;
+    this.rawType = Objects.firstNonNull(contentType, "html");
+    this.type = Objects.firstNonNull(type, ContentType.HTML);
     this.preferredHeight = preferredHeight;
     this.preferredWidth = preferredWidth;
     this.attributes = Collections.unmodifiableMap(attributes);

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=983884&r1=983883&r2=983884&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 Tue Aug 10 08:45:27 2010
@@ -24,6 +24,7 @@ import static org.junit.Assert.assertNot
 import static org.junit.Assert.assertSame;
 import static org.junit.Assert.assertTrue;
 
+import com.google.common.base.Charsets;
 import com.google.common.base.Joiner;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
@@ -136,7 +137,7 @@ public class HttpResponseBuilderTest {
   public void setEncoding() {
     HttpResponseBuilder builder = new HttpResponseBuilder()
         .addHeader("Content-Type", "text/html; charset=Big5")
-        .setEncoding(CharsetUtil.UTF8);
+        .setEncoding(Charsets.UTF_8);
     
     Multimap<String, String> headers = builder.getHeaders();
     assertEquals("text/html; charset=UTF-8", headers.get("Content-Type").iterator().next());        
@@ -146,7 +147,7 @@ public class HttpResponseBuilderTest {
   public void setEncodingEmpty() {
     HttpResponseBuilder builder = new HttpResponseBuilder()
         .addHeader("Content-Type", "text/html")
-        .setEncoding(CharsetUtil.UTF8);
+        .setEncoding(Charsets.UTF_8);
     
     Multimap<String, String> headers = builder.getHeaders();
     assertEquals("text/html; charset=UTF-8", headers.get("Content-Type").iterator().next());        

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=983884&r1=983883&r2=983884&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 Tue Aug 10 08:45:27 2010
@@ -18,6 +18,7 @@
  */
 package org.apache.shindig.gadgets.rewrite;
 
+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;
@@ -95,7 +96,7 @@ public class MutableContentTest {
   @Test
   public void modifyBytesReflectedInContentAndTree() throws Exception {
     assertEquals(0, mhc.getNumChanges());
-    mhc.setContentBytes("NEW CONTENT".getBytes("UTF8"), CharsetUtil.UTF8);
+    mhc.setContentBytes("NEW CONTENT".getBytes("UTF8"), Charsets.UTF_8);
     assertEquals(1, mhc.getNumChanges());
     Document document = mhc.getDocument();
     assertEquals(1, document.getChildNodes().getLength());

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=983884&r1=983883&r2=983884&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 Tue Aug 10 08:45:27 2010
@@ -240,6 +240,6 @@ public class StyleAdjacencyVisitorTest e
   }
   
   private boolean revisit(Node... nodes) throws Exception {
-    return new StyleAdjacencyVisitor().revisit(gadget(), ImmutableList.<Node>of(nodes));
+    return new StyleAdjacencyVisitor().revisit(gadget(), ImmutableList.<Node>copyOf(nodes));
   }
 }

Modified: shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/GadgetsHandlerTest.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/GadgetsHandlerTest.java?rev=983884&r1=983883&r2=983884&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/GadgetsHandlerTest.java (original)
+++ shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/GadgetsHandlerTest.java Tue Aug 10 08:45:27 2010
@@ -86,7 +86,7 @@ public class GadgetsHandlerTest extends 
       throws JSONException {
     JSONObject req =
         new JSONObject().put("method", "gadgets.metadata").put("id", "req1").put("params",
-            new JSONObject().put("ids", ImmutableList.of(uris)).put("container", CONTAINER));
+            new JSONObject().put("ids", ImmutableList.copyOf(uris)).put("container", CONTAINER));
     if (lang != null) req.put("language", lang);
     if (country != null) req.put("country", country);
     return req;
@@ -95,7 +95,7 @@ public class GadgetsHandlerTest extends 
   private JSONObject makeTokenRequest(String... uris) throws JSONException {
     JSONObject req =
         new JSONObject().put("method", "gadgets.token").put("id", "req1").put("params",
-            new JSONObject().put("ids", ImmutableList.of(uris)).put("container", CONTAINER));
+            new JSONObject().put("ids", ImmutableList.copyOf(uris)).put("container", CONTAINER));
     return req;
   }
 

Modified: shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/uri/DefaultConcatUriManagerTest.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/uri/DefaultConcatUriManagerTest.java?rev=983884&r1=983883&r2=983884&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/uri/DefaultConcatUriManagerTest.java (original)
+++ shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/uri/DefaultConcatUriManagerTest.java Tue Aug 10 08:45:27 2010
@@ -519,7 +519,7 @@ public class DefaultConcatUriManagerTest
   private ConcatUriManager.Versioner makeVersioner(UriStatus status, String... versions) {
     ConcatUriManager.Versioner versioner = createMock(ConcatUriManager.Versioner.class);
     expect(versioner.version(isA(List.class), eq(CONTAINER)))
-        .andReturn(ImmutableList.of(versions)).anyTimes();
+        .andReturn(ImmutableList.copyOf(versions)).anyTimes();
     expect(versioner.validate(isA(List.class), eq(CONTAINER), isA(String.class)))
         .andReturn(status).anyTimes();
     replay(versioner);

Modified: shindig/trunk/java/samples/pom.xml
URL: http://svn.apache.org/viewvc/shindig/trunk/java/samples/pom.xml?rev=983884&r1=983883&r2=983884&view=diff
==============================================================================
--- shindig/trunk/java/samples/pom.xml (original)
+++ shindig/trunk/java/samples/pom.xml Tue Aug 10 08:45:27 2010
@@ -119,16 +119,16 @@
       <version>1.2.2</version>
     </dependency>
     <dependency>
-      <artifactId>commons-collections</artifactId>
-      <groupId>commons-collections</groupId>
+      <groupId>com.google.guava</groupId>
+      <artifactId>guava</artifactId>
     </dependency>
     <dependency>
       <artifactId>commons-io</artifactId>
       <groupId>commons-io</groupId>
     </dependency>
     <dependency>
-      <groupId>com.google.collections</groupId>
-      <artifactId>google-collections</artifactId>
+      <groupId>com.google.guava</groupId>
+      <artifactId>guava</artifactId>
     </dependency>
     <dependency>
       <groupId>net.oauth.core</groupId>

Modified: shindig/trunk/java/server/pom.xml
URL: http://svn.apache.org/viewvc/shindig/trunk/java/server/pom.xml?rev=983884&r1=983883&r2=983884&view=diff
==============================================================================
--- shindig/trunk/java/server/pom.xml (original)
+++ shindig/trunk/java/server/pom.xml Tue Aug 10 08:45:27 2010
@@ -132,8 +132,8 @@
       <artifactId>commons-io</artifactId>
     </dependency>
     <dependency>
-      <groupId>com.google.collections</groupId>
-      <artifactId>google-collections</artifactId>
+      <groupId>com.google.guava</groupId>
+      <artifactId>guava</artifactId>
     </dependency>
     <dependency>
       <groupId>com.google.inject</groupId>

Modified: shindig/trunk/java/social-api/pom.xml
URL: http://svn.apache.org/viewvc/shindig/trunk/java/social-api/pom.xml?rev=983884&r1=983883&r2=983884&view=diff
==============================================================================
--- shindig/trunk/java/social-api/pom.xml (original)
+++ shindig/trunk/java/social-api/pom.xml Tue Aug 10 08:45:27 2010
@@ -103,8 +103,8 @@
       <artifactId>commons-codec</artifactId>
     </dependency>
     <dependency>
-      <groupId>com.google.collections</groupId>
-      <artifactId>google-collections</artifactId>
+      <groupId>com.google.guava</groupId>
+      <artifactId>guava</artifactId>
     </dependency>
     <dependency>
       <artifactId>commons-lang</artifactId>

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=983884&r1=983883&r2=983884&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 08:45:27 2010
@@ -18,6 +18,7 @@
 package org.apache.shindig.social.core.util.atom;
 
 import org.apache.shindig.social.opensocial.model.Activity;
+import com.google.common.base.Objects;
 import com.google.common.base.Preconditions;
 
 /**
@@ -35,10 +36,6 @@ public class AtomSource {
    */
   public AtomSource(Activity activity) {
     title = activity.getStreamTitle();
-    link = new AtomLink("self", firstNonNull(activity.getStreamUrl(), "urn:bogus"));
-  }
-
-  private static <T> T firstNonNull(T first, T second) {
-    return first != null ? first : Preconditions.checkNotNull(second);
+    link = new AtomLink("self", Objects.firstNonNull(activity.getStreamUrl(), "urn:bogus"));
   }
 }

Modified: shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/util/xstream/XStream081Configuration.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/util/xstream/XStream081Configuration.java?rev=983884&r1=983883&r2=983884&view=diff
==============================================================================
--- shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/util/xstream/XStream081Configuration.java (original)
+++ shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/util/xstream/XStream081Configuration.java Tue Aug 10 08:45:27 2010
@@ -58,6 +58,7 @@ import org.apache.shindig.social.opensoc
 import org.apache.shindig.social.opensocial.model.Person;
 import org.apache.shindig.social.opensocial.model.Url;
 
+import com.google.common.base.Objects;
 import com.google.common.base.Preconditions;
 import com.google.common.collect.ForwardingMap;
 import com.google.common.collect.ImmutableList;
@@ -295,7 +296,7 @@ public class XStream081Configuration imp
   }
 
   private static Multimap<String, Class<?>> getOmitMap(ConverterSet c) {
-    return firstNonNull(omitMap.get(c), omitMap.get(ConverterSet.DEFAULT));
+    return Objects.firstNonNull(omitMap.get(c), omitMap.get(ConverterSet.DEFAULT));
   }
 
 
@@ -376,7 +377,7 @@ public class XStream081Configuration imp
     @SuppressWarnings("unchecked")
     public V get(Object o) {
       K key = (K)o;
-      return firstNonNull(backing.get(key), backing.get(defaultval));
+      return Objects.firstNonNull(backing.get(key), backing.get(defaultval));
     }
 
     @Override
@@ -384,8 +385,4 @@ public class XStream081Configuration imp
       return backing;
     }
   }
-
-  public static <T> T firstNonNull(T first, T second) {
-    return first != null ? first : Preconditions.checkNotNull(second);
-  }
 }

Modified: shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/EnumUtil.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/EnumUtil.java?rev=983884&r1=983883&r2=983884&view=diff
==============================================================================
--- shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/EnumUtil.java (original)
+++ shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/EnumUtil.java Tue Aug 10 08:45:27 2010
@@ -18,6 +18,7 @@
 
 package org.apache.shindig.social.opensocial.model;
 
+import com.google.common.base.Preconditions;
 import com.google.common.collect.ImmutableSet;
 
 import java.util.Set;
@@ -46,10 +47,7 @@ public final class EnumUtil {
     }
     Set<String> result = builder.build();
 
-    if (result.size() != vals.length) {
-      throw new IllegalArgumentException("Enum names are not disjoint set");
-    }
-
+    Preconditions.checkArgument(result.size() == vals.length, "Enum names are not disjoint set");
     return result;
   }
 }

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=983884&r1=983883&r2=983884&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 08:45:27 2010
@@ -28,6 +28,7 @@ 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.Objects;
 import com.google.common.base.Preconditions;
 import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.Iterables;
@@ -142,12 +143,8 @@ public class ActivityHandler  {
   @Operation(httpMethods = "GET", path="/@supportedFields")
   public List<Object> supportedFields(RequestItem request) {
     // TODO: Would be nice if name in config matched name of service.
-    String container = firstNonNull(request.getToken().getContainer(), ContainerConfig.DEFAULT_CONTAINER);
+    String container = Objects.firstNonNull(request.getToken().getContainer(), ContainerConfig.DEFAULT_CONTAINER);
     return config.getList(container,
         "${Cur['gadgets.features'].opensocial.supportedFields.activity}");
   }
-
-  private static <T> T firstNonNull(T first, T second) {
-    return first != null ? first : Preconditions.checkNotNull(second);
-  }
 }

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=983884&r1=983883&r2=983884&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 08:45:27 2010
@@ -35,6 +35,7 @@ import org.apache.shindig.social.opensoc
 import org.apache.shindig.social.opensocial.spi.PersonService;
 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;
@@ -111,12 +112,8 @@ public class PersonHandler {
   @Operation(httpMethods = "GET", path="/@supportedFields")
   public List<Object> supportedFields(RequestItem request) {
     // TODO: Would be nice if name in config matched name of service.
-    String container = firstNonNull(request.getToken().getContainer(), "default");
+    String container = Objects.firstNonNull(request.getToken().getContainer(), "default");
     return config.getList(container,
         "${Cur['gadgets.features'].opensocial.supportedFields.person}");
   }
-
-  private static <T> T firstNonNull(T first, T second) {
-    return first != null ? first : Preconditions.checkNotNull(second);
-  }
 }

Modified: shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/service/SocialRequestItem.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/service/SocialRequestItem.java?rev=983884&r1=983883&r2=983884&view=diff
==============================================================================
--- shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/service/SocialRequestItem.java (original)
+++ shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/service/SocialRequestItem.java Tue Aug 10 08:45:27 2010
@@ -21,6 +21,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
+import com.google.common.base.Preconditions;
 import org.apache.shindig.auth.SecurityToken;
 import org.apache.shindig.protocol.BaseRequestItem;
 import org.apache.shindig.protocol.conversion.BeanConverter;
@@ -54,12 +55,9 @@ public class SocialRequestItem extends B
   public Set<UserId> getUsers() {
     List<String> ids = getListParameter(USER_ID);
     if (ids.isEmpty()) {
-      if (token.getViewerId() != null) {
-        // Assume @me
-        return ImmutableSet.of(UserId.fromJson("@me"));
-      } else {
-        throw new IllegalArgumentException("No userId provided and viewer not available");
-      }
+      Preconditions.checkArgument(token.getViewerId() != null, "No userId provided and viewer not available");
+      // Assume @me
+      return ImmutableSet.of(UserId.fromJson("@me"));
     }
     ImmutableSet.Builder<UserId> userIds = ImmutableSet.builder();
     for (String id : ids) {

Modified: shindig/trunk/pom.xml
URL: http://svn.apache.org/viewvc/shindig/trunk/pom.xml?rev=983884&r1=983883&r2=983884&view=diff
==============================================================================
--- shindig/trunk/pom.xml (original)
+++ shindig/trunk/pom.xml Tue Aug 10 08:45:27 2010
@@ -1390,10 +1390,11 @@
       </dependency>
 
       <dependency>
-        <groupId>com.google.collections</groupId>
-        <artifactId>google-collections</artifactId>
-        <version>1.0</version>
+        <groupId>com.google.guava</groupId>
+        <artifactId>guava</artifactId>
+        <version>r06</version>
       </dependency>
+
       <dependency>
         <groupId>commons-codec</groupId>
         <artifactId>commons-codec</artifactId>