Merge pull request #12810 from aloubyansky/create-or-empty-dir

Replace recursiveDeleteAndThenCreate(dir) with createOrEmptyDir(dir)
quarkusio · Oct 20, 2020 · ef410e6 · ef410e6
2 parents a21f2bc + 311d0af
commit ef410e6
Show file tree

Hide file tree

Showing 5 changed files with 28 additions and 31 deletions.
diff --git a/core/deployment/src/main/java/io/quarkus/deployment/mutability/DevModeTask.java b/core/deployment/src/main/java/io/quarkus/deployment/mutability/DevModeTask.java
@@ -129,7 +129,7 @@ public static void extractDevModeClasses(Path appRoot, AppModel appModel, PostEx
                 //not all local projects are dependencies
                 continue;
             }
-            IoUtils.recursiveDeleteAndThenCreate(moduleClasses);
+            IoUtils.createOrEmptyDir(moduleClasses);
             for (Path p : dep.getPaths()) {
                 if (Files.isDirectory(p)) {
                     Path moduleTarget = moduleClasses;

diff --git a/core/deployment/src/main/java/io/quarkus/deployment/pkg/steps/AppCDSBuildStep.java b/core/deployment/src/main/java/io/quarkus/deployment/pkg/steps/AppCDSBuildStep.java
@@ -38,7 +38,7 @@ public class AppCDSBuildStep {
     public void requested(OutputTargetBuildItem outputTarget, BuildProducer<AppCDSRequestedBuildItem> producer)
             throws IOException {
         Path appCDSDir = outputTarget.getOutputDirectory().resolve("appcds");
-        IoUtils.recursiveDeleteAndThenCreate(appCDSDir);
+        IoUtils.createOrEmptyDir(appCDSDir);
 
         producer.produce(new AppCDSRequestedBuildItem(outputTarget.getOutputDirectory().resolve("appcds")));
     }

diff --git a/core/deployment/src/main/java/io/quarkus/deployment/pkg/steps/JarResultBuildStep.java b/core/deployment/src/main/java/io/quarkus/deployment/pkg/steps/JarResultBuildStep.java
@@ -415,7 +415,7 @@ private JarBuildItem buildLegacyThinJar(CurateOutcomeBuildItem curateOutcomeBuil
                 .resolve(outputTargetBuildItem.getBaseName() + packageConfig.runnerSuffix + ".jar");
         Path libDir = outputTargetBuildItem.getOutputDirectory().resolve("lib");
         Files.deleteIfExists(runnerJar);
-        IoUtils.recursiveDeleteAndThenCreate(libDir);
+        IoUtils.createOrEmptyDir(libDir);
 
         try (FileSystem runnerZipFs = ZipUtils.newZip(runnerJar)) {
 
@@ -464,7 +464,7 @@ private JarBuildItem buildThinJar(CurateOutcomeBuildItem curateOutcomeBuildItem,
             userProviders = buildDir.resolve(packageConfig.userProvidersDirectory.get());
         }
         if (!rebuild) {
-            IoUtils.recursiveDeleteAndThenCreate(buildDir);
+            IoUtils.createOrEmptyDir(buildDir);
             Files.createDirectories(mainLib);
             Files.createDirectories(baseLib);
             Files.createDirectories(appDir);
@@ -476,7 +476,7 @@ private JarBuildItem buildThinJar(CurateOutcomeBuildItem curateOutcomeBuildItem,
                 Files.createFile(userProviders.resolve(".keep"));
             }
         } else {
-            IoUtils.recursiveDeleteAndThenCreate(quarkus);
+            IoUtils.createOrEmptyDir(quarkus);
         }
         Map<AppArtifactKey, List<Path>> copiedArtifacts = new HashMap<>();
 
@@ -714,7 +714,7 @@ public NativeImageSourceJarBuildItem buildNativeImageJar(CurateOutcomeBuildItem
             List<UberJarRequiredBuildItem> uberJarRequired) throws Exception {
         Path targetDirectory = outputTargetBuildItem.getOutputDirectory()
                 .resolve(outputTargetBuildItem.getBaseName() + "-native-image-source-jar");
-        IoUtils.recursiveDeleteAndThenCreate(targetDirectory);
+        IoUtils.createOrEmptyDir(targetDirectory);
 
         List<GeneratedClassBuildItem> allClasses = new ArrayList<>(generatedClasses);
         allClasses.addAll(nativeImageResources.stream()

diff --git a/core/deployment/src/main/java/io/quarkus/deployment/util/WebJarUtil.java b/core/deployment/src/main/java/io/quarkus/deployment/util/WebJarUtil.java
@@ -59,7 +59,7 @@ public static Path devOrTest(CurateOutcomeBuildItem curateOutcomeBuildItem, Laun
 
         // Clean on non dev mode
         if (!launch.getLaunchMode().equals(LaunchMode.DEVELOPMENT)) {
-            IoUtils.recursiveDeleteAndThenCreate(path);
+            IoUtils.createOrEmptyDir(path);
         }
 
         if (isEmpty(path)) {

diff --git a/...pendent-projects/bootstrap/app-model/src/main/java/io/quarkus/bootstrap/util/IoUtils.java b/...pendent-projects/bootstrap/app-model/src/main/java/io/quarkus/bootstrap/util/IoUtils.java
@@ -6,7 +6,7 @@
 import java.io.OutputStream;
 import java.io.StringWriter;
 import java.nio.charset.StandardCharsets;
-import java.nio.file.AccessDeniedException;
+import java.nio.file.DirectoryStream;
 import java.nio.file.FileAlreadyExistsException;
 import java.nio.file.FileVisitOption;
 import java.nio.file.FileVisitResult;
@@ -18,6 +18,7 @@
 import java.nio.file.StandardOpenOption;
 import java.nio.file.attribute.BasicFileAttributes;
 import java.util.EnumSet;
+import java.util.Objects;
 import java.util.UUID;
 
 /**
@@ -90,31 +91,27 @@ public FileVisitResult postVisitDirectory(Path dir, IOException e)
         }
     }
 
-    public static void recursiveDeleteAndThenCreate(Path root) throws IOException {
-        recursiveDelete(root);
-        if (!PropertyUtils.isWindows()) {
-            Files.createDirectories(root);
+    /**
+     * Creates a new empty directory or empties an existing one.
+     * 
+     * @param dir directory
+     * @throws IOException in case of a failure
+     */
+    public static void createOrEmptyDir(Path dir) throws IOException {
+        Objects.requireNonNull(dir);
+        if (!Files.exists(dir)) {
+            Files.createDirectories(dir);
             return;
         }
-
-        // in Windows, recreating a directory right after deleting it can be problematic, see https://bugs.openjdk.java.net/browse/JDK-8029608
-        // so we just try the create a operation a few times and hope it works
-
-        final int maxTries = 3;
-        int i = 0;
-        while (true) {
-            try {
-                Files.createDirectories(root);
-                return;
-            } catch (AccessDeniedException e) {
-                if (++i == maxTries) {
-                    throw e;
-                }
-
-                try {
-                    Thread.sleep(100);
-                } catch (InterruptedException ignored) {
-
+        if (!Files.isDirectory(dir)) {
+            throw new IllegalArgumentException(dir + " is not a directory");
+        }
+        try (DirectoryStream<Path> stream = Files.newDirectoryStream(dir)) {
+            for (Path p : stream) {
+                if (Files.isDirectory(p)) {
+                    recursiveDelete(p);
+                } else {
+                    Files.delete(p);
                 }
             }
         }