Fix for http://code.google.com/p/mybatis/issues/detail?id=11 and http://code.google.com/p/mybatis/issues/detail?id=145 . Cglib proxies for beans with no default constructors. Cglib upgraded from 2.1.3 to 2.2.

Author: emacarron

pom.xml

@@ -227,7 +227,7 @@
     <dependency>
       <groupId>cglib</groupId>
       <artifactId>cglib</artifactId>
-      <version>2.1_3</version>
+      <version>2.2</version>
       <optional>true</optional>
     </dependency>
     <!-- Test dependencies -->

src/main/java/org/apache/ibatis/executor/loader/DeserializedObjectProxy.java

@@ -2,7 +2,7 @@
 
 import java.io.ObjectStreamException;
 import java.lang.reflect.Method;
-import java.util.HashSet;
+import java.util.List;
 import java.util.Locale;
 import java.util.Set;
 
@@ -13,8 +13,6 @@
 import net.sf.cglib.proxy.MethodProxy;
 
 import org.apache.ibatis.executor.ExecutorException;
-import org.apache.ibatis.logging.Log;
-import org.apache.ibatis.logging.LogFactory;
 import org.apache.ibatis.reflection.ExceptionUtil;
 import org.apache.ibatis.reflection.factory.ObjectFactory;
 import org.apache.ibatis.reflection.property.PropertyCopier;
@@ -23,33 +21,37 @@
 
 public class DeserializedObjectProxy {
 
-  private static final Log log = LogFactory.getLog(DeserializedObjectProxy.class);
-
   private static final String FINALIZE_METHOD = "finalize";
   private static final String WRITE_REPLACE_METHOD = "writeReplace";
 
-  public static Object createProxy(Object target, String[] unloadedProperties, ObjectFactory objectFactory) {
-    return DeserializationProxyImpl.createProxy(target, unloadedProperties, objectFactory);
+  public static Object createProxy(Object target, Set<String> unloadedProperties, ObjectFactory objectFactory,
+      List<Class> constructorArgTypes, List<Object> constructorArgs) {
+    return DeserializationProxyImpl.createProxy(target, unloadedProperties, objectFactory, constructorArgTypes,
+        constructorArgs);
   }
 
   private static class DeserializationProxyImpl implements MethodInterceptor {
 
     private Class type;
     private Set<String> unloadedProperties;
     private ObjectFactory objectFactory;
+    private List<Class> constructorArgTypes;
+    private List<Object> constructorArgs;
 
-    private DeserializationProxyImpl(Class type, String[] unloadedProperties, ObjectFactory objectFactory) {
+    private DeserializationProxyImpl(Class type, Set<String> unloadedProperties, ObjectFactory objectFactory,
+        List<Class> constructorArgTypes, List<Object> constructorArgs) {
       this.type = type;
-      this.unloadedProperties = new HashSet<String>();
-      for (String s : unloadedProperties) {
-        this.unloadedProperties.add(s);
-      }
+      this.unloadedProperties = unloadedProperties;
       this.objectFactory = objectFactory;
+      this.constructorArgTypes = constructorArgTypes;
+      this.constructorArgs = constructorArgs;
     }
 
-    public static Object createProxy(Object target, String[] unloadedProperties, ObjectFactory objectFactory) {
+    public static Object createProxy(Object target, Set<String> unloadedProperties, ObjectFactory objectFactory,
+        List<Class> constructorArgTypes, List<Object> constructorArgs) {
       final Class type = target.getClass();
-      DeserializationProxyImpl proxy = new DeserializationProxyImpl(type, unloadedProperties, objectFactory);
+      DeserializationProxyImpl proxy = new DeserializationProxyImpl(type, unloadedProperties, objectFactory,
+          constructorArgTypes, constructorArgs);
       Enhancer enhancer = new Enhancer();
       enhancer.setCallback(proxy);
       enhancer.setSuperclass(type);
@@ -66,28 +68,41 @@ public static Object createProxy(Object target, String[] unloadedProperties, Obj
         // nothing to do here
       }
 
-      final Object enhanced = enhancer.create();
+      Object enhanced = null;
+      if (constructorArgTypes.isEmpty()) {
+        enhanced = enhancer.create();
+      } else {
+        Class[] typesArray = constructorArgTypes.toArray(new Class[constructorArgTypes.size()]);
+        Object[] valuesArray = constructorArgs.toArray(new Object[constructorArgs.size()]);
+        enhanced = enhancer.create(typesArray, valuesArray);
+      }
       PropertyCopier.copyBeanProperties(type, target, enhanced);
       return enhanced;
     }
-    
+
     public Object intercept(Object enhanced, Method method, Object[] args, MethodProxy methodProxy) throws Throwable {
       final String methodName = method.getName();
       try {
         if (WRITE_REPLACE_METHOD.equals(methodName)) {
-          Object original = objectFactory.create(type);
+          Object original = null;
+          if (constructorArgTypes.isEmpty()) {
+            original = objectFactory.create(type);
+          } else {
+            original = objectFactory.create(type, constructorArgTypes, constructorArgs);
+          }
           PropertyCopier.copyBeanProperties(type, enhanced, original);
-          return new SerialStatusHolder(original, unloadedProperties.toArray(new String[unloadedProperties.size()]), objectFactory);
+          return new SerialStateHolder(original, unloadedProperties, objectFactory, constructorArgTypes,
+              constructorArgs);
         } else {
           if (!FINALIZE_METHOD.equals(methodName) && PropertyNamer.isProperty(methodName)) {
             final String property = PropertyNamer.methodToProperty(methodName);
             if (unloadedProperties.contains(property.toUpperCase(Locale.ENGLISH))) {
-              throw new ExecutorException("An attempt has been made to read a not loaded lazy property '" 
-                  + property + "' of a disconnected object");
+              throw new ExecutorException("An attempt has been made to read a not loaded lazy property '" + property
+                  + "' of a disconnected object");
             }
           }
           return methodProxy.invokeSuper(enhanced, args);
-        }       
+        }
       } catch (Throwable t) {
         throw ExceptionUtil.unwrapThrowable(t);
       }

src/main/java/org/apache/ibatis/executor/loader/ResultObjectProxy.java

@@ -4,6 +4,7 @@
 import java.lang.reflect.Method;
 import java.util.Arrays;
 import java.util.HashSet;
+import java.util.List;
 import java.util.Set;
 
 import net.sf.cglib.core.Signature;
@@ -25,13 +26,15 @@ public class ResultObjectProxy {
 
   private static final Log log = LogFactory.getLog(ResultObjectProxy.class);
 
-  private static final Set<String> objectMethods = new HashSet<String>(Arrays.asList(new String[]{"equals","clone","hashCode","toString"}));
+  private static final Set<String> objectMethods = new HashSet<String>(Arrays.asList(new String[] { "equals", "clone", "hashCode", "toString" }));
   private static final TypeHandlerRegistry registry = new TypeHandlerRegistry();
   private static final String FINALIZE_METHOD = "finalize";
   private static final String WRITE_REPLACE_METHOD = "writeReplace";
 
-  public static Object createProxy(Object target, ResultLoaderMap lazyLoader, boolean aggressive, ObjectFactory objectFactory) {
-    return EnhancedResultObjectProxyImpl.createProxy(target, lazyLoader, aggressive, objectFactory);
+  public static Object createProxy(Object target, ResultLoaderMap lazyLoader, boolean aggressive,
+      ObjectFactory objectFactory, List<Class> constructorArgTypes, List<Object> constructorArgs) {
+    return EnhancedResultObjectProxyImpl.createProxy(target, lazyLoader, aggressive, objectFactory,
+        constructorArgTypes, constructorArgs);
   }
 
   private static class EnhancedResultObjectProxyImpl implements MethodInterceptor {
@@ -40,20 +43,27 @@ private static class EnhancedResultObjectProxyImpl implements MethodInterceptor
     private ResultLoaderMap lazyLoader;
     private boolean aggressive;
     private ObjectFactory objectFactory;
+    private List<Class> constructorArgTypes;
+    private List<Object> constructorArgs;
 
-    private EnhancedResultObjectProxyImpl(Class type, ResultLoaderMap lazyLoader, boolean aggressive, ObjectFactory objectFactory) {
+    private EnhancedResultObjectProxyImpl(Class type, ResultLoaderMap lazyLoader, boolean aggressive,
+        ObjectFactory objectFactory, List<Class> constructorArgTypes, List<Object> constructorArgs) {
       this.type = type;
       this.lazyLoader = lazyLoader;
       this.aggressive = aggressive;
       this.objectFactory = objectFactory;
+      this.constructorArgTypes = constructorArgTypes;
+      this.constructorArgs = constructorArgs;
     }
 
-    public static Object createProxy(Object target, ResultLoaderMap lazyLoader, boolean aggressive, ObjectFactory objectFactory) {
+    public static Object createProxy(Object target, ResultLoaderMap lazyLoader, boolean aggressive,
+        ObjectFactory objectFactory, List<Class> constructorArgTypes, List<Object> constructorArgs) {
       final Class type = target.getClass();
       if (registry.hasTypeHandler(type)) {
         return target;
       } else {
-        EnhancedResultObjectProxyImpl proxy = new EnhancedResultObjectProxyImpl(type, lazyLoader, aggressive, objectFactory);
+        EnhancedResultObjectProxyImpl proxy = new EnhancedResultObjectProxyImpl(type, lazyLoader, aggressive,
+            objectFactory, constructorArgTypes, constructorArgs);
         Enhancer enhancer = new Enhancer();
         enhancer.setCallback(proxy);
         enhancer.setSuperclass(type);
@@ -71,24 +81,34 @@ public static Object createProxy(Object target, ResultLoaderMap lazyLoader, bool
           // nothing to do here
         }
 
-        final Object enhanced = enhancer.create();
+        Object enhanced = null;
+        if (constructorArgTypes.isEmpty()) {
+          enhanced = enhancer.create();
+        } else {
+          Class[] typesArray = constructorArgTypes.toArray(new Class[constructorArgTypes.size()]);
+          Object[] valuesArray = constructorArgs.toArray(new Object[constructorArgs.size()]);
+          enhanced = enhancer.create(typesArray, valuesArray);
+        }
         PropertyCopier.copyBeanProperties(type, target, enhanced);
         return enhanced;
       }
     }
-    
+
     public Object intercept(Object enhanced, Method method, Object[] args, MethodProxy methodProxy) throws Throwable {
       final String methodName = method.getName();
       try {
         synchronized (lazyLoader) {
           if (WRITE_REPLACE_METHOD.equals(methodName)) {
-            Object original = objectFactory.create(type);
+            Object original = null;
+            if (constructorArgTypes.isEmpty()) {
+              original = objectFactory.create(type);
+            } else {
+              original = objectFactory.create(type, constructorArgTypes, constructorArgs);
+            }
             PropertyCopier.copyBeanProperties(type, enhanced, original);
             if (lazyLoader.size() > 0) {
-              Set<String> unloadedProperties = lazyLoader.getPropertyNames();
-              return new SerialStatusHolder(original, 
-                  unloadedProperties.toArray(new String[unloadedProperties.size()]), 
-                  objectFactory);
+              return new SerialStateHolder(original, lazyLoader.getPropertyNames(), objectFactory,
+                  constructorArgTypes, constructorArgs);
             } else {
               return original;
             }

src/main/java/org/apache/ibatis/executor/loader/SerialStateHolder.java

@@ -0,0 +1,37 @@
+package org.apache.ibatis.executor.loader;
+
+import java.io.ObjectStreamException;
+import java.io.Serializable;
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
+import org.apache.ibatis.reflection.factory.ObjectFactory;
+
+class SerialStateHolder implements Serializable {
+  
+  private static final long serialVersionUID = 9018585337519878124L;
+  private Object userBean;
+  private String[] unloadedProperties;
+  private ObjectFactory objectFactory;
+  private Class[] constructorArgTypes;
+  private Object[] constructorArgs;
+
+  public SerialStateHolder(final Object userBean, final Set<String> unloadedProperties,
+      final ObjectFactory objectFactory, List<Class> constructorArgTypes, List<Object> constructorArgs) {
+    this.userBean = userBean;
+    this.unloadedProperties = unloadedProperties.toArray(new String[unloadedProperties.size()]);
+    this.objectFactory = objectFactory;
+    this.constructorArgTypes = constructorArgTypes.toArray(new Class[constructorArgTypes.size()]);
+    this.constructorArgs = constructorArgs.toArray(new Object[constructorArgs.size()]);
+  }
+  
+  protected Object readResolve() throws ObjectStreamException {
+    Set<String> arrayProps = new HashSet<String>(Arrays.asList(this.unloadedProperties));
+    List<Class> arrayTypes = Arrays.asList(this.constructorArgTypes);
+    List<Object> arrayValues = Arrays.asList(this.constructorArgs);
+    return DeserializedObjectProxy.createProxy(userBean, arrayProps, objectFactory, arrayTypes, arrayValues);
+  }
+
+}

src/main/java/org/apache/ibatis/executor/loader/SerialStatusHolder.java

@@ -283,39 +283,41 @@ protected void loadMappedAndUnmappedColumnNames(ResultSet rs, ResultMap resultMa
   //
 
   protected Object createResultObject(ResultSet rs, ResultMap resultMap, ResultLoaderMap lazyLoader) throws SQLException {
-    final Object resultObject = createResultObject(rs, resultMap);
+    final List<Class> constructorArgTypes = new ArrayList<Class>();
+    final List<Object> constructorArgs = new ArrayList<Object>();
+    final Object resultObject = createResultObject(rs, resultMap, constructorArgTypes, constructorArgs);
     if (resultObject != null && configuration.isLazyLoadingEnabled()) {
-      return ResultObjectProxy.createProxy(resultObject, lazyLoader, configuration.isAggressiveLazyLoading(), objectFactory);
+      return ResultObjectProxy.createProxy(resultObject, lazyLoader, configuration.isAggressiveLazyLoading(), objectFactory, constructorArgTypes, constructorArgs);
     }
     return resultObject;
   }
 
-  protected Object createResultObject(ResultSet rs, ResultMap resultMap) throws SQLException {
+  protected Object createResultObject(ResultSet rs, ResultMap resultMap, List<Class> constructorArgTypes, List<Object> constructorArgs)
+      throws SQLException {
     final Class resultType = resultMap.getType();
     final List<ResultMapping> constructorMappings = resultMap.getConstructorResultMappings();
     if (typeHandlerRegistry.hasTypeHandler(resultType)) {
       return createPrimitiveResultObject(rs, resultMap);
     } else if (constructorMappings.size() > 0) {
-      return createParameterizedResultObject(rs, resultType, constructorMappings);
+      return createParameterizedResultObject(rs, resultType, constructorMappings, constructorArgTypes, constructorArgs);
     } else {
       return objectFactory.create(resultType);
     }
   }
 
-  protected Object createParameterizedResultObject(ResultSet rs, Class resultType, List<ResultMapping> constructorMappings) throws SQLException {
+  protected Object createParameterizedResultObject(ResultSet rs, Class resultType,
+      List<ResultMapping> constructorMappings, List<Class> constructorArgTypes, List<Object> constructorArgs) throws SQLException {
     boolean foundValues = false;
-    final List<Class> parameterTypes = new ArrayList<Class>();
-    final List<Object> parameterValues = new ArrayList<Object>();
     for (ResultMapping constructorMapping : constructorMappings) {
       final Class parameterType = constructorMapping.getJavaType();
       final TypeHandler typeHandler = constructorMapping.getTypeHandler();
       final String column = constructorMapping.getColumn();
       final Object value = typeHandler.getResult(rs, column);
-      parameterTypes.add(parameterType);
-      parameterValues.add(value);
+      constructorArgTypes.add(parameterType);
+      constructorArgs.add(value);
       foundValues = value != null || foundValues;
     }
-    return foundValues ? objectFactory.create(resultType, parameterTypes, parameterValues) : null;
+    return foundValues ? objectFactory.create(resultType, constructorArgTypes, constructorArgs) : null;
   }
 
   protected Object createPrimitiveResultObject(ResultSet rs, ResultMap resultMap) throws SQLException {