Merge branch 'hotfix/1.0.2' into develop

Author: jarnaiz

README.md

@@ -14,7 +14,7 @@ This project provides a first API implementation, little optimized, but "complet
 <dependency>
 	<groupId>com.upplication</groupId>
 	<artifactId>s3fs</artifactId>
-	<version>1.0.1</version>
+	<version>1.0.2</version>
 </dependency>
 ```
 

pom.xml

@@ -4,7 +4,7 @@
 	<groupId>com.upplication</groupId>
 	<artifactId>s3fs</artifactId>
 	<packaging>jar</packaging>
-	<version>1.0.1</version>
+	<version>1.0.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/S3FileSystem.java

@@ -39,7 +39,7 @@ public S3FileSystem(S3FileSystemProvider provider, String key, AmazonS3 client,
 	}
 
 	@Override
-	public FileSystemProvider provider() {
+	public S3FileSystemProvider provider() {
 		return provider;
 	}
 

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

@@ -379,8 +379,7 @@ public WatchKey register(WatchService watcher, WatchEvent.Kind<?>... events) thr
 	public Iterator<Path> iterator() {
 		ImmutableList.Builder<Path> builder = ImmutableList.builder();
 
-		for (Iterator<String> iterator = parts.iterator(); iterator.hasNext();) {
-			String part = iterator.next();
+		for (String part : parts) {
 			builder.add(new S3Path(fileSystem, null, ImmutableList.of(part)));
 		}
 

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

@@ -11,15 +11,16 @@
 import java.nio.file.Files;
 import java.nio.file.OpenOption;
 import java.nio.file.Path;
+import java.nio.file.StandardCopyOption;
 import java.nio.file.StandardOpenOption;
+import java.util.Collections;
 import java.util.HashSet;
 import java.util.Set;
 
 import org.apache.tika.Tika;
 
 import com.amazonaws.services.s3.model.ObjectMetadata;
 import com.amazonaws.services.s3.model.S3Object;
-import com.upplication.s3fs.util.IOUtils;
 
 public class S3SeekableByteChannel implements SeekableByteChannel {
 
@@ -30,25 +31,33 @@ public class S3SeekableByteChannel implements SeekableByteChannel {
 
 	public S3SeekableByteChannel(S3Path path, Set<? extends OpenOption> options) throws IOException {
 		this.path = path;
-		this.options = options;
+		this.options = Collections.unmodifiableSet(new HashSet<>(options));
 		String key = path.getKey();
-		tempFile = Files.createTempFile("temp-s3-", key.replaceAll("/", "_"));
-		boolean existed = ((S3FileSystemProvider)path.getFileSystem().provider()).exists(path);
+		boolean existed = path.getFileSystem().provider().exists(path);
 
-        if (existed && options.contains(StandardOpenOption.CREATE_NEW))
+        if (existed && this.options.contains(StandardOpenOption.CREATE_NEW))
             throw new FileAlreadyExistsException(format("target already exists: %s", path));
 
-		if(existed) {
-			S3Object object = path.getFileSystem()
-                    .getClient()
-                    .getObject(path.getFileStore().getBucket().getName(), key);
-			InputStream is = object.getObjectContent();
-			Files.write(tempFile, IOUtils.toByteArray(is), StandardOpenOption.CREATE, StandardOpenOption.TRUNCATE_EXISTING);
-		}
-
-        options.remove(StandardOpenOption.CREATE_NEW);
+		tempFile = Files.createTempFile("temp-s3-", key.replaceAll("/", "_"));
+		boolean removeTempFile = true;
+		try {
+			if (existed) {
+				try (S3Object object = path.getFileSystem()
+                                           .getClient()
+                                           .getObject(path.getFileStore().getBucket().getName(), key)) {
+					Files.copy(object.getObjectContent(), tempFile, StandardCopyOption.REPLACE_EXISTING); 
+				}
+			}
 
-		seekable = Files.newByteChannel(tempFile, options);
+			Set<? extends OpenOption> seekOptions = new HashSet<>(this.options);
+			seekOptions.remove(StandardOpenOption.CREATE_NEW);
+			seekable = Files.newByteChannel(tempFile, seekOptions);
+			removeTempFile = false;
+		} finally {
+			if (removeTempFile) {
+				Files.deleteIfExists(tempFile);
+			}
+		}
 	}
 
 	@Override

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

@@ -129,6 +129,21 @@ public void createsAnonymous() {
 		verify(s3fsProvider).createFileSystem(eq(uri), eq(buildFakeProps(null, null)));
 	}
 
+    @Test
+    public void createWithDefaultEndpoint() {
+        Properties props = new Properties();
+        props.setProperty(SECRET_KEY, "better secret key");
+        props.setProperty(ACCESS_KEY, "better access key");
+        props.setProperty(CHARSET_KEY, "UTF-8");
+        doReturn(props).when(s3fsProvider).loadAmazonProperties();
+        URI uri = URI.create("s3:///");
+
+        FileSystem fileSystem = s3fsProvider.newFileSystem(uri, ImmutableMap.<String, Object> of());
+        assertNotNull(fileSystem);
+
+        verify(s3fsProvider).createFileSystem(eq(uri), eq(buildFakeProps("better access key", "better secret key", "UTF-8")));
+    }
+
 	@Test(expected = IllegalArgumentException.class)
 	public void createWithOnlyAccessKey() {
 		Properties props = new Properties();