Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
爱吃血肠
spring-framework
提交
21baa728
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 搜索 >>
提交
21baa728
编写于
12月 25, 2018
作者:
J
Juergen Hoeller
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Consistent support for EnumSet subclasses in CollectionFactory
Issue: SPR-17619 (cherry picked from commit
31a24720
)
上级
3c7887c2
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
21 addition
and
13 deletion
+21
-13
spring-core/src/main/java/org/springframework/core/CollectionFactory.java
...main/java/org/springframework/core/CollectionFactory.java
+2
-2
spring-core/src/test/java/org/springframework/core/CollectionFactoryTests.java
...java/org/springframework/core/CollectionFactoryTests.java
+19
-11
未找到文件。
spring-core/src/main/java/org/springframework/core/CollectionFactory.java
浏览文件 @
21baa728
/*
* 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.
...
...
@@ -189,7 +189,7 @@ public abstract class CollectionFactory {
throw
new
IllegalArgumentException
(
"Unsupported Collection interface: "
+
collectionType
.
getName
());
}
}
else
if
(
EnumSet
.
class
==
collectionType
)
{
else
if
(
EnumSet
.
class
.
isAssignableFrom
(
collectionType
)
)
{
Assert
.
notNull
(
elementType
,
"Cannot create EnumSet for unknown element type"
);
// Cast is necessary for compilation in Eclipse 4.4.1.
return
(
Collection
<
E
>)
EnumSet
.
noneOf
(
asEnumType
(
elementType
));
...
...
spring-core/src/test/java/org/springframework/core/CollectionFactoryTests.java
浏览文件 @
21baa728
/*
* Copyright 2002-201
4
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.
...
...
@@ -35,10 +35,11 @@ import java.util.TreeMap;
import
java.util.TreeSet
;
import
org.junit.Test
;
import
org.springframework.util.LinkedMultiValueMap
;
import
org.springframework.util.MultiValueMap
;
import
static
org
.
hamcrest
.
Core
Matchers
.*;
import
static
org
.
hamcrest
.
Matchers
.*;
import
static
org
.
junit
.
Assert
.*;
import
static
org
.
springframework
.
core
.
CollectionFactory
.*;
...
...
@@ -103,7 +104,7 @@ public class CollectionFactoryTests {
* {@link CollectionFactory#createApproximateMap(Object, int)}
* is not type-safe.
* <p>The reasoning is similar that described in
* {@link #createApproximateCollectionIsNotTypeSafe
()
}.
* {@link #createApproximateCollectionIsNotTypeSafe
ForEnumSet
}.
*/
@Test
public
void
createApproximateMapIsNotTypeSafeForEnumMap
()
{
...
...
@@ -165,27 +166,27 @@ public class CollectionFactoryTests {
@Test
public
void
createApproximateCollectionFromEmptyHashSet
()
{
Collection
<
String
>
set
=
createApproximateCollection
(
new
HashSet
<
String
>(),
2
);
assertThat
(
set
.
size
(),
is
(
0
));
assertThat
(
set
,
is
(
empty
()
));
}
@Test
public
void
createApproximateCollectionFromNonEmptyHashSet
()
{
HashSet
<
String
>
hashSet
=
new
HashSet
<
String
>();
HashSet
<
String
>
hashSet
=
new
HashSet
<>();
hashSet
.
add
(
"foo"
);
Collection
<
String
>
set
=
createApproximateCollection
(
hashSet
,
2
);
assertThat
(
set
.
size
(),
is
(
0
));
assertThat
(
set
,
is
(
empty
()
));
}
@Test
public
void
createApproximateCollectionFromEmptyEnumSet
()
{
Collection
<
Color
>
colors
=
createApproximateCollection
(
EnumSet
.
noneOf
(
Color
.
class
),
2
);
assertThat
(
colors
.
size
(),
is
(
0
));
assertThat
(
colors
,
is
(
empty
()
));
}
@Test
public
void
createApproximateCollectionFromNonEmptyEnumSet
()
{
Collection
<
Color
>
colors
=
createApproximateCollection
(
EnumSet
.
of
(
Color
.
BLUE
),
2
);
assertThat
(
colors
.
size
(),
is
(
0
));
assertThat
(
colors
,
is
(
empty
()
));
}
@Test
...
...
@@ -196,7 +197,7 @@ public class CollectionFactoryTests {
@Test
public
void
createApproximateMapFromNonEmptyHashMap
()
{
Map
<
String
,
String
>
hashMap
=
new
HashMap
<
String
,
String
>();
Map
<
String
,
String
>
hashMap
=
new
HashMap
<>();
hashMap
.
put
(
"foo"
,
"bar"
);
Map
<
String
,
String
>
map
=
createApproximateMap
(
hashMap
,
2
);
assertThat
(
map
.
size
(),
is
(
0
));
...
...
@@ -210,7 +211,7 @@ public class CollectionFactoryTests {
@Test
public
void
createApproximateMapFromNonEmptyEnumMap
()
{
EnumMap
<
Color
,
String
>
enumMap
=
new
EnumMap
<
Color
,
String
>(
Color
.
class
);
EnumMap
<
Color
,
String
>
enumMap
=
new
EnumMap
<>(
Color
.
class
);
enumMap
.
put
(
Color
.
BLUE
,
"blue"
);
Map
<
Color
,
String
>
colors
=
createApproximateMap
(
enumMap
,
2
);
assertThat
(
colors
.
size
(),
is
(
0
));
...
...
@@ -241,6 +242,12 @@ public class CollectionFactoryTests {
assertThat
(
createCollection
(
EnumSet
.
class
,
Color
.
class
,
0
),
is
(
instanceOf
(
EnumSet
.
class
)));
}
@Test
// SPR-17619
public
void
createsEnumSetSubclass
()
{
EnumSet
<
Color
>
enumSet
=
EnumSet
.
noneOf
(
Color
.
class
);
assertThat
(
createCollection
(
enumSet
.
getClass
(),
Color
.
class
,
0
),
is
(
instanceOf
(
enumSet
.
getClass
())));
}
@Test
(
expected
=
IllegalArgumentException
.
class
)
public
void
rejectsInvalidElementTypeForEnumSet
()
{
createCollection
(
EnumSet
.
class
,
Object
.
class
,
0
);
...
...
@@ -296,7 +303,8 @@ public class CollectionFactoryTests {
}
static
enum
Color
{
enum
Color
{
RED
,
BLUE
;
}
}
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录