From cb57c2524471453137e9dbd8660f315775f10663 Mon Sep 17 00:00:00 2001 From: spencergibb Date: Fri, 16 Oct 2020 15:02:31 -0400 Subject: [PATCH] Updates field name to resource --- .../config/client/ConfigServerBootstrapper.java | 12 ++++++------ ...erverConfigDataCustomizationIntegrationTests.java | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/spring-cloud-config-client/src/main/java/org/springframework/cloud/config/client/ConfigServerBootstrapper.java b/spring-cloud-config-client/src/main/java/org/springframework/cloud/config/client/ConfigServerBootstrapper.java index 2ec29cbf..06f79210 100644 --- a/spring-cloud-config-client/src/main/java/org/springframework/cloud/config/client/ConfigServerBootstrapper.java +++ b/spring-cloud-config-client/src/main/java/org/springframework/cloud/config/client/ConfigServerBootstrapper.java @@ -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() { diff --git a/spring-cloud-config-client/src/test/java/org/springframework/cloud/config/client/ConfigServerConfigDataCustomizationIntegrationTests.java b/spring-cloud-config-client/src/test/java/org/springframework/cloud/config/client/ConfigServerConfigDataCustomizationIntegrationTests.java index cbaff955..a993cd0f 100644 --- a/spring-cloud-config-client/src/test/java/org/springframework/cloud/config/client/ConfigServerConfigDataCustomizationIntegrationTests.java +++ b/spring-cloud-config-client/src/test/java/org/springframework/cloud/config/client/ConfigServerConfigDataCustomizationIntegrationTests.java @@ -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()); } }