You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by gg...@apache.org on 2025/08/12 17:37:25 UTC

(commons-beanutils) 03/04: Replace cascading if-else with a map lookup

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

commit e29a5003de8441648e4728391648a4a94d68136c
Author: ggregory <ga...@gmail.com>
AuthorDate: Tue Aug 12 10:56:00 2025 -0400

    Replace cascading if-else with a map lookup
    
    Remove unused
    org.apache.commons.beanutils2.MethodUtils.getPrimitiveWrapper(Class) in
    favor of org.apache.commons.lang3.ClassUtils.primitiveToWrapper(Class)
---
 src/changes/changes.xml                            |  1 +
 .../org/apache/commons/beanutils2/MethodUtils.java | 40 ++--------------------
 2 files changed, 4 insertions(+), 37 deletions(-)

diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index 4bb06c3b..f7221243 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -49,6 +49,7 @@
       <action dev="ggregory" type="remove" due-to="Gary Gregory">Remove unused org.apache.commons.beanutils2.MethodUtils.invokeStaticMethod(Class, String, Object[], Class[]) in favor of Apache Commons Lang's org.apache.commons.lang3.reflect.MethodUtils.</action>
       <action dev="ggregory" type="remove" due-to="Gary Gregory">Remove unused org.apache.commons.beanutils2.MethodUtils.toNonPrimitiveClass(Class) in favor of org.apache.commons.lang3.ClassUtils.primitiveToWrapper(Class).</action>
       <action dev="ggregory" type="remove" due-to="Gary Gregory">Remove unused org.apache.commons.beanutils2.MethodUtils.getPrimitiveType(Class) in favor of org.apache.commons.lang3.ClassUtils.wrapperToPrimitive(Class).</action>
+      <action dev="ggregory" type="remove" due-to="Gary Gregory">Remove unused org.apache.commons.beanutils2.MethodUtils.getPrimitiveWrapper(Class) in favor of org.apache.commons.lang3.ClassUtils.primitiveToWrapper(Class).</action>
     </release>
     <release version="2.0.0-M2" date="2025-05-25" description="This is a major release and requires Java 8.">
       <!-- FIX -->
diff --git a/src/main/java/org/apache/commons/beanutils2/MethodUtils.java b/src/main/java/org/apache/commons/beanutils2/MethodUtils.java
index 63e75942..0766a0d3 100644
--- a/src/main/java/org/apache/commons/beanutils2/MethodUtils.java
+++ b/src/main/java/org/apache/commons/beanutils2/MethodUtils.java
@@ -28,6 +28,7 @@ import java.util.Map;
 import java.util.Objects;
 import java.util.WeakHashMap;
 
+import org.apache.commons.lang3.ClassUtils;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
@@ -493,7 +494,7 @@ public final class MethodUtils {
         float cost = 0.0f;
         while (srcClass != null && !destClass.equals(srcClass)) {
             if (destClass.isPrimitive()) {
-                final Class<?> destClassWrapperClazz = getPrimitiveWrapper(destClass);
+                final Class<?> destClassWrapperClazz = ClassUtils.wrapperToPrimitive(destClass);
                 if (destClassWrapperClazz != null && destClassWrapperClazz.equals(srcClass)) {
                     cost += 0.25f;
                     break;
@@ -521,41 +522,6 @@ public final class MethodUtils {
         return cost;
     }
 
-    /**
-     * Gets the wrapper object class for the given primitive type class. For example, passing {@code boolean.class</code> returns <code>Boolean.class}
-     *
-     * @param primitiveType the primitive type class for which a match is to be found
-     * @return the wrapper type associated with the given primitive or null if no match is found
-     */
-    public static Class<?> getPrimitiveWrapper(final Class<?> primitiveType) {
-        // does anyone know a better strategy than comparing names?
-        if (boolean.class.equals(primitiveType)) {
-            return Boolean.class;
-        }
-        if (float.class.equals(primitiveType)) {
-            return Float.class;
-        }
-        if (long.class.equals(primitiveType)) {
-            return Long.class;
-        }
-        if (int.class.equals(primitiveType)) {
-            return Integer.class;
-        }
-        if (short.class.equals(primitiveType)) {
-            return Short.class;
-        }
-        if (byte.class.equals(primitiveType)) {
-            return Byte.class;
-        }
-        if (double.class.equals(primitiveType)) {
-            return Double.class;
-        }
-        if (char.class.equals(primitiveType)) {
-            return Character.class;
-        }
-        return null;
-    }
-
     /**
      * Returns the sum of the object transformation cost for each class in the source argument list.
      *
@@ -749,7 +715,7 @@ public final class MethodUtils {
         if (parameterType.isPrimitive()) {
             // this method does *not* do widening - you must specify exactly
             // is this the right behavior?
-            final Class<?> parameterWrapperClazz = getPrimitiveWrapper(parameterType);
+            final Class<?> parameterWrapperClazz = ClassUtils.wrapperToPrimitive(parameterType);
             if (parameterWrapperClazz != null) {
                 return parameterWrapperClazz.equals(parameterization);
             }