Browse Source

Revert "fix bug of XForwardedHeadersTransformer ConditionalOnBean"

This reverts commit 3678133481.
pull/1155/head
Olga Maciaszek-Sharma 2 years ago
parent
commit
f938e797be
  1. 3
      spring-cloud-loadbalancer/src/main/java/org/springframework/cloud/loadbalancer/annotation/LoadBalancerClientConfiguration.java

3
spring-cloud-loadbalancer/src/main/java/org/springframework/cloud/loadbalancer/annotation/LoadBalancerClientConfiguration.java

@ -56,7 +56,6 @@ import org.springframework.web.reactive.function.client.WebClient; @@ -56,7 +56,6 @@ import org.springframework.web.reactive.function.client.WebClient;
* @author Olga Maciaszek-Sharma
* @author Tim Ysewyn
* @author BaoLin Zhu
* @author changjin wei(魏昌进)
*/
@Configuration(proxyBeanMethods = false)
@ConditionalOnDiscoveryEnabled
@ -98,7 +97,7 @@ public class LoadBalancerClientConfiguration { @@ -98,7 +97,7 @@ public class LoadBalancerClientConfiguration {
}
@Bean
@ConditionalOnBean(LoadBalancerClientFactory.class)
@ConditionalOnBean({ XForwardedHeadersTransformer.class, LoadBalancerClientFactory.class })
@ConditionalOnMissingBean
public XForwardedHeadersTransformer xForwarderHeadersTransformer(LoadBalancerClientFactory clientFactory) {
return new XForwardedHeadersTransformer(clientFactory);

Loading…
Cancel
Save