From 30bb7050d47166a20dd523bfbddb796f35f20733 Mon Sep 17 00:00:00 2001
From: Diego Alonso Marquez Palacios <diegomarquezp@google.com>
Date: Wed, 8 Oct 2025 14:05:07 -0400
Subject: [PATCH] chore: use credential-specific fromStream method

---
 .../google/cloud/spanner/jdbc/JdbcDatabaseMetaDataTest.java | 6 +++---
 .../com/google/cloud/spanner/jdbc/it/ITJdbcConnectTest.java | 4 +++-
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/test/java/com/google/cloud/spanner/jdbc/JdbcDatabaseMetaDataTest.java b/src/test/java/com/google/cloud/spanner/jdbc/JdbcDatabaseMetaDataTest.java
index 7dc4667e4..d5a429078 100644
--- a/src/test/java/com/google/cloud/spanner/jdbc/JdbcDatabaseMetaDataTest.java
+++ b/src/test/java/com/google/cloud/spanner/jdbc/JdbcDatabaseMetaDataTest.java
@@ -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;
@@ -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);
diff --git a/src/test/java/com/google/cloud/spanner/jdbc/it/ITJdbcConnectTest.java b/src/test/java/com/google/cloud/spanner/jdbc/it/ITJdbcConnectTest.java
index b42e81e5e..92e590e16 100644
--- a/src/test/java/com/google/cloud/spanner/jdbc/it/ITJdbcConnectTest.java
+++ b/src/test/java/com/google/cloud/spanner/jdbc/it/ITJdbcConnectTest.java
@@ -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;
@@ -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();