From 1f4baf8093567cb95f5292e4b0e30ea82a1d5504 Mon Sep 17 00:00:00 2001
From: spencergibb <sgibb@pivotal.io>
Date: Tue, 10 May 2022 16:08:22 -0400
Subject: [PATCH] Updates config data classes to use DeferredLogFactory

---
 .../cloud/consul/config/ConsulConfigDataLoader.java         | 5 +++--
 .../consul/config/ConsulConfigDataLocationResolver.java     | 5 +++--
 .../config/ConsulConfigDataLocationResolverTests.java       | 6 ++++--
 3 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/spring-cloud-consul-config/src/main/java/org/springframework/cloud/consul/config/ConsulConfigDataLoader.java b/spring-cloud-consul-config/src/main/java/org/springframework/cloud/consul/config/ConsulConfigDataLoader.java
index 501b04a3..f1d7cd54 100644
--- a/spring-cloud-consul-config/src/main/java/org/springframework/cloud/consul/config/ConsulConfigDataLoader.java
+++ b/spring-cloud-consul-config/src/main/java/org/springframework/cloud/consul/config/ConsulConfigDataLoader.java
@@ -31,6 +31,7 @@ import org.springframework.boot.context.config.ConfigDataLoader;
 import org.springframework.boot.context.config.ConfigDataLoaderContext;
 import org.springframework.boot.context.config.ConfigDataResourceNotFoundException;
 import org.springframework.boot.context.properties.bind.Binder;
+import org.springframework.boot.logging.DeferredLogFactory;
 import org.springframework.cloud.consul.config.ConsulBootstrapper.LoadContext;
 import org.springframework.cloud.consul.config.ConsulBootstrapper.LoaderInterceptor;
 import org.springframework.util.StringUtils;
@@ -41,8 +42,8 @@ public class ConsulConfigDataLoader implements ConfigDataLoader<ConsulConfigData
 
 	private final Log log;
 
-	public ConsulConfigDataLoader(Log log) {
-		this.log = log;
+	public ConsulConfigDataLoader(DeferredLogFactory logFactory) {
+		this.log = logFactory.getLog(ConsulConfigDataLoader.class);
 	}
 
 	@Override
diff --git a/spring-cloud-consul-config/src/main/java/org/springframework/cloud/consul/config/ConsulConfigDataLocationResolver.java b/spring-cloud-consul-config/src/main/java/org/springframework/cloud/consul/config/ConsulConfigDataLocationResolver.java
index 2bba719e..1ebf3edc 100644
--- a/spring-cloud-consul-config/src/main/java/org/springframework/cloud/consul/config/ConsulConfigDataLocationResolver.java
+++ b/spring-cloud-consul-config/src/main/java/org/springframework/cloud/consul/config/ConsulConfigDataLocationResolver.java
@@ -37,6 +37,7 @@ import org.springframework.boot.context.config.Profiles;
 import org.springframework.boot.context.properties.bind.BindHandler;
 import org.springframework.boot.context.properties.bind.Bindable;
 import org.springframework.boot.context.properties.bind.Binder;
+import org.springframework.boot.logging.DeferredLogFactory;
 import org.springframework.cloud.consul.ConsulAutoConfiguration;
 import org.springframework.cloud.consul.ConsulProperties;
 import org.springframework.cloud.consul.config.ConsulPropertySources.Context;
@@ -63,8 +64,8 @@ public class ConsulConfigDataLocationResolver implements ConfigDataLocationResol
 
 	private final Log log;
 
-	public ConsulConfigDataLocationResolver(Log log) {
-		this.log = log;
+	public ConsulConfigDataLocationResolver(DeferredLogFactory logFactory) {
+		this.log = logFactory.getLog(ConsulConfigDataLocationResolver.class);
 	}
 
 	@Override
diff --git a/spring-cloud-consul-config/src/test/java/org/springframework/cloud/consul/config/ConsulConfigDataLocationResolverTests.java b/spring-cloud-consul-config/src/test/java/org/springframework/cloud/consul/config/ConsulConfigDataLocationResolverTests.java
index 7af3760c..2361bca6 100644
--- a/spring-cloud-consul-config/src/test/java/org/springframework/cloud/consul/config/ConsulConfigDataLocationResolverTests.java
+++ b/spring-cloud-consul-config/src/test/java/org/springframework/cloud/consul/config/ConsulConfigDataLocationResolverTests.java
@@ -42,7 +42,8 @@ public class ConsulConfigDataLocationResolverTests {
 
 	@Test
 	public void testParseLocation() {
-		ConsulConfigDataLocationResolver resolver = new ConsulConfigDataLocationResolver(LogFactory.getLog(getClass()));
+		ConsulConfigDataLocationResolver resolver = new ConsulConfigDataLocationResolver(
+				destination -> LogFactory.getLog(ConsulConfigDataLocationResolver.class));
 		UriComponents uriComponents = resolver.parseLocation(null,
 				ConfigDataLocation.of("consul:myhost:8501/mypath1;/mypath2;/mypath3"));
 		assertThat(uriComponents.toUri()).hasScheme("consul").hasHost("myhost").hasPort(8501)
@@ -98,7 +99,8 @@ public class ConsulConfigDataLocationResolverTests {
 	}
 
 	private ConsulConfigDataLocationResolver createResolver() {
-		return new ConsulConfigDataLocationResolver(LogFactory.getLog(getClass())) {
+		return new ConsulConfigDataLocationResolver(
+				destination -> LogFactory.getLog(ConsulConfigDataLocationResolver.class)) {
 			@Override
 			public <T> void registerBean(ConfigDataLocationResolverContext context, Class<T> type, T instance) {
 				// do nothing