Merge branch '6.1.x'

Author: sbrannen

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

@@ -310,11 +310,15 @@ static boolean convertArguments(TypeConverter converter, Object[] arguments, Exe
 					}
 				}
 				// If the argument type is assignable to the varargs component type, there is no need to
-				// convert it or wrap it in an array. For example, using StringToArrayConverter to
-				// 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.
-				else if (!sourceType.isAssignableTo(componentTypeDesc)) {
-					arguments[varargsPosition] = converter.convertValue(argument, sourceType, targetType);
+				// convert it or wrap it in an array. For example, using StringToArrayConverter to 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. Similarly, if the argument is an array that is
+				// assignable to the varargs array type, there is no need to convert it.
+				else if (!sourceType.isAssignableTo(componentTypeDesc) ||
+						(sourceType.isArray() && !sourceType.isAssignableTo(targetType))) {
+
+					TypeDescriptor targetTypeToUse = (sourceType.isArray() ? targetType : componentTypeDesc);
+					arguments[varargsPosition] = converter.convertValue(argument, sourceType, targetTypeToUse);
 				}
 				// Possible outcomes of the above if-else block:
 				// 1) the input argument was null, and nothing was done.

spring-expression/src/test/java/org/springframework/expression/spel/MethodInvocationTests.java

@@ -23,7 +23,6 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
 import org.springframework.expression.Expression;
@@ -357,7 +356,6 @@ void testVarargsWithPrimitiveArrayType() {
 		evaluate("formatPrimitiveVarargs('x -> %s %s', '2', 3.0d)", "x -> 2 3", String.class);
 	}
 
-	@Disabled("Primitive array to Object[] conversion is not currently supported")
 	@Test
 	void testVarargsWithPrimitiveArrayToObjectArrayConversion() {
 		evaluate("formatObjectVarargs('x -> %s %s %s', new short[]{1, 2, 3})", "x -> 1 2 3", String.class); // short[] to Object[]

spring-expression/src/test/java/org/springframework/expression/spel/VariableAndFunctionTests.java

@@ -16,7 +16,6 @@
 
 package org.springframework.expression.spel;
 
-import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
 import org.springframework.expression.spel.standard.SpelExpressionParser;
@@ -199,7 +198,6 @@ void functionWithPrimitiveVarargsViaMethodHandle() {
 		evaluate("#formatPrimitiveVarargs('x -> %s %s %s', new String[]{'1', '2', '3'})", "x -> 1 2 3", String.class); // String[] to int[]
 	}
 
-	@Disabled("Primitive array to Object[] conversion is not currently supported")
 	@Test
 	void functionFromMethodWithVarargsAndPrimitiveArrayToObjectArrayConversion() {
 		evaluate("#varargsObjectFunction(new short[]{1, 2, 3})", "[1, 2, 3]", String.class); // short[] to Object[]