-
Notifications
You must be signed in to change notification settings - Fork 181
[MCOMPILER-1006] Fix <proc>only</proc> not triggering annotation processors #1017
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
Manas-Dikshit
wants to merge
7
commits into
apache:master
Choose a base branch
from
Manas-Dikshit:master
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+13
−1
Open
Changes from all commits
Commits
Show all changes
7 commits
Select commit
Hold shift + click to select a range
bb5991c
Refactor execute method for better error handling
Manas-Dikshit 09d6857
Formatting
Manas-Dikshit cbb8dc6
Refactor comments in AbstractCompilerMojo.java
Manas-Dikshit 64e3df0
Update print statement from 'Hello' to 'Goodbye'
Manas-Dikshit a6f8f52
Fix annotation processor execution condition
Manas-Dikshit 194dc42
Add method documentation for task creation
Manas-Dikshit 79fb5af
Fix annotation processor condition check
Manas-Dikshit File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -1185,8 +1185,17 @@ public void execute() throws MojoException { | |
| supportedVersion = version; | ||
| } | ||
| } | ||
|
|
||
| Options configuration = parseParameters(compiler); | ||
| try { | ||
| // --- Fix for issue #1006: ensure <proc>only</proc> runs annotation processors | ||
| // --- | ||
| if ("only".equalsIgnoreCase(compilerConfiguration.getProc())) { | ||
| logger.info("Running annotation processors (proc: only)"); | ||
| compile(compiler, configuration); | ||
| return; | ||
| } | ||
| // ------------------------------------------------------------------------------- | ||
| compile(compiler, configuration); | ||
| } catch (RuntimeException e) { | ||
| String message = e.getLocalizedMessage(); | ||
|
|
@@ -1198,15 +1207,18 @@ public void execute() throws MojoException { | |
| message = message.substring(0, s); // Log only the first line. | ||
| } | ||
| } | ||
|
|
||
| MessageBuilder mb = messageBuilderFactory | ||
| .builder() | ||
| .strong("COMPILATION ERROR: ") | ||
| .a(message); | ||
| logger.error(mb.toString(), verbose ? e : null); | ||
|
|
||
| if (tipForCommandLineCompilation != null) { | ||
| logger.info(tipForCommandLineCompilation); | ||
| tipForCommandLineCompilation = null; | ||
| } | ||
|
|
||
| if (failOnError) { | ||
| throw e; | ||
| } | ||
|
|
@@ -1215,7 +1227,7 @@ public void execute() throws MojoException { | |
| throw new CompilationFailureException("I/O error while compiling the project.", e); | ||
| } | ||
| } | ||
|
|
||
|
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Keep blank line between methods. |
||
| /** | ||
| * Creates a new task by taking a snapshot of the current configuration of this <abbr>MOJO</abbr>. | ||
| * This method creates the {@linkplain ToolExecutor#outputDirectory output directory} if it does not already exist. | ||
|
|
||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Just looking for the first time at this pull request seriously (my previous comment was only formatting). What is the purpose of this addition? It does exactly the same thing as before — just invoking
compiler(compiler, configuration)— with only a log added.