fix

Author: iamthomaspowell

NEXT_CHANGELOG.md

@@ -10,5 +10,6 @@
 ### Documentation
 
 ### Internal Changes
+* Capture DatabricksError when retrying API calls ([#427](https://github.com/databricks/databricks-sdk-java/pull/427)).
 
 ### API Changes

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

@@ -15,15 +15,14 @@
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.JavaType;
 import com.fasterxml.jackson.databind.ObjectMapper;
+import com.google.common.base.Strings;
 import java.io.IOException;
 import java.io.InputStream;
 import java.lang.reflect.Field;
 import java.time.ZonedDateTime;
 import java.time.format.DateTimeFormatter;
 import java.util.*;
 import java.util.function.Function;
-
-import com.google.common.base.Strings;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -254,7 +253,8 @@ private Response executeInner(Request in, String path) {
 
       // Retry after a backoff.
       long sleepMillis = getBackoffMillis(out, attemptNumber);
-      LOG.debug(String.format("Retry %s in %dms", in.getRequestLine(), sleepMillis), databricksError);
+      LOG.debug(
+          String.format("Retry %s in %dms", in.getRequestLine(), sleepMillis), databricksError);
       try {
         timer.sleep(sleepMillis);
       } catch (InterruptedException ex) {

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

@@ -374,13 +374,17 @@ public DatabricksConfig setAzureUseMsi(boolean azureUseMsi) {
     return this;
   }
 
-  /** @deprecated Use {@link #getAzureUseMsi()} instead. */
+  /**
+   * @deprecated Use {@link #getAzureUseMsi()} instead.
+   */
   @Deprecated()
   public boolean getAzureUseMSI() {
     return azureUseMsi;
   }
 
-  /** @deprecated Use {@link #setAzureUseMsi(boolean)} instead. */
+  /**
+   * @deprecated Use {@link #setAzureUseMsi(boolean)} instead.
+   */
   @Deprecated
   public DatabricksConfig setAzureUseMSI(boolean azureUseMsi) {
     this.azureUseMsi = azureUseMsi;

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

@@ -11,14 +11,13 @@
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
+import com.google.errorprone.annotations.CanIgnoreReturnValue;
 import java.io.IOException;
 import java.net.MalformedURLException;
 import java.net.URL;
 import java.net.UnknownHostException;
 import java.time.*;
 import java.util.*;
-
-import com.google.errorprone.annotations.CanIgnoreReturnValue;
 import org.apache.http.impl.EnglishReasonPhraseCatalog;
 import org.junit.jupiter.api.Test;
 
@@ -220,16 +219,17 @@ void retry429() throws IOException {
   @Test
   void failAfterTooManyRetries() throws IOException {
     Request req = getBasicRequest();
-    DatabricksException exception = runFailingApiClientTest(
-        req,
-        Arrays.asList(
-            getTooManyRequestsResponseWithRetryAfterDateHeader(req),
-            getTooManyRequestsResponse(req),
-            getTooManyRequestsResponse(req),
-            getTooManyRequestsResponse(req),
-            getSuccessResponse(req)),
-        MyEndpointResponse.class,
-        "Request GET /api/my/endpoint failed after 4 retries");
+    DatabricksException exception =
+        runFailingApiClientTest(
+            req,
+            Arrays.asList(
+                getTooManyRequestsResponseWithRetryAfterDateHeader(req),
+                getTooManyRequestsResponse(req),
+                getTooManyRequestsResponse(req),
+                getTooManyRequestsResponse(req),
+                getSuccessResponse(req)),
+            MyEndpointResponse.class,
+            "Request GET /api/my/endpoint failed after 4 retries");
     assertInstanceOf(DatabricksError.class, exception.getCause());
     DatabricksError cause = (DatabricksError) exception.getCause();
     assertEquals(cause.getErrorCode(), "TOO_MANY_REQUESTS");