Use {placeholder} instead of ${placeholder}

Closes gh-58

Author: rwinch

README.adoc

@@ -223,7 +223,7 @@ The value is calculated as `http://{host}:{port}{contextRoot}`.
 
 This provides a mapping to issuer-uri of https://docs.spring.io/spring-boot/docs/current/reference/html/application-properties.html#application-properties.security.spring.security.oauth2.client.provider[the OAuth provider details].
 
-* name `spring.security.oauth2.client.provider.${providerName}.issuer-uri` with a default `providerName` of `spring`. The `providerName` can be overridden with the `OAuth2ClientProviderIssuerUri.providerName` property.
+* name `spring.security.oauth2.client.provider.{providerName}.issuer-uri` with a default `providerName` of `spring`. The `providerName` can be overridden with the `OAuth2ClientProviderIssuerUri.providerName` property.
 * value `'http://127.0.0.1:' + port` which can be overriden with the `OAuth2ClientProviderIssuerUri.value` property
 
 == Samples

spring-boot-testjars/src/main/java/org/springframework/experimental/boot/test/context/DynamicPortUrl.java

@@ -59,7 +59,7 @@
 @Target({ ElementType.METHOD, ElementType.TYPE })
 @Retention(RetentionPolicy.RUNTIME)
 @Documented
-@DynamicProperty(name = "${name}", value = "'http://${host}:' + port + '${contextRoot}'")
+@DynamicProperty(name = "{name}", value = "'http://{host}:' + port + '{contextRoot}'")
 public @interface DynamicPortUrl {
 
 	/**

spring-boot-testjars/src/main/java/org/springframework/experimental/boot/test/context/DynamicPropertyRegistryPropertyFactory.java

@@ -18,15 +18,14 @@
 
 import java.util.HashMap;
 import java.util.Map;
+import java.util.Properties;
 import java.util.function.Supplier;
 
 import org.springframework.core.annotation.MergedAnnotation;
-import org.springframework.core.env.MapPropertySource;
-import org.springframework.core.env.MutablePropertySources;
-import org.springframework.core.env.PropertySourcesPropertyResolver;
 import org.springframework.expression.Expression;
 import org.springframework.expression.ExpressionParser;
 import org.springframework.expression.spel.standard.SpelExpressionParser;
+import org.springframework.util.PropertyPlaceholderHelper;
 
 /**
  * Creates a {@link DynamicPropertyRegistryProperty} from the {@link DynamicProperty}
@@ -44,12 +43,11 @@ DynamicPropertyRegistryProperty createRegistryProperty(MergedAnnotation<DynamicP
 		if (dynamicProperty == null) {
 			return null;
 		}
-		MutablePropertySources propertySources = new MutablePropertySources();
-		Map<String, Object> annotationProperties = collectAttributes(mergedAnnotation);
-		propertySources.addFirst(new MapPropertySource("dynamicProperty", annotationProperties));
-		PropertySourcesPropertyResolver propertyResolver = new PropertySourcesPropertyResolver(propertySources);
-		String value = propertyResolver.resolvePlaceholders(dynamicProperty.value());
-		String name = propertyResolver.resolvePlaceholders(dynamicProperty.name());
+		Properties annotationProperties = new Properties();
+		annotationProperties.putAll(collectAttributes(mergedAnnotation));
+		PropertyPlaceholderHelper propertyResolver = new PropertyPlaceholderHelper("{", "}");
+		String value = propertyResolver.replacePlaceholders(dynamicProperty.value(), annotationProperties);
+		String name = propertyResolver.replacePlaceholders(dynamicProperty.name(), annotationProperties);
 		Expression expression = this.parser.parseExpression(value);
 		return new DynamicPropertyRegistryProperty(name, () -> expression.getValue(rootObject.get()));
 	}

spring-boot-testjars/src/main/java/org/springframework/experimental/boot/test/context/OAuth2ClientProviderIssuerUri.java

@@ -26,15 +26,15 @@
 
 /**
  * A composed annotation for {@link DynamicProperty} for specifying the property name
- * "spring.security.oauth2.client.provider.${providerName}.issuer-uri" such that
+ * "spring.security.oauth2.client.provider.{providerName}.issuer-uri" such that
  * providerName's value is specified by {@link #providerName()}.
  *
  * @author Rob Winch
  */
 @Target(ElementType.METHOD)
 @Retention(RetentionPolicy.RUNTIME)
 @Documented
-@DynamicPortUrl(name = "spring.security.oauth2.client.provider.${providerName}.issuer-uri")
+@DynamicPortUrl(name = "spring.security.oauth2.client.provider.{providerName}.issuer-uri")
 public @interface OAuth2ClientProviderIssuerUri {
 
 	/**

spring-boot-testjars/src/test/java/org/springframework/experimental/boot/test/context/DynamicPropertyRegistryPropertyFactoryTests.java

@@ -137,7 +137,7 @@ static void dynamicPortUrlWithOverride() {
 	}
 
 	@Retention(RetentionPolicy.RUNTIME)
-	@DynamicProperty(name = "message", value = "'Hello ${firstName}'")
+	@DynamicProperty(name = "message", value = "'Hello {firstName}'")
 	@interface ValueWithVariable {
 
 		String firstName();