From d76002d1196ead1897a6a12d336eb1646b098327 Mon Sep 17 00:00:00 2001
From: spencergibb <spencer@gibb.us>
Date: Fri, 21 Aug 2020 10:19:04 -0400
Subject: [PATCH] Updates to new ConfigData method signatures

---
 .../cloud/config/client/AbstractConfigDataLoader.java      | 5 ++++-
 .../config/client/TestConfigServerConfigDataLoader.java    | 7 ++++---
 .../server/environment/NativeEnvironmentRepository.java    | 2 +-
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/spring-cloud-config-client/src/main/java/org/springframework/cloud/config/client/AbstractConfigDataLoader.java b/spring-cloud-config-client/src/main/java/org/springframework/cloud/config/client/AbstractConfigDataLoader.java
index dc799fc4..8460af01 100644
--- a/spring-cloud-config-client/src/main/java/org/springframework/cloud/config/client/AbstractConfigDataLoader.java
+++ b/spring-cloud-config-client/src/main/java/org/springframework/cloud/config/client/AbstractConfigDataLoader.java
@@ -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);
diff --git a/spring-cloud-config-client/src/test/java/org/springframework/cloud/config/client/TestConfigServerConfigDataLoader.java b/spring-cloud-config-client/src/test/java/org/springframework/cloud/config/client/TestConfigServerConfigDataLoader.java
index 6f6d17c9..55e342d7 100644
--- a/spring-cloud-config-client/src/test/java/org/springframework/cloud/config/client/TestConfigServerConfigDataLoader.java
+++ b/spring-cloud-config-client/src/test/java/org/springframework/cloud/config/client/TestConfigServerConfigDataLoader.java
@@ -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);
diff --git a/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/environment/NativeEnvironmentRepository.java b/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/environment/NativeEnvironmentRepository.java
index ddd4d1cb..6260e60c 100644
--- a/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/environment/NativeEnvironmentRepository.java
+++ b/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/environment/NativeEnvironmentRepository.java
@@ -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");