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

Merge remote-tracking branch 'origin/2.2.x'

Browse Source 
# Conflicts:
#	docs/src/main/asciidoc/spring-cloud-commons.adoc
#	spring-cloud-commons/src/main/java/org/springframework/cloud/client/loadbalancer/LoadBalancerAutoConfiguration.java
#	spring-cloud-commons/src/main/java/org/springframework/cloud/client/loadbalancer/reactive/ExchangeFilterFunctionUtils.java
#	spring-cloud-commons/src/main/java/org/springframework/cloud/client/loadbalancer/reactive/ReactorLoadBalancerClientAutoConfiguration.java
#	spring-cloud-commons/src/main/java/org/springframework/cloud/client/loadbalancer/reactive/ReactorLoadBalancerExchangeFilterFunction.java
#	spring-cloud-commons/src/main/java/org/springframework/cloud/client/loadbalancer/reactive/RetryableLoadBalancerExchangeFilterFunction.java
#	spring-cloud-commons/src/test/java/org/springframework/cloud/client/loadbalancer/reactive/RetryableLoadBalancerExchangeFilterFunctionIntegrationTests.java
#	spring-cloud-loadbalancer/src/main/java/org/springframework/cloud/loadbalancer/config/BlockingLoadBalancerClientAutoConfiguration.java
This commit is contained in:
Olga MaciaszekSharma
2021-03-12 14:49:19 +01:00
parent 272365490a 3e74ab018d
commit 5c0bc097fa
11 changed files with 273 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
spring-cloud-loadbalancer/src/test/java/org/springframework/cloud/loadbalancer/core/CachingServiceInstanceListSupplierTests.java
View File

@@ -67,7 +67,7 @@ class CachingServiceInstanceListSupplierTests {
@Test
void shouldNotHangOnCachingWhenDelegateReturnsInfiniteStream() {
assertTimeoutPreemptively(ofMillis(500), () -> {
assertTimeoutPreemptively(ofMillis(1000), () -> {
blockingLoadBalancerClient.choose(SERVICE_ID);
});

12
spring-cloud-loadbalancer/src/test/java/org/springframework/cloud/loadbalancer/core/LoadBalancerTests.java
View File

@@ -59,13 +59,13 @@ import static org.mockito.Mockito.when;
* @author Spencer Gibb
*/
@SpringBootTest
public class LoadBalancerTests {
class LoadBalancerTests {
@Autowired
private LoadBalancerClientFactory clientFactory;
@Test
public void roundRobbinLoadbalancerWorks() {
void roundRobbinLoadbalancerWorks() {
ReactiveLoadBalancer<ServiceInstance> reactiveLoadBalancer = this.clientFactory.getInstance("myservice",
ReactiveLoadBalancer.class, ServiceInstance.class);
@@ -101,7 +101,7 @@ public class LoadBalancerTests {
}
@Test
public void emptyHosts() {
void emptyHosts() {
ResolvableType type = ResolvableType.forClassWithGenerics(ReactorLoadBalancer.class, ServiceInstance.class);
ReactorLoadBalancer<ServiceInstance> loadBalancer = this.clientFactory.getInstance("unknownservice", type);
@@ -115,7 +115,7 @@ public class LoadBalancerTests {
}
@Test
public void staticConfigurationWorks() {
void staticConfigurationWorks() {
String serviceId = "test1";
RoundRobinLoadBalancer loadBalancer = new RoundRobinLoadBalancer(ServiceInstanceListSuppliers
.toProvider(serviceId, instance(serviceId, "1host", false), instance(serviceId, "2host-secure", true)),
@@ -129,7 +129,7 @@ public class LoadBalancerTests {
@SuppressWarnings("ConstantConditions")
@Test
public void canPassHintViaRequest() {
void canPassHintViaRequest() {
String serviceId = "test1";
RoundRobinLoadBalancer loadBalancer = new TestHintLoadBalancer(ServiceInstanceListSuppliers.toProvider(
serviceId, instance(serviceId, "1host", false), instance(serviceId, "2host-secure", true)), serviceId);
@@ -141,7 +141,7 @@ public class LoadBalancerTests {
}
@Test
public void selectedInstanceCallback() {
void selectedInstanceCallback() {
String serviceId = "test1";
ServiceInstance serviceInstance = instance(serviceId, "1host", false);
SameInstancePreferenceServiceInstanceListSupplier supplier = mock(