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

Polish SpEL function invocation support

Browse Source
This commit is contained in:
Sam Brannen
2024-07-10 16:01:58 +02:00
parent f2b3263fff
commit dc16f3cffb
2 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
spring-expression/src/main/java/org/springframework/expression/spel/ast/FunctionReference.java
View File

@@ -217,7 +217,7 @@ public class FunctionReference extends SpelNodeImpl {
} }
} }
// more complex case, we need to look at conversion and vararg repacking // more complex case, we need to look at conversion and varargs repackaging
Integer varArgPosition = null; Integer varArgPosition = null;
if (isSuspectedVarargs) { if (isSuspectedVarargs) {
varArgPosition = declaredParamCount - 1; varArgPosition = declaredParamCount - 1;

16
spring-expression/src/main/java/org/springframework/expression/spel/support/ReflectionHelper.java
View File

@@ -356,10 +356,10 @@ public abstract class ReflectionHelper {
MethodHandle methodHandle, @Nullable Integer varargsPosition) throws EvaluationException { MethodHandle methodHandle, @Nullable Integer varargsPosition) throws EvaluationException {
boolean conversionOccurred = false; boolean conversionOccurred = false;
MethodType methodHandleArgumentTypes = methodHandle.type(); MethodType methodHandleType = methodHandle.type();
if (varargsPosition == null) { if (varargsPosition == null) {
for (int i = 0; i < arguments.length; i++) { for (int i = 0; i < arguments.length; i++) {
Class<?> argumentClass = methodHandleArgumentTypes.parameterType(i); Class<?> argumentClass = methodHandleType.parameterType(i);
ResolvableType resolvableType = ResolvableType.forClass(argumentClass); ResolvableType resolvableType = ResolvableType.forClass(argumentClass);
TypeDescriptor targetType = new TypeDescriptor(resolvableType, argumentClass, null); TypeDescriptor targetType = new TypeDescriptor(resolvableType, argumentClass, null);
@@ -371,7 +371,7 @@ public abstract class ReflectionHelper {
else { else {
// Convert everything up to the varargs position // Convert everything up to the varargs position
for (int i = 0; i < varargsPosition; i++) { for (int i = 0; i < varargsPosition; i++) {
Class<?> argumentClass = methodHandleArgumentTypes.parameterType(i); Class<?> argumentClass = methodHandleType.parameterType(i);
ResolvableType resolvableType = ResolvableType.forClass(argumentClass); ResolvableType resolvableType = ResolvableType.forClass(argumentClass);
TypeDescriptor targetType = new TypeDescriptor(resolvableType, argumentClass, null); TypeDescriptor targetType = new TypeDescriptor(resolvableType, argumentClass, null);
@@ -380,10 +380,10 @@ public abstract class ReflectionHelper {
conversionOccurred |= (argument != arguments[i]); conversionOccurred |= (argument != arguments[i]);
} }
Class<?> varArgClass = methodHandleArgumentTypes.lastParameterType().componentType(); Class<?> varArgClass = methodHandleType.lastParameterType().componentType();
ResolvableType varArgResolvableType = ResolvableType.forClass(varArgClass); ResolvableType varArgResolvableType = ResolvableType.forClass(varArgClass);
TypeDescriptor varArgComponentType = new TypeDescriptor(varArgResolvableType, varArgClass, null); TypeDescriptor targetType = new TypeDescriptor(varArgResolvableType, varArgClass, null);
TypeDescriptor componentTypeDesc = varArgComponentType.getElementTypeDescriptor(); TypeDescriptor componentTypeDesc = targetType.getElementTypeDescriptor();
// TODO Determine why componentTypeDesc can be null. // TODO Determine why componentTypeDesc can be null.
// Assert.state(componentTypeDesc != null, "Component type must not be null for a varargs array"); // Assert.state(componentTypeDesc != null, "Component type must not be null for a varargs array");
@@ -403,7 +403,7 @@ public abstract class ReflectionHelper {
// convert a String containing a comma would result in the String being split and // convert a String containing a comma would result in the String being split and
// repackaged in an array when it should be used as-is. // repackaged in an array when it should be used as-is.
else if (componentTypeDesc != null && !sourceType.isAssignableTo(componentTypeDesc)) { else if (componentTypeDesc != null && !sourceType.isAssignableTo(componentTypeDesc)) {
arguments[varargsPosition] = converter.convertValue(argument, sourceType, varArgComponentType); arguments[varargsPosition] = converter.convertValue(argument, sourceType, targetType);
} }
// Possible outcomes of the above if-else block: // Possible outcomes of the above if-else block:
// 1) the input argument was null, and nothing was done. // 1) the input argument was null, and nothing was done.
@@ -420,7 +420,7 @@ public abstract class ReflectionHelper {
else { else {
for (int i = varargsPosition; i < arguments.length; i++) { for (int i = varargsPosition; i < arguments.length; i++) {
Object argument = arguments[i]; Object argument = arguments[i];
arguments[i] = converter.convertValue(argument, TypeDescriptor.forObject(argument), varArgComponentType); arguments[i] = converter.convertValue(argument, TypeDescriptor.forObject(argument), targetType);
conversionOccurred |= (argument != arguments[i]); conversionOccurred |= (argument != arguments[i]);
} }
} }