Merge branch 'master' into develop

Upplication · Nov 29, 2017 · ae53e59 · ae53e59
2 parents 0632844 + 98ee900
commit ae53e59
Show file tree

Hide file tree

Showing 35 changed files with 257 additions and 173 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -5,7 +5,6 @@ addons:
 language: java
 jdk:
 - openjdk7
-- oraclejdk7
 - oraclejdk8
 env:
   global:

diff --git a/src/main/java/com/upplication/s3fs/S3FileSystemProvider.java b/src/main/java/com/upplication/s3fs/S3FileSystemProvider.java
@@ -229,6 +229,10 @@ public boolean overloadPropertiesWithSystemProps(Properties props, String key) {
     }
 
     /**
+     * The system envs have preference over the properties files.
+     * So we overload it
+     * @param props Properties
+     * @param key String
      * @return true if the key are overloaded by a system property
      */
     public boolean overloadPropertiesWithSystemEnv(Properties props, String key) {
@@ -239,6 +243,11 @@ public boolean overloadPropertiesWithSystemEnv(Properties props, String key) {
         return false;
     }
 
+    /**
+     * Get the system env with the key param
+     * @param key String
+     * @return String or null
+     */
     public String systemGetEnv(String key) {
         return System.getenv(key);
     }

diff --git a/src/main/java/com/upplication/s3fs/S3Path.java b/src/main/java/com/upplication/s3fs/S3Path.java
@@ -116,6 +116,8 @@ public S3FileStore getFileStore() {
     /**
      * key for amazon without final slash.
      * <b>note:</b> the final slash need to be added to save a directory (Amazon s3 spec)
+     *
+     * @return the key for AmazonS3Client
      */
     public String getKey() {
 
@@ -125,12 +127,6 @@ public String getKey() {
             key = key.substring(1, key.length());
         }
 
-        // TODO: review this... :S
-        /*
-        if (key.endsWith("/")) {
-            key = key.substring(0, key.length()-1);
-        }
-        */
         return key;
     }
 

diff --git a/src/test/java/com/upplication/s3fs/FileSystemProvider/CheckAccessTest.java b/src/test/java/com/upplication/s3fs/FileSystemProvider/CheckAccessTest.java
@@ -16,6 +16,7 @@
 import java.nio.file.*;
 import java.util.Properties;
 
+import static com.upplication.s3fs.util.S3EndpointConstant.S3_GLOBAL_URI_TEST;
 import static org.junit.Assert.assertArrayEquals;
 import static org.junit.Assert.assertTrue;
 import static org.mockito.Mockito.*;
@@ -25,10 +26,9 @@ public class CheckAccessTest extends S3UnitTestBase {
     private S3FileSystemProvider s3fsProvider;
 
     @Before
-    public void setup() {
-        s3fsProvider = spy(new S3FileSystemProvider());
-        doReturn(false).when(s3fsProvider).overloadPropertiesWithSystemEnv(any(Properties.class), anyString());
-        doReturn(new Properties()).when(s3fsProvider).loadAmazonProperties();
+    public void setup() throws IOException {
+        s3fsProvider = getS3fsProvider();
+        s3fsProvider.newFileSystem(S3EndpointConstant.S3_GLOBAL_URI_TEST, null);
     }
     // check access
 

diff --git a/src/test/java/com/upplication/s3fs/FileSystemProvider/CopyTest.java b/src/test/java/com/upplication/s3fs/FileSystemProvider/CopyTest.java
@@ -23,10 +23,9 @@ public class CopyTest extends S3UnitTestBase {
     private S3FileSystemProvider s3fsProvider;
 
     @Before
-    public void setup() {
-        s3fsProvider = spy(new S3FileSystemProvider());
-        doReturn(false).when(s3fsProvider).overloadPropertiesWithSystemEnv(any(Properties.class), anyString());
-        doReturn(new Properties()).when(s3fsProvider).loadAmazonProperties();
+    public void setup() throws IOException {
+        s3fsProvider = getS3fsProvider();
+        s3fsProvider.newFileSystem(S3EndpointConstant.S3_GLOBAL_URI_TEST, null);
     }
 
     @Test

diff --git a/src/test/java/com/upplication/s3fs/FileSystemProvider/CreateDirectoryTest.java b/src/test/java/com/upplication/s3fs/FileSystemProvider/CreateDirectoryTest.java
@@ -12,22 +12,17 @@
 
 import java.io.IOException;
 import java.nio.file.*;
-import java.util.Properties;
 
-import static org.junit.Assert.assertArrayEquals;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-import static org.mockito.Mockito.*;
+import static org.junit.Assert.*;
 
 public class CreateDirectoryTest extends S3UnitTestBase {
 
     private S3FileSystemProvider s3fsProvider;
 
     @Before
-    public void setup() {
-        s3fsProvider = spy(new S3FileSystemProvider());
-        doReturn(false).when(s3fsProvider).overloadPropertiesWithSystemEnv(any(Properties.class), anyString());
-        doReturn(new Properties()).when(s3fsProvider).loadAmazonProperties();
+    public void setup() throws IOException {
+        s3fsProvider = getS3fsProvider();
+        s3fsProvider.newFileSystem(S3EndpointConstant.S3_GLOBAL_URI_TEST, null);
     }
 
     @Test
@@ -51,6 +46,7 @@ public void createDirectoryInNewBucket() throws IOException {
         S3Path root = createNewS3FileSystem().getPath("/newer-bucket");
         Path resolve = root.resolve("folder");
         Path path = Files.createDirectories(resolve);
+
         assertEquals("s3://s3.test.amazonaws.com/newer-bucket/folder", path.toAbsolutePath().toString());
         // assert
         assertTrue(Files.exists(root));
@@ -89,8 +85,7 @@ private S3FileSystem createNewS3FileSystem() throws IOException {
         try {
             return s3fsProvider.getFileSystem(S3EndpointConstant.S3_GLOBAL_URI_TEST);
         } catch (FileSystemNotFoundException e) {
-            return (S3FileSystem) FileSystems.newFileSystem(S3EndpointConstant.S3_GLOBAL_URI_TEST, null);
+            return (S3FileSystem) s3fsProvider.newFileSystem(S3EndpointConstant.S3_GLOBAL_URI_TEST, null);
         }
-
     }
 }
diff --git a/src/test/java/com/upplication/s3fs/FileSystemProvider/DeleteTest.java b/src/test/java/com/upplication/s3fs/FileSystemProvider/DeleteTest.java
@@ -26,10 +26,9 @@ public class DeleteTest extends S3UnitTestBase {
     private S3FileSystemProvider s3fsProvider;
 
     @Before
-    public void setup() {
-        s3fsProvider = spy(new S3FileSystemProvider());
-        doReturn(false).when(s3fsProvider).overloadPropertiesWithSystemEnv(any(Properties.class), anyString());
-        doReturn(new Properties()).when(s3fsProvider).loadAmazonProperties();
+    public void setup() throws IOException {
+        s3fsProvider = getS3fsProvider();
+        s3fsProvider.newFileSystem(S3EndpointConstant.S3_GLOBAL_URI_TEST, null);
     }
 
     @Test

diff --git a/src/test/java/com/upplication/s3fs/FileSystemProvider/GetFileAttributeViewTest.java b/src/test/java/com/upplication/s3fs/FileSystemProvider/GetFileAttributeViewTest.java
@@ -26,13 +26,11 @@ public class GetFileAttributeViewTest extends S3UnitTestBase {
     private S3FileSystemProvider s3fsProvider;
 
     @Before
-    public void setup() {
-        s3fsProvider = spy(new S3FileSystemProvider());
-        doReturn(false).when(s3fsProvider).overloadPropertiesWithSystemEnv(any(Properties.class), anyString());
-        doReturn(new Properties()).when(s3fsProvider).loadAmazonProperties();
+    public void setup() throws IOException {
+        s3fsProvider = getS3fsProvider();
+        s3fsProvider.newFileSystem(S3EndpointConstant.S3_GLOBAL_URI_TEST, null);
     }
 
-
     @Test
     public void getBasicFileAttributeView() throws IOException {
         AmazonS3ClientMock client = AmazonS3MockFactory.getAmazonClientMock();

diff --git a/src/test/java/com/upplication/s3fs/FileSystemProvider/GetFileStoreTest.java b/src/test/java/com/upplication/s3fs/FileSystemProvider/GetFileStoreTest.java
@@ -22,13 +22,11 @@ public class GetFileStoreTest extends S3UnitTestBase {
     private S3FileSystemProvider s3fsProvider;
 
     @Before
-    public void setup() {
-        s3fsProvider = spy(new S3FileSystemProvider());
-        doReturn(false).when(s3fsProvider).overloadPropertiesWithSystemEnv(any(Properties.class), anyString());
-        doReturn(new Properties()).when(s3fsProvider).loadAmazonProperties();
+    public void setup() throws IOException {
+        s3fsProvider = getS3fsProvider();
+        s3fsProvider.newFileSystem(S3EndpointConstant.S3_GLOBAL_URI_TEST, null);
     }
 
-
     @Test(expected = UnsupportedOperationException.class)
     public void getFileStore() throws IOException {
         // fixtures

diff --git a/src/test/java/com/upplication/s3fs/FileSystemProvider/GetPathTest.java b/src/test/java/com/upplication/s3fs/FileSystemProvider/GetPathTest.java
@@ -3,6 +3,7 @@
 import com.google.common.collect.ImmutableMap;
 import com.upplication.s3fs.S3FileSystemProvider;
 import com.upplication.s3fs.S3UnitTestBase;
+import com.upplication.s3fs.util.S3EndpointConstant;
 import org.junit.Before;
 import org.junit.Test;
 
@@ -19,13 +20,11 @@ public class GetPathTest extends S3UnitTestBase {
     private S3FileSystemProvider s3fsProvider;
 
     @Before
-    public void setup() {
-        s3fsProvider = spy(new S3FileSystemProvider());
-        doReturn(false).when(s3fsProvider).overloadPropertiesWithSystemEnv(any(Properties.class), anyString());
-        doReturn(new Properties()).when(s3fsProvider).loadAmazonProperties();
+    public void setup() throws IOException {
+        s3fsProvider = getS3fsProvider();
+        s3fsProvider.newFileSystem(S3EndpointConstant.S3_GLOBAL_URI_TEST, null);
     }
 
-
     @Test
     public void getPathWithEmtpyEndpoint() throws IOException {
         FileSystem fs = FileSystems.newFileSystem(URI.create("s3:///"), ImmutableMap.<String, Object>of());

diff --git a/src/test/java/com/upplication/s3fs/FileSystemProvider/IsHiddenTest.java b/src/test/java/com/upplication/s3fs/FileSystemProvider/IsHiddenTest.java
@@ -22,10 +22,9 @@ public class IsHiddenTest extends S3UnitTestBase {
     private S3FileSystemProvider s3fsProvider;
 
     @Before
-    public void setup() {
-        s3fsProvider = spy(new S3FileSystemProvider());
-        doReturn(false).when(s3fsProvider).overloadPropertiesWithSystemEnv(any(Properties.class), anyString());
-        doReturn(new Properties()).when(s3fsProvider).loadAmazonProperties();
+    public void setup() throws IOException {
+        s3fsProvider = getS3fsProvider();
+        s3fsProvider.newFileSystem(S3EndpointConstant.S3_GLOBAL_URI_TEST, null);
     }
 
     @Test

diff --git a/src/test/java/com/upplication/s3fs/FileSystemProvider/IsSameFileTest.java b/src/test/java/com/upplication/s3fs/FileSystemProvider/IsSameFileTest.java
@@ -22,10 +22,9 @@ public class IsSameFileTest extends S3UnitTestBase {
     private S3FileSystemProvider s3fsProvider;
 
     @Before
-    public void setup() {
-        s3fsProvider = spy(new S3FileSystemProvider());
-        doReturn(false).when(s3fsProvider).overloadPropertiesWithSystemEnv(any(Properties.class), anyString());
-        doReturn(new Properties()).when(s3fsProvider).loadAmazonProperties();
+    public void setup() throws IOException {
+        s3fsProvider = getS3fsProvider();
+        s3fsProvider.newFileSystem(S3EndpointConstant.S3_GLOBAL_URI_TEST, null);
     }
 
     @Test

diff --git a/src/test/java/com/upplication/s3fs/FileSystemProvider/MoveTest.java b/src/test/java/com/upplication/s3fs/FileSystemProvider/MoveTest.java
@@ -21,10 +21,9 @@ public class MoveTest extends S3UnitTestBase {
     private S3FileSystemProvider s3fsProvider;
 
     @Before
-    public void setup() {
-        s3fsProvider = spy(new S3FileSystemProvider());
-        doReturn(false).when(s3fsProvider).overloadPropertiesWithSystemEnv(any(Properties.class), anyString());
-        doReturn(new Properties()).when(s3fsProvider).loadAmazonProperties();
+    public void setup() throws IOException {
+        s3fsProvider = getS3fsProvider();
+        s3fsProvider.newFileSystem(S3EndpointConstant.S3_GLOBAL_URI_TEST, null);
     }
 
 

diff --git a/src/test/java/com/upplication/s3fs/FileSystemProvider/NewByteChannelTest.java b/src/test/java/com/upplication/s3fs/FileSystemProvider/NewByteChannelTest.java
@@ -26,13 +26,11 @@ public class NewByteChannelTest extends S3UnitTestBase {
     private S3FileSystemProvider s3fsProvider;
 
     @Before
-    public void setup() {
-        s3fsProvider = spy(new S3FileSystemProvider());
-        doReturn(false).when(s3fsProvider).overloadPropertiesWithSystemEnv(any(Properties.class), anyString());
-        doReturn(new Properties()).when(s3fsProvider).loadAmazonProperties();
+    public void setup() throws IOException {
+        s3fsProvider = getS3fsProvider();
+        s3fsProvider.newFileSystem(S3EndpointConstant.S3_GLOBAL_URI_TEST, null);
     }
 
-
     @Test
     public void seekable() throws IOException {
         // fixtures

diff --git a/src/test/java/com/upplication/s3fs/FileSystemProvider/NewDirectoryStreamTest.java b/src/test/java/com/upplication/s3fs/FileSystemProvider/NewDirectoryStreamTest.java
@@ -23,10 +23,9 @@ public class NewDirectoryStreamTest extends S3UnitTestBase {
     private S3FileSystemProvider s3fsProvider;
 
     @Before
-    public void setup() {
-        s3fsProvider = spy(new S3FileSystemProvider());
-        doReturn(false).when(s3fsProvider).overloadPropertiesWithSystemEnv(any(Properties.class), anyString());
-        doReturn(new Properties()).when(s3fsProvider).loadAmazonProperties();
+    public void setup() throws IOException {
+        s3fsProvider = getS3fsProvider();
+        s3fsProvider.newFileSystem(S3EndpointConstant.S3_GLOBAL_URI_TEST, null);
     }
 
     @Test