root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 12 Packages Projects Releases Wiki Activity

Polish "Provide access to root URI from TestRestTemplate" 

See gh-10641
This commit is contained in:
Andy Wilkinson 2017-11-12 12:11:57 +00:00
parent c1205c3243
commit 71632ac767
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
spring-boot-project/spring-boot-test/src/main/java/org/springframework/boot/test/web/client/TestRestTemplate.java
View File

@ -166,10 +166,14 @@ public class TestRestTemplate {
this.restTemplate.setUriTemplateHandler(handler); this.restTemplate.setUriTemplateHandler(handler);
} }
/**
* Returns the root URI applied by a {@link RootUriTemplateHandler} or {@code ""} if
* the root URI is not available.
* @return the root URI
*/
public String getRootUri() { public String getRootUri() {
UriTemplateHandler uriTemplateHandler = this.restTemplate.getUriTemplateHandler(); UriTemplateHandler uriTemplateHandler = this.restTemplate.getUriTemplateHandler();
if (RootUriTemplateHandler.class if (uriTemplateHandler instanceof RootUriTemplateHandler) {
.isAssignableFrom(uriTemplateHandler.getClass())) {
return ((RootUriTemplateHandler) uriTemplateHandler).getRootUri(); return ((RootUriTemplateHandler) uriTemplateHandler).getRootUri();
} }
return ""; return "";

2
spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/web/client/TestRestTemplateTests.java
View File

@ -86,7 +86,6 @@ public class TestRestTemplateTests {
public void getRootUriRootUriSetViaRestTemplateBuilder() { public void getRootUriRootUriSetViaRestTemplateBuilder() {
String rootUri = "http://example.com"; String rootUri = "http://example.com";
RestTemplate delegate = new RestTemplateBuilder().rootUri(rootUri).build(); RestTemplate delegate = new RestTemplateBuilder().rootUri(rootUri).build();
assertThat(new TestRestTemplate(delegate).getRootUri()).isEqualTo(rootUri); assertThat(new TestRestTemplate(delegate).getRootUri()).isEqualTo(rootUri);
} }
@ -98,7 +97,6 @@ public class TestRestTemplateTests {
LocalHostUriTemplateHandler.class); LocalHostUriTemplateHandler.class);
given(templateHandler.getRootUri()).willReturn(rootUri); given(templateHandler.getRootUri()).willReturn(rootUri);
template.setUriTemplateHandler(templateHandler); template.setUriTemplateHandler(templateHandler);
assertThat(template.getRootUri()).isEqualTo(rootUri); assertThat(template.getRootUri()).isEqualTo(rootUri);
} }