Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Support for resource patterns in @PropertySource locations

Browse Source 
Closes gh-21325
This commit is contained in:
Juergen Hoeller
2023-08-14 19:16:52 +02:00
parent 3228502108
commit 9c74c25961
2 changed files with 25 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
spring-context/src/test/java/org/springframework/context/annotation/PropertySourceAnnotationTests.java
View File

@@ -234,6 +234,14 @@ class PropertySourceAnnotationTests {
ctx.close();
}
@Test
void multipleResourcesFromPropertySourcePattern() { // gh-21325
ConfigurableApplicationContext ctx = new AnnotationConfigApplicationContext(ResourcePatternConfig.class);
ctx.getBean(ResourcePatternConfig.class);
assertEnvironmentContainsProperties(ctx, "from.p1", "from.p2", "from.p3", "from.p4", "from.p5");
ctx.close();
}
@Test
void withNamedPropertySources() {
AnnotationConfigApplicationContext ctx = new AnnotationConfigApplicationContext(ConfigWithNamedPropertySources.class);
@@ -277,15 +285,15 @@ class PropertySourceAnnotationTests {
}
@Test
void orderingWithAndWithoutNameAndFourResourceLocations() {
void orderingWithFourResourceLocations() {
// SPR-12198: p4 should 'win' as it was registered last
AnnotationConfigApplicationContext ctxWithoutName = new AnnotationConfigApplicationContext(ConfigWithFourResourceLocations.class);
assertEnvironmentProperty(ctxWithoutName, "testbean.name", "p4TestBean");
ctxWithoutName.close();
AnnotationConfigApplicationContext ctx = new AnnotationConfigApplicationContext(ConfigWithFourResourceLocations.class);
assertEnvironmentProperty(ctx, "testbean.name", "p4TestBean");
ctx.close();
}
@Test
void orderingDoesntReplaceExisting() throws Exception {
void orderingDoesntReplaceExisting() {
// SPR-12198: mySource should 'win' as it was registered manually
AnnotationConfigApplicationContext ctxWithoutName = new AnnotationConfigApplicationContext();
MapPropertySource mySource = new MapPropertySource("mine", Map.of("testbean.name", "myTestBean"));
@@ -522,6 +530,12 @@ class PropertySourceAnnotationTests {
static class MultipleComposedAnnotationsConfig {
}
@PropertySource("classpath*:org/springframework/context/annotation/p?.properties")
static class ResourcePatternConfig {
}
@Configuration
@PropertySources({
@PropertySource(name = "psName", value = "classpath:org/springframework/context/annotation/p1.properties"),