From f4bdc0284ebd3b2c0338253f66e5114bda604e5e Mon Sep 17 00:00:00 2001 From: Juergen Hoeller Date: Tue, 15 Sep 2020 09:56:53 +0200 Subject: [PATCH] Polishing --- .../reactive/HttpComponentsClientHttpConnector.java | 8 +++++--- .../client/reactive/HttpComponentsClientHttpRequest.java | 2 +- .../client/reactive/HttpComponentsClientHttpResponse.java | 4 ++-- .../http/client/reactive/JettyClientHttpConnector.java | 4 +++- 4 files changed, 11 insertions(+), 7 deletions(-) diff --git a/spring-web/src/main/java/org/springframework/http/client/reactive/HttpComponentsClientHttpConnector.java b/spring-web/src/main/java/org/springframework/http/client/reactive/HttpComponentsClientHttpConnector.java index a9f9e4952a2..90ed8ff36b2 100644 --- a/spring-web/src/main/java/org/springframework/http/client/reactive/HttpComponentsClientHttpConnector.java +++ b/spring-web/src/main/java/org/springframework/http/client/reactive/HttpComponentsClientHttpConnector.java @@ -90,13 +90,15 @@ public class HttpComponentsClientHttpConnector implements ClientHttpConnector { this.client.start(); } + /** - * Set the buffer factory to be used. + * Set the buffer factory to use. */ public void setBufferFactory(DataBufferFactory bufferFactory) { this.dataBufferFactory = bufferFactory; } + @Override public Mono connect(HttpMethod method, URI uri, Function> requestCallback) { @@ -143,8 +145,8 @@ public class HttpComponentsClientHttpConnector implements ClientHttpConnector { @Override public void completed(Message> result) { - HttpComponentsClientHttpResponse response = new HttpComponentsClientHttpResponse(this.dataBufferFactory, - result, this.context); + HttpComponentsClientHttpResponse response = + new HttpComponentsClientHttpResponse(this.dataBufferFactory, result, this.context); this.sink.success(response); } diff --git a/spring-web/src/main/java/org/springframework/http/client/reactive/HttpComponentsClientHttpRequest.java b/spring-web/src/main/java/org/springframework/http/client/reactive/HttpComponentsClientHttpRequest.java index 01b63cb4745..440fc681860 100644 --- a/spring-web/src/main/java/org/springframework/http/client/reactive/HttpComponentsClientHttpRequest.java +++ b/spring-web/src/main/java/org/springframework/http/client/reactive/HttpComponentsClientHttpRequest.java @@ -85,7 +85,7 @@ class HttpComponentsClientHttpRequest extends AbstractClientHttpRequest { return this.httpRequest.getUri(); } catch (URISyntaxException ex) { - throw new IllegalArgumentException("Invalid URI syntax.", ex); + throw new IllegalArgumentException("Invalid URI syntax: " + ex.getMessage()); } } diff --git a/spring-web/src/main/java/org/springframework/http/client/reactive/HttpComponentsClientHttpResponse.java b/spring-web/src/main/java/org/springframework/http/client/reactive/HttpComponentsClientHttpResponse.java index 67dccd6e7a0..df39dd1d407 100644 --- a/spring-web/src/main/java/org/springframework/http/client/reactive/HttpComponentsClientHttpResponse.java +++ b/spring-web/src/main/java/org/springframework/http/client/reactive/HttpComponentsClientHttpResponse.java @@ -56,8 +56,7 @@ class HttpComponentsClientHttpResponse implements ClientHttpResponse { public HttpComponentsClientHttpResponse(DataBufferFactory dataBufferFactory, - Message> message, - HttpClientContext context) { + Message> message, HttpClientContext context) { this.dataBufferFactory = dataBufferFactory; this.message = message; @@ -112,4 +111,5 @@ class HttpComponentsClientHttpResponse implements ClientHttpResponse { public HttpHeaders getHeaders() { return this.headers; } + } diff --git a/spring-web/src/main/java/org/springframework/http/client/reactive/JettyClientHttpConnector.java b/spring-web/src/main/java/org/springframework/http/client/reactive/JettyClientHttpConnector.java index 85f57da5ce0..2556b43ebce 100644 --- a/spring-web/src/main/java/org/springframework/http/client/reactive/JettyClientHttpConnector.java +++ b/spring-web/src/main/java/org/springframework/http/client/reactive/JettyClientHttpConnector.java @@ -91,13 +91,15 @@ public class JettyClientHttpConnector implements ClientHttpConnector { } } + /** - * Set the buffer factory to be used. + * Set the buffer factory to use. */ public void setBufferFactory(DataBufferFactory bufferFactory) { this.bufferFactory = bufferFactory; } + @Override public Mono connect(HttpMethod method, URI uri, Function> requestCallback) {