(commons-beanutils) branch 1.X updated: Use simple class names

[ggregory]

This is an automated email from the ASF dual-hosted git repository.

ggregory pushed a commit to branch 1.X
in repository https://gitbox.apache.org/repos/asf/commons-beanutils.git


The following commit(s) were added to refs/heads/1.X by this push:
     new f1d0e348 Use simple class names
f1d0e348 is described below

commit f1d0e3487978f697b3206ea4b2666fb8ca874e16
Author: Gary Gregory <garydgreg...@gmail.com>
AuthorDate: Sat Aug 31 17:29:58 2024 -0400

    Use simple class names
---
 src/main/java/org/apache/commons/beanutils/PropertyUtilsBean.java | 8 ++++----
 .../org/apache/commons/beanutils/converters/ArrayConverter.java   | 3 ++-
 .../commons/beanutils/locale/converters/DateLocaleConverter.java  | 8 +++++---
 3 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/src/main/java/org/apache/commons/beanutils/PropertyUtilsBean.java 
b/src/main/java/org/apache/commons/beanutils/PropertyUtilsBean.java
index f81ebe11..11d2ac94 100644
--- a/src/main/java/org/apache/commons/beanutils/PropertyUtilsBean.java
+++ b/src/main/java/org/apache/commons/beanutils/PropertyUtilsBean.java
@@ -519,12 +519,12 @@ public class PropertyUtilsBean {
         // Call the property getter and return the value
         final Object value = invokeMethod(readMethod, bean, 
EMPTY_OBJECT_ARRAY);
         if (!value.getClass().isArray()) {
-            if (!(value instanceof java.util.List)) {
+            if (!(value instanceof List)) {
                 throw new IllegalArgumentException("Property '" + name +
                         "' is not indexed on bean class '" + bean.getClass() + 
"'");
             }
             //get the List's value
-            return ((java.util.List<?>) value).get(index);
+            return ((List<?>) value).get(index);
         }
         //get the array's value
         try {
@@ -693,8 +693,8 @@ public class PropertyUtilsBean {
           }
         final Object invokeResult = invokeMethod(readMethod, bean, 
EMPTY_OBJECT_ARRAY);
         /* test and fetch from the map */
-        if (invokeResult instanceof java.util.Map) {
-          result = ((java.util.Map<?, ?>)invokeResult).get(key);
+        if (invokeResult instanceof Map) {
+          result = ((Map<?, ?>)invokeResult).get(key);
         }
         }
         return result;
diff --git 
a/src/main/java/org/apache/commons/beanutils/converters/ArrayConverter.java 
b/src/main/java/org/apache/commons/beanutils/converters/ArrayConverter.java
index 9bf8324a..d728d076 100644
--- a/src/main/java/org/apache/commons/beanutils/converters/ArrayConverter.java
+++ b/src/main/java/org/apache/commons/beanutils/converters/ArrayConverter.java
@@ -23,6 +23,7 @@ import java.lang.reflect.Array;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
+import java.util.Date;
 import java.util.Iterator;
 import java.util.List;
 
@@ -218,7 +219,7 @@ public class ArrayConverter extends AbstractConverter {
         }
         if (value instanceof Number ||
             value instanceof Boolean ||
-            value instanceof java.util.Date) {
+            value instanceof Date) {
             final List<Object> list = new ArrayList<>(1);
             list.add(value);
             return list;
diff --git 
a/src/main/java/org/apache/commons/beanutils/locale/converters/DateLocaleConverter.java
 
b/src/main/java/org/apache/commons/beanutils/locale/converters/DateLocaleConverter.java
index 4c25b9f9..8c78951c 100644
--- 
a/src/main/java/org/apache/commons/beanutils/locale/converters/DateLocaleConverter.java
+++ 
b/src/main/java/org/apache/commons/beanutils/locale/converters/DateLocaleConverter.java
@@ -22,6 +22,8 @@ import java.text.DateFormatSymbols;
 import java.text.ParseException;
 import java.text.ParsePosition;
 import java.text.SimpleDateFormat;
+import java.util.Calendar;
+import java.util.Date;
 import java.util.Locale;
 
 import org.apache.commons.beanutils.ConversionException;
@@ -329,13 +331,13 @@ public class DateLocaleConverter extends 
BaseLocaleConverter {
     protected Object parse(final Object value, String pattern) throws 
ParseException {
 
         // Handle Date
-        if (value instanceof java.util.Date) {
+        if (value instanceof Date) {
             return value;
         }
 
         // Handle Calendar
-        if (value instanceof java.util.Calendar) {
-            return ((java.util.Calendar)value).getTime();
+        if (value instanceof Calendar) {
+            return ((Calendar) value).getTime();
         }
 
          if (locPattern) {