Skip to content

Commit 23b5bd1

Browse files
vikrantpuppalavikrantpuppala
committed
fmt
1 parent ab64d0f commit 23b5bd1

File tree

4 files changed

+66
-68
lines changed

4 files changed

+66
-68
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,12 +48,12 @@ public HeaderFactory configure(DatabricksConfig config) {
4848
if (config.getHost() == null || !Objects.equals(config.getAuthType(), "external-browser")) {
4949
return null;
5050
}
51-
51+
5252
// Use the utility class to resolve client ID and client secret
5353
String[] clientCreds = OAuthClientUtils.resolveClientCredentials(config);
5454
String clientId = clientCreds[0];
5555
String clientSecret = clientCreds[1];
56-
56+
5757
try {
5858
if (tokenCache == null) {
5959
// Create a default FileTokenCache based on config

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

Lines changed: 9 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -2,19 +2,15 @@
22

33
import com.databricks.sdk.core.DatabricksConfig;
44

5-
/**
6-
* Utility methods for OAuth client credentials resolution.
7-
*/
5+
/** Utility methods for OAuth client credentials resolution. */
86
public class OAuthClientUtils {
97

10-
/**
11-
* Default client ID to use when no client ID is specified.
12-
*/
8+
/** Default client ID to use when no client ID is specified. */
139
private static final String DEFAULT_CLIENT_ID = "databricks-cli";
1410

1511
/**
16-
* Resolves the OAuth client ID from the configuration.
17-
* Prioritizes regular OAuth client ID, then Azure client ID, and falls back to default client ID.
12+
* Resolves the OAuth client ID from the configuration. Prioritizes regular OAuth client ID, then
13+
* Azure client ID, and falls back to default client ID.
1814
*
1915
* @param config The Databricks configuration
2016
* @return The resolved client ID
@@ -29,8 +25,8 @@ public static String resolveClientId(DatabricksConfig config) {
2925
}
3026

3127
/**
32-
* Resolves the OAuth client secret from the configuration.
33-
* Prioritizes regular OAuth client secret, then Azure client secret.
28+
* Resolves the OAuth client secret from the configuration. Prioritizes regular OAuth client
29+
* secret, then Azure client secret.
3430
*
3531
* @param config The Databricks configuration
3632
* @return The resolved client secret, or null if not present
@@ -46,13 +42,13 @@ public static String resolveClientSecret(DatabricksConfig config) {
4642

4743
/**
4844
* Resolves both client ID and client secret from the configuration.
49-
*
45+
*
5046
* @param config The Databricks configuration
5147
* @return An array containing the client ID and client secret (may be null)
5248
*/
5349
public static String[] resolveClientCredentials(DatabricksConfig config) {
5450
String clientId = resolveClientId(config);
5551
String clientSecret = resolveClientSecret(config);
56-
return new String[]{clientId, clientSecret};
52+
return new String[] {clientId, clientSecret};
5753
}
58-
}
54+
}

‎databricks-sdk-java/src/test/java/com/databricks/sdk/core/oauth/ExternalBrowserCredentialsProviderTest.java‎

Lines changed: 28 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -42,14 +42,15 @@ void clientAndConsentTest() throws IOException {
4242

4343
assertEquals("tokenEndPointFromServer", config.getOidcEndpoints().getTokenEndpoint());
4444

45-
OAuthClient testClient = new OAuthClient.Builder()
46-
.withHttpClient(config.getHttpClient())
47-
.withClientId(config.getClientId())
48-
.withClientSecret(config.getClientSecret())
49-
.withHost(config.getHost())
50-
.withRedirectUrl(config.getEffectiveOAuthRedirectUrl())
51-
.withScopes(config.getScopes())
52-
.build();
45+
OAuthClient testClient =
46+
new OAuthClient.Builder()
47+
.withHttpClient(config.getHttpClient())
48+
.withClientId(config.getClientId())
49+
.withClientSecret(config.getClientSecret())
50+
.withHost(config.getHost())
51+
.withRedirectUrl(config.getEffectiveOAuthRedirectUrl())
52+
.withScopes(config.getScopes())
53+
.build();
5354
assertEquals("test-client-id", testClient.getClientId());
5455

5556
Consent testConsent = testClient.initiateConsent();
@@ -86,14 +87,15 @@ void clientAndConsentTestWithCustomRedirectUrl() throws IOException {
8687

8788
assertEquals("tokenEndPointFromServer", config.getOidcEndpoints().getTokenEndpoint());
8889

89-
OAuthClient testClient = new OAuthClient.Builder()
90-
.withHttpClient(config.getHttpClient())
91-
.withClientId(config.getClientId())
92-
.withClientSecret(config.getClientSecret())
93-
.withHost(config.getHost())
94-
.withRedirectUrl(config.getEffectiveOAuthRedirectUrl())
95-
.withScopes(config.getScopes())
96-
.build();
90+
OAuthClient testClient =
91+
new OAuthClient.Builder()
92+
.withHttpClient(config.getHttpClient())
93+
.withClientId(config.getClientId())
94+
.withClientSecret(config.getClientSecret())
95+
.withHost(config.getHost())
96+
.withRedirectUrl(config.getEffectiveOAuthRedirectUrl())
97+
.withScopes(config.getScopes())
98+
.build();
9799
assertEquals("test-client-id", testClient.getClientId());
98100

99101
Consent testConsent = testClient.initiateConsent();
@@ -275,7 +277,11 @@ void cacheWithValidTokenTest() throws IOException {
275277

276278
// Verify performBrowserAuth was NOT called since refresh succeeded
277279
Mockito.verify(provider, Mockito.never())
278-
.performBrowserAuth(any(DatabricksConfig.class), any(String.class), any(String.class), any(TokenCache.class));
280+
.performBrowserAuth(
281+
any(DatabricksConfig.class),
282+
any(String.class),
283+
any(String.class),
284+
any(TokenCache.class));
279285

280286
// Verify token was saved back to cache
281287
Mockito.verify(mockTokenCache, Mockito.times(1)).save(any(Token.class));
@@ -352,7 +358,11 @@ void cacheWithInvalidAccessTokenValidRefreshTest() throws IOException {
352358

353359
// Verify performBrowserAuth was NOT called since refresh succeeded
354360
Mockito.verify(provider, Mockito.never())
355-
.performBrowserAuth(any(DatabricksConfig.class), any(String.class), any(String.class), any(TokenCache.class));
361+
.performBrowserAuth(
362+
any(DatabricksConfig.class),
363+
any(String.class),
364+
any(String.class),
365+
any(TokenCache.class));
356366

357367
// Verify token was saved back to cache
358368
Mockito.verify(mockTokenCache, Mockito.times(1)).save(any(Token.class));

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

Lines changed: 27 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -11,69 +11,60 @@ public class OAuthClientUtilsTest {
1111
@Test
1212
void resolveClientIdTest() {
1313
// Test with regular client ID
14-
DatabricksConfig config = new DatabricksConfig()
15-
.setClientId("test-client-id")
16-
.setAzureClientId("azure-client-id");
14+
DatabricksConfig config =
15+
new DatabricksConfig().setClientId("test-client-id").setAzureClientId("azure-client-id");
1716
assertEquals("test-client-id", OAuthClientUtils.resolveClientId(config));
1817

1918
// Test with only Azure client ID
20-
config = new DatabricksConfig()
21-
.setClientId(null)
22-
.setAzureClientId("azure-client-id");
19+
config = new DatabricksConfig().setClientId(null).setAzureClientId("azure-client-id");
2320
assertEquals("azure-client-id", OAuthClientUtils.resolveClientId(config));
2421

2522
// Test with no client IDs
26-
config = new DatabricksConfig()
27-
.setClientId(null)
28-
.setAzureClientId(null);
23+
config = new DatabricksConfig().setClientId(null).setAzureClientId(null);
2924
assertEquals("databricks-cli", OAuthClientUtils.resolveClientId(config));
3025
}
3126

3227
@Test
3328
void resolveClientSecretTest() {
3429
// Test with regular client secret
35-
DatabricksConfig config = new DatabricksConfig()
36-
.setClientSecret("test-client-secret")
37-
.setAzureClientSecret("azure-client-secret");
30+
DatabricksConfig config =
31+
new DatabricksConfig()
32+
.setClientSecret("test-client-secret")
33+
.setAzureClientSecret("azure-client-secret");
3834
assertEquals("test-client-secret", OAuthClientUtils.resolveClientSecret(config));
3935

4036
// Test with only Azure client secret
41-
config = new DatabricksConfig()
42-
.setClientSecret(null)
43-
.setAzureClientSecret("azure-client-secret");
37+
config =
38+
new DatabricksConfig().setClientSecret(null).setAzureClientSecret("azure-client-secret");
4439
assertEquals("azure-client-secret", OAuthClientUtils.resolveClientSecret(config));
4540

4641
// Test with no client secrets
47-
config = new DatabricksConfig()
48-
.setClientSecret(null)
49-
.setAzureClientSecret(null);
42+
config = new DatabricksConfig().setClientSecret(null).setAzureClientSecret(null);
5043
assertNull(OAuthClientUtils.resolveClientSecret(config));
5144
}
5245

5346
@Test
5447
void resolveClientCredentialsTest() {
5548
// Test with both client ID and secret
56-
DatabricksConfig config = new DatabricksConfig()
57-
.setClientId("test-client-id")
58-
.setClientSecret("test-client-secret");
49+
DatabricksConfig config =
50+
new DatabricksConfig().setClientId("test-client-id").setClientSecret("test-client-secret");
5951
String[] credentials = OAuthClientUtils.resolveClientCredentials(config);
6052
assertEquals("test-client-id", credentials[0]);
6153
assertEquals("test-client-secret", credentials[1]);
6254

6355
// Test with only client ID
64-
config = new DatabricksConfig()
65-
.setClientId("test-client-id")
66-
.setClientSecret(null);
56+
config = new DatabricksConfig().setClientId("test-client-id").setClientSecret(null);
6757
credentials = OAuthClientUtils.resolveClientCredentials(config);
6858
assertEquals("test-client-id", credentials[0]);
6959
assertNull(credentials[1]);
7060

7161
// Test with Azure credentials
72-
config = new DatabricksConfig()
73-
.setClientId(null)
74-
.setClientSecret(null)
75-
.setAzureClientId("azure-client-id")
76-
.setAzureClientSecret("azure-client-secret");
62+
config =
63+
new DatabricksConfig()
64+
.setClientId(null)
65+
.setClientSecret(null)
66+
.setAzureClientId("azure-client-id")
67+
.setAzureClientSecret("azure-client-secret");
7768
credentials = OAuthClientUtils.resolveClientCredentials(config);
7869
assertEquals("azure-client-id", credentials[0]);
7970
assertEquals("azure-client-secret", credentials[1]);
@@ -85,13 +76,14 @@ void resolveClientCredentialsTest() {
8576
assertNull(credentials[1]);
8677

8778
// Test mixed credentials preference
88-
config = new DatabricksConfig()
89-
.setClientId("test-client-id")
90-
.setClientSecret(null)
91-
.setAzureClientId("azure-client-id")
92-
.setAzureClientSecret("azure-client-secret");
79+
config =
80+
new DatabricksConfig()
81+
.setClientId("test-client-id")
82+
.setClientSecret(null)
83+
.setAzureClientId("azure-client-id")
84+
.setAzureClientSecret("azure-client-secret");
9385
credentials = OAuthClientUtils.resolveClientCredentials(config);
9486
assertEquals("test-client-id", credentials[0]);
9587
assertEquals("azure-client-secret", credentials[1]);
9688
}
97-
}
89+
}

0 commit comments

Comments
 (0)