Merge branch '6.1.x'

sbrannen · sbrannen · commit 46a4ad4a757f · 2024-08-05T11:07:47.000+03:00
diff --git a/spring-expression/src/test/java/org/springframework/expression/spel/VariableAndFunctionTests.java b/spring-expression/src/test/java/org/springframework/expression/spel/VariableAndFunctionTests.java
@@ -206,7 +206,6 @@ void functionFromMethodWithVarargsAndPrimitiveArrayToObjectArrayConversion() {
 		evaluate("#varargsObjectFunction(new int[]{1, 2, 3})", "[1, 2, 3]", String.class); // int[] to Object[]
 	}
 
-	@Disabled("Primitive array to Object[] conversion is not currently supported")
 	@Test
 	void functionFromMethodHandleWithVarargsAndPrimitiveArrayToObjectArrayConversion() {
 		evaluate("#message('x -> %s %s %s', new short[]{1, 2, 3})", "x -> 1 2 3", String.class);  // short[] to Object[]

Original file line number	Diff line number	Diff line change
`@@ -206,7 +206,6 @@ void functionFromMethodWithVarargsAndPrimitiveArrayToObjectArrayConversion() {`
`206`	`206`	`evaluate("#varargsObjectFunction(new int[]{1, 2, 3})", "[1, 2, 3]", String.class); // int[] to Object[]`
`207`	`207`	`}`
`208`	`208`
`209`		`- @Disabled("Primitive array to Object[] conversion is not currently supported")`
`210`	`209`	`@Test`
`211`	`210`	`void functionFromMethodHandleWithVarargsAndPrimitiveArrayToObjectArrayConversion() {`
`212`	`211`	`evaluate("#message('x -> %s %s %s', new short[]{1, 2, 3})", "x -> 1 2 3", String.class); // short[] to Object[]`