Renamed DeleteOldAppData to FileHelper

3 files changed, 10 insertions, 10 deletions

diff --git a/node-maintainer/src/main/java/com/yahoo/vespa/hosted/node/maintainer/CoredumpHandler.java b/node-maintainer/src/main/java/com/yahoo/vespa/hosted/node/maintainer/CoredumpHandler.java
index 54ff7db997f..5794e5e5389 100644
--- a/node-maintainer/src/main/java/com/yahoo/vespa/hosted/node/maintainer/CoredumpHandler.java
+++ b/node-maintainer/src/main/java/com/yahoo/vespa/hosted/node/maintainer/CoredumpHandler.java
@@ -50,7 +50,7 @@ public class CoredumpHandler {
 
     public void removeJavaCoredumps(Path javaCoredumpsPath) throws IOException {
         if (! javaCoredumpsPath.toFile().isDirectory()) return;
-        DeleteOldAppData.deleteFiles(javaCoredumpsPath, Duration.ZERO, Optional.of("^java_pid.*\\.hprof$"), false);
+        FileHelper.deleteFiles(javaCoredumpsPath, Duration.ZERO, Optional.of("^java_pid.*\\.hprof$"), false);
     }
 
     Path processCoredumps(Path coredumpsPath, Map<String, Object> nodeAttributes) throws IOException {
diff --git a/node-maintainer/src/main/java/com/yahoo/vespa/hosted/node/maintainer/DeleteOldAppData.java b/node-maintainer/src/main/java/com/yahoo/vespa/hosted/node/maintainer/FileHelper.java
index ea8481b6bcb..b9255ace848 100644
--- a/node-maintainer/src/main/java/com/yahoo/vespa/hosted/node/maintainer/DeleteOldAppData.java
+++ b/node-maintainer/src/main/java/com/yahoo/vespa/hosted/node/maintainer/FileHelper.java
@@ -20,8 +20,8 @@ import java.util.stream.Collectors;
  * @author freva
  */
 
-public class DeleteOldAppData {
-    private static final Logger logger = Logger.getLogger(DeleteOldAppData.class.getSimpleName());
+public class FileHelper {
+    private static final Logger logger = Logger.getLogger(FileHelper.class.getSimpleName());
 
     /**
      * (Recursively) deletes files if they match all the criteria, also deletes empty directories.
@@ -64,7 +64,7 @@ public class DeleteOldAppData {
 
         List<Path> pathsInDeleteDir = Files.list(basePath)
                 .filter(Files::isRegularFile)
-                .sorted(Comparator.comparing(DeleteOldAppData::getLastModifiedTime))
+                .sorted(Comparator.comparing(FileHelper::getLastModifiedTime))
                 .skip(nMostRecentToKeep)
                 .collect(Collectors.toList());
 
@@ -138,7 +138,7 @@ public class DeleteOldAppData {
     private static Optional<Path> getMostRecentlyModifiedFileIn(Path basePath) {
         return listContentsOfDirectory(basePath).stream()
                 .filter(Files::isRegularFile)
-                .max(Comparator.comparing(DeleteOldAppData::getLastModifiedTime));
+                .max(Comparator.comparing(FileHelper::getLastModifiedTime));
     }
 
     private static boolean isTimeSinceLastModifiedMoreThan(Path path, Duration duration) {
diff --git a/node-maintainer/src/main/java/com/yahoo/vespa/hosted/node/maintainer/restapi/v1/MaintainerApiHandler.java b/node-maintainer/src/main/java/com/yahoo/vespa/hosted/node/maintainer/restapi/v1/MaintainerApiHandler.java
index 8564746a27d..7aa8b09c746 100644
--- a/node-maintainer/src/main/java/com/yahoo/vespa/hosted/node/maintainer/restapi/v1/MaintainerApiHandler.java
+++ b/node-maintainer/src/main/java/com/yahoo/vespa/hosted/node/maintainer/restapi/v1/MaintainerApiHandler.java
@@ -14,7 +14,7 @@ import com.yahoo.system.ProcessExecuter;
 import com.yahoo.vespa.config.SlimeUtils;
 import com.yahoo.vespa.hosted.node.maintainer.CoreCollector;
 import com.yahoo.vespa.hosted.node.maintainer.CoredumpHandler;
-import com.yahoo.vespa.hosted.node.maintainer.DeleteOldAppData;
+import com.yahoo.vespa.hosted.node.maintainer.FileHelper;
 import com.yahoo.yolean.Exceptions;
 import org.apache.http.impl.client.HttpClientBuilder;
 
@@ -121,7 +121,7 @@ public class MaintainerApiHandler extends LoggingRequestHandler {
         Optional<String> fileNameRegex = SlimeUtils.optionalString(getFieldOrFail(arguments, "fileNameRegex"));
         boolean recursive = getFieldOrFail(arguments, "recursive").asBool();
         try {
-            DeleteOldAppData.deleteFiles(basePath, maxAge, fileNameRegex, recursive);
+            FileHelper.deleteFiles(basePath, maxAge, fileNameRegex, recursive);
         } catch (IOException e) {
             throw new RuntimeException("Failed deleting files under " + basePath.toAbsolutePath() +
                     fileNameRegex.map(regex -> ", matching '" + regex + "'").orElse("") +
@@ -135,7 +135,7 @@ public class MaintainerApiHandler extends LoggingRequestHandler {
         Duration maxAge = Duration.ofSeconds(getFieldOrFail(arguments, "maxAgeSeconds").asLong());
         Optional<String> dirNameRegex = SlimeUtils.optionalString(getFieldOrFail(arguments, "dirNameRegex"));
         try {
-            DeleteOldAppData.deleteDirectories(basePath, maxAge, dirNameRegex);
+            FileHelper.deleteDirectories(basePath, maxAge, dirNameRegex);
         } catch (IOException e) {
             throw new RuntimeException("Failed deleting directories under " + basePath.toAbsolutePath() +
                     dirNameRegex.map(regex -> ", matching '" + regex + "'").orElse("") +
@@ -146,7 +146,7 @@ public class MaintainerApiHandler extends LoggingRequestHandler {
     private void parseRecursiveDelete(Inspector arguments) {
         Path basePath = Paths.get(getFieldOrFail(arguments, "path").asString());
         try {
-            DeleteOldAppData.recursiveDelete(basePath);
+            FileHelper.recursiveDelete(basePath);
         } catch (IOException e) {
             throw new RuntimeException("Failed deleting " + basePath.toAbsolutePath(), e);
         }
@@ -157,7 +157,7 @@ public class MaintainerApiHandler extends LoggingRequestHandler {
         Path to = Paths.get(getFieldOrFail(arguments, "to").asString());
 
         try {
-            DeleteOldAppData.moveIfExists(from, to);
+            FileHelper.moveIfExists(from, to);
         } catch (IOException e) {
             throw new RuntimeException("Failed moving from " + from.toAbsolutePath() + ", to " + to.toAbsolutePath(), e);
         }