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

encode uri if needed

Browse Source 
fixes gh-347
This commit is contained in:
Spencer Gibb
2015-05-18 21:51:58 -06:00
parent 8bb578ad97
commit bd5d00c082
2 changed files with 19 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/zuul/filters/route/RibbonCommand.java
View File

@@ -21,6 +21,10 @@ import java.net.URI;
import java.net.URISyntaxException;
import java.util.List;
import org.springframework.util.MultiValueMap;
import org.springframework.util.StringUtils;
import org.springframework.web.util.UriComponentsBuilder;
import com.netflix.client.http.HttpRequest;
import com.netflix.client.http.HttpRequest.Builder;
import com.netflix.client.http.HttpRequest.Verb;
@@ -35,7 +39,6 @@ import com.netflix.hystrix.HystrixCommandProperties.ExecutionIsolationStrategy;
import com.netflix.niws.client.http.RestClient;
import com.netflix.zuul.constants.ZuulConstants;
import com.netflix.zuul.context.RequestContext;
import org.springframework.util.MultiValueMap;
/**
* Hystrix wrapper around Eureka Ribbon command
@@ -77,7 +80,7 @@ public class RibbonCommand extends HystrixCommand<HttpResponse> {
super(getSetter(commandKey));
this.restClient = restClient;
this.verb = verb;
this.uri = new URI(uri);
this.uri = (StringUtils.hasText(uri))? UriComponentsBuilder.fromUriString(uri).build().toUri() : new URI(uri);
this.retryable = retryable;
this.headers = headers;
this.params = params;

14
spring-cloud-netflix-core/src/test/java/org/springframework/cloud/netflix/zuul/SampleZuulProxyApplicationTests.java
View File

@@ -132,6 +132,15 @@ public class SampleZuulProxyApplicationTests {
assertEquals("Gotten 1!", result.getBody());
}
@Test
public void routeWithSpace() {
ResponseEntity<String> result = new TestRestTemplate().exchange(
"http://localhost:" + this.port + "/simple/spa ce",
HttpMethod.GET, new HttpEntity<>((Void) null), String.class);
assertEquals(HttpStatus.OK, result.getStatusCode());
assertEquals("Hello space", result.getBody());
}
}
// Don't use @SpringBootApplication because we don't want to component scan
@@ -169,6 +178,11 @@ class SampleZuulProxyApplication {
return "Hello world";
}
@RequestMapping("/spa ce")
public String space() {
return "Hello space";
}
@Bean
public ZuulFilter sampleFilter() {
return new ZuulFilter() {