Use List/Set injection into configuration

core/trino-main/src/main/java/io/trino/FeaturesConfig.java

@@ -14,7 +14,6 @@
 package io.trino;
 
 import com.google.common.annotations.VisibleForTesting;
-import com.google.common.base.Splitter;
 import com.google.common.collect.ImmutableList;
 import io.airlift.configuration.Config;
 import io.airlift.configuration.ConfigDescription;
@@ -276,10 +275,11 @@ public List<Path> getSpillerSpillPaths()
     }
 
     @Config("spiller-spill-path")
-    public FeaturesConfig setSpillerSpillPaths(String spillPaths)
+    public FeaturesConfig setSpillerSpillPaths(List<String> spillPaths)
     {
-        List<String> spillPathsSplit = ImmutableList.copyOf(Splitter.on(",").trimResults().omitEmptyStrings().split(spillPaths));
-        this.spillerSpillPaths = spillPathsSplit.stream().map(Paths::get).collect(toImmutableList());
+        this.spillerSpillPaths = spillPaths.stream()
+                .map(Paths::get)
+                .collect(toImmutableList());
         return this;
     }
 

core/trino-main/src/main/java/io/trino/connector/FileCatalogStoreConfig.java

@@ -13,7 +13,6 @@
  */
 package io.trino.connector;
 
-import com.google.common.base.Splitter;
 import com.google.common.collect.ImmutableList;
 import io.airlift.configuration.Config;
 import io.airlift.configuration.LegacyConfig;
@@ -24,10 +23,8 @@
 
 public class FileCatalogStoreConfig
 {
-    private static final Splitter SPLITTER = Splitter.on(',').trimResults().omitEmptyStrings();
-
     private File catalogConfigurationDir = new File("etc/catalog/");
-    private List<String> disabledCatalogs;
+    private List<String> disabledCatalogs = ImmutableList.of();
     private boolean readOnly;
 
     @NotNull
@@ -50,15 +47,9 @@ public List<String> getDisabledCatalogs()
     }
 
     @Config("catalog.disabled-catalogs")
-    public FileCatalogStoreConfig setDisabledCatalogs(String catalogs)
-    {
-        this.disabledCatalogs = (catalogs == null) ? null : SPLITTER.splitToList(catalogs);
-        return this;
-    }
-
     public FileCatalogStoreConfig setDisabledCatalogs(List<String> catalogs)
     {
-        this.disabledCatalogs = (catalogs == null) ? null : ImmutableList.copyOf(catalogs);
+        this.disabledCatalogs = ImmutableList.copyOf(catalogs);
         return this;
     }
 

core/trino-main/src/main/java/io/trino/connector/StaticCatalogManagerConfig.java

@@ -13,7 +13,6 @@
  */
 package io.trino.connector;
 
-import com.google.common.base.Splitter;
 import com.google.common.collect.ImmutableList;
 import io.airlift.configuration.Config;
 import io.airlift.configuration.LegacyConfig;
@@ -24,10 +23,8 @@
 
 public class StaticCatalogManagerConfig
 {
-    private static final Splitter SPLITTER = Splitter.on(',').trimResults().omitEmptyStrings();
-
     private File catalogConfigurationDir = new File("etc/catalog/");
-    private List<String> disabledCatalogs;
+    private List<String> disabledCatalogs = ImmutableList.of();
 
     @NotNull
     public File getCatalogConfigurationDir()
@@ -49,15 +46,9 @@ public List<String> getDisabledCatalogs()
     }
 
     @Config("catalog.disabled-catalogs")
-    public StaticCatalogManagerConfig setDisabledCatalogs(String catalogs)
-    {
-        this.disabledCatalogs = (catalogs == null) ? null : SPLITTER.splitToList(catalogs);
-        return this;
-    }
-
     public StaticCatalogManagerConfig setDisabledCatalogs(List<String> catalogs)
     {
-        this.disabledCatalogs = (catalogs == null) ? null : ImmutableList.copyOf(catalogs);
+        this.disabledCatalogs = ImmutableList.copyOf(catalogs);
         return this;
     }
 }

core/trino-main/src/main/java/io/trino/eventlistener/EventListenerConfig.java

@@ -13,7 +13,6 @@
  */
 package io.trino.eventlistener;
 
-import com.google.common.base.Splitter;
 import com.google.common.collect.ImmutableList;
 import io.airlift.configuration.Config;
 import io.airlift.configuration.validation.FileExists;
@@ -26,7 +25,6 @@
 
 public class EventListenerConfig
 {
-    private static final Splitter SPLITTER = Splitter.on(',').trimResults().omitEmptyStrings();
     private List<File> eventListenerFiles = ImmutableList.of();
 
     @NotNull
@@ -36,17 +34,11 @@ public class EventListenerConfig
     }
 
     @Config("event-listener.config-files")
-    public EventListenerConfig setEventListenerFiles(String eventListenerFiles)
+    public EventListenerConfig setEventListenerFiles(List<String> eventListenerFiles)
     {
-        this.eventListenerFiles = SPLITTER.splitToList(eventListenerFiles).stream()
+        this.eventListenerFiles = eventListenerFiles.stream()
                 .map(File::new)
                 .collect(toImmutableList());
         return this;
     }
-
-    public EventListenerConfig setEventListenerFiles(List<File> eventListenerFiles)
-    {
-        this.eventListenerFiles = ImmutableList.copyOf(eventListenerFiles);
-        return this;
-    }
 }

core/trino-main/src/main/java/io/trino/execution/scheduler/SubnetTopologyConfig.java

@@ -13,13 +13,11 @@
  */
 package io.trino.execution.scheduler;
 
-import com.google.common.base.Splitter;
 import com.google.common.collect.ImmutableList;
 import io.airlift.configuration.Config;
 
 import java.util.List;
 
-import static com.google.common.collect.ImmutableList.toImmutableList;
 import static io.trino.execution.scheduler.SubnetBasedTopology.AddressProtocol.IPv4;
 
 public class SubnetTopologyConfig
@@ -33,11 +31,9 @@ public List<Integer> getCidrPrefixLengths()
     }
 
     @Config("node-scheduler.network-topology.subnet.cidr-prefix-lengths")
-    public SubnetTopologyConfig setCidrPrefixLengths(String commaSeparatedLengths)
+    public SubnetTopologyConfig setCidrPrefixLengths(List<Integer> cidrPrefixLengths)
     {
-        this.cidrPrefixLengths = Splitter.on(',').omitEmptyStrings().splitToList(commaSeparatedLengths).stream()
-                .map(Integer::parseInt)
-                .collect(toImmutableList());
+        this.cidrPrefixLengths = ImmutableList.copyOf(cidrPrefixLengths);
         return this;
     }
 

core/trino-main/src/main/java/io/trino/execution/scheduler/TopologyAwareNodeSelectorConfig.java

@@ -13,15 +13,12 @@
  */
 package io.trino.execution.scheduler;
 
-import com.google.common.base.Splitter;
 import com.google.common.collect.ImmutableList;
 import io.airlift.configuration.Config;
 import jakarta.validation.constraints.NotNull;
 
 import java.util.List;
 
-import static java.util.Objects.requireNonNull;
-
 public class TopologyAwareNodeSelectorConfig
 {
     public enum TopologyType
@@ -51,19 +48,10 @@ public List<String> getLocationSegmentNames()
         return locationSegmentNames;
     }
 
-    public TopologyAwareNodeSelectorConfig setLocationSegmentNames(List<String> locationSegmentNames)
-    {
-        this.locationSegmentNames = requireNonNull(locationSegmentNames, "locationSegmentNames is null");
-        return this;
-    }
-
     @Config("node-scheduler.network-topology.segments")
-    public TopologyAwareNodeSelectorConfig setLocationSegmentNames(String locationSegmentNames)
+    public TopologyAwareNodeSelectorConfig setLocationSegmentNames(List<String> locationSegmentNames)
     {
-        this.locationSegmentNames = Splitter.on(",")
-                .trimResults()
-                .omitEmptyStrings()
-                .splitToList(locationSegmentNames);
+        this.locationSegmentNames = ImmutableList.copyOf(locationSegmentNames);
         return this;
     }
 }

core/trino-main/src/main/java/io/trino/security/AccessControlConfig.java

@@ -13,7 +13,6 @@
  */
 package io.trino.security;
 
-import com.google.common.base.Splitter;
 import com.google.common.collect.ImmutableList;
 import io.airlift.configuration.Config;
 import io.airlift.configuration.validation.FileExists;
@@ -26,7 +25,6 @@
 
 public class AccessControlConfig
 {
-    private static final Splitter SPLITTER = Splitter.on(',').trimResults().omitEmptyStrings();
     private List<File> accessControlFiles = ImmutableList.of();
 
     @NotNull
@@ -36,17 +34,11 @@ public class AccessControlConfig
     }
 
     @Config("access-control.config-files")
-    public AccessControlConfig setAccessControlFiles(String accessControlFiles)
+    public AccessControlConfig setAccessControlFiles(List<String> accessControlFiles)
     {
-        this.accessControlFiles = SPLITTER.splitToList(accessControlFiles).stream()
+        this.accessControlFiles = accessControlFiles.stream()
                 .map(File::new)
                 .collect(toImmutableList());
         return this;
     }
-
-    public AccessControlConfig setAccessControlFiles(List<File> accessControlFiles)
-    {
-        this.accessControlFiles = ImmutableList.copyOf(accessControlFiles);
-        return this;
-    }
 }

core/trino-main/src/main/java/io/trino/server/security/PasswordAuthenticatorConfig.java

@@ -13,7 +13,6 @@
  */
 package io.trino.server.security;
 
-import com.google.common.base.Splitter;
 import com.google.common.collect.ImmutableList;
 import io.airlift.configuration.Config;
 import io.airlift.configuration.ConfigDescription;
@@ -29,7 +28,6 @@
 
 public class PasswordAuthenticatorConfig
 {
-    private static final Splitter SPLITTER = Splitter.on(',').trimResults().omitEmptyStrings();
     private Optional<String> userMappingPattern = Optional.empty();
     private Optional<File> userMappingFile = Optional.empty();
     private List<File> passwordAuthenticatorFiles = ImmutableList.of(new File("etc/password-authenticator.properties"));
@@ -67,9 +65,9 @@ public PasswordAuthenticatorConfig setUserMappingFile(File userMappingFile)
 
     @Config("password-authenticator.config-files")
     @ConfigDescription("Ordered list of password authenticator config files")
-    public PasswordAuthenticatorConfig setPasswordAuthenticatorFiles(String passwordAuthenticatorFiles)
+    public PasswordAuthenticatorConfig setPasswordAuthenticatorFiles(List<String> passwordAuthenticatorFiles)
     {
-        this.passwordAuthenticatorFiles = SPLITTER.splitToList(passwordAuthenticatorFiles).stream()
+        this.passwordAuthenticatorFiles = passwordAuthenticatorFiles.stream()
                 .map(File::new)
                 .collect(toImmutableList());
         return this;

core/trino-main/src/main/java/io/trino/server/security/SecurityConfig.java

@@ -13,7 +13,6 @@
  */
 package io.trino.server.security;
 
-import com.google.common.base.Splitter;
 import com.google.common.collect.ImmutableList;
 import io.airlift.configuration.Config;
 import io.airlift.configuration.ConfigDescription;
@@ -30,8 +29,6 @@
         "dispatcher.forwarded-header"})
 public class SecurityConfig
 {
-    private static final Splitter SPLITTER = Splitter.on(',').trimResults().omitEmptyStrings();
-
     private boolean insecureAuthenticationOverHttpAllowed = true;
     private List<String> authenticationTypes = ImmutableList.of("insecure");
     private Optional<String> fixedManagementUser = Optional.empty();
@@ -57,17 +54,11 @@ public List<String> getAuthenticationTypes()
         return authenticationTypes;
     }
 
-    public SecurityConfig setAuthenticationTypes(List<String> authenticationTypes)
-    {
-        this.authenticationTypes = ImmutableList.copyOf(authenticationTypes);
-        return this;
-    }
-
     @Config("http-server.authentication.type")
     @ConfigDescription("Ordered list of authentication types")
-    public SecurityConfig setAuthenticationTypes(String types)
+    public SecurityConfig setAuthenticationTypes(List<String> types)
     {
-        authenticationTypes = Optional.ofNullable(types).map(SPLITTER::splitToList).orElse(null);
+        authenticationTypes = ImmutableList.copyOf(types);
         return this;
     }
 

core/trino-main/src/main/java/io/trino/server/security/oauth2/OAuth2Config.java

@@ -13,7 +13,6 @@
  */
 package io.trino.server.security.oauth2;
 
-import com.google.common.base.Splitter;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableSet;
 import io.airlift.configuration.Config;
@@ -32,7 +31,6 @@
 import java.util.Set;
 import java.util.concurrent.TimeUnit;
 
-import static com.google.common.collect.ImmutableSet.toImmutableSet;
 import static io.trino.server.security.oauth2.OAuth2Service.OPENID_SCOPE;
 
 public class OAuth2Config
@@ -132,9 +130,9 @@ public Set<String> getScopes()
 
     @Config("http-server.authentication.oauth2.scopes")
     @ConfigDescription("Scopes requested by the server during OAuth2 authorization challenge")
-    public OAuth2Config setScopes(String scopes)
+    public OAuth2Config setScopes(Set<String> scopes)
     {
-        this.scopes = Splitter.on(',').trimResults().omitEmptyStrings().splitToStream(scopes).collect(toImmutableSet());
+        this.scopes = ImmutableSet.copyOf(scopes);
         return this;
     }
 

core/trino-main/src/test/java/io/trino/connector/TestFileCatalogStoreConfig.java

@@ -31,7 +31,7 @@ public void testDefaults()
     {
         assertRecordedDefaults(recordDefaults(FileCatalogStoreConfig.class)
                 .setCatalogConfigurationDir(new File("etc/catalog"))
-                .setDisabledCatalogs((String) null)
+                .setDisabledCatalogs(ImmutableList.of())
                 .setReadOnly(false));
     }
 

core/trino-main/src/test/java/io/trino/connector/TestStaticCatalogManagerConfig.java

@@ -31,7 +31,7 @@ public void testDefaults()
     {
         assertRecordedDefaults(recordDefaults(StaticCatalogManagerConfig.class)
                 .setCatalogConfigurationDir(new File("etc/catalog"))
-                .setDisabledCatalogs((String) null));
+                .setDisabledCatalogs(ImmutableList.of()));
     }
 
     @Test

core/trino-main/src/test/java/io/trino/eventlistener/TestEventListenerConfig.java

@@ -32,7 +32,7 @@ public class TestEventListenerConfig
     public void testDefaults()
     {
         assertRecordedDefaults(ConfigAssertions.recordDefaults(EventListenerConfig.class)
-                .setEventListenerFiles(""));
+                .setEventListenerFiles(ImmutableList.of()));
     }
 
     @Test
@@ -45,7 +45,7 @@ public void testExplicitPropertyMappings()
         Map<String, String> properties = ImmutableMap.of("event-listener.config-files", config1.toString() + "," + config2.toString());
 
         EventListenerConfig expected = new EventListenerConfig()
-                .setEventListenerFiles(ImmutableList.of(config1.toFile(), config2.toFile()));
+                .setEventListenerFiles(ImmutableList.of(config1.toFile().getPath(), config2.toFile().getPath()));
 
         assertFullMapping(properties, expected);
     }

core/trino-main/src/test/java/io/trino/execution/scheduler/TestSubnetTopologyConfig.java

@@ -13,6 +13,7 @@
  */
 package io.trino.execution.scheduler;
 
+import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
 import io.airlift.configuration.testing.ConfigAssertions;
 import org.junit.jupiter.api.Test;
@@ -29,7 +30,7 @@ public class TestSubnetTopologyConfig
     public void testDefaults()
     {
         ConfigAssertions.assertRecordedDefaults(ConfigAssertions.recordDefaults(SubnetTopologyConfig.class)
-                .setCidrPrefixLengths("")
+                .setCidrPrefixLengths(ImmutableList.of())
                 .setAddressProtocol(IPv4));
     }
 
@@ -43,7 +44,7 @@ public void testExplicitPropertyMappings()
                 .buildOrThrow();
 
         SubnetTopologyConfig expected = new SubnetTopologyConfig()
-                .setCidrPrefixLengths("24,26")
+                .setCidrPrefixLengths(ImmutableList.of(24, 26))
                 .setAddressProtocol(IPv6);
 
         ConfigAssertions.assertFullMapping(properties, expected);

core/trino-main/src/test/java/io/trino/execution/scheduler/TestTopologyAwareNodeSelectorConfig.java

@@ -28,7 +28,7 @@ public void testDefaults()
     {
         ConfigAssertions.assertRecordedDefaults(ConfigAssertions.recordDefaults(TopologyAwareNodeSelectorConfig.class)
                 .setType(TopologyType.FLAT)
-                .setLocationSegmentNames("machine"));
+                .setLocationSegmentNames(ImmutableList.of("machine")));
     }
 
     @Test