svn commit: r1571417 - /shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/oauth2/OAuth2TokenHandler.java

[an...@apache.org]

Author: ankon
Date: Mon Feb 24 19:59:19 2014
New Revision: 1571417

URL: http://svn.apache.org/r1571417
Log:
SHINDIG-1958: Fix OAuth2TokenHandler#listToString()

1. Use Joiner instead of hand-rolling the joining.
2. Separate scopes by ' ' instead of ','

The first part actually makes the method "work" instead of throwing an AIOOBException, the second
part makes it "correct" according to the OAuth standard.

Review: https://reviews.apache.org/r/15958/


Modified:
    shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/oauth2/OAuth2TokenHandler.java

Modified: shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/oauth2/OAuth2TokenHandler.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/oauth2/OAuth2TokenHandler.java?rev=1571417&r1=1571416&r2=1571417&view=diff
==============================================================================
--- shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/oauth2/OAuth2TokenHandler.java (original)
+++ shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/oauth2/OAuth2TokenHandler.java Mon Feb 24 19:59:19 2014
@@ -27,6 +27,9 @@ import javax.servlet.http.HttpServletRes
 
 import org.apache.shindig.social.core.oauth2.OAuth2Types.TokenFormat;
 
+import com.google.common.annotations.VisibleForTesting;
+import com.google.common.base.Joiner;
+
 /**
  * Handles operations to the OAuth 2.0 token end point.
  *
@@ -84,15 +87,10 @@ public class OAuth2TokenHandler {
   /**
    * Private utility to comma-delimit a list of Strings
    */
-  private static String listToString(List<String> list) {
-    if (list == null || list.isEmpty())
+  @VisibleForTesting
+  protected static String listToString(List<String> list) {
+    if (list == null)
       return "";
-    StringBuilder sb = new StringBuilder();
-    for (String item : list) {
-      sb.append(item);
-      sb.append(',');
-    }
-    sb.deleteCharAt(sb.length());
-    return sb.toString();
+    return Joiner.on(' ').join(list);
   }
 }