Invoke defaultRequest earlier in RestClient and WebClient

Closes gh-32053
This commit is contained in:
Arjen Poutsma
2024-01-25 11:09:38 +01:00
parent 218957f0e8
commit bc2257aaff
4 changed files with 50 additions and 8 deletions

View File

@@ -181,7 +181,11 @@ final class DefaultRestClient implements RestClient {
}
private RequestBodyUriSpec methodInternal(HttpMethod httpMethod) {
return new DefaultRequestBodyUriSpec(httpMethod);
DefaultRequestBodyUriSpec spec = new DefaultRequestBodyUriSpec(httpMethod);
if (this.defaultRequest != null) {
this.defaultRequest.accept(spec);
}
return spec;
}
@Override
@@ -456,9 +460,6 @@ final class DefaultRestClient implements RestClient {
Observation observation = null;
URI uri = null;
try {
if (DefaultRestClient.this.defaultRequest != null) {
DefaultRestClient.this.defaultRequest.accept(this);
}
uri = initUri();
HttpHeaders headers = initHeaders();
ClientHttpRequest clientRequest = createRequest(uri);