Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
爱吃血肠
spring-framework
提交
1a30252f
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 搜索 >>
提交
1a30252f
编写于
8月 31, 2016
作者:
J
Juergen Hoeller
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
ResolvableType.java.forRawClass(Class) supports isAssignableFrom(ResolvableType) as well
Issue: SPR-14648
上级
e08b1b75
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
25 addition
and
9 deletion
+25
-9
spring-core/src/main/java/org/springframework/core/ResolvableType.java
...rc/main/java/org/springframework/core/ResolvableType.java
+7
-2
spring-core/src/test/java/org/springframework/core/ResolvableTypeTests.java
...st/java/org/springframework/core/ResolvableTypeTests.java
+18
-7
未找到文件。
spring-core/src/main/java/org/springframework/core/ResolvableType.java
浏览文件 @
1a30252f
...
...
@@ -276,7 +276,7 @@ public class ResolvableType implements Serializable {
WildcardBounds
ourBounds
=
WildcardBounds
.
get
(
this
);
WildcardBounds
typeBounds
=
WildcardBounds
.
get
(
other
);
// In the f
ro
m X is assignable to <? extends Number>
// In the f
or
m X is assignable to <? extends Number>
if
(
typeBounds
!=
null
)
{
return
(
ourBounds
!=
null
&&
ourBounds
.
isSameKind
(
typeBounds
)
&&
ourBounds
.
isAssignableFrom
(
typeBounds
.
getBounds
()));
...
...
@@ -937,7 +937,7 @@ public class ResolvableType implements Serializable {
* Return a {@link ResolvableType} for the specified {@link Class}, doing
* assignability checks against the raw class only (analogous to
* {@link Class#isAssignableFrom}, which this serves as a wrapper for.
* For example: {@code ResolvableType.for
Class(MyArray
List.class)}.
* For example: {@code ResolvableType.for
RawClass(
List.class)}.
* @param sourceClass the source class ({@code null} is semantically
* equivalent to {@code Object.class} for typical use cases here}
* @return a {@link ResolvableType} for the specified class
...
...
@@ -951,6 +951,11 @@ public class ResolvableType implements Serializable {
public
boolean
isAssignableFrom
(
Class
<?>
other
)
{
return
ClassUtils
.
isAssignable
(
getRawClass
(),
other
);
}
@Override
public
boolean
isAssignableFrom
(
ResolvableType
other
)
{
Class
<?>
otherClass
=
other
.
getRawClass
();
return
(
otherClass
!=
null
&&
ClassUtils
.
isAssignable
(
getRawClass
(),
otherClass
));
}
};
}
...
...
spring-core/src/test/java/org/springframework/core/ResolvableTypeTests.java
浏览文件 @
1a30252f
...
...
@@ -37,6 +37,7 @@ import java.util.Collections;
import
java.util.HashMap
;
import
java.util.List
;
import
java.util.Map
;
import
java.util.Set
;
import
java.util.SortedSet
;
import
java.util.TreeSet
;
import
java.util.concurrent.Callable
;
...
...
@@ -1084,7 +1085,6 @@ public class ResolvableTypeTests {
@Test
public
void
isAssignableFromForWildcards
()
throws
Exception
{
ResolvableType
object
=
ResolvableType
.
forClass
(
Object
.
class
);
ResolvableType
charSequence
=
ResolvableType
.
forClass
(
CharSequence
.
class
);
ResolvableType
string
=
ResolvableType
.
forClass
(
String
.
class
);
...
...
@@ -1287,6 +1287,15 @@ public class ResolvableTypeTests {
assertThat
(((
ParameterizedType
)
type
).
getActualTypeArguments
()[
0
],
is
(
equalTo
(
String
.
class
)));
}
@Test
public
void
testSpr14648
()
throws
Exception
{
ResolvableType
collectionClass
=
ResolvableType
.
forRawClass
(
Collection
.
class
);
ResolvableType
setClass
=
ResolvableType
.
forRawClass
(
Set
.
class
);
ResolvableType
fromReturnType
=
ResolvableType
.
forMethodReturnType
(
Methods
.
class
.
getMethod
(
"wildcardSet"
));
assertTrue
(
collectionClass
.
isAssignableFrom
(
fromReturnType
));
assertTrue
(
setClass
.
isAssignableFrom
(
fromReturnType
));
}
private
ResolvableType
testSerialization
(
ResolvableType
type
)
throws
Exception
{
ByteArrayOutputStream
bos
=
new
ByteArrayOutputStream
();
...
...
@@ -1385,7 +1394,7 @@ public class ResolvableTypeTests {
}
static
interface
Methods
<
T
>
{
interface
Methods
<
T
>
{
List
<
CharSequence
>
charSequenceReturn
();
...
...
@@ -1398,6 +1407,8 @@ public class ResolvableTypeTests {
void
typedParameter
(
T
p
);
T
typedReturn
();
Set
<?>
wildcardSet
();
}
...
...
@@ -1453,7 +1464,7 @@ public class ResolvableTypeTests {
}
static
interface
TypedMethods
extends
Methods
<
String
>
{
interface
TypedMethods
extends
Methods
<
String
>
{
}
...
...
@@ -1526,19 +1537,19 @@ public class ResolvableTypeTests {
}
static
interface
Wildcard
<
T
extends
Number
>
extends
List
<
T
>
{
interface
Wildcard
<
T
extends
Number
>
extends
List
<
T
>
{
}
static
interface
RawExtendsWildcard
extends
Wildcard
{
interface
RawExtendsWildcard
extends
Wildcard
{
}
static
interface
VariableNameSwitch
<
V
,
K
>
extends
MultiValueMap
<
K
,
V
>
{
interface
VariableNameSwitch
<
V
,
K
>
extends
MultiValueMap
<
K
,
V
>
{
}
static
interface
ListOfGenericArray
extends
List
<
List
<
String
>[]>
{
interface
ListOfGenericArray
extends
List
<
List
<
String
>[]>
{
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录