Use a directory Stream

Author: tburch

src/main/java/com/lowtuna/jsonblob/core/BlobCleanupProducer.java

@@ -9,6 +9,7 @@
 
 import java.io.File;
 import java.io.IOException;
+import java.nio.file.Files;
 import java.nio.file.Path;
 import java.time.LocalDate;
 import java.util.Collection;
@@ -34,39 +35,46 @@ public BlobCleanupProducer(Path dataDirectoryPath, Duration blobAccessTtl, Block
 
   @Override
   protected boolean handleDirectory(File directory, int depth, Collection<Void> results) throws IOException {
-    File[] files = directory.listFiles();
-
-    if (files != null && files.length == 0) {
-      if (directory.delete()) log.info("{} has no files, so it's being deleted", directory.getAbsolutePath());
-      return false;
-    }
-
-    if (files.length == 1) {
-      if (files[0].getName().startsWith(FileSystemJsonBlobManager.BLOB_METADATA_FILE_NAME)) {
-        if (directory.delete()) log.info("{} has only a metadata file, so it's being deleted", directory.getAbsolutePath());
-        return false;
-      }
-    }
-
-    boolean process = true;
     if (isDataDir(directory.getAbsolutePath())) {
       String[] dateParts = directory.getAbsolutePath().replace(dataDirectoryPath.toFile().getAbsolutePath(), "").split("/", 4);
       LocalDate localDate = LocalDate.of(Integer.parseInt(dateParts[1]), Integer.parseInt(dateParts[2]), Integer.parseInt(dateParts[3]));
-      process = localDate.isBefore(LocalDate.now().minusDays(blobAccessTtl.toDays()));
+      boolean process = localDate.isBefore(LocalDate.now().minusDays(blobAccessTtl.toDays()));
       if (process) {
         log.info("Processing {} blobs for un-accessed blobs", directory.getAbsolutePath());
-        for (File file: files) {
-          try {
-            filesToProcess.put(file);
-          } catch (InterruptedException e) {
-            log.warn("Interrupted while trying to add file to be processed at {}", file.getAbsolutePath(), e);
+        Files.newDirectoryStream(directory.toPath())
+                .forEach(path -> {
+                  File file = path.toFile();
+                  if (file.getName().startsWith(FileSystemJsonBlobManager.BLOB_METADATA_FILE_NAME)) {
+                    return;
+                  }
+                  try {
+                    filesToProcess.put(file);
+                  } catch (InterruptedException e) {
+                    log.warn("Interrupted while trying to add file to be processed at {}", file.getAbsolutePath(), e);
+                  }
+                });
+      }
+
+      File[] files = directory.listFiles();
+      if (files != null && files.length == 1) {
+        if (files[0].getName().startsWith(FileSystemJsonBlobManager.BLOB_METADATA_FILE_NAME)) {
+          if (directory.delete()) {
+            log.info("{} has only a metadata file, so it's being deleted", directory.getAbsolutePath());
           }
         }
-        process = false;
+      } else if (files.length == 0) {
+        log.info("{} has no files, so it's being deleted", directory.getAbsolutePath());
+      }
+      return false;
+    } else {
+      File[] files = directory.listFiles();
+      if (files != null && files.length == 0) {
+        if (directory.delete()) log.info("{} has no files, so it's being deleted", directory.getAbsolutePath());
+        return false;
       }
     }
 
-    return process;
+    return true;
   }
 
   private boolean isDataDir(String path) {