Remove final modifier from DbxClientV2 and DbxTeamClientV2 for easier mocking.

Karl Rieb · Karl Rieb · commit 40fd4cb02a3a · 2016-07-01T13:09:50.000-07:00
diff --git a/ChangeLog.txt b/ChangeLog.txt
@@ -2,6 +2,7 @@
 ---------------------------------------------
 - Add configureRequest(..) method for simpler subclassing of OkHttpRequestor and OkHttp3Requestor.
 - Fix BadRequest error when adding custom state to a DbxWebAuth.Request object.
+- Remove final modifier from DbxClientV2 and DbxTeamClientV2 class declarations for easier mocking in tests.
 
 2.0.6 (2016-06-20)
 ---------------------------------------------
diff --git a/src/main/java/com/dropbox/core/v2/DbxClientV2.java b/src/main/java/com/dropbox/core/v2/DbxClientV2.java
@@ -16,7 +16,7 @@
  * <p> This class has no mutable state, so it's thread safe as long as you pass
  * in a thread safe {@link HttpRequestor} implementation. </p>
  */
-public final class DbxClientV2 extends DbxClientV2Base {
+public class DbxClientV2 extends DbxClientV2Base {
 
     /**
      * Creates a client that uses the given OAuth 2 access token as
diff --git a/src/main/java/com/dropbox/core/v2/DbxTeamClientV2.java b/src/main/java/com/dropbox/core/v2/DbxTeamClientV2.java
@@ -21,7 +21,7 @@
  * <p> This class has no mutable state, so it's thread safe as long as you pass
  * in a thread safe {@link HttpRequestor} implementation. </p>
  */
-public final class DbxTeamClientV2 extends DbxTeamClientV2Base {
+public class DbxTeamClientV2 extends DbxTeamClientV2Base {
     private final String accessToken;
 
     /**
diff --git a/src/test/java/com/dropbox/core/DbxWebAuthTest.java b/src/test/java/com/dropbox/core/DbxWebAuthTest.java
@@ -158,7 +158,6 @@ public void testFinishWithState() throws Exception {
              "\"token_type\":\"Bearer\"" +
              ",\"access_token\":\"" + expected.getAccessToken() + "\"" +
              ",\"uid\":\"" + expected.getUserId() + "\"" +
-             ",\"state\":\"" + expected.getUrlState() + "\"" +
              "}"
             ).getBytes("UTF-8")
         );
@@ -186,9 +185,9 @@ public void testFinishWithState() throws Exception {
                    "state", extractQueryParam(authorizationUrl, "state"))
         );
 
-        // verify the CRSF nonce was properly stripped from the finish request
+        // verify the state param isn't send to the 'oauth2/token' endpoint
         String finishParams = new String(body.toByteArray(), "UTF-8");
-        assertEquals(extractQueryParam(finishParams, "state"), state);
+        assertNull(toParamsMap(finishParams).get("state"));
 
         assertNotNull(actual);
         assertEquals(actual.getAccessToken(), expected.getAccessToken());
