Fix for comments

Author: emmyzhou-db

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

@@ -36,20 +36,20 @@ private enum TokenState {
   // Default duration before expiry to consider a token as 'stale'.
   private static final Duration DEFAULT_STALE_DURATION = Duration.ofMinutes(3);
 
-  /** The current OAuth token. May be null if not yet fetched. */
+  // The current OAuth token. May be null if not yet fetched.
   protected Token token;
-  /** Whether asynchronous refresh is enabled. */
+  // Whether asynchronous refresh is enabled.
   private boolean asyncEnabled = false;
-  /** Duration before expiry to consider a token as 'stale'. */
+  // Duration before expiry to consider a token as 'stale'.
   private Duration staleDuration = DEFAULT_STALE_DURATION;
-  /** Additional buffer before expiry to consider a token as expired. */
-  private Duration expiryBuffer = Duration.ZERO;
-  /** Whether a refresh is currently in progress (for async refresh). */
+  // Additional buffer before expiry to consider a token as expired.
+  private Duration expiryBuffer = Duration.ofSeconds(40);
+  // Whether a refresh is currently in progress (for async refresh).
   private boolean refreshInProgress = false;
-  /** Whether the last refresh attempt succeeded. */
+  // Whether the last refresh attempt succeeded.
   private boolean lastRefreshSucceeded = true;
 
-  /** Default constructor. */
+  /** Constructs a new {@code RefreshableTokenSource} with no initial token. */
   public RefreshableTokenSource() {}
 
   /**
@@ -103,7 +103,7 @@ public RefreshableTokenSource withExpiryBuffer(Duration buffer) {
    *
    * @return The current valid token
    */
-  public synchronized Token getToken() {
+  public Token getToken() {
     if (!asyncEnabled) {
       return getTokenBlocking();
     }
@@ -143,15 +143,10 @@ protected synchronized Token getTokenBlocking() {
     if (state != TokenState.EXPIRED) {
       return token;
     }
-    try {
-      Token newToken = refresh();
-      token = newToken;
-      lastRefreshSucceeded = true;
-      return newToken;
-    } catch (Exception e) {
-      lastRefreshSucceeded = false;
-      throw e;
-    }
+    lastRefreshSucceeded = false;
+    token = refresh(); // May throw an exception
+    lastRefreshSucceeded = true;
+    return token;
   }
 
   /**
@@ -170,16 +165,15 @@ protected Token getTokenAsync() {
       state = getTokenState();
       currentToken = token;
     }
-    if (state == TokenState.FRESH) {
-      return currentToken;
-    }
-    if (state == TokenState.STALE) {
-      // Trigger background refresh, return current token
-      triggerAsyncRefresh();
-      return token;
-    } else {
-      // Token is expired, block to refresh
-      return getTokenBlocking();
+    switch (state) {
+      case FRESH:
+        return currentToken;
+      case STALE:
+        triggerAsyncRefresh();
+        return currentToken;
+      case EXPIRED:
+      default:
+        return getTokenBlocking();
     }
   }
 

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

@@ -6,7 +6,6 @@
 import com.fasterxml.jackson.annotation.JsonProperty;
 import java.time.Duration;
 import java.time.LocalDateTime;
-import java.time.temporal.ChronoUnit;
 import java.util.Objects;
 
 public class Token {
@@ -66,33 +65,6 @@ public Token(
     this.clockSupplier = clockSupplier;
   }
 
-  /**
-   * Checks if the token is expired. Tokens are considered expired 40 seconds before their actual
-   * expiry time to account for Azure Databricks rejecting tokens that expire in 30 seconds or less.
-   *
-   * @return true if the token is expired or about to expire, false otherwise
-   */
-  public boolean isExpired() {
-    if (expiry == null) {
-      return false;
-    }
-    // Azure Databricks rejects tokens that expire in 30 seconds or less,
-    // so we refresh the token 40 seconds before it expires.
-    LocalDateTime potentiallyExpired = expiry.minus(40, ChronoUnit.SECONDS);
-    LocalDateTime now = LocalDateTime.now(clockSupplier.getClock());
-    return potentiallyExpired.isBefore(now);
-  }
-
-  /**
-   * Checks if the token is valid. A token is valid if it has a non-null access token and is not
-   * expired.
-   *
-   * @return true if the token is valid, false otherwise
-   */
-  public boolean isValid() {
-    return accessToken != null && !isExpired();
-  }
-
   /**
    * Returns the type of the token (e.g., "Bearer").
    *

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

@@ -196,7 +196,6 @@ void testDataPlaneTokenSource(
       assertEquals(expectedToken.getAccessToken(), token.getAccessToken());
       assertEquals(expectedToken.getTokenType(), token.getTokenType());
       assertEquals(expectedToken.getRefreshToken(), token.getRefreshToken());
-      assertTrue(token.isValid());
     }
   }
 

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

@@ -330,7 +330,6 @@ void testTokenSource(TestCase testCase) {
       assertEquals(TOKEN, token.getAccessToken());
       assertEquals(TOKEN_TYPE, token.getTokenType());
       assertEquals(REFRESH_TOKEN, token.getRefreshToken());
-      assertFalse(token.isExpired());
 
       // Verify correct audience was used
       verify(testCase.idTokenSource, atLeastOnce()).getIDToken(testCase.expectedAudience);

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

@@ -54,24 +54,6 @@ void testSaveAndLoadToken() {
     assertEquals("access-token", loadedToken.getAccessToken());
     assertEquals("Bearer", loadedToken.getTokenType());
     assertEquals("refresh-token", loadedToken.getRefreshToken());
-    assertFalse(loadedToken.isExpired(), "Token should not be expired");
-  }
-
-  @Test
-  void testTokenExpiry() {
-    // Create an expired token
-    LocalDateTime pastTime = LocalDateTime.now().minusHours(1);
-    Token expiredToken = new Token("access-token", "Bearer", "refresh-token", pastTime);
-
-    // Verify it's marked as expired
-    assertTrue(expiredToken.isExpired(), "Token should be expired");
-
-    // Create a valid token
-    LocalDateTime futureTime = LocalDateTime.now().plusMinutes(30);
-    Token validToken = new Token("access-token", "Bearer", "refresh-token", futureTime);
-
-    // Verify it's not marked as expired
-    assertFalse(validToken.isExpired(), "Token should not be expired");
   }
 
   @Test

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

@@ -30,7 +30,6 @@ void createNonRefreshableToken() {
     assertEquals(accessToken, token.getAccessToken());
     assertEquals(tokenType, token.getTokenType());
     assertNull(token.getRefreshToken());
-    assertTrue(token.isValid());
   }
 
   @Test
@@ -45,31 +44,6 @@ void createRefreshableToken() {
     assertEquals(accessToken, token.getAccessToken());
     assertEquals(tokenType, token.getTokenType());
     assertEquals(refreshToken, token.getRefreshToken());
-    assertTrue(token.isValid());
-  }
-
-  @Test
-  void tokenExpiryMoreThan40Seconds() {
-    Token token =
-        new Token(accessToken, tokenType, currentLocalDateTime.plusSeconds(50), fakeClockSupplier);
-    assertFalse(token.isExpired());
-    assertTrue(token.isValid());
-  }
-
-  @Test
-  void tokenExpiryLessThan40Seconds() {
-    Token token =
-        new Token(accessToken, tokenType, currentLocalDateTime.plusSeconds(30), fakeClockSupplier);
-    assertTrue(token.isExpired());
-    assertFalse(token.isValid());
-  }
-
-  @Test
-  void expiredToken() {
-    Token token =
-        new Token(accessToken, tokenType, currentLocalDateTime.minusSeconds(10), fakeClockSupplier);
-    assertTrue(token.isExpired());
-    assertFalse(token.isValid());
   }
 
   @Test