Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
sesemomo
spring-framework
提交
f8c2d7ab
S
spring-framework
项目概览
sesemomo
/
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,发现更多精彩内容 >>
提交
f8c2d7ab
编写于
5月 01, 2018
作者:
J
Juergen Hoeller
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Nullable HttpMethod parameter only on internal doExecute delegate
Issue: SPR-15540
上级
21fad8e2
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
6 addition
and
15 deletion
+6
-15
spring-web/src/main/java/org/springframework/web/client/RestTemplate.java
...ain/java/org/springframework/web/client/RestTemplate.java
+6
-15
未找到文件。
spring-web/src/main/java/org/springframework/web/client/RestTemplate.java
浏览文件 @
f8c2d7ab
...
...
@@ -655,23 +655,19 @@ public class RestTemplate extends InterceptingHttpAccessor implements RestOperat
public
<
T
>
ResponseEntity
<
T
>
exchange
(
RequestEntity
<?>
requestEntity
,
Class
<
T
>
responseType
)
throws
RestClientException
{
Assert
.
notNull
(
requestEntity
,
"RequestEntity must not be null"
);
RequestCallback
requestCallback
=
httpEntityCallback
(
requestEntity
,
responseType
);
ResponseExtractor
<
ResponseEntity
<
T
>>
responseExtractor
=
responseEntityExtractor
(
responseType
);
return
nonNull
(
e
xecute
(
requestEntity
.
getUrl
(),
requestEntity
.
getMethod
(),
requestCallback
,
responseExtractor
));
return
nonNull
(
doE
xecute
(
requestEntity
.
getUrl
(),
requestEntity
.
getMethod
(),
requestCallback
,
responseExtractor
));
}
@Override
public
<
T
>
ResponseEntity
<
T
>
exchange
(
RequestEntity
<?>
requestEntity
,
ParameterizedTypeReference
<
T
>
responseType
)
throws
RestClientException
{
Assert
.
notNull
(
requestEntity
,
"RequestEntity must not be null"
);
Type
type
=
responseType
.
getType
();
RequestCallback
requestCallback
=
httpEntityCallback
(
requestEntity
,
type
);
ResponseExtractor
<
ResponseEntity
<
T
>>
responseExtractor
=
responseEntityExtractor
(
type
);
return
nonNull
(
e
xecute
(
requestEntity
.
getUrl
(),
requestEntity
.
getMethod
(),
requestCallback
,
responseExtractor
));
return
nonNull
(
doE
xecute
(
requestEntity
.
getUrl
(),
requestEntity
.
getMethod
(),
requestCallback
,
responseExtractor
));
}
...
...
@@ -698,7 +694,7 @@ public class RestTemplate extends InterceptingHttpAccessor implements RestOperat
@Override
@Nullable
public
<
T
>
T
execute
(
URI
url
,
@Nullable
HttpMethod
method
,
@Nullable
RequestCallback
requestCallback
,
public
<
T
>
T
execute
(
URI
url
,
HttpMethod
method
,
@Nullable
RequestCallback
requestCallback
,
@Nullable
ResponseExtractor
<
T
>
responseExtractor
)
throws
RestClientException
{
return
doExecute
(
url
,
method
,
requestCallback
,
responseExtractor
);
...
...
@@ -718,8 +714,8 @@ public class RestTemplate extends InterceptingHttpAccessor implements RestOperat
protected
<
T
>
T
doExecute
(
URI
url
,
@Nullable
HttpMethod
method
,
@Nullable
RequestCallback
requestCallback
,
@Nullable
ResponseExtractor
<
T
>
responseExtractor
)
throws
RestClientException
{
Assert
.
notNull
(
url
,
"
'url' must not be null
"
);
Assert
.
notNull
(
method
,
"
'method' must not be null
"
);
Assert
.
notNull
(
url
,
"
URI is required
"
);
Assert
.
notNull
(
method
,
"
HttpMethod is required
"
);
ClientHttpResponse
response
=
null
;
try
{
ClientHttpRequest
request
=
createRequest
(
url
,
method
);
...
...
@@ -728,12 +724,7 @@ public class RestTemplate extends InterceptingHttpAccessor implements RestOperat
}
response
=
request
.
execute
();
handleResponse
(
url
,
method
,
response
);
if
(
responseExtractor
!=
null
)
{
return
responseExtractor
.
extractData
(
response
);
}
else
{
return
null
;
}
return
(
responseExtractor
!=
null
?
responseExtractor
.
extractData
(
response
)
:
null
);
}
catch
(
IOException
ex
)
{
String
resource
=
url
.
toString
();
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录