Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
爱吃血肠
spring-framework
提交
e8562bb3
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 搜索 >>
提交
e8562bb3
编写于
7月 25, 2016
作者:
J
Juergen Hoeller
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
LinkedCaseInsensitiveMap properly overrides HashMap.clone()
Issue: SPR-14509 (cherry picked from commit
dadd2c37
)
上级
a4b54251
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
45 addition
and
18 deletion
+45
-18
spring-core/src/main/java/org/springframework/util/LinkedCaseInsensitiveMap.java
...va/org/springframework/util/LinkedCaseInsensitiveMap.java
+21
-11
spring-core/src/test/java/org/springframework/util/LinkedCaseInsensitiveMapTests.java
...g/springframework/util/LinkedCaseInsensitiveMapTests.java
+24
-7
未找到文件。
spring-core/src/main/java/org/springframework/util/LinkedCaseInsensitiveMap.java
浏览文件 @
e8562bb3
/*
* Copyright 2002-201
2
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.
...
...
@@ -36,7 +36,7 @@ import java.util.Map;
@SuppressWarnings
(
"serial"
)
public
class
LinkedCaseInsensitiveMap
<
V
>
extends
LinkedHashMap
<
String
,
V
>
{
private
final
Map
<
String
,
String
>
caseInsensitiveKeys
;
private
Map
<
String
,
String
>
caseInsensitiveKeys
;
private
final
Locale
locale
;
...
...
@@ -114,21 +114,23 @@ public class LinkedCaseInsensitiveMap<V> extends LinkedHashMap<String, V> {
@Override
public
V
get
(
Object
key
)
{
if
(
key
instanceof
String
)
{
return
super
.
get
(
this
.
caseInsensitiveKeys
.
get
(
convertKey
((
String
)
key
)
));
}
else
{
return
null
;
String
caseInsensitiveKey
=
this
.
caseInsensitiveKeys
.
get
(
convertKey
((
String
)
key
));
if
(
caseInsensitiveKey
!=
null
)
{
return
super
.
get
(
caseInsensitiveKey
);
}
}
return
null
;
}
@Override
public
V
remove
(
Object
key
)
{
if
(
key
instanceof
String
)
{
return
super
.
remove
(
this
.
caseInsensitiveKeys
.
remove
(
convertKey
((
String
)
key
)
));
}
else
{
return
null
;
if
(
key
instanceof
String
)
{
String
caseInsensitiveKey
=
this
.
caseInsensitiveKeys
.
remove
(
convertKey
((
String
)
key
));
if
(
caseInsensitiveKey
!=
null
)
{
return
super
.
remove
(
caseInsensitiveKey
);
}
}
return
null
;
}
@Override
...
...
@@ -137,6 +139,14 @@ public class LinkedCaseInsensitiveMap<V> extends LinkedHashMap<String, V> {
super
.
clear
();
}
@Override
@SuppressWarnings
(
"unchecked"
)
public
Object
clone
()
{
LinkedCaseInsensitiveMap
<
V
>
copy
=
(
LinkedCaseInsensitiveMap
<
V
>)
super
.
clone
();
copy
.
caseInsensitiveKeys
=
new
HashMap
<
String
,
String
>(
this
.
caseInsensitiveKeys
);
return
copy
;
}
/**
* Convert the given key to a case-insensitive key.
...
...
spring-core/src/test/java/org/springframework/util/LinkedCaseInsensitiveMapTests.java
浏览文件 @
e8562bb3
/*
* Copyright 2002-201
2
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.
...
...
@@ -16,7 +16,6 @@
package
org.springframework.util
;
import
org.junit.Before
;
import
org.junit.Test
;
import
static
org
.
junit
.
Assert
.*;
...
...
@@ -26,12 +25,8 @@ import static org.junit.Assert.*;
*/
public
class
LinkedCaseInsensitiveMapTests
{
private
LinkedCaseInsensitiveMap
<
String
>
map
;
private
final
LinkedCaseInsensitiveMap
<
String
>
map
=
new
LinkedCaseInsensitiveMap
<
String
>()
;
@Before
public
void
setUp
()
{
map
=
new
LinkedCaseInsensitiveMap
<
String
>();
}
@Test
public
void
putAndGet
()
{
...
...
@@ -55,4 +50,26 @@ public class LinkedCaseInsensitiveMapTests {
assertEquals
(
"value3"
,
map
.
get
(
"Key"
));
}
@Test
@SuppressWarnings
(
"unchecked"
)
public
void
mapClone
()
{
map
.
put
(
"key"
,
"value1"
);
LinkedCaseInsensitiveMap
<
String
>
copy
=
(
LinkedCaseInsensitiveMap
<
String
>)
map
.
clone
();
assertEquals
(
"value1"
,
map
.
get
(
"key"
));
assertEquals
(
"value1"
,
map
.
get
(
"KEY"
));
assertEquals
(
"value1"
,
map
.
get
(
"Key"
));
assertEquals
(
"value1"
,
copy
.
get
(
"key"
));
assertEquals
(
"value1"
,
copy
.
get
(
"KEY"
));
assertEquals
(
"value1"
,
copy
.
get
(
"Key"
));
copy
.
put
(
"Key"
,
"value2"
);
assertEquals
(
1
,
map
.
size
());
assertEquals
(
1
,
copy
.
size
());
assertEquals
(
"value1"
,
map
.
get
(
"key"
));
assertEquals
(
"value1"
,
map
.
get
(
"KEY"
));
assertEquals
(
"value1"
,
map
.
get
(
"Key"
));
assertEquals
(
"value2"
,
copy
.
get
(
"key"
));
assertEquals
(
"value2"
,
copy
.
get
(
"KEY"
));
assertEquals
(
"value2"
,
copy
.
get
(
"Key"
));
}
}
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录