Use Path instead of a File for plugin.dir

Author: wendigo

core/trino-main/src/main/java/io/trino/server/ServerPluginsProvider.java

@@ -16,12 +16,12 @@
 import com.google.inject.Inject;
 import io.trino.server.PluginManager.PluginsProvider;
 
-import java.io.File;
 import java.io.IOException;
 import java.io.UncheckedIOException;
 import java.net.MalformedURLException;
 import java.net.URL;
 import java.nio.file.DirectoryStream;
+import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.List;
 import java.util.concurrent.Callable;
@@ -36,7 +36,7 @@
 public class ServerPluginsProvider
         implements PluginsProvider
 {
-    private final List<File> installedPluginsDirs;
+    private final List<Path> installedPluginsDirs;
     private final Executor executor;
 
     @Inject
@@ -53,28 +53,28 @@ public void loadPlugins(Loader loader, ClassLoaderFactory createClassLoader)
                 executor,
                 installedPluginsDirs.stream()
                         .flatMap(installedPluginsDir -> listFiles(installedPluginsDir).stream())
-                        .filter(File::isDirectory)
-                        .map(file -> (Callable<?>) () -> {
-                            loader.load(file.getAbsolutePath(), () ->
-                                    createClassLoader.create(file.getName(), buildClassPath(file)));
+                        .filter(Files::isDirectory)
+                        .map(Path::toAbsolutePath)
+                        .map(path -> (Callable<?>) () -> {
+                            String name = path.getFileName().toString();
+                            loader.load(name, () -> createClassLoader.create(name, buildClassPath(path)));
                             return null;
                         })
                         .collect(toImmutableList()));
     }
 
-    private static List<URL> buildClassPath(File path)
+    private static List<URL> buildClassPath(Path path)
     {
         return listFiles(path).stream()
                 .map(ServerPluginsProvider::fileToUrl)
                 .collect(toImmutableList());
     }
 
-    private static List<File> listFiles(File path)
+    private static List<Path> listFiles(Path path)
     {
         try {
-            try (DirectoryStream<Path> directoryStream = newDirectoryStream(path.toPath())) {
+            try (DirectoryStream<Path> directoryStream = newDirectoryStream(path)) {
                 return stream(directoryStream)
-                        .map(Path::toFile)
                         .sorted()
                         .collect(toImmutableList());
             }
@@ -84,10 +84,10 @@ private static List<File> listFiles(File path)
         }
     }
 
-    private static URL fileToUrl(File file)
+    private static URL fileToUrl(Path file)
     {
         try {
-            return file.toURI().toURL();
+            return file.toUri().toURL();
         }
         catch (MalformedURLException e) {
             throw new UncheckedIOException(e);

core/trino-main/src/main/java/io/trino/server/ServerPluginsProviderConfig.java

@@ -18,21 +18,21 @@
 import io.airlift.configuration.ConfigDescription;
 import io.airlift.configuration.validation.FileExists;
 
-import java.io.File;
+import java.nio.file.Path;
 import java.util.List;
 
 public class ServerPluginsProviderConfig
 {
-    private List<File> installedPluginsDirs = ImmutableList.of(new File("plugin"));
+    private List<Path> installedPluginsDirs = ImmutableList.of(Path.of("plugin"));
 
-    public List<@FileExists File> getInstalledPluginsDirs()
+    public List<@FileExists Path> getInstalledPluginsDirs()
     {
         return installedPluginsDirs;
     }
 
     @Config("plugin.dir")
     @ConfigDescription("Comma separated list of root directories where the plugins are located")
-    public ServerPluginsProviderConfig setInstalledPluginsDirs(List<File> installedPluginsDirs)
+    public ServerPluginsProviderConfig setInstalledPluginsDirs(List<Path> installedPluginsDirs)
     {
         this.installedPluginsDirs = ImmutableList.copyOf(installedPluginsDirs);
         return this;

core/trino-main/src/test/java/io/trino/server/TestServerPluginsProviderConfig.java

@@ -17,7 +17,6 @@
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.io.TempDir;
 
-import java.io.File;
 import java.nio.file.Path;
 import java.util.List;
 import java.util.Map;
@@ -32,7 +31,7 @@ public class TestServerPluginsProviderConfig
     public void testDefaults()
     {
         assertRecordedDefaults(recordDefaults(ServerPluginsProviderConfig.class)
-                .setInstalledPluginsDirs(List.of(new File("plugin"))));
+                .setInstalledPluginsDirs(List.of(Path.of("plugin"))));
     }
 
     @Test
@@ -41,7 +40,7 @@ public void testExplicitPropertyMappings(@TempDir Path tempDir)
         Map<String, String> properties = ImmutableMap.of("plugin.dir", tempDir.toString());
 
         ServerPluginsProviderConfig expected = new ServerPluginsProviderConfig()
-                .setInstalledPluginsDirs(List.of(tempDir.toFile()));
+                .setInstalledPluginsDirs(List.of(tempDir));
 
         assertFullMapping(properties, expected);
     }
@@ -52,7 +51,7 @@ public void testExplicitPropertyMappingMultiDir(@TempDir Path tempDir1, @TempDir
         Map<String, String> properties = ImmutableMap.of("plugin.dir", tempDir1.toString() + "," + tempDir2.toString());
 
         ServerPluginsProviderConfig expected = new ServerPluginsProviderConfig()
-                .setInstalledPluginsDirs(List.of(tempDir1.toFile(), tempDir2.toFile()));
+                .setInstalledPluginsDirs(List.of(tempDir1, tempDir2));
 
         assertFullMapping(properties, expected);
     }

testing/trino-plugin-reader/src/main/java/io/trino/server/PluginLoader.java

@@ -17,7 +17,7 @@
 import io.trino.spi.Plugin;
 import io.trino.spi.classloader.ThreadContextClassLoader;
 
-import java.io.File;
+import java.nio.file.Path;
 import java.util.List;
 import java.util.ServiceLoader;
 import java.util.function.Supplier;
@@ -67,7 +67,7 @@ public static void printPluginFeatures(Plugin plugin)
         plugin.getExchangeManagerFactories().forEach(factory -> System.out.println(EXCHANGE_MANAGER + factory.getName()));
     }
 
-    public static List<Plugin> loadPlugins(List<File> path)
+    public static List<Plugin> loadPlugins(List<Path> path)
     {
         ServerPluginsProviderConfig config = new ServerPluginsProviderConfig();
         config.setInstalledPluginsDirs(path);

testing/trino-plugin-reader/src/main/java/io/trino/server/PluginReader.java

@@ -22,6 +22,7 @@
 import java.io.File;
 import java.io.IOException;
 import java.nio.file.Files;
+import java.nio.file.Path;
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
@@ -46,7 +47,7 @@ public class PluginReader
     private Optional<File> impactedModulesFile;
 
     @Option(names = {"-p", "--plugin-dir"}, description = "Trino plugin directories", arity = "1..*")
-    private List<File> pluginDirs = List.of(new File("plugin"));
+    private List<Path> pluginDirs = List.of(Path.of("plugin"));
 
     @Option(names = {"-r", "--root-pom"}, description = "Trino root module pom.xml")
     private File rootPom = new File("pom.xml");