Polishing

spring-expression/src/main/java/org/springframework/expression/spel/ast/FormatHelper.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2018 the original author or authors.
+ * Copyright 2002-2023 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -24,9 +24,10 @@ import org.springframework.lang.Nullable;
 import org.springframework.util.ClassUtils;
 
 /**
- * Utility methods (formatters etc) used during parsing and evaluation.
+ * Utility methods (formatters, etc) used during parsing and evaluation.
  *
  * @author Andy Clement
+ * @author Sam Brannen
  */
 abstract class FormatHelper {
 
@@ -34,19 +35,15 @@ abstract class FormatHelper {
 	 * Produce a readable representation for a given method name with specified arguments.
 	 * @param name the name of the method
 	 * @param argumentTypes the types of the arguments to the method
-	 * @return a nicely formatted representation, e.g. {@code foo(String,int)}
+	 * @return a nicely formatted representation — for example, {@code foo(java.lang.String,int)}
 	 */
-	public static String formatMethodForMessage(String name, List<TypeDescriptor> argumentTypes) {
+	static String formatMethodForMessage(String name, List<TypeDescriptor> argumentTypes) {
 		StringJoiner sj = new StringJoiner(",", "(", ")");
 		for (TypeDescriptor typeDescriptor : argumentTypes) {
-			if (typeDescriptor != null) {
-				sj.add(formatClassNameForMessage(typeDescriptor.getType()));
-			}
-			else {
-				sj.add(formatClassNameForMessage(null));
-			}
+			String className = (typeDescriptor != null ? formatClassNameForMessage(typeDescriptor.getType()) : "null");
+			sj.add(className);
 		}
-		return name + sj.toString();
+		return name + sj;
 	}
 
 	/**
@@ -56,7 +53,7 @@ abstract class FormatHelper {
 	 * @return a formatted String suitable for message inclusion
 	 * @see ClassUtils#getQualifiedName(Class)
 	 */
-	public static String formatClassNameForMessage(@Nullable Class<?> clazz) {
+	static String formatClassNameForMessage(@Nullable Class<?> clazz) {
 		return (clazz != null ? ClassUtils.getQualifiedName(clazz) : "null");
 	}
 

spring-expression/src/main/java/org/springframework/expression/spel/ast/MethodReference.java

@@ -231,8 +231,8 @@ public class MethodReference extends SpelNodeImpl {
 	 * if the cause was a RuntimeException, throw the RuntimeException directly.
 	 */
 	private void throwSimpleExceptionIfPossible(Object value, AccessException ex) {
-		if (ex.getCause() instanceof InvocationTargetException) {
-			Throwable rootCause = ex.getCause().getCause();
+		if (ex.getCause() instanceof InvocationTargetException cause) {
+			Throwable rootCause = cause.getCause();
 			if (rootCause instanceof RuntimeException runtimeException) {
 				throw runtimeException;
 			}

spring-expression/src/main/java/org/springframework/expression/spel/ast/TypeReference.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2021 the original author or authors.
+ * Copyright 2002-2023 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -28,10 +28,11 @@ import org.springframework.lang.Nullable;
 import org.springframework.util.Assert;
 
 /**
- * Represents a reference to a type, for example
- * {@code "T(String)" or "T(com.somewhere.Foo)"}.
+ * Represents a reference to a type, for example {@code "T(String)"} or
+ * {@code "T(com.example.Foo)"}.
  *
  * @author Andy Clement
+ * @author Sam Brannen
  */
 public class TypeReference extends SpelNodeImpl {
 
@@ -74,22 +75,19 @@ public class TypeReference extends SpelNodeImpl {
 	}
 
 	private Class<?> makeArrayIfNecessary(Class<?> clazz) {
-		if (this.dimensions != 0) {
-			for (int i = 0; i < this.dimensions; i++) {
-				Object array = Array.newInstance(clazz, 0);
-				clazz = array.getClass();
-			}
+		if (this.dimensions < 1) {
+			return clazz;
 		}
-		return clazz;
+		int[] dims = new int[this.dimensions];
+		Object array = Array.newInstance(clazz, dims);
+		return array.getClass();
 	}
 
 	@Override
 	public String toStringAST() {
 		StringBuilder sb = new StringBuilder("T(");
 		sb.append(getChild(0).toStringAST());
-		for (int d = 0; d < this.dimensions; d++) {
-			sb.append("[]");
-		}
+		sb.append("[]".repeat(this.dimensions));
 		sb.append(')');
 		return sb.toString();
 	}

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

@@ -869,7 +869,7 @@ class SpelReproTests extends AbstractExpressionTests {
 		Expression expression = parser.parseExpression("parseInt('-FF', 16)");
 
 		Integer result = expression.getValue(context, "", Integer.class);
-		assertThat(result.intValue()).isEqualTo(-255);
+		assertThat(result).isEqualTo(-255);
 	}
 
 	@Test
@@ -880,25 +880,25 @@ class SpelReproTests extends AbstractExpressionTests {
 		Object result = null;
 
 		expression = parser.parseExpression("new java.lang.Long[0].class");
-		result = expression.getValue(context, "");
-		assertThat(result.toString()).as("Equal assertion failed: ").isEqualTo("class [Ljava.lang.Long;");
+		result = expression.getValue(context);
+		assertThat(result).asString().isEqualTo("class [Ljava.lang.Long;");
 
 		expression = parser.parseExpression("T(java.lang.Long[])");
-		result = expression.getValue(context, "");
-		assertThat(result.toString()).as("Equal assertion failed: ").isEqualTo("class [Ljava.lang.Long;");
+		result = expression.getValue(context);
+		assertThat(result).asString().isEqualTo("class [Ljava.lang.Long;");
 
 		expression = parser.parseExpression("T(java.lang.String[][][])");
-		result = expression.getValue(context, "");
-		assertThat(result.toString()).as("Equal assertion failed: ").isEqualTo("class [[[Ljava.lang.String;");
+		result = expression.getValue(context);
+		assertThat(result).asString().isEqualTo("class [[[Ljava.lang.String;");
 		assertThat(((SpelExpression) expression).toStringAST()).isEqualTo("T(java.lang.String[][][])");
 
 		expression = parser.parseExpression("new int[0].class");
-		result = expression.getValue(context, "");
-		assertThat(result.toString()).as("Equal assertion failed: ").isEqualTo("class [I");
+		result = expression.getValue(context);
+		assertThat(result).asString().isEqualTo("class [I");
 
 		expression = parser.parseExpression("T(int[][])");
-		result = expression.getValue(context, "");
-		assertThat(result.toString()).isEqualTo("class [[I");
+		result = expression.getValue(context);
+		assertThat(result).asString().isEqualTo("class [[I");
 	}
 
 	@Test
@@ -1587,12 +1587,12 @@ class SpelReproTests extends AbstractExpressionTests {
 		// #this should be the element from list1
 		Expression ex = parser.parseExpression("#list1.?[#list2.contains(#this)]");
 		Object result = ex.getValue(context);
-		assertThat(result.toString()).isEqualTo("[x]");
+		assertThat(result).asString().isEqualTo("[x]");
 
 		// toString() should be called on the element from list1
 		ex = parser.parseExpression("#list1.?[#list2.contains(toString())]");
 		result = ex.getValue(context);
-		assertThat(result.toString()).isEqualTo("[x]");
+		assertThat(result).asString().isEqualTo("[x]");
 
 		List list3 = new ArrayList();
 		list3.add(1);
@@ -1604,11 +1604,11 @@ class SpelReproTests extends AbstractExpressionTests {
 		context.setVariable("list3", list3);
 		ex = parser.parseExpression("#list3.?[#this > 2]");
 		result = ex.getValue(context);
-		assertThat(result.toString()).isEqualTo("[3, 4]");
+		assertThat(result).asString().isEqualTo("[3, 4]");
 
 		ex = parser.parseExpression("#list3.?[#this >= T(java.lang.Math).abs(T(java.lang.Math).abs(#this))]");
 		result = ex.getValue(context);
-		assertThat(result.toString()).isEqualTo("[1, 2, 3, 4]");
+		assertThat(result).asString().isEqualTo("[1, 2, 3, 4]");
 	}
 
 	@Test
@@ -1628,11 +1628,11 @@ class SpelReproTests extends AbstractExpressionTests {
 		// #this should be the element from list1
 		Expression ex = parser.parseExpression("#map1.?[#map2.containsKey(#this.getKey())]");
 		Object result = ex.getValue(context);
-		assertThat(result.toString()).isEqualTo("{X=66}");
+		assertThat(result).asString().isEqualTo("{X=66}");
 
 		ex = parser.parseExpression("#map1.?[#map2.containsKey(key)]");
 		result = ex.getValue(context);
-		assertThat(result.toString()).isEqualTo("{X=66}");
+		assertThat(result).asString().isEqualTo("{X=66}");
 	}
 
 	@Test