deepClone中增加type参数，便于在能获得type的情况下使用

qiujiayu · qiujiayu · commit f0751cb0990f · 2016-06-30T17:42:08.000+08:00
diff --git a/pom.xml b/pom.xml
@@ -2,7 +2,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.github.qiujiayu</groupId>
   <artifactId>autoload-cache</artifactId>
-  <version>4.12</version>
+  <version>4.13-SNAPSHOT</version>
   <packaging>jar</packaging>
   <name>AutoLoadCache</name>
   <description>User Spring AOP and annotation to do with cache.</description>
diff --git a/src/main/java/com/jarvis/cache/clone/Cloning.java b/src/main/java/com/jarvis/cache/clone/Cloning.java
@@ -1,6 +1,7 @@
 package com.jarvis.cache.clone;
 
 import java.lang.reflect.Method;
+import java.lang.reflect.Type;
 
 import com.rits.cloning.Cloner;
 
@@ -9,7 +10,7 @@ public class Cloning implements ICloner {
     private final Cloner cloner=new Cloner();
 
     @Override
-    public Object deepClone(Object obj) throws Exception {
+    public Object deepClone(Object obj, final Type type) throws Exception {
         if(null == obj) {
             return null;
         }
@@ -18,7 +19,7 @@ public Object deepClone(Object obj) throws Exception {
 
     @Override
     public Object[] deepCloneMethodArgs(Method method, Object[] args) throws Exception {
-        return (Object[])deepClone(args);
+        return (Object[])deepClone(args, null);
     }
 
 }
diff --git a/src/main/java/com/jarvis/cache/clone/ICloner.java b/src/main/java/com/jarvis/cache/clone/ICloner.java
@@ -1,6 +1,7 @@
 package com.jarvis.cache.clone;
 
 import java.lang.reflect.Method;
+import java.lang.reflect.Type;
 
 /**
  * 深度复制
@@ -11,10 +12,11 @@ public interface ICloner {
     /**
      * 深度复制Object
      * @param obj Object
+     * @param type obj的类型，方便以json来处理时，提升性能,如果获取不到type，则可以为null
      * @return Object
      * @throws Exception
      */
-    Object deepClone(Object obj) throws Exception;
+    Object deepClone(Object obj, final Type type) throws Exception;
 
     /**
      * 深度复制 Method 中的参数
diff --git a/src/main/java/com/jarvis/cache/map/CachePointCut.java b/src/main/java/com/jarvis/cache/map/CachePointCut.java
@@ -86,7 +86,7 @@ public void setCache(final CacheKeyTO cacheKeyTO, final CacheWrapper<Object> res
         CacheWrapper<Object> value=null;
         if(copyValue) {
             try {
-                value=(CacheWrapper<Object>)this.getCloner().deepClone(value);
+                value=(CacheWrapper<Object>)this.getCloner().deepClone(result, null);// 这里type为null，因为有可以是设置@ExCache缓存
             } catch(Exception e) {
                 e.printStackTrace();
             }
@@ -153,7 +153,11 @@ public CacheWrapper<Object> get(final CacheKeyTO cacheKeyTO, final Method method
         }
         if(copyValue) {
             try {
-                return (CacheWrapper<Object>)this.getCloner().deepClone(value);
+                CacheWrapper<Object> res=new CacheWrapper<Object>();
+                res.setExpire(value.getExpire());
+                res.setLastLoadTime(value.getLastLoadTime());
+                res.setCacheObject(this.getCloner().deepClone(value.getCacheObject(), method.getReturnType()));
+                return res;
             } catch(Exception e) {
                 e.printStackTrace();
             }
diff --git a/src/main/java/com/jarvis/cache/serializer/CompressorSerializer.java b/src/main/java/com/jarvis/cache/serializer/CompressorSerializer.java
@@ -76,8 +76,8 @@ public Object deserialize(final byte[] bytes, final Type returnType) throws Exce
     }
 
     @Override
-    public Object deepClone(Object obj) throws Exception {
-        return serializer.deepClone(obj);
+    public Object deepClone(Object obj, final Type type) throws Exception {
+        return serializer.deepClone(obj, type);
     }
 
     @Override
diff --git a/src/main/java/com/jarvis/cache/serializer/FastjsonSerializer.java b/src/main/java/com/jarvis/cache/serializer/FastjsonSerializer.java
@@ -51,10 +51,14 @@ public Object deserialize(final byte[] bytes, final Type returnType) throws Exce
 
     @SuppressWarnings({"rawtypes", "unchecked"})
     @Override
-    public Object deepClone(Object obj) throws Exception {
+    public Object deepClone(Object obj, final Type type) throws Exception {
         if(null == obj) {
             return null;
         }
+        if(null != type) {
+            String json=JSON.toJSONString(obj, features);
+            return JSON.parseObject(json, type);
+        }
         Class<?> clazz=obj.getClass();
         if(clazz.isArray()) {
             Object[] arr=(Object[])obj;
@@ -63,7 +67,7 @@ public Object deepClone(Object obj) throws Exception {
                 ((Object)clazz == (Object)Object[].class) ? (Object[])new Object[arr.length] : (Object[])Array.newInstance(
                     clazz.getComponentType(), arr.length);
             for(int i=0; i < arr.length; i++) {
-                res[i]=deepClone(arr[i]);
+                res[i]=deepClone(arr[i], null);
             }
             return res;
         } else if(obj instanceof Collection) {
@@ -72,7 +76,7 @@ public Object deepClone(Object obj) throws Exception {
 
             Iterator<?> it=tempCol.iterator();
             while(it.hasNext()) {
-                Object val=deepClone(it.next());
+                Object val=deepClone(it.next(), null);
                 res.add(val);
             }
             return res;
@@ -84,10 +88,16 @@ public Object deepClone(Object obj) throws Exception {
                 Map.Entry entry=(Entry)it.next();
                 Object key=entry.getKey();
                 Object val=entry.getValue();
-                res.put(deepClone(key), deepClone(val));
+                res.put(deepClone(key, null), deepClone(val, null));
             }
             return res;
-
+        } else if(obj instanceof CacheWrapper) {
+            CacheWrapper<Object> wrapper=(CacheWrapper<Object>)obj;
+            CacheWrapper<Object> res=new CacheWrapper<Object>();
+            res.setExpire(wrapper.getExpire());
+            res.setLastLoadTime(wrapper.getLastLoadTime());
+            res.setCacheObject(deepClone(wrapper.getCacheObject(), null));
+            return res;
         } else {
             String json=JSON.toJSONString(obj, features);
             return JSON.parseObject(json, clazz);
@@ -116,7 +126,7 @@ public Object[] deepCloneMethodArgs(Method method, Object[] args) throws Excepti
                 String json=JSON.toJSONString(obj, features);
                 res[i]=JSON.parseObject(json, genericParameterType);
             } else {
-                res[i]=deepClone(obj);
+                res[i]=deepClone(obj, null);
             }
         }
         return res;
diff --git a/src/main/java/com/jarvis/cache/serializer/HessianSerializer.java b/src/main/java/com/jarvis/cache/serializer/HessianSerializer.java
@@ -59,7 +59,7 @@ public Object deserialize(final byte[] bytes, final Type returnType) throws Exce
     }
 
     @Override
-    public Object deepClone(Object obj) throws Exception {
+    public Object deepClone(Object obj, final Type type) throws Exception {
         return deserialize(serialize(obj), null);
     }
 
diff --git a/src/main/java/com/jarvis/cache/serializer/JdkSerializer.java b/src/main/java/com/jarvis/cache/serializer/JdkSerializer.java
@@ -33,7 +33,7 @@ public byte[] serialize(Object obj) throws Exception {
     }
 
     @Override
-    public Object deepClone(Object obj) throws Exception {
+    public Object deepClone(Object obj, final Type type) throws Exception {
         return deserialize(serialize(obj), null);
     }
 
diff --git a/src/main/java/com/jarvis/cache/serializer/StringSerializer.java b/src/main/java/com/jarvis/cache/serializer/StringSerializer.java
@@ -37,7 +37,7 @@ public byte[] serialize(String string) throws Exception {
     }
 
     @Override
-    public Object deepClone(Object obj) throws Exception {
+    public Object deepClone(Object obj, final Type type) throws Exception {
         if(null == obj) {
             return obj;
         }
@@ -47,6 +47,6 @@ public Object deepClone(Object obj) throws Exception {
 
     @Override
     public Object[] deepCloneMethodArgs(Method method, Object[] args) throws Exception {
-        return (Object[])deepClone(args);
+        return (Object[])deepClone(args, null);
     }
 }
diff --git a/src/test/java/com/test/JdkSerializerTest.java b/src/test/java/com/test/JdkSerializerTest.java
@@ -15,7 +15,7 @@ public static void main(String[] args) throws Exception {
         CacheWrapper wrapper=new CacheWrapper();
         wrapper.setCacheObject(Simple.getSimple());
 
-        new JdkSerializer().deepClone(wrapper);
+        new JdkSerializer().deepClone(wrapper, null);
         byte[] data=null;
         for(int i=0; i < 1000; i++) {
             data=write(wrapper);
diff --git a/src/test/java/com/test/WeakReferenceTest.java b/src/test/java/com/test/WeakReferenceTest.java
@@ -20,7 +20,7 @@ public static void main(String[] args) {
         WeakReference<Simple> ref=new WeakReference<Simple>(s);
         s=null;
         try {
-            WeakReference<Simple> ref2=(WeakReference<Simple>)serializer.deepClone(ref);
+            WeakReference<Simple> ref2=(WeakReference<Simple>)serializer.deepClone(ref, null);
             System.out.println(ref2.get());
         } catch(Exception e1) {
             e1.printStackTrace();
@@ -40,7 +40,7 @@ public static void main(String[] args) {
         }
         System.out.println("object a was cleared by JVM!");
         try {
-            WeakReference<Simple> ref2=(WeakReference<Simple>)serializer.deepClone(ref);
+            WeakReference<Simple> ref2=(WeakReference<Simple>)serializer.deepClone(ref, null);
             System.out.println(ref2.get());
         } catch(Exception e1) {
             e1.printStackTrace();
diff --git a/src/test/java/com/test/fastjson/CloningTest.java b/src/test/java/com/test/fastjson/CloningTest.java
@@ -19,7 +19,7 @@ public static void main(String[] args) throws Exception {
         user.setName("test2");
         user.setBirthday(new Date());
         ICloner s=new Cloning();
-        User user2=(User)s.deepClone(user);
+        User user2=(User)s.deepClone(user, User.class);
         user2.setName("test3333");
         System.out.println(user);
         System.out.println(user2);
@@ -38,7 +38,7 @@ private static void deepCloneTest() {
         ICloner s=new Cloning();
         try {
             System.out.println("--------------obj arr------------------");
-            Object[] rs=(Object[])s.deepClone(arr);
+            Object[] rs=(Object[])s.deepClone(arr, null);
             for(int i=0; i < rs.length; i++) {
                 Object obj=rs[i];
                 System.out.println(obj.getClass().getName() + "--->" + obj);
@@ -50,7 +50,7 @@ private static void deepCloneTest() {
         System.out.println("--------------user arr------------------");
         User[] arr2=new User[]{user};
         try {
-            Object[] rs=(Object[])s.deepClone(arr2);
+            Object[] rs=(Object[])s.deepClone(arr2, null);
             for(int i=0; i < rs.length; i++) {
                 Object obj=rs[i];
                 System.out.println(obj.getClass().getName() + "--->" + obj);
@@ -61,7 +61,7 @@ private static void deepCloneTest() {
         }
         System.out.println("--------------map------------------");
         try {
-            Map<Integer, User> obj=(Map<Integer, User>)s.deepClone(map);
+            Map<Integer, User> obj=(Map<Integer, User>)s.deepClone(map, null);
             System.out.println(obj.getClass().getName() + "--->" + obj);
         } catch(Exception e) {
             // TODO Auto-generated catch block
diff --git a/src/test/java/com/test/fastjson/DeepCloneTest.java b/src/test/java/com/test/fastjson/DeepCloneTest.java
@@ -105,7 +105,7 @@ private static void fastJsonTest() {
         ISerializer<Object> s=new FastjsonSerializer();
         try {
             System.out.println("--------------obj arr------------------");
-            Object[] rs=(Object[])s.deepClone(arr);
+            Object[] rs=(Object[])s.deepClone(arr, null);
             for(int i=0; i < rs.length; i++) {
                 Object obj=rs[i];
                 System.out.println(obj.getClass().getName() + "--->" + obj);
@@ -117,7 +117,7 @@ private static void fastJsonTest() {
         System.out.println("--------------user arr------------------");
         User[] arr2=new User[]{user};
         try {
-            Object[] rs=(Object[])s.deepClone(arr2);
+            Object[] rs=(Object[])s.deepClone(arr2, null);
             for(int i=0; i < rs.length; i++) {
                 Object obj=rs[i];
                 System.out.println(obj.getClass().getName() + "--->" + obj);
@@ -128,7 +128,7 @@ private static void fastJsonTest() {
         }
         System.out.println("--------------map------------------");
         try {
-            Map<Integer, User> obj=(Map<Integer, User>)s.deepClone(map);
+            Map<Integer, User> obj=(Map<Integer, User>)s.deepClone(map, null);
             Iterator<Map.Entry<Integer, User>> it=obj.entrySet().iterator();
             while(it.hasNext()) {
                 Map.Entry<Integer, User> enty=it.next();
@@ -163,12 +163,12 @@ public static void deepClone(ICloner h) throws Exception {
         Object user=getUser();
 
         for(int i=0; i < hot; i++) {
-            h.deepClone(user);
+            h.deepClone(user, null);
         }
 
         Stopwatch sw=Stopwatch.begin();
         for(int i=0; i < run; i++) {
-            h.deepClone(user);
+            h.deepClone(user, null);
         }
         sw.stop();
         System.out.println(h.getClass().getName() + ": " + sw);

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,7 @@`
`1`	`1`	`package com.jarvis.cache.clone;`
`2`	`2`
`3`	`3`	`import java.lang.reflect.Method;`
	`4`	`+import java.lang.reflect.Type;`
`4`	`5`
`5`	`6`	`import com.rits.cloning.Cloner;`
`6`	`7`
`@@ -9,7 +10,7 @@ public class Cloning implements ICloner {`
`9`	`10`	`private final Cloner cloner=new Cloner();`
`10`	`11`
`11`	`12`	`@Override`
`12`		`- public Object deepClone(Object obj) throws Exception {`
	`13`	`+ public Object deepClone(Object obj, final Type type) throws Exception {`
`13`	`14`	`if(null == obj) {`
`14`	`15`	`return null;`
`15`	`16`	`}`
`@@ -18,7 +19,7 @@ public Object deepClone(Object obj) throws Exception {`
`18`	`19`
`19`	`20`	`@Override`
`20`	`21`	`public Object[] deepCloneMethodArgs(Method method, Object[] args) throws Exception {`
`21`		`- return (Object[])deepClone(args);`
	`22`	`+ return (Object[])deepClone(args, null);`
`22`	`23`	`}`
`23`	`24`
`24`	`25`	`}`
Original file line number	Diff line number	Diff line change
`@@ -76,8 +76,8 @@ public Object deserialize(final byte[] bytes, final Type returnType) throws Exce`
`76`	`76`	`}`
`77`	`77`
`78`	`78`	`@Override`
`79`		`- public Object deepClone(Object obj) throws Exception {`
`80`		`- return serializer.deepClone(obj);`
	`79`	`+ public Object deepClone(Object obj, final Type type) throws Exception {`
	`80`	`+ return serializer.deepClone(obj, type);`
`81`	`81`	`}`
`82`	`82`
`83`	`83`	`@Override`
Original file line number	Diff line number	Diff line change
`@@ -59,7 +59,7 @@ public Object deserialize(final byte[] bytes, final Type returnType) throws Exce`
`59`	`59`	`}`
`60`	`60`
`61`	`61`	`@Override`
`62`		`- public Object deepClone(Object obj) throws Exception {`
	`62`	`+ public Object deepClone(Object obj, final Type type) throws Exception {`
`63`	`63`	`return deserialize(serialize(obj), null);`
`64`	`64`	`}`
`65`	`65`
Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@ public byte[] serialize(Object obj) throws Exception {`
`33`	`33`	`}`
`34`	`34`
`35`	`35`	`@Override`
`36`		`- public Object deepClone(Object obj) throws Exception {`
	`36`	`+ public Object deepClone(Object obj, final Type type) throws Exception {`
`37`	`37`	`return deserialize(serialize(obj), null);`
`38`	`38`	`}`
`39`	`39`
Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@ public byte[] serialize(String string) throws Exception {`
`37`	`37`	`}`
`38`	`38`
`39`	`39`	`@Override`
`40`		`- public Object deepClone(Object obj) throws Exception {`
	`40`	`+ public Object deepClone(Object obj, final Type type) throws Exception {`
`41`	`41`	`if(null == obj) {`
`42`	`42`	`return obj;`
`43`	`43`	`}`
`@@ -47,6 +47,6 @@ public Object deepClone(Object obj) throws Exception {`
`47`	`47`
`48`	`48`	`@Override`
`49`	`49`	`public Object[] deepCloneMethodArgs(Method method, Object[] args) throws Exception {`
`50`		`- return (Object[])deepClone(args);`
	`50`	`+ return (Object[])deepClone(args, null);`
`51`	`51`	`}`
`52`	`52`	`}`