Remove unused LogonMechanism config

Author: electrum

plugin/trino-teradata/pom.xml

@@ -40,6 +40,11 @@
             <artifactId>trino-plugin-toolkit</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>jakarta.validation</groupId>
+            <artifactId>jakarta.validation-api</artifactId>
+        </dependency>
+
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-annotations</artifactId>

plugin/trino-teradata/src/main/java/io/trino/plugin/teradata/LogonMechanism.java

@@ -41,17 +41,15 @@ public class TeradataClientModule
     @Provides
     @Singleton
     @ForBaseJdbc
-    public static ConnectionFactory getConnectionFactory(BaseJdbcConfig config, TeradataConfig teradataConfig, CredentialProvider credentialProvider, OpenTelemetry openTelemetry)
+    public static ConnectionFactory getConnectionFactory(BaseJdbcConfig config, CredentialProvider credentialProvider, OpenTelemetry openTelemetry)
             throws SQLException
     {
-        Properties connectionProperties = new Properties();
         Driver driver = DriverManager.getDriver(config.getConnectionUrl());
-        String logonMechanism = LogonMechanism.fromString(teradataConfig.getLogMech()).getMechanism();
-        connectionProperties.put("LOGMECH", logonMechanism);
-        if (!logonMechanism.equals("TD2")) {
-            throw new IllegalArgumentException("Unsupported logon mechanism: " + logonMechanism);
-        }
-        return DriverConnectionFactory.builder(driver, config.getConnectionUrl(), credentialProvider).setConnectionProperties(connectionProperties).setOpenTelemetry(openTelemetry).build();
+        Properties connectionProperties = new Properties();
+        connectionProperties.setProperty("LOGMECH", "TD2");
+        return DriverConnectionFactory.builder(driver, config.getConnectionUrl(), credentialProvider)
+                .setConnectionProperties(connectionProperties)
+                .setOpenTelemetry(openTelemetry).build();
     }
 
     @Override

plugin/trino-teradata/src/main/java/io/trino/plugin/teradata/TeradataClientModule.java

@@ -15,27 +15,13 @@
 
 import io.airlift.configuration.Config;
 import io.airlift.configuration.ConfigDescription;
-import io.trino.plugin.jdbc.BaseJdbcConfig;
+import jakarta.validation.constraints.NotNull;
 
 public class TeradataConfig
-        extends BaseJdbcConfig
 {
-    private String logMech = "TD2";
     private TeradataCaseSensitivity teradataCaseSensitivity = TeradataCaseSensitivity.CASE_SENSITIVE;
 
-    public String getLogMech()
-    {
-        return logMech;
-    }
-
-    @Config("logon-mechanism")
-    @ConfigDescription("Specifies the logon mechanism for Teradata (default: TD2). Use 'TD2' for TD2 authentication.")
-    public TeradataConfig setLogMech(String logMech)
-    {
-        this.logMech = logMech;
-        return this;
-    }
-
+    @NotNull
     public TeradataCaseSensitivity getTeradataCaseSensitivity()
     {
         return teradataCaseSensitivity;

plugin/trino-teradata/src/main/java/io/trino/plugin/teradata/TeradataConfig.java

@@ -13,38 +13,35 @@
  */
 package io.trino.plugin.teradata;
 
+import com.google.common.collect.ImmutableMap;
+import io.trino.plugin.teradata.TeradataConfig.TeradataCaseSensitivity;
 import org.junit.jupiter.api.Test;
 
-import static org.assertj.core.api.Assertions.assertThat;
+import java.util.Map;
+
+import static io.airlift.configuration.testing.ConfigAssertions.assertFullMapping;
+import static io.airlift.configuration.testing.ConfigAssertions.assertRecordedDefaults;
+import static io.airlift.configuration.testing.ConfigAssertions.recordDefaults;
 
 public class TestTeradataConfig
 {
     @Test
     public void testDefaults()
     {
-        TeradataConfig config = new TeradataConfig();
-        assertThat(config.getLogMech()).isEqualTo("TD2");
-        assertThat(config.getTeradataCaseSensitivity()).isEqualTo(TeradataConfig.TeradataCaseSensitivity.CASE_SENSITIVE);
+        assertRecordedDefaults(recordDefaults(TeradataConfig.class)
+                .setTeradataCaseSensitivity(TeradataCaseSensitivity.CASE_SENSITIVE));
     }
 
     @Test
-    public void testSetters()
+    public void testExplicitPropertyMappings()
     {
-        TeradataConfig config = new TeradataConfig()
-                .setLogMech("TD2")
-                .setTeradataCaseSensitivity(TeradataConfig.TeradataCaseSensitivity.CASE_INSENSITIVE);
-        assertThat(config.getLogMech()).isEqualTo("TD2");
-        assertThat(config.getTeradataCaseSensitivity()).isEqualTo(TeradataConfig.TeradataCaseSensitivity.CASE_INSENSITIVE);
-    }
+        Map<String, String> properties = ImmutableMap.<String, String>builder()
+                .put("teradata.case-sensitivity", "as-defined")
+                .buildOrThrow();
 
-    @Test
-    public void testTeradataCaseSensitivityEnum()
-    {
-        assertThat(TeradataConfig.TeradataCaseSensitivity.valueOf("CASE_INSENSITIVE"))
-                .isEqualTo(TeradataConfig.TeradataCaseSensitivity.CASE_INSENSITIVE);
-        assertThat(TeradataConfig.TeradataCaseSensitivity.valueOf("CASE_SENSITIVE"))
-                .isEqualTo(TeradataConfig.TeradataCaseSensitivity.CASE_SENSITIVE);
-        assertThat(TeradataConfig.TeradataCaseSensitivity.valueOf("AS_DEFINED"))
-                .isEqualTo(TeradataConfig.TeradataCaseSensitivity.AS_DEFINED);
+        TeradataConfig expected = new TeradataConfig()
+                .setTeradataCaseSensitivity(TeradataCaseSensitivity.AS_DEFINED);
+
+        assertFullMapping(properties, expected);
     }
 }

plugin/trino-teradata/src/test/java/io/trino/plugin/teradata/TestLogonMechanism.java

@@ -13,8 +13,6 @@
  */
 package io.trino.plugin.teradata.integration;
 
-import io.trino.plugin.teradata.LogonMechanism;
-
 import java.util.Map;
 
 public class DatabaseConfig
@@ -23,7 +21,6 @@ public class DatabaseConfig
     private final String hostName;
     private final String databaseName;
     private final boolean useClearScape;
-    private final LogonMechanism logMech;
     private final AuthenticationConfig authConfig;
     private final String clearScapeEnvName;
     private final Map<String, String> jdbcProperties;
@@ -34,7 +31,6 @@ private DatabaseConfig(Builder builder)
         this.hostName = builder.hostName;
         this.databaseName = builder.databaseName;
         this.useClearScape = builder.useClearScape;
-        this.logMech = builder.logMech;
         this.authConfig = builder.authConfig;
         this.clearScapeEnvName = builder.clearScapeEnvName;
         this.jdbcProperties = builder.jdbcProperties;
@@ -52,7 +48,6 @@ public Builder toBuilder()
                 .hostName(this.hostName)
                 .databaseName(this.databaseName)
                 .useClearScape(this.useClearScape)
-                .logMech(this.logMech)
                 .authConfig(this.authConfig)
                 .clearScapeEnvName(this.clearScapeEnvName)
                 .jdbcProperties(this.jdbcProperties);
@@ -73,11 +68,6 @@ public boolean isUseClearScape()
         return useClearScape;
     }
 
-    public LogonMechanism getLogMech()
-    {
-        return logMech;
-    }
-
     public AuthenticationConfig getAuthConfig()
     {
         return authConfig;
@@ -112,7 +102,6 @@ public static class Builder
         private String hostName;
         private String databaseName = "trino";
         private boolean useClearScape;
-        private LogonMechanism logMech = LogonMechanism.TD2;
         private AuthenticationConfig authConfig = new AuthenticationConfig();
         private String clearScapeEnvName;
         private Map<String, String> jdbcProperties;
@@ -135,12 +124,6 @@ public Builder useClearScape(boolean useClearScape)
             return this;
         }
 
-        public Builder logMech(LogonMechanism logMech)
-        {
-            this.logMech = logMech;
-            return this;
-        }
-
         public Builder authConfig(AuthenticationConfig authConfig)
         {
             this.authConfig = authConfig;

plugin/trino-teradata/src/test/java/io/trino/plugin/teradata/TestTeradataConfig.java

@@ -13,8 +13,6 @@
  */
 package io.trino.plugin.teradata.integration;
 
-import io.trino.plugin.teradata.LogonMechanism;
-
 import java.util.HashMap;
 import java.util.Map;
 
@@ -23,43 +21,31 @@
 
 public class DatabaseConfigFactory
 {
-    private static final String DEFAULT_LOG_MECH = "TD2";
-
     private DatabaseConfigFactory() {}
 
     public static DatabaseConfig create(String envName)
     {
-        String userName = null;
-        String password = null;
+        String userName;
+        String password;
         String hostName = null;
 
-        if (!isEnvSet("CLEARSCAPE_TOKEN")) {
-            hostName = requireEnv("hostname");
+        if (isEnvSet("CLEARSCAPE_TOKEN")) {
+            userName = TeradataTestConstants.ENV_CLEARSCAPE_USERNAME;
+            password = requireEnv("CLEARSCAPE_PASSWORD");
         }
-
-        String logMech = DEFAULT_LOG_MECH;
-        if (isEnvSet("logMech")) {
-            logMech = requireEnv("logMech");
+        else {
+            userName = requireEnv("TERADATA_USERNAME");
+            password = requireEnv("TERADATA_PASSWORD");
+            hostName = requireEnv("TERADATA_HOSTNAME");
         }
-        if (DEFAULT_LOG_MECH.equals(logMech)) {
-            if (isEnvSet("CLEARSCAPE_TOKEN")) {
-                userName = TeradataTestConstants.ENV_CLEARSCAPE_USERNAME;
-                password = requireEnv("CLEARSCAPE_PASSWORD");
-            }
-            else {
-                userName = requireEnv("username");
-                password = requireEnv("password");
-            }
-        }
-        LogonMechanism logonMechanism = LogonMechanism.fromString(logMech);
+
         String databaseName = envName.replace("-", "_");
 
         AuthenticationConfig authConfig = createAuthConfig(userName, password);
         return DatabaseConfig.builder()
                 .hostName(hostName)
                 .databaseName(databaseName)
-                .useClearScape(isEnvSet("CLEARSCAPE_TOKEN"))
-                .logMech(logonMechanism)
+                .useClearScape(hostName == null)
                 .authConfig(authConfig)
                 .clearScapeEnvName(envName)
                 .jdbcProperties(getJdbcProperties())