Skip to content
This repository has been archived by the owner on Jul 30, 2021. It is now read-only.

Adding support for generating eclipse markers through m2e injuected buildContext #34

Merged
merged 4 commits into from
Feb 8, 2015
Merged

Adding support for generating eclipse markers through m2e injuected buildContext #34

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
158fed9
support for generating m2e eclipse markers through buildContext
Feb 2, 2015
26dad6d
indent with 4 spaces
Feb 3, 2015
9027fb9
finals removed and changed the order for the switch block
Feb 3, 2015
4319a22
Use DiagnosticCollector instead of DiagnosticListener
Feb 4, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
45 changes: 44 additions & 1 deletion src/main/java/com/mysema/maven/apt/AbstractProcessorMojo.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,11 @@
*/
package com.mysema.maven.apt;

import javax.tools.Diagnostic;
import javax.tools.Diagnostic.Kind;
import javax.tools.JavaCompiler;
import javax.tools.JavaCompiler.CompilationTask;
import javax.tools.DiagnosticCollector;
import javax.tools.JavaFileObject;
import javax.tools.StandardJavaFileManager;
import javax.tools.ToolProvider;
Expand Down Expand Up @@ -279,6 +282,40 @@ private Set<File> filterFiles(Set<File> directories) {
return files;
}

/**
* Add messages through the buildContext:
* <ul>
* <li>cli build creates log output</li>
* <li>m2e build creates markers for eclipse</li>
* </ul>
* @param diagnostics
*/
private void processDiagnostics(final List<Diagnostic<? extends JavaFileObject>> diagnostics) {
for (Diagnostic<? extends JavaFileObject> diagnostic : diagnostics) {
JavaFileObject javaFileObject = diagnostic.getSource();
if (javaFileObject != null) { // message was created without element parameter
File file = new File(javaFileObject.toUri().getPath());
Kind kind = diagnostic.getKind();
int lineNumber = (int) diagnostic.getLineNumber();
int columnNumber = (int) diagnostic.getColumnNumber();
String message = diagnostic.getMessage(Locale.getDefault());
switch (kind) {
case ERROR:
buildContext.addMessage(file, lineNumber, columnNumber, message, BuildContext.SEVERITY_ERROR, null);
break;
case WARNING:
case MANDATORY_WARNING:
buildContext.addMessage(file, lineNumber, columnNumber, message, BuildContext.SEVERITY_WARNING, null);
break;
case NOTE:
case OTHER:
default:
break;
}
}
}
}

public void execute() throws MojoExecutionException {
if (getOutputDirectory() == null) {
return;
Expand Down Expand Up @@ -319,6 +356,10 @@ public void execute() throws MojoExecutionException {

fileManager = compiler.getStandardFileManager(null, null, null);
Iterable<? extends JavaFileObject> compilationUnits1 = fileManager.getJavaFileObjectsFromFiles(files);
// clean all markers
for (JavaFileObject javaFileObject : compilationUnits1) {
buildContext.removeMessages(new File(javaFileObject.toUri().getPath()));
}

String compileClassPath = buildCompileClasspath();

Expand All @@ -341,13 +382,15 @@ public void execute() throws MojoExecutionException {
}
ExecutorService executor = Executors.newSingleThreadExecutor();
try {
CompilationTask task = compiler.getTask(out, fileManager, null, compilerOptions, null, compilationUnits1);
DiagnosticCollector<JavaFileObject> diagnosticCollector = new DiagnosticCollector<JavaFileObject>();
CompilationTask task = compiler.getTask(out, fileManager, diagnosticCollector, compilerOptions, null, compilationUnits1);
Future<Boolean> future = executor.submit(task);
Boolean rv = future.get();

if (Boolean.FALSE.equals(rv) && logOnlyOnError) {
getLog().error(out.toString());
}
processDiagnostics(diagnosticCollector.getDiagnostics());
} finally {
executor.shutdown();
if (tempDirectory != null) {
Expand Down