Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
爱吃血肠
spring-framework
提交
2e1c035d
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 搜索 >>
提交
2e1c035d
编写于
10月 26, 2013
作者:
P
Phillip Webb
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Increased ResolvableType unit test coverage
Issue: SPR-11034
上级
6cfbcf4f
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
52 addition
and
8 deletion
+52
-8
spring-core/src/main/java/org/springframework/core/ResolvableType.java
...rc/main/java/org/springframework/core/ResolvableType.java
+5
-7
spring-core/src/test/java/org/springframework/core/ResolvableTypeTests.java
...st/java/org/springframework/core/ResolvableTypeTests.java
+47
-1
未找到文件。
spring-core/src/main/java/org/springframework/core/ResolvableType.java
浏览文件 @
2e1c035d
...
...
@@ -358,18 +358,16 @@ public final class ResolvableType implements Serializable {
* The result will be {@code true} only in those two scenarios.
*/
public
boolean
hasUnresolvableGenerics
()
{
ResolvableType
[]
generics
=
getGenerics
();
for
(
ResolvableType
generic
:
generics
)
{
if
(
generic
.
resolve
()
==
null
)
{
for
(
Class
<?>
generic
:
resolveGenerics
())
{
if
(
generic
==
null
)
{
return
true
;
}
}
Class
<?>
resolved
=
resolve
();
if
(
resolved
!=
null
)
{
Type
[]
ifcs
=
resolved
.
getGenericInterfaces
();
for
(
Type
ifc
:
ifcs
)
{
if
(
ifc
instanceof
Class
)
{
if
(
forClass
((
Class
)
ifc
).
hasGenerics
())
{
for
(
Type
genericInterface
:
resolved
.
getGenericInterfaces
())
{
if
(
genericInterface
instanceof
Class
)
{
if
(
forClass
((
Class
<?>)
genericInterface
).
hasGenerics
())
{
return
true
;
}
}
...
...
spring-core/src/test/java/org/springframework/core/ResolvableTypeTests.java
浏览文件 @
2e1c035d
...
...
@@ -48,7 +48,6 @@ import org.junit.runner.RunWith;
import
org.mockito.ArgumentCaptor
;
import
org.mockito.Captor
;
import
org.mockito.runners.MockitoJUnitRunner
;
import
org.springframework.core.ResolvableType.VariableResolver
;
import
org.springframework.util.MultiValueMap
;
...
...
@@ -57,6 +56,8 @@ import static org.junit.Assert.*;
import
static
org
.
mockito
.
BDDMockito
.*;
/**
* Tests for {@link ResolvableType}.
*
* @author Phillip Webb
*/
@SuppressWarnings
(
"rawtypes"
)
...
...
@@ -89,6 +90,7 @@ public class ResolvableTypeTests {
assertThat
(
none
.
resolveGeneric
(
0
),
nullValue
());
assertThat
(
none
.
resolveGenerics
().
length
,
equalTo
(
0
));
assertThat
(
none
.
toString
(),
equalTo
(
"?"
));
assertThat
(
none
.
hasUnresolvableGenerics
(),
equalTo
(
false
));
assertThat
(
none
.
isAssignableFrom
(
ResolvableType
.
forClass
(
Object
.
class
)),
equalTo
(
false
));
}
...
...
@@ -1121,6 +1123,42 @@ public class ResolvableTypeTests {
assertThat
(
narrow
.
getGeneric
().
resolve
(),
equalTo
((
Class
)
String
.
class
));
}
@Test
public
void
hasUnresolvableGenerics
()
throws
Exception
{
ResolvableType
type
=
ResolvableType
.
forField
(
Fields
.
class
.
getField
(
"stringList"
));
assertThat
(
type
.
hasUnresolvableGenerics
(),
equalTo
(
false
));
}
@Test
public
void
hasUnresolvableGenericsBasedOnOwnGenerics
()
throws
Exception
{
ResolvableType
type
=
ResolvableType
.
forClass
(
List
.
class
);
assertThat
(
type
.
hasUnresolvableGenerics
(),
equalTo
(
true
));
}
@Test
public
void
hasUnresolvableGenericsWhenSelfNotResolvable
()
throws
Exception
{
ResolvableType
type
=
ResolvableType
.
forClass
(
List
.
class
).
getGeneric
();
assertThat
(
type
.
hasUnresolvableGenerics
(),
equalTo
(
false
));
}
@Test
public
void
hasUnresolvableGenericsWhenImplementesRawInterface
()
throws
Exception
{
ResolvableType
type
=
ResolvableType
.
forClass
(
MySimpleInterfaceTypeWithImplementsRaw
.
class
);
for
(
ResolvableType
generic
:
type
.
getGenerics
())
{
assertThat
(
generic
.
resolve
(),
not
(
nullValue
()));
}
assertThat
(
type
.
hasUnresolvableGenerics
(),
equalTo
(
true
));
}
@Test
public
void
hasUnresolvableGenericsWhenExtends
()
throws
Exception
{
ResolvableType
type
=
ResolvableType
.
forClass
(
ExtendsMySimpleInterfaceTypeWithImplementsRaw
.
class
);
for
(
ResolvableType
generic
:
type
.
getGenerics
())
{
assertThat
(
generic
.
resolve
(),
not
(
nullValue
()));
}
assertThat
(
type
.
hasUnresolvableGenerics
(),
equalTo
(
true
));
}
private
ResolvableType
testSerialization
(
ResolvableType
type
)
throws
Exception
{
ByteArrayOutputStream
bos
=
new
ByteArrayOutputStream
();
...
...
@@ -1332,6 +1370,14 @@ public class ResolvableTypeTests {
}
public
abstract
class
MySimpleInterfaceTypeWithImplementsRaw
implements
MyInterfaceType
<
String
>,
List
{
}
public
abstract
class
ExtendsMySimpleInterfaceTypeWithImplementsRaw
extends
MySimpleInterfaceTypeWithImplementsRaw
{
}
public
class
MyCollectionInterfaceType
implements
MyInterfaceType
<
Collection
<
String
>>
{
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录