Merge pull request #307 from domaframework/polish

Polish the org.seasar.doma.internal package

Author: nakamura-to

src/main/java/org/seasar/doma/internal/ClassNames.java

@@ -8,11 +8,12 @@
 
 public class ClassNames {
 
-  public static String normalizeBinaryName(String binaryName) {
+  public static String normalizeBinaryName(CharSequence binaryName) {
     assertNotNull(binaryName);
-    String packageName = ClassUtil.getPackageName(binaryName);
-    List<String> enclosingNames = ClassUtil.getEnclosingNames(binaryName);
-    String simpleName = ClassUtil.getSimpleName(binaryName);
+    String name = binaryName.toString();
+    String packageName = ClassUtil.getPackageName(name);
+    List<String> enclosingNames = ClassUtil.getEnclosingNames(name);
+    String simpleName = ClassUtil.getSimpleName(name);
     String base = "";
     if (packageName.length() > 0) {
       base = packageName + ".";

src/main/java/org/seasar/doma/internal/apt/Context.java

@@ -11,9 +11,9 @@ public class Context {
 
   private boolean initialized;
 
-  private Elements elements;
+  private MoreElements moreElements;
 
-  private Types types;
+  private MoreTypes moreTypes;
 
   private Options options;
 
@@ -35,8 +35,8 @@ public void init() {
     if (initialized) {
       throw new AptIllegalStateException("already initialized");
     }
-    elements = new Elements(this, env);
-    types = new Types(this, env);
+    moreElements = new MoreElements(this, env);
+    moreTypes = new MoreTypes(this, env);
     options = new Options(this, env);
     reporter = new Reporter(env);
     resources = new Resources(this, env);
@@ -46,14 +46,14 @@ public void init() {
     initialized = true;
   }
 
-  public Elements getElements() {
+  public MoreElements getMoreElements() {
     assertInitialized();
-    return elements;
+    return moreElements;
   }
 
-  public Types getTypes() {
+  public MoreTypes getMoreTypes() {
     assertInitialized();
-    return types;
+    return moreTypes;
   }
 
   public Options getOptions() {

src/main/java/org/seasar/doma/internal/apt/Elements.java renamed to src/main/java/org/seasar/doma/internal/apt/MoreElements.java

@@ -12,17 +12,18 @@
 import javax.lang.model.type.DeclaredType;
 import javax.lang.model.type.TypeMirror;
 import javax.lang.model.util.ElementFilter;
+import javax.lang.model.util.Elements;
 import javax.lang.model.util.SimpleElementVisitor8;
 import org.seasar.doma.ParameterName;
 import org.seasar.doma.internal.apt.def.TypeParametersDef;
 
-public class Elements implements javax.lang.model.util.Elements {
+public class MoreElements implements Elements {
 
   private final Context ctx;
 
-  private final javax.lang.model.util.Elements elementUtils;
+  private final Elements elementUtils;
 
-  public Elements(Context ctx, ProcessingEnvironment env) {
+  public MoreElements(Context ctx, ProcessingEnvironment env) {
     assertNotNull(ctx, env);
     this.ctx = ctx;
     this.elementUtils = env.getElementUtils();
@@ -36,8 +37,8 @@ public PackageElement getPackageElement(CharSequence name) {
 
   // delegate to elementUtils
   @Override
-  public TypeElement getTypeElement(CharSequence name) {
-    return elementUtils.getTypeElement(name);
+  public TypeElement getTypeElement(CharSequence canonicalName) {
+    return elementUtils.getTypeElement(canonicalName);
   }
 
   // delegate to elementUtils
@@ -120,18 +121,6 @@ public boolean isFunctionalInterface(TypeElement type) {
     return elementUtils.isFunctionalInterface(type);
   }
 
-  public String getBinaryNameAsString(TypeElement type) {
-    assertNotNull(type);
-    Name binaryName = elementUtils.getBinaryName(type);
-    return binaryName.toString();
-  }
-
-  public String getPackageName(Element element) {
-    assertNotNull(element);
-    PackageElement packageElement = elementUtils.getPackageOf(element);
-    return packageElement.getQualifiedName().toString();
-  }
-
   public String getParameterName(VariableElement variableElement) {
     assertNotNull(variableElement);
     ParameterName parameterName = variableElement.getAnnotation(ParameterName.class);
@@ -167,11 +156,11 @@ public TypeParameterElement visitTypeParameter(TypeParameterElement e, Void aVoi
         null);
   }
 
-  public TypeElement getTypeElement(String binaryName) {
+  public TypeElement getTypeElementFromBinaryName(String binaryName) {
     assertNotNull(binaryName);
     String[] parts = binaryName.split("\\$");
     if (parts.length > 1) {
-      TypeElement topElement = getTypeElement(parts[0]);
+      TypeElement topElement = getTypeElementFromBinaryName(parts[0]);
       if (topElement == null) {
         return null;
       }
@@ -206,15 +195,15 @@ public AnnotationMirror getAnnotationMirror(
       Element element, Class<? extends Annotation> annotationClass) {
     assertNotNull(element, annotationClass);
     return getAnnotationMirrorInternal(
-        element, type -> ctx.getTypes().isSameTypeWithErasure(type, annotationClass));
+        element, type -> ctx.getMoreTypes().isSameTypeWithErasure(type, annotationClass));
   }
 
   public AnnotationMirror getAnnotationMirror(Element element, String annotationClassName) {
     assertNotNull(element, annotationClassName);
     return getAnnotationMirrorInternal(
         element,
         type -> {
-          TypeElement typeElement = ctx.getTypes().toTypeElement(type);
+          TypeElement typeElement = ctx.getMoreTypes().toTypeElement(type);
           if (typeElement == null) {
             return false;
           }
@@ -272,11 +261,10 @@ public TypeParametersDef getTypeParametersDef(Parameterizable element) {
     return new TypeParametersDef(map);
   }
 
-  public List<String> getTypeParameterNames(
-      List<? extends TypeParameterElement> typeParameterElements) {
+  List<String> getTypeParameterNames(List<? extends TypeParameterElement> typeParameterElements) {
     assertNotNull(typeParameterElements);
     List<TypeMirror> typeMirrors =
         typeParameterElements.stream().map(TypeParameterElement::asType).collect(toList());
-    return ctx.getTypes().getTypeParameterNames(typeMirrors);
+    return ctx.getMoreTypes().getTypeParameterNames(typeMirrors);
   }
 }

src/main/java/org/seasar/doma/internal/apt/Types.java renamed to src/main/java/org/seasar/doma/internal/apt/MoreTypes.java

@@ -25,14 +25,15 @@
 import javax.lang.model.util.SimpleTypeVisitor6;
 import javax.lang.model.util.SimpleTypeVisitor8;
 import javax.lang.model.util.TypeKindVisitor8;
+import javax.lang.model.util.Types;
 
-public class Types implements javax.lang.model.util.Types {
+public class MoreTypes implements Types {
 
   private final Context ctx;
 
-  private final javax.lang.model.util.Types typeUtils;
+  private final Types typeUtils;
 
-  public Types(Context ctx, ProcessingEnvironment env) {
+  public MoreTypes(Context ctx, ProcessingEnvironment env) {
     assertNotNull(ctx, env);
     this.ctx = ctx;
     this.typeUtils = env.getTypeUtils();
@@ -141,11 +142,13 @@ public TypeMirror asMemberOf(DeclaredType containing, Element element) {
     return typeUtils.asMemberOf(containing, element);
   }
 
+  // delegate to typeUtils
   @Override
   public boolean isAssignable(TypeMirror t1, TypeMirror t2) {
     return typeUtils.isAssignable(t1, t2);
   }
 
+  // delegate to typeUtils
   @Override
   public boolean isSameType(TypeMirror t1, TypeMirror t2) {
     return typeUtils.isSameType(t1, t2);
@@ -157,7 +160,7 @@ public TypeElement toTypeElement(TypeMirror typeMirror) {
     if (element == null) {
       return null;
     }
-    return ctx.getElements().toTypeElement(element);
+    return ctx.getMoreElements().toTypeElement(element);
   }
 
   public DeclaredType toDeclaredType(TypeMirror typeMirror) {
@@ -198,7 +201,7 @@ public ArrayType visitArray(ArrayType t, Void p) {
 
   public boolean isAssignableWithErasure(TypeMirror lhs, Class<?> rhs) {
     assertNotNull(lhs, rhs);
-    TypeElement typeElement = ctx.getElements().getTypeElement(rhs);
+    TypeElement typeElement = ctx.getMoreElements().getTypeElement(rhs);
     if (typeElement == null) {
       return false;
     }
@@ -237,19 +240,10 @@ public boolean isAssignableWithErasure(TypeMirror lhs, TypeMirror rhs) {
 
   public boolean isSameTypeWithErasure(TypeMirror typeMirror, Class<?> clazz) {
     assertNotNull(typeMirror, clazz);
-    if (typeMirror.getKind() == TypeKind.VOID) {
-      return clazz == void.class;
-    }
-    if (clazz.isArray()) {
-      TypeElement componentType = ctx.getElements().getTypeElement(clazz.getComponentType());
-      ArrayType arrayType = ctx.getTypes().getArrayType(componentType.asType());
-      if (arrayType == null) {
-        return false;
-      }
-      return isSameTypeWithErasure(typeMirror, arrayType);
+    if (clazz.isPrimitive() || clazz.isArray()) {
+      return typeUtils.isSameType(typeMirror, getTypeMirror(clazz));
     }
-
-    TypeElement typeElement = ctx.getElements().getTypeElement(clazz);
+    TypeElement typeElement = ctx.getMoreElements().getTypeElement(clazz);
     if (typeElement == null) {
       return false;
     }
@@ -290,31 +284,7 @@ public String getTypeName(TypeMirror typeMirror) {
     return p.toString();
   }
 
-  public String getBoxedTypeName(TypeMirror typeMirror) {
-    assertNotNull(typeMirror);
-    switch (typeMirror.getKind()) {
-      case BOOLEAN:
-        return Boolean.class.getName();
-      case BYTE:
-        return Byte.class.getName();
-      case SHORT:
-        return Short.class.getName();
-      case INT:
-        return Integer.class.getName();
-      case LONG:
-        return Long.class.getName();
-      case FLOAT:
-        return Float.class.getName();
-      case DOUBLE:
-        return Double.class.getName();
-      case CHAR:
-        return Character.class.getName();
-      default:
-        return getTypeName(typeMirror);
-    }
-  }
-
-  public List<String> getTypeParameterNames(List<TypeMirror> typeMirrors) {
+  List<String> getTypeParameterNames(List<TypeMirror> typeMirrors) {
     assertNotNull(typeMirrors);
     TypeParameterNameBuilder builder = new TypeParameterNameBuilder();
     List<String> names = new ArrayList<>();
@@ -371,7 +341,11 @@ public TypeMirror getTypeMirror(Class<?> clazz) {
     if (clazz == double.class) {
       return typeUtils.getPrimitiveType(TypeKind.DOUBLE);
     }
-    TypeElement typeElement = ctx.getElements().getTypeElement(clazz);
+    if (clazz.isArray()) {
+      TypeMirror componentType = getTypeMirror(clazz.getComponentType());
+      return typeUtils.getArrayType(componentType);
+    }
+    TypeElement typeElement = ctx.getMoreElements().getTypeElement(clazz);
     if (typeElement == null) {
       throw new AptIllegalStateException(clazz.getName());
     }
@@ -440,7 +414,7 @@ public Void visitWildcard(WildcardType t, StringBuilder p) {
 
     protected Void defaultAction(TypeMirror e, StringBuilder p) {
       p.append(e);
-      throw new IllegalArgumentException(p.toString());
+      return null;
     }
   }
 
@@ -467,7 +441,7 @@ public Void visitTypeVariable(TypeVariable t, StringBuilder p) {
       }
       processedVariables.add(t);
       TypeParameterElement typeParameterElement =
-          ctx.getElements().toTypeParameterElement(t.asElement());
+          ctx.getMoreElements().toTypeParameterElement(t.asElement());
       if (typeParameterElement == null) {
         return null;
       }
@@ -479,7 +453,7 @@ public Void visitTypeVariable(TypeVariable t, StringBuilder p) {
       }
       Iterator<? extends TypeMirror> it = bounds.iterator();
       TypeMirror first = it.next();
-      if (bounds.size() == 1 && ctx.getTypes().isSameTypeWithErasure(first, Object.class)) {
+      if (bounds.size() == 1 && ctx.getMoreTypes().isSameTypeWithErasure(first, Object.class)) {
         return null;
       }
       p.append(" extends ");

src/main/java/org/seasar/doma/internal/apt/annot/Annotations.java

@@ -29,15 +29,15 @@ public AllArgsConstructorAnnot newAllArgsConstructorAnnot(TypeElement typeElemen
   public AnnotateWithAnnot newAnnotateWithAnnot(TypeElement typeElement) {
     assertNotNull(typeElement);
     AnnotationMirror annotateWith =
-        ctx.getElements().getAnnotationMirror(typeElement, AnnotateWith.class);
+        ctx.getMoreElements().getAnnotationMirror(typeElement, AnnotateWith.class);
     if (annotateWith == null) {
       for (AnnotationMirror annotationMirror : typeElement.getAnnotationMirrors()) {
         TypeElement ownerElement =
-            ctx.getElements().toTypeElement(annotationMirror.getAnnotationType().asElement());
+            ctx.getMoreElements().toTypeElement(annotationMirror.getAnnotationType().asElement());
         if (ownerElement == null) {
           continue;
         }
-        annotateWith = ctx.getElements().getAnnotationMirror(ownerElement, AnnotateWith.class);
+        annotateWith = ctx.getMoreElements().getAnnotationMirror(ownerElement, AnnotateWith.class);
         if (annotateWith != null) {
           break;
         }
@@ -46,7 +46,7 @@ public AnnotateWithAnnot newAnnotateWithAnnot(TypeElement typeElement) {
         return null;
       }
     }
-    Map<String, AnnotationValue> values = ctx.getElements().getValuesWithDefaults(annotateWith);
+    Map<String, AnnotationValue> values = ctx.getMoreElements().getValuesWithDefaults(annotateWith);
     AnnotationValue annotations = values.get(AnnotateWithAnnot.ANNOTATIONS);
     ArrayList<AnnotationAnnot> annotationsValue = new ArrayList<>();
     for (AnnotationMirror annotationMirror : AnnotationValueUtil.toAnnotationList(annotations)) {
@@ -226,7 +226,7 @@ private <ANNOT> ANNOT newInstance(
       Class<? extends java.lang.annotation.Annotation> annotationClass,
       BiFunction<AnnotationMirror, Map<String, AnnotationValue>, ANNOT> biFunction) {
     AnnotationMirror annotationMirror =
-        ctx.getElements().getAnnotationMirror(element, annotationClass);
+        ctx.getMoreElements().getAnnotationMirror(element, annotationClass);
     return newInstance(annotationMirror, biFunction);
   }
 
@@ -235,7 +235,7 @@ private <ANNOT> ANNOT newInstance(
       String annotationClassName,
       BiFunction<AnnotationMirror, Map<String, AnnotationValue>, ANNOT> biFunction) {
     AnnotationMirror annotationMirror =
-        ctx.getElements().getAnnotationMirror(element, annotationClassName);
+        ctx.getMoreElements().getAnnotationMirror(element, annotationClassName);
     return newInstance(annotationMirror, biFunction);
   }
 
@@ -245,7 +245,8 @@ private <ANNOT> ANNOT newInstance(
     if (annotationMirror == null) {
       return null;
     }
-    Map<String, AnnotationValue> values = ctx.getElements().getValuesWithDefaults(annotationMirror);
+    Map<String, AnnotationValue> values =
+        ctx.getMoreElements().getValuesWithDefaults(annotationMirror);
     return biFunction.apply(annotationMirror, values);
   }
 }

src/main/java/org/seasar/doma/internal/apt/cttype/AbstractCtType.java

@@ -22,11 +22,11 @@ protected AbstractCtType(Context ctx, TypeMirror type) {
     assertNotNull(ctx, type);
     this.ctx = ctx;
     this.type = type;
-    this.typeElement = ctx.getTypes().toTypeElement(type);
+    this.typeElement = ctx.getMoreTypes().toTypeElement(type);
     if (typeElement != null) {
       qualifiedName = typeElement.getQualifiedName().toString();
     } else {
-      qualifiedName = ctx.getTypes().getTypeName(type);
+      qualifiedName = ctx.getMoreTypes().getTypeName(type);
     }
   }
 
@@ -72,6 +72,6 @@ public boolean isTypevar() {
 
   @Override
   public boolean isSameType(CtType other) {
-    return ctx.getTypes().isSameTypeWithErasure(type, other.getType());
+    return ctx.getMoreTypes().isSameTypeWithErasure(type, other.getType());
   }
 }

src/main/java/org/seasar/doma/internal/apt/cttype/BasicCtType.java

@@ -15,7 +15,7 @@ public class BasicCtType extends AbstractCtType {
   BasicCtType(Context ctx, TypeMirror type, TypeMirror wrapperType) {
     super(ctx, type);
     assertNotNull(wrapperType);
-    this.boxedType = ctx.getTypes().boxIfPrimitive(type);
+    this.boxedType = ctx.getMoreTypes().boxIfPrimitive(type);
     this.wrapperType = wrapperType;
   }