From 7f280a3b177fb8456e036565f747cfc4b64104ed Mon Sep 17 00:00:00 2001 From: Juergen Hoeller Date: Mon, 31 Oct 2016 12:28:44 +0100 Subject: [PATCH] Polishing --- .../HttpComponentsAsyncClientHttpRequest.java | 27 +++++++++---------- ...HttpComponentsAsyncClientHttpResponse.java | 6 ++--- .../HttpComponentsClientHttpRequest.java | 16 +++++------ .../HttpComponentsClientHttpResponse.java | 8 +++--- ...pComponentsStreamingClientHttpRequest.java | 15 ++++++----- .../http/client/Netty4ClientHttpRequest.java | 3 +-- .../http/client/Netty4ClientHttpResponse.java | 3 +-- .../client/OkHttp3AsyncClientHttpRequest.java | 2 +- .../http/client/OkHttp3ClientHttpRequest.java | 2 +- .../client/OkHttpAsyncClientHttpRequest.java | 2 +- .../http/client/OkHttpClientHttpRequest.java | 2 +- 11 files changed, 39 insertions(+), 47 deletions(-) diff --git a/spring-web/src/main/java/org/springframework/http/client/HttpComponentsAsyncClientHttpRequest.java b/spring-web/src/main/java/org/springframework/http/client/HttpComponentsAsyncClientHttpRequest.java index 22313ed59e2..9f9d33e3962 100644 --- a/spring-web/src/main/java/org/springframework/http/client/HttpComponentsAsyncClientHttpRequest.java +++ b/spring-web/src/main/java/org/springframework/http/client/HttpComponentsAsyncClientHttpRequest.java @@ -40,15 +40,15 @@ import org.springframework.util.concurrent.SuccessCallback; /** - * {@link ClientHttpRequest} implementation that uses Apache HttpComponents HttpClient to - * execute requests. + * {@link ClientHttpRequest} implementation based on + * Apache HttpComponents HttpAsyncClient. * - *

Created via the {@link org.springframework.http.client.HttpComponentsClientHttpRequestFactory}. + *

Created via the {@link HttpComponentsClientHttpRequestFactory}. * * @author Oleg Kalnichevski * @author Arjen Poutsma * @since 4.0 - * @see org.springframework.http.client.HttpComponentsClientHttpRequestFactory#createRequest + * @see HttpComponentsClientHttpRequestFactory#createRequest */ final class HttpComponentsAsyncClientHttpRequest extends AbstractBufferingAsyncClientHttpRequest { @@ -59,10 +59,10 @@ final class HttpComponentsAsyncClientHttpRequest extends AbstractBufferingAsyncC private final HttpContext httpContext; - HttpComponentsAsyncClientHttpRequest(HttpAsyncClient httpClient, HttpUriRequest httpRequest, HttpContext httpContext) { - this.httpClient = httpClient; - this.httpRequest = httpRequest; - this.httpContext = httpContext; + HttpComponentsAsyncClientHttpRequest(HttpAsyncClient client, HttpUriRequest request, HttpContext context) { + this.httpClient = client; + this.httpRequest = request; + this.httpContext = context; } @@ -92,26 +92,23 @@ final class HttpComponentsAsyncClientHttpRequest extends AbstractBufferingAsyncC entityEnclosingRequest.setEntity(requestEntity); } - final HttpResponseFutureCallback callback = new HttpResponseFutureCallback(this.httpRequest); - final Future futureResponse = - this.httpClient.execute(this.httpRequest, this.httpContext, callback); + HttpResponseFutureCallback callback = new HttpResponseFutureCallback(this.httpRequest); + Future futureResponse = this.httpClient.execute(this.httpRequest, this.httpContext, callback); return new ClientHttpResponseFuture(futureResponse, callback); } private static class HttpResponseFutureCallback implements FutureCallback { - private final ListenableFutureCallbackRegistry callbacks = - new ListenableFutureCallbackRegistry<>(); - private final HttpUriRequest httpRequest; + private final ListenableFutureCallbackRegistry callbacks = + new ListenableFutureCallbackRegistry<>(); public HttpResponseFutureCallback(HttpUriRequest httpRequest) { this.httpRequest = httpRequest; } - public void addCallback(ListenableFutureCallback callback) { this.callbacks.addCallback(callback); } diff --git a/spring-web/src/main/java/org/springframework/http/client/HttpComponentsAsyncClientHttpResponse.java b/spring-web/src/main/java/org/springframework/http/client/HttpComponentsAsyncClientHttpResponse.java index f25579a4e82..b8f5a6bbb76 100644 --- a/spring-web/src/main/java/org/springframework/http/client/HttpComponentsAsyncClientHttpResponse.java +++ b/spring-web/src/main/java/org/springframework/http/client/HttpComponentsAsyncClientHttpResponse.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2015 the original author or authors. + * Copyright 2002-2016 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -27,8 +27,8 @@ import org.springframework.http.HttpHeaders; import org.springframework.util.StreamUtils; /** - * {@link ClientHttpResponse} implementation that uses - * Apache HttpComponents HttpClient to execute requests. + * {@link ClientHttpResponse} implementation based on + * Apache HttpComponents HttpAsyncClient. * *

Created via the {@link HttpComponentsAsyncClientHttpRequest}. * diff --git a/spring-web/src/main/java/org/springframework/http/client/HttpComponentsClientHttpRequest.java b/spring-web/src/main/java/org/springframework/http/client/HttpComponentsClientHttpRequest.java index 0bf8d9fb04b..d9875264c84 100644 --- a/spring-web/src/main/java/org/springframework/http/client/HttpComponentsClientHttpRequest.java +++ b/spring-web/src/main/java/org/springframework/http/client/HttpComponentsClientHttpRequest.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2015 the original author or authors. + * Copyright 2002-2016 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -35,13 +35,11 @@ import org.springframework.http.HttpMethod; import org.springframework.util.StringUtils; /** - * {@link org.springframework.http.client.ClientHttpRequest} implementation that uses - * Apache HttpComponents HttpClient to execute requests. + * {@link ClientHttpRequest} implementation based on + * Apache HttpComponents HttpClient. * *

Created via the {@link HttpComponentsClientHttpRequestFactory}. * - *

NOTE: Requires Apache HttpComponents 4.3 or higher, as of Spring 4.0. - * * @author Oleg Kalnichevski * @author Arjen Poutsma * @author Juergen Hoeller @@ -57,10 +55,10 @@ final class HttpComponentsClientHttpRequest extends AbstractBufferingClientHttpR private final HttpContext httpContext; - HttpComponentsClientHttpRequest(HttpClient httpClient, HttpUriRequest httpRequest, HttpContext httpContext) { - this.httpClient = httpClient; - this.httpRequest = httpRequest; - this.httpContext = httpContext; + HttpComponentsClientHttpRequest(HttpClient client, HttpUriRequest request, HttpContext context) { + this.httpClient = client; + this.httpRequest = request; + this.httpContext = context; } diff --git a/spring-web/src/main/java/org/springframework/http/client/HttpComponentsClientHttpResponse.java b/spring-web/src/main/java/org/springframework/http/client/HttpComponentsClientHttpResponse.java index 3ef65b0e2dd..3798a97d813 100644 --- a/spring-web/src/main/java/org/springframework/http/client/HttpComponentsClientHttpResponse.java +++ b/spring-web/src/main/java/org/springframework/http/client/HttpComponentsClientHttpResponse.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2015 the original author or authors. + * Copyright 2002-2016 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -29,13 +29,11 @@ import org.springframework.http.HttpHeaders; import org.springframework.util.StreamUtils; /** - * {@link org.springframework.http.client.ClientHttpResponse} implementation that uses - * Apache HttpComponents HttpClient to execute requests. + * {@link ClientHttpResponse} implementation based on + * Apache HttpComponents HttpClient. * *

Created via the {@link HttpComponentsClientHttpRequest}. * - *

NOTE: Requires Apache HttpComponents 4.3 or higher, as of Spring 4.0. - * * @author Oleg Kalnichevski * @author Arjen Poutsma * @since 3.1 diff --git a/spring-web/src/main/java/org/springframework/http/client/HttpComponentsStreamingClientHttpRequest.java b/spring-web/src/main/java/org/springframework/http/client/HttpComponentsStreamingClientHttpRequest.java index 68756d71666..e27d9f8f0d5 100644 --- a/spring-web/src/main/java/org/springframework/http/client/HttpComponentsStreamingClientHttpRequest.java +++ b/spring-web/src/main/java/org/springframework/http/client/HttpComponentsStreamingClientHttpRequest.java @@ -36,8 +36,8 @@ import org.springframework.http.MediaType; import org.springframework.http.StreamingHttpOutputMessage; /** - * {@link ClientHttpRequest} implementation that uses Apache HttpComponents - * HttpClient to execute requests. + * {@link ClientHttpRequest} implementation based on + * Apache HttpComponents HttpClient in streaming mode. * *

Created via the {@link HttpComponentsClientHttpRequestFactory}. * @@ -45,7 +45,8 @@ import org.springframework.http.StreamingHttpOutputMessage; * @since 4.0 * @see HttpComponentsClientHttpRequestFactory#createRequest(java.net.URI, org.springframework.http.HttpMethod) */ -final class HttpComponentsStreamingClientHttpRequest extends AbstractClientHttpRequest implements StreamingHttpOutputMessage { +final class HttpComponentsStreamingClientHttpRequest extends AbstractClientHttpRequest + implements StreamingHttpOutputMessage { private final HttpClient httpClient; @@ -56,10 +57,10 @@ final class HttpComponentsStreamingClientHttpRequest extends AbstractClientHttpR private Body body; - HttpComponentsStreamingClientHttpRequest(HttpClient httpClient, HttpUriRequest httpRequest, HttpContext httpContext) { - this.httpClient = httpClient; - this.httpRequest = httpRequest; - this.httpContext = httpContext; + HttpComponentsStreamingClientHttpRequest(HttpClient client, HttpUriRequest request, HttpContext context) { + this.httpClient = client; + this.httpRequest = request; + this.httpContext = context; } diff --git a/spring-web/src/main/java/org/springframework/http/client/Netty4ClientHttpRequest.java b/spring-web/src/main/java/org/springframework/http/client/Netty4ClientHttpRequest.java index d7b825db0ba..41ac7108f2c 100644 --- a/spring-web/src/main/java/org/springframework/http/client/Netty4ClientHttpRequest.java +++ b/spring-web/src/main/java/org/springframework/http/client/Netty4ClientHttpRequest.java @@ -42,8 +42,7 @@ import org.springframework.util.concurrent.ListenableFuture; import org.springframework.util.concurrent.SettableListenableFuture; /** - * {@link org.springframework.http.client.ClientHttpRequest} implementation - * that uses Netty 4 to execute requests. + * {@link ClientHttpRequest} implementation based on Netty 4. * *

Created via the {@link Netty4ClientHttpRequestFactory}. * diff --git a/spring-web/src/main/java/org/springframework/http/client/Netty4ClientHttpResponse.java b/spring-web/src/main/java/org/springframework/http/client/Netty4ClientHttpResponse.java index 2baa53a4233..e42259edd88 100644 --- a/spring-web/src/main/java/org/springframework/http/client/Netty4ClientHttpResponse.java +++ b/spring-web/src/main/java/org/springframework/http/client/Netty4ClientHttpResponse.java @@ -28,8 +28,7 @@ import org.springframework.http.HttpHeaders; import org.springframework.util.Assert; /** - * {@link org.springframework.http.client.ClientHttpResponse} implementation - * that uses Netty 4 to parse responses. + * {@link ClientHttpResponse} implementation based on Netty 4. * * @author Arjen Poutsma * @since 4.1.2 diff --git a/spring-web/src/main/java/org/springframework/http/client/OkHttp3AsyncClientHttpRequest.java b/spring-web/src/main/java/org/springframework/http/client/OkHttp3AsyncClientHttpRequest.java index 057a165243e..06e1d064ffe 100644 --- a/spring-web/src/main/java/org/springframework/http/client/OkHttp3AsyncClientHttpRequest.java +++ b/spring-web/src/main/java/org/springframework/http/client/OkHttp3AsyncClientHttpRequest.java @@ -31,7 +31,7 @@ import org.springframework.util.concurrent.ListenableFuture; import org.springframework.util.concurrent.SettableListenableFuture; /** - * {@link AsyncClientHttpRequest} implementation that uses OkHttp 3.x to execute requests. + * {@link AsyncClientHttpRequest} implementation based on OkHttp 3.x. * *

Created via the {@link OkHttp3ClientHttpRequestFactory}. * diff --git a/spring-web/src/main/java/org/springframework/http/client/OkHttp3ClientHttpRequest.java b/spring-web/src/main/java/org/springframework/http/client/OkHttp3ClientHttpRequest.java index e0ebaac3378..aa1416f87b6 100644 --- a/spring-web/src/main/java/org/springframework/http/client/OkHttp3ClientHttpRequest.java +++ b/spring-web/src/main/java/org/springframework/http/client/OkHttp3ClientHttpRequest.java @@ -26,7 +26,7 @@ import org.springframework.http.HttpHeaders; import org.springframework.http.HttpMethod; /** - * {@link ClientHttpRequest} implementation that uses OkHttp 3.x to execute requests. + * {@link ClientHttpRequest} implementation based on OkHttp 3.x. * *

Created via the {@link OkHttp3ClientHttpRequestFactory}. * diff --git a/spring-web/src/main/java/org/springframework/http/client/OkHttpAsyncClientHttpRequest.java b/spring-web/src/main/java/org/springframework/http/client/OkHttpAsyncClientHttpRequest.java index 644709423a7..21350d6cc85 100644 --- a/spring-web/src/main/java/org/springframework/http/client/OkHttpAsyncClientHttpRequest.java +++ b/spring-web/src/main/java/org/springframework/http/client/OkHttpAsyncClientHttpRequest.java @@ -31,7 +31,7 @@ import org.springframework.util.concurrent.ListenableFuture; import org.springframework.util.concurrent.SettableListenableFuture; /** - * {@link AsyncClientHttpRequest} implementation that uses OkHttp 2.x to execute requests. + * {@link AsyncClientHttpRequest} implementation based on OkHttp 2.x. * *

Created via the {@link OkHttpClientHttpRequestFactory}. * diff --git a/spring-web/src/main/java/org/springframework/http/client/OkHttpClientHttpRequest.java b/spring-web/src/main/java/org/springframework/http/client/OkHttpClientHttpRequest.java index 70821c345ec..b1c197e03d9 100644 --- a/spring-web/src/main/java/org/springframework/http/client/OkHttpClientHttpRequest.java +++ b/spring-web/src/main/java/org/springframework/http/client/OkHttpClientHttpRequest.java @@ -26,7 +26,7 @@ import org.springframework.http.HttpHeaders; import org.springframework.http.HttpMethod; /** - * {@link ClientHttpRequest} implementation that uses OkHttp 2.x to execute requests. + * {@link ClientHttpRequest} implementation based on OkHttp 2.x. * *

Created via the {@link OkHttpClientHttpRequestFactory}. *