Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
爱吃血肠
spring-framework
提交
f44217a0
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 搜索 >>
提交
f44217a0
编写于
11月 26, 2014
作者:
J
Juergen Hoeller
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Clarified getAllAnnotationAttributes behavior
Issue: SPR-12473 (cherry picked from commit
5ac86803
)
上级
b3bfa95e
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
30 addition
and
20 deletion
+30
-20
spring-core/src/main/java/org/springframework/core/type/AnnotatedTypeMetadata.java
.../org/springframework/core/type/AnnotatedTypeMetadata.java
+12
-12
spring-core/src/test/java/org/springframework/core/type/AnnotationMetadataTests.java
...rg/springframework/core/type/AnnotationMetadataTests.java
+18
-8
未找到文件。
spring-core/src/main/java/org/springframework/core/type/AnnotatedTypeMetadata.java
浏览文件 @
f44217a0
...
...
@@ -38,8 +38,8 @@ import org.springframework.util.MultiValueMap;
public
interface
AnnotatedTypeMetadata
{
/**
* Determine whether the underlying
type has an annotation or
*
meta-annotation
of the given type defined.
* Determine whether the underlying
element has an annotation or meta-annotation
* of the given type defined.
* <p>If this method returns {@code true}, then
* {@link #getAnnotationAttributes} will return a non-null Map.
* @param annotationType the annotation type to look for
...
...
@@ -48,9 +48,9 @@ public interface AnnotatedTypeMetadata {
boolean
isAnnotated
(
String
annotationType
);
/**
* Retrieve the attributes of the annotation of the given type,
*
if any (i.e. if defined on the underlying class, as direct
* a
nnotation or as meta-annotation)
.
* Retrieve the attributes of the annotation of the given type,
if any (i.e. if
*
defined on the underlying element, as direct annotation or meta-annotation),
* a
lso taking attribute overrides on composed annotations into account
.
* @param annotationType the annotation type to look for
* @return a Map of attributes, with the attribute name as key (e.g. "value")
* and the defined attribute value as Map value. This return value will be
...
...
@@ -59,9 +59,9 @@ public interface AnnotatedTypeMetadata {
Map
<
String
,
Object
>
getAnnotationAttributes
(
String
annotationType
);
/**
* Retrieve the attributes of the annotation of the given type,
*
if any (i.e. if defined on the underlying class, as direct
* a
nnotation or as meta-annotation)
.
* Retrieve the attributes of the annotation of the given type,
if any (i.e. if
*
defined on the underlying element, as direct annotation or meta-annotation),
* a
lso taking attribute overrides on composed annotations into account
.
* @param annotationType the annotation type to look for
* @param classValuesAsString whether to convert class references to String
* class names for exposure as values in the returned Map, instead of Class
...
...
@@ -74,8 +74,8 @@ public interface AnnotatedTypeMetadata {
/**
* Retrieve all attributes of all annotations of the given type, if any (i.e. if
* defined on the underlying
type ({@link AnnotationMetadata class} or
*
{@link MethodMetadata method}), as direct annotation or as meta-annotation)
.
* defined on the underlying
element, as direct annotation or meta-annotation).
*
Note that this variant does <i>not</i> take attribute overrides into account
.
* @param annotationType the annotation type to look for
* @return a MultiMap of attributes, with the attribute name as key (e.g. "value")
* and a list of the defined attribute values as Map value. This return value will
...
...
@@ -86,8 +86,8 @@ public interface AnnotatedTypeMetadata {
/**
* Retrieve all attributes of all annotations of the given type, if any (i.e. if
* defined on the underlying
type ({@link AnnotationMetadata class} or
*
{@link MethodMetadata method}), as direct annotation or as meta-annotation)
.
* defined on the underlying
element, as direct annotation or meta-annotation).
*
Note that this variant does <i>not</i> take attribute overrides into account
.
* @param annotationType the annotation type to look for
* @param classValuesAsString whether to convert class references to String
* @return a MultiMap of attributes, with the attribute name as key (e.g. "value")
...
...
spring-core/src/test/java/org/springframework/core/type/AnnotationMetadataTests.java
浏览文件 @
f44217a0
...
...
@@ -244,6 +244,7 @@ public class AnnotationMetadataTests {
assertMultipleAnnotationsWithIdenticalAttributeNames
(
metadata
);
}
private
void
assertMultipleAnnotationsWithIdenticalAttributeNames
(
AnnotationMetadata
metadata
)
{
AnnotationAttributes
attributes1
=
(
AnnotationAttributes
)
metadata
.
getAnnotationAttributes
(
NamedAnnotation1
.
class
.
getName
(),
false
);
...
...
@@ -292,6 +293,8 @@ public class AnnotationMetadataTests {
assertEquals
(
"direct"
,
method
.
getAnnotationAttributes
(
DirectAnnotation
.
class
.
getName
()).
get
(
"value"
));
List
<
Object
>
allMeta
=
method
.
getAllAnnotationAttributes
(
DirectAnnotation
.
class
.
getName
()).
get
(
"value"
);
assertThat
(
new
HashSet
<
Object
>(
allMeta
),
is
(
equalTo
(
new
HashSet
<
Object
>(
Arrays
.
asList
(
"direct"
,
"meta"
)))));
allMeta
=
method
.
getAllAnnotationAttributes
(
DirectAnnotation
.
class
.
getName
()).
get
(
"additional"
);
assertThat
(
new
HashSet
<
Object
>(
allMeta
),
is
(
equalTo
(
new
HashSet
<
Object
>(
Arrays
.
asList
(
"direct"
)))));
assertTrue
(
metadata
.
isAnnotated
(
IsAnnotatedAnnotation
.
class
.
getName
()));
...
...
@@ -332,6 +335,8 @@ public class AnnotationMetadataTests {
assertEquals
(
"direct"
,
metadata
.
getAnnotationAttributes
(
DirectAnnotation
.
class
.
getName
()).
get
(
"value"
));
allMeta
=
metadata
.
getAllAnnotationAttributes
(
DirectAnnotation
.
class
.
getName
()).
get
(
"value"
);
assertThat
(
new
HashSet
<
Object
>(
allMeta
),
is
(
equalTo
(
new
HashSet
<
Object
>(
Arrays
.
asList
(
"direct"
,
"meta"
)))));
allMeta
=
metadata
.
getAllAnnotationAttributes
(
DirectAnnotation
.
class
.
getName
()).
get
(
"additional"
);
assertThat
(
new
HashSet
<
Object
>(
allMeta
),
is
(
equalTo
(
new
HashSet
<
Object
>(
Arrays
.
asList
(
"direct"
)))));
}
{
// perform tests with classValuesAsString = true
AnnotationAttributes
specialAttrs
=
(
AnnotationAttributes
)
metadata
.
getAnnotationAttributes
(
...
...
@@ -407,14 +412,16 @@ public class AnnotationMetadataTests {
NestedAnno
[]
optionalArray
()
default
{
@NestedAnno
(
value
=
"optional"
,
anEnum
=
SomeEnum
.
DEFAULT
,
classArray
=
Void
.
class
)
};
}
@Target
({
ElementType
.
TYPE
,
ElementType
.
METHOD
})
@Target
({
ElementType
.
TYPE
,
ElementType
.
METHOD
})
@Retention
(
RetentionPolicy
.
RUNTIME
)
public
@interface
DirectAnnotation
{
String
value
();
String
additional
()
default
"direct"
;
}
@Target
(
{
ElementType
.
TYPE
}
)
@Target
(
ElementType
.
TYPE
)
@Retention
(
RetentionPolicy
.
RUNTIME
)
public
@interface
IsAnnotatedAnnotation
{
}
...
...
@@ -424,9 +431,11 @@ public class AnnotationMetadataTests {
@DirectAnnotation
(
"meta"
)
@IsAnnotatedAnnotation
public
@interface
MetaAnnotation
{
String
additional
()
default
"meta"
;
}
@Target
({
ElementType
.
TYPE
,
ElementType
.
METHOD
})
@Target
({
ElementType
.
TYPE
,
ElementType
.
METHOD
})
@Retention
(
RetentionPolicy
.
RUNTIME
)
@MetaAnnotation
public
@interface
MetaMetaAnnotation
{
...
...
@@ -446,17 +455,18 @@ public class AnnotationMetadataTests {
},
BAR
{
/* Do not delete! This subclassing is intentional. */
}
;
}
}
@Component
(
"myName"
)
@Scope
(
"myScope"
)
@SpecialAttr
(
clazz
=
String
.
class
,
state
=
Thread
.
State
.
NEW
,
nestedAnno
=
@NestedAnno
(
value
=
"na"
,
anEnum
=
SomeEnum
.
LABEL1
,
classArray
=
{
String
.
class
}),
nestedAnnoArray
=
{
@NestedAnno
,
@NestedAnno
(
value
=
"na1"
,
anEnum
=
SomeEnum
.
LABEL2
,
classArray
=
{
Number
.
class
})
})
@SuppressWarnings
({
"serial"
,
"unused"
})
@SpecialAttr
(
clazz
=
String
.
class
,
state
=
Thread
.
State
.
NEW
,
nestedAnno
=
@NestedAnno
(
value
=
"na"
,
anEnum
=
SomeEnum
.
LABEL1
,
classArray
=
{
String
.
class
}),
nestedAnnoArray
=
{
@NestedAnno
,
@NestedAnno
(
value
=
"na1"
,
anEnum
=
SomeEnum
.
LABEL2
,
classArray
=
{
Number
.
class
})})
@SuppressWarnings
({
"serial"
,
"unused"
})
@DirectAnnotation
(
"direct"
)
@MetaMetaAnnotation
@EnumSubclasses
({
SubclassEnum
.
FOO
,
SubclassEnum
.
BAR
})
@EnumSubclasses
({
SubclassEnum
.
FOO
,
SubclassEnum
.
BAR
})
private
static
class
AnnotatedComponent
implements
Serializable
{
@TestAutowired
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录