Apply instanceof pattern matching in RootBeanDefinition

FelixDes · sbrannen · commit 05b15812bbff · 2024-03-23T09:09:25.000+01:00
Closes gh-32520
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/support/RootBeanDefinition.java b/spring-beans/src/main/java/org/springframework/beans/factory/support/RootBeanDefinition.java
@@ -401,8 +401,8 @@ public Constructor<?>[] getPreferredConstructors() {
 		if (attribute instanceof Constructor<?> constructor) {
 			return new Constructor<?>[] {constructor};
 		}
-		if (attribute instanceof Constructor<?>[]) {
-			return (Constructor<?>[]) attribute;
+		if (attribute instanceof Constructor<?>[] constructors) {
+			return constructors;
 		}
 		throw new IllegalArgumentException("Invalid value type for attribute '" +
 				PREFERRED_CONSTRUCTORS_ATTRIBUTE + "': " + attribute.getClass().getName());

Original file line number	Diff line number	Diff line change
`@@ -401,8 +401,8 @@ public Constructor<?>[] getPreferredConstructors() {`
`401`	`401`	`if (attribute instanceof Constructor<?> constructor) {`
`402`	`402`	`return new Constructor<?>[] {constructor};`
`403`	`403`	`}`
`404`		`- if (attribute instanceof Constructor<?>[]) {`
`405`		`- return (Constructor<?>[]) attribute;`
	`404`	`+ if (attribute instanceof Constructor<?>[] constructors) {`
	`405`	`+ return constructors;`
`406`	`406`	`}`
`407`	`407`	`throw new IllegalArgumentException("Invalid value type for attribute '" +`
`408`	`408`	`PREFERRED_CONSTRUCTORS_ATTRIBUTE + "': " + attribute.getClass().getName());`