Manual Merge of pull request

Merge branch 'master' of https://github.com/normanatashbar/ReloadablePropertiesAnnotation into normanatashbar-master

Author: jamesmorgan

src/main/java/com/morgan/design/properties/internal/ReadablePropertySourcesPlaceholderConfigurer.java

@@ -94,9 +94,16 @@ public void startWatching() {
 	}
 
 	public Object resolveProperty(final Object property) {
-		final Object resolvedPropertyValue = this.properties.get(this.propertyResolver.resolveProperty(property));
-		if (this.propertyResolver.requiresFurtherResoltuion(resolvedPropertyValue)) {
-			return resolveProperty(resolvedPropertyValue);
+		Object resolvedPropertyValue = this.properties.get(this.propertyResolver.resolveProperty(property));
+        if (!(resolvedPropertyValue instanceof String))
+            return resolvedPropertyValue;
+		while (this.propertyResolver.requiresFurtherResoltuion(resolvedPropertyValue)) {
+            String resolvedValueStr = resolvedPropertyValue.toString();
+            int startingIndex = resolvedValueStr.indexOf("${");
+            int endingIndex = resolvedValueStr.indexOf("}", startingIndex) + 1;
+            String toResolve = resolvedValueStr.substring(startingIndex, endingIndex);
+            String resolved = resolveProperty(toResolve).toString();
+            resolvedPropertyValue = resolvedValueStr.substring(0, startingIndex) + resolved + resolvedValueStr.substring(endingIndex);
 		}
 		return resolvedPropertyValue;
 	}

src/main/java/com/morgan/design/properties/resolver/SubstitutingPropertyResolver.java

@@ -51,7 +51,7 @@ public boolean requiresFurtherResoltuion(final Object property) {
 	 */
 	private boolean propertyRequiresSubstitution(final String property) {
 		if (null != property) {
-			return property.startsWith("${") && property.endsWith("}");
+			return property.contains("${") && property.contains("}") && property.indexOf("${") < property.indexOf("}");
 		}
 		return false;
 	}

src/test/java/com/morgan/design/properties/internal/UpdatingReloadablePropertyPostProcessorIntTest.java

@@ -35,25 +35,29 @@ public class UpdatingReloadablePropertyPostProcessorIntTest extends AbstractJUni
 	public void setUp() throws IOException {
 		this.loadedProperties = PropertiesLoaderUtils.loadAllProperties(PROPERTIES);
 		assertThat(this.bean.getStringProperty(), is("Injected String Value"));
+        assertThat(this.bean.getCompositeStringProperty(), is("Hello, World!"));
 	}
 
 	@After
 	public void cleanUp() throws Exception {
 		this.loadedProperties.setProperty("dynamicProperty.stringValue", "Injected String Value");
+        this.loadedProperties.setProperty("dynamicProperty.baseStringValue", "World");
+        this.loadedProperties.setProperty("dynamicProperty.compoiteStringValue", "Hello, ${dynamicProperty.baseStringValue}!");
 
 		final OutputStream newOutputStream = Files.newOutputStream(new File(DIR + PROPERTIES).toPath(), new OpenOption[] {});
 		this.loadedProperties.store(newOutputStream, null);
 
 		Thread.sleep(500); // this is a hack -> I need to find an alternative
 
 		assertThat(this.bean.getStringProperty(), is("Injected String Value"));
+        assertThat(this.bean.getCompositeStringProperty(), is("Hello, World!"));
 	}
 
 	@Test
 	public void shouldReloadAlteredStringProperty() throws Exception {
 		assertThat(this.bean.getStringProperty(), is("Injected String Value"));
 
-		this.loadedProperties.setProperty("dynamicProperty.stringValue", "Altered Injected String Value");
+        this.loadedProperties.setProperty("dynamicProperty.stringValue", "Altered Injected String Value");
 
 		final File file = new File(DIR + PROPERTIES);
 		final OutputStream newOutputStream = Files.newOutputStream(file.toPath(), new OpenOption[] {});
@@ -65,4 +69,21 @@ public void shouldReloadAlteredStringProperty() throws Exception {
 
 		assertThat(this.bean.getStringProperty(), is("Altered Injected String Value"));
 	}
+
+    @Test
+    public void shouldReloadAlteredCompositeStringProperty() throws Exception {
+        assertThat(this.bean.getCompositeStringProperty(), is("Hello, World!"));
+
+        this.loadedProperties.setProperty("dynamicProperty.compoiteStringValue", "Goodbye, ${dynamicProperty.baseStringValue}!");
+
+        final File file = new File(DIR + PROPERTIES);
+        final OutputStream newOutputStream = Files.newOutputStream(file.toPath(), new OpenOption[] {});
+        this.loadedProperties.store(newOutputStream, null);
+        newOutputStream.flush();
+        newOutputStream.close();
+
+        Thread.sleep(500); // this is a hack -> I need to find an alternative
+
+        assertThat(this.bean.getCompositeStringProperty(), is("Goodbye, World!"));
+    }
 }

src/test/java/com/morgan/design/properties/testBeans/ReloadingAutowiredPropertyBean.java

@@ -10,7 +10,14 @@ public class ReloadingAutowiredPropertyBean {
 	@ReloadableProperty("dynamicProperty.stringValue")
 	private String stringProperty;
 
-	public String getStringProperty() {
+    @ReloadableProperty("dynamicProperty.compoiteStringValue")
+    private String compositeStringProperty;
+
+    public String getStringProperty() {
 		return this.stringProperty;
 	}
+
+    public String getCompositeStringProperty() {
+        return this.compositeStringProperty;
+    }
 }

src/test/resources/test-files/reloading.properties

@@ -1,2 +1,3 @@
 #Sun Jul 15 13:22:10 BST 2012
 dynamicProperty.stringValue=Injected String Value
+dynamicProperty.compoiteStringValue=Hello, World!