Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Polish indentation

Browse Source
This commit is contained in:
Brian Clozel
2014-10-08 17:02:26 +02:00
parent 4cf19df462
commit 0a68d265fb
1 changed files with 36 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

72
spring-web/src/main/java/org/springframework/http/client/HttpComponentsClientHttpRequestFactory.java
View File

@@ -61,7 +61,7 @@ public class HttpComponentsClientHttpRequestFactory implements ClientHttpRequest
private int connectTimeout; private int connectTimeout;
private int socketTimeout; private int socketTimeout;
private boolean bufferRequestBody = true; private boolean bufferRequestBody = true;
@@ -84,21 +84,21 @@ public class HttpComponentsClientHttpRequestFactory implements ClientHttpRequest
public HttpComponentsClientHttpRequestFactory(HttpClient httpClient) { public HttpComponentsClientHttpRequestFactory(HttpClient httpClient) {
Assert.notNull(httpClient, "'httpClient' must not be null"); Assert.notNull(httpClient, "'httpClient' must not be null");
Assert.isInstanceOf(CloseableHttpClient.class, httpClient, "'httpClient' is not of type CloseableHttpClient"); Assert.isInstanceOf(CloseableHttpClient.class, httpClient, "'httpClient' is not of type CloseableHttpClient");
this.httpClient = (CloseableHttpClient) httpClient; this.httpClient = (CloseableHttpClient) httpClient;
} }
/** /**
* Set the {@code HttpClient} used for * Set the {@code HttpClient} used for
* <p>As of Spring Framework 4.0, the given client is expected to be of type * <p>As of Spring Framework 4.0, the given client is expected to be of type
* {@link CloseableHttpClient} (requiring HttpClient 4.3+). * {@link CloseableHttpClient} (requiring HttpClient 4.3+).
*/ */
public void setHttpClient(HttpClient httpClient) { public void setHttpClient(HttpClient httpClient) {
Assert.isInstanceOf(CloseableHttpClient.class, httpClient, "'httpClient' is not of type CloseableHttpClient"); Assert.isInstanceOf(CloseableHttpClient.class, httpClient, "'httpClient' is not of type CloseableHttpClient");
this.httpClient = (CloseableHttpClient) httpClient; this.httpClient = (CloseableHttpClient) httpClient;
} }
/** /**
* Return the {@code HttpClient} used for * Return the {@code HttpClient} used for
* {@linkplain #createRequest(URI, HttpMethod) synchronous execution}. * {@linkplain #createRequest(URI, HttpMethod) synchronous execution}.
*/ */
@@ -113,7 +113,7 @@ public class HttpComponentsClientHttpRequestFactory implements ClientHttpRequest
*/ */
public void setConnectTimeout(int timeout) { public void setConnectTimeout(int timeout) {
Assert.isTrue(timeout >= 0, "Timeout must be a non-negative value"); Assert.isTrue(timeout >= 0, "Timeout must be a non-negative value");
this.connectTimeout = timeout; this.connectTimeout = timeout;
setLegacyConnectionTimeout(getHttpClient(), timeout); setLegacyConnectionTimeout(getHttpClient(), timeout);
} }
@@ -146,7 +146,7 @@ public class HttpComponentsClientHttpRequestFactory implements ClientHttpRequest
*/ */
public void setReadTimeout(int timeout) { public void setReadTimeout(int timeout) {
Assert.isTrue(timeout >= 0, "Timeout must be a non-negative value"); Assert.isTrue(timeout >= 0, "Timeout must be a non-negative value");
this.socketTimeout = timeout; this.socketTimeout = timeout;
setLegacySocketTimeout(getHttpClient(), timeout); setLegacySocketTimeout(getHttpClient(), timeout);
} }
@@ -181,30 +181,30 @@ public class HttpComponentsClientHttpRequestFactory implements ClientHttpRequest
Assert.state(client != null, "Synchronous execution requires an HttpClient to be set"); Assert.state(client != null, "Synchronous execution requires an HttpClient to be set");
HttpUriRequest httpRequest = createHttpUriRequest(httpMethod, uri); HttpUriRequest httpRequest = createHttpUriRequest(httpMethod, uri);
postProcessHttpRequest(httpRequest); postProcessHttpRequest(httpRequest);
HttpContext context = createHttpContext(httpMethod, uri); HttpContext context = createHttpContext(httpMethod, uri);
if (context == null) { if (context == null) {
context = HttpClientContext.create(); context = HttpClientContext.create();
} }
// Request configuration not set in the context // Request configuration not set in the context
if (context.getAttribute(HttpClientContext.REQUEST_CONFIG) == null) { if (context.getAttribute(HttpClientContext.REQUEST_CONFIG) == null) {
// Use request configuration given by the user, when available // Use request configuration given by the user, when available
RequestConfig config = null; RequestConfig config = null;
if (httpRequest instanceof Configurable) { if (httpRequest instanceof Configurable) {
config = ((Configurable) httpRequest).getConfig(); config = ((Configurable) httpRequest).getConfig();
} }
if (config == null) { if (config == null) {
if (this.socketTimeout > 0 || this.connectTimeout > 0) { if (this.socketTimeout > 0 || this.connectTimeout > 0) {
config = RequestConfig.custom() config = RequestConfig.custom()
.setConnectTimeout(this.connectTimeout) .setConnectTimeout(this.connectTimeout)
.setSocketTimeout(this.socketTimeout) .setSocketTimeout(this.socketTimeout)
.build(); .build();
} }
else { else {
config = RequestConfig.DEFAULT; config = RequestConfig.DEFAULT;
} }
} }
context.setAttribute(HttpClientContext.REQUEST_CONFIG, config); context.setAttribute(HttpClientContext.REQUEST_CONFIG, config);
} }
if (this.bufferRequestBody) { if (this.bufferRequestBody) {
return new HttpComponentsClientHttpRequest(client, httpRequest, context); return new HttpComponentsClientHttpRequest(client, httpRequest, context);
} }
@@ -270,7 +270,7 @@ public class HttpComponentsClientHttpRequestFactory implements ClientHttpRequest
*/ */
@Override @Override
public void destroy() throws Exception { public void destroy() throws Exception {
this.httpClient.close(); this.httpClient.close();
} }
} }