Relocate method: classFor(asmType) to Types

Because of single responsibility and code reusability, moved method classFor(asmType) to an internal util class Types
modelmapper · Apr 28, 2017 · 6796071 · 6796071
1 parent 66c4617
commit 6796071
Show file tree

Hide file tree

Showing 2 changed files with 36 additions and 32 deletions.
diff --git a/core/src/main/java/org/modelmapper/internal/ExplicitMappingVisitor.java b/core/src/main/java/org/modelmapper/internal/ExplicitMappingVisitor.java
@@ -1,6 +1,5 @@
 package org.modelmapper.internal;
 
-import java.lang.reflect.Array;
 import java.lang.reflect.Field;
 import java.lang.reflect.Member;
 import java.lang.reflect.Method;
@@ -15,6 +14,7 @@
 import org.modelmapper.internal.PropertyInfoImpl.FieldPropertyInfo;
 import org.modelmapper.internal.util.Members;
 import org.modelmapper.internal.util.Primitives;
+import org.modelmapper.internal.util.Types;
 import org.modelmapper.spi.NameableType;
 import org.objectweb.asm.ClassVisitor;
 import org.objectweb.asm.FieldVisitor;
@@ -330,41 +330,15 @@ private Method methodFor(Class<?> type, Type methodType, MethodInsnNode mn) {
     Type[] argumentTypes = methodType.getArgumentTypes();
     Class<?>[] paramTypes = new Class<?>[argumentTypes.length];
     for (int i = 0; i < paramTypes.length; i++) {
-      paramTypes[i] = classFor(argumentTypes[i]);
+      try {
+        paramTypes[i] = Types.classFor(argumentTypes[i], propertyMapClassLoader);
+      } catch (ClassNotFoundException e) {
+        throw errors.errorResolvingClass(e, argumentTypes[i].getClassName()).toException();
+      }
     }
     return Members.methodFor(type, mn.name, paramTypes);
   }
 
-  /**
-   * Returns a origin class for the ASM {@code type}, else {@code null}.
-   */
-  public Class<?> classFor(Type type) {
-    switch (type.getSort()) {
-      case Type.BOOLEAN:
-        return Boolean.TYPE;
-      case Type.CHAR:
-        return Character.TYPE;
-      case Type.BYTE:
-        return Byte.TYPE;
-      case Type.SHORT:
-        return Short.TYPE;
-      case Type.INT:
-        return Integer.TYPE;
-      case Type.LONG:
-        return Long.TYPE;
-      case Type.FLOAT:
-        return Float.TYPE;
-      case Type.DOUBLE:
-        return Double.TYPE;
-      case Type.ARRAY:
-        return Array.newInstance(classFor(type.getElementType()), new int[type.getDimensions()])
-            .getClass();
-      case Type.OBJECT:
-      default:
-        return classFor(type.getClassName());
-    }
-  }
-
   private Class<?> classFor(String className) {
     try {
       return Class.forName(className, true, propertyMapClassLoader);

diff --git a/core/src/main/java/org/modelmapper/internal/util/Types.java b/core/src/main/java/org/modelmapper/internal/util/Types.java
@@ -127,6 +127,36 @@ public static Class<?> rawTypeFor(Type type) {
     }
   }
 
+  /**
+   * Returns a origin class for the ASM {@code type}, else {@code null}.
+   */
+  public static Class<?> classFor(org.objectweb.asm.Type type, ClassLoader classLoader) throws ClassNotFoundException {
+    switch (type.getSort()) {
+      case org.objectweb.asm.Type.BOOLEAN:
+        return Boolean.TYPE;
+      case org.objectweb.asm.Type.CHAR:
+        return Character.TYPE;
+      case org.objectweb.asm.Type.BYTE:
+        return Byte.TYPE;
+      case org.objectweb.asm.Type.SHORT:
+        return Short.TYPE;
+      case org.objectweb.asm.Type.INT:
+        return Integer.TYPE;
+      case org.objectweb.asm.Type.LONG:
+        return Long.TYPE;
+      case org.objectweb.asm.Type.FLOAT:
+        return Float.TYPE;
+      case org.objectweb.asm.Type.DOUBLE:
+        return Double.TYPE;
+      case org.objectweb.asm.Type.ARRAY:
+        return Array.newInstance(classFor(type.getElementType(), classLoader), new int[type.getDimensions()])
+            .getClass();
+      case org.objectweb.asm.Type.OBJECT:
+      default:
+        return Class.forName(type.getClassName(), true, classLoader);
+    }
+  }
+
   /**
    * Returns a simplified String representation of the {@code member}.
    */