Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
爱吃血肠
spring-framework
提交
46e5dd64
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 搜索 >>
提交
46e5dd64
编写于
5月 07, 2019
作者:
J
Juergen Hoeller
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Consistent handling of empty List entries in LinkedMultiValueMap
Closes gh-22912
上级
4aaec942
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
50 addition
and
11 deletion
+50
-11
spring-core/src/main/java/org/springframework/util/LinkedMultiValueMap.java
...in/java/org/springframework/util/LinkedMultiValueMap.java
+7
-3
spring-core/src/test/java/org/springframework/util/LinkedMultiValueMapTests.java
...va/org/springframework/util/LinkedMultiValueMapTests.java
+43
-8
未找到文件。
spring-core/src/main/java/org/springframework/util/LinkedMultiValueMap.java
浏览文件 @
46e5dd64
/*
* Copyright 2002-201
8
the original author or authors.
* Copyright 2002-201
9
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.
...
...
@@ -81,7 +81,7 @@ public class LinkedMultiValueMap<K, V> implements MultiValueMap<K, V>, Serializa
@Nullable
public
V
getFirst
(
K
key
)
{
List
<
V
>
values
=
this
.
targetMap
.
get
(
key
);
return
(
values
!=
null
?
values
.
get
(
0
)
:
null
);
return
(
values
!=
null
&&
!
values
.
isEmpty
()
?
values
.
get
(
0
)
:
null
);
}
@Override
...
...
@@ -118,7 +118,11 @@ public class LinkedMultiValueMap<K, V> implements MultiValueMap<K, V>, Serializa
@Override
public
Map
<
K
,
V
>
toSingleValueMap
()
{
LinkedHashMap
<
K
,
V
>
singleValueMap
=
new
LinkedHashMap
<>(
this
.
targetMap
.
size
());
this
.
targetMap
.
forEach
((
key
,
value
)
->
singleValueMap
.
put
(
key
,
value
.
get
(
0
)));
this
.
targetMap
.
forEach
((
key
,
values
)
->
{
if
(
values
!=
null
&&
!
values
.
isEmpty
())
{
singleValueMap
.
put
(
key
,
values
.
get
(
0
));
}
});
return
singleValueMap
;
}
...
...
spring-core/src/test/java/org/springframework/util/LinkedMultiValueMapTests.java
浏览文件 @
46e5dd64
/*
* Copyright 2002-201
7
the original author or authors.
* Copyright 2002-201
9
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.
...
...
@@ -29,10 +29,11 @@ import static org.junit.Assert.*;
/**
* @author Arjen Poutsma
* @author Juergen Hoeller
*/
public
class
LinkedMultiValueMapTests
{
private
final
LinkedMultiValueMap
<
String
,
String
>
map
=
new
LinkedMultiValueMap
<
String
,
String
>();
private
final
LinkedMultiValueMap
<
String
,
String
>
map
=
new
LinkedMultiValueMap
<>();
@Test
...
...
@@ -47,7 +48,15 @@ public class LinkedMultiValueMapTests {
}
@Test
public
void
addAll
()
throws
Exception
{
public
void
set
()
{
map
.
set
(
"key"
,
"value1"
);
map
.
set
(
"key"
,
"value2"
);
assertEquals
(
1
,
map
.
size
());
assertEquals
(
Collections
.
singletonList
(
"value2"
),
map
.
get
(
"key"
));
}
@Test
public
void
addAll
()
{
map
.
add
(
"key"
,
"value1"
);
map
.
addAll
(
"key"
,
Arrays
.
asList
(
"value2"
,
"value3"
));
assertEquals
(
1
,
map
.
size
());
...
...
@@ -58,6 +67,14 @@ public class LinkedMultiValueMapTests {
assertEquals
(
expected
,
map
.
get
(
"key"
));
}
@Test
public
void
addAllWithEmptyList
()
{
map
.
addAll
(
"key"
,
Collections
.
emptyList
());
assertEquals
(
1
,
map
.
size
());
assertEquals
(
Collections
.
emptyList
(),
map
.
get
(
"key"
));
assertNull
(
map
.
getFirst
(
"key"
));
}
@Test
public
void
getFirst
()
{
List
<
String
>
values
=
new
ArrayList
<>(
2
);
...
...
@@ -69,11 +86,29 @@ public class LinkedMultiValueMapTests {
}
@Test
public
void
set
()
{
map
.
set
(
"key"
,
"value1"
);
map
.
set
(
"key"
,
"value2"
);
assertEquals
(
1
,
map
.
size
());
assertEquals
(
Collections
.
singletonList
(
"value2"
),
map
.
get
(
"key"
));
public
void
getFirstWithEmptyList
()
{
map
.
put
(
"key"
,
Collections
.
emptyList
());
assertNull
(
map
.
getFirst
(
"key"
));
assertNull
(
map
.
getFirst
(
"other"
));
}
@Test
public
void
toSingleValueMap
()
{
List
<
String
>
values
=
new
ArrayList
<>(
2
);
values
.
add
(
"value1"
);
values
.
add
(
"value2"
);
map
.
put
(
"key"
,
values
);
Map
<
String
,
String
>
svm
=
map
.
toSingleValueMap
();
assertEquals
(
1
,
svm
.
size
());
assertEquals
(
"value1"
,
svm
.
get
(
"key"
));
}
@Test
public
void
toSingleValueMapWithEmptyList
()
{
map
.
put
(
"key"
,
Collections
.
emptyList
());
Map
<
String
,
String
>
svm
=
map
.
toSingleValueMap
();
assertEquals
(
0
,
svm
.
size
());
assertNull
(
svm
.
get
(
"key"
));
}
@Test
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录