修复无法复制代理对象问题

zhou-hao · zhou-hao · commit fc5e18d3a21b · 2019-09-21T19:22:51.000+08:00
diff --git a/hsweb-core/src/main/java/org/hswebframework/web/bean/FastBeanCopier.java b/hsweb-core/src/main/java/org/hswebframework/web/bean/FastBeanCopier.java
@@ -114,9 +114,23 @@ public static <T, S> T copy(S source, T target, Converter converter, Set<String>
         return target;
     }
 
+    static Class getUserClass(Object object) {
+        if (object instanceof Map) {
+            return Map.class;
+        }
+        Class type = ClassUtils.getUserClass(object);
+
+        if (java.lang.reflect.Proxy.isProxyClass(type)) {
+            Class[] interfaces= type.getInterfaces();
+            return interfaces[0];
+        }
+
+        return type;
+    }
+
     public static Copier getCopier(Object source, Object target, boolean autoCreate) {
-        Class sourceType = source instanceof Map ? Map.class : ClassUtils.getUserClass(source);
-        Class targetType = target instanceof Map ? Map.class : ClassUtils.getUserClass(target);
+        Class sourceType = getUserClass(source);
+        Class targetType = getUserClass(target);
         CacheKey key = createCacheKey(sourceType, targetType);
         if (autoCreate) {
             return CACHE.computeIfAbsent(key, k -> createCopier(sourceType, targetType));
@@ -541,7 +555,7 @@ public <T> T convert(Object source, Class<T> targetClass, Class[] genericType) {
 
             if (targetClass.isEnum()) {
                 if (EnumDict.class.isAssignableFrom(targetClass)) {
-                    String strVal=String.valueOf(source);
+                    String strVal = String.valueOf(source);
 
                     Object val = EnumDict.find((Class) targetClass, e -> {
                         return e.eq(source) || e.name().equalsIgnoreCase(strVal);
@@ -564,7 +578,7 @@ public <T> T convert(Object source, Class<T> targetClass, Class[] genericType) {
             if (targetClass.isArray()) {
                 Class<?> componentType = targetClass.getComponentType();
                 List<?> val = convert(source, List.class, new Class[]{componentType});
-                return (T) val.toArray((Object[])Array.newInstance(componentType,val.size()));
+                return (T) val.toArray((Object[]) Array.newInstance(componentType, val.size()));
             }
 
             try {
diff --git a/hsweb-core/src/test/java/org/hswebframework/web/bean/FastBeanCopierTest.java b/hsweb-core/src/test/java/org/hswebframework/web/bean/FastBeanCopierTest.java
@@ -1,14 +1,15 @@
 package org.hswebframework.web.bean;
 
-import org.apache.commons.beanutils.BeanUtils;
 import org.junit.Assert;
 import org.junit.Test;
 
 import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Proxy;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
+import java.util.concurrent.atomic.AtomicReference;
 
 /**
  * @author zhouhao
@@ -44,8 +45,8 @@ public void test() throws InvocationTargetException, IllegalAccessException {
 
     @Test
     public void testMapArray() {
-       Map<String,Object> data =new HashMap<>();
-       data.put("colors", Arrays.asList("RED"));
+        Map<String, Object> data = new HashMap<>();
+        data.put("colors", Arrays.asList("RED"));
 
 
         Target target = new Target();
@@ -82,4 +83,41 @@ public void testCopyMap() {
     }
 
 
+    @Test
+    public void testProxy() {
+        AtomicReference<Object> reference=new AtomicReference<>();
+
+        ProxyTest test = (ProxyTest) Proxy.newProxyInstance(ClassLoader.getSystemClassLoader(),
+                new Class[]{ProxyTest.class}, (proxy, method, args) -> {
+                    if (method.getName().equals("getName")) {
+                        return "test";
+                    }
+
+                    if (method.getName().equals("setName")) {
+                        reference.set(args[0]);
+                        return null;
+                    }
+
+                    return null;
+                });
+
+        Target source = new Target();
+
+        FastBeanCopier.copy(test,source);
+        Assert.assertEquals(source.getName(),test.getName());
+
+
+        source.setName("test2");
+        FastBeanCopier.copy(source,test);
+
+        Assert.assertEquals(reference.get(),source.getName());
+    }
+
+
+    public interface ProxyTest {
+        String getName();
+
+        void setName(String name);
+    }
+
 }
