Using fethType in xml for consistency.

Author: emacarron

src/main/java/org/apache/ibatis/builder/xml/XMLMapperBuilder.java

@@ -364,14 +364,14 @@ private ResultMapping buildResultMappingFromContext(XNode context, Class<?> resu
     String typeHandler = context.getStringAttribute("typeHandler");
     String resulSet = context.getStringAttribute("resultSet");
     String foreignColumn = context.getStringAttribute("foreignColumn");
-    boolean lazy = context.getBooleanAttribute("lazy", configuration.isLazyLoadingEnabled());
+    boolean lazy = "lazy".equals(context.getStringAttribute("fetchType", configuration.isLazyLoadingEnabled() ? "lazy" : "eager"));
     Class<?> javaTypeClass = resolveClass(javaType);
     @SuppressWarnings("unchecked")
     Class<? extends TypeHandler<?>> typeHandlerClass = (Class<? extends TypeHandler<?>>) resolveClass(typeHandler);
     JdbcType jdbcTypeEnum = resolveJdbcType(jdbcType);
     return builderAssistant.buildResultMapping(resultType, property, column, javaTypeClass, jdbcTypeEnum, nestedSelect, nestedResultMap, notNullColumn, columnPrefix, typeHandlerClass, flags, resulSet, foreignColumn, lazy);
   }
-
+  
   private String processNestedResultMappings(XNode context, List<ResultMapping> resultMappings) throws Exception {
     if ("association".equals(context.getName())
         || "collection".equals(context.getName())

src/main/java/org/apache/ibatis/builder/xml/mybatis-3-mapper.dtd

@@ -117,7 +117,7 @@ columnPrefix CDATA #IMPLIED
 resultSet CDATA #IMPLIED
 foreignColumn CDATA #IMPLIED
 autoMapping (true|false) #IMPLIED
-lazy (true|false) #IMPLIED
+fetchType (lazy|eager) #IMPLIED
 >
 
 <!ELEMENT association (constructor?,id*,result*,association*,collection*, discriminator?)>
@@ -134,7 +134,7 @@ columnPrefix CDATA #IMPLIED
 resultSet CDATA #IMPLIED
 foreignColumn CDATA #IMPLIED
 autoMapping (true|false) #IMPLIED
-lazy (true|false) #IMPLIED
+fetchType (lazy|eager) #IMPLIED
 >
 
 <!ELEMENT discriminator (case+)>

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

@@ -33,6 +33,7 @@
 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;
@@ -94,7 +95,7 @@ public DefaultResultSetHandler(Executor executor, MappedStatement mappedStatemen
     this.typeHandlerRegistry = configuration.getTypeHandlerRegistry();
     this.objectFactory = configuration.getObjectFactory();
     this.resultHandler = resultHandler;
-    this.proxyFactory = configuration.getProxyFactory();
+    this.proxyFactory = configuration.getProxyFactory() == null ? new CglibProxyFactory() : configuration.getProxyFactory();
   }
 
   //

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

@@ -292,9 +292,6 @@ public void setLazyLoadingEnabled(boolean lazyLoadingEnabled) {
   }
 
   public ProxyFactory getProxyFactory() {
-    if (proxyFactory == null) {
-      proxyFactory = new CglibProxyFactory();
-    }
     return proxyFactory;
   }
 

src/test/java/org/apache/ibatis/builder/BlogMapper.xml

@@ -58,8 +58,8 @@
   <resultMap id="blogWithPostsLazy" type="Blog">
     <id property="id" column="id"/>
     <result property="title" column="title"/>
-    <association property="author" column="author_id" select="domain.blog.mappers.AuthorMapper.selectAuthorWithInlineParams" lazy="true"/>
-    <collection property="posts" column="id" select="selectPostsForBlog" lazy="true"/>
+    <association property="author" column="author_id" select="domain.blog.mappers.AuthorMapper.selectAuthorWithInlineParams" fetchType="lazy"/>
+    <collection property="posts" column="id" select="selectPostsForBlog" fetchType="lazy"/>
   </resultMap>
 
   <select id="selectBlogWithPostsUsingSubSelectLazily" parameterType="int" resultMap="blogWithPostsLazy">