root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 15 Packages Projects Releases Wiki Activity

Don't adapt RandomPropertySource 

Stop adapting `RandomPropertySource` to `ConfigurationPropertySource`
since it's not useful as a binding source.

Closes gh-21659
This commit is contained in:
Phillip Webb 2020-10-27 20:41:13 -07:00
parent 10ab477426
commit 0588e989af
2 changed files with 20 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/properties/source/SpringConfigurationPropertySources.java
View File

@ -21,6 +21,7 @@ import java.util.Deque;
import java.util.Iterator;
import java.util.Map;
import java.util.NoSuchElementException;
import java.util.Random;
import java.util.function.Function;
import org.springframework.core.env.ConfigurableEnvironment;
@ -123,10 +124,16 @@ class SpringConfigurationPropertySources implements Iterable<ConfigurationProper
}
private boolean isIgnored(PropertySource<?> candidate) {
return (candidate instanceof StubPropertySource
return (isRandomPropertySource(candidate) || candidate instanceof StubPropertySource
|| candidate instanceof ConfigurationPropertySourcesPropertySource);
}
private boolean isRandomPropertySource(PropertySource<?> candidate) {
Object source = candidate.getSource();
return (source instanceof Random) || (source instanceof PropertySource<?>
&& ((PropertySource<?>) source).getSource() instanceof Random);
}
}
}

12
spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/properties/source/SpringConfigurationPropertySourcesTests.java
View File

@ -21,6 +21,7 @@ import java.util.Iterator;
import org.junit.jupiter.api.Test;
import org.springframework.boot.env.RandomValuePropertySource;
import org.springframework.core.env.Environment;
import org.springframework.core.env.MapPropertySource;
import org.springframework.core.env.MutablePropertySources;
@ -161,4 +162,15 @@ class SpringConfigurationPropertySourcesTests {
assertThat(configurationSources.iterator().next().getConfigurationProperty(name).getValue()).isEqualTo("s2");
}
@Test
void shouldNotAdaptRandomePropertySource() {
MutablePropertySources sources = new MutablePropertySources();
sources.addFirst(new RandomValuePropertySource());
sources.addFirst(new MapPropertySource("test", Collections.singletonMap("a", "b")));
Iterator<ConfigurationPropertySource> iterator = new SpringConfigurationPropertySources(sources).iterator();
ConfigurationPropertyName name = ConfigurationPropertyName.of("a");
assertThat(iterator.next().getConfigurationProperty(name).getValue()).isEqualTo("b");
assertThat(iterator.hasNext()).isFalse();
}
}