Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
爱吃血肠
spring-framework
提交
92efe950
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 搜索 >>
提交
92efe950
编写于
11月 11, 2019
作者:
S
stsypanov
提交者:
Juergen Hoeller
11月 11, 2019
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Simplify ConstructorResolver: do not sort intermediate array
上级
51b43496
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
10 addition
and
11 deletion
+10
-11
spring-beans/src/main/java/org/springframework/beans/factory/support/AutowireUtils.java
.../springframework/beans/factory/support/AutowireUtils.java
+1
-1
spring-beans/src/main/java/org/springframework/beans/factory/support/ConstructorResolver.java
...gframework/beans/factory/support/ConstructorResolver.java
+9
-10
未找到文件。
spring-beans/src/main/java/org/springframework/beans/factory/support/AutowireUtils.java
浏览文件 @
92efe950
...
...
@@ -51,7 +51,7 @@ import org.springframework.util.ClassUtils;
*/
abstract
class
AutowireUtils
{
p
rivate
static
final
Comparator
<
Executable
>
EXECUTABLE_COMPARATOR
=
(
e1
,
e2
)
->
{
p
ublic
static
final
Comparator
<
Executable
>
EXECUTABLE_COMPARATOR
=
(
e1
,
e2
)
->
{
int
result
=
Boolean
.
compare
(
Modifier
.
isPublic
(
e2
.
getModifiers
()),
Modifier
.
isPublic
(
e1
.
getModifiers
()));
return
result
!=
0
?
result
:
Integer
.
compare
(
e2
.
getParameterCount
(),
e1
.
getParameterCount
());
};
...
...
spring-beans/src/main/java/org/springframework/beans/factory/support/ConstructorResolver.java
浏览文件 @
92efe950
...
...
@@ -453,27 +453,27 @@ class ConstructorResolver {
// Try all methods with this name to see if they match the given arguments.
factoryClass
=
ClassUtils
.
getUserClass
(
factoryClass
);
List
<
Method
>
candidate
List
=
null
;
List
<
Method
>
candidate
s
=
null
;
if
(
mbd
.
isFactoryMethodUnique
)
{
if
(
factoryMethodToUse
==
null
)
{
factoryMethodToUse
=
mbd
.
getResolvedFactoryMethod
();
}
if
(
factoryMethodToUse
!=
null
)
{
candidate
List
=
Collections
.
singletonList
(
factoryMethodToUse
);
candidate
s
=
Collections
.
singletonList
(
factoryMethodToUse
);
}
}
if
(
candidate
List
==
null
)
{
candidate
List
=
new
ArrayList
<>();
if
(
candidate
s
==
null
)
{
candidate
s
=
new
ArrayList
<>();
Method
[]
rawCandidates
=
getCandidateMethods
(
factoryClass
,
mbd
);
for
(
Method
candidate
:
rawCandidates
)
{
if
(
Modifier
.
isStatic
(
candidate
.
getModifiers
())
==
isStatic
&&
mbd
.
isFactoryMethod
(
candidate
))
{
candidate
List
.
add
(
candidate
);
candidate
s
.
add
(
candidate
);
}
}
}
if
(
candidate
List
.
size
()
==
1
&&
explicitArgs
==
null
&&
!
mbd
.
hasConstructorArgumentValues
())
{
Method
uniqueCandidate
=
candidate
List
.
get
(
0
);
if
(
candidate
s
.
size
()
==
1
&&
explicitArgs
==
null
&&
!
mbd
.
hasConstructorArgumentValues
())
{
Method
uniqueCandidate
=
candidate
s
.
get
(
0
);
if
(
uniqueCandidate
.
getParameterCount
()
==
0
)
{
mbd
.
factoryMethodToIntrospect
=
uniqueCandidate
;
synchronized
(
mbd
.
constructorArgumentLock
)
{
...
...
@@ -486,8 +486,7 @@ class ConstructorResolver {
}
}
Method
[]
candidates
=
candidateList
.
toArray
(
new
Method
[
0
]);
AutowireUtils
.
sortFactoryMethods
(
candidates
);
candidates
.
sort
(
AutowireUtils
.
EXECUTABLE_COMPARATOR
);
ConstructorArgumentValues
resolvedValues
=
null
;
boolean
autowiring
=
(
mbd
.
getResolvedAutowireMode
()
==
AutowireCapableBeanFactory
.
AUTOWIRE_CONSTRUCTOR
);
...
...
@@ -536,7 +535,7 @@ class ConstructorResolver {
paramNames
=
pnd
.
getParameterNames
(
candidate
);
}
argsHolder
=
createArgumentArray
(
beanName
,
mbd
,
resolvedValues
,
bw
,
paramTypes
,
paramNames
,
candidate
,
autowiring
,
candidates
.
length
==
1
);
paramTypes
,
paramNames
,
candidate
,
autowiring
,
candidates
.
size
()
==
1
);
}
catch
(
UnsatisfiedDependencyException
ex
)
{
if
(
logger
.
isTraceEnabled
())
{
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录