From f6110dda06220f4bd4ab023adaf1c42b679ad210 Mon Sep 17 00:00:00 2001
From: Sam Brannen <104798+sbrannen@users.noreply.github.com>
Date: Thu, 8 Aug 2024 17:48:57 +0300
Subject: [PATCH] Polishing

---
 .../org/springframework/util/ObjectUtils.java   |  6 +++---
 .../springframework/util/ObjectUtilsTests.java  | 17 +++++++++--------
 .../test/http/MediaTypeAssert.java              |  2 +-
 3 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/spring-core/src/main/java/org/springframework/util/ObjectUtils.java b/spring-core/src/main/java/org/springframework/util/ObjectUtils.java
index 70f6f9f64c..06dd448d76 100644
--- a/spring-core/src/main/java/org/springframework/util/ObjectUtils.java
+++ b/spring-core/src/main/java/org/springframework/util/ObjectUtils.java
@@ -288,9 +288,9 @@ public abstract class ObjectUtils {
 	}
 
 	/**
-	 * Convert the given array (which may be a primitive array) to an
-	 * object array (if necessary of primitive wrapper objects).
-	 * <p>A {@code null} source value will be converted to an
+	 * Convert the given array (which may be a primitive array) to an object array (if
+	 * necessary, to an array of primitive wrapper objects).
+	 * <p>A {@code null} source value or empty primitive array will be converted to an
 	 * empty Object array.
 	 * @param source the (potentially primitive) array
 	 * @return the corresponding object array (never {@code null})
diff --git a/spring-core/src/test/java/org/springframework/util/ObjectUtilsTests.java b/spring-core/src/test/java/org/springframework/util/ObjectUtilsTests.java
index f7107de888..4ea30cfa4a 100644
--- a/spring-core/src/test/java/org/springframework/util/ObjectUtilsTests.java
+++ b/spring-core/src/test/java/org/springframework/util/ObjectUtilsTests.java
@@ -188,19 +188,20 @@ class ObjectUtilsTests {
 
 	@Test
 	void toObjectArrayWithNonArrayType() {
-		assertThatIllegalArgumentException().isThrownBy(() ->
-				ObjectUtils.toObjectArray("Not an []"));
+		assertThatIllegalArgumentException()
+				.isThrownBy(() -> ObjectUtils.toObjectArray("Not an []"))
+				.withMessageStartingWith("Source is not an array");
 	}
 
 	@Test
 	void toObjectArrayWithNonPrimitiveArray() {
-		String[] source = new String[] {"Bingo"};
-		assertThat(ObjectUtils.toObjectArray(source)).isEqualTo(source);
+		String[] source = {"Bingo"};
+		assertThat(ObjectUtils.toObjectArray(source)).isSameAs(source);
 	}
 
 	@Test
 	void addObjectToArraySunnyDay() {
-		String[] array = new String[] {"foo", "bar"};
+		String[] array = {"foo", "bar"};
 		String newElement = "baz";
 		Object[] newArray = ObjectUtils.addObjectToArray(array, newElement);
 		assertThat(newArray).hasSize(3);
@@ -209,7 +210,7 @@ class ObjectUtilsTests {
 
 	@Test
 	void addObjectToArraysAtPosition() {
-		String[] array = new String[] {"foo", "bar", "baz"};
+		String[] array = {"foo", "bar", "baz"};
 		assertThat(ObjectUtils.addObjectToArray(array, "bat", 3)).containsExactly("foo", "bar", "baz", "bat");
 		assertThat(ObjectUtils.addObjectToArray(array, "bat", 2)).containsExactly("foo", "bar", "bat", "baz");
 		assertThat(ObjectUtils.addObjectToArray(array, "bat", 1)).containsExactly("foo", "bat", "bar", "baz");
@@ -228,7 +229,7 @@ class ObjectUtilsTests {
 	@Test
 	void addObjectToSingleNonNullElementArray() {
 		String existingElement = "foo";
-		String[] array = new String[] {existingElement};
+		String[] array = {existingElement};
 		String newElement = "bar";
 		String[] newArray = ObjectUtils.addObjectToArray(array, newElement);
 		assertThat(newArray).hasSize(2);
@@ -238,7 +239,7 @@ class ObjectUtilsTests {
 
 	@Test
 	void addObjectToSingleNullElementArray() {
-		String[] array = new String[] {null};
+		String[] array = {null};
 		String newElement = "bar";
 		String[] newArray = ObjectUtils.addObjectToArray(array, newElement);
 		assertThat(newArray).hasSize(2);
diff --git a/spring-test/src/main/java/org/springframework/test/http/MediaTypeAssert.java b/spring-test/src/main/java/org/springframework/test/http/MediaTypeAssert.java
index 5c6077cce6..a25b39094d 100644
--- a/spring-test/src/main/java/org/springframework/test/http/MediaTypeAssert.java
+++ b/spring-test/src/main/java/org/springframework/test/http/MediaTypeAssert.java
@@ -51,7 +51,7 @@ public class MediaTypeAssert extends AbstractObjectAssert<MediaTypeAssert, Media
 	 * representation.
 	 * @param mediaType the expected media type, as a String to be parsed
 	 * into a MediaType
-*/
+	 */
 	public MediaTypeAssert isEqualTo(String mediaType) {
 		return isEqualTo(parseMediaType(mediaType));
 	}