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

Fix custom config with older HttpClient

Browse Source 
Since HttpClient 4.3, custom configuration such as the connection
timeout and the socket timeout are set in a RequestConfig object
stored in the HttpContext.

Unfortunately, older HttpClients are not supporting this
infrastructure and new clients throw an exception when the
deprecated API is used.

This commit detects if the client is an "old" implementation and
set the configuration through the deprecated means to restore
full backward compatibility with these features.

Issue: SPR-11442
This commit is contained in:
Stephane Nicoll
2014-03-04 16:53:04 +01:00
parent bea94d5302
commit 7a6ec69523
3 changed files with 86 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
spring-web/src/main/java/org/springframework/http/client/HttpComponentsClientHttpRequest.java
View File

@@ -70,6 +70,9 @@ final class HttpComponentsClientHttpRequest extends AbstractBufferingClientHttpR
return this.httpRequest.getURI();
}
HttpContext getHttpContext() {
return httpContext;
}
@Override
protected ClientHttpResponse executeInternal(HttpHeaders headers, byte[] bufferedOutput) throws IOException {

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

@@ -113,6 +113,7 @@ public class HttpComponentsClientHttpRequestFactory implements ClientHttpRequest
public void setConnectTimeout(int timeout) {
Assert.isTrue(timeout >= 0, "Timeout must be a non-negative value");
this.connectTimeout = timeout;
setLegacyConnectionTimeout(getHttpClient(), connectTimeout);
}
/**
@@ -123,6 +124,7 @@ public class HttpComponentsClientHttpRequestFactory implements ClientHttpRequest
public void setReadTimeout(int timeout) {
Assert.isTrue(timeout >= 0, "Timeout must be a non-negative value");
this.socketTimeout= timeout;
setLegacyReadTimeout(getHttpClient(), socketTimeout);
}
/**
@@ -222,6 +224,44 @@ public class HttpComponentsClientHttpRequestFactory implements ClientHttpRequest
return null;
}
/**
* Apply the specified custom connection timeout for deprecated {@link HttpClient}
* instances.
* <p>As from HttpClient 4.3, default parameters have to be set in a
* {@link RequestConfig} instance instead of setting the parameters
* on the client.
* <p>Unfortunately, this behaviour is not backward compatible and older
* {@link HttpClient} implementations will ignore the {@link RequestConfig}
* object set in the context.
* <p>If the specified client is an older implementation, we set the
* custom connection timeout through the deprecated API. Otherwise, we just
* return as it is set per request with newer clients
* @param client the client to handle
* @param connectionTimeout the custom connection timeout
*/
@SuppressWarnings("deprecation")
private void setLegacyConnectionTimeout(HttpClient client, int connectionTimeout) {
if (org.apache.http.impl.client.AbstractHttpClient.class.isInstance(client)) {
client.getParams().setIntParameter(
org.apache.http.params.CoreConnectionPNames.CONNECTION_TIMEOUT, connectionTimeout);
}
}
/**
* Apply the specified read timeout for deprecated {@link HttpClient}
* instances.
* @param client the client to handle
* @param readTimeout the custom read timeout
* @see #setLegacyConnectionTimeout(org.apache.http.client.HttpClient, int)
*/
@SuppressWarnings("deprecation")
private void setLegacyReadTimeout(HttpClient client, int readTimeout) {
if (org.apache.http.impl.client.AbstractHttpClient.class.isInstance(client)) {
client.getParams().setIntParameter(
org.apache.http.params.CoreConnectionPNames.SO_TIMEOUT, readTimeout);
}
}
/**
* Shutdown hook that closes the underlying
* {@link org.apache.http.conn.HttpClientConnectionManager ClientConnectionManager}'s