1580: Fixes property substitution problem for active profiles (#1581)

* 1580: Fixes property substitution problem for active profiles

Signed-off-by: Schäfer, H.H. (Hans Hosea) <[email protected]>

* 1580: Test adjusted and extended for fixed behavior

Signed-off-by: Schäfer, H.H. (Hans Hosea) <[email protected]>

---------

Signed-off-by: Schäfer, H.H. (Hans Hosea) <[email protected]>
Co-authored-by: Schäfer, H.H. (Hans Hosea) <[email protected]>

Author: hosea

spring-cloud-context/src/main/java/org/springframework/cloud/bootstrap/config/PropertySourceBootstrapConfiguration.java

@@ -314,14 +314,9 @@ private String[] getProfilesForValue(Object property, ConfigurableEnvironment en
 	}
 
 	private String[] resolvePlaceholdersInProfiles(String profiles, ConfigurableEnvironment environment) {
-		return Arrays.stream(StringUtils.tokenizeToStringArray(profiles, ",")).map(s -> {
-			if (s.startsWith("${") && s.endsWith("}")) {
-				return environment.resolvePlaceholders(s);
-			}
-			else {
-				return s;
-			}
-		}).toArray(String[]::new);
+		return Arrays.stream(StringUtils.tokenizeToStringArray(profiles, ","))
+			.map(environment::resolvePlaceholders)
+			.toArray(String[]::new);
 	}
 
 	/*

spring-cloud-context/src/test/java/org/springframework/cloud/bootstrap/config/BootstrapConfigurationTests.java

@@ -666,15 +666,15 @@ public void activeAndIncludeProfileFromBootstrapPropertySourceWithReplacementWit
 	}
 
 	private void activeAndIncludeProfileFromBootstrapPropertySourceWithReplacement(String... properties) {
-		PropertySourceConfiguration.MAP.put("spring.profiles.active", "${barreplacement},baz");
+		PropertySourceConfiguration.MAP.put("spring.profiles.active", "before_${barreplacement}_after,baz");
 		PropertySourceConfiguration.MAP.put("spring.profiles.include", "${barreplacement},baz,hello");
 		context = new SpringApplicationBuilder().web(WebApplicationType.NONE)
 			.properties(properties)
 			.profiles("foo")
 			.sources(BareConfiguration.class)
 			.run();
-		then(context.getEnvironment().acceptsProfiles("baz", "bar", "hello", "foo")).isTrue();
-		then(context.getEnvironment().getActiveProfiles()).contains("baz", "bar", "foo", "hello");
+		then(context.getEnvironment().acceptsProfiles("baz", "bar", "hello", "foo", "before_bar_after")).isTrue();
+		then(context.getEnvironment().getActiveProfiles()).contains("baz", "bar", "foo", "hello", "before_bar_after");
 	}
 
 	@Test
@@ -739,6 +739,7 @@ void activeAndIncludeProfileFromBootstrapPropertySource_WhenMultiplePlacesHaveAc
 			.anyMatch("local"::equals)).isTrue();
 	}
 
+
 	@Configuration(proxyBeanMethods = false)
 	@EnableConfigurationProperties
 	protected static class BareConfiguration {