Skip to content

Commit daf53ee

Browse files
Migrate manual files to logging abstraction
1 parent 86798d3 commit daf53ee

26 files changed

Lines changed: 53 additions & 53 deletions

NEXT_CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,5 +17,6 @@
1717

1818
### Internal Changes
1919
* 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.
20+
* Migrated internal SDK classes to the logging abstraction. The SDK now supports SLF4J, `java.util.logging`, or a custom backend via `LoggerFactory.setDefault()`.
2021

2122
### API Changes

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

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@
66
import com.databricks.sdk.core.http.Request;
77
import com.databricks.sdk.core.http.RequestOptions;
88
import com.databricks.sdk.core.http.Response;
9+
import com.databricks.sdk.core.logging.Logger;
10+
import com.databricks.sdk.core.logging.LoggerFactory;
911
import com.databricks.sdk.core.retry.NoRetryStrategyPicker;
1012
import com.databricks.sdk.core.retry.RequestBasedRetryStrategyPicker;
1113
import com.databricks.sdk.core.retry.RetryStrategy;
@@ -25,8 +27,6 @@
2527
import java.time.format.DateTimeFormatter;
2628
import java.util.*;
2729
import java.util.function.Function;
28-
import org.slf4j.Logger;
29-
import org.slf4j.LoggerFactory;
3030

3131
/**
3232
* 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) {
253253

254254
try {
255255
response = httpClient.execute(in);
256-
if (LOG.isDebugEnabled()) {
257-
LOG.debug(makeLogRecord(in, response));
258-
}
256+
Response resp = response;
257+
LOG.debug(() -> makeLogRecord(in, resp));
259258

260259
if (isResponseSuccessful(response)) {
261260
return response; // stop here if the request succeeded

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
package com.databricks.sdk.core;
22

3+
import com.databricks.sdk.core.logging.Logger;
4+
import com.databricks.sdk.core.logging.LoggerFactory;
35
import com.databricks.sdk.core.oauth.CachedTokenSource;
46
import com.databricks.sdk.core.oauth.OAuthHeaderFactory;
57
import com.databricks.sdk.core.oauth.Token;
68
import com.databricks.sdk.core.utils.AzureUtils;
79
import com.databricks.sdk.support.InternalApi;
810
import com.fasterxml.jackson.databind.ObjectMapper;
911
import java.util.*;
10-
import org.slf4j.Logger;
11-
import org.slf4j.LoggerFactory;
1212

1313
@InternalApi
1414
public class AzureCliCredentialsProvider implements CredentialsProvider {

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
package com.databricks.sdk.core;
22

3+
import com.databricks.sdk.core.logging.Logger;
4+
import com.databricks.sdk.core.logging.LoggerFactory;
35
import com.databricks.sdk.core.oauth.Token;
46
import com.databricks.sdk.core.oauth.TokenSource;
57
import com.databricks.sdk.core.utils.Environment;
@@ -18,8 +20,6 @@
1820
import java.util.Arrays;
1921
import java.util.List;
2022
import org.apache.commons.io.IOUtils;
21-
import org.slf4j.Logger;
22-
import org.slf4j.LoggerFactory;
2323

2424
@InternalApi
2525
public class CliTokenSource implements TokenSource {

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
package com.databricks.sdk.core;
22

3+
import com.databricks.sdk.core.logging.Logger;
4+
import com.databricks.sdk.core.logging.LoggerFactory;
35
import com.databricks.sdk.core.utils.Environment;
46
import com.databricks.sdk.support.InternalApi;
57
import java.io.FileNotFoundException;
@@ -13,8 +15,6 @@
1315
import org.apache.commons.configuration2.INIConfiguration;
1416
import org.apache.commons.configuration2.SubnodeConfiguration;
1517
import org.apache.commons.configuration2.ex.ConfigurationException;
16-
import org.slf4j.Logger;
17-
import org.slf4j.LoggerFactory;
1818

1919
@InternalApi
2020
public class ConfigLoader {

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
package com.databricks.sdk.core;
22

3+
import com.databricks.sdk.core.logging.Logger;
4+
import com.databricks.sdk.core.logging.LoggerFactory;
35
import com.databricks.sdk.core.oauth.CachedTokenSource;
46
import com.databricks.sdk.core.oauth.OAuthHeaderFactory;
57
import com.databricks.sdk.core.oauth.Token;
@@ -10,8 +12,6 @@
1012
import com.fasterxml.jackson.databind.ObjectMapper;
1113
import java.nio.charset.StandardCharsets;
1214
import java.util.*;
13-
import org.slf4j.Logger;
14-
import org.slf4j.LoggerFactory;
1515

1616
@InternalApi
1717
public class DatabricksCliCredentialsProvider implements CredentialsProvider {

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@
44
import com.databricks.sdk.core.http.HttpClient;
55
import com.databricks.sdk.core.http.Request;
66
import com.databricks.sdk.core.http.Response;
7+
import com.databricks.sdk.core.logging.Logger;
8+
import com.databricks.sdk.core.logging.LoggerFactory;
79
import com.databricks.sdk.core.oauth.ErrorTokenSource;
810
import com.databricks.sdk.core.oauth.HostMetadata;
911
import com.databricks.sdk.core.oauth.OAuthHeaderFactory;
@@ -19,8 +21,6 @@
1921
import java.time.Duration;
2022
import java.util.*;
2123
import org.apache.http.HttpMessage;
22-
import org.slf4j.Logger;
23-
import org.slf4j.LoggerFactory;
2424

2525
public class DatabricksConfig {
2626
private static final Logger LOG = LoggerFactory.getLogger(DatabricksConfig.class);

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
package com.databricks.sdk.core;
22

3+
import com.databricks.sdk.core.logging.Logger;
4+
import com.databricks.sdk.core.logging.LoggerFactory;
35
import com.databricks.sdk.core.oauth.*;
46
import com.databricks.sdk.support.InternalApi;
57
import com.google.common.base.Strings;
68
import java.util.ArrayList;
79
import java.util.List;
8-
import org.slf4j.Logger;
9-
import org.slf4j.LoggerFactory;
1010

1111
/**
1212
* The DefaultCredentialsProvider is the primary authentication handler for the Databricks SDK. It

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@
33
import static com.databricks.sdk.core.utils.GoogleUtils.GCP_SCOPES;
44
import static com.databricks.sdk.core.utils.GoogleUtils.SA_ACCESS_TOKEN_HEADER;
55

6+
import com.databricks.sdk.core.logging.Logger;
7+
import com.databricks.sdk.core.logging.LoggerFactory;
68
import com.databricks.sdk.support.InternalApi;
79
import com.google.auth.oauth2.*;
810
import com.google.auth.oauth2.IdTokenProvider.Option;
@@ -12,8 +14,6 @@
1214
import java.nio.file.Files;
1315
import java.nio.file.Paths;
1416
import java.util.*;
15-
import org.slf4j.Logger;
16-
import org.slf4j.LoggerFactory;
1717

1818
@InternalApi
1919
public class GoogleCredentialsCredentialsProvider implements CredentialsProvider {

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,15 @@
33
import static com.databricks.sdk.core.utils.GoogleUtils.GCP_SCOPES;
44
import static com.databricks.sdk.core.utils.GoogleUtils.SA_ACCESS_TOKEN_HEADER;
55

6+
import com.databricks.sdk.core.logging.Logger;
7+
import com.databricks.sdk.core.logging.LoggerFactory;
68
import com.databricks.sdk.support.InternalApi;
79
import com.google.auth.oauth2.GoogleCredentials;
810
import com.google.auth.oauth2.IdTokenCredentials;
911
import com.google.auth.oauth2.IdTokenProvider;
1012
import com.google.auth.oauth2.ImpersonatedCredentials;
1113
import java.io.IOException;
1214
import java.util.*;
13-
import org.slf4j.Logger;
14-
import org.slf4j.LoggerFactory;
1515

1616
@InternalApi
1717
public class GoogleIdCredentialsProvider implements CredentialsProvider {

0 commit comments

Comments
 (0)