From a71a1e2b4c9c6d6e16fa5ce300c615dbb668d540 Mon Sep 17 00:00:00 2001 From: Olga MaciaszekSharma Date: Fri, 5 Nov 2021 13:57:16 +0100 Subject: [PATCH] Use new LoadBalancerServiceInstanceCookieTransformer constructor. --- .../config/BlockingLoadBalancerClientAutoConfiguration.java | 6 +++--- .../core/LoadBalancerServiceInstanceCookieTransformer.java | 5 +++++ 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/spring-cloud-loadbalancer/src/main/java/org/springframework/cloud/loadbalancer/config/BlockingLoadBalancerClientAutoConfiguration.java b/spring-cloud-loadbalancer/src/main/java/org/springframework/cloud/loadbalancer/config/BlockingLoadBalancerClientAutoConfiguration.java index 99cdcb05..9d0b934e 100644 --- a/spring-cloud-loadbalancer/src/main/java/org/springframework/cloud/loadbalancer/config/BlockingLoadBalancerClientAutoConfiguration.java +++ b/spring-cloud-loadbalancer/src/main/java/org/springframework/cloud/loadbalancer/config/BlockingLoadBalancerClientAutoConfiguration.java @@ -27,7 +27,6 @@ import org.springframework.cloud.client.loadbalancer.AsyncLoadBalancerAutoConfig 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.client.loadbalancer.reactive.ReactiveLoadBalancer; import org.springframework.cloud.loadbalancer.annotation.LoadBalancerClients; import org.springframework.cloud.loadbalancer.blocking.XForwardedHeadersTransformer; @@ -63,10 +62,11 @@ public class BlockingLoadBalancerClientAutoConfiguration { } @Bean + @ConditionalOnBean(LoadBalancerClientFactory.class) @ConditionalOnMissingBean(LoadBalancerServiceInstanceCookieTransformer.class) public LoadBalancerServiceInstanceCookieTransformer loadBalancerServiceInstanceCookieTransformer( - LoadBalancerProperties properties) { - return new LoadBalancerServiceInstanceCookieTransformer(properties.getStickySession()); + LoadBalancerClientFactory loadBalancerClientFactory) { + return new LoadBalancerServiceInstanceCookieTransformer(loadBalancerClientFactory); } @Bean diff --git a/spring-cloud-loadbalancer/src/main/java/org/springframework/cloud/loadbalancer/core/LoadBalancerServiceInstanceCookieTransformer.java b/spring-cloud-loadbalancer/src/main/java/org/springframework/cloud/loadbalancer/core/LoadBalancerServiceInstanceCookieTransformer.java index 6aed0d0a..71d3985f 100644 --- a/spring-cloud-loadbalancer/src/main/java/org/springframework/cloud/loadbalancer/core/LoadBalancerServiceInstanceCookieTransformer.java +++ b/spring-cloud-loadbalancer/src/main/java/org/springframework/cloud/loadbalancer/core/LoadBalancerServiceInstanceCookieTransformer.java @@ -42,6 +42,11 @@ public class LoadBalancerServiceInstanceCookieTransformer implements LoadBalance private LoadBalancerProperties.StickySession stickySessionProperties; + /** + * @deprecated in favour of + * {@link LoadBalancerServiceInstanceCookieTransformer#LoadBalancerServiceInstanceCookieTransformer(ReactiveLoadBalancer.Factory)} + */ + @Deprecated public LoadBalancerServiceInstanceCookieTransformer(LoadBalancerProperties.StickySession stickySessionProperties) { this.stickySessionProperties = stickySessionProperties; }