consolidated and moved around constants

Author: jonschmidt

src/main/java/com/soundcloud/api/ApiWrapper.java

@@ -1,13 +1,5 @@
 package com.soundcloud.api;
 
-import static com.soundcloud.api.AuthParams.CLIENT_ID;
-import static com.soundcloud.api.AuthParams.CLIENT_SECRET;
-import static com.soundcloud.api.AuthParams.CODE;
-import static com.soundcloud.api.AuthParams.GRANT_TYPE;
-import static com.soundcloud.api.AuthParams.REDIRECT_URI;
-import static com.soundcloud.api.AuthParams.RESPONSE_TYPE;
-import static com.soundcloud.api.AuthParams.USERNAME;
-
 import org.apache.http.ConnectionReuseStrategy;
 import org.apache.http.Header;
 import org.apache.http.HeaderElement;
@@ -147,11 +139,11 @@ public ApiWrapper(String clientId,
             throw new IllegalArgumentException("username or password is null");
         }
         final Request request = addScope(Request.to(Endpoints.TOKEN).with(
-                GRANT_TYPE, CloudAPI.PASSWORD,
+                GRANT_TYPE, PASSWORD,
                 CLIENT_ID, mClientId,
                 CLIENT_SECRET, mClientSecret,
                 USERNAME, username,
-                AuthParams.PASSWORD, password), scopes);
+                PASSWORD, password), scopes);
         mToken = requestToken(request);
         return mToken;
     }
@@ -205,20 +197,20 @@ public Token extensionGrantType(String grantType, String... scopes) throws IOExc
     @Override public Token refreshToken() throws IOException {
         if (mToken == null || mToken.refresh == null) throw new IllegalStateException("no refresh token available");
         mToken = requestToken(Request.to(Endpoints.TOKEN).with(
-                GRANT_TYPE, CloudAPI.REFRESH_TOKEN,
+                GRANT_TYPE, REFRESH_TOKEN,
                 CLIENT_ID, mClientId,
                 CLIENT_SECRET, mClientSecret,
-                AuthParams.REFRESH_TOKEN, mToken.refresh));
+                REFRESH_TOKEN, mToken.refresh));
         return mToken;
     }
 
     @Override public Token exchangeOAuth1Token(String oauth1AccessToken) throws IOException {
         if (oauth1AccessToken == null) throw new IllegalArgumentException("need access token");
         mToken = requestToken(Request.to(Endpoints.TOKEN).with(
-                GRANT_TYPE, OAUTH1_TOKEN,
+                GRANT_TYPE, OAUTH1_TOKEN_GRANT_TYPE,
                 CLIENT_ID, mClientId,
                 CLIENT_SECRET, mClientSecret,
-                AuthParams.REFRESH_TOKEN, oauth1AccessToken));
+                REFRESH_TOKEN, oauth1AccessToken));
         return mToken;
     }
 
@@ -241,8 +233,8 @@ public Token extensionGrantType(String grantType, String... scopes) throws IOExc
         final Request req = Request.to(options.length == 0 ? Endpoints.CONNECT : options[0]).with(
                 REDIRECT_URI, mRedirectUri,
                 CLIENT_ID, mClientId,
-                RESPONSE_TYPE, "code");
-        if (options.length == 2) req.add("scope", options[1]);
+                RESPONSE_TYPE, CODE);
+        if (options.length == 2) req.add(SCOPE, options[1]);
         return getURI(req, false, true);
     }
 
@@ -677,7 +669,7 @@ public void setDefaultAcceptEncoding(String encoding) {
                 scope.append(scopes[i]);
                 if (i < scopes.length-1) scope.append(" ");
             }
-            request.add("scope", scope.toString());
+            request.add(SCOPE, scope.toString());
         }
         return request;
     }

src/main/java/com/soundcloud/api/AuthParams.java

@@ -15,25 +15,32 @@
  * @see ApiWrapper
  */
 public interface CloudAPI {
+    // OAuth2 parameters
+    String GRANT_TYPE       = "grant_type";
+    String CLIENT_ID        = "client_id";
+    String CLIENT_SECRET    = "client_secret";
+    String USERNAME         = "username";
+    String REDIRECT_URI     = "redirect_uri";
+    String CODE             = "code";
+    String RESPONSE_TYPE    = "response_type";
+    String SCOPE            = "scope";
+
     // standard oauth2 grant types
     String PASSWORD           = "password";
     String AUTHORIZATION_CODE = "authorization_code";
     String REFRESH_TOKEN      = "refresh_token";
     String CLIENT_CREDENTIALS = "client_credentials";
 
-    // custom soundcloud
-    String OAUTH1_TOKEN       = "oauth1_token";
-
-    // oauth2 extension grant types
-    String FACEBOOK_GRANT_TYPE = "urn:soundcloud:oauth2:grant-type:facebook&access_token=";
+    // custom
+    String OAUTH1_TOKEN_GRANT_TYPE  = "oauth1_token"; // soundcloud
+    String FACEBOOK_GRANT_TYPE      = "urn:soundcloud:oauth2:grant-type:facebook&access_token="; // oauth2 extension
 
     // other constants
     String REALM              = "SoundCloud";
     String OAUTH_SCHEME       = "oauth";
     String VERSION            = "1.2.1";
     String USER_AGENT         = "SoundCloud Java Wrapper ("+VERSION+")";
 
-
     /**
      * Request a token using <a href="http://tools.ietf.org/html/draft-ietf-oauth-v2-10#section-4.1.2">
      * Resource Owner Password Credentials</a>.

src/main/java/com/soundcloud/api/CloudAPI.java

@@ -16,20 +16,20 @@
 public class Token implements Serializable {
     private static final long serialVersionUID = 766168501082045382L;
 
-    public static final String ACCESS_TOKEN  = "access_token";
-    public static final String REFRESH_TOKEN = "refresh_token";
-    public static final String SCOPE         = "scope";
-    public static final String EXPIRES_IN    = "expires_in";
-
     public static final String SCOPE_DEFAULT      = "*";
 
     /** Special scope for signup / password recovery */
     public static final String SCOPE_SIGNUP       = "signup";
-    public static final String SCOPE_PLAYCOUNT    = "playcount";
 
+    public static final String SCOPE_PLAYCOUNT    = "playcount";
     /** Don't expire access token - returned tokens won't include a refresh token */
     public static final String SCOPE_NON_EXPIRING = "non-expiring";
 
+    private static final String ACCESS_TOKEN  = "access_token";
+    private static final String REFRESH_TOKEN = "refresh_token";
+    private static final String SCOPE         = "scope";
+    private static final String EXPIRES_IN    = "expires_in";
+
     // XXX these should be private
     public String access, refresh, scope;
     public long expiresIn;