Only read file attributes once when creating Directory or ArchivePath…

…Tree
quarkusio · Jan 1, 2022 · c0dc00f · c0dc00f
1 parent c8d74d3
commit c0dc00f
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 12 deletions.
diff --git a/...cts/bootstrap/app-model/src/main/java/io/quarkus/maven/dependency/ResolvedDependency.java b/...cts/bootstrap/app-model/src/main/java/io/quarkus/maven/dependency/ResolvedDependency.java
@@ -2,12 +2,10 @@
 
 import io.quarkus.bootstrap.workspace.ArtifactSources;
 import io.quarkus.bootstrap.workspace.WorkspaceModule;
-import io.quarkus.paths.DirectoryPathTree;
 import io.quarkus.paths.EmptyPathTree;
 import io.quarkus.paths.MultiRootPathTree;
 import io.quarkus.paths.PathCollection;
 import io.quarkus.paths.PathTree;
-import java.nio.file.Files;
 import java.nio.file.Path;
 
 public interface ResolvedDependency extends Dependency {
@@ -40,12 +38,12 @@ default PathTree getContentTree() {
         }
         if (paths.isSinglePath()) {
             final Path p = paths.getSinglePath();
-            return Files.isDirectory(p) ? new DirectoryPathTree(p) : PathTree.ofArchive(p);
+            return PathTree.ofDirectoryOrArchive(p);
         }
         final PathTree[] trees = new PathTree[paths.size()];
         int i = 0;
         for (Path p : paths) {
-            trees[i++] = Files.isDirectory(p) ? new DirectoryPathTree(p) : PathTree.ofArchive(p);
+            trees[i++] = PathTree.ofDirectoryOrArchive(p);
         }
         return new MultiRootPathTree(trees);
     }

diff --git a/independent-projects/bootstrap/app-model/src/main/java/io/quarkus/paths/PathTree.java b/independent-projects/bootstrap/app-model/src/main/java/io/quarkus/paths/PathTree.java
@@ -1,21 +1,39 @@
 package io.quarkus.paths;
 
+import java.io.IOException;
 import java.nio.file.Files;
 import java.nio.file.Path;
+import java.nio.file.attribute.BasicFileAttributes;
 import java.util.Collection;
 import java.util.function.Function;
 import java.util.jar.Manifest;
 
 public interface PathTree {
 
     static PathTree of(Path p) {
-        if (Files.isDirectory(p)) {
-            return new DirectoryPathTree(p);
-        }
-        if (Files.exists(p)) {
+        try {
+            BasicFileAttributes fileAttributes = Files.readAttributes(p, BasicFileAttributes.class);
+            if (fileAttributes.isDirectory()) {
+                return new DirectoryPathTree(p);
+            }
+
             return new FilePathTree(p);
+        } catch (IOException e) {
+            throw new IllegalArgumentException(p + " does not exist", e);
+        }
+    }
+
+    static PathTree ofDirectoryOrArchive(Path p) {
+        try {
+            BasicFileAttributes fileAttributes = Files.readAttributes(p, BasicFileAttributes.class);
+            if (fileAttributes.isDirectory()) {
+                return new DirectoryPathTree(p);
+            }
+
+            return new ArchivePathTree(p);
+        } catch (IOException e) {
+            throw new IllegalArgumentException(p + " does not exist", e);
         }
-        throw new IllegalArgumentException(p + " does not exist");
     }
 
     static PathTree ofArchive(Path archive) {

diff --git a/...ects/bootstrap/core/src/main/java/io/quarkus/bootstrap/classloading/ClassPathElement.java b/...ects/bootstrap/core/src/main/java/io/quarkus/bootstrap/classloading/ClassPathElement.java
@@ -2,12 +2,10 @@
 
 import io.quarkus.maven.dependency.ArtifactKey;
 import io.quarkus.maven.dependency.ResolvedDependency;
-import io.quarkus.paths.DirectoryPathTree;
 import io.quarkus.paths.EmptyPathTree;
 import io.quarkus.paths.OpenPathTree;
 import io.quarkus.paths.PathTree;
 import java.io.Closeable;
-import java.nio.file.Files;
 import java.nio.file.Path;
 import java.security.ProtectionDomain;
 import java.util.Collections;
@@ -81,7 +79,7 @@ default ArtifactKey getDependencyKey() {
      * Creates an element from a file system path
      */
     static ClassPathElement fromPath(Path path, boolean runtime) {
-        return new PathTreeClassPathElement(Files.isDirectory(path) ? new DirectoryPathTree(path) : PathTree.ofArchive(path),
+        return new PathTreeClassPathElement(PathTree.ofDirectoryOrArchive(path),
                 runtime);
     }