Include does substitution

Author: mccabd

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

@@ -1456,7 +1456,7 @@ public synchronized Object put(final Object aKey, final Object aValue) {
 
 			// Act on "include" directives immediately
 			if (INCLUDE.equals(key)) {
-				for (String subFile : parseStringArray(value)) {
+				for (String subFile : parseStringArray(StringSubstitutor.replace(value, backing))) {
 					DefaultConfiguration.this.load(subFile);
 				}
 				return value;

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

@@ -130,6 +130,11 @@ public void testIncludes() {
 		assertPropertyEquals("test.includeAfter.secondaryString", "secondary");
 	}
 
+	@Test
+	public void testIncludeWithSubstitution() {
+		Assert.assertTrue(config.getBoolean("test.property.included"));
+	}
+
 	@Test
 	public void testGetSubProperties() {
 		final int propertyCount = 7;

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

@@ -86,3 +86,9 @@ includeAfter=${includeAfter.test.path}/DefaultConfigurationTest_includeAfterWith
 test.includeAfter.secondaryString=anIncludeAfterWillOvverrideThis
 
 include=./path/to/a/non/existent/file.properties
+
+include.substitution.property=includeWithSubstitution
+
+include=com/github/bordertech/config/DefaultConfigurationTest_${include.substitution.property}.properties
+
+

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

@@ -0,0 +1,8 @@
+############################################################################
+# This property file is for the DefaultConfiguration_Test jUnit test
+# It must not be included or be included by property file that is not
+# directly related to the test.
+############################################################################
+        
+test.property.included=true
+