SONAR-7125 use efficient delete dir method in sonar-process

1 files changed, 1 insertions, 33 deletions

diff --git a/sonar-application/src/main/java/org/sonar/application/AppFileSystem.java b/sonar-application/src/main/java/org/sonar/application/AppFileSystem.java
index 0f513928c98..c195008a638 100644
--- a/sonar-application/src/main/java/org/sonar/application/AppFileSystem.java
+++ b/sonar-application/src/main/java/org/sonar/application/AppFileSystem.java
@@ -21,19 +21,13 @@ package org.sonar.application;
 
 import java.io.File;
 import java.io.IOException;
-import java.nio.file.FileVisitResult;
-import java.nio.file.Path;
-import java.nio.file.Paths;
-import java.nio.file.SimpleFileVisitor;
-import java.nio.file.attribute.BasicFileAttributes;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.sonar.process.Props;
 import org.sonar.process.monitor.FileSystem;
 
-import static java.nio.file.Files.delete;
-import static java.nio.file.Files.walkFileTree;
 import static org.apache.commons.io.FileUtils.forceMkdir;
+import static org.sonar.process.FileUtils.cleanDirectory;
 import static org.sonar.process.ProcessProperties.PATH_DATA;
 import static org.sonar.process.ProcessProperties.PATH_HOME;
 import static org.sonar.process.ProcessProperties.PATH_LOGS;
@@ -123,30 +117,4 @@ public class AppFileSystem implements FileSystem {
     }
   }
 
-  private static void cleanDirectory(File dir) throws IOException {
-    Path path = Paths.get(dir.toURI());
-    walkFileTree(path, new CleanRecursivelyFileVisitor(path));
-  }
-
-  private static class CleanRecursivelyFileVisitor extends SimpleFileVisitor<Path> {
-    private final Path path;
-
-    public CleanRecursivelyFileVisitor(Path path) {
-      this.path = path;
-    }
-
-    @Override
-    public FileVisitResult visitFile(Path file, BasicFileAttributes attrs) throws IOException {
-      delete(file);
-      return FileVisitResult.CONTINUE;
-    }
-
-    @Override
-    public FileVisitResult postVisitDirectory(Path dir, IOException exc) throws IOException {
-      if (!dir.equals(path)) {
-        delete(dir);
-      }
-      return FileVisitResult.CONTINUE;
-    }
-  }
 }