From ad9f8ee5e61f2ab60f47eee2fcb77ec5d63b641b Mon Sep 17 00:00:00 2001 From: Ryan Baxter <524254+ryanjbaxter@users.noreply.github.com> Date: Tue, 13 Jun 2023 16:57:50 -0400 Subject: [PATCH] Fix compile errors --- .../discovery/configclient/ConsulConfigServerBootstrapper.java | 3 ++- .../configclient/ConsulConfigServerBootstrapperIT.java | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/spring-cloud-consul-discovery/src/main/java/org/springframework/cloud/consul/discovery/configclient/ConsulConfigServerBootstrapper.java b/spring-cloud-consul-discovery/src/main/java/org/springframework/cloud/consul/discovery/configclient/ConsulConfigServerBootstrapper.java index 71d0799f..ce705a91 100644 --- a/spring-cloud-consul-discovery/src/main/java/org/springframework/cloud/consul/discovery/configclient/ConsulConfigServerBootstrapper.java +++ b/spring-cloud-consul-discovery/src/main/java/org/springframework/cloud/consul/discovery/configclient/ConsulConfigServerBootstrapper.java @@ -141,7 +141,8 @@ public class ConsulConfigServerBootstrapper implements BootstrapRegistryInitiali ConsulProperties consulProperties = binder .bind(ConsulProperties.PREFIX, Bindable.of(ConsulProperties.class), bindHandler) .orElseGet(ConsulProperties::new); - ConsulClient consulClient = ConsulAutoConfiguration.createConsulClient(consulProperties); + ConsulClient consulClient = ConsulAutoConfiguration.createConsulClient(consulProperties, + ConsulAutoConfiguration.createConsulRawClientBuilder()); ConsulDiscoveryProperties properties = binder .bind(ConsulDiscoveryProperties.PREFIX, Bindable.of(ConsulDiscoveryProperties.class), bindHandler) .orElseGet(() -> new ConsulDiscoveryProperties(new InetUtils(new InetUtilsProperties()))); diff --git a/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/discovery/configclient/ConsulConfigServerBootstrapperIT.java b/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/discovery/configclient/ConsulConfigServerBootstrapperIT.java index ff0a3814..621b7b30 100644 --- a/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/discovery/configclient/ConsulConfigServerBootstrapperIT.java +++ b/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/discovery/configclient/ConsulConfigServerBootstrapperIT.java @@ -73,7 +73,8 @@ public class ConsulConfigServerBootstrapperIT { ConsulProperties consulProperties = new ConsulProperties(); consulProperties.setHost(consul.getHost()); consulProperties.setPort(consul.getMappedPort(ConsulTestcontainers.DEFAULT_PORT)); - ConsulClient client = ConsulAutoConfiguration.createConsulClient(consulProperties); + ConsulClient client = ConsulAutoConfiguration.createConsulClient(consulProperties, + ConsulAutoConfiguration.createConsulRawClientBuilder()); NewService newService = new NewService(); newService.setId("consul-configserver"); newService.setName("consul-configserver");