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

Filter candidate methods by name first (for more efficient sorting)

Browse Source 
Closes gh-28377

(cherry picked from commit 0599320bd8)
This commit is contained in:
Juergen Hoeller
2023-11-24 23:25:28 +01:00
parent aadf96ba92
commit ad44e8ab0a
1 changed files with 35 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

71
spring-expression/src/main/java/org/springframework/expression/spel/support/ReflectiveMethodResolver.java
View File

@@ -117,6 +117,7 @@ public class ReflectiveMethodResolver implements MethodResolver {
TypeConverter typeConverter = context.getTypeConverter(); TypeConverter typeConverter = context.getTypeConverter();
Class<?> type = (targetObject instanceof Class<?> clazz ? clazz : targetObject.getClass()); Class<?> type = (targetObject instanceof Class<?> clazz ? clazz : targetObject.getClass());
ArrayList<Method> methods = new ArrayList<>(getMethods(type, targetObject)); ArrayList<Method> methods = new ArrayList<>(getMethods(type, targetObject));
methods.removeIf(method -> !method.getName().equals(name));
// If a filter is registered for this type, call it // If a filter is registered for this type, call it
MethodFilter filter = (this.filters != null ? this.filters.get(type) : null); MethodFilter filter = (this.filters != null ? this.filters.get(type) : null);
@@ -160,48 +161,46 @@ public class ReflectiveMethodResolver implements MethodResolver {
boolean multipleOptions = false; boolean multipleOptions = false;
for (Method method : methodsToIterate) { for (Method method : methodsToIterate) {
if (method.getName().equals(name)) { int paramCount = method.getParameterCount();
int paramCount = method.getParameterCount(); List<TypeDescriptor> paramDescriptors = new ArrayList<>(paramCount);
List<TypeDescriptor> paramDescriptors = new ArrayList<>(paramCount); for (int i = 0; i < paramCount; i++) {
for (int i = 0; i < paramCount; i++) { paramDescriptors.add(new TypeDescriptor(new MethodParameter(method, i)));
paramDescriptors.add(new TypeDescriptor(new MethodParameter(method, i))); }
ReflectionHelper.ArgumentsMatchInfo matchInfo = null;
if (method.isVarArgs() && argumentTypes.size() >= (paramCount - 1)) {
// *sigh* complicated
matchInfo = ReflectionHelper.compareArgumentsVarargs(paramDescriptors, argumentTypes, typeConverter);
}
else if (paramCount == argumentTypes.size()) {
// Name and parameter number match, check the arguments
matchInfo = ReflectionHelper.compareArguments(paramDescriptors, argumentTypes, typeConverter);
}
if (matchInfo != null) {
if (matchInfo.isExactMatch()) {
return new ReflectiveMethodExecutor(method, type);
} }
ReflectionHelper.ArgumentsMatchInfo matchInfo = null; else if (matchInfo.isCloseMatch()) {
if (method.isVarArgs() && argumentTypes.size() >= (paramCount - 1)) { if (this.useDistance) {
// *sigh* complicated int matchDistance = ReflectionHelper.getTypeDifferenceWeight(paramDescriptors, argumentTypes);
matchInfo = ReflectionHelper.compareArgumentsVarargs(paramDescriptors, argumentTypes, typeConverter); if (closeMatch == null || matchDistance < closeMatchDistance) {
} // This is a better match...
else if (paramCount == argumentTypes.size()) { closeMatch = method;
// Name and parameter number match, check the arguments closeMatchDistance = matchDistance;
matchInfo = ReflectionHelper.compareArguments(paramDescriptors, argumentTypes, typeConverter);
}
if (matchInfo != null) {
if (matchInfo.isExactMatch()) {
return new ReflectiveMethodExecutor(method, type);
}
else if (matchInfo.isCloseMatch()) {
if (this.useDistance) {
int matchDistance = ReflectionHelper.getTypeDifferenceWeight(paramDescriptors, argumentTypes);
if (closeMatch == null || matchDistance < closeMatchDistance) {
// This is a better match...
closeMatch = method;
closeMatchDistance = matchDistance;
}
}
else {
// Take this as a close match if there isn't one already
if (closeMatch == null) {
closeMatch = method;
}
} }
} }
else if (matchInfo.isMatchRequiringConversion()) { else {
if (matchRequiringConversion != null) { // Take this as a close match if there isn't one already
multipleOptions = true; if (closeMatch == null) {
closeMatch = method;
} }
matchRequiringConversion = method;
} }
} }
else if (matchInfo.isMatchRequiringConversion()) {
if (matchRequiringConversion != null) {
multipleOptions = true;
}
matchRequiringConversion = method;
}
} }
} }
if (closeMatch != null) { if (closeMatch != null) {