From 289d1dbae593a81ff0ad9b3f0ac0d53f7108c989 Mon Sep 17 00:00:00 2001 From: Spencer Gibb Date: Tue, 10 Mar 2020 15:31:01 -0400 Subject: [PATCH 1/2] Increase timeout for CI tests --- .../core/HealthCheckServiceInstanceListSupplierTests.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring-cloud-loadbalancer/src/test/java/org/springframework/cloud/loadbalancer/core/HealthCheckServiceInstanceListSupplierTests.java b/spring-cloud-loadbalancer/src/test/java/org/springframework/cloud/loadbalancer/core/HealthCheckServiceInstanceListSupplierTests.java index 82320d59..bda3279b 100644 --- a/spring-cloud-loadbalancer/src/test/java/org/springframework/cloud/loadbalancer/core/HealthCheckServiceInstanceListSupplierTests.java +++ b/spring-cloud-loadbalancer/src/test/java/org/springframework/cloud/loadbalancer/core/HealthCheckServiceInstanceListSupplierTests.java @@ -62,7 +62,7 @@ class HealthCheckServiceInstanceListSupplierTests { private static final String SERVICE_ID = "ignored-service"; - private static final Duration VERIFY_TIMEOUT = Duration.ofSeconds(5); + private static final Duration VERIFY_TIMEOUT = Duration.ofSeconds(10); @LocalServerPort private int port; From b85f7375d16c6c29653c5cca036a580528c03b01 Mon Sep 17 00:00:00 2001 From: Timothy Date: Sun, 15 Mar 2020 19:11:23 -0500 Subject: [PATCH 2/2] Adds reconstructURI method to ReactorLoadBalancerExchangeFilterFunction fixes gh-711 --- .../reactive/ReactorLoadBalancerExchangeFilterFunction.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/spring-cloud-commons/src/main/java/org/springframework/cloud/client/loadbalancer/reactive/ReactorLoadBalancerExchangeFilterFunction.java b/spring-cloud-commons/src/main/java/org/springframework/cloud/client/loadbalancer/reactive/ReactorLoadBalancerExchangeFilterFunction.java index ef599eff..0ae70559 100644 --- a/spring-cloud-commons/src/main/java/org/springframework/cloud/client/loadbalancer/reactive/ReactorLoadBalancerExchangeFilterFunction.java +++ b/spring-cloud-commons/src/main/java/org/springframework/cloud/client/loadbalancer/reactive/ReactorLoadBalancerExchangeFilterFunction.java @@ -80,11 +80,15 @@ public class ReactorLoadBalancerExchangeFilterFunction implements ExchangeFilter serviceId, instance.getUri())); } ClientRequest newRequest = buildClientRequest(request, - LoadBalancerUriTools.reconstructURI(instance, originalUrl)); + reconstructURI(instance, originalUrl)); return next.exchange(newRequest); }); } + protected URI reconstructURI(ServiceInstance instance, URI original) { + return LoadBalancerUriTools.reconstructURI(instance, original); + } + protected Mono> choose(String serviceId) { ReactiveLoadBalancer loadBalancer = loadBalancerFactory .getInstance(serviceId);