Catering for variable interpolation like:

p = a${b}${c}d

Author: n0rmzzz

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

@@ -94,9 +94,14 @@ 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));
+		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;
 	}