Fix directory listing with leading slash (#1644)

newDirectoryStream("dir1/") and newDirectoryStream("/dir1/") should return the same result. Added a test to show they didn't, then fixed it so the test passes.
googleapis · Feb 22, 2017 · 0fb03eb · 0fb03eb
1 parent 235874d
commit 0fb03eb
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 1 deletion.
diff --git a/...io/src/main/java/com/google/cloud/storage/contrib/nio/CloudStorageFileSystemProvider.java b/...io/src/main/java/com/google/cloud/storage/contrib/nio/CloudStorageFileSystemProvider.java
@@ -598,7 +598,7 @@ public DirectoryStream<Path> newDirectoryStream(Path dir, final Filter<? super P
     final CloudStoragePath cloudPath = CloudStorageUtil.checkPath(dir);
     checkNotNull(filter);
     initStorage();
-    String prefix = cloudPath.toString();
+    String prefix = cloudPath.toRealPath().toString();
     final Iterator<Blob> blobIterator = storage.list(cloudPath.bucket(),
         Storage.BlobListOption.prefix(prefix), Storage.BlobListOption.currentDirectory(),
         Storage.BlobListOption.fields()).iterateAll();

diff --git a/...ud-nio/src/test/java/com/google/cloud/storage/contrib/nio/CloudStorageFileSystemTest.java b/...ud-nio/src/test/java/com/google/cloud/storage/contrib/nio/CloudStorageFileSystemTest.java
@@ -158,6 +158,13 @@ public void testListFiles() throws IOException {
         got.add(path);
       }
       assertThat(got).containsExactlyElementsIn(goodPaths);
+
+      // Must also work with relative path
+      got.clear();
+      for (Path path : Files.newDirectoryStream(fs.getPath("dir/"))) {
+        got.add(path);
+      }
+      assertThat(got).containsExactlyElementsIn(goodPaths);
     }
   }
 

diff --git a/...trib/google-cloud-nio/src/test/java/com/google/cloud/storage/contrib/nio/it/ITGcsNio.java b/...trib/google-cloud-nio/src/test/java/com/google/cloud/storage/contrib/nio/it/ITGcsNio.java
@@ -347,6 +347,13 @@ public void testListFiles() throws IOException {
       }
 
       List<Path> got = new ArrayList<>();
+      for (Path path : Files.newDirectoryStream(fs.getPath("/dir/"))) {
+        got.add(path);
+      }
+      assertThat(got).containsExactlyElementsIn(goodPaths);
+
+      // Must also work with relative path
+      got.clear();
       for (Path path : Files.newDirectoryStream(fs.getPath("dir/"))) {
         got.add(path);
       }