Merge branch 'zivver-master' into hotfix/1.1.1

Author: jarnaiz

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

@@ -232,9 +232,16 @@ protected String systemGetEnv(String key){
         return System.getenv(key);
     }
 
+	/**
+	 * Get existing filesystem based on a combination of URI and env settings. Create new filesystem otherwise.
+	 * @param uri URI of existing, or to be created filesystem.
+	 * @param env environment settings.
+	 * @return new or existing filesystem.
+	 */
 	public FileSystem getFileSystem(URI uri, Map<String, ?> env) {
 		validateUri(uri);
-		String key = this.getFileSystemKey(uri);
+		Properties props = getProperties(uri, env);
+		String key = this.getFileSystemKey(uri, props); // s3fs_access_key is part of the key here.
 		if (fileSystems.containsKey(key))
 			return fileSystems.get(key);
 		return newFileSystem(uri, env);

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

@@ -4,6 +4,7 @@
 import static com.upplication.s3fs.S3UnitTestBase.S3_GLOBAL_URI;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertSame;
 import static org.mockito.Matchers.argThat;
 import static org.mockito.Matchers.eq;
 import static org.mockito.Mockito.*;
@@ -39,8 +40,6 @@ public void setup() throws IOException {
 		}
 		provider = spy(new S3FileSystemProvider());
         doReturn(buildFakeProps()).when(provider).loadAmazonProperties();
-        doReturn(false).when(provider).overloadPropertiesWithSystemEnv(any(Properties.class), anyString());
-        doReturn(false).when(provider).overloadPropertiesWithSystemProps(any(Properties.class), anyString());
 	}
 
 	@Test
@@ -64,7 +63,7 @@ public void createsAuthenticatedByEnvOverridesProps() {
 		verify(provider).createFileSystem(eq(S3_GLOBAL_URI), argThat(new ArgumentMatcher<Properties>() {
             @Override
             public boolean matches(Object argument) {
-                Properties called = (Properties)argument;
+                Properties called = (Properties) argument;
                 assertEquals(env.get(ACCESS_KEY), called.get(ACCESS_KEY));
                 assertEquals(env.get(SECRET_KEY), called.get(SECRET_KEY));
                 return true;
@@ -139,10 +138,22 @@ public boolean matches(Object argument) {
 
 	@Test
 	public void createsAnonymousNotPossible() {
-		FileSystem fileSystem = provider.newFileSystem(S3_GLOBAL_URI, ImmutableMap.<String, Object> of());
+		FileSystem fileSystem = provider.newFileSystem(S3_GLOBAL_URI, ImmutableMap.<String, Object>of());
 		assertNotNull(fileSystem);
 		verify(provider).createFileSystem(eq(S3_GLOBAL_URI), eq(buildFakeProps()));
 	}
+
+    @Test
+    public void getFileSystemWithSameEnvReturnSameFileSystem() {
+        doCallRealMethod().when(provider).loadAmazonProperties();
+
+        Map<String, Object> env = ImmutableMap.<String, Object> of("s3fs_access_key", "a", "s3fs_secret_key", "b");
+        FileSystem fileSystem = provider.getFileSystem(S3_GLOBAL_URI, env);
+        assertNotNull(fileSystem);
+
+        FileSystem sameFileSystem = provider.getFileSystem(S3_GLOBAL_URI, env);
+        assertSame(fileSystem, sameFileSystem);
+    }
 
 	private Map<String, String> buildFakeEnv(){
 		return ImmutableMap.<String, String> builder()
@@ -153,7 +164,7 @@ private Map<String, String> buildFakeEnv(){
 	private Properties buildFakeProps() {
         try {
             Properties props = new Properties();
-            props.load(Thread.currentThread().getContextClassLoader().getResourceAsStream("amazon-test-sample.properties"));
+            props.load(Thread.currentThread().getContextClassLoader().getResourceAsStream("amazon-test.properties"));
             return props;
         }
         catch (IOException e){

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

@@ -47,7 +47,7 @@ public class S3FileSystemProviderTest extends S3UnitTestBase {
 	@Before
 	public void setup() {
 		s3fsProvider = spy(new S3FileSystemProvider());
-        doReturn(false).when(s3fsProvider).overloadPropertiesWithSystemEnv(any(Properties.class), anyString());
+        //doReturn(false).when(s3fsProvider).overloadPropertiesWithSystemEnv(any(Properties.class), anyString());
 		doReturn(new Properties()).when(s3fsProvider).loadAmazonProperties();
 	}