spring/spring-cloud-netflix
1
0
Fork 0
mirror of https://github.com/spring-cloud/spring-cloud-netflix.git synced 2026-09-17 15:49:00 +00:00
Code Issues Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Ryan Baxter
2019-02-22 07:49:29 -05:00
parent 62363587e0 f55c95b5f3
commit 53ede01f5e
2 changed files with 14 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
spring-cloud-netflix-ribbon/src/main/java/org/springframework/cloud/netflix/ribbon/apache/RetryableRibbonLoadBalancingHttpClient.java
+4 -4
View File
@@ -104,11 +104,11 @@ public class RetryableRibbonLoadBalancingHttpClient
newRequest = newRequest.withNewUri(UriComponentsBuilder.newInstance()
.host(service.getHost()).scheme(service.getUri().getScheme())
.userInfo(newRequest.getURI().getUserInfo())
.port(service.getPort()).path(newRequest.getURI().getPath())
.port(service.getPort())
.path(newRequest.getURI().getRawPath())
.query(newRequest.getURI().getQuery())
.fragment(newRequest.getURI().getFragment()).build().encode()
.toUri());
.fragment(newRequest.getURI().getFragment()).build(true)
.encode().toUri());
if (ribbonLoadBalancerContext == null) {
LOGGER.error(
"RibbonLoadBalancerContext is null. Unable to update load balancer stats");
spring-cloud-netflix-ribbon/src/test/java/org/springframework/cloud/netflix/ribbon/apache/RibbonLoadBalancingHttpClientTests.java
+10 -1
View File
@@ -443,7 +443,7 @@ public class RibbonLoadBalancingHttpClientTests {
String host = serviceName;
int port = 80;
HttpMethod method = HttpMethod.GET;
URI uri = new URI("http://" + host + ":" + port);
URI uri = new URI("http://" + host + ":" + port + "/a%2Bb");
CloseableHttpClient delegate = mock(CloseableHttpClient.class);
final CloseableHttpResponse response = mock(CloseableHttpResponse.class);
StatusLine statusLine = mock(StatusLine.class);
@@ -470,6 +470,15 @@ public class RibbonLoadBalancingHttpClientTests {
verify(delegate, times(3)).execute(any(HttpUriRequest.class));
verify(lb, times(2)).chooseServer(eq(serviceName));
assertThat(myBackOffPolicy.getCount()).isEqualTo(2);
verify(request, times(3)).withNewUri(argThat(new ArgumentMatcher<URI>() {
@Override
public boolean matches(URI argument) {
if (argument.equals(uri)) {
return true;
}
return false;
}
}));
}
@Test