Skip to content

Commit 0953a2e

Browse files
committed
remove overloads of auth functions
1 parent 7cfedcf commit 0953a2e

2 files changed

Lines changed: 3 additions & 26 deletions

File tree

java-bigquery-jdbc/src/main/java/com/google/cloud/bigquery/jdbc/BigQueryJdbcOAuthUtility.java

Lines changed: 0 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -400,15 +400,6 @@ private static GoogleCredentials getGoogleServiceAccountCredentials(
400400
return builder.build();
401401
}
402402

403-
static UserAuthorizer getUserAuthorizer(
404-
Map<String, String> authProperties,
405-
Map<String, String> overrideProperties,
406-
int port,
407-
String callerClassName)
408-
throws URISyntaxException {
409-
return getUserAuthorizer(authProperties, overrideProperties, port, null, callerClassName);
410-
}
411-
412403
static UserAuthorizer getUserAuthorizer(
413404
Map<String, String> authProperties,
414405
Map<String, String> overrideProperties,
@@ -446,11 +437,6 @@ static UserAuthorizer getUserAuthorizer(
446437
return userAuthorizerBuilder.build();
447438
}
448439

449-
static UserCredentials getCredentialsFromCode(
450-
UserAuthorizer userAuthorizer, String code, String callerClassName) throws IOException {
451-
return getCredentialsFromCode(userAuthorizer, code, null, callerClassName);
452-
}
453-
454440
static UserCredentials getCredentialsFromCode(
455441
UserAuthorizer userAuthorizer,
456442
String code,
@@ -562,15 +548,6 @@ static GoogleCredentials getPreGeneratedTokensCredentials(
562548
}
563549
}
564550

565-
static UserCredentials getPreGeneratedRefreshTokenCredentials(
566-
Map<String, String> authProperties,
567-
Map<String, String> overrideProperties,
568-
String callerClassName)
569-
throws URISyntaxException {
570-
return getPreGeneratedRefreshTokenCredentials(
571-
authProperties, overrideProperties, null, callerClassName);
572-
}
573-
574551
static UserCredentials getPreGeneratedRefreshTokenCredentials(
575552
Map<String, String> authProperties,
576553
Map<String, String> overrideProperties,

java-bigquery-jdbc/src/test/java/com/google/cloud/bigquery/jdbc/BigQueryJdbcOAuthUtilityTest.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -248,7 +248,7 @@ public void testGenerateUserAuthURL() {
248248

249249
UserAuthorizer userAuthorizer =
250250
BigQueryJdbcOAuthUtility.getUserAuthorizer(
251-
authProperties, new HashMap<String, String>(), USER_AUTH_PORT, null);
251+
authProperties, new HashMap<String, String>(), USER_AUTH_PORT, null, null);
252252

253253
String userId = "test_user";
254254
String state = "test_state";
@@ -281,7 +281,7 @@ public void testGenerateUserAuthURLOverrideOauthEndpoint() {
281281

282282
UserAuthorizer userAuthorizer =
283283
BigQueryJdbcOAuthUtility.getUserAuthorizer(
284-
authProperties, overrideProperties, USER_AUTH_PORT, null);
284+
authProperties, overrideProperties, USER_AUTH_PORT, null, null);
285285

286286
assertThat(overrideTokenSeverURI).isEqualTo(userAuthorizer.toBuilder().getTokenServerUri());
287287
} catch (URISyntaxException e) {
@@ -322,7 +322,7 @@ public void testParseOverridePropsForRefreshTokenAuth() {
322322

323323
UserCredentials userCredentials =
324324
BigQueryJdbcOAuthUtility.getPreGeneratedRefreshTokenCredentials(
325-
authProperties, overrideProperties, null);
325+
authProperties, overrideProperties, null, null);
326326

327327
assertThat(userCredentials.toBuilder().getTokenServerUri())
328328
.isEqualTo(URI.create("https://oauth2-private.p.googleapis.com/token"));

0 commit comments

Comments
 (0)