Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
爱吃血肠
spring-framework
提交
a8623dbb
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 搜索 >>
提交
a8623dbb
编写于
7月 30, 2019
作者:
J
Juergen Hoeller
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
MethodParameter.equals checks nesting level and containing class
Closes gh-23352
上级
4f010423
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
56 addition
and
4 deletion
+56
-4
spring-core/src/main/java/org/springframework/core/MethodParameter.java
...c/main/java/org/springframework/core/MethodParameter.java
+8
-3
spring-core/src/test/java/org/springframework/core/MethodParameterTests.java
...t/java/org/springframework/core/MethodParameterTests.java
+48
-1
未找到文件。
spring-core/src/main/java/org/springframework/core/MethodParameter.java
浏览文件 @
a8623dbb
/*
* Copyright 2002-201
8
the original author or authors.
* Copyright 2002-201
9
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.
...
...
@@ -29,6 +29,7 @@ import java.util.Map;
import
org.springframework.util.Assert
;
import
org.springframework.util.ClassUtils
;
import
org.springframework.util.ObjectUtils
;
/**
* Helper class that encapsulates the specification of a method parameter, i.e. a {@link Method}
...
...
@@ -71,7 +72,7 @@ public class MethodParameter {
private
final
int
parameterIndex
;
private
int
nestingLevel
=
1
;
private
int
nestingLevel
;
/** Map from Integer level to Integer type index */
Map
<
Integer
,
Integer
>
typeIndexesPerLevel
;
...
...
@@ -612,7 +613,11 @@ public class MethodParameter {
return
false
;
}
MethodParameter
otherParam
=
(
MethodParameter
)
other
;
return
(
this
.
parameterIndex
==
otherParam
.
parameterIndex
&&
getMember
().
equals
(
otherParam
.
getMember
()));
return
(
this
.
containingClass
==
otherParam
.
containingClass
&&
ObjectUtils
.
nullSafeEquals
(
this
.
typeIndexesPerLevel
,
otherParam
.
typeIndexesPerLevel
)
&&
this
.
nestingLevel
==
otherParam
.
nestingLevel
&&
this
.
parameterIndex
==
otherParam
.
parameterIndex
&&
getMember
().
equals
(
otherParam
.
getMember
()));
}
@Override
...
...
spring-core/src/test/java/org/springframework/core/MethodParameterTests.java
浏览文件 @
a8623dbb
/*
* Copyright 2002-201
8
the original author or authors.
* Copyright 2002-201
9
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.
...
...
@@ -22,6 +22,7 @@ import java.lang.annotation.RetentionPolicy;
import
java.lang.annotation.Target
;
import
java.lang.reflect.Constructor
;
import
java.lang.reflect.Method
;
import
java.util.ArrayList
;
import
java.util.concurrent.Callable
;
import
org.junit.Before
;
...
...
@@ -130,6 +131,44 @@ public class MethodParameterTests {
methodParameter
.
getGenericParameterType
());
}
@Test
public
void
multipleResolveParameterTypeCalls
()
throws
Exception
{
Method
method
=
ArrayList
.
class
.
getMethod
(
"get"
,
int
.
class
);
MethodParameter
methodParameter
=
MethodParameter
.
forMethodOrConstructor
(
method
,
-
1
);
assertEquals
(
Object
.
class
,
methodParameter
.
getParameterType
());
GenericTypeResolver
.
resolveParameterType
(
methodParameter
,
StringList
.
class
);
assertEquals
(
String
.
class
,
methodParameter
.
getParameterType
());
GenericTypeResolver
.
resolveParameterType
(
methodParameter
,
IntegerList
.
class
);
assertEquals
(
Integer
.
class
,
methodParameter
.
getParameterType
());
}
@Test
public
void
equalsAndHashCodeConsidersContainingClass
()
throws
Exception
{
Method
method
=
ArrayList
.
class
.
getMethod
(
"get"
,
int
.
class
);
MethodParameter
m1
=
MethodParameter
.
forMethodOrConstructor
(
method
,
-
1
);
MethodParameter
m2
=
MethodParameter
.
forMethodOrConstructor
(
method
,
-
1
);
MethodParameter
m3
=
MethodParameter
.
forMethodOrConstructor
(
method
,
-
1
).
nested
();
assertEquals
(
m1
,
m2
);
assertNotEquals
(
m1
,
m3
);
assertEquals
(
m1
.
hashCode
(),
m2
.
hashCode
());
}
@Test
public
void
equalsAndHashCodeConsidersNesting
()
throws
Exception
{
Method
method
=
ArrayList
.
class
.
getMethod
(
"get"
,
int
.
class
);
MethodParameter
m1
=
MethodParameter
.
forMethodOrConstructor
(
method
,
-
1
);
GenericTypeResolver
.
resolveParameterType
(
m1
,
StringList
.
class
);
MethodParameter
m2
=
MethodParameter
.
forMethodOrConstructor
(
method
,
-
1
);
GenericTypeResolver
.
resolveParameterType
(
m2
,
StringList
.
class
);
MethodParameter
m3
=
MethodParameter
.
forMethodOrConstructor
(
method
,
-
1
);
GenericTypeResolver
.
resolveParameterType
(
m3
,
IntegerList
.
class
);
MethodParameter
m4
=
MethodParameter
.
forMethodOrConstructor
(
method
,
-
1
);
assertEquals
(
m1
,
m2
);
assertNotEquals
(
m1
,
m3
);
assertNotEquals
(
m1
,
m4
);
assertEquals
(
m1
.
hashCode
(),
m2
.
hashCode
());
}
public
int
method
(
String
p1
,
long
p2
)
{
return
42
;
...
...
@@ -154,4 +193,12 @@ public class MethodParameterTests {
private
@interface
Param
{
}
@SuppressWarnings
(
"serial"
)
private
static
class
StringList
extends
ArrayList
<
String
>
{
}
@SuppressWarnings
(
"serial"
)
private
static
class
IntegerList
extends
ArrayList
<
Integer
>
{
}
}
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录