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

Merge branch '6.2.x'

This commit is contained in:
Sam Brannen 2025-05-11 15:55:07 +02:00
parent 74f4a07eac 49ffb833a3
commit dde69c96b0
1 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
spring-context/src/main/java/org/springframework/context/support/PropertySourcesPlaceholderConfigurer.java
View File

@ -230,6 +230,16 @@ public class PropertySourcesPlaceholderConfigurer extends PlaceholderConfigurerS
} }
@Override
public boolean containsProperty(String name) {
for (PropertySource<?> propertySource : super.source.getPropertySources()) {
if (propertySource.containsProperty(name)) {
return true;
}
}
return false;
}
@Override @Override
public @Nullable Object getProperty(String name) { public @Nullable Object getProperty(String name) {
for (PropertySource<?> propertySource : super.source.getPropertySources()) { for (PropertySource<?> propertySource : super.source.getPropertySources()) {
@ -241,16 +251,6 @@ public class PropertySourcesPlaceholderConfigurer extends PlaceholderConfigurerS
return null; return null;
} }
@Override
public boolean containsProperty(String name) {
for (PropertySource<?> propertySource : super.source.getPropertySources()) {
if (propertySource.containsProperty(name)) {
return true;
}
}
return false;
}
@Override @Override
public String toString() { public String toString() {
return "ConfigurableEnvironmentPropertySource {propertySources=" + super.source.getPropertySources() + "}"; return "ConfigurableEnvironmentPropertySource {propertySources=" + super.source.getPropertySources() + "}";
@ -270,6 +270,11 @@ public class PropertySourcesPlaceholderConfigurer extends PlaceholderConfigurerS
} }
@Override
public boolean containsProperty(String name) {
return super.source.containsProperty(name);
}
@Override @Override
public @Nullable Object getProperty(String name) { public @Nullable Object getProperty(String name) {
return super.source.getProperty(name); return super.source.getProperty(name);