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

Consistent inclusion of baseUrl in URI_TEMPLATE attribute

Browse Source 
Closes gh-31882
This commit is contained in:
rstoyanchev
2024-01-10 20:39:14 +00:00
parent e7eaaaded1
commit 2b4ffe0391
2 changed files with 32 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -231,14 +231,16 @@ final class DefaultWebClient implements WebClient {
@Override
public RequestBodySpec uri(String uriTemplate, Map<String, ?> uriVariables) {
attribute(URI_TEMPLATE_ATTRIBUTE, uriTemplate);
return uri(uriBuilderFactory.expand(uriTemplate, uriVariables));
UriBuilder uriBuilder = uriBuilderFactory.uriString(uriTemplate);
attribute(URI_TEMPLATE_ATTRIBUTE, uriBuilder.toUriString());
return uri(uriBuilder.build(uriVariables));
}
@Override
public RequestBodySpec uri(String uriTemplate, Function<UriBuilder, URI> uriFunction) {
attribute(URI_TEMPLATE_ATTRIBUTE, uriTemplate);
return uri(uriFunction.apply(uriBuilderFactory.uriString(uriTemplate)));
UriBuilder uriBuilder = uriBuilderFactory.uriString(uriTemplate);
attribute(URI_TEMPLATE_ATTRIBUTE, uriBuilder.toUriString());
return uri(uriFunction.apply(uriBuilder));
}
@Override

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

@@ -21,6 +21,7 @@ import java.util.Collections;
import java.util.HashMap;
import java.util.Map;
import java.util.function.Consumer;
import java.util.function.Function;
import java.util.function.Predicate;
import org.junit.jupiter.api.BeforeEach;
@@ -110,7 +111,7 @@ public class DefaultWebClientTests {
ClientRequest request = verifyAndGetRequest();
assertThat(request.url().toString()).isEqualTo("/base/path/identifier?q=12");
assertThat(request.attribute(WebClient.class.getName() + ".uriTemplate")).contains("/path/{id}");
assertThat(request.attribute(WebClient.class.getName() + ".uriTemplate")).contains("/base/path/{id}");
}
@Test
@@ -363,6 +364,30 @@ public class DefaultWebClientTests {
assertThat(request.attribute("foo")).isNotPresent();
}
@Test
public void uriTemplateAttribute() {
testUriTemplateAttribute(client -> client.get().uri("/{id}", 1), "/base/{id}");
testUriTemplateAttribute(client -> client.get().uri("/{id}", Map.of("id", 1)), "/base/{id}");
testUriTemplateAttribute(client -> client.get().uri("/{id}", builder -> builder.build(1)), "/base/{id}");
}
private void testUriTemplateAttribute(
Function<WebClient, WebClient.RequestHeadersSpec<?>> requestFn, String expectedPath) {
Map<String, Object> actual = new HashMap<>();
ExchangeFilterFunction filter = (request, next) -> {
actual.putAll(request.attributes());
return next.exchange(request);
};
requestFn.apply(this.builder.filter(filter).build())
.retrieve().bodyToMono(Void.class)
.block(Duration.ofSeconds(10));
String key = WebClient.class.getName() + ".uriTemplate";
assertThat(actual.get(key)).isEqualTo(expectedPath);
}
@Test
public void apply() {
WebClient client = this.builder