注釈処理で出力するメッセージに、クラス、メソッド、フィード名など出力元の情報を追加

Kotlin 1.0.2 の kapt によって出力される注釈処理のメッセージにソースコードの場所が含まれないことへの対応です。

Author: nakamura-to

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

@@ -70,7 +70,8 @@ protected void generate(TypeElement typeElement, M meta) {
             generator.generate();
         } catch (IOException e) {
             throw new AptException(Message.DOMA4011, processingEnv,
-                    typeElement, e, typeElement.getQualifiedName(), e);
+                    typeElement, e, new Object[] {
+                            typeElement.getQualifiedName(), e });
         } finally {
             IOUtil.close(generator);
         }

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

@@ -143,7 +143,7 @@ protected void throwExceptionIfNecessary() {
         if (ioException != null) {
             formatter.close();
             throw new AptException(Message.DOMA4079, env, typeElement,
-                    ioException, canonicalName, ioException);
+                    ioException, new Object[] { canonicalName, ioException });
         }
     }
 

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

@@ -51,8 +51,8 @@ protected void handleTypeElement(TypeElement typeElement,
             return;
         }
         if (Options.isDebugEnabled(processingEnv)) {
-            Notifier.debug(processingEnv, Message.DOMA4090, getClass()
-                    .getName(), typeElement.getQualifiedName());
+            Notifier.debug(processingEnv, Message.DOMA4090, new Object[] {
+                    getClass().getName(), typeElement.getQualifiedName() });
         }
         try {
             handler.accept(typeElement);
@@ -64,16 +64,16 @@ protected void handleTypeElement(TypeElement typeElement,
             throw new AptTypeHandleException(typeElement, e);
         } catch (AptIllegalStateException e) {
             Notifier.notify(processingEnv, Kind.ERROR, Message.DOMA4039,
-                    typeElement);
+                    typeElement, new Object[] {});
             throw new AptTypeHandleException(typeElement, e);
         } catch (RuntimeException e) {
             Notifier.notify(processingEnv, Kind.ERROR, Message.DOMA4016,
-                    typeElement);
+                    typeElement, new Object[] {});
             throw new AptTypeHandleException(typeElement, e);
         }
         if (Options.isDebugEnabled(processingEnv)) {
-            Notifier.debug(processingEnv, Message.DOMA4091, getClass()
-                    .getName(), typeElement.getQualifiedName());
+            Notifier.debug(processingEnv, Message.DOMA4091, new Object[] {
+                    getClass().getName(), typeElement.getQualifiedName() });
         }
     }
 }

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

@@ -42,42 +42,43 @@ public class AptException extends DomaException {
     protected AnnotationValue annotationValue;
 
     public AptException(MessageResource messageResource,
-            ProcessingEnvironment env, Element element, Object... args) {
+            ProcessingEnvironment env, Element element, Object[] args) {
         this(messageResource, env, Kind.ERROR, element, null, null, null, args);
     }
 
     public AptException(MessageResource messageResource,
             ProcessingEnvironment env, Element element, Throwable cause,
-            Object... args) {
+            Object[] args) {
         this(messageResource, env, Kind.ERROR, element, null, null, cause, args);
     }
 
     public AptException(MessageResource messageResource,
             ProcessingEnvironment env, Element element,
-            AnnotationMirror annotationMirror, Object... args) {
+            AnnotationMirror annotationMirror, Object[] args) {
         this(messageResource, env, Kind.ERROR, element, annotationMirror, null,
                 null, args);
     }
 
     public AptException(MessageResource messageResource,
             ProcessingEnvironment env, Element element,
             AnnotationMirror annotationMirror, AnnotationValue annotationValue,
-            Object... args) {
+            Object[] args) {
         this(messageResource, env, Kind.ERROR, element, annotationMirror,
                 annotationValue, null, args);
     }
 
-    public AptException(MessageResource messageResource,
+    private AptException(MessageResource messageResource,
             ProcessingEnvironment env, Kind kind, Element element,
             AnnotationMirror annotationMirror, AnnotationValue annotationValue,
-            Throwable cause, Object... args) {
+            Throwable cause, Object[] args) {
         super(messageResource, cause, args);
         this.kind = kind;
         this.element = element;
         this.annotationMirror = annotationMirror;
         this.annotationValue = annotationValue;
         if (Options.isDebugEnabled(env)) {
-            Notifier.debug(env, Message.DOMA4074, messageResource, cause);
+            Notifier.debug(env, Message.DOMA4074, new Object[] {
+                    messageResource, cause });
         }
     }
 

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

@@ -55,7 +55,7 @@ public BatchSqlValidator(ProcessingEnvironment env,
     public Void visitEmbeddedVariableNode(EmbeddedVariableNode node, Void p) {
         if (!isSuppressed(Message.DOMA4181) && !embeddedVariableWarningNotified) {
             Notifier.notify(env, Kind.WARNING, Message.DOMA4181, methodElement,
-                    path);
+                    new Object[] { path });
             embeddedVariableWarningNotified = true;
         }
         return super.visitEmbeddedVariableNode(node, p);
@@ -65,7 +65,7 @@ public Void visitEmbeddedVariableNode(EmbeddedVariableNode node, Void p) {
     public Void visitIfNode(IfNode node, Void p) {
         if (!isSuppressed(Message.DOMA4182) && !ifWarningNotified) {
             Notifier.notify(env, Kind.WARNING, Message.DOMA4182, methodElement,
-                    path);
+                    new Object[] { path });
             ifWarningNotified = true;
         }
         return super.visitIfNode(node, p);
@@ -75,7 +75,7 @@ public Void visitIfNode(IfNode node, Void p) {
     public Void visitForNode(ForNode node, Void p) {
         if (!isSuppressed(Message.DOMA4183) && !forWarningNotified) {
             Notifier.notify(env, Kind.WARNING, Message.DOMA4183, methodElement,
-                    path);
+                    new Object[] { path });
             forWarningNotified = true;
         }
         return super.visitForNode(node, p);

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

@@ -69,7 +69,7 @@ protected void validate(TypeElement typeElement) {
             if (convElement.getAnnotation(ExternalDomain.class) == null) {
                 throw new AptException(Message.DOMA4196, processingEnv,
                         typeElement, convertersMirror.getAnnotationMirror(),
-                        convElement.getQualifiedName());
+                        new Object[] { convElement.getQualifiedName() });
             }
         }
     }