Merge branch '2.2.x' into 2.3.x

Closes gh-21655
spring-projects · Jun 2, 2020 · 2589f98 · 2589f98
2 parents f0bc8ee + 09a47c9
commit 2589f98
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 1 deletion.
diff --git a/...org/springframework/boot/context/properties/source/SpringConfigurationPropertySource.java b/...org/springframework/boot/context/properties/source/SpringConfigurationPropertySource.java
@@ -104,7 +104,7 @@ public ConfigurationPropertyState containsDescendantOf(ConfigurationPropertyName
 	}
 
 	private static ConfigurationPropertyState containsDescendantOfForRandom(ConfigurationPropertyName name) {
-		if (name.isAncestorOf(RANDOM) || name.equals(RANDOM)) {
+		if (RANDOM.isAncestorOf(name) || name.equals(RANDOM)) {
 			return ConfigurationPropertyState.PRESENT;
 		}
 		return ConfigurationPropertyState.ABSENT;

diff --git a/...pringframework/boot/context/properties/source/SpringConfigurationPropertySourceTests.java b/...pringframework/boot/context/properties/source/SpringConfigurationPropertySourceTests.java
@@ -21,6 +21,7 @@
 
 import org.junit.jupiter.api.Test;
 
+import org.springframework.boot.env.RandomValuePropertySource;
 import org.springframework.boot.origin.Origin;
 import org.springframework.boot.origin.OriginLookup;
 import org.springframework.core.env.MapPropertySource;
@@ -141,6 +142,30 @@ void getWhenEnumerableShouldBeIterable() {
 				.isInstanceOf(IterableConfigurationPropertySource.class);
 	}
 
+	@Test
+	void containsDescendantOfWhenRandomSourceAndRandomPropertyReturnsPresent() {
+		SpringConfigurationPropertySource source = SpringConfigurationPropertySource
+				.from(new RandomValuePropertySource());
+		assertThat(source.containsDescendantOf(ConfigurationPropertyName.of("random")))
+				.isEqualTo(ConfigurationPropertyState.PRESENT);
+	}
+
+	@Test
+	void containsDescendantOfWhenRandomSourceAndRandomPrefixedPropertyReturnsPresent() {
+		SpringConfigurationPropertySource source = SpringConfigurationPropertySource
+				.from(new RandomValuePropertySource());
+		assertThat(source.containsDescendantOf(ConfigurationPropertyName.of("random.something")))
+				.isEqualTo(ConfigurationPropertyState.PRESENT);
+	}
+
+	@Test
+	void containsDescendantOfWhenRandomSourceAndNonRandomPropertyReturnsAbsent() {
+		SpringConfigurationPropertySource source = SpringConfigurationPropertySource
+				.from(new RandomValuePropertySource());
+		assertThat(source.containsDescendantOf(ConfigurationPropertyName.of("abandon.something")))
+				.isEqualTo(ConfigurationPropertyState.ABSENT);
+	}
+
 	/**
 	 * Test {@link PropertySource} that's also an {@link OriginLookup}.
 	 *