Update as detailed in the PR

Rather than substituting at get() we only substitute before put

Author: mccabd

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

@@ -1315,15 +1315,14 @@ protected String get(final String key, final String defolt) {
 	 * @return the property value or null
 	 */
 	protected String get(final String key) {
-		// Check environment property
+		// Check profile property
 		if (useProfileKey(key)) {
 			String result = backing.get(getProfileKey(key));
 			if (result != null) {
-				return StringSubstitutor.replace(result, backing);
+				return result;
 			}
 		}
-		//Final substitution check
-		return StringSubstitutor.replace(backing.get(key), backing);
+		return backing.get(key);
 	}
 
 	/**
@@ -1345,9 +1344,12 @@ protected void addOrModifyProperty(final String name, final String value) {
 			throw new IllegalArgumentException("value parameter can not be null.");
 		}
 
-		recordMessage("modifyProperties() - Adding property '" + name + "' with the value '" + value + "'.");
+		//Check for substitution variables
+		final String updatedValue = StringSubstitutor.replace(value, backing);
 
-		runtimeProperties.put(name, value);
+		recordMessage("modifyProperties() - Adding property '" + name + "' with the value '" + updatedValue + "'.");
+
+		runtimeProperties.put(name, updatedValue);
 
 		handlePropertiesChanged();
 	}

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

@@ -102,18 +102,6 @@ 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.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
@@ -167,6 +155,14 @@ public void testSetProperty() {
 		assertPropertyEquals(STRING_PROPERTY_KEY, "simplePropertyValue");
 		config.setProperty(STRING_PROPERTY_KEY, "changedValue");
 		assertPropertyEquals(STRING_PROPERTY_KEY, "changedValue");
+
+		final String key = "aNewPropertyKey";
+
+		config.setProperty(key, "${" + STRING_PROPERTY_KEY + "} with other details");
+		assertPropertyEquals(key, "changedValue with other details");
+
+		config.setProperty(key, "${keyDoesNotExist} with other details");
+		assertPropertyEquals(key, "${keyDoesNotExist} with other details");
 	}
 
 	@Test