From 3171a8b0e2d7a4bfbdf27739f1c5beab565e25c9 Mon Sep 17 00:00:00 2001 From: Juergen Hoeller Date: Wed, 14 Jun 2023 11:18:18 +0200 Subject: [PATCH] Align with 5.3.28 javadoc for isSimpleValueType See gh-30661 --- .../src/main/java/org/springframework/util/ObjectUtils.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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 fd4fb57588..bf873018f1 100644 --- a/spring-core/src/main/java/org/springframework/util/ObjectUtils.java +++ b/spring-core/src/main/java/org/springframework/util/ObjectUtils.java @@ -941,6 +941,7 @@ public abstract class ObjectUtils { /** * Derived from {@link org.springframework.beans.BeanUtils#isSimpleValueType}. + * As of 5.3.28, considering {@code UUID} in addition to the bean-level check. */ private static boolean isSimpleValueType(Class type) { return (Void.class != type && void.class != type && @@ -950,7 +951,7 @@ public abstract class ObjectUtils { Number.class.isAssignableFrom(type) || Date.class.isAssignableFrom(type) || Temporal.class.isAssignableFrom(type) || - UUID.class.isAssignableFrom(type) || + UUID.class == type || URI.class == type || URL.class == type || Locale.class == type ||