Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
SSSDNSY
spring-framework
提交
44783546
S
spring-framework
项目概览
SSSDNSY
/
spring-framework
与 Fork 源项目一致
从无法访问的项目Fork
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
S
spring-framework
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
44783546
编写于
7月 04, 2016
作者:
J
Juergen Hoeller
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Remove support for deprecated AbstractHttpClient class
Issue: SPR-14422
上级
09008088
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
2 addition
and
133 deletion
+2
-133
spring-web/src/main/java/org/springframework/http/client/HttpComponentsClientHttpRequestFactory.java
...k/http/client/HttpComponentsClientHttpRequestFactory.java
+0
-51
spring-web/src/main/java/org/springframework/remoting/httpinvoker/HttpComponentsHttpInvokerRequestExecutor.java
...httpinvoker/HttpComponentsHttpInvokerRequestExecutor.java
+0
-51
spring-web/src/test/java/org/springframework/http/client/HttpComponentsClientHttpRequestFactoryTests.java
...p/client/HttpComponentsClientHttpRequestFactoryTests.java
+1
-15
spring-web/src/test/java/org/springframework/remoting/httpinvoker/HttpComponentsHttpInvokerRequestExecutorTests.java
...nvoker/HttpComponentsHttpInvokerRequestExecutorTests.java
+1
-16
未找到文件。
spring-web/src/main/java/org/springframework/http/client/HttpComponentsClientHttpRequestFactory.java
浏览文件 @
44783546
...
...
@@ -59,20 +59,6 @@ import org.springframework.util.ClassUtils;
*/
public
class
HttpComponentsClientHttpRequestFactory
implements
ClientHttpRequestFactory
,
DisposableBean
{
private
static
Class
<?>
abstractHttpClientClass
;
static
{
try
{
// Looking for AbstractHttpClient class (deprecated as of HttpComponents 4.3)
abstractHttpClientClass
=
ClassUtils
.
forName
(
"org.apache.http.impl.client.AbstractHttpClient"
,
HttpComponentsClientHttpRequestFactory
.
class
.
getClassLoader
());
}
catch
(
ClassNotFoundException
ex
)
{
// Probably removed from HttpComponents in the meantime...
}
}
private
HttpClient
httpClient
;
private
RequestConfig
requestConfig
;
...
...
@@ -126,28 +112,6 @@ public class HttpComponentsClientHttpRequestFactory implements ClientHttpRequest
public
void
setConnectTimeout
(
int
timeout
)
{
Assert
.
isTrue
(
timeout
>=
0
,
"Timeout must be a non-negative value"
);
this
.
requestConfig
=
requestConfigBuilder
().
setConnectTimeout
(
timeout
).
build
();
setLegacyConnectionTimeout
(
getHttpClient
(),
timeout
);
}
/**
* Apply the specified connection timeout to deprecated {@link HttpClient}
* implementations.
* <p>As of HttpClient 4.3, default parameters have to be exposed through a
* {@link RequestConfig} instance instead of setting the parameters on the
* client. Unfortunately, this behavior 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 through {@link RequestConfig} with newer clients.
* @param client the client to configure
* @param timeout the custom connection timeout
*/
@SuppressWarnings
(
"deprecation"
)
private
void
setLegacyConnectionTimeout
(
HttpClient
client
,
int
timeout
)
{
if
(
abstractHttpClientClass
!=
null
&&
abstractHttpClientClass
.
isInstance
(
client
))
{
client
.
getParams
().
setIntParameter
(
org
.
apache
.
http
.
params
.
CoreConnectionPNames
.
CONNECTION_TIMEOUT
,
timeout
);
}
}
/**
...
...
@@ -174,21 +138,6 @@ public class HttpComponentsClientHttpRequestFactory implements ClientHttpRequest
public
void
setReadTimeout
(
int
timeout
)
{
Assert
.
isTrue
(
timeout
>=
0
,
"Timeout must be a non-negative value"
);
this
.
requestConfig
=
requestConfigBuilder
().
setSocketTimeout
(
timeout
).
build
();
setLegacySocketTimeout
(
getHttpClient
(),
timeout
);
}
/**
* Apply the specified socket timeout to deprecated {@link HttpClient}
* implementations. See {@link #setLegacyConnectionTimeout}.
* @param client the client to configure
* @param timeout the custom socket timeout
* @see #setLegacyConnectionTimeout
*/
@SuppressWarnings
(
"deprecation"
)
private
void
setLegacySocketTimeout
(
HttpClient
client
,
int
timeout
)
{
if
(
abstractHttpClientClass
!=
null
&&
abstractHttpClientClass
.
isInstance
(
client
))
{
client
.
getParams
().
setIntParameter
(
org
.
apache
.
http
.
params
.
CoreConnectionPNames
.
SO_TIMEOUT
,
timeout
);
}
}
/**
...
...
spring-web/src/main/java/org/springframework/remoting/httpinvoker/HttpComponentsHttpInvokerRequestExecutor.java
浏览文件 @
44783546
...
...
@@ -71,20 +71,6 @@ public class HttpComponentsHttpInvokerRequestExecutor extends AbstractHttpInvoke
private
static
final
int
DEFAULT_READ_TIMEOUT_MILLISECONDS
=
(
60
*
1000
);
private
static
Class
<?>
abstractHttpClientClass
;
static
{
try
{
// Looking for AbstractHttpClient class (deprecated as of HttpComponents 4.3)
abstractHttpClientClass
=
ClassUtils
.
forName
(
"org.apache.http.impl.client.AbstractHttpClient"
,
HttpComponentsHttpInvokerRequestExecutor
.
class
.
getClassLoader
());
}
catch
(
ClassNotFoundException
ex
)
{
// Probably removed from HttpComponents in the meantime...
}
}
private
HttpClient
httpClient
;
private
RequestConfig
requestConfig
;
...
...
@@ -153,28 +139,6 @@ public class HttpComponentsHttpInvokerRequestExecutor extends AbstractHttpInvoke
public
void
setConnectTimeout
(
int
timeout
)
{
Assert
.
isTrue
(
timeout
>=
0
,
"Timeout must be a non-negative value"
);
this
.
requestConfig
=
cloneRequestConfig
().
setConnectTimeout
(
timeout
).
build
();
setLegacyConnectionTimeout
(
getHttpClient
(),
timeout
);
}
/**
* Apply the specified connection timeout to deprecated {@link HttpClient}
* implementations.
* <p>As of HttpClient 4.3, default parameters have to be exposed through a
* {@link RequestConfig} instance instead of setting the parameters on the
* client. Unfortunately, this behavior 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 through {@link RequestConfig} with newer clients.
* @param client the client to configure
* @param timeout the custom connection timeout
*/
@SuppressWarnings
(
"deprecation"
)
private
void
setLegacyConnectionTimeout
(
HttpClient
client
,
int
timeout
)
{
if
(
abstractHttpClientClass
!=
null
&&
abstractHttpClientClass
.
isInstance
(
client
))
{
client
.
getParams
().
setIntParameter
(
org
.
apache
.
http
.
params
.
CoreConnectionPNames
.
CONNECTION_TIMEOUT
,
timeout
);
}
}
/**
...
...
@@ -202,21 +166,6 @@ public class HttpComponentsHttpInvokerRequestExecutor extends AbstractHttpInvoke
public
void
setReadTimeout
(
int
timeout
)
{
Assert
.
isTrue
(
timeout
>=
0
,
"Timeout must be a non-negative value"
);
this
.
requestConfig
=
cloneRequestConfig
().
setSocketTimeout
(
timeout
).
build
();
setLegacySocketTimeout
(
getHttpClient
(),
timeout
);
}
/**
* Apply the specified socket timeout to deprecated {@link HttpClient}
* implementations. See {@link #setLegacyConnectionTimeout}.
* @param client the client to configure
* @param timeout the custom socket timeout
* @see #setLegacyConnectionTimeout
*/
@SuppressWarnings
(
"deprecation"
)
private
void
setLegacySocketTimeout
(
HttpClient
client
,
int
timeout
)
{
if
(
abstractHttpClientClass
!=
null
&&
abstractHttpClientClass
.
isInstance
(
client
))
{
client
.
getParams
().
setIntParameter
(
org
.
apache
.
http
.
params
.
CoreConnectionPNames
.
SO_TIMEOUT
,
timeout
);
}
}
private
RequestConfig
.
Builder
cloneRequestConfig
()
{
...
...
spring-web/src/test/java/org/springframework/http/client/HttpComponentsClientHttpRequestFactoryTests.java
浏览文件 @
44783546
/*
* Copyright 2002-201
5
the original author or authors.
* Copyright 2002-201
6
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.
...
...
@@ -49,20 +49,6 @@ public class HttpComponentsClientHttpRequestFactoryTests extends AbstractHttpReq
assertHttpMethod
(
"patch"
,
HttpMethod
.
PATCH
);
}
@SuppressWarnings
(
"deprecation"
)
@Test
public
void
assertLegacyCustomConfig
()
{
HttpClient
httpClient
=
new
org
.
apache
.
http
.
impl
.
client
.
DefaultHttpClient
();
// Does not support RequestConfig
HttpComponentsClientHttpRequestFactory
hrf
=
new
HttpComponentsClientHttpRequestFactory
(
httpClient
);
hrf
.
setConnectTimeout
(
1234
);
assertEquals
(
1234
,
httpClient
.
getParams
().
getIntParameter
(
org
.
apache
.
http
.
params
.
CoreConnectionPNames
.
CONNECTION_TIMEOUT
,
0
));
hrf
.
setReadTimeout
(
4567
);
assertEquals
(
4567
,
httpClient
.
getParams
().
getIntParameter
(
org
.
apache
.
http
.
params
.
CoreConnectionPNames
.
SO_TIMEOUT
,
0
));
}
@Test
public
void
assertCustomConfig
()
throws
Exception
{
HttpClient
httpClient
=
HttpClientBuilder
.
create
().
build
();
...
...
spring-web/src/test/java/org/springframework/remoting/httpinvoker/HttpComponentsHttpInvokerRequestExecutorTests.java
浏览文件 @
44783546
/*
* Copyright 2002-201
5
the original author or authors.
* Copyright 2002-201
6
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.
...
...
@@ -34,21 +34,6 @@ import static org.mockito.Mockito.*;
*/
public
class
HttpComponentsHttpInvokerRequestExecutorTests
{
@SuppressWarnings
(
"deprecation"
)
@Test
public
void
assertLegacyCustomConfig
()
{
HttpClient
httpClient
=
new
org
.
apache
.
http
.
impl
.
client
.
DefaultHttpClient
();
// Does not support RequestConfig
HttpComponentsHttpInvokerRequestExecutor
executor
=
new
HttpComponentsHttpInvokerRequestExecutor
(
httpClient
);
executor
.
setConnectTimeout
(
1234
);
assertEquals
(
1234
,
httpClient
.
getParams
().
getIntParameter
(
org
.
apache
.
http
.
params
.
CoreConnectionPNames
.
CONNECTION_TIMEOUT
,
0
));
executor
.
setReadTimeout
(
4567
);
assertEquals
(
4567
,
httpClient
.
getParams
().
getIntParameter
(
org
.
apache
.
http
.
params
.
CoreConnectionPNames
.
SO_TIMEOUT
,
0
));
}
@Test
public
void
customizeConnectionTimeout
()
throws
IOException
{
HttpComponentsHttpInvokerRequestExecutor
executor
=
new
HttpComponentsHttpInvokerRequestExecutor
();
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录