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

Updates field name to resource

Browse Source
This commit is contained in:
spencergibb
2020-10-16 15:02:31 -04:00
parent 8c0c9384f2
commit cb57c25244
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
spring-cloud-config-client/src/main/java/org/springframework/cloud/config/client/ConfigServerBootstrapper.java
View File

@@ -75,20 +75,20 @@ public class ConfigServerBootstrapper implements Bootstrapper {
private final ConfigDataLoaderContext loaderContext;
private final ConfigServerConfigDataResource location;
private final ConfigServerConfigDataResource resource;
private final Binder binder;
private final LoaderInvocation invocation;
LoadContext(ConfigDataLoaderContext loaderContext, ConfigServerConfigDataResource location, Binder binder,
LoadContext(ConfigDataLoaderContext loaderContext, ConfigServerConfigDataResource resource, Binder binder,
LoaderInvocation invocation) {
Assert.notNull(loaderContext, "loaderContext may not be null");
Assert.notNull(location, "location may not be null");
Assert.notNull(resource, "resource may not be null");
Assert.notNull(binder, "binder may not be null");
Assert.notNull(invocation, "invocation may not be null");
this.loaderContext = loaderContext;
this.location = location;
this.resource = resource;
this.binder = binder;
this.invocation = invocation;
}
@@ -97,8 +97,8 @@ public class ConfigServerBootstrapper implements Bootstrapper {
return this.loaderContext;
}
public ConfigServerConfigDataResource getLocation() {
return this.location;
public ConfigServerConfigDataResource getResource() {
return this.resource;
}
public Binder getBinder() {

2
spring-cloud-config-client/src/test/java/org/springframework/cloud/config/client/ConfigServerConfigDataCustomizationIntegrationTests.java
View File

@@ -90,7 +90,7 @@ public class ConfigServerConfigDataCustomizationIntegrationTests {
public ConfigData apply(ConfigServerBootstrapper.LoadContext context) {
applied = true;
hasBinder = context.getBinder() != null;
return context.getInvocation().apply(context.getLoaderContext(), context.getLocation());
return context.getInvocation().apply(context.getLoaderContext(), context.getResource());
}
}