diff --git a/NEXT_CHANGELOG.md b/NEXT_CHANGELOG.md index d91b9fb32..b25d748cf 100644 --- a/NEXT_CHANGELOG.md +++ b/NEXT_CHANGELOG.md @@ -17,5 +17,6 @@ ### Internal Changes * Added parametrized unit tests covering PAT, Basic, OAuth M2M, GitHub OIDC, Env OIDC, File OIDC, Azure Client Secret, and Azure GitHub OIDC against six host profiles (LW, NW, LA, NA, SPOGW, SPOGA) across AWS, Azure, and GCP (138 subtests total). Mirrors databricks-sdk-go PR #1627 and databricks-sdk-py PR #1357. +* Migrated internal SDK classes to the logging abstraction. The SDK now supports SLF4J, `java.util.logging`, or a custom backend via `LoggerFactory.setDefault()`. ### API Changes diff --git a/databricks-sdk-java/src/main/java/com/databricks/sdk/core/ApiClient.java b/databricks-sdk-java/src/main/java/com/databricks/sdk/core/ApiClient.java index 6507d1eb6..3cbd0d61a 100644 --- a/databricks-sdk-java/src/main/java/com/databricks/sdk/core/ApiClient.java +++ b/databricks-sdk-java/src/main/java/com/databricks/sdk/core/ApiClient.java @@ -6,6 +6,8 @@ import com.databricks.sdk.core.http.Request; import com.databricks.sdk.core.http.RequestOptions; import com.databricks.sdk.core.http.Response; +import com.databricks.sdk.core.logging.Logger; +import com.databricks.sdk.core.logging.LoggerFactory; import com.databricks.sdk.core.retry.NoRetryStrategyPicker; import com.databricks.sdk.core.retry.RequestBasedRetryStrategyPicker; import com.databricks.sdk.core.retry.RetryStrategy; @@ -25,8 +27,6 @@ import java.time.format.DateTimeFormatter; import java.util.*; import java.util.function.Function; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; /** * Simplified REST API client with retries, JSON POJO SerDe through Jackson and exception POJO @@ -253,9 +253,8 @@ private Response executeInner(Request in, String path, RequestOptions options) { try { response = httpClient.execute(in); - if (LOG.isDebugEnabled()) { - LOG.debug(makeLogRecord(in, response)); - } + Response resp = response; + LOG.debug(() -> makeLogRecord(in, resp)); if (isResponseSuccessful(response)) { return response; // stop here if the request succeeded diff --git a/databricks-sdk-java/src/main/java/com/databricks/sdk/core/AzureCliCredentialsProvider.java b/databricks-sdk-java/src/main/java/com/databricks/sdk/core/AzureCliCredentialsProvider.java index 7e67ca72e..1c97a7ac9 100644 --- a/databricks-sdk-java/src/main/java/com/databricks/sdk/core/AzureCliCredentialsProvider.java +++ b/databricks-sdk-java/src/main/java/com/databricks/sdk/core/AzureCliCredentialsProvider.java @@ -1,5 +1,7 @@ package com.databricks.sdk.core; +import com.databricks.sdk.core.logging.Logger; +import com.databricks.sdk.core.logging.LoggerFactory; import com.databricks.sdk.core.oauth.CachedTokenSource; import com.databricks.sdk.core.oauth.OAuthHeaderFactory; import com.databricks.sdk.core.oauth.Token; @@ -7,8 +9,6 @@ import com.databricks.sdk.support.InternalApi; import com.fasterxml.jackson.databind.ObjectMapper; import java.util.*; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; @InternalApi public class AzureCliCredentialsProvider implements CredentialsProvider { diff --git a/databricks-sdk-java/src/main/java/com/databricks/sdk/core/CliTokenSource.java b/databricks-sdk-java/src/main/java/com/databricks/sdk/core/CliTokenSource.java index 58aaf7655..7855b73c7 100644 --- a/databricks-sdk-java/src/main/java/com/databricks/sdk/core/CliTokenSource.java +++ b/databricks-sdk-java/src/main/java/com/databricks/sdk/core/CliTokenSource.java @@ -1,5 +1,7 @@ package com.databricks.sdk.core; +import com.databricks.sdk.core.logging.Logger; +import com.databricks.sdk.core.logging.LoggerFactory; import com.databricks.sdk.core.oauth.Token; import com.databricks.sdk.core.oauth.TokenSource; import com.databricks.sdk.core.utils.Environment; @@ -18,8 +20,6 @@ import java.util.Arrays; import java.util.List; import org.apache.commons.io.IOUtils; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; @InternalApi public class CliTokenSource implements TokenSource { diff --git a/databricks-sdk-java/src/main/java/com/databricks/sdk/core/ConfigLoader.java b/databricks-sdk-java/src/main/java/com/databricks/sdk/core/ConfigLoader.java index 1f47f8155..f69f30658 100644 --- a/databricks-sdk-java/src/main/java/com/databricks/sdk/core/ConfigLoader.java +++ b/databricks-sdk-java/src/main/java/com/databricks/sdk/core/ConfigLoader.java @@ -1,5 +1,7 @@ package com.databricks.sdk.core; +import com.databricks.sdk.core.logging.Logger; +import com.databricks.sdk.core.logging.LoggerFactory; import com.databricks.sdk.core.utils.Environment; import com.databricks.sdk.support.InternalApi; import java.io.FileNotFoundException; @@ -13,8 +15,6 @@ import org.apache.commons.configuration2.INIConfiguration; import org.apache.commons.configuration2.SubnodeConfiguration; import org.apache.commons.configuration2.ex.ConfigurationException; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; @InternalApi public class ConfigLoader { diff --git a/databricks-sdk-java/src/main/java/com/databricks/sdk/core/DatabricksCliCredentialsProvider.java b/databricks-sdk-java/src/main/java/com/databricks/sdk/core/DatabricksCliCredentialsProvider.java index c7ee7b9f5..ae401280d 100644 --- a/databricks-sdk-java/src/main/java/com/databricks/sdk/core/DatabricksCliCredentialsProvider.java +++ b/databricks-sdk-java/src/main/java/com/databricks/sdk/core/DatabricksCliCredentialsProvider.java @@ -1,5 +1,7 @@ package com.databricks.sdk.core; +import com.databricks.sdk.core.logging.Logger; +import com.databricks.sdk.core.logging.LoggerFactory; import com.databricks.sdk.core.oauth.CachedTokenSource; import com.databricks.sdk.core.oauth.OAuthHeaderFactory; import com.databricks.sdk.core.oauth.Token; @@ -10,8 +12,6 @@ import com.fasterxml.jackson.databind.ObjectMapper; import java.nio.charset.StandardCharsets; import java.util.*; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; @InternalApi public class DatabricksCliCredentialsProvider implements CredentialsProvider { diff --git a/databricks-sdk-java/src/main/java/com/databricks/sdk/core/DatabricksConfig.java b/databricks-sdk-java/src/main/java/com/databricks/sdk/core/DatabricksConfig.java index cad8b747f..1924588a6 100644 --- a/databricks-sdk-java/src/main/java/com/databricks/sdk/core/DatabricksConfig.java +++ b/databricks-sdk-java/src/main/java/com/databricks/sdk/core/DatabricksConfig.java @@ -4,6 +4,8 @@ import com.databricks.sdk.core.http.HttpClient; import com.databricks.sdk.core.http.Request; import com.databricks.sdk.core.http.Response; +import com.databricks.sdk.core.logging.Logger; +import com.databricks.sdk.core.logging.LoggerFactory; import com.databricks.sdk.core.oauth.ErrorTokenSource; import com.databricks.sdk.core.oauth.HostMetadata; import com.databricks.sdk.core.oauth.OAuthHeaderFactory; @@ -19,8 +21,6 @@ import java.time.Duration; import java.util.*; import org.apache.http.HttpMessage; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; public class DatabricksConfig { private static final Logger LOG = LoggerFactory.getLogger(DatabricksConfig.class); diff --git a/databricks-sdk-java/src/main/java/com/databricks/sdk/core/DefaultCredentialsProvider.java b/databricks-sdk-java/src/main/java/com/databricks/sdk/core/DefaultCredentialsProvider.java index 4d4805b8a..3b1a98026 100644 --- a/databricks-sdk-java/src/main/java/com/databricks/sdk/core/DefaultCredentialsProvider.java +++ b/databricks-sdk-java/src/main/java/com/databricks/sdk/core/DefaultCredentialsProvider.java @@ -1,12 +1,12 @@ package com.databricks.sdk.core; +import com.databricks.sdk.core.logging.Logger; +import com.databricks.sdk.core.logging.LoggerFactory; import com.databricks.sdk.core.oauth.*; import com.databricks.sdk.support.InternalApi; import com.google.common.base.Strings; import java.util.ArrayList; import java.util.List; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; /** * The DefaultCredentialsProvider is the primary authentication handler for the Databricks SDK. It diff --git a/databricks-sdk-java/src/main/java/com/databricks/sdk/core/GoogleCredentialsCredentialsProvider.java b/databricks-sdk-java/src/main/java/com/databricks/sdk/core/GoogleCredentialsCredentialsProvider.java index 624371b29..1852355f2 100644 --- a/databricks-sdk-java/src/main/java/com/databricks/sdk/core/GoogleCredentialsCredentialsProvider.java +++ b/databricks-sdk-java/src/main/java/com/databricks/sdk/core/GoogleCredentialsCredentialsProvider.java @@ -3,6 +3,8 @@ import static com.databricks.sdk.core.utils.GoogleUtils.GCP_SCOPES; import static com.databricks.sdk.core.utils.GoogleUtils.SA_ACCESS_TOKEN_HEADER; +import com.databricks.sdk.core.logging.Logger; +import com.databricks.sdk.core.logging.LoggerFactory; import com.databricks.sdk.support.InternalApi; import com.google.auth.oauth2.*; import com.google.auth.oauth2.IdTokenProvider.Option; @@ -12,8 +14,6 @@ import java.nio.file.Files; import java.nio.file.Paths; import java.util.*; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; @InternalApi public class GoogleCredentialsCredentialsProvider implements CredentialsProvider { diff --git a/databricks-sdk-java/src/main/java/com/databricks/sdk/core/GoogleIdCredentialsProvider.java b/databricks-sdk-java/src/main/java/com/databricks/sdk/core/GoogleIdCredentialsProvider.java index 57765541c..675f95b69 100644 --- a/databricks-sdk-java/src/main/java/com/databricks/sdk/core/GoogleIdCredentialsProvider.java +++ b/databricks-sdk-java/src/main/java/com/databricks/sdk/core/GoogleIdCredentialsProvider.java @@ -3,6 +3,8 @@ import static com.databricks.sdk.core.utils.GoogleUtils.GCP_SCOPES; import static com.databricks.sdk.core.utils.GoogleUtils.SA_ACCESS_TOKEN_HEADER; +import com.databricks.sdk.core.logging.Logger; +import com.databricks.sdk.core.logging.LoggerFactory; import com.databricks.sdk.support.InternalApi; import com.google.auth.oauth2.GoogleCredentials; import com.google.auth.oauth2.IdTokenCredentials; @@ -10,8 +12,6 @@ import com.google.auth.oauth2.ImpersonatedCredentials; import java.io.IOException; import java.util.*; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; @InternalApi public class GoogleIdCredentialsProvider implements CredentialsProvider { diff --git a/databricks-sdk-java/src/main/java/com/databricks/sdk/core/NotebookNativeCredentialsProvider.java b/databricks-sdk-java/src/main/java/com/databricks/sdk/core/NotebookNativeCredentialsProvider.java index ef6571e61..ec3259ae3 100644 --- a/databricks-sdk-java/src/main/java/com/databricks/sdk/core/NotebookNativeCredentialsProvider.java +++ b/databricks-sdk-java/src/main/java/com/databricks/sdk/core/NotebookNativeCredentialsProvider.java @@ -1,11 +1,11 @@ package com.databricks.sdk.core; +import com.databricks.sdk.core.logging.Logger; +import com.databricks.sdk.core.logging.LoggerFactory; import com.databricks.sdk.support.InternalApi; import java.lang.reflect.Field; import java.lang.reflect.InvocationTargetException; import java.util.*; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; /** * A CredentialsProvider that uses the API token from the command context to authenticate. diff --git a/databricks-sdk-java/src/main/java/com/databricks/sdk/core/commons/CommonsHttpClient.java b/databricks-sdk-java/src/main/java/com/databricks/sdk/core/commons/CommonsHttpClient.java index b1e9ca61a..6183ff5a6 100644 --- a/databricks-sdk-java/src/main/java/com/databricks/sdk/core/commons/CommonsHttpClient.java +++ b/databricks-sdk-java/src/main/java/com/databricks/sdk/core/commons/CommonsHttpClient.java @@ -8,6 +8,8 @@ import com.databricks.sdk.core.http.HttpClient; import com.databricks.sdk.core.http.Request; import com.databricks.sdk.core.http.Response; +import com.databricks.sdk.core.logging.Logger; +import com.databricks.sdk.core.logging.LoggerFactory; import com.databricks.sdk.core.utils.CustomCloseInputStream; import com.databricks.sdk.core.utils.ProxyUtils; import com.databricks.sdk.support.InternalApi; @@ -35,8 +37,6 @@ import org.apache.http.impl.conn.PoolingHttpClientConnectionManager; import org.apache.http.protocol.BasicHttpContext; import org.apache.http.protocol.HttpContext; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; @InternalApi public class CommonsHttpClient implements HttpClient { diff --git a/databricks-sdk-java/src/main/java/com/databricks/sdk/core/error/AbstractErrorMapper.java b/databricks-sdk-java/src/main/java/com/databricks/sdk/core/error/AbstractErrorMapper.java index cf0c81853..5db56052b 100644 --- a/databricks-sdk-java/src/main/java/com/databricks/sdk/core/error/AbstractErrorMapper.java +++ b/databricks-sdk-java/src/main/java/com/databricks/sdk/core/error/AbstractErrorMapper.java @@ -3,11 +3,11 @@ import com.databricks.sdk.core.DatabricksError; import com.databricks.sdk.core.error.details.ErrorDetails; import com.databricks.sdk.core.http.Response; +import com.databricks.sdk.core.logging.Logger; +import com.databricks.sdk.core.logging.LoggerFactory; import com.databricks.sdk.support.InternalApi; import java.util.HashMap; import java.util.Map; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; @InternalApi abstract class AbstractErrorMapper { diff --git a/databricks-sdk-java/src/main/java/com/databricks/sdk/core/oauth/AzureServicePrincipalCredentialsProvider.java b/databricks-sdk-java/src/main/java/com/databricks/sdk/core/oauth/AzureServicePrincipalCredentialsProvider.java index eca52808d..3ee6679b4 100644 --- a/databricks-sdk-java/src/main/java/com/databricks/sdk/core/oauth/AzureServicePrincipalCredentialsProvider.java +++ b/databricks-sdk-java/src/main/java/com/databricks/sdk/core/oauth/AzureServicePrincipalCredentialsProvider.java @@ -1,13 +1,13 @@ package com.databricks.sdk.core.oauth; import com.databricks.sdk.core.*; +import com.databricks.sdk.core.logging.Logger; +import com.databricks.sdk.core.logging.LoggerFactory; import com.databricks.sdk.core.utils.AzureUtils; import com.databricks.sdk.support.InternalApi; import com.fasterxml.jackson.databind.ObjectMapper; import java.util.HashMap; import java.util.Map; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; /** * Adds refreshed Azure Active Directory (AAD) Service Principal OAuth tokens to every request, diff --git a/databricks-sdk-java/src/main/java/com/databricks/sdk/core/oauth/CachedTokenSource.java b/databricks-sdk-java/src/main/java/com/databricks/sdk/core/oauth/CachedTokenSource.java index 6f3d63ec5..1b676e758 100644 --- a/databricks-sdk-java/src/main/java/com/databricks/sdk/core/oauth/CachedTokenSource.java +++ b/databricks-sdk-java/src/main/java/com/databricks/sdk/core/oauth/CachedTokenSource.java @@ -1,13 +1,13 @@ package com.databricks.sdk.core.oauth; +import com.databricks.sdk.core.logging.Logger; +import com.databricks.sdk.core.logging.LoggerFactory; import com.databricks.sdk.core.utils.ClockSupplier; import com.databricks.sdk.core.utils.UtcClockSupplier; import java.time.Duration; import java.time.Instant; import java.util.Objects; import java.util.concurrent.CompletableFuture; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; /** * An OAuth TokenSource which can be refreshed. diff --git a/databricks-sdk-java/src/main/java/com/databricks/sdk/core/oauth/Consent.java b/databricks-sdk-java/src/main/java/com/databricks/sdk/core/oauth/Consent.java index 19619d127..39951f2bc 100644 --- a/databricks-sdk-java/src/main/java/com/databricks/sdk/core/oauth/Consent.java +++ b/databricks-sdk-java/src/main/java/com/databricks/sdk/core/oauth/Consent.java @@ -3,6 +3,8 @@ import com.databricks.sdk.core.DatabricksException; import com.databricks.sdk.core.commons.CommonsHttpClient; import com.databricks.sdk.core.http.HttpClient; +import com.databricks.sdk.core.logging.Logger; +import com.databricks.sdk.core.logging.LoggerFactory; import com.sun.net.httpserver.Headers; import com.sun.net.httpserver.HttpExchange; import com.sun.net.httpserver.HttpHandler; @@ -21,8 +23,6 @@ import java.util.Objects; import java.util.Optional; import org.apache.commons.io.IOUtils; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; /** * Consent provides a mechanism to retrieve an authorization code and exchange it for an OAuth token diff --git a/databricks-sdk-java/src/main/java/com/databricks/sdk/core/oauth/DatabricksOAuthTokenSource.java b/databricks-sdk-java/src/main/java/com/databricks/sdk/core/oauth/DatabricksOAuthTokenSource.java index 026197e12..8613515b0 100644 --- a/databricks-sdk-java/src/main/java/com/databricks/sdk/core/oauth/DatabricksOAuthTokenSource.java +++ b/databricks-sdk-java/src/main/java/com/databricks/sdk/core/oauth/DatabricksOAuthTokenSource.java @@ -2,6 +2,8 @@ import com.databricks.sdk.core.DatabricksException; import com.databricks.sdk.core.http.HttpClient; +import com.databricks.sdk.core.logging.Logger; +import com.databricks.sdk.core.logging.LoggerFactory; import com.google.common.base.Strings; import java.time.Instant; import java.util.Arrays; @@ -9,8 +11,6 @@ import java.util.List; import java.util.Map; import java.util.Objects; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; /** * Implementation of TokenSource that handles OAuth token exchange for Databricks authentication. diff --git a/databricks-sdk-java/src/main/java/com/databricks/sdk/core/oauth/EndpointTokenSource.java b/databricks-sdk-java/src/main/java/com/databricks/sdk/core/oauth/EndpointTokenSource.java index afc40024e..bd95dd598 100644 --- a/databricks-sdk-java/src/main/java/com/databricks/sdk/core/oauth/EndpointTokenSource.java +++ b/databricks-sdk-java/src/main/java/com/databricks/sdk/core/oauth/EndpointTokenSource.java @@ -2,13 +2,13 @@ import com.databricks.sdk.core.DatabricksException; import com.databricks.sdk.core.http.HttpClient; +import com.databricks.sdk.core.logging.Logger; +import com.databricks.sdk.core.logging.LoggerFactory; import com.databricks.sdk.support.InternalApi; import java.time.Instant; import java.util.HashMap; import java.util.Map; import java.util.Objects; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; /** * Represents a token source that exchanges a control plane token for an endpoint-specific dataplane diff --git a/databricks-sdk-java/src/main/java/com/databricks/sdk/core/oauth/ExternalBrowserCredentialsProvider.java b/databricks-sdk-java/src/main/java/com/databricks/sdk/core/oauth/ExternalBrowserCredentialsProvider.java index 1d8b48dac..7c8d0fe4a 100644 --- a/databricks-sdk-java/src/main/java/com/databricks/sdk/core/oauth/ExternalBrowserCredentialsProvider.java +++ b/databricks-sdk-java/src/main/java/com/databricks/sdk/core/oauth/ExternalBrowserCredentialsProvider.java @@ -3,6 +3,8 @@ import com.databricks.sdk.core.CredentialsProvider; import com.databricks.sdk.core.DatabricksConfig; import com.databricks.sdk.core.DatabricksException; +import com.databricks.sdk.core.logging.Logger; +import com.databricks.sdk.core.logging.LoggerFactory; import com.databricks.sdk.support.InternalApi; import java.io.IOException; import java.nio.file.Path; @@ -12,8 +14,6 @@ import java.util.Objects; import java.util.Optional; import java.util.Set; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; /** * A {@code CredentialsProvider} which implements the Authorization Code + PKCE flow by opening a diff --git a/databricks-sdk-java/src/main/java/com/databricks/sdk/core/oauth/FileTokenCache.java b/databricks-sdk-java/src/main/java/com/databricks/sdk/core/oauth/FileTokenCache.java index b1805c131..83554b3d0 100644 --- a/databricks-sdk-java/src/main/java/com/databricks/sdk/core/oauth/FileTokenCache.java +++ b/databricks-sdk-java/src/main/java/com/databricks/sdk/core/oauth/FileTokenCache.java @@ -1,5 +1,7 @@ package com.databricks.sdk.core.oauth; +import com.databricks.sdk.core.logging.Logger; +import com.databricks.sdk.core.logging.LoggerFactory; import com.databricks.sdk.core.utils.SerDeUtils; import com.databricks.sdk.support.InternalApi; import com.fasterxml.jackson.databind.ObjectMapper; @@ -8,8 +10,6 @@ import java.nio.file.Files; import java.nio.file.Path; import java.util.Objects; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; /** A TokenCache implementation that stores tokens as plain files. */ @InternalApi diff --git a/databricks-sdk-java/src/main/java/com/databricks/sdk/core/oauth/SessionCredentials.java b/databricks-sdk-java/src/main/java/com/databricks/sdk/core/oauth/SessionCredentials.java index 34a1878d1..645c69239 100644 --- a/databricks-sdk-java/src/main/java/com/databricks/sdk/core/oauth/SessionCredentials.java +++ b/databricks-sdk-java/src/main/java/com/databricks/sdk/core/oauth/SessionCredentials.java @@ -3,11 +3,11 @@ import com.databricks.sdk.core.CredentialsProvider; import com.databricks.sdk.core.DatabricksConfig; import com.databricks.sdk.core.http.HttpClient; +import com.databricks.sdk.core.logging.Logger; +import com.databricks.sdk.core.logging.LoggerFactory; import com.databricks.sdk.support.InternalApi; import java.io.Serializable; import java.util.Optional; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; /** * An implementation of RefreshableTokenSource implementing the refresh_token OAuth grant type. diff --git a/databricks-sdk-java/src/main/java/com/databricks/sdk/core/oauth/SessionCredentialsTokenSource.java b/databricks-sdk-java/src/main/java/com/databricks/sdk/core/oauth/SessionCredentialsTokenSource.java index 3c42e0490..419d030ec 100644 --- a/databricks-sdk-java/src/main/java/com/databricks/sdk/core/oauth/SessionCredentialsTokenSource.java +++ b/databricks-sdk-java/src/main/java/com/databricks/sdk/core/oauth/SessionCredentialsTokenSource.java @@ -2,12 +2,12 @@ import com.databricks.sdk.core.DatabricksException; import com.databricks.sdk.core.http.HttpClient; +import com.databricks.sdk.core.logging.Logger; +import com.databricks.sdk.core.logging.LoggerFactory; import com.databricks.sdk.support.InternalApi; import java.util.HashMap; import java.util.Map; import java.util.Optional; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; /** * TokenSource that handles OAuth token refresh for SessionCredentials. diff --git a/databricks-sdk-java/src/main/java/com/databricks/sdk/core/oauth/TokenEndpointClient.java b/databricks-sdk-java/src/main/java/com/databricks/sdk/core/oauth/TokenEndpointClient.java index 8931ec162..0ce38703e 100644 --- a/databricks-sdk-java/src/main/java/com/databricks/sdk/core/oauth/TokenEndpointClient.java +++ b/databricks-sdk-java/src/main/java/com/databricks/sdk/core/oauth/TokenEndpointClient.java @@ -6,6 +6,8 @@ import com.databricks.sdk.core.http.HttpClient; import com.databricks.sdk.core.http.Request; import com.databricks.sdk.core.http.Response; +import com.databricks.sdk.core.logging.Logger; +import com.databricks.sdk.core.logging.LoggerFactory; import com.databricks.sdk.support.InternalApi; import com.fasterxml.jackson.databind.ObjectMapper; import java.io.IOException; @@ -14,8 +16,6 @@ import java.util.Map; import java.util.Objects; import org.apache.http.HttpHeaders; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; /** * Client for interacting with an OAuth token endpoint. diff --git a/databricks-sdk-java/src/main/java/com/databricks/sdk/core/retry/NonIdempotentRequestRetryStrategy.java b/databricks-sdk-java/src/main/java/com/databricks/sdk/core/retry/NonIdempotentRequestRetryStrategy.java index db4740700..8f91bf650 100644 --- a/databricks-sdk-java/src/main/java/com/databricks/sdk/core/retry/NonIdempotentRequestRetryStrategy.java +++ b/databricks-sdk-java/src/main/java/com/databricks/sdk/core/retry/NonIdempotentRequestRetryStrategy.java @@ -1,13 +1,13 @@ package com.databricks.sdk.core.retry; import com.databricks.sdk.core.DatabricksError; +import com.databricks.sdk.core.logging.Logger; +import com.databricks.sdk.core.logging.LoggerFactory; import java.net.*; import java.util.Arrays; import java.util.HashSet; import java.util.List; import java.util.Set; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; /** * This class is used to determine if a non-idempotent request should be retried. We essentially diff --git a/databricks-sdk-java/src/main/java/com/databricks/sdk/core/utils/OSUtils.java b/databricks-sdk-java/src/main/java/com/databricks/sdk/core/utils/OSUtils.java index 66da25cfa..3b2574557 100644 --- a/databricks-sdk-java/src/main/java/com/databricks/sdk/core/utils/OSUtils.java +++ b/databricks-sdk-java/src/main/java/com/databricks/sdk/core/utils/OSUtils.java @@ -1,14 +1,14 @@ package com.databricks.sdk.core.utils; import com.databricks.sdk.core.DatabricksException; +import com.databricks.sdk.core.logging.Logger; +import com.databricks.sdk.core.logging.LoggerFactory; import com.databricks.sdk.support.InternalApi; import java.io.IOException; import java.nio.file.Files; import java.nio.file.Path; import java.nio.file.Paths; import java.util.List; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; /** * OSUtils is an interface that provides utility methods for determining the current operating diff --git a/databricks-sdk-java/src/main/java/com/databricks/sdk/mixin/ClustersExt.java b/databricks-sdk-java/src/main/java/com/databricks/sdk/mixin/ClustersExt.java index dc86da730..4ee8ffea6 100644 --- a/databricks-sdk-java/src/main/java/com/databricks/sdk/mixin/ClustersExt.java +++ b/databricks-sdk-java/src/main/java/com/databricks/sdk/mixin/ClustersExt.java @@ -4,6 +4,8 @@ import com.databricks.sdk.core.ApiClient; import com.databricks.sdk.core.DatabricksError; +import com.databricks.sdk.core.logging.Logger; +import com.databricks.sdk.core.logging.LoggerFactory; import com.databricks.sdk.service.compute.*; import java.time.Duration; import java.util.ArrayList; @@ -13,8 +15,6 @@ import java.util.concurrent.TimeoutException; import java.util.function.Function; import java.util.stream.Collectors; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; public class ClustersExt extends ClustersAPI { private static final Logger LOG = LoggerFactory.getLogger(ClustersExt.class);