Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
sesemomo
spring-framework
提交
c8b6233b
S
spring-framework
项目概览
sesemomo
/
spring-framework
与 Fork 源项目一致
从无法访问的项目Fork
通知
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,发现更多精彩内容 >>
提交
c8b6233b
编写于
5月 02, 2018
作者:
J
Juergen Hoeller
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Introspect originating bean definition as configuration class candidate
Issue: SPR-16756
上级
4c021d04
变更
6
隐藏空白更改
内联
并排
Showing
6 changed file
with
124 addition
and
9 deletion
+124
-9
spring-context/src/main/java/org/springframework/context/annotation/ConfigurationClassBeanDefinitionReader.java
...xt/annotation/ConfigurationClassBeanDefinitionReader.java
+4
-3
spring-context/src/main/java/org/springframework/context/annotation/ConfigurationClassParser.java
...ramework/context/annotation/ConfigurationClassParser.java
+6
-3
spring-context/src/main/java/org/springframework/context/annotation/ConfigurationClassUtils.java
...framework/context/annotation/ConfigurationClassUtils.java
+3
-3
spring-context/src/test/java/org/springframework/context/annotation/spr16756/ScannedComponent.java
...amework/context/annotation/spr16756/ScannedComponent.java
+50
-0
spring-context/src/test/java/org/springframework/context/annotation/spr16756/ScanningConfiguration.java
...rk/context/annotation/spr16756/ScanningConfiguration.java
+24
-0
spring-context/src/test/java/org/springframework/context/annotation/spr16756/Spr16756Tests.java
...gframework/context/annotation/spr16756/Spr16756Tests.java
+37
-0
未找到文件。
spring-context/src/main/java/org/springframework/context/annotation/ConfigurationClassBeanDefinitionReader.java
浏览文件 @
c8b6233b
/*
* Copyright 2002-201
7
the original author or authors.
* Copyright 2002-201
8
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.
...
...
@@ -122,8 +122,8 @@ class ConfigurationClassBeanDefinitionReader {
* Read a particular {@link ConfigurationClass}, registering bean definitions
* for the class itself and all of its {@link Bean} methods.
*/
private
void
loadBeanDefinitionsForConfigurationClass
(
ConfigurationClass
configClass
,
TrackedConditionEvaluator
trackedConditionEvaluator
)
{
private
void
loadBeanDefinitionsForConfigurationClass
(
ConfigurationClass
configClass
,
TrackedConditionEvaluator
trackedConditionEvaluator
)
{
if
(
trackedConditionEvaluator
.
shouldSkip
(
configClass
))
{
String
beanName
=
configClass
.
getBeanName
();
...
...
@@ -140,6 +140,7 @@ class ConfigurationClassBeanDefinitionReader {
for
(
BeanMethod
beanMethod
:
configClass
.
getBeanMethods
())
{
loadBeanDefinitionsForBeanMethod
(
beanMethod
);
}
loadBeanDefinitionsFromImportedResources
(
configClass
.
getImportedResources
());
loadBeanDefinitionsFromRegistrars
(
configClass
.
getImportBeanDefinitionRegistrars
());
}
...
...
spring-context/src/main/java/org/springframework/context/annotation/ConfigurationClassParser.java
浏览文件 @
c8b6233b
...
...
@@ -288,9 +288,12 @@ class ConfigurationClassParser {
this
.
componentScanParser
.
parse
(
componentScan
,
sourceClass
.
getMetadata
().
getClassName
());
// Check the set of scanned definitions for any further config classes and parse recursively if needed
for
(
BeanDefinitionHolder
holder
:
scannedBeanDefinitions
)
{
if
(
ConfigurationClassUtils
.
checkConfigurationClassCandidate
(
holder
.
getBeanDefinition
(),
this
.
metadataReaderFactory
))
{
parse
(
holder
.
getBeanDefinition
().
getBeanClassName
(),
holder
.
getBeanName
());
BeanDefinition
bdCand
=
holder
.
getBeanDefinition
().
getOriginatingBeanDefinition
();
if
(
bdCand
==
null
)
{
bdCand
=
holder
.
getBeanDefinition
();
}
if
(
ConfigurationClassUtils
.
checkConfigurationClassCandidate
(
bdCand
,
this
.
metadataReaderFactory
))
{
parse
(
bdCand
.
getBeanClassName
(),
holder
.
getBeanName
());
}
}
}
...
...
spring-context/src/main/java/org/springframework/context/annotation/ConfigurationClassUtils.java
浏览文件 @
c8b6233b
/*
* Copyright 2002-201
7
the original author or authors.
* Copyright 2002-201
8
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.
...
...
@@ -39,7 +39,7 @@ import org.springframework.lang.Nullable;
import
org.springframework.stereotype.Component
;
/**
* Utilities for
process
ing @{@link Configuration} classes.
* Utilities for
identify
ing @{@link Configuration} classes.
*
* @author Chris Beams
* @author Juergen Hoeller
...
...
@@ -60,7 +60,7 @@ abstract class ConfigurationClassUtils {
private
static
final
Log
logger
=
LogFactory
.
getLog
(
ConfigurationClassUtils
.
class
);
private
static
final
Set
<
String
>
candidateIndicators
=
new
HashSet
<>(
4
);
private
static
final
Set
<
String
>
candidateIndicators
=
new
HashSet
<>(
8
);
static
{
candidateIndicators
.
add
(
Component
.
class
.
getName
());
...
...
spring-context/src/test/java/org/springframework/context/annotation/spr16756/ScannedComponent.java
0 → 100644
浏览文件 @
c8b6233b
/*
* Copyright 2002-2018 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.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package
org.springframework.context.annotation.spr16756
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.context.annotation.Scope
;
import
org.springframework.context.annotation.ScopedProxyMode
;
import
org.springframework.stereotype.Component
;
@Component
public
class
ScannedComponent
{
@Autowired
private
State
state
;
public
String
iDoAnything
()
{
return
state
.
anyMethod
();
}
public
interface
State
{
String
anyMethod
();
}
@Component
@Scope
(
proxyMode
=
ScopedProxyMode
.
INTERFACES
,
value
=
"prototype"
)
public
static
class
StateImpl
implements
State
{
public
String
anyMethod
()
{
return
"anyMethod called"
;
}
}
}
spring-context/src/test/java/org/springframework/context/annotation/spr16756/ScanningConfiguration.java
0 → 100644
浏览文件 @
c8b6233b
/*
* Copyright 2002-2018 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.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package
org.springframework.context.annotation.spr16756
;
import
org.springframework.context.annotation.ComponentScan
;
@ComponentScan
public
class
ScanningConfiguration
{
}
spring-context/src/test/java/org/springframework/context/annotation/spr16756/Spr16756Tests.java
0 → 100644
浏览文件 @
c8b6233b
/*
* Copyright 2002-2018 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.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package
org.springframework.context.annotation.spr16756
;
import
org.junit.Test
;
import
org.springframework.context.annotation.AnnotationConfigApplicationContext
;
/**
* @author Juergen Hoeller
*/
public
class
Spr16756Tests
{
@Test
public
void
shouldNotFailOnNestedScopedComponent
()
{
AnnotationConfigApplicationContext
context
=
new
AnnotationConfigApplicationContext
();
context
.
register
(
ScanningConfiguration
.
class
);
context
.
refresh
();
context
.
getBean
(
ScannedComponent
.
class
);
context
.
getBean
(
ScannedComponent
.
State
.
class
);
}
}
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录