Add changelog + fmt

Author: renaudhartert-db

NEXT_CHANGELOG.md

@@ -4,6 +4,8 @@
 
 ### New Features and Improvements
 
+* Add option to add a timeout for browser confirmation in the U2M authentication flow.
+
 ### Bug Fixes
 
 * User provided scopes are now properly propagated in OAuth flows.

databricks-sdk-java/src/main/java/com/databricks/sdk/core/ConfigAttributeAccessor.java

@@ -45,7 +45,7 @@ public void setValueOnConfig(DatabricksConfig cfg, String value) throws IllegalA
       if (value == null || value.trim().isEmpty()) {
         return;
       }
-      
+
       if (field.getType() == String.class) {
         field.set(cfg, value);
       } else if (field.getType() == int.class) {

databricks-sdk-java/src/main/java/com/databricks/sdk/core/DatabricksConfig.java

@@ -165,8 +165,8 @@ public class DatabricksConfig {
   private Boolean disableAsyncTokenRefresh;
 
   /**
-   * The duration to wait for a browser response during U2M authentication before timing out. 
-   * If set to 0 or null, the connector waits for an indefinite amount of time.
+   * The duration to wait for a browser response during U2M authentication before timing out. If set
+   * to 0 or null, the connector waits for an indefinite amount of time.
    */
   @ConfigAttribute(env = "DATABRICKS_OAUTH_BROWSER_AUTH_TIMEOUT")
   private Duration oauthBrowserAuthTimeout;

databricks-sdk-java/src/main/java/com/databricks/sdk/core/oauth/Consent.java

@@ -14,13 +14,12 @@
 import java.io.Serializable;
 import java.net.*;
 import java.nio.charset.StandardCharsets;
+import java.time.Duration;
 import java.util.Arrays;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Objects;
 import java.util.Optional;
-import java.time.Duration;
-
 import org.apache.commons.io.IOUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -402,7 +401,8 @@ public Map<String, String> getParams() {
               Duration t = timeout.get();
               lock.wait(t.toMillis());
               if (params == null) {
-                throw new DatabricksException("OAuth browser authentication timed out after " + t.getSeconds() + " seconds");
+                throw new DatabricksException(
+                    "OAuth browser authentication timed out after " + t.getSeconds() + " seconds");
               }
             } else {
               lock.wait();

databricks-sdk-java/src/main/java/com/databricks/sdk/core/oauth/ExternalBrowserCredentialsProvider.java

@@ -9,7 +9,6 @@
 import java.util.HashSet;
 import java.util.Objects;
 import java.util.Optional;
-import java.time.Duration;
 import java.util.Set;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

databricks-sdk-java/src/main/java/com/databricks/sdk/core/oauth/OAuthClient.java

@@ -10,13 +10,12 @@
 import java.security.NoSuchAlgorithmException;
 import java.security.SecureRandom;
 import java.time.Duration;
-import java.util.Arrays;
+import java.util.Base64;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
 import java.util.Optional;
-import java.util.Base64;
-import java.util.HashMap;
 import java.util.stream.Collectors;
 
 /**

databricks-sdk-java/src/test/java/com/databricks/sdk/core/DatabricksConfigTest.java

@@ -255,18 +255,18 @@ public void testGetTokenSourceWithOAuth() {
   @Test
   public void testOAuthBrowserAuthTimeout() {
     DatabricksConfig config = new DatabricksConfig();
-    
+
     // Test default value (should be null)
     assertNull(config.getOAuthBrowserAuthTimeout());
-    
+
     // Test setting the timeout using Duration
     config.setOAuthBrowserAuthTimeout(Duration.ofSeconds(30));
     assertEquals(Duration.ofSeconds(30), config.getOAuthBrowserAuthTimeout());
-    
+
     // Test setting the timeout using int (backward compatibility)
     config.setOAuthBrowserAuthTimeout(60);
     assertEquals(Duration.ofSeconds(60), config.getOAuthBrowserAuthTimeout());
-    
+
     // Test setting to 0 (should be null for indefinite wait)
     config.setOAuthBrowserAuthTimeout(0);
     assertNull(config.getOAuthBrowserAuthTimeout());
@@ -276,17 +276,17 @@ public void testOAuthBrowserAuthTimeout() {
   public void testEnvironmentVariableLoading() {
     // Test that environment variables are now loaded properly for Duration and Integer
     DatabricksConfig config = new DatabricksConfig();
-    
+
     // Set environment variable
     Map<String, String> env = new HashMap<>();
     env.put("DATABRICKS_OAUTH_BROWSER_AUTH_TIMEOUT", "30");
     env.put("DATABRICKS_DEBUG_TRUNCATE_BYTES", "100");
     env.put("DATABRICKS_RATE_LIMIT", "50");
-    
+
     // Resolve config with environment
     Environment environment = new Environment(env, new ArrayList<>(), "Linux");
     config.resolve(environment);
-    
+
     // These should now be loaded properly
     assertEquals(Duration.ofSeconds(30), config.getOAuthBrowserAuthTimeout());
     assertEquals(Integer.valueOf(100), config.getDebugTruncateBytes());
@@ -297,15 +297,15 @@ public void testEnvironmentVariableLoading() {
   public void testEnvironmentVariableLoadingZeroTimeout() {
     // Test that environment variable with value 0 results in null Duration
     DatabricksConfig config = new DatabricksConfig();
-    
+
     // Set environment variable to 0
     Map<String, String> env = new HashMap<>();
     env.put("DATABRICKS_OAUTH_BROWSER_AUTH_TIMEOUT", "0");
-    
+
     // Resolve config with environment
     Environment environment = new Environment(env, new ArrayList<>(), "Linux");
     config.resolve(environment);
-    
+
     // Should be null for indefinite wait
     assertNull(config.getOAuthBrowserAuthTimeout());
   }

databricks-sdk-java/src/test/java/com/databricks/sdk/core/oauth/ConsentTest.java

@@ -10,34 +10,36 @@ public class ConsentTest {
 
   @Test
   public void testConsentWithBrowserAuthTimeout() {
-    Consent consent = new Consent.Builder()
-        .withClientId("test-client-id")
-        .withClientSecret("test-client-secret")
-        .withAuthUrl("https://test.com/auth")
-        .withTokenUrl("https://test.com/token")
-        .withRedirectUrl("http://localhost:8080/callback")
-        .withState("test-state")
-        .withVerifier("test-verifier")
-        .withBrowserTimeout(Duration.ofSeconds(30))
-        .build();
+    Consent consent =
+        new Consent.Builder()
+            .withClientId("test-client-id")
+            .withClientSecret("test-client-secret")
+            .withAuthUrl("https://test.com/auth")
+            .withTokenUrl("https://test.com/token")
+            .withRedirectUrl("http://localhost:8080/callback")
+            .withState("test-state")
+            .withVerifier("test-verifier")
+            .withBrowserTimeout(Duration.ofSeconds(30))
+            .build();
 
     // Verify that the timeout is properly set
     assertEquals(Optional.of(Duration.ofSeconds(30)), consent.getBrowserTimeout());
   }
 
   @Test
   public void testConsentWithoutBrowserAuthTimeout() {
-    Consent consent = new Consent.Builder()
-        .withClientId("test-client-id")
-        .withClientSecret("test-client-secret")
-        .withAuthUrl("https://test.com/auth")
-        .withTokenUrl("https://test.com/token")
-        .withRedirectUrl("http://localhost:8080/callback")
-        .withState("test-state")
-        .withVerifier("test-verifier")
-        .build();
+    Consent consent =
+        new Consent.Builder()
+            .withClientId("test-client-id")
+            .withClientSecret("test-client-secret")
+            .withAuthUrl("https://test.com/auth")
+            .withTokenUrl("https://test.com/token")
+            .withRedirectUrl("http://localhost:8080/callback")
+            .withState("test-state")
+            .withVerifier("test-verifier")
+            .build();
 
     // Verify that the timeout is empty when not set
     assertEquals(Optional.empty(), consent.getBrowserTimeout());
   }
-} 
+}