Browse Source

Use URI String as fallback in ReactorClientHttpConnector

Closes gh-31033
pull/31496/head
rstoyanchev 1 year ago
parent
commit
957b6b2caf
  1. 14
      spring-web/src/main/java/org/springframework/http/client/reactive/ReactorClientHttpConnector.java

14
spring-web/src/main/java/org/springframework/http/client/reactive/ReactorClientHttpConnector.java

@ -108,7 +108,7 @@ public class ReactorClientHttpConnector implements ClientHttpConnector { @@ -108,7 +108,7 @@ public class ReactorClientHttpConnector implements ClientHttpConnector {
HttpClient.RequestSender requestSender = this.httpClient
.request(io.netty.handler.codec.http.HttpMethod.valueOf(method.name()));
requestSender = (uri.isAbsolute() ? requestSender.uri(uri) : requestSender.uri(uri.toString()));
requestSender = setUri(requestSender, uri);
return requestSender
.send((request, outbound) -> requestCallback.apply(adaptRequest(method, uri, request, outbound)))
@ -125,6 +125,18 @@ public class ReactorClientHttpConnector implements ClientHttpConnector { @@ -125,6 +125,18 @@ public class ReactorClientHttpConnector implements ClientHttpConnector {
});
}
private static HttpClient.RequestSender setUri(HttpClient.RequestSender requestSender, URI uri) {
if (uri.isAbsolute()) {
try {
return requestSender.uri(uri);
}
catch (Exception ex) {
// Fall back on passing it in as a String
}
}
return requestSender.uri(uri.toString());
}
private ReactorClientHttpRequest adaptRequest(HttpMethod method, URI uri, HttpClientRequest request,
NettyOutbound nettyOutbound) {

Loading…
Cancel
Save