bugfix and add test for %

jean-philippe-martin · jean-philippe-martin · commit b15781412c0e · 2016-12-08T13:41:54.000-08:00
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
@@ -212,7 +212,7 @@ public CloudStoragePath getPath(URI uri) {
 
   /** Convenience method: replaces spaces with "%20", builds a URI, and calls getPath(uri). */
   public CloudStoragePath getPath(String uriInStringForm) {
-    String escaped = UrlEscapers.urlFragmentEscaper().escape("gs://bucket/with/a space");
+    String escaped = UrlEscapers.urlFragmentEscaper().escape(uriInStringForm);
     return getPath(URI.create(escaped));
   }
 
diff --git a/google-cloud-contrib/google-cloud-nio/src/test/java/com/google/cloud/storage/contrib/nio/CloudStorageFileSystemProviderTest.java b/google-cloud-contrib/google-cloud-nio/src/test/java/com/google/cloud/storage/contrib/nio/CloudStorageFileSystemProviderTest.java
@@ -41,6 +41,7 @@
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
+import java.io.UnsupportedEncodingException;
 import java.net.URI;
 import java.nio.ByteBuffer;
 import java.nio.channels.ReadableByteChannel;
@@ -646,7 +647,7 @@ public void testProviderEquals() {
   }
 
   @Test
-  public void testFromSpace() {
+  public void testFromSpace() throws UnsupportedEncodingException {
     // User should be able to create paths to files whose name contains a space.
     // Traditional way 1: manually escape the spaces
     Path path1 = Paths.get(URI.create("gs://bucket/with/a%20space"));
@@ -663,6 +664,11 @@ public void testFromSpace() {
     assertThat(path2.getFileSystem().provider()).isEqualTo(path3.getFileSystem().provider());
     assertThat(path1.toUri()).isEqualTo(path2.toUri());
     assertThat(path2.toUri()).isEqualTo(path3.toUri());
+
+    Path path4 = provider.getPath("gs://bucket/with/a%20percent");
+    String toString = path4.toString();
+    assertThat(toString).doesNotContain(" ");
+    assertThat(toString).contains("%");
   }
 
   private static CloudStorageConfiguration permitEmptyPathComponents(boolean value) {
diff --git a/google-cloud-contrib/google-cloud-nio/src/test/java/com/google/cloud/storage/contrib/nio/CloudStoragePathTest.java b/google-cloud-contrib/google-cloud-nio/src/test/java/com/google/cloud/storage/contrib/nio/CloudStoragePathTest.java
@@ -494,6 +494,11 @@ public void testSpaces() throws IOException {
       // we can also go via a URI. Decoding should give us the space back.
       String toUri = URLDecoder.decode(path.toUri().toString(), "UTF-8");
       assertThat(toUri).contains(" ");
+
+      Path path2 = fs.getPath("/with/a%20percent");
+      String toUri2 = URLDecoder.decode(path2.toUri().toString(), "UTF-8");
+      assertThat(toUri2).doesNotContain(" ");
+      assertThat(toUri2).contains("%");
     }
   }
 

Original file line number	Diff line number	Diff line change
`@@ -212,7 +212,7 @@ public CloudStoragePath getPath(URI uri) {`
`212`	`212`
`213`	`213`	`/** Convenience method: replaces spaces with "%20", builds a URI, and calls getPath(uri). */`
`214`	`214`	`public CloudStoragePath getPath(String uriInStringForm) {`
`215`		`- String escaped = UrlEscapers.urlFragmentEscaper().escape("gs://bucket/with/a space");`
	`215`	`+ String escaped = UrlEscapers.urlFragmentEscaper().escape(uriInStringForm);`
`216`	`216`	`return getPath(URI.create(escaped));`
`217`	`217`	`}`
`218`	`218`
Original file line number	Diff line number	Diff line change
`@@ -494,6 +494,11 @@ public void testSpaces() throws IOException {`
`494`	`494`	`// we can also go via a URI. Decoding should give us the space back.`
`495`	`495`	`String toUri = URLDecoder.decode(path.toUri().toString(), "UTF-8");`
`496`	`496`	`assertThat(toUri).contains(" ");`
	`497`	`+`
	`498`	`+ Path path2 = fs.getPath("/with/a%20percent");`
	`499`	`+ String toUri2 = URLDecoder.decode(path2.toUri().toString(), "UTF-8");`
	`500`	`+ assertThat(toUri2).doesNotContain(" ");`
	`501`	`+ assertThat(toUri2).contains("%");`
`497`	`502`	`}`
`498`	`503`	`}`
`499`	`504`