make the property resolver configurable

1zg12 · 1zg12 · commit af602bb7e138 · 2021-04-06T10:46:36.000+08:00
diff --git a/spring-context/src/main/java/org/springframework/context/support/PropertySourcesPlaceholderConfigurer.java b/spring-context/src/main/java/org/springframework/context/support/PropertySourcesPlaceholderConfigurer.java
@@ -154,10 +154,17 @@ public String getProperty(String key) {
 			}
 		}
 
-		processProperties(beanFactory, new PropertySourcesPropertyResolver(this.propertySources));
+		processProperties(beanFactory, getPropertyResolver(this.propertySources));
 		this.appliedPropertySources = this.propertySources;
 	}
 
+	/**
+	 * Construct and provide a PropertyResolver from the given properties.
+	 */
+	public ConfigurablePropertyResolver getPropertyResolver(MutablePropertySources propertySources){
+		return new PropertySourcesPropertyResolver(propertySources);
+	}
+
 	/**
 	 * Visit each bean definition in the given bean factory and attempt to replace ${...} property
 	 * placeholders with values from the given properties.

Original file line number	Diff line number	Diff line change
`@@ -154,10 +154,17 @@ public String getProperty(String key) {`
`154`	`154`	`}`
`155`	`155`	`}`
`156`	`156`
`157`		`- processProperties(beanFactory, new PropertySourcesPropertyResolver(this.propertySources));`
	`157`	`+ processProperties(beanFactory, getPropertyResolver(this.propertySources));`
`158`	`158`	`this.appliedPropertySources = this.propertySources;`
`159`	`159`	`}`
`160`	`160`
	`161`	`+ /**`
	`162`	`+ * Construct and provide a PropertyResolver from the given properties.`
	`163`	`+ */`
	`164`	`+ public ConfigurablePropertyResolver getPropertyResolver(MutablePropertySources propertySources){`
	`165`	`+ return new PropertySourcesPropertyResolver(propertySources);`
	`166`	`+ }`
	`167`	`+`
`161`	`168`	`/**`
`162`	`169`	`* Visit each bean definition in the given bean factory and attempt to replace ${...} property`
`163`	`170`	`* placeholders with values from the given properties.`