Merge branch 'sbeimin-#99'

Author: jarnaiz

pom.xml

@@ -4,7 +4,7 @@
 	<groupId>com.upplication</groupId>
 	<artifactId>s3fs</artifactId>
 	<packaging>jar</packaging>
-	<version>2.2.1</version>
+	<version>2.2.2</version>
 	<name>s3fs</name>
 	<description>S3 filesystem provider for Java 7</description>
 	<url>https://github.com/Upplication/Amazon-S3-FileSystem-NIO2</url>

src/main/java/com/upplication/s3fs/S3Path.java

@@ -465,7 +465,7 @@ public URI toUri() {
             return URI.create("s3://" + normalizeURI(builder.toString()));
         }
         else {
-            return URI.create(this.uri);
+            return URI.create(uri);
         }
     }
 

src/test/java/com/upplication/s3fs/Path/ToUriTest.java

@@ -57,6 +57,13 @@ public void toUriWithEndSlash() {
         assertEquals(S3_GLOBAL_URI_TEST + "bucket/folder/", s3Path.toUri().toString());
     }
 
+    @Test
+    public void toUriWithSpaces() {
+        S3Path s3Path = getPath("/bucket/with spaces");
+
+        assertEquals(S3_GLOBAL_URI_TEST.resolve("bucket/with%20spaces") , s3Path.toUri());
+    }
+
     @Test
     public void toUriWithNotEndSlash() {
         S3Path s3Path = getPath("/bucket/file");
@@ -72,6 +79,14 @@ public void toUriRelative() {
         assertEquals(URI.create("bla"), path.toUri());
     }
 
+    @Test
+    public void toUriRelativeWithSpaces() {
+        S3FileSystem fileSystem = s3fsProvider.getFileSystem(S3_GLOBAL_URI_TEST);
+
+        S3Path path = new S3Path(fileSystem, "with space");
+        assertEquals(URI.create("with%20space"), path.toUri());
+    }
+
     @Test
     public void toUriBucketWithoutEndSlash() {
         S3Path s3Path = getPath("/bucket");