Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
爱吃血肠
spring-framework
提交
4e47006a
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,发现更多精彩内容 >>
提交
4e47006a
编写于
2月 12, 2019
作者:
J
Juergen Hoeller
浏览文件
操作
浏览文件
下载
差异文件
Merge branch '5.1.x'
上级
0bdacddc
106a7570
变更
5
隐藏空白更改
内联
并排
Showing
5 changed file
with
37 addition
and
9 deletion
+37
-9
spring-context/src/test/java/org/springframework/context/annotation/ConfigurationClassPostProcessorTests.java
...text/annotation/ConfigurationClassPostProcessorTests.java
+24
-1
spring-core/src/main/java/org/springframework/core/annotation/AnnotationAttributes.java
...springframework/core/annotation/AnnotationAttributes.java
+2
-2
spring-core/src/main/java/org/springframework/core/type/classreading/AnnotationReadingVisitorUtils.java
...core/type/classreading/AnnotationReadingVisitorUtils.java
+3
-2
spring-core/src/main/java/org/springframework/core/type/classreading/RecursiveAnnotationArrayVisitor.java
...re/type/classreading/RecursiveAnnotationArrayVisitor.java
+6
-2
spring-core/src/test/java/org/springframework/core/annotation/AnnotationAttributesTests.java
...gframework/core/annotation/AnnotationAttributesTests.java
+2
-2
未找到文件。
spring-context/src/test/java/org/springframework/context/annotation/ConfigurationClassPostProcessorTests.java
浏览文件 @
4e47006a
/*
* 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.
...
...
@@ -184,6 +184,20 @@ public class ConfigurationClassPostProcessorTests {
assertSupportForComposedAnnotationWithExclude
(
beanDefinition
);
}
@Test
public
void
postProcessorWorksWithExtendedConfigurationWithAttributeOverrideForExcludesFilterUsingReflection
()
{
RootBeanDefinition
beanDefinition
=
new
RootBeanDefinition
(
ExtendedConfigurationWithAttributeOverrideForExcludeFilter
.
class
);
assertSupportForComposedAnnotationWithExclude
(
beanDefinition
);
}
@Test
public
void
postProcessorWorksWithExtendedConfigurationWithAttributeOverrideForExcludesFilterUsingAsm
()
{
RootBeanDefinition
beanDefinition
=
new
RootBeanDefinition
(
ExtendedConfigurationWithAttributeOverrideForExcludeFilter
.
class
.
getName
());
assertSupportForComposedAnnotationWithExclude
(
beanDefinition
);
}
@Test
public
void
postProcessorWorksWithComposedComposedConfigurationWithAttributeOverridesUsingReflection
()
{
RootBeanDefinition
beanDefinition
=
new
RootBeanDefinition
(
...
...
@@ -1515,6 +1529,15 @@ public class ConfigurationClassPostProcessorTests {
public
static
class
ComposedConfigurationWithAttributeOverrideForExcludeFilter
{
}
@ComponentScan
(
basePackages
=
"org.springframework.context.annotation.componentscan.base"
,
excludeFilters
=
{})
public
static
class
BaseConfigurationWithEmptyExcludeFilters
{
}
@ComponentScan
(
basePackages
=
"org.springframework.context.annotation.componentscan.simple"
,
excludeFilters
=
@ComponentScan
.
Filter
(
Component
.
class
))
public
static
class
ExtendedConfigurationWithAttributeOverrideForExcludeFilter
extends
BaseConfigurationWithEmptyExcludeFilters
{
}
@ComposedConfigurationWithAttributeOverrides
@Retention
(
RetentionPolicy
.
RUNTIME
)
@Target
(
ElementType
.
TYPE
)
...
...
spring-core/src/main/java/org/springframework/core/annotation/AnnotationAttributes.java
浏览文件 @
4e47006a
/*
* Copyright 2002-201
7
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.
...
...
@@ -363,7 +363,7 @@ public class AnnotationAttributes extends LinkedHashMap<String, Object> {
private
void
assertAttributeType
(
String
attributeName
,
Object
attributeValue
,
Class
<?>
expectedType
)
{
if
(!
expectedType
.
isInstance
(
attributeValue
))
{
throw
new
IllegalArgumentException
(
String
.
format
(
"Attribute '%s' is of type
[%s], but [%s]
was expected in attributes for annotation [%s]"
,
"Attribute '%s' is of type
%s, but %s
was expected in attributes for annotation [%s]"
,
attributeName
,
attributeValue
.
getClass
().
getSimpleName
(),
expectedType
.
getSimpleName
(),
this
.
displayName
));
}
...
...
spring-core/src/main/java/org/springframework/core/type/classreading/AnnotationReadingVisitorUtils.java
浏览文件 @
4e47006a
/*
* Copyright 2002-201
7
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.
...
...
@@ -28,6 +28,7 @@ import org.springframework.core.annotation.AnnotationAttributes;
import
org.springframework.core.annotation.AnnotationUtils
;
import
org.springframework.lang.Nullable
;
import
org.springframework.util.ClassUtils
;
import
org.springframework.util.CollectionUtils
;
import
org.springframework.util.LinkedMultiValueMap
;
import
org.springframework.util.ObjectUtils
;
...
...
@@ -124,7 +125,7 @@ abstract class AnnotationReadingVisitorUtils {
// Get the unmerged list of attributes for the target annotation.
List
<
AnnotationAttributes
>
attributesList
=
attributesMap
.
get
(
annotationName
);
if
(
attributesList
==
null
||
attributesList
.
isEmpty
(
))
{
if
(
CollectionUtils
.
isEmpty
(
attributesList
))
{
return
null
;
}
...
...
spring-core/src/main/java/org/springframework/core/type/classreading/RecursiveAnnotationArrayVisitor.java
浏览文件 @
4e47006a
/*
* 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.
...
...
@@ -89,7 +89,11 @@ class RecursiveAnnotationArrayVisitor extends AbstractRecursiveAnnotationVisitor
try
{
Class
<?>
attributeType
=
annotationType
.
getMethod
(
this
.
attributeName
).
getReturnType
();
if
(
attributeType
.
isArray
())
{
this
.
attributes
.
put
(
this
.
attributeName
,
Array
.
newInstance
(
attributeType
.
getComponentType
(),
0
));
Class
<?>
elementType
=
attributeType
.
getComponentType
();
if
(
elementType
.
isAnnotation
())
{
elementType
=
AnnotationAttributes
.
class
;
}
this
.
attributes
.
put
(
this
.
attributeName
,
Array
.
newInstance
(
elementType
,
0
));
}
}
catch
(
NoSuchMethodException
ex
)
{
...
...
spring-core/src/test/java/org/springframework/core/annotation/AnnotationAttributesTests.java
浏览文件 @
4e47006a
/*
* Copyright 2002-201
6
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.
...
...
@@ -154,7 +154,7 @@ public class AnnotationAttributesTests {
public
void
getEnumWithTypeMismatch
()
{
attributes
.
put
(
"color"
,
"RED"
);
exception
.
expect
(
IllegalArgumentException
.
class
);
exception
.
expectMessage
(
containsString
(
"Attribute 'color' is of type
[String], but [Enum]
was expected"
));
exception
.
expectMessage
(
containsString
(
"Attribute 'color' is of type
String, but Enum
was expected"
));
attributes
.
getEnum
(
"color"
);
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录