Fix directory listing with leading slash

jean-philippe-martin · jean-philippe-martin · commit da3724f99da5 · 2017-02-22T11:39:46.000-08:00
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.
diff --git a/google-cloud-contrib/google-cloud-nio/src/main/java/com/google/cloud/storage/contrib/nio/CloudStorageFileSystemProvider.java b/google-cloud-contrib/google-cloud-nio/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/google-cloud-contrib/google-cloud-nio/src/test/java/com/google/cloud/storage/contrib/nio/CloudStorageFileSystemTest.java b/google-cloud-contrib/google-cloud-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/google-cloud-contrib/google-cloud-nio/src/test/java/com/google/cloud/storage/contrib/nio/it/ITGcsNio.java b/google-cloud-contrib/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);
       }

Original file line number	Diff line number	Diff line change
`@@ -158,6 +158,13 @@ public void testListFiles() throws IOException {`
`158`	`158`	`got.add(path);`
`159`	`159`	`}`
`160`	`160`	`assertThat(got).containsExactlyElementsIn(goodPaths);`
	`161`	`+`
	`162`	`+ // Must also work with relative path`
	`163`	`+ got.clear();`
	`164`	`+ for (Path path : Files.newDirectoryStream(fs.getPath("dir/"))) {`
	`165`	`+ got.add(path);`
	`166`	`+ }`
	`167`	`+ assertThat(got).containsExactlyElementsIn(goodPaths);`
`161`	`168`	`}`
`162`	`169`	`}`
`163`	`170`
Original file line number	Diff line number	Diff line change
`@@ -347,6 +347,13 @@ public void testListFiles() throws IOException {`
`347`	`347`	`}`
`348`	`348`
`349`	`349`	`List<Path> got = new ArrayList<>();`
	`350`	`+ for (Path path : Files.newDirectoryStream(fs.getPath("/dir/"))) {`
	`351`	`+ got.add(path);`
	`352`	`+ }`
	`353`	`+ assertThat(got).containsExactlyElementsIn(goodPaths);`
	`354`	`+`
	`355`	`+ // Must also work with relative path`
	`356`	`+ got.clear();`
`350`	`357`	`for (Path path : Files.newDirectoryStream(fs.getPath("dir/"))) {`
`351`	`358`	`got.add(path);`
`352`	`359`	`}`