Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
爱吃血肠
spring-framework
提交
34767b14
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 搜索 >>
提交
34767b14
编写于
8月 06, 2019
作者:
S
Sam Brannen
浏览文件
操作
浏览文件
下载
差异文件
Merge branch '5.1.x'
上级
23cd261b
30ebc3b8
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
11 addition
and
23 deletion
+11
-23
spring-core/src/main/java/org/springframework/core/annotation/AnnotationAttributes.java
...springframework/core/annotation/AnnotationAttributes.java
+2
-22
spring-core/src/test/java/org/springframework/core/annotation/AnnotationAttributesTests.java
...gframework/core/annotation/AnnotationAttributesTests.java
+9
-1
未找到文件。
spring-core/src/main/java/org/springframework/core/annotation/AnnotationAttributes.java
浏览文件 @
34767b14
...
...
@@ -369,10 +369,10 @@ public class AnnotationAttributes extends LinkedHashMap<String, Object> {
}
private
void
assertNotException
(
String
attributeName
,
Object
attributeValue
)
{
if
(
attributeValue
instanceof
Exception
)
{
if
(
attributeValue
instanceof
Throwable
)
{
throw
new
IllegalArgumentException
(
String
.
format
(
"Attribute '%s' for annotation [%s] was not resolvable due to exception [%s]"
,
attributeName
,
this
.
displayName
,
attributeValue
),
(
Exception
)
attributeValue
);
attributeName
,
this
.
displayName
,
attributeValue
),
(
Throwable
)
attributeValue
);
}
}
...
...
@@ -385,26 +385,6 @@ public class AnnotationAttributes extends LinkedHashMap<String, Object> {
}
}
/**
* Store the supplied {@code value} in this map under the specified
* {@code key}, unless a value is already stored under the key.
* @param key the key under which to store the value
* @param value the value to store
* @return the current value stored in this map, or {@code null} if no
* value was previously stored in this map
* @see #get
* @see #put
* @since 4.2
*/
@Override
public
Object
putIfAbsent
(
String
key
,
Object
value
)
{
Object
obj
=
get
(
key
);
if
(
obj
==
null
)
{
obj
=
put
(
key
,
value
);
}
return
obj
;
}
@Override
public
String
toString
()
{
Iterator
<
Map
.
Entry
<
String
,
Object
>>
entries
=
entrySet
().
iterator
();
...
...
spring-core/src/test/java/org/springframework/core/annotation/AnnotationAttributesTests.java
浏览文件 @
34767b14
...
...
@@ -72,13 +72,21 @@ public class AnnotationAttributesTests {
}
@Test
public
void
unresolvableClass
()
throws
Exception
{
public
void
unresolvableClass
WithClassNotFoundException
()
throws
Exception
{
attributes
.
put
(
"unresolvableClass"
,
new
ClassNotFoundException
(
"myclass"
));
assertThatIllegalArgumentException
().
isThrownBy
(()
->
attributes
.
getClass
(
"unresolvableClass"
))
.
withMessageContaining
(
"myclass"
);
}
@Test
public
void
unresolvableClassWithLinkageError
()
throws
Exception
{
attributes
.
put
(
"unresolvableClass"
,
new
LinkageError
(
"myclass"
));
exception
.
expect
(
IllegalArgumentException
.
class
);
exception
.
expectMessage
(
containsString
(
"myclass"
));
attributes
.
getClass
(
"unresolvableClass"
);
}
@Test
public
void
singleElementToSingleElementArrayConversionSupport
()
throws
Exception
{
Filter
filter
=
FilteredClass
.
class
.
getAnnotation
(
Filter
.
class
);
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录