Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

WebClient uri method with uriTemplate and UriBuilder

Browse Source 
See gh-22705
This commit is contained in:
Jeoffrey Haeyaert
2019-03-28 22:14:28 +01:00
committed by Rossen Stoyanchev
parent ed70978071
commit 9976783639
3 changed files with 25 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
spring-webflux/src/main/java/org/springframework/web/reactive/function/client/DefaultWebClient.java
View File

@@ -184,6 +184,12 @@ class DefaultWebClient implements WebClient {
return uri(uriBuilderFactory.expand(uriTemplate, uriVariables));
}
@Override
public RequestBodySpec uri(String uriTemplate, Function<UriBuilder, URI> uriFunction) {
attribute(URI_TEMPLATE_ATTRIBUTE, uriTemplate);
return uri(uriFunction.apply(uriBuilderFactory.uriString(uriTemplate)));
}
@Override
public RequestBodySpec uri(Function<UriBuilder, URI> uriFunction) {
return uri(uriFunction.apply(uriBuilderFactory.builder()));

7
spring-webflux/src/main/java/org/springframework/web/reactive/function/client/WebClient.java
View File

@@ -348,9 +348,16 @@ public interface WebClient {
*/
S uri(String uri, Map<String, ?> uriVariables);
/**
* Build the URI for the request using the {@link UriBuilderFactory}
* configured for this client and initialized with the specified <code>uri</code>.
*/
S uri(String uri, Function<UriBuilder, URI> uriFunction);
/**
* Build the URI for the request using the {@link UriBuilderFactory}
* configured for this client.
* @see #uri(String, Function)
*/
S uri(Function<UriBuilder, URI> uriFunction);
}

12
spring-webflux/src/test/java/org/springframework/web/reactive/function/client/DefaultWebClientTests.java
View File

@@ -84,6 +84,18 @@ public class DefaultWebClientTests {
assertEquals("/base/path?q=12", request.url().toString());
}
@Test
public void uriBuilderWithUriTemplate() {
this.builder.build().get()
.uri("/path/{id}", builder -> builder.queryParam("q", "12").build("identifier"))
.exchange().block(Duration.ofSeconds(10));
ClientRequest request = verifyAndGetRequest();
assertEquals("/base/path/identifier?q=12", request.url().toString());
assertEquals("/path/{id}", request.attribute(WebClient.class.getName() + ".uriTemplate").<String>get());
}
@Test
public void uriBuilderWithPathOverride() {
this.builder.build().get()