Skip to content

Commit ce75413

Browse files
remove extra function
1 parent 23b5bd1 commit ce75413

File tree

3 files changed

+2
-59
lines changed

3 files changed

+2
-59
lines changed

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

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -50,9 +50,8 @@ public HeaderFactory configure(DatabricksConfig config) {
5050
}
5151

5252
// Use the utility class to resolve client ID and client secret
53-
String[] clientCreds = OAuthClientUtils.resolveClientCredentials(config);
54-
String clientId = clientCreds[0];
55-
String clientSecret = clientCreds[1];
53+
String clientId = OAuthClientUtils.resolveClientId(config);
54+
String clientSecret = OAuthClientUtils.resolveClientSecret(config);
5655

5756
try {
5857
if (tokenCache == null) {

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

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -39,16 +39,4 @@ public static String resolveClientSecret(DatabricksConfig config) {
3939
}
4040
return null;
4141
}
42-
43-
/**
44-
* Resolves both client ID and client secret from the configuration.
45-
*
46-
* @param config The Databricks configuration
47-
* @return An array containing the client ID and client secret (may be null)
48-
*/
49-
public static String[] resolveClientCredentials(DatabricksConfig config) {
50-
String clientId = resolveClientId(config);
51-
String clientSecret = resolveClientSecret(config);
52-
return new String[] {clientId, clientSecret};
53-
}
5442
}

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

Lines changed: 0 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -42,48 +42,4 @@ void resolveClientSecretTest() {
4242
config = new DatabricksConfig().setClientSecret(null).setAzureClientSecret(null);
4343
assertNull(OAuthClientUtils.resolveClientSecret(config));
4444
}
45-
46-
@Test
47-
void resolveClientCredentialsTest() {
48-
// Test with both client ID and secret
49-
DatabricksConfig config =
50-
new DatabricksConfig().setClientId("test-client-id").setClientSecret("test-client-secret");
51-
String[] credentials = OAuthClientUtils.resolveClientCredentials(config);
52-
assertEquals("test-client-id", credentials[0]);
53-
assertEquals("test-client-secret", credentials[1]);
54-
55-
// Test with only client ID
56-
config = new DatabricksConfig().setClientId("test-client-id").setClientSecret(null);
57-
credentials = OAuthClientUtils.resolveClientCredentials(config);
58-
assertEquals("test-client-id", credentials[0]);
59-
assertNull(credentials[1]);
60-
61-
// Test with Azure credentials
62-
config =
63-
new DatabricksConfig()
64-
.setClientId(null)
65-
.setClientSecret(null)
66-
.setAzureClientId("azure-client-id")
67-
.setAzureClientSecret("azure-client-secret");
68-
credentials = OAuthClientUtils.resolveClientCredentials(config);
69-
assertEquals("azure-client-id", credentials[0]);
70-
assertEquals("azure-client-secret", credentials[1]);
71-
72-
// Test with no credentials
73-
config = new DatabricksConfig();
74-
credentials = OAuthClientUtils.resolveClientCredentials(config);
75-
assertEquals("databricks-cli", credentials[0]);
76-
assertNull(credentials[1]);
77-
78-
// Test mixed credentials preference
79-
config =
80-
new DatabricksConfig()
81-
.setClientId("test-client-id")
82-
.setClientSecret(null)
83-
.setAzureClientId("azure-client-id")
84-
.setAzureClientSecret("azure-client-secret");
85-
credentials = OAuthClientUtils.resolveClientCredentials(config);
86-
assertEquals("test-client-id", credentials[0]);
87-
assertEquals("azure-client-secret", credentials[1]);
88-
}
8945
}

0 commit comments

Comments
 (0)