Use configuration resolver to replace standard resolver

Closes spring-projectsgh-28687
terminux · Apr 7, 2023 · a2d0dc8 · a2d0dc8
1 parent 12537c7
commit a2d0dc8
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/...t/spring-boot/src/main/java/org/springframework/boot/logging/LoggingSystemProperties.java b/...t/spring-boot/src/main/java/org/springframework/boot/logging/LoggingSystemProperties.java
@@ -20,11 +20,12 @@
 import java.nio.charset.StandardCharsets;
 import java.util.function.BiConsumer;
 
+import org.springframework.boot.context.properties.source.ConfigurationPropertySources;
 import org.springframework.boot.system.ApplicationPid;
 import org.springframework.core.env.ConfigurableEnvironment;
+import org.springframework.core.env.ConfigurablePropertyResolver;
 import org.springframework.core.env.Environment;
 import org.springframework.core.env.PropertyResolver;
-import org.springframework.core.env.PropertySourcesPropertyResolver;
 import org.springframework.util.Assert;
 
 /**
@@ -162,8 +163,7 @@ protected void apply(LogFile logFile, PropertyResolver resolver) {
 
 	private PropertyResolver getPropertyResolver() {
 		if (this.environment instanceof ConfigurableEnvironment configurableEnvironment) {
-			PropertySourcesPropertyResolver resolver = new PropertySourcesPropertyResolver(
-					configurableEnvironment.getPropertySources());
+			ConfigurablePropertyResolver resolver = ConfigurationPropertySources.createPropertyResolver(configurableEnvironment.getPropertySources());
 			resolver.setConversionService(((ConfigurableEnvironment) this.environment).getConversionService());
 			resolver.setIgnoreUnresolvableNestedPlaceholders(true);
 			return resolver;