From 2be3632d8d119822f5bf183628350abf28f815c4 Mon Sep 17 00:00:00 2001 From: spencergibb Date: Mon, 11 Jan 2021 12:25:25 -0500 Subject: [PATCH] Create InetUtils in default ConsulDiscoveryProperties constructor. Fixes gh-683 --- .../cloud/consul/discovery/ConsulDiscoveryProperties.java | 5 +++-- .../configclient/ConsulConfigServerBootstrapperTests.java | 1 + 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/spring-cloud-consul-discovery/src/main/java/org/springframework/cloud/consul/discovery/ConsulDiscoveryProperties.java b/spring-cloud-consul-discovery/src/main/java/org/springframework/cloud/consul/discovery/ConsulDiscoveryProperties.java index bdb3092c..96da9b21 100644 --- a/spring-cloud-consul-discovery/src/main/java/org/springframework/cloud/consul/discovery/ConsulDiscoveryProperties.java +++ b/spring-cloud-consul-discovery/src/main/java/org/springframework/cloud/consul/discovery/ConsulDiscoveryProperties.java @@ -28,6 +28,7 @@ import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.cloud.commons.util.InetUtils; import org.springframework.cloud.commons.util.InetUtils.HostInfo; +import org.springframework.cloud.commons.util.InetUtilsProperties; import org.springframework.core.style.ToStringCreator; /** @@ -207,11 +208,11 @@ public class ConsulDiscoveryProperties { @SuppressWarnings("unused") private ConsulDiscoveryProperties() { - this.managementTags.add(MANAGEMENT); + this(new InetUtils(new InetUtilsProperties())); } public ConsulDiscoveryProperties(InetUtils inetUtils) { - this(); + this.managementTags.add(MANAGEMENT); this.hostInfo = inetUtils.findFirstNonLoopbackHostInfo(); this.ipAddress = this.hostInfo.getIpAddress(); this.hostname = this.hostInfo.getHostname(); diff --git a/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/discovery/configclient/ConsulConfigServerBootstrapperTests.java b/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/discovery/configclient/ConsulConfigServerBootstrapperTests.java index e3629d23..3dd6431b 100644 --- a/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/discovery/configclient/ConsulConfigServerBootstrapperTests.java +++ b/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/discovery/configclient/ConsulConfigServerBootstrapperTests.java @@ -55,6 +55,7 @@ public class ConsulConfigServerBootstrapperTests { BindHandlerBootstrapper bindHandlerBootstrapper = new BindHandlerBootstrapper(); ConfigurableApplicationContext context = new SpringApplicationBuilder(TestConfig.class) .properties("--server.port=0", "spring.cloud.config.discovery.enabled=true", + "spring.cloud.consul.discovery.hostname=myhost", "spring.cloud.service-registry.auto-registration.enabled=false", "spring.cloud.consul.host=localhost") .addBootstrapper(bindHandlerBootstrapper)