Polishing

Author: jhoeller

Diff for: spring-beans/src/main/java/org/springframework/beans/AbstractNestablePropertyAccessor.java

@@ -291,18 +291,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('[');

Diff for: spring-jdbc/src/main/java/org/springframework/jdbc/core/SingleColumnRowMapper.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.
@@ -85,12 +85,13 @@ public void setRequiredType(Class<T> requiredType) {
 	 * Set a {@link ConversionService} for converting a fetched value.
 	 * <p>Default is the {@link DefaultConversionService}.
 	 * @since 5.0.4
-	 * @see DefaultConversionService#getSharedInstance
+	 * @see DefaultConversionService#getSharedInstance()
 	 */
 	public void setConversionService(@Nullable ConversionService conversionService) {
 		this.conversionService = conversionService;
 	}
 
+
 	/**
 	 * Extract a value for the single column in the current row.
 	 * <p>Validates that there is only one column selected,

Diff for: 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.
@@ -48,8 +48,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;

Diff for: spring-web/src/main/java/org/springframework/web/client/DefaultRestClient.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.
@@ -150,6 +150,7 @@ final class DefaultRestClient implements RestClient {
 		this.builder = builder;
 	}
 
+
 	@Override
 	public RequestHeadersUriSpec<?> get() {
 		return methodInternal(HttpMethod.GET);
@@ -283,8 +284,6 @@ private static <T> Class<T> bodyClass(Type type) {
 	}
 
 
-
-
 	private class DefaultRequestBodyUriSpec implements RequestBodyUriSpec {
 
 		private final HttpMethod httpMethod;
@@ -523,7 +522,6 @@ private void logBody(Object body, @Nullable MediaType mediaType, HttpMessageConv
 			}
 		}
 
-
 		@Override
 		public ResponseSpec retrieve() {
 			return new DefaultResponseSpec(this);
@@ -832,7 +830,6 @@ private void applyStatusHandlers(HttpRequest request, ClientHttpResponse respons
 				throw new UncheckedIOException(ex);
 			}
 		}
-
 	}
 
 
@@ -882,8 +879,6 @@ public String getStatusText() throws IOException {
 		public void close() {
 			this.delegate.close();
 		}
-
 	}
 
-
 }

Diff for: 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.
@@ -217,11 +217,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) {