Refine use of isArray() and componentType()

Author: sbrannen

spring-beans/src/main/java/org/springframework/beans/AbstractNestablePropertyAccessor.java

@@ -288,18 +288,17 @@ private void processKeyedProperty(PropertyTokenHolder tokens, PropertyValue pv)
 		String lastKey = tokens.keys[tokens.keys.length - 1];
 
 		if (propValue.getClass().isArray()) {
-			Class<?> requiredType = propValue.getClass().componentType();
+			Class<?> componentType = propValue.getClass().componentType();
 			int arrayIndex = Integer.parseInt(lastKey);
 			Object oldValue = null;
 			try {
 				if (isExtractOldValueForEditor() && arrayIndex < Array.getLength(propValue)) {
 					oldValue = Array.get(propValue, arrayIndex);
 				}
 				Object convertedValue = convertIfNecessary(tokens.canonicalName, oldValue, pv.getValue(),
-						requiredType, ph.nested(tokens.keys.length));
+						componentType, ph.nested(tokens.keys.length));
 				int length = Array.getLength(propValue);
 				if (arrayIndex >= length && arrayIndex < this.autoGrowCollectionLimit) {
-					Class<?> componentType = propValue.getClass().componentType();
 					Object newArray = Array.newInstance(componentType, arrayIndex + 1);
 					System.arraycopy(propValue, 0, newArray, 0, length);
 					int lastKeyIndex = tokens.canonicalName.lastIndexOf('[');

spring-core/src/main/java/org/springframework/core/annotation/RepeatableContainers.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2023 the original author or authors.
+ * Copyright 2002-2025 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.
@@ -211,7 +211,7 @@ private static class ExplicitRepeatableContainer extends RepeatableContainers {
 					throw new NoSuchMethodException("No value method found");
 				}
 				Class<?> returnType = valueMethod.getReturnType();
-				if (!returnType.isArray() || returnType.componentType() != repeatable) {
+				if (returnType.componentType() != repeatable) {
 					throw new AnnotationConfigurationException(
 							"Container type [%s] must declare a 'value' attribute for an array of type [%s]"
 								.formatted(container.getName(), repeatable.getName()));

spring-expression/src/main/java/org/springframework/expression/spel/CodeFlow.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2024 the original author or authors.
+ * Copyright 2002-2025 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.
@@ -516,11 +516,9 @@ public static String createSignatureDescriptor(Constructor<?> ctor) {
 	 */
 	public static String toJvmDescriptor(Class<?> clazz) {
 		StringBuilder sb = new StringBuilder();
-		if (clazz.isArray()) {
-			while (clazz.isArray()) {
-				sb.append('[');
-				clazz = clazz.componentType();
-			}
+		while (clazz.isArray()) {
+			sb.append('[');
+			clazz = clazz.componentType();
 		}
 		if (clazz.isPrimitive()) {
 			if (clazz == boolean.class) {

spring-messaging/src/main/java/org/springframework/messaging/rsocket/service/DestinationVariableArgumentResolver.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2023 the original author or authors.
+ * Copyright 2002-2025 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.
@@ -49,8 +49,8 @@ public boolean resolve(
 				collection.forEach(requestValues::addRouteVariable);
 				return true;
 			}
-			else if (argument.getClass().isArray()) {
-				for (Object variable : (Object[]) argument) {
+			else if (argument instanceof Object[] arguments) {
+				for (Object variable : arguments) {
 					requestValues.addRouteVariable(variable);
 				}
 				return true;

spring-oxm/src/main/java/org/springframework/oxm/jaxb/Jaxb2Marshaller.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2024 the original author or authors.
+ * Copyright 2002-2025 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.
@@ -623,7 +623,7 @@ public boolean supports(Type genericType) {
 					parameterizedType.getActualTypeArguments().length == 1) {
 				Type typeArgument = parameterizedType.getActualTypeArguments()[0];
 				if (typeArgument instanceof Class<?> classArgument) {
-					return ((classArgument.isArray() && byte.class == classArgument.componentType()) ||
+					return ((byte.class == classArgument.componentType()) ||
 							isPrimitiveWrapper(classArgument) || isStandardClass(classArgument) ||
 							supportsInternal(classArgument, false));
 				}

spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/AbstractMultiCheckedElementTag.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2023 the original author or authors.
+ * Copyright 2002-2025 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.
@@ -208,11 +208,10 @@ protected int writeTagContent(TagWriter tagWriter) throws JspException {
 			throw new IllegalArgumentException("Attribute 'items' is required and must be a Collection, an Array or a Map");
 		}
 
-		if (itemsObject.getClass().isArray()) {
-			Object[] itemsArray = (Object[]) itemsObject;
-			for (int i = 0; i < itemsArray.length; i++) {
-				Object item = itemsArray[i];
-				writeObjectEntry(tagWriter, valueProperty, labelProperty, item, i);
+		if (itemsObject instanceof Object[] itemsArray) {
+			for (int itemIndex = 0; itemIndex < itemsArray.length; itemIndex++) {
+				Object item = itemsArray[itemIndex];
+				writeObjectEntry(tagWriter, valueProperty, labelProperty, item, itemIndex);
 			}
 		}
 		else if (itemsObject instanceof Collection<?> optionCollection) {