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

Updates config data classes to use DeferredLogFactory

Browse Source
This commit is contained in:
spencergibb
2022-05-10 16:08:22 -04:00
parent 1d0d0f1982
commit 1f4baf8093
3 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
spring-cloud-consul-config/src/main/java/org/springframework/cloud/consul/config/ConsulConfigDataLoader.java
View File

@@ -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

5
spring-cloud-consul-config/src/main/java/org/springframework/cloud/consul/config/ConsulConfigDataLocationResolver.java
View File

@@ -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

6
spring-cloud-consul-config/src/test/java/org/springframework/cloud/consul/config/ConsulConfigDataLocationResolverTests.java
View File

@@ -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