SpringCloud/spring-cloud-config
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Updates to use new ConfigDataEnvironmentPostProcessor.applyTo() method

Browse Source
This commit is contained in:
spencergibb
2020-08-06 21:43:10 -04:00
parent 854060b019
commit 46e78194a2
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/environment/NativeEnvironmentRepository.java
View File

@@ -27,7 +27,7 @@ import java.util.regex.Pattern;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.springframework.boot.context.config.ConfigDataAccessor;
import org.springframework.boot.context.config.ConfigDataEnvironmentPostProcessor;
import org.springframework.cloud.config.environment.Environment;
import org.springframework.cloud.config.environment.PropertySource;
import org.springframework.core.NestedExceptionUtils;
@@ -134,9 +134,8 @@ public class NativeEnvironmentRepository
try {
ConfigurableEnvironment environment = getEnvironment(config, profile, label);
DefaultResourceLoader resourceLoader = new DefaultResourceLoader();
ConfigDataAccessor configDataEnvironment = new ConfigDataAccessor(environment,
resourceLoader, StringUtils.commaDelimitedListToStringArray(profile));
configDataEnvironment.applyToEnvironment();
ConfigDataEnvironmentPostProcessor.applyTo(environment, resourceLoader,
StringUtils.commaDelimitedListToStringArray(profile));
environment.getPropertySources().remove("config-data-setup");
return clean(new PassthruEnvironmentRepository(environment).findOne(config,