add support for diagnostic feedback

trentjeff · trentjeff · commit 34580bbf2eb2 · 2022-03-31T00:56:29.000-04:00
diff --git a/jOOR-java-8/pom.xml b/jOOR-java-8/pom.xml
@@ -11,7 +11,7 @@
 
     <groupId>org.jooq</groupId>
     <artifactId>joor-java-8</artifactId>
-    <version>0.9.14</version>
+    <version>0.9.14.2</version>
     <packaging>bundle</packaging>
 
     <name>jOOR</name>
diff --git a/jOOR-java-8/src/main/java/org/joor/Compile.java b/jOOR-java-8/src/main/java/org/joor/Compile.java
@@ -95,15 +95,15 @@ static Class<?> compile(String className, String content, CompileOptions compile
                     options.addAll(Arrays.asList("-classpath", classpath.toString()));
                 }
 
-                CompilationTask task = compiler.getTask(out, fileManager, null, options, null, files);
+                CompilationTask task = compiler.getTask(out, fileManager, compileOptions.diagnosticListener, options, null, files);
 
                 if (!compileOptions.processors.isEmpty())
                     task.setProcessors(compileOptions.processors);
 
                 task.call();
 
                 if (fileManager.isEmpty()) {
-                    if (compileOptions.hashOption("-proc:only")) {
+                    if (compileOptions.hasOption("-proc:only")) {
                         return null;
                     }
                     throw new ReflectException("Compilation error: " + out);
diff --git a/jOOR-java-8/src/main/java/org/joor/CompileOptions.java b/jOOR-java-8/src/main/java/org/joor/CompileOptions.java
@@ -21,6 +21,8 @@
 import java.util.List;
 
 import javax.annotation.processing.Processor;
+import javax.tools.DiagnosticListener;
+import javax.tools.JavaFileObject;
 
 /**
  * @author Lukas Eder
@@ -29,6 +31,7 @@ public final class CompileOptions {
 
     final List<? extends Processor> processors;
     final List<String> options;
+    DiagnosticListener<JavaFileObject> diagnosticListener;
 
     public CompileOptions() {
         this(
@@ -61,13 +64,19 @@ public final CompileOptions options(List<String> newOptions) {
         return new CompileOptions(processors, newOptions);
     }
 
-    public boolean hashOption(String opt) {
+    public boolean hasOption(String opt) {
         for (String option : options) {
             if (option.equalsIgnoreCase(opt)) {
                 return true;
             }
         }
         return false;
     }
+
+    public CompileOptions withDiagnosticListener(DiagnosticListener<JavaFileObject> listener) {
+        this.diagnosticListener = listener;
+        return this;
+    }
+
 }
 
diff --git a/jOOR-java-8/src/test/java/org/joor/test/CompileOptionsTest.java b/jOOR-java-8/src/test/java/org/joor/test/CompileOptionsTest.java
@@ -15,8 +15,9 @@
 
 import java.util.Collections;
 
-
+import java.util.Locale;
 import java.util.Set;
+import java.util.concurrent.atomic.AtomicReference;
 
 import javax.annotation.processing.Completion;
 import javax.annotation.processing.ProcessingEnvironment;
@@ -27,6 +28,7 @@
 import javax.lang.model.element.Element;
 import javax.lang.model.element.ExecutableElement;
 import javax.lang.model.element.TypeElement;
+import javax.tools.Diagnostic;
 
 import org.joor.CompileOptions;
 import org.joor.Reflect;
@@ -154,6 +156,7 @@ public SourceVersion getSupportedSourceVersion() {
 
         @Override
         public void init(ProcessingEnvironment processingEnv) {
+            processingEnv.getMessager().printMessage(Diagnostic.Kind.NOTE, "running " + getClass().getName());
         }
 
         @Override
@@ -179,10 +182,16 @@ public Iterable<? extends Completion> getCompletions(Element element, Annotation
      * see https://docs.oracle.com/javase/7/docs/technotes/tools/windows/javac.html
      */
     @Test
-    public void testProcOnly() {
+    public void testProcOnlyWithDiagnostics() {
+        AtomicReference<String> diagMessage = new AtomicReference<>();
         Object result = Reflect.compile("p.D", "package p; public class D extends B {} class B {}",
-                                        new CompileOptions().options("-proc:only").processors(new AProcessor()));
+                                        new CompileOptions().options("-proc:only")
+                                                .processors(new AProcessor())
+                                                .withDiagnosticListener(diagnostic -> {
+                                                    diagMessage.set(diagnostic.getMessage(Locale.ENGLISH));
+                                                }));
         assertNull(result);
+        assertNotNull(diagMessage.get());
     }
 
 }

Original file line number	Diff line number	Diff line change
`@@ -95,15 +95,15 @@ static Class<?> compile(String className, String content, CompileOptions compile`
`95`	`95`	`options.addAll(Arrays.asList("-classpath", classpath.toString()));`
`96`	`96`	`}`
`97`	`97`
`98`		`- CompilationTask task = compiler.getTask(out, fileManager, null, options, null, files);`
	`98`	`+ CompilationTask task = compiler.getTask(out, fileManager, compileOptions.diagnosticListener, options, null, files);`
`99`	`99`
`100`	`100`	`if (!compileOptions.processors.isEmpty())`
`101`	`101`	`task.setProcessors(compileOptions.processors);`
`102`	`102`
`103`	`103`	`task.call();`
`104`	`104`
`105`	`105`	`if (fileManager.isEmpty()) {`
`106`		`- if (compileOptions.hashOption("-proc:only")) {`
	`106`	`+ if (compileOptions.hasOption("-proc:only")) {`
`107`	`107`	`return null;`
`108`	`108`	`}`
`109`	`109`	`throw new ReflectException("Compilation error: " + out);`