This is an automated email from the ASF dual-hosted git repository. rfscholte pushed a commit to branch MJLINK-36 in repository https://gitbox.apache.org/repos/asf/maven-jlink-plugin.git
commit 7a1634395763ef14338c5e9e7611d18f02bc689d Author: Benjamin Marwell <[email protected]> AuthorDate: Mon Nov 16 11:40:06 2020 +0100 update javadoc, simplifly Optional use. --- .../org/apache/maven/plugins/jlink/JLinkExecutor.java | 2 +- .../org/apache/maven/plugins/jlink/JLinkExecutor.java | 18 +++++++++--------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/main/java/org/apache/maven/plugins/jlink/JLinkExecutor.java b/src/main/java/org/apache/maven/plugins/jlink/JLinkExecutor.java index 51d2991..f025458 100644 --- a/src/main/java/org/apache/maven/plugins/jlink/JLinkExecutor.java +++ b/src/main/java/org/apache/maven/plugins/jlink/JLinkExecutor.java @@ -32,7 +32,7 @@ import java.util.Optional; /** * JDK 8-only Jlink executor. * - * <p>As JDK8 does not ship jlink, either a toolchain or JAVA_HOME is required.</p> + * <p>As JDK8 does not ship jlink, a toolchain is required.</p> */ class JLinkExecutor extends AbstractJLinkExecutor { diff --git a/src/main/java9/org/apache/maven/plugins/jlink/JLinkExecutor.java b/src/main/java9/org/apache/maven/plugins/jlink/JLinkExecutor.java index 02c4333..c78b8c3 100644 --- a/src/main/java9/org/apache/maven/plugins/jlink/JLinkExecutor.java +++ b/src/main/java9/org/apache/maven/plugins/jlink/JLinkExecutor.java @@ -32,12 +32,17 @@ import java.nio.file.Files; import java.util.ArrayDeque; import java.util.Deque; import java.util.List; -import java.util.NoSuchElementException; import java.util.Optional; import java.util.spi.ToolProvider; import java.util.stream.Collectors; import java.util.stream.Stream; +/** + * JDK9+ executor for jlink. + * + * <p>This implementation uses the JDK9+ Toolprovider SPI to find and execute jlink. + * This way, no fork needs to be created.</p> + */ class JLinkExecutor extends AbstractJLinkExecutor { @@ -63,14 +68,9 @@ class JLinkExecutor extends AbstractJLinkExecutor protected final ToolProvider getJLinkExecutable() { - Optional<ToolProvider> jlink = ToolProvider.findFirst( "jlink" ); - - if ( !jlink.isPresent() ) - { - throw new IllegalStateException( "No jlink tool found." ); - } - - return jlink.orElseThrow( NoSuchElementException::new ); + return ToolProvider + .findFirst( "jlink" ) + .orElseThrow( () -> new IllegalStateException( "No jlink tool found." ) ); }
