- changes order of parameters again to avoid offending kotlin

baywet · baywet · commit 3fe685765bf2 · 2021-01-21T13:40:20.000-05:00
diff --git a/samples/deviceCodeSample/src/main/java/deviceCodeFlowMain.java b/samples/deviceCodeSample/src/main/java/deviceCodeFlowMain.java
@@ -31,7 +31,7 @@ public static void deviceCodeFlow() throws AuthenticationException {
                 .challengeConsumer(challenge -> {System.out.println(challenge.getMessage());})
                 .build();
 
-        final TokenCredentialAuthProvider tokenCredAuthProvider = new TokenCredentialAuthProvider(deviceCodeCred, SCOPES);
+        final TokenCredentialAuthProvider tokenCredAuthProvider = new TokenCredentialAuthProvider(SCOPES, deviceCodeCred);
         final OkHttpClient httpClient = HttpClients.createDefault(tokenCredAuthProvider);
 
         final Request request = new Request.Builder().url("https://graph.microsoft.com/v1.0/me/").build();
diff --git a/samples/interactiveBrowserSample/src/main/java/interactiveBrowserMain.java b/samples/interactiveBrowserSample/src/main/java/interactiveBrowserMain.java
@@ -29,7 +29,7 @@ private static void interactiveBrowser() throws AuthenticationException{
                 .port(8765)
                 .build();
 
-        final TokenCredentialAuthProvider tokenCredentialAuthProvider = new TokenCredentialAuthProvider(interactiveBrowserCredential, SCOPES);
+        final TokenCredentialAuthProvider tokenCredentialAuthProvider = new TokenCredentialAuthProvider(SCOPES, interactiveBrowserCredential);
         final OkHttpClient httpClient = HttpClients.createDefault(tokenCredentialAuthProvider);
 
         final Request request = new Request.Builder().url("https://graph.microsoft.com/v1.0/me/").build();
diff --git a/src/main/java/com/microsoft/graph/authentication/TokenCredentialAuthProvider.java b/src/main/java/com/microsoft/graph/authentication/TokenCredentialAuthProvider.java
@@ -40,7 +40,7 @@ public class TokenCredentialAuthProvider implements IAuthenticationProvider<Requ
      * @param tokenCredential Credential object inheriting the TokenCredential interface used to instantiate the Auth Provider
      */
     public TokenCredentialAuthProvider(@Nonnull final TokenCredential tokenCredential) {
-        this(tokenCredential, Arrays.asList(new String[] {DEFAULT_GRAPH_SCOPE}));
+        this(Arrays.asList(new String[] {DEFAULT_GRAPH_SCOPE}), tokenCredential);
     }
 
     /**
@@ -49,8 +49,8 @@ public TokenCredentialAuthProvider(@Nonnull final TokenCredential tokenCredentia
      * @param tokenCredential Credential object inheriting the TokenCredential interface used to instantiate the Auth Provider
      * @param scopes Specified desired scopes of the Auth Provider
      */
-    public TokenCredentialAuthProvider(@Nonnull final TokenCredential tokenCredential, @Nonnull final List<String> scopes) {
-        this(tokenCredential, scopes, Duration.ofMinutes(DEFAULT_TOKEN_TIMEOUT));
+    public TokenCredentialAuthProvider(@Nonnull final List<String> scopes, @Nonnull final TokenCredential tokenCredential) {
+        this(scopes, Duration.ofMinutes(DEFAULT_TOKEN_TIMEOUT), tokenCredential);
     }
 
     /**
@@ -60,7 +60,7 @@ public TokenCredentialAuthProvider(@Nonnull final TokenCredential tokenCredentia
      * @param scopes Specified desired scopes of the Auth Provider
      * @param tokenObtentionTimeout Maximum time to wait for token obtention. Default 10 minutes. Use lower value on application with stable connectivity and no user interactions.
      */
-    public TokenCredentialAuthProvider(@Nonnull final TokenCredential tokenCredential, @Nonnull final List<String> scopes, @Nonnull final Duration tokenObtentionTimeout) {
+    public TokenCredentialAuthProvider(@Nonnull final List<String> scopes, @Nonnull final Duration tokenObtentionTimeout, @Nonnull final TokenCredential tokenCredential) {
         if(tokenCredential == null) {
             throw new IllegalArgumentException("tokenCredential parameter cannot be null.");
         }
