updated tests

googleapis · Sep 14, 2023 · 6be02e8 · 6be02e8
1 parent f1e815b
commit 6be02e8
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 42 deletions.
diff --git a/...e-oauth-client/src/main/java/com/google/api/client/auth/oauth2/AuthorizationCodeFlow.java b/...e-oauth-client/src/main/java/com/google/api/client/auth/oauth2/AuthorizationCodeFlow.java
@@ -166,8 +166,8 @@ public AuthorizationCodeFlow(
             tokenServerUrl,
             clientAuthentication,
             clientId,
-            authorizationServerEncodedUrl,
-            additionalParameters)
+            authorizationServerEncodedUrl)
+          .setAdditionalParameters(additionalParameters)
     );
   }
 
@@ -184,7 +184,7 @@ protected AuthorizationCodeFlow(Builder builder) {
     clientId = Preconditions.checkNotNull(builder.clientId);
     authorizationServerEncodedUrl =
         Preconditions.checkNotNull(builder.authorizationServerEncodedUrl);
-    additionalParameters = Preconditions.checkNotNull(builder.additionalParameters);    
+    additionalParameters = builder.additionalParameters;    
     requestInitializer = builder.requestInitializer;
     credentialStore = builder.credentialStore;
     credentialDataStore = builder.credentialDataStore;
@@ -616,25 +616,6 @@ public Builder(
     setAdditionalParameters(Collections.<String, String>emptyMap());
   }
 
-     public Builder(
-        AccessMethod method,
-        HttpTransport transport,
-        JsonFactory jsonFactory,
-        GenericUrl tokenServerUrl,
-        HttpExecuteInterceptor clientAuthentication,
-        String clientId,
-        String authorizationServerEncodedUrl,
-        Map<String, String> additionalParameters) {
-      setMethod(method);
-      setTransport(transport);
-      setJsonFactory(jsonFactory);
-      setTokenServerUrl(tokenServerUrl);
-      setClientAuthentication(clientAuthentication);
-      setClientId(clientId);
-      setAuthorizationServerEncodedUrl(authorizationServerEncodedUrl);
-      setAdditionalParameters(additionalParameters);
-    }
-
     /** Returns a new instance of an authorization code flow based on this builder. */
     public AuthorizationCodeFlow build() {
       return new AuthorizationCodeFlow(this);

diff --git a/...ient/src/test/java/com/google/api/client/auth/oauth2/AuthorizationCodeRequestUrlTest.java b/...ient/src/test/java/com/google/api/client/auth/oauth2/AuthorizationCodeRequestUrlTest.java
@@ -44,24 +44,4 @@ public void testBuild() {
     assertEquals(EXPECTED, url.build());
   }
 
-  /*
-  public void testAdditionalParams() {
-
-    Map<String, String> testMap = new HashMap<>();
-    String expectedUrl =
-    "https://server.example.com/authorize?client_id=s6BhdRkqt3&"
-    + "redirect_uri=https://client.example.com/rd&response_type=code"
-    + "&scope=a%20b%20c&state=xyz&param1=value1";
-
-    testMap.put("param1", "value1");
-    AuthorizationRequestUrl url =
-        new AuthorizationCodeRequestUrl("https://server.example.com/authorize", "s6BhdRkqt3")
-            .setState("xyz")
-            .setRedirectUri("https://client.example.com/rd")
-            .setScopes(Arrays.asList("a", "b", "c"));
-
-    assertEquals(expectedUrl, url.build());
-  }
-  */
-
 }