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

Updates to new ConfigData method signatures

Browse Source
This commit is contained in:
spencergibb
2020-08-21 10:19:04 -04:00
parent c4bc612258
commit d76002d119
3 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
spring-cloud-config-client/src/main/java/org/springframework/cloud/config/client/AbstractConfigDataLoader.java
View File

@@ -29,6 +29,7 @@ import org.apache.commons.logging.Log;
import org.springframework.boot.context.config.ConfigData;
import org.springframework.boot.context.config.ConfigDataLoader;
import org.springframework.boot.context.config.ConfigDataLoaderContext;
import org.springframework.boot.env.OriginTrackedMapPropertySource;
import org.springframework.boot.origin.Origin;
import org.springframework.boot.origin.OriginTrackedValue;
@@ -68,8 +69,10 @@ public abstract class AbstractConfigDataLoader<L extends AbstractConfigDataLocat
return -1;
}
@Override
// TODO: retry
public ConfigData load(L location) throws IOException {
public ConfigData load(ConfigDataLoaderContext context, L location)
throws IOException {
ConfigClientProperties properties = location.getProperties();
// ConfigClientProperties properties =
// this.defaultProperties.override(environment);

7
spring-cloud-config-client/src/test/java/org/springframework/cloud/config/client/TestConfigServerConfigDataLoader.java
View File

@@ -25,6 +25,7 @@ import org.springframework.boot.SpringBootConfiguration;
import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
import org.springframework.boot.builder.SpringApplicationBuilder;
import org.springframework.boot.context.config.ConfigData;
import org.springframework.boot.context.config.ConfigDataLoaderContext;
import org.springframework.util.ReflectionUtils;
public class TestConfigServerConfigDataLoader
@@ -40,12 +41,12 @@ public class TestConfigServerConfigDataLoader
}
@Override
public ConfigData load(TestConfigServerConfigDataLocation location)
throws IOException {
public ConfigData load(ConfigDataLoaderContext context,
TestConfigServerConfigDataLocation location) throws IOException {
// This could be a RetryTemplate
Function<TestConfigServerConfigDataLocation, ConfigData> fn = dataLocation -> {
try {
return super.load(dataLocation);
return super.load(context, dataLocation);
}
catch (IOException e) {
ReflectionUtils.rethrowRuntimeException(e);

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

@@ -134,7 +134,7 @@ public class NativeEnvironmentRepository
try {
ConfigurableEnvironment environment = getEnvironment(config, profile, label);
DefaultResourceLoader resourceLoader = new DefaultResourceLoader();
ConfigDataEnvironmentPostProcessor.applyTo(environment, resourceLoader,
ConfigDataEnvironmentPostProcessor.applyTo(environment, resourceLoader, null,
StringUtils.commaDelimitedListToStringArray(profile));
environment.getPropertySources().remove("config-data-setup");