Keep CGLIB optional.

Author: emacarron

src/main/java/org/apache/ibatis/executor/resultset/DefaultResultSetHandler.java

@@ -30,10 +30,8 @@
 import org.apache.ibatis.cache.CacheKey;
 import org.apache.ibatis.executor.Executor;
 import org.apache.ibatis.executor.ExecutorException;
-import org.apache.ibatis.executor.loader.ProxyFactory;
 import org.apache.ibatis.executor.loader.ResultLoader;
 import org.apache.ibatis.executor.loader.ResultLoaderMap;
-import org.apache.ibatis.executor.loader.cglib.CglibProxyFactory;
 import org.apache.ibatis.executor.parameter.ParameterHandler;
 import org.apache.ibatis.executor.result.DefaultResultContext;
 import org.apache.ibatis.executor.result.DefaultResultHandler;
@@ -68,7 +66,6 @@ public class DefaultResultSetHandler implements ResultSetHandler {
   private final BoundSql boundSql;
   private final TypeHandlerRegistry typeHandlerRegistry;
   private final ObjectFactory objectFactory;
-  private final ProxyFactory proxyFactory;
 
   // nested resultmaps
   private final Map<CacheKey, Object> nestedResultObjects = new HashMap<CacheKey, Object>();
@@ -95,7 +92,6 @@ public DefaultResultSetHandler(Executor executor, MappedStatement mappedStatemen
     this.typeHandlerRegistry = configuration.getTypeHandlerRegistry();
     this.objectFactory = configuration.getObjectFactory();
     this.resultHandler = resultHandler;
-    this.proxyFactory = configuration.getProxyFactory() == null ? new CglibProxyFactory() : configuration.getProxyFactory();
   }
 
   //
@@ -509,7 +505,7 @@ private Object createResultObject(ResultSetWrapper rsw, ResultMap resultMap, Res
       final List<ResultMapping> propertyMappings = resultMap.getPropertyResultMappings();
       for (ResultMapping propertyMapping : propertyMappings) {
         if (propertyMapping.getNestedQueryId() != null && propertyMapping.isLazy()) { // issue gcode #109 && issue #149
-          return proxyFactory.createProxy(resultObject, lazyLoader, configuration, objectFactory, constructorArgTypes, constructorArgs);
+          return configuration.getProxyFactory().createProxy(resultObject, lazyLoader, configuration, objectFactory, constructorArgTypes, constructorArgs);
         }
       }
     }

src/main/java/org/apache/ibatis/session/Configuration.java

@@ -292,6 +292,10 @@ public void setLazyLoadingEnabled(boolean lazyLoadingEnabled) {
   }
 
   public ProxyFactory getProxyFactory() {
+    if (proxyFactory == null) {
+      // makes sure CGLIB is not needed unless explicitly requested
+      proxyFactory = new CglibProxyFactory();
+    }
     return proxyFactory;
   }