Skip to content

Commit 2731d4f

Browse files
committed
Polish "Restore customization of PropertyResolver"
See gh-26761
1 parent 00fffb7 commit 2731d4f

File tree

1 file changed

+6
-4
lines changed

1 file changed

+6
-4
lines changed

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

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2002-2022 the original author or authors.
2+
* Copyright 2002-2023 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -170,14 +170,16 @@ public String getProperty(String key) {
170170
}
171171
}
172172

173-
processProperties(beanFactory, getPropertyResolver(this.propertySources));
173+
processProperties(beanFactory, createPropertyResolver(this.propertySources));
174174
this.appliedPropertySources = this.propertySources;
175175
}
176176

177177
/**
178-
* Construct and provide a PropertyResolver from the given properties.
178+
* Create a {@link ConfigurablePropertyResolver} for the specified property sources.
179+
* @param propertySources the property sources to use
180+
* @since 6.0.12
179181
*/
180-
public ConfigurablePropertyResolver getPropertyResolver(MutablePropertySources propertySources){
182+
protected ConfigurablePropertyResolver createPropertyResolver(MutablePropertySources propertySources){
181183
return new PropertySourcesPropertyResolver(propertySources);
182184
}
183185

0 commit comments

Comments
 (0)