Merge branch 'main' into emmyzhou-db/async_token_cache_wrapper

Author: emmyzhou-db

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

@@ -70,7 +70,7 @@ public String getAccessToken() {
   }
 
   /**
-   * Returns the expiry time of the token as a LocalDateTime.
+   * Returns the expiry time of the token as a Instant.
    *
    * @return the expiry time
    */

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

@@ -194,6 +194,7 @@ void testDataPlaneTokenSource(
       assertEquals(expectedToken.getAccessToken(), token.getAccessToken());
       assertEquals(expectedToken.getTokenType(), token.getTokenType());
       assertEquals(expectedToken.getRefreshToken(), token.getRefreshToken());
+      assertTrue(expectedToken.getExpiry().isAfter(Instant.now()));
     }
   }
 

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

@@ -54,6 +54,7 @@ void testSaveAndLoadToken() {
     assertEquals("access-token", loadedToken.getAccessToken());
     assertEquals("Bearer", loadedToken.getTokenType());
     assertEquals("refresh-token", loadedToken.getRefreshToken());
+    assertEquals(expiry, loadedToken.getExpiry());
   }
 
   @Test

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

@@ -18,6 +18,7 @@ void createNonRefreshableToken() {
     assertEquals(accessToken, token.getAccessToken());
     assertEquals(tokenType, token.getTokenType());
     assertNull(token.getRefreshToken());
+    assertEquals(currentInstant.plusSeconds(300), token.getExpiry());
   }
 
   @Test
@@ -26,5 +27,6 @@ void createRefreshableToken() {
     assertEquals(accessToken, token.getAccessToken());
     assertEquals(tokenType, token.getTokenType());
     assertEquals(refreshToken, token.getRefreshToken());
+    assertEquals(currentInstant.plusSeconds(300), token.getExpiry());
   }
 }

databricks-sdk-java/src/test/java/com/databricks/sdk/core/utils/FakeClockSupplier.java

@@ -0,0 +1,23 @@
+package com.databricks.sdk.core.utils;
+
+import java.time.Clock;
+import java.time.Duration;
+import java.time.Instant;
+import java.time.ZoneId;
+
+public class TestClockSupplier implements ClockSupplier {
+  private Clock clock;
+
+  public TestClockSupplier(Instant fixedInstant) {
+    clock = Clock.fixed(fixedInstant, ZoneId.of("UTC"));
+  }
+
+  public void advanceTime(Duration duration) {
+    clock = Clock.offset(clock, duration);
+  }
+
+  @Override
+  public Clock getClock() {
+    return clock;
+  }
+}