feat: Support filtered DirectoryStream (#381)

* Add support for filtered DirectoryStreams. * Add unit test --------- Co-authored-by: Marcel Hekman <[email protected]>
carlspring · Sep 28, 2023 · f6668ba · f6668ba
1 parent 71640bd
commit f6668ba
Show file tree

Hide file tree

Showing 3 changed files with 131 additions and 12 deletions.
diff --git a/src/main/java/org/carlspring/cloud/storage/s3fs/S3FileSystemProvider.java b/src/main/java/org/carlspring/cloud/storage/s3fs/S3FileSystemProvider.java
@@ -512,7 +512,7 @@ public void close()
             @Override
             public Iterator<Path> iterator()
             {
-                return new S3Iterator(s3Path);
+                return new S3FilteredIterator(s3Path, filter);
             }
         };
     }

diff --git a/src/main/java/org/carlspring/cloud/storage/s3fs/S3FilteredIterator.java b/src/main/java/org/carlspring/cloud/storage/s3fs/S3FilteredIterator.java
@@ -0,0 +1,84 @@
+package org.carlspring.cloud.storage.s3fs;
+
+import java.io.IOException;
+import java.nio.file.DirectoryStream.Filter;
+import java.nio.file.Path;
+import java.util.Iterator;
+import java.util.NoSuchElementException;
+
+public class S3FilteredIterator implements Iterator<Path>
+{
+
+    private final S3Iterator s3iterator;
+
+    private final Filter<? super Path> filter;
+
+    private Path cursor;
+
+    private boolean cursorIsCurrent;
+
+    public S3FilteredIterator(S3Path s3Path,
+                              Filter<? super Path> filter)
+    {
+        this.filter = filter;
+        this.s3iterator = new S3Iterator(s3Path);
+        clearCursor();
+    }
+
+    @Override
+    public boolean hasNext()
+    {
+        if (!cursorIsCurrent)
+        {
+            findNextFiltered();
+        }
+        return cursorIsCurrent;
+    }
+
+    @Override
+    public Path next()
+    {
+        if (!hasNext())
+        {
+            throw new NoSuchElementException();
+        }
+        Path next = cursor;
+        clearCursor();
+        return next;
+    }
+
+    private void findNextFiltered()
+    {
+        try
+        {
+            while (s3iterator.hasNext())
+            {
+                S3Path next = s3iterator.next();
+                if (filter.accept(next))
+                {
+                    cursor = next;
+                    cursorIsCurrent = true;
+                    return;
+                }
+            }
+            clearCursor();
+        }
+        catch (IOException e)
+        {
+            throw new RuntimeException(e);
+        }
+    }
+
+    private void clearCursor()
+    {
+        cursor = null;
+        cursorIsCurrent = false;
+    }
+
+    @Override
+    public void remove()
+    {
+        throw new UnsupportedOperationException();
+    }
+
+}
diff --git a/...est/java/org/carlspring/cloud/storage/s3fs/fileSystemProvider/NewDirectoryStreamTest.java b/...est/java/org/carlspring/cloud/storage/s3fs/fileSystemProvider/NewDirectoryStreamTest.java
@@ -104,6 +104,35 @@ void removeIteratorStreamDirectoryReader()
         }
     }
 
+    @Test
+    public void directoryStreamWithFilter()
+        throws IOException
+    {
+        // fixtures
+        S3ClientMock client = S3MockFactory.getS3ClientMock();
+        client.bucket("bucketA")
+              .dir("dir1") //
+              .file("dir/file1.txt", "content".getBytes()) //
+              .file("dir/file2.sql", "content".getBytes()) //
+              .file("dir/file3.txt", "content".getBytes()) //
+              .file("dir/file4.sql", "content".getBytes()) //
+              .file("dir/tmp_file.txt", "content".getBytes());
+
+        // act
+        Path base = createNewS3FileSystem().getPath("/bucketA", "dir");
+        DirectoryStream.Filter<Path> filter = entry -> {
+            String filename = entry.getFileName().toString();
+            return filename.startsWith("tmp_") || filename.endsWith(".sql");
+        };
+
+        // act
+        try (DirectoryStream<Path> dirStream = Files.newDirectoryStream(base, filter))
+        {
+            // assert
+            assertDirectoryStream(dirStream, "file2.sql", "file4.sql", "tmp_file.txt");
+        }
+    }
+
     @Test
     void list999Paths()
             throws IOException
@@ -146,21 +175,27 @@ private void assertNewDirectoryStream(Path base,
     {
         try (DirectoryStream<Path> dir = Files.newDirectoryStream(base))
         {
-            assertNotNull(dir);
-            assertNotNull(dir.iterator());
-            assertTrue(dir.iterator().hasNext());
+            assertDirectoryStream(dir, files);
+        }
+    }
 
-            Set<String> filesNamesExpected = new HashSet<>(Arrays.asList(files));
-            Set<String> filesNamesActual = new HashSet<>();
+    private void assertDirectoryStream(DirectoryStream<Path> dir,
+                                       final String... files)
+    {
+        assertNotNull(dir);
+        assertNotNull(dir.iterator());
+        assertTrue(dir.iterator().hasNext());
 
-            for (Path path : dir)
-            {
-                String fileName = path.getFileName().toString();
-                filesNamesActual.add(fileName);
-            }
+        Set<String> filesNamesExpected = new HashSet<>(Arrays.asList(files));
+        Set<String> filesNamesActual = new HashSet<>();
 
-            assertEquals(filesNamesExpected, filesNamesActual);
+        for (Path path : dir)
+        {
+            String fileName = path.getFileName().toString();
+            filesNamesActual.add(fileName);
         }
+
+        assertEquals(filesNamesExpected, filesNamesActual);
     }
 
     /**