Skip to content

chore: use credential-specific fromStream method #2242

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 8, 2025
Merged

chore: use credential-specific fromStream method #2242

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions src/test/java/com/google/cloud/spanner/jdbc/JdbcDatabaseMetaDataTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;

import com.google.auth.oauth2.GoogleCredentials;
import com.google.auth.oauth2.ServiceAccountCredentials;
import com.google.cloud.spanner.Dialect;
import com.google.cloud.spanner.connection.ConnectionOptions;
import com.google.cloud.spanner.connection.ConnectionOptionsTest;
Expand Down Expand Up @@ -555,8 +555,8 @@ public void testGetVersionColumns() throws SQLException {

@Test
public void testGetUserName() throws SQLException, IOException {
GoogleCredentials credentials =
GoogleCredentials.fromStream(
ServiceAccountCredentials credentials =
ServiceAccountCredentials.fromStream(
Objects.requireNonNull(ConnectionOptionsTest.class.getResource("test-key.json"))
.openStream());
JdbcConnection connection = mock(JdbcConnection.class);
Expand Down
4 changes: 3 additions & 1 deletion src/test/java/com/google/cloud/spanner/jdbc/it/ITJdbcConnectTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@

import com.google.auth.oauth2.AccessToken;
import com.google.auth.oauth2.GoogleCredentials;
import com.google.auth.oauth2.ServiceAccountCredentials;
import com.google.cloud.spanner.Database;
import com.google.cloud.spanner.Dialect;
import com.google.cloud.spanner.ParallelIntegrationTest;
Expand Down Expand Up @@ -230,7 +231,8 @@ public void testConnectWithDataSourceWithConflictingValues() throws SQLException
public void testConnectWithOAuthToken() throws Exception {
GoogleCredentials credentials;
if (hasValidKeyFile()) {
credentials = GoogleCredentials.fromStream(Files.newInputStream(Paths.get(getKeyFile())));
credentials =
ServiceAccountCredentials.fromStream(Files.newInputStream(Paths.get(getKeyFile())));
} else {
try {
credentials = GoogleCredentials.getApplicationDefault();
Expand Down