From 5fee522f4ccc2c4b1f6a4fee241bf70e73e2a4f6 Mon Sep 17 00:00:00 2001 From: spencergibb Date: Thu, 28 Oct 2021 14:48:11 -0400 Subject: [PATCH] Uses new LoadBalancerClientsProperties class, take 2 --- .../HttpClient5FeignLoadBalancerConfiguration.java | 3 ++- .../loadbalancer/HttpClientFeignLoadBalancerConfiguration.java | 3 ++- .../loadbalancer/OkHttpFeignLoadBalancerConfiguration.java | 3 ++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/loadbalancer/HttpClient5FeignLoadBalancerConfiguration.java b/spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/loadbalancer/HttpClient5FeignLoadBalancerConfiguration.java index c681b734..d3000207 100644 --- a/spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/loadbalancer/HttpClient5FeignLoadBalancerConfiguration.java +++ b/spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/loadbalancer/HttpClient5FeignLoadBalancerConfiguration.java @@ -27,6 +27,7 @@ import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.boot.context.properties.EnableConfigurationProperties; import org.springframework.cloud.client.loadbalancer.LoadBalancedRetryFactory; import org.springframework.cloud.client.loadbalancer.LoadBalancerClient; +import org.springframework.cloud.client.loadbalancer.LoadBalancerClientsProperties; import org.springframework.cloud.client.loadbalancer.LoadBalancerProperties; import org.springframework.cloud.loadbalancer.support.LoadBalancerClientFactory; import org.springframework.cloud.openfeign.clientconfig.HttpClient5FeignConfiguration; @@ -46,7 +47,7 @@ import org.springframework.context.annotation.Import; @ConditionalOnBean({ LoadBalancerClient.class, LoadBalancerClientFactory.class }) @ConditionalOnProperty(value = "feign.httpclient.hc5.enabled", havingValue = "true") @Import(HttpClient5FeignConfiguration.class) -@EnableConfigurationProperties(LoadBalancerProperties.class) +@EnableConfigurationProperties(LoadBalancerClientsProperties.class) class HttpClient5FeignLoadBalancerConfiguration { @Bean diff --git a/spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/loadbalancer/HttpClientFeignLoadBalancerConfiguration.java b/spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/loadbalancer/HttpClientFeignLoadBalancerConfiguration.java index ce176d2b..56d4fb2a 100644 --- a/spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/loadbalancer/HttpClientFeignLoadBalancerConfiguration.java +++ b/spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/loadbalancer/HttpClientFeignLoadBalancerConfiguration.java @@ -27,6 +27,7 @@ import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.boot.context.properties.EnableConfigurationProperties; import org.springframework.cloud.client.loadbalancer.LoadBalancedRetryFactory; import org.springframework.cloud.client.loadbalancer.LoadBalancerClient; +import org.springframework.cloud.client.loadbalancer.LoadBalancerClientsProperties; import org.springframework.cloud.client.loadbalancer.LoadBalancerProperties; import org.springframework.cloud.loadbalancer.support.LoadBalancerClientFactory; import org.springframework.cloud.openfeign.HttpClient5DisabledConditions; @@ -50,7 +51,7 @@ import org.springframework.context.annotation.Import; @ConditionalOnProperty(value = "feign.httpclient.enabled", matchIfMissing = true) @Conditional(HttpClient5DisabledConditions.class) @Import(HttpClientFeignConfiguration.class) -@EnableConfigurationProperties(LoadBalancerProperties.class) +@EnableConfigurationProperties(LoadBalancerClientsProperties.class) class HttpClientFeignLoadBalancerConfiguration { @Bean diff --git a/spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/loadbalancer/OkHttpFeignLoadBalancerConfiguration.java b/spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/loadbalancer/OkHttpFeignLoadBalancerConfiguration.java index f5fbd04d..54be57cd 100644 --- a/spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/loadbalancer/OkHttpFeignLoadBalancerConfiguration.java +++ b/spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/loadbalancer/OkHttpFeignLoadBalancerConfiguration.java @@ -26,6 +26,7 @@ import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.boot.context.properties.EnableConfigurationProperties; import org.springframework.cloud.client.loadbalancer.LoadBalancedRetryFactory; import org.springframework.cloud.client.loadbalancer.LoadBalancerClient; +import org.springframework.cloud.client.loadbalancer.LoadBalancerClientsProperties; import org.springframework.cloud.client.loadbalancer.LoadBalancerProperties; import org.springframework.cloud.loadbalancer.support.LoadBalancerClientFactory; import org.springframework.cloud.openfeign.clientconfig.OkHttpFeignConfiguration; @@ -46,7 +47,7 @@ import org.springframework.context.annotation.Import; @ConditionalOnProperty("feign.okhttp.enabled") @ConditionalOnBean({ LoadBalancerClient.class, LoadBalancerClientFactory.class }) @Import(OkHttpFeignConfiguration.class) -@EnableConfigurationProperties(LoadBalancerProperties.class) +@EnableConfigurationProperties(LoadBalancerClientsProperties.class) class OkHttpFeignLoadBalancerConfiguration { @Bean