Refactor Initialization of Configuration File Merger #586
Conversation
This file contains 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
oracle-contributor-agreement
bot
added
the
OCA Verified
fniephaus
reviewed
Apr 8, 2024
|
|
||
| private void initializeMergerExecutable() throws MojoExecutionException { | ||
| Path nativeImage = NativeImageConfigurationUtils.getNativeImage(logger); | ||
| File nativeImageExecutable = nativeImage.toAbsolutePath().toFile(); | ||
| File mergerExecutable = new File(nativeImageExecutable.getParentFile(), nativeImageConfigureFileName()); |
There was a problem hiding this comment.
Use a variable for nativeImageConfigureFileName() so it's only called once.
Comment on lines
76
to
77
| throw new MojoExecutionException("'" + nativeImageConfigureFileName() + "' tool was not found in your " + nativeImage + "." + | ||
| "This probably means that the JDK at '" + nativeImage + "' is not a GraalVM distribution." |
There was a problem hiding this comment.
getNativeImage() already checks whether native-image exists, so if native-image-configure is missing, then it is an incomplete GraalVM distribution. Maybe something like this:
Suggested change
| throw new MojoExecutionException("'" + nativeImageConfigureFileName() + "' tool was not found in your " + nativeImage + "." + | |
| "This probably means that the JDK at '" + nativeImage + "' is not a GraalVM distribution." | |
| throw new MojoExecutionException("'" + nativeImageConfigureFileName() + "' tool was not found in the GraalVM JDK at '" + nativeImageExecutable.getParentFile().getParentFile() + "'." + | |
| "This probably means that you are using a GraalVM distribution that is not fully supported by the Native Build Tools." |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Remove macro from merger init and throw better error if executable does not exist