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

spring-cloud-netflix-ribbon/src/main/java/org/springframework/cloud/netflix/ribbon/apache/RetryableRibbonLoadBalancingHttpClient.java

@@ -16,7 +16,6 @@
 package org.springframework.cloud.netflix.ribbon.apache;
 
 import java.io.IOException;
-import java.net.URI;
 import org.apache.commons.lang.BooleanUtils;
 import org.apache.http.HttpResponse;
 import org.apache.http.client.config.RequestConfig;
@@ -42,6 +41,7 @@ import org.springframework.retry.policy.NeverRetryPolicy;
 import org.springframework.retry.support.RetryTemplate;
 import org.springframework.cloud.netflix.ribbon.RibbonLoadBalancerClient;
 import org.springframework.cloud.netflix.ribbon.ServerIntrospector;
+import org.springframework.web.util.UriComponentsBuilder;
 import com.netflix.client.RequestSpecificRetryHandler;
 import com.netflix.client.RetryHandler;
 import com.netflix.client.config.IClientConfig;
@@ -119,13 +119,14 @@ public class RetryableRibbonLoadBalancingHttpClient extends RibbonLoadBalancingH
 				ServiceInstance service = ((LoadBalancedRetryContext)context).getServiceInstance();
 				if(service != null) {
 					//Reconstruct the request URI using the host and port set in the retry context
-                    newRequest = newRequest.withNewUri(new URI(service.getUri().getScheme(),
-                            newRequest.getURI().getUserInfo(), service.getHost(), service.getPort(),
-                            newRequest.getURI().getPath(), newRequest.getURI().getQuery(),
-                            newRequest.getURI().getFragment()));
+					newRequest = newRequest.withNewUri(UriComponentsBuilder.newInstance().host(service.getHost())
+							.scheme(service.getUri().getScheme()).userInfo(newRequest.getURI().getUserInfo())
+							.port(service.getPort()).path(newRequest.getURI().getPath())
+							.query(newRequest.getURI().getQuery()).fragment(newRequest.getURI().getFragment())
+							.build().encode().toUri());
 				}
 			}
-            newRequest = getSecureRequest(request, configOverride);
+			newRequest = getSecureRequest(newRequest, configOverride);
 			HttpUriRequest httpUriRequest = newRequest.toRequest(requestConfig);
 			final HttpResponse httpResponse = RetryableRibbonLoadBalancingHttpClient.this.delegate.execute(httpUriRequest);
 			if(retryPolicy.retryableStatusCode(httpResponse.getStatusLine().getStatusCode())) {

spring-cloud-netflix-ribbon/src/test/java/org/springframework/cloud/netflix/ribbon/apache/RibbonLoadBalancingHttpClientTests.java

@@ -430,7 +430,7 @@ public class RibbonLoadBalancingHttpClientTests {
 		String host = serviceName;
 		int port = 80;
 		HttpMethod method = HttpMethod.GET;
-		final URI uri = new URI("https://" + host + ":" + port + "/a%2Bb");
+		final URI uri = new URI("https://" + host + ":" + port + "/a%20b");
 		RibbonCommandContext context = new RibbonCommandContext(serviceName, method.toString(), uri.toString(), true,
 				new LinkedMultiValueMap<String, String>(), new LinkedMultiValueMap<String, String>(),
 				new ByteArrayInputStream(new String("bar").getBytes()),