SpringCloud/spring-cloud-contract
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Use LB per-client properties. (#1725)

Browse Source
This commit is contained in:
Olga Maciaszek-Sharma
2021-11-03 14:36:26 +01:00
committed by GitHub
parent 15331074f4
commit 9b7d28c684
1 changed files with 16 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/spring/cloud/loadbalancer/SpringCloudLoadBalancerAutoConfiguration.java
View File

@@ -30,10 +30,12 @@ import org.springframework.boot.autoconfigure.AutoConfigureBefore;
import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
import org.springframework.boot.context.properties.EnableConfigurationProperties;
import org.springframework.cloud.client.ServiceInstance;
import org.springframework.cloud.client.loadbalancer.CompletionContext;
import org.springframework.cloud.client.loadbalancer.DefaultResponse;
import org.springframework.cloud.client.loadbalancer.LoadBalancerClient;
import org.springframework.cloud.client.loadbalancer.LoadBalancerClientsProperties;
import org.springframework.cloud.client.loadbalancer.LoadBalancerLifecycle;
import org.springframework.cloud.client.loadbalancer.Request;
import org.springframework.cloud.client.loadbalancer.Response;
@@ -67,12 +69,14 @@ import org.springframework.util.StringUtils;
@AutoConfigureBefore(LoadBalancerAutoConfiguration.class)
@AutoConfigureAfter({ LoadBalancerClientConfiguration.class, StubRunnerSpringCloudAutoConfiguration.class })
@ConditionalOnStubbedDiscoveryEnabled
@EnableConfigurationProperties(LoadBalancerClientsProperties.class)
public class SpringCloudLoadBalancerAutoConfiguration {
@Bean
@Primary
LoadBalancerClientFactory stubRunnerLoadBalancerClientFactory(BeanFactory beanFactory) {
return new StubRunnerLoadBalancerClientFactory(beanFactory);
LoadBalancerClientFactory stubRunnerLoadBalancerClientFactory(BeanFactory beanFactory,
LoadBalancerClientsProperties properties) {
return new StubRunnerLoadBalancerClientFactory(beanFactory, properties);
}
}
@@ -81,10 +85,20 @@ class StubRunnerLoadBalancerClientFactory extends LoadBalancerClientFactory impl
private final BeanFactory beanFactory;
/**
* @deprecated in favour of
* {@link StubRunnerLoadBalancerClientFactory#StubRunnerLoadBalancerClientFactory(BeanFactory, LoadBalancerClientsProperties)}
*/
@Deprecated
StubRunnerLoadBalancerClientFactory(BeanFactory beanFactory) {
this.beanFactory = beanFactory;
}
StubRunnerLoadBalancerClientFactory(BeanFactory beanFactory, LoadBalancerClientsProperties properties) {
super(properties);
this.beanFactory = beanFactory;
}
@Override
public ReactiveLoadBalancer<ServiceInstance> getInstance(String serviceId) {
return new ContractReactorServiceInstanceLoadBalancer(this.beanFactory, serviceId);