SpringCloud/spring-cloud-commons
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:40:10 -04:00
parent 08ca4105ab
commit da469626f4
2 changed files with 3 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
spring-cloud-context/src/main/java/org/springframework/boot/context/config/ConfigDataAccessor.java
View File

@@ -1,46 +0,0 @@
/*
* Copyright 2013-2020 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.
* You may obtain a copy of the License at
*
* https://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.springframework.boot.context.config;
import java.util.Arrays;
import java.util.function.Supplier;
import org.springframework.core.env.ConfigurableEnvironment;
import org.springframework.core.env.Environment;
import org.springframework.core.io.ResourceLoader;
public class ConfigDataAccessor {
private final ConfigDataEnvironment configDataEnvironment;
/**
* Create a new {@link ConfigDataEnvironment} instance.
* @param environment the Spring {@link Environment}.
* @param resourceLoader {@link ResourceLoader} to load resource locations
* @param additionalProfiles any additional profiles to activate
*/
public ConfigDataAccessor(ConfigurableEnvironment environment,
ResourceLoader resourceLoader, String[] additionalProfiles) {
configDataEnvironment = new ConfigDataEnvironment(Supplier::get, environment,
resourceLoader, Arrays.asList(additionalProfiles));
}
public void applyToEnvironment() {
configDataEnvironment.processAndApply();
}
}

8
spring-cloud-context/src/main/java/org/springframework/cloud/context/refresh/ConfigDataContextRefresher.java
View File

@@ -16,7 +16,7 @@
package org.springframework.cloud.context.refresh;
import org.springframework.boot.context.config.ConfigDataAccessor;
import org.springframework.boot.context.config.ConfigDataEnvironmentPostProcessor;
import org.springframework.cloud.context.scope.refresh.RefreshScope;
import org.springframework.context.ConfigurableApplicationContext;
import org.springframework.core.env.MutablePropertySources;
@@ -43,10 +43,8 @@ public class ConfigDataContextRefresher extends ContextRefresher {
StandardEnvironment environment = copyEnvironment(getContext().getEnvironment());
String[] activeProfiles = getContext().getEnvironment().getActiveProfiles();
DefaultResourceLoader resourceLoader = new DefaultResourceLoader();
ConfigDataAccessor configDataAccessor = new ConfigDataAccessor(environment,
resourceLoader, activeProfiles);
configDataAccessor.applyToEnvironment();
ConfigDataEnvironmentPostProcessor.applyTo(environment, resourceLoader,
activeProfiles);
if (environment.getPropertySources().contains(REFRESH_ARGS_PROPERTY_SOURCE)) {
environment.getPropertySources().remove(REFRESH_ARGS_PROPERTY_SOURCE);