Using jee term FetchType [ci skip]

Author: emacarron

src/main/java/org/apache/ibatis/annotations/Many.java

@@ -20,13 +20,13 @@
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
-import org.apache.ibatis.mapping.Loading;
+import org.apache.ibatis.mapping.FetchType;
 
 @Retention(RetentionPolicy.RUNTIME)
 @Target(ElementType.METHOD)
 public @interface Many {
   String select() default "";
 
-  Loading lazy() default Loading.DEFAULT;
+  FetchType lazy() default FetchType.DEFAULT;
 
 }

src/main/java/org/apache/ibatis/annotations/One.java

@@ -20,13 +20,13 @@
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
-import org.apache.ibatis.mapping.Loading;
+import org.apache.ibatis.mapping.FetchType;
 
 @Retention(RetentionPolicy.RUNTIME)
 @Target(ElementType.METHOD)
 public @interface One {
   String select() default "";
 
-  Loading lazy() default Loading.DEFAULT;
+  FetchType lazy() default FetchType.DEFAULT;
 
 }

src/main/java/org/apache/ibatis/builder/annotation/MapperAnnotationBuilder.java

@@ -67,7 +67,7 @@
 import org.apache.ibatis.executor.keygen.SelectKeyGenerator;
 import org.apache.ibatis.io.Resources;
 import org.apache.ibatis.mapping.Discriminator;
-import org.apache.ibatis.mapping.Loading;
+import org.apache.ibatis.mapping.FetchType;
 import org.apache.ibatis.mapping.MappedStatement;
 import org.apache.ibatis.mapping.ResultFlag;
 import org.apache.ibatis.mapping.ResultMapping;
@@ -497,12 +497,12 @@ private String nestedSelectId(Result result) {
 
   private boolean isLazy(Result result) {
     Boolean isLazy = null;
-    if (Loading.DEFAULT != result.one().lazy()) {
-      isLazy = (result.one().lazy() == Loading.LAZY);
+    if (FetchType.DEFAULT != result.one().lazy()) {
+      isLazy = (result.one().lazy() == FetchType.LAZY);
     }
-    if (Loading.DEFAULT != result.many().lazy()) {
+    if (FetchType.DEFAULT != result.many().lazy()) {
       if (isLazy == null) {
-        isLazy = (result.many().lazy() == Loading.LAZY);
+        isLazy = (result.many().lazy() == FetchType.LAZY);
       } else {
         throw new BuilderException("Cannot use both @One and @Many annotations in the same @Result");
       }

src/main/java/org/apache/ibatis/mapping/Loading.java renamed to src/main/java/org/apache/ibatis/mapping/FetchType.java

@@ -15,6 +15,6 @@
  */
 package org.apache.ibatis.mapping;
 
-public enum Loading {
+public enum FetchType {
   LAZY, EAGER, DEFAULT
 }