Refactor profile usage

Author: mccabd

src/main/java/com/github/bordertech/config/DefaultConfiguration.java

@@ -4,6 +4,7 @@
 import org.apache.commons.configuration.ConversionException;
 import org.apache.commons.configuration.MapConfiguration;
 import org.apache.commons.lang3.BooleanUtils;
+import org.apache.commons.lang3.ObjectUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.tuple.ImmutablePair;
 import org.apache.commons.lang3.tuple.Pair;
@@ -282,8 +283,6 @@ private void load() {
 
 		recordMessage("Working directory is " + workingDir);
 
-		setEnvironmentProfile();
-
 		for (String resourceName : resourceLoadOrder) {
 			loadTop(resourceName);
 		}
@@ -298,6 +297,8 @@ private void load() {
 			loadEnvironmentProperties();
 		}
 
+		setEnvironmentProfile();
+
 		// Check if environment set
 		checkEnvironmentProperty();
 
@@ -723,7 +724,8 @@ private void loadEnvironmentProperties() {
 	 * If both are defined, system property overrides and environment property
 	 */
 	private void setEnvironmentProfile() {
-		environmentProfile = System.getProperty(PROFILE_PROPERTY, System.getenv().get(PROFILE_PROPERTY));
+
+		environmentProfile = ObjectUtils.firstNonNull(backing.get(PROFILE_PROPERTY), System.getProperty(PROFILE_PROPERTY), System.getenv().get(PROFILE_PROPERTY));
 
 		if (StringUtils.isBlank(environmentProfile)) {
 			recordMessage("Environment Profile Property <" + PROFILE_PROPERTY + "> has not been defined.");
@@ -1320,7 +1322,14 @@ protected String get(final String key, final String defolt) {
 	 * @return the property value or null
 	 */
 	protected String get(final String key) {
-		return backing.get(getKey(key));
+		String result = backing.get(getKey(key));
+
+		if (StringUtils.isNotBlank(result)) {
+			//Final substitution check
+			result = StringSubstitutor.replace(result, backing);
+		}
+
+		return result;
 	}
 
 	/**
@@ -1357,6 +1366,7 @@ protected void handlePropertiesChanged() {
 		subcontextCache.clear();
 		// Check if environment changed
 		checkEnvironmentProperty();
+		setEnvironmentProfile();
 	}
 
 	/**

src/test/java/com/github/bordertech/config/DefaultConfigurationTest.java

@@ -102,7 +102,18 @@ public void testSubstitution() {
 		assertPropertyEquals("substitute.part1And2And3Key", "part1Value+part2Value+part3Value");
 		assertPropertyEquals("substitute.combinedKey", "multiPart1ValuemultiPart2Value");
 		assertPropertyEquals("substitute.reurse", "${substitute.recurse}");
-		assertPropertyEquals("substitute.key.not.defined.in.value", "${this.key.is.not.defined}");
+		assertPropertyEquals("substitute.key.not.defined.in.value", "${this.key.is.not.defined.initially}");
+		assertPropertyEquals("substitute.key.with.profile.in.value", "prefix_${bordertech.config.profile}_suffix");
+
+		config.setProperty("this.key.is.not.defined.initially", "isNowDefined");
+
+		assertPropertyEquals("substitute.key.not.defined.in.value", "isNowDefined");
+
+		config.setProperty(PROFILE_PROPERTY, "a_profile");
+
+		assertPropertyEquals("substitute.key.with.profile.in.value", "prefix_a_profile_suffix");
+
+		config.clearProperty(PROFILE_PROPERTY);
 	}
 
 	@Test
@@ -458,7 +469,7 @@ public void testRefresh() {
 	public void testClear() {
 		Assert.assertFalse(config.isEmpty());
 		config.clear();
-		Assert.assertTrue(config.isEmpty());
+		Assert.assertTrue("Config should be cleared", config.isEmpty());
 	}
 
 	@Test
@@ -609,7 +620,16 @@ public void testUseEnvironmentProfile() {
 		//Profile is set and property key with profile is set
 		Assert.assertEquals(profileValue, config.get(key));
 
+		config.addProperty(PROFILE_PROPERTY, env + "second");
+
+		Assert.assertEquals(value, config.get(key));
+
+		config.addProperty(key + "." + env + "second", profileValue + "Second");
+
+		Assert.assertEquals(profileValue + "Second", config.get(key));
+
 		System.clearProperty(PROFILE_PROPERTY);
+		config.refresh();
 	}
 
 	@Test

src/test/resources/com/github/bordertech/config/DefaultConfigurationTest.properties

@@ -46,7 +46,9 @@ substitute.reurse2=${substitute.recurse3}
 substitute.reurse3=${substitute.recurse1}
 
 #Substitution before key is defined
-substitute.key.not.defined.in.value=${this.key.is.not.defined}
+substitute.key.not.defined.in.value=${this.key.is.not.defined.initially}
+
+substitute.key.with.profile.in.value=prefix_${bordertech.config.profile}_suffix
 
 # -------------------------------------------------------------------------------------------------
 # Environment Suffix tests