Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
爱吃血肠
spring-framework
提交
316244d2
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,发现更多精彩内容 >>
提交
316244d2
编写于
7月 27, 2016
作者:
J
Juergen Hoeller
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Isolated circular import detection for scanned configuration classes
Issue: SPR-14517
上级
fd9e88d3
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
23 addition
and
4 deletion
+23
-4
spring-context/src/main/java/org/springframework/context/annotation/ConfigurationClassParser.java
...ramework/context/annotation/ConfigurationClassParser.java
+11
-2
spring-context/src/test/java/org/springframework/context/annotation/ComponentScanAndImportAnnotationInteractionTests.java
...ion/ComponentScanAndImportAnnotationInteractionTests.java
+12
-2
未找到文件。
spring-context/src/main/java/org/springframework/context/annotation/ConfigurationClassParser.java
浏览文件 @
316244d2
...
...
@@ -139,7 +139,7 @@ class ConfigurationClassParser {
private
final
List
<
String
>
propertySourceNames
=
new
ArrayList
<>();
private
final
ImportStack
importStack
=
new
ImportStack
();
private
ImportStack
importStack
=
new
ImportStack
();
private
List
<
DeferredImportSelectorHolder
>
deferredImportSelectors
;
...
...
@@ -276,7 +276,16 @@ class ConfigurationClassParser {
// Check the set of scanned definitions for any further config classes and parse recursively if necessary
for
(
BeanDefinitionHolder
holder
:
scannedBeanDefinitions
)
{
if
(
ConfigurationClassUtils
.
checkConfigurationClassCandidate
(
holder
.
getBeanDefinition
(),
this
.
metadataReaderFactory
))
{
parse
(
holder
.
getBeanDefinition
().
getBeanClassName
(),
holder
.
getBeanName
());
// Provide isolated circular import detection for scanned classes,
// since the initial registration did not come explicitly.
ImportStack
previousStack
=
this
.
importStack
;
this
.
importStack
=
new
ImportStack
();
try
{
parse
(
holder
.
getBeanDefinition
().
getBeanClassName
(),
holder
.
getBeanName
());
}
finally
{
this
.
importStack
=
previousStack
;
}
}
}
}
...
...
spring-context/src/test/java/org/springframework/context/annotation/ComponentScanAndImportAnnotationInteractionTests.java
浏览文件 @
316244d2
/*
* Copyright 2002-201
4
the original author or authors.
* Copyright 2002-201
6
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.
...
...
@@ -19,6 +19,7 @@ package org.springframework.context.annotation;
import
org.junit.Test
;
import
org.springframework.beans.factory.support.RootBeanDefinition
;
import
org.springframework.context.annotation.componentscan.importing.ImportingConfig
;
import
org.springframework.context.annotation.componentscan.simple.SimpleComponent
;
/**
...
...
@@ -58,7 +59,7 @@ public class ComponentScanAndImportAnnotationInteractionTests {
@Test
public
void
componentScanViaImportUsingAsm
()
{
AnnotationConfigApplicationContext
ctx
=
new
AnnotationConfigApplicationContext
();
ctx
.
registerBeanDefinition
(
"config
4
"
,
new
RootBeanDefinition
(
Config3
.
class
.
getName
()));
ctx
.
registerBeanDefinition
(
"config"
,
new
RootBeanDefinition
(
Config3
.
class
.
getName
()));
ctx
.
refresh
();
ctx
.
getBean
(
SimpleComponent
.
class
);
}
...
...
@@ -71,6 +72,14 @@ public class ComponentScanAndImportAnnotationInteractionTests {
ctx
.
getBean
(
SimpleComponent
.
class
);
}
@Test
public
void
circularImportViaComponentScan
()
{
AnnotationConfigApplicationContext
ctx
=
new
AnnotationConfigApplicationContext
();
ctx
.
registerBeanDefinition
(
"config"
,
new
RootBeanDefinition
(
ImportingConfig
.
class
.
getName
()));
ctx
.
refresh
();
ctx
.
getBean
(
SimpleComponent
.
class
);
}
@ComponentScan
(
"org.springframework.context.annotation.componentscan.simple"
)
static
final
class
Config1
{
...
...
@@ -88,6 +97,7 @@ public class ComponentScanAndImportAnnotationInteractionTests {
@ComponentScan
(
"org.springframework.context.annotation.componentscan.simple"
)
@ComponentScan
(
"org.springframework.context.annotation.componentscan.importing"
)
public
static
final
class
ImportedConfig
{
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录