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

Polishing

Browse Source
This commit is contained in:
Sam Brannen
2024-07-11 12:33:48 +02:00
parent e15f123486
commit 48a6bd6ce7
2 changed files with 15 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -240,8 +240,7 @@ public class FunctionReference extends SpelNodeImpl {
// to be packaged in an array, in contrast to how method invocation works with // to be packaged in an array, in contrast to how method invocation works with
// reflection. // reflection.
int actualVarargsIndex = functionArgs.length - 1; int actualVarargsIndex = functionArgs.length - 1;
if (actualVarargsIndex >= 0 && functionArgs[actualVarargsIndex].getClass().isArray()) { if (actualVarargsIndex >= 0 && functionArgs[actualVarargsIndex] instanceof Object[] argsToUnpack) {
Object[] argsToUnpack = (Object[]) functionArgs[actualVarargsIndex];
Object[] newArgs = new Object[actualVarargsIndex + argsToUnpack.length]; Object[] newArgs = new Object[actualVarargsIndex + argsToUnpack.length];
System.arraycopy(functionArgs, 0, newArgs, 0, actualVarargsIndex); System.arraycopy(functionArgs, 0, newArgs, 0, actualVarargsIndex);
System.arraycopy(argsToUnpack, 0, newArgs, actualVarargsIndex, argsToUnpack.length); System.arraycopy(argsToUnpack, 0, newArgs, actualVarargsIndex, argsToUnpack.length);

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

@@ -279,7 +279,8 @@ public abstract class ReflectionHelper {
for (int i = 0; i < arguments.length; i++) { for (int i = 0; i < arguments.length; i++) {
TypeDescriptor targetType = new TypeDescriptor(MethodParameter.forExecutable(executable, i)); TypeDescriptor targetType = new TypeDescriptor(MethodParameter.forExecutable(executable, i));
Object argument = arguments[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]); conversionOccurred |= (argument != arguments[i]);
} }
} }
@@ -288,7 +289,8 @@ public abstract class ReflectionHelper {
for (int i = 0; i < varargsPosition; i++) { for (int i = 0; i < varargsPosition; i++) {
TypeDescriptor targetType = new TypeDescriptor(MethodParameter.forExecutable(executable, i)); TypeDescriptor targetType = new TypeDescriptor(MethodParameter.forExecutable(executable, i));
Object argument = arguments[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]); conversionOccurred |= (argument != arguments[i]);
} }
@@ -318,7 +320,7 @@ public abstract class ReflectionHelper {
// 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.
// 2) the input argument was null; the varargs component type is Optional; and the argument was converted to Optional.empty(). // 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. // 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. // 5) the input argument was the wrong type and got converted and wrapped in an array.
if (argument != arguments[varargsPosition] && if (argument != arguments[varargsPosition] &&
@@ -364,7 +366,8 @@ public abstract class ReflectionHelper {
TypeDescriptor targetType = new TypeDescriptor(resolvableType, argumentClass, null); TypeDescriptor targetType = new TypeDescriptor(resolvableType, argumentClass, null);
Object argument = arguments[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]); conversionOccurred |= (argument != arguments[i]);
} }
} }
@@ -376,7 +379,8 @@ public abstract class ReflectionHelper {
TypeDescriptor targetType = new TypeDescriptor(resolvableType, argumentClass, null); TypeDescriptor targetType = new TypeDescriptor(resolvableType, argumentClass, null);
Object argument = arguments[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]); conversionOccurred |= (argument != arguments[i]);
} }
@@ -407,9 +411,9 @@ public abstract class ReflectionHelper {
// 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.
// 2) the input argument was null; the varargs component type is Optional; and the argument was converted to Optional.empty(). // 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. // 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 and wrapped in an array. // 5) the input argument was the wrong type and got converted as explained in the comments above.
if (argument != arguments[varargsPosition] && if (argument != arguments[varargsPosition] &&
!isFirstEntryInArray(argument, arguments[varargsPosition])) { !isFirstEntryInArray(argument, arguments[varargsPosition])) {
conversionOccurred = true; // case 5 conversionOccurred = true; // case 5
@@ -419,7 +423,8 @@ 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), componentTypeDesc); TypeDescriptor sourceType = TypeDescriptor.forObject(argument);
arguments[i] = converter.convertValue(argument, sourceType, componentTypeDesc);
conversionOccurred |= (argument != arguments[i]); conversionOccurred |= (argument != arguments[i]);
} }
} }