Skip to content

Commit

Permalink
Merge pull request #26761 from 1zg12
Browse files Browse the repository at this point in the history
* pr/26761:
  Polish "Restore customization of PropertyResolver"
  Restore customization of PropertyResolver

Closes gh-26761
  • Loading branch information
snicoll committed Aug 26, 2023
2 parents 89b7a6b + 2731d4f commit 2b3539a
Showing 1 changed file with 11 additions and 2 deletions.
@@ -1,5 +1,5 @@
/*
* Copyright 2002-2022 the original author or authors.
* Copyright 2002-2023 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down Expand Up @@ -170,10 +170,19 @@ public String getProperty(String key) {
}
}

processProperties(beanFactory, new PropertySourcesPropertyResolver(this.propertySources));
processProperties(beanFactory, createPropertyResolver(this.propertySources));
this.appliedPropertySources = this.propertySources;
}

/**
* Create a {@link ConfigurablePropertyResolver} for the specified property sources.
* @param propertySources the property sources to use
* @since 6.0.12
*/
protected ConfigurablePropertyResolver createPropertyResolver(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.
Expand Down

0 comments on commit 2b3539a

Please sign in to comment.