fixed issue #49

Author: jarnaiz

pom.xml

@@ -4,7 +4,7 @@
 	<groupId>com.upplication</groupId>
 	<artifactId>s3fs</artifactId>
 	<packaging>jar</packaging>
-	<version>1.1.2</version>
+	<version>1.2.0</version>
 	<name>s3fs</name>
 	<description>S3 filesystem provider for Java 7</description>
 	<url>https://github.com/Upplication/Amazon-S3-FileSystem-NIO2</url>
@@ -71,11 +71,6 @@
 			<artifactId>guava</artifactId>
 			<version>18.0</version>
 		</dependency>
-		<dependency>
-			<groupId>org.unbescape</groupId>
-			<artifactId>unbescape</artifactId>
-			<version>1.1.0.RELEASE</version>
-		</dependency>
         <dependency>
             <groupId>org.apache.tika</groupId>
             <artifactId>tika-core</artifactId>

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

@@ -9,7 +9,6 @@
 import java.nio.file.PathMatcher;
 import java.nio.file.WatchService;
 import java.nio.file.attribute.UserPrincipalLookupService;
-import java.nio.file.spi.FileSystemProvider;
 import java.util.List;
 import java.util.Set;
 
@@ -18,7 +17,6 @@
 import com.google.common.base.Joiner;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableSet;
-import org.unbescape.uri.UriEscape;
 
 /**
  * S3FileSystem with a concrete client configured and ready to use.
@@ -135,19 +133,15 @@ public String[] key2Parts(String keyParts) {
 		String[] split = new String[parts.length];
 		int i=0;
 		for (String part : parts) {
-			split[i++] = UriEscape.unescapeUriPathSegment(part);
+			split[i++] = part;
         }
         return split;
 	}
 
 	public String parts2Key(List<String> parts) {
 		if (parts.isEmpty())
 			return "";
-		ImmutableList.Builder<String> builder = ImmutableList.builder();
-		for (String part : parts) {
-			builder.add(UriEscape.escapeUriPathSegment(part));
-        }
-        return Joiner.on(PATH_SEPARATOR).join(builder.build());
+        return Joiner.on(PATH_SEPARATOR).join(ImmutableList.copyOf(parts));
 	}
 
 	@Override

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

@@ -24,7 +24,6 @@
 import java.io.IOException;
 import java.io.InputStream;
 import java.net.URI;
-import java.net.URISyntaxException;
 import java.nio.channels.SeekableByteChannel;
 import java.nio.file.*;
 import java.nio.file.attribute.BasicFileAttributes;

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

@@ -7,29 +7,15 @@
 
 import java.io.File;
 import java.io.IOException;
-import java.io.InputStream;
 import java.net.URI;
-import java.nio.channels.SeekableByteChannel;
-import java.nio.file.AccessDeniedException;
-import java.nio.file.AccessMode;
-import java.nio.file.CopyOption;
-import java.nio.file.DirectoryNotEmptyException;
-import java.nio.file.FileAlreadyExistsException;
-import java.nio.file.FileVisitor;
-import java.nio.file.Files;
 import java.nio.file.LinkOption;
-import java.nio.file.NoSuchFileException;
-import java.nio.file.OpenOption;
 import java.nio.file.Path;
 import java.nio.file.WatchEvent;
 import java.nio.file.WatchKey;
 import java.nio.file.WatchService;
-import java.nio.file.attribute.BasicFileAttributes;
-import java.nio.file.attribute.FileAttribute;
 import java.util.Arrays;
 import java.util.Iterator;
 import java.util.List;
-import java.util.Set;
 
 import javax.annotation.Nullable;
 

src/test/java/com/upplication/s3fs/FilesOperationsIT.java

@@ -21,6 +21,8 @@
 import java.util.EnumSet;
 import java.util.UUID;
 
+import com.amazonaws.services.s3.AmazonS3;
+import com.amazonaws.services.s3.AmazonS3Client;
 import org.junit.Before;
 
 import com.amazonaws.services.s3.model.ObjectMetadata;

src/test/java/com/upplication/s3fs/S3FileSystemTest.java

@@ -19,6 +19,7 @@
 import java.util.Map;
 import java.util.Set;
 
+import com.amazonaws.services.s3.AmazonS3Client;
 import com.google.common.collect.ImmutableMap;
 import org.junit.Before;
 import org.junit.Test;
@@ -276,7 +277,7 @@ public void parts2Key() {
 		S3FileSystem s3fs = new S3FileSystem(provider, null, amazonClientMock, "mirror1.amazon.test");
 		S3Path path = s3fs.getPath("/bucket", "folder with spaces", "file");
 		try {
-			assertEquals("folder%20with%20spaces/file", path.getKey());
+			assertEquals("folder with spaces/file", path.getKey());
 		} finally {
 			try {
 				s3fs.close();
@@ -285,6 +286,34 @@ public void parts2Key() {
 			}
 		}
 	}
+
+	@Test
+	public void urlWithSpecialCharacters() throws IOException {
+		String fileName = "βeta.png";
+		String expected = "https://bucket.s3.amazonaws.com/%CE%B2eta.png";
+
+		AmazonS3Client amazonS3Client = new AmazonS3Client();
+		S3FileSystem s3FileSystem = new S3FileSystem(null, null, amazonS3Client, "mirror");
+		S3Path path = new S3Path(s3FileSystem, fileName);
+
+		String url = amazonS3Client.getResourceUrl("bucket", path.getKey());
+
+		assertEquals(expected, url);
+	}
+
+    @Test
+    public void urlWithSpaceCharacters() throws IOException {
+        String fileName = "beta gaming.png";
+        String expected = "https://bucket.s3.amazonaws.com/beta%20gaming.png";
+
+        AmazonS3Client amazonS3Client = new AmazonS3Client();
+        S3FileSystem s3FileSystem = new S3FileSystem(null, null, amazonS3Client, "mirror");
+        S3Path path = new S3Path(s3FileSystem, fileName);
+
+        String url = amazonS3Client.getResourceUrl("bucket", path.getKey());
+
+        assertEquals(expected, url);
+    }
 
 	@Test
 	public void createDirectory() throws IOException {