diff --git a/spring-expression/src/main/java/org/springframework/expression/spel/ast/FunctionReference.java b/spring-expression/src/main/java/org/springframework/expression/spel/ast/FunctionReference.java index 1f1fdcee7a4..71c848820b5 100644 --- a/spring-expression/src/main/java/org/springframework/expression/spel/ast/FunctionReference.java +++ b/spring-expression/src/main/java/org/springframework/expression/spel/ast/FunctionReference.java @@ -243,8 +243,7 @@ public class FunctionReference extends SpelNodeImpl { // to be packaged in an array, in contrast to how method invocation works with // reflection. int actualVarargsIndex = functionArgs.length - 1; - if (actualVarargsIndex >= 0 && functionArgs[actualVarargsIndex].getClass().isArray()) { - Object[] argsToUnpack = (Object[]) functionArgs[actualVarargsIndex]; + if (actualVarargsIndex >= 0 && functionArgs[actualVarargsIndex] instanceof Object[] argsToUnpack) { Object[] newArgs = new Object[actualVarargsIndex + argsToUnpack.length]; System.arraycopy(functionArgs, 0, newArgs, 0, actualVarargsIndex); System.arraycopy(argsToUnpack, 0, newArgs, actualVarargsIndex, argsToUnpack.length); diff --git a/spring-expression/src/main/java/org/springframework/expression/spel/support/ReflectionHelper.java b/spring-expression/src/main/java/org/springframework/expression/spel/support/ReflectionHelper.java index 7e0cd19c202..14dcfc26f1b 100644 --- a/spring-expression/src/main/java/org/springframework/expression/spel/support/ReflectionHelper.java +++ b/spring-expression/src/main/java/org/springframework/expression/spel/support/ReflectionHelper.java @@ -278,7 +278,8 @@ public abstract class ReflectionHelper { for (int i = 0; i < arguments.length; i++) { TypeDescriptor targetType = new TypeDescriptor(MethodParameter.forExecutable(executable, i)); Object argument = arguments[i]; - arguments[i] = converter.convertValue(argument, TypeDescriptor.forObject(argument), targetType); + TypeDescriptor sourceType = TypeDescriptor.forObject(argument); + arguments[i] = converter.convertValue(argument, sourceType, targetType); conversionOccurred |= (argument != arguments[i]); } } @@ -287,7 +288,8 @@ public abstract class ReflectionHelper { for (int i = 0; i < varargsPosition; i++) { TypeDescriptor targetType = new TypeDescriptor(MethodParameter.forExecutable(executable, i)); Object argument = arguments[i]; - arguments[i] = converter.convertValue(argument, TypeDescriptor.forObject(argument), targetType); + TypeDescriptor sourceType = TypeDescriptor.forObject(argument); + arguments[i] = converter.convertValue(argument, sourceType, targetType); conversionOccurred |= (argument != arguments[i]); } @@ -317,7 +319,7 @@ public abstract class ReflectionHelper { // Possible outcomes of the above if-else block: // 1) the input argument was null, and nothing was done. // 2) the input argument was null; the varargs component type is Optional; and the argument was converted to Optional.empty(). - // 3) the input argument was correct type but not wrapped in an array, and nothing was done. + // 3) the input argument was the correct type but not wrapped in an array, and nothing was done. // 4) the input argument was already compatible (i.e., array of valid type), and nothing was done. // 5) the input argument was the wrong type and got converted and wrapped in an array. if (argument != arguments[varargsPosition] && @@ -363,7 +365,8 @@ public abstract class ReflectionHelper { TypeDescriptor targetType = new TypeDescriptor(resolvableType, argumentClass, null); Object argument = arguments[i]; - arguments[i] = converter.convertValue(argument, TypeDescriptor.forObject(argument), targetType); + TypeDescriptor sourceType = TypeDescriptor.forObject(argument); + arguments[i] = converter.convertValue(argument, sourceType, targetType); conversionOccurred |= (argument != arguments[i]); } } @@ -375,7 +378,8 @@ public abstract class ReflectionHelper { TypeDescriptor targetType = new TypeDescriptor(resolvableType, argumentClass, null); Object argument = arguments[i]; - arguments[i] = converter.convertValue(argument, TypeDescriptor.forObject(argument), targetType); + TypeDescriptor sourceType = TypeDescriptor.forObject(argument); + arguments[i] = converter.convertValue(argument, sourceType, targetType); conversionOccurred |= (argument != arguments[i]); } @@ -406,9 +410,9 @@ public abstract class ReflectionHelper { // Possible outcomes of the above if-else block: // 1) the input argument was null, and nothing was done. // 2) the input argument was null; the varargs component type is Optional; and the argument was converted to Optional.empty(). - // 3) the input argument was correct type but not wrapped in an array, and nothing was done. - // 4) the input argument was already compatible (i.e., array of valid type), and nothing was done. - // 5) the input argument was the wrong type and got converted and wrapped in an array. + // 3) the input argument was the correct type but not wrapped in an array, and nothing was done. + // 4) the input argument was already compatible (i.e., an Object array of valid type), and nothing was done. + // 5) the input argument was the wrong type and got converted as explained in the comments above. if (argument != arguments[varargsPosition] && !isFirstEntryInArray(argument, arguments[varargsPosition])) { conversionOccurred = true; // case 5 @@ -418,7 +422,8 @@ public abstract class ReflectionHelper { else { for (int i = varargsPosition; i < arguments.length; i++) { Object argument = arguments[i]; - arguments[i] = converter.convertValue(argument, TypeDescriptor.forObject(argument), componentTypeDesc); + TypeDescriptor sourceType = TypeDescriptor.forObject(argument); + arguments[i] = converter.convertValue(argument, sourceType, componentTypeDesc); conversionOccurred |= (argument != arguments[i]); } }