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

Support custom UriTemplateHandler in LocalHostUriTemplateHandler 

See gh-13208
This commit is contained in:
Mihhail Lapushkin 2018-05-18 11:31:51 +03:00 committed by Stephane Nicoll
parent 48cf025093
commit d31dbac69e
2 changed files with 22 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -58,9 +58,23 @@ public class LocalHostUriTemplateHandler extends RootUriTemplateHandler {
* @since 1.4.1
*/
public LocalHostUriTemplateHandler(Environment environment, String scheme) {
super(new DefaultUriBuilderFactory());
this(environment, scheme, new DefaultUriBuilderFactory());
}
/**
* Create a new {@code LocalHostUriTemplateHandler} that will generate URIs with the
* given {@code scheme}, use the given {@code environment} to determine the
* context-path and port and delegate to the given template {@code handler}.
* @param environment the environment used to determine the port
* @param scheme the scheme of the root uri
* @param handler the delegate handler
* @since 2.0.3
*/
public LocalHostUriTemplateHandler(Environment environment, String scheme, UriTemplateHandler handler) {
super(handler);
Assert.notNull(environment, "Environment must not be null");
Assert.notNull(scheme, "Scheme must not be null");
Assert.notNull(handler, "Handler must not be null");
this.environment = environment;
this.scheme = scheme;
}

7
spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/web/client/LocalHostUriTemplateHandlerTests.java
View File

@ -50,6 +50,13 @@ public class LocalHostUriTemplateHandlerTests {
new LocalHostUriTemplateHandler(new MockEnvironment(), null);
}
@Test
public void createWhenHandlerIsNullShouldThrowException() {
this.thrown.expect(IllegalArgumentException.class);
this.thrown.expectMessage("Handler must not be null");
new LocalHostUriTemplateHandler(new MockEnvironment(), "http", null);
}
@Test
public void getRootUriShouldUseLocalServerPort() {
MockEnvironment environment = new MockEnvironment();