Fix

Author: chenjian2664

lib/trino-filesystem-gcs/src/main/java/io/trino/filesystem/gcs/GcsFileSystemConfig.java

@@ -26,7 +26,6 @@
 import jakarta.validation.constraints.NotNull;
 import jakarta.validation.constraints.Size;
 
-import java.util.Arrays;
 import java.util.Optional;
 import java.util.concurrent.TimeUnit;
 
@@ -161,11 +160,7 @@ public GcsFileSystemConfig setAuthType(AuthType authType)
     @Deprecated
     public boolean isUseGcsAccessToken()
     {
-        // should not be called; allow calling from TestGcsFileSystemConfig as it is needed by airlift config test framework
-        if (Arrays.stream(Thread.currentThread().getStackTrace()).anyMatch(element -> element.getClassName().equals("io.trino.filesystem.gcs.TestGcsFileSystemConfig"))) {
-            return useGcsAccessToken.orElse(false);
-        }
-        throw new RuntimeException("isUseGcsAccessToken must not be called; use getAuthType instead");
+        return useGcsAccessToken.orElse(false);
     }
 
     @Deprecated
@@ -176,12 +171,6 @@ public GcsFileSystemConfig setUseGcsAccessToken(boolean useGcsAccessToken)
         return this;
     }
 
-    @AssertTrue(message = "Cannot set both gcs.use-access-token and gcs.auth-type")
-    public boolean isAuthTypeAndUseGcsAccessTokenMutuallyExclusive()
-    {
-        return !(authType.isPresent() && useGcsAccessToken.isPresent());
-    }
-
     @Nullable
     public String getJsonKey()
     {
@@ -313,4 +302,10 @@ public boolean isAuthMethodValid()
 
         return (jsonKey == null) ^ (jsonKeyFilePath == null);
     }
+
+    @AssertTrue(message = "Cannot set both gcs.use-access-token and gcs.auth-type")
+    public boolean isAuthTypeAndUseGcsAccessTokenMutuallyExclusive()
+    {
+        return !(authType.isPresent() && useGcsAccessToken.isPresent());
+    }
 }

lib/trino-filesystem-gcs/src/test/java/io/trino/filesystem/gcs/TestGcsFileSystemConfig.java

@@ -31,33 +31,29 @@
 import static io.airlift.units.DataSize.Unit.MEGABYTE;
 import static java.util.concurrent.TimeUnit.MILLISECONDS;
 import static java.util.concurrent.TimeUnit.SECONDS;
-import static org.assertj.core.api.Assertions.assertThatThrownBy;
 
 public class TestGcsFileSystemConfig
 {
     @Test
     void testDefaults()
     {
-        assertThatThrownBy(
-                () -> assertRecordedDefaults(recordDefaults(GcsFileSystemConfig.class)
-                                .setReadBlockSize(DataSize.of(2, MEGABYTE))
-                                .setWriteBlockSize(DataSize.of(16, MEGABYTE))
-                                .setPageSize(100)
-                                .setBatchSize(100)
-                                .setProjectId(null)
-                                .setEndpoint(Optional.empty())
-                                .setAuthType(AuthType.DEFAULT)
-                                .setJsonKey(null)
-                                .setJsonKeyFilePath(null)
-                                .setMaxRetries(20)
-                                .setBackoffScaleFactor(3.0)
-                                .setMaxRetryTime(new Duration(25, SECONDS))
-                                .setMinBackoffDelay(new Duration(10, MILLISECONDS))
-                                .setMaxBackoffDelay(new Duration(2000, MILLISECONDS))
-                                .setApplicationId("Trino")))
-                .isInstanceOf(AssertionError.class)
-                // use-access-token is now deprecated and isn't allowed to be set with auth-type
-                .hasMessage("Untested attributes: [UseGcsAccessToken]");
+        assertRecordedDefaults(recordDefaults(GcsFileSystemConfig.class)
+                .setReadBlockSize(DataSize.of(2, MEGABYTE))
+                .setWriteBlockSize(DataSize.of(16, MEGABYTE))
+                .setPageSize(100)
+                .setBatchSize(100)
+                .setUseGcsAccessToken(false)
+                .setProjectId(null)
+                .setEndpoint(Optional.empty())
+                .setAuthType(AuthType.DEFAULT)
+                .setJsonKey(null)
+                .setJsonKeyFilePath(null)
+                .setMaxRetries(20)
+                .setBackoffScaleFactor(3.0)
+                .setMaxRetryTime(new Duration(25, SECONDS))
+                .setMinBackoffDelay(new Duration(10, MILLISECONDS))
+                .setMaxBackoffDelay(new Duration(2000, MILLISECONDS))
+                .setApplicationId("Trino"));
     }
 
     @Test
@@ -187,16 +183,16 @@ public void testValidation()
 
         assertFailsValidation(
                 new GcsFileSystemConfig()
-                        .setAuthType(AuthType.DEFAULT)
-                        .setUseGcsAccessToken(true),
+                        .setUseGcsAccessToken(true)
+                        .setAuthType(AuthType.DEFAULT),
                 "authTypeAndUseGcsAccessTokenMutuallyExclusive",
                 "Cannot set both gcs.use-access-token and gcs.auth-type",
                 AssertTrue.class);
 
         assertFailsValidation(
                 new GcsFileSystemConfig()
-                        .setAuthType(AuthType.DEFAULT)
-                        .setUseGcsAccessToken(false),
+                        .setUseGcsAccessToken(false)
+                        .setAuthType(AuthType.DEFAULT),
                 "authTypeAndUseGcsAccessTokenMutuallyExclusive",
                 "Cannot set both gcs.use-access-token and gcs.auth-type",
                 AssertTrue.class);