Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

revised non-lenient resolution

Browse Source
This commit is contained in:
Juergen Hoeller
2009-07-28 14:43:37 +00:00
parent 1d6a7e57c1
commit 3cb073abce
3 changed files with 109 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
org.springframework.beans/src/main/java/org/springframework/beans/factory/support/ConstructorResolver.java
View File

@@ -220,7 +220,8 @@ class ConstructorResolver {
args = new ArgumentsHolder(explicitArgs);
}
int typeDiffWeight = args.getTypeDifferenceWeight(paramTypes);
int typeDiffWeight = (mbd.isLenientConstructorResolution() ?
args.getTypeDifferenceWeight(paramTypes) : args.getAssignabilityWeight(paramTypes));
// Choose this constructor if it represents the closest match.
if (typeDiffWeight < minTypeDiffWeight) {
constructorToUse = candidate;
@@ -436,8 +437,9 @@ class ConstructorResolver {
args = new ArgumentsHolder(explicitArgs);
}
int typeDiffWeight = args.getTypeDifferenceWeight(paramTypes);
// Choose this constructor if it represents the closest match.
int typeDiffWeight = (mbd.isLenientConstructorResolution() ?
args.getTypeDifferenceWeight(paramTypes) : args.getAssignabilityWeight(paramTypes));
// Choose this factory method if it represents the closest match.
if (typeDiffWeight < minTypeDiffWeight) {
factoryMethodToUse = candidate;
argsToUse = args.arguments;
@@ -744,6 +746,20 @@ class ConstructorResolver {
int rawTypeDiffWeight = MethodInvoker.getTypeDifferenceWeight(paramTypes, this.rawArguments) - 1024;
return (rawTypeDiffWeight < typeDiffWeight ? rawTypeDiffWeight : typeDiffWeight);
}
public int getAssignabilityWeight(Class[] paramTypes) {
for (int i = 0; i < paramTypes.length; i++) {
if (!ClassUtils.isAssignableValue(paramTypes[i], this.arguments[i])) {
return Integer.MAX_VALUE;
}
}
for (int i = 0; i < paramTypes.length; i++) {
if (!ClassUtils.isAssignableValue(paramTypes[i], this.rawArguments[i])) {
return Integer.MAX_VALUE - 512;
}
}
return Integer.MAX_VALUE - 1024;
}
}