(commons-beanutils) branch master updated: Use simple class names

[ggregory]

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

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


The following commit(s) were added to refs/heads/master by this push:
     new 72150eee Use simple class names
72150eee is described below

commit 72150eee68e426e0d1b33754a6b7145f8b082c58
Author: Gary Gregory <garydgreg...@gmail.com>
AuthorDate: Sat Aug 31 13:36:53 2024 -0400

    Use simple class names
---
 .../org/apache/commons/beanutils2/PropertyUtilsBean.java     | 12 ++++++------
 .../apache/commons/beanutils2/converters/ArrayConverter.java |  4 ++--
 .../beanutils2/locale/converters/DateLocaleConverter.java    |  5 +++--
 3 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/src/main/java/org/apache/commons/beanutils2/PropertyUtilsBean.java 
b/src/main/java/org/apache/commons/beanutils2/PropertyUtilsBean.java
index 642b04b1..7d7ef87a 100644
--- a/src/main/java/org/apache/commons/beanutils2/PropertyUtilsBean.java
+++ b/src/main/java/org/apache/commons/beanutils2/PropertyUtilsBean.java
@@ -476,12 +476,12 @@ public class PropertyUtilsBean {
         // Call the property getter and return the value
         final Object value = invokeMethod(readMethod, bean, 
BeanUtils.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 {
@@ -622,8 +622,8 @@ public class PropertyUtilsBean {
           }
         final Object invokeResult = invokeMethod(readMethod, bean, 
BeanUtils.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;
@@ -1691,8 +1691,8 @@ public class PropertyUtilsBean {
           }
         final Object invokeResult = invokeMethod(readMethod, bean, 
BeanUtils.EMPTY_OBJECT_ARRAY);
         /* test and fetch from the map */
-        if (invokeResult instanceof java.util.Map) {
-          final java.util.Map<String, Object> map = 
toPropertyMap(invokeResult);
+        if (invokeResult instanceof Map) {
+          final Map<String, Object> map = toPropertyMap(invokeResult);
           map.put(key, value);
         }
         }
diff --git 
a/src/main/java/org/apache/commons/beanutils2/converters/ArrayConverter.java 
b/src/main/java/org/apache/commons/beanutils2/converters/ArrayConverter.java
index 269d1f85..2111c678 100644
--- a/src/main/java/org/apache/commons/beanutils2/converters/ArrayConverter.java
+++ b/src/main/java/org/apache/commons/beanutils2/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;
 import java.util.Objects;
@@ -191,7 +192,6 @@ public class ArrayConverter<C> extends AbstractConverter<C> 
{
     }
 
     /**
-     * <p>
      * Converts non-array values to a Collection prior
      * to being converted either to an array or a String.
      * <ul>
@@ -216,7 +216,7 @@ public class ArrayConverter<C> extends AbstractConverter<C> 
{
         }
         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/beanutils2/locale/converters/DateLocaleConverter.java
 
b/src/main/java/org/apache/commons/beanutils2/locale/converters/DateLocaleConverter.java
index 0adbf6f5..246424a2 100644
--- 
a/src/main/java/org/apache/commons/beanutils2/locale/converters/DateLocaleConverter.java
+++ 
b/src/main/java/org/apache/commons/beanutils2/locale/converters/DateLocaleConverter.java
@@ -22,6 +22,7 @@ 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;
 
@@ -230,8 +231,8 @@ public class DateLocaleConverter<D extends Date> extends 
BaseLocaleConverter<D>
         }
 
         // Handle Calendar
-        if (value instanceof java.util.Calendar) {
-            return (D) ((java.util.Calendar) value).getTime();
+        if (value instanceof Calendar) {
+            return (D) ((Calendar) value).getTime();
         }
 
         if (localizedPattern) {