Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
爱吃血肠
spring-framework
提交
1ac8e1c9
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,发现更多精彩内容 >>
提交
1ac8e1c9
编写于
8月 11, 2016
作者:
J
Juergen Hoeller
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Polishing
(cherry picked from commit
a4a71a89
)
上级
8b5d3559
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
13 addition
and
10 deletion
+13
-10
spring-beans/src/main/java/org/springframework/beans/factory/config/AutowireCapableBeanFactory.java
...work/beans/factory/config/AutowireCapableBeanFactory.java
+10
-10
spring-beans/src/main/java/org/springframework/beans/factory/support/DefaultListableBeanFactory.java
...ork/beans/factory/support/DefaultListableBeanFactory.java
+3
-0
未找到文件。
spring-beans/src/main/java/org/springframework/beans/factory/config/AutowireCapableBeanFactory.java
浏览文件 @
1ac8e1c9
...
@@ -318,8 +318,8 @@ public interface AutowireCapableBeanFactory extends BeanFactory {
...
@@ -318,8 +318,8 @@ public interface AutowireCapableBeanFactory extends BeanFactory {
* @param requiredType type the bean must match; can be an interface or superclass.
* @param requiredType type the bean must match; can be an interface or superclass.
* {@code null} is disallowed.
* {@code null} is disallowed.
* @return the bean name plus bean instance
* @return the bean name plus bean instance
* @throws NoSuchBeanDefinitionException if no
bean of the given type
was found
* @throws NoSuchBeanDefinitionException if no
matching bean
was found
* @throws NoUniqueBeanDefinitionException if more than one
bean of the given type
was found
* @throws NoUniqueBeanDefinitionException if more than one
matching bean
was found
* @throws BeansException if the bean could not be created
* @throws BeansException if the bean could not be created
* @since 4.3.3
* @since 4.3.3
* @see #getBean(Class)
* @see #getBean(Class)
...
@@ -328,30 +328,30 @@ public interface AutowireCapableBeanFactory extends BeanFactory {
...
@@ -328,30 +328,30 @@ public interface AutowireCapableBeanFactory extends BeanFactory {
/**
/**
* Resolve the specified dependency against the beans defined in this factory.
* Resolve the specified dependency against the beans defined in this factory.
* @param descriptor the descriptor for the dependency
* @param descriptor the descriptor for the dependency
(field/method/constructor)
* @param requestingBeanName the name of the bean which declares the
present
dependency
* @param requestingBeanName the name of the bean which declares the
given
dependency
* @return the resolved object, or {@code null} if none found
* @return the resolved object, or {@code null} if none found
* @throws NoSuchBeanDefinitionException if no matching bean was found
* @throws NoSuchBeanDefinitionException if no matching bean was found
* @throws NoUniqueBeanDefinitionException if more than one matching bean was found
* @throws NoUniqueBeanDefinitionException if more than one matching bean was found
* @throws BeansException if dependency resolution failed for any other reason
* @throws BeansException if dependency resolution failed for any other reason
* @see #resolveDependency(DependencyDescriptor, String, Set, TypeConverter)
* @since 2.5
* @since 2.5
* @see #resolveDependency(DependencyDescriptor, String, Set, TypeConverter)
*/
*/
Object
resolveDependency
(
DependencyDescriptor
descriptor
,
String
requestingBeanName
)
throws
BeansException
;
Object
resolveDependency
(
DependencyDescriptor
descriptor
,
String
requestingBeanName
)
throws
BeansException
;
/**
/**
* Resolve the specified dependency against the beans defined in this factory.
* Resolve the specified dependency against the beans defined in this factory.
* @param descriptor the descriptor for the dependency
* @param descriptor the descriptor for the dependency
(field/method/constructor)
* @param requestingBeanName the name of the bean which declares the
present
dependency
* @param requestingBeanName the name of the bean which declares the
given
dependency
* @param autowiredBeanNames a Set that all names of autowired beans (used for
resolving
* @param autowiredBeanNames a Set that all names of autowired beans (used for
*
the present
dependency) are supposed to be added to
*
resolving the given
dependency) are supposed to be added to
* @param typeConverter the TypeConverter to use for populating arrays and collections
* @param typeConverter the TypeConverter to use for populating arrays and collections
* @return the resolved object, or {@code null} if none found
* @return the resolved object, or {@code null} if none found
* @throws NoSuchBeanDefinitionException if no matching bean was found
* @throws NoSuchBeanDefinitionException if no matching bean was found
* @throws NoUniqueBeanDefinitionException if more than one matching bean was found
* @throws NoUniqueBeanDefinitionException if more than one matching bean was found
* @throws BeansException if dependency resolution failed for any other reason
* @throws BeansException if dependency resolution failed for any other reason
* @see DependencyDescriptor
* @since 2.5
* @since 2.5
* @see DependencyDescriptor
*/
*/
Object
resolveDependency
(
DependencyDescriptor
descriptor
,
String
requestingBeanName
,
Object
resolveDependency
(
DependencyDescriptor
descriptor
,
String
requestingBeanName
,
Set
<
String
>
autowiredBeanNames
,
TypeConverter
typeConverter
)
throws
BeansException
;
Set
<
String
>
autowiredBeanNames
,
TypeConverter
typeConverter
)
throws
BeansException
;
...
...
spring-beans/src/main/java/org/springframework/beans/factory/support/DefaultListableBeanFactory.java
浏览文件 @
1ac8e1c9
...
@@ -979,6 +979,7 @@ public class DefaultListableBeanFactory extends AbstractAutowireCapableBeanFacto
...
@@ -979,6 +979,7 @@ public class DefaultListableBeanFactory extends AbstractAutowireCapableBeanFacto
private
<
T
>
NamedBeanHolder
<
T
>
resolveNamedBean
(
Class
<
T
>
requiredType
,
Object
...
args
)
throws
BeansException
{
private
<
T
>
NamedBeanHolder
<
T
>
resolveNamedBean
(
Class
<
T
>
requiredType
,
Object
...
args
)
throws
BeansException
{
Assert
.
notNull
(
requiredType
,
"Required type must not be null"
);
Assert
.
notNull
(
requiredType
,
"Required type must not be null"
);
String
[]
beanNames
=
getBeanNamesForType
(
requiredType
);
String
[]
beanNames
=
getBeanNamesForType
(
requiredType
);
if
(
beanNames
.
length
>
1
)
{
if
(
beanNames
.
length
>
1
)
{
ArrayList
<
String
>
autowireCandidates
=
new
ArrayList
<>();
ArrayList
<
String
>
autowireCandidates
=
new
ArrayList
<>();
for
(
String
beanName
:
beanNames
)
{
for
(
String
beanName
:
beanNames
)
{
...
@@ -990,6 +991,7 @@ public class DefaultListableBeanFactory extends AbstractAutowireCapableBeanFacto
...
@@ -990,6 +991,7 @@ public class DefaultListableBeanFactory extends AbstractAutowireCapableBeanFacto
beanNames
=
autowireCandidates
.
toArray
(
new
String
[
autowireCandidates
.
size
()]);
beanNames
=
autowireCandidates
.
toArray
(
new
String
[
autowireCandidates
.
size
()]);
}
}
}
}
if
(
beanNames
.
length
==
1
)
{
if
(
beanNames
.
length
==
1
)
{
String
beanName
=
beanNames
[
0
];
String
beanName
=
beanNames
[
0
];
return
new
NamedBeanHolder
<>(
beanName
,
getBean
(
beanName
,
requiredType
,
args
));
return
new
NamedBeanHolder
<>(
beanName
,
getBean
(
beanName
,
requiredType
,
args
));
...
@@ -1009,6 +1011,7 @@ public class DefaultListableBeanFactory extends AbstractAutowireCapableBeanFacto
...
@@ -1009,6 +1011,7 @@ public class DefaultListableBeanFactory extends AbstractAutowireCapableBeanFacto
}
}
throw
new
NoUniqueBeanDefinitionException
(
requiredType
,
candidates
.
keySet
());
throw
new
NoUniqueBeanDefinitionException
(
requiredType
,
candidates
.
keySet
());
}
}
return
null
;
return
null
;
}
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录