Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
爱吃血肠
spring-framework
提交
b790bd1f
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,发现更多精彩内容 >>
提交
b790bd1f
编写于
6月 11, 2018
作者:
J
Juergen Hoeller
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
LinkedCaseInsensitiveMap explicitly implements put/computeIfAbsent
Issue: SPR-16926
上级
646d7f9e
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
45 addition
and
20 deletion
+45
-20
spring-core/src/main/java/org/springframework/util/LinkedCaseInsensitiveMap.java
...va/org/springframework/util/LinkedCaseInsensitiveMap.java
+28
-3
spring-core/src/test/java/org/springframework/util/LinkedCaseInsensitiveMapTests.java
...g/springframework/util/LinkedCaseInsensitiveMapTests.java
+17
-17
未找到文件。
spring-core/src/main/java/org/springframework/util/LinkedCaseInsensitiveMap.java
浏览文件 @
b790bd1f
/*
* Copyright 2002-201
7
the original author or authors.
* Copyright 2002-201
8
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.
...
...
@@ -23,6 +23,7 @@ import java.util.LinkedHashMap;
import
java.util.Locale
;
import
java.util.Map
;
import
java.util.Set
;
import
java.util.function.Function
;
import
org.springframework.lang.Nullable
;
...
...
@@ -151,6 +152,7 @@ public class LinkedCaseInsensitiveMap<V> implements Map<String, V>, Serializable
}
@Override
@Nullable
public
V
getOrDefault
(
Object
key
,
V
defaultValue
)
{
if
(
key
instanceof
String
)
{
String
caseInsensitiveKey
=
this
.
caseInsensitiveKeys
.
get
(
convertKey
((
String
)
key
));
...
...
@@ -162,12 +164,15 @@ public class LinkedCaseInsensitiveMap<V> implements Map<String, V>, Serializable
}
@Override
@Nullable
public
V
put
(
String
key
,
@Nullable
V
value
)
{
String
oldKey
=
this
.
caseInsensitiveKeys
.
put
(
convertKey
(
key
),
key
);
V
oldKeyValue
=
null
;
if
(
oldKey
!=
null
&&
!
oldKey
.
equals
(
key
))
{
this
.
targetMap
.
remove
(
oldKey
);
oldKeyValue
=
this
.
targetMap
.
remove
(
oldKey
);
}
return
this
.
targetMap
.
put
(
key
,
value
);
V
oldValue
=
this
.
targetMap
.
put
(
key
,
value
);
return
(
oldKeyValue
!=
null
?
oldKeyValue
:
oldValue
);
}
@Override
...
...
@@ -178,6 +183,26 @@ public class LinkedCaseInsensitiveMap<V> implements Map<String, V>, Serializable
map
.
forEach
(
this
::
put
);
}
@Override
@Nullable
public
V
putIfAbsent
(
String
key
,
@Nullable
V
value
)
{
String
oldKey
=
this
.
caseInsensitiveKeys
.
putIfAbsent
(
convertKey
(
key
),
key
);
if
(
oldKey
!=
null
)
{
return
this
.
targetMap
.
get
(
oldKey
);
}
return
this
.
targetMap
.
putIfAbsent
(
key
,
value
);
}
@Override
@Nullable
public
V
computeIfAbsent
(
String
key
,
Function
<?
super
String
,
?
extends
V
>
mappingFunction
)
{
String
oldKey
=
this
.
caseInsensitiveKeys
.
putIfAbsent
(
convertKey
(
key
),
key
);
if
(
oldKey
!=
null
)
{
return
this
.
targetMap
.
get
(
oldKey
);
}
return
this
.
targetMap
.
computeIfAbsent
(
key
,
mappingFunction
);
}
@Override
@Nullable
public
V
remove
(
Object
key
)
{
...
...
spring-core/src/test/java/org/springframework/util/LinkedCaseInsensitiveMapTests.java
浏览文件 @
b790bd1f
/*
* Copyright 2002-201
7
the original author or authors.
* Copyright 2002-201
8
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.
...
...
@@ -30,9 +30,9 @@ public class LinkedCaseInsensitiveMapTests {
@Test
public
void
putAndGet
()
{
map
.
put
(
"key"
,
"value1"
);
map
.
put
(
"key"
,
"value2"
);
map
.
put
(
"key"
,
"value3"
);
assertNull
(
map
.
put
(
"key"
,
"value1"
)
);
assertEquals
(
"value1"
,
map
.
put
(
"key"
,
"value2"
)
);
assertEquals
(
"value2"
,
map
.
put
(
"key"
,
"value3"
)
);
assertEquals
(
1
,
map
.
size
());
assertEquals
(
"value3"
,
map
.
get
(
"key"
));
assertEquals
(
"value3"
,
map
.
get
(
"KEY"
));
...
...
@@ -47,9 +47,9 @@ public class LinkedCaseInsensitiveMapTests {
@Test
public
void
putWithOverlappingKeys
()
{
map
.
put
(
"key"
,
"value1"
);
map
.
put
(
"KEY"
,
"value2"
);
map
.
put
(
"Key"
,
"value3"
);
assertNull
(
map
.
put
(
"key"
,
"value1"
)
);
assertEquals
(
"value1"
,
map
.
put
(
"KEY"
,
"value2"
)
);
assertEquals
(
"value2"
,
map
.
put
(
"Key"
,
"value3"
)
);
assertEquals
(
1
,
map
.
size
());
assertEquals
(
"value3"
,
map
.
get
(
"key"
));
assertEquals
(
"value3"
,
map
.
get
(
"KEY"
));
...
...
@@ -64,9 +64,9 @@ public class LinkedCaseInsensitiveMapTests {
@Test
public
void
getOrDefault
()
{
map
.
put
(
"key"
,
"value1"
);
map
.
put
(
"KEY"
,
"value2"
);
map
.
put
(
"Key"
,
"value3"
);
assertNull
(
map
.
put
(
"key"
,
"value1"
)
);
assertEquals
(
"value1"
,
map
.
put
(
"KEY"
,
"value2"
)
);
assertEquals
(
"value2"
,
map
.
put
(
"Key"
,
"value3"
)
);
assertEquals
(
"value3"
,
map
.
getOrDefault
(
"key"
,
"N"
));
assertEquals
(
"value3"
,
map
.
getOrDefault
(
"KEY"
,
"N"
));
assertEquals
(
"value3"
,
map
.
getOrDefault
(
"Key"
,
"N"
));
...
...
@@ -76,9 +76,9 @@ public class LinkedCaseInsensitiveMapTests {
@Test
public
void
getOrDefaultWithNullValue
()
{
map
.
put
(
"key"
,
null
);
map
.
put
(
"KEY"
,
null
);
map
.
put
(
"Key"
,
null
);
assertNull
(
map
.
put
(
"key"
,
null
)
);
assertNull
(
map
.
put
(
"KEY"
,
null
)
);
assertNull
(
map
.
put
(
"Key"
,
null
)
);
assertNull
(
map
.
getOrDefault
(
"key"
,
"N"
));
assertNull
(
map
.
getOrDefault
(
"KEY"
,
"N"
));
assertNull
(
map
.
getOrDefault
(
"Key"
,
"N"
));
...
...
@@ -88,9 +88,9 @@ public class LinkedCaseInsensitiveMapTests {
@Test
public
void
computeIfAbsentWithExistingValue
()
{
map
.
put
(
"key"
,
"value1"
);
map
.
put
(
"KEY"
,
"value2"
);
map
.
put
(
"Key"
,
"value3"
);
assertNull
(
map
.
putIfAbsent
(
"key"
,
"value1"
)
);
assertEquals
(
"value1"
,
map
.
putIfAbsent
(
"KEY"
,
"value2"
)
);
assertEquals
(
"value1"
,
map
.
put
(
"Key"
,
"value3"
)
);
assertEquals
(
"value3"
,
map
.
computeIfAbsent
(
"key"
,
key
->
"value1"
));
assertEquals
(
"value3"
,
map
.
computeIfAbsent
(
"KEY"
,
key
->
"value2"
));
assertEquals
(
"value3"
,
map
.
computeIfAbsent
(
"Key"
,
key
->
"value3"
));
...
...
@@ -105,7 +105,7 @@ public class LinkedCaseInsensitiveMapTests {
@Test
public
void
mapClone
()
{
map
.
put
(
"key"
,
"value1"
);
assertNull
(
map
.
put
(
"key"
,
"value1"
)
);
LinkedCaseInsensitiveMap
<
String
>
copy
=
map
.
clone
();
assertEquals
(
map
.
getLocale
(),
copy
.
getLocale
());
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录