BufferedZipStore auto closable

Author: brokkoli71

src/main/java/dev/zarr/zarrjava/store/BufferedZipStore.java

@@ -22,7 +22,7 @@
 /**
  * A Store implementation that buffers reads and writes and flushes them to an underlying Store as a zip file.
  */
-public class BufferedZipStore extends ZipStore {
+public class BufferedZipStore extends ZipStore implements AutoCloseable {
 
     private final Store.ListableStore bufferStore;
     private final boolean flushOnWrite;
@@ -228,6 +228,11 @@ public void flush() throws IOException {
         writeBuffer();
     }
 
+    @Override
+    public void close() throws IOException {
+        flush();
+    }
+
     @Override
     public String getArchiveComment() {
         return archiveComment;

src/main/java/dev/zarr/zarrjava/store/S3Store.java

@@ -103,29 +103,6 @@ public void delete(String[] keys) {
                 .build());
     }
 
-//    @Override
-//    public Stream<String[]> list(String[] keys) {
-//        final String fullKey = resolveKeys(keys);
-//        ListObjectsRequest req = ListObjectsRequest.builder()
-//                .bucket(bucketName).prefix(fullKey)
-//                .build();
-//        ListObjectsResponse res = s3client.listObjects(req);
-//        return res.contents().stream()
-//                .map(S3Object::key)
-//                .flatMap(key -> {
-//                    List<String> pathSegments = new ArrayList<>();
-//                    int index = fullKey.length();
-//                    while ((index = key.indexOf('/', index + 1)) != -1) {
-//                        pathSegments.add(key.substring(fullKey.length() + 1, index));
-//                    }
-//                    pathSegments.add(key.substring(fullKey.length() + 1));
-//                    return pathSegments.stream();
-//                })
-//                .distinct()
-//                .map(s -> s.split("/"))
-//                .filter(arr -> arr.length > 0);
-//    }
-
     @Override
     public Stream<String[]> list(String[] keys) {
         String fullPrefix = resolveKeys(keys);

src/test/java/dev/zarr/zarrjava/store/BufferedZipStoreTest.java

@@ -72,6 +72,17 @@ public void testWriteZipStore(boolean flushOnWrite) throws ZarrException, IOExce
         assertIsTestGroupV3(Group.open(fsStore.resolve()), true);
     }
 
+    @Test
+    public void testAutoCloseable() throws ZarrException, IOException {
+        Path path = TESTOUTPUT.resolve("testAutoCloseable.zip");
+        try (BufferedZipStore zipStore = new BufferedZipStore(path)) {
+            writeTestGroupV3(zipStore.resolve(), true);
+        }
+        // After closing, it should be flushed
+        BufferedZipStore zipStoreRead = new BufferedZipStore(path);
+        assertIsTestGroupV3(Group.open(zipStoreRead.resolve()), true);
+    }
+
     @ParameterizedTest
     @CsvSource({"false", "true",})
     public void testZipStoreWithComment(boolean flushOnWrite) throws ZarrException, IOException {