Merge pull request #10 from ericdallo/issue-9

[ISSUE-9] Fallback to os properties if java property was not found

Author: ericdallo

src/main/java/com/spring/loader/util/SystemPropertyResolver.java

@@ -3,15 +3,15 @@
 import static java.lang.String.format;
 import static org.springframework.util.StringUtils.isEmpty;
 
-import com.spring.loader.exception.EnviromentPropertyNotFoundException;
-import com.spring.loader.exception.InvalidS3LocationException;
-
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
+import com.spring.loader.exception.EnviromentPropertyNotFoundException;
+import com.spring.loader.exception.InvalidS3LocationException;
+
 /**
- * Resolver for properties that will be retrieved from system environment. 
- * 
+ * Resolver for properties that will be retrieved from system environment.
+ *
  * @author Eric Dallo
  * @since 2.0
  */
@@ -40,15 +40,19 @@ public String getFormattedValue(String value) {
 
 			return bucket;
 		}
-		
+
 		return value;
 	}
 
 	private String getFromEnv(String key) {
-		String valueFromEnv = System.getenv(key);
+		String valueFromEnv = System.getProperty(key);
 
 		if (isEmpty(valueFromEnv)) {
-			throw new EnviromentPropertyNotFoundException(format("Environment variable %s not found in system", key));
+			valueFromEnv = System.getenv(key);
+
+			if (isEmpty(valueFromEnv)) {
+				throw new EnviromentPropertyNotFoundException(format("Environment variable %s not found in system and java properties", key));
+			}
 		}
 
 		return valueFromEnv;

src/test/java/com/spring/loader/util/SystemPropertyResolverTest.java

@@ -1,23 +1,22 @@
 package com.spring.loader.util;
 
 import static org.junit.Assert.assertEquals;
+import static org.mockito.Matchers.eq;
 
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.mockito.Mockito;
 import org.powermock.api.mockito.PowerMockito;
 import org.powermock.core.classloader.annotations.PrepareForTest;
 import org.powermock.modules.junit4.PowerMockRunner;
 
 import com.spring.loader.exception.EnviromentPropertyNotFoundException;
 import com.spring.loader.exception.InvalidS3LocationException;
-import com.spring.loader.util.SystemPropertyResolver;
 
 @PrepareForTest(SystemPropertyResolver.class)
 @RunWith(PowerMockRunner.class)
 public class SystemPropertyResolverTest {
-	
+
 	private SystemPropertyResolver subject;
 
 	@Before
@@ -29,13 +28,26 @@ public void setup() {
 	@Test
 	public void shouldGetFormattedValueWhenValueIsValid() {
 		String expected = "someValue";
-		
-		PowerMockito.when(System.getenv(Mockito.eq("AWS_S3"))).thenReturn(expected);
-		
+
+		PowerMockito.when(System.getenv(eq("AWS_S3"))).thenReturn(expected);
+
 		String env = "${AWS_S3}";
-		
+
 		String formattedValue = subject.getFormattedValue(env);
-		
+
+		assertEquals(expected, formattedValue);
+	}
+
+	@Test
+	public void shouldGetFormattedValueFromPropertiesWhenValueIsValid() {
+		String expected = "someValue";
+
+		PowerMockito.when(System.getProperty(eq("AWS_S3"))).thenReturn(expected);
+
+		String env = "${AWS_S3}";
+
+		String formattedValue = subject.getFormattedValue(env);
+
 		assertEquals(expected, formattedValue);
 	}
 
@@ -44,8 +56,8 @@ public void shouldGetCombinedFormattedValueWhenValueIsValid() {
 		String region = "someRegion";
 		String environment = "someEnvironment";
 
-		PowerMockito.when(System.getenv(Mockito.eq("S3_BUCKET_REGION"))).thenReturn(region);
-		PowerMockito.when(System.getenv(Mockito.eq("S3_BUCKET_ENVIRONMENT"))).thenReturn(environment);
+		PowerMockito.when(System.getenv(eq("S3_BUCKET_REGION"))).thenReturn(region);
+		PowerMockito.when(System.getenv(eq("S3_BUCKET_ENVIRONMENT"))).thenReturn(environment);
 
 		String configValue = "${S3_BUCKET_REGION}/${S3_BUCKET_ENVIRONMENT}/myApplication/application.properties";
 		String expected = String.format("%s/%s/myApplication/application.properties", region, environment);
@@ -59,7 +71,7 @@ public void shouldGetCombinedFormattedValueWhenValueIsValid() {
 	public void shouldReplaceMultiple() {
 		String environment = "dev";
 
-		PowerMockito.when(System.getenv(Mockito.eq("EC2_ENVIRONMENT"))).thenReturn(environment);
+		PowerMockito.when(System.getenv(eq("EC2_ENVIRONMENT"))).thenReturn(environment);
 
 		String configValue = "region-${EC2_ENVIRONMENT}/deploy-${EC2_ENVIRONMENT}/application.properties";
 		String expected = String.format("region-%s/deploy-%s/application.properties", environment, environment);
@@ -72,32 +84,32 @@ public void shouldReplaceMultiple() {
 	@Test
 	public void shouldGetFormattedValueWhenValueIsValidAndNotASystemEnv() {
 		String expected = "someValue";
-		
+
 		String formattedValue = subject.getFormattedValue(expected);
-		
+
 		assertEquals(expected, formattedValue);
 	}
-	
+
 	@Test(expected = InvalidS3LocationException.class)
 	public void shouldNotGetFormattedValueWhenValueIsEmpty() {
 		String expected = "";
-		
+
 		subject.getFormattedValue(expected);
 	}
-	
+
 	@Test(expected = InvalidS3LocationException.class)
 	public void shouldNotGetFormattedValueWhenValueHasAInvalidSyntax() {
 		String expected = "${AWS_S3";
-		
+
 		subject.getFormattedValue(expected);
 	}
-	
+
 	@Test(expected = EnviromentPropertyNotFoundException.class)
 	public void shouldNotGetFormattedValueWhenSystemDoesNotHasTheEnvironmentVariable() {
-		PowerMockito.when(System.getenv(Mockito.eq("AWS_S3"))).thenReturn(null);
-		
+		PowerMockito.when(System.getenv(eq("AWS_S3"))).thenReturn(null);
+
 		String env = "${AWS_S3}";
-		
+
 		subject.getFormattedValue(env);
 	}