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

Merge branch '6.0.x'

This commit is contained in:
rstoyanchev 2023-11-09 12:53:36 +00:00
parent d8441fc80c 7714110940
commit 769128a0b2
1 changed files with 6 additions and 4 deletions
Show Stats 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

@ -79,7 +79,9 @@ final class DefaultWebClient implements WebClient {
private static final Mono<ClientResponse> NO_HTTP_CLIENT_RESPONSE_ERROR = Mono.error( private static final Mono<ClientResponse> NO_HTTP_CLIENT_RESPONSE_ERROR = Mono.error(
() -> new IllegalStateException("The underlying HTTP client completed without emitting a response.")); () -> new IllegalStateException("The underlying HTTP client completed without emitting a response."));
private static final DefaultClientRequestObservationConvention DEFAULT_OBSERVATION_CONVENTION = new DefaultClientRequestObservationConvention(); private static final DefaultClientRequestObservationConvention DEFAULT_OBSERVATION_CONVENTION =
new DefaultClientRequestObservationConvention();
private final ExchangeFunction exchangeFunction; private final ExchangeFunction exchangeFunction;
@ -119,10 +121,10 @@ final class DefaultWebClient implements WebClient {
this.uriBuilderFactory = uriBuilderFactory; this.uriBuilderFactory = uriBuilderFactory;
this.defaultHeaders = defaultHeaders; this.defaultHeaders = defaultHeaders;
this.defaultCookies = defaultCookies; this.defaultCookies = defaultCookies;
this.observationRegistry = observationRegistry;
this.observationConvention = observationConvention;
this.defaultRequest = defaultRequest; this.defaultRequest = defaultRequest;
this.defaultStatusHandlers = initStatusHandlers(statusHandlerMap); this.defaultStatusHandlers = initStatusHandlers(statusHandlerMap);
this.observationRegistry = observationRegistry;
this.observationConvention = observationConvention;
this.builder = builder; this.builder = builder;
} }
@ -697,7 +699,7 @@ final class DefaultWebClient implements WebClient {
private static URI getUriToLog(URI uri) { private static URI getUriToLog(URI uri) {
if (StringUtils.hasText(uri.getQuery())) { if (StringUtils.hasText(uri.getQuery())) {
try { try {
uri = new URI(uri.getScheme(), uri.getHost(), uri.getPath(), null); uri = new URI(uri.getScheme(), null, uri.getHost(), uri.getPort(), uri.getPath(), null, null);
} }
catch (URISyntaxException ex) { catch (URISyntaxException ex) {
// ignore // ignore