From 7d6b9857b1eb16d426e1c149195b48c0c06318ef Mon Sep 17 00:00:00 2001 From: Jisfeng Date: Mon, 14 Jun 2021 17:48:18 +0800 Subject: [PATCH] rewrite annotation on ReactiveRetryConfiguration (#965) --- .../annotation/LoadBalancerClientConfiguration.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/spring-cloud-loadbalancer/src/main/java/org/springframework/cloud/loadbalancer/annotation/LoadBalancerClientConfiguration.java b/spring-cloud-loadbalancer/src/main/java/org/springframework/cloud/loadbalancer/annotation/LoadBalancerClientConfiguration.java index 44adf557..3fc711c3 100644 --- a/spring-cloud-loadbalancer/src/main/java/org/springframework/cloud/loadbalancer/annotation/LoadBalancerClientConfiguration.java +++ b/spring-cloud-loadbalancer/src/main/java/org/springframework/cloud/loadbalancer/annotation/LoadBalancerClientConfiguration.java @@ -50,6 +50,7 @@ import org.springframework.web.reactive.function.client.WebClient; * @author Spencer Gibb * @author Olga Maciaszek-Sharma * @author Tim Ysewyn + * @author BaoLin Zhu */ @Configuration(proxyBeanMethods = false) @ConditionalOnDiscoveryEnabled @@ -202,7 +203,7 @@ public class LoadBalancerClientConfiguration { } @Configuration(proxyBeanMethods = false) - @ConditionalOnBlockingDiscoveryEnabled + @ConditionalOnReactiveDiscoveryEnabled @Conditional(ReactiveOnAvoidPreviousInstanceAndRetryEnabledCondition.class) @AutoConfigureAfter(ReactiveSupportConfiguration.class) @ConditionalOnBean(ServiceInstanceListSupplier.class)