Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
爱吃血肠
spring-framework
提交
d96a7b4b
S
spring-framework
项目概览
爱吃血肠
/
spring-framework
通知
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,体验更适合开发者的 AI 搜索 >>
提交
d96a7b4b
编写于
11月 12, 2018
作者:
J
Juergen Hoeller
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
ClientRequest.attribute(name) defensively handles null value
Issue: SPR-17486
上级
b3aad549
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
24 addition
and
18 deletion
+24
-18
spring-webflux/src/main/java/org/springframework/web/reactive/function/client/ClientRequest.java
...framework/web/reactive/function/client/ClientRequest.java
+1
-7
spring-webflux/src/test/java/org/springframework/web/reactive/function/client/DefaultWebClientTests.java
...k/web/reactive/function/client/DefaultWebClientTests.java
+23
-11
未找到文件。
spring-webflux/src/main/java/org/springframework/web/reactive/function/client/ClientRequest.java
浏览文件 @
d96a7b4b
...
...
@@ -86,13 +86,7 @@ public interface ClientRequest {
* @return the attribute value
*/
default
Optional
<
Object
>
attribute
(
String
name
)
{
Map
<
String
,
Object
>
attributes
=
attributes
();
if
(
attributes
.
containsKey
(
name
))
{
return
Optional
.
of
(
attributes
.
get
(
name
));
}
else
{
return
Optional
.
empty
();
}
return
Optional
.
ofNullable
(
attributes
().
get
(
name
));
}
/**
...
...
spring-webflux/src/test/java/org/springframework/web/reactive/function/client/DefaultWebClientTests.java
浏览文件 @
d96a7b4b
...
...
@@ -62,7 +62,6 @@ public class DefaultWebClientTests {
@Test
public
void
basic
()
{
this
.
builder
.
build
().
get
().
uri
(
"/path"
).
exchange
();
ClientRequest
request
=
verifyAndGetRequest
();
...
...
@@ -73,7 +72,6 @@ public class DefaultWebClientTests {
@Test
public
void
uriBuilder
()
{
this
.
builder
.
build
().
get
()
.
uri
(
builder
->
builder
.
path
(
"/path"
).
queryParam
(
"q"
,
"12"
).
build
())
.
exchange
();
...
...
@@ -85,7 +83,6 @@ public class DefaultWebClientTests {
@Test
public
void
uriBuilderWithPathOverride
()
{
this
.
builder
.
build
().
get
()
.
uri
(
builder
->
builder
.
replacePath
(
"/path"
).
build
())
.
exchange
();
...
...
@@ -97,7 +94,6 @@ public class DefaultWebClientTests {
@Test
public
void
requestHeaderAndCookie
()
{
this
.
builder
.
build
().
get
().
uri
(
"/path"
).
accept
(
MediaType
.
APPLICATION_JSON
)
.
cookies
(
cookies
->
cookies
.
add
(
"id"
,
"123"
))
// SPR-16178
.
exchange
();
...
...
@@ -110,7 +106,6 @@ public class DefaultWebClientTests {
@Test
public
void
defaultHeaderAndCookie
()
{
WebClient
client
=
this
.
builder
.
defaultHeader
(
"Accept"
,
"application/json"
).
defaultCookie
(
"id"
,
"123"
)
.
build
();
...
...
@@ -125,7 +120,6 @@ public class DefaultWebClientTests {
@Test
public
void
defaultHeaderAndCookieOverrides
()
{
WebClient
client
=
this
.
builder
.
defaultHeader
(
"Accept"
,
"application/json"
)
.
defaultCookie
(
"id"
,
"123"
)
...
...
@@ -141,7 +135,6 @@ public class DefaultWebClientTests {
@Test
public
void
defaultRequest
()
{
ThreadLocal
<
String
>
context
=
new
NamedThreadLocal
<>(
"foo"
);
Map
<
String
,
Object
>
actual
=
new
HashMap
<>();
...
...
@@ -176,7 +169,6 @@ public class DefaultWebClientTests {
@Test
public
void
mutateDoesCopy
()
{
// First, build the clients
WebClient
.
Builder
builder
=
WebClient
.
builder
()
...
...
@@ -216,8 +208,7 @@ public class DefaultWebClientTests {
}
@Test
public
void
attributes
()
{
public
void
withStringAttribute
()
{
Map
<
String
,
Object
>
actual
=
new
HashMap
<>();
ExchangeFilterFunction
filter
=
(
request
,
next
)
->
{
actual
.
putAll
(
request
.
attributes
());
...
...
@@ -230,11 +221,32 @@ public class DefaultWebClientTests {
.
exchange
();
assertEquals
(
"bar"
,
actual
.
get
(
"foo"
));
ClientRequest
request
=
verifyAndGetRequest
();
assertEquals
(
"bar"
,
request
.
attribute
(
"foo"
).
get
());
}
@Test
public
void
apply
()
{
public
void
withNullAttribute
()
{
Map
<
String
,
Object
>
actual
=
new
HashMap
<>();
ExchangeFilterFunction
filter
=
(
request
,
next
)
->
{
actual
.
putAll
(
request
.
attributes
());
return
next
.
exchange
(
request
);
};
this
.
builder
.
filter
(
filter
).
build
()
.
get
().
uri
(
"/path"
)
.
attribute
(
"foo"
,
null
)
.
exchange
();
assertNull
(
actual
.
get
(
"foo"
));
ClientRequest
request
=
verifyAndGetRequest
();
assertFalse
(
request
.
attribute
(
"foo"
).
isPresent
());
}
@Test
public
void
apply
()
{
WebClient
client
=
this
.
builder
.
apply
(
builder
->
builder
.
defaultHeader
(
"Accept"
,
"application/json"
)
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录