bmarwell commented on a change in pull request #16: URL: https://github.com/apache/maven-jlink-plugin/pull/16#discussion_r523750235
########## File path: src/main/java9/org/apache/maven/plugins/jlink/JLinkExecutor.java ########## @@ -0,0 +1,175 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +package org.apache.maven.plugins.jlink; + +import org.apache.commons.lang3.StringUtils; +import org.apache.maven.plugin.MojoExecutionException; +import org.apache.maven.plugin.logging.Log; +import org.apache.maven.toolchain.Toolchain; + +import java.io.ByteArrayOutputStream; +import java.io.File; +import java.io.IOException; +import java.io.PrintWriter; +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; + +class JLinkExecutor extends AbstractJLinkExecutor +{ + + private final ToolProvider toolProvider; + + public JLinkExecutor( Toolchain toolchain, Log log ) throws IOException + { + super( toolchain, log ); + this.toolProvider = getJLinkExecutable(); + } + + @Override + public Optional<File> getJmodsFolder( /* nullable */ File sourceJdkModules ) + { + if ( sourceJdkModules != null && sourceJdkModules.isDirectory() ) + { + return Optional.of( new File( sourceJdkModules, JMODS ) ); + } + + // ToolProvider does not need jmods folder to be set. + return Optional.empty(); + } + + 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 ); + } + + + protected Stream<String> argsfileToArgs( File argsFile ) + { + try + { + List<String> strings = Files.readAllLines( argsFile.toPath() ); + Deque<String> out = new ArrayDeque<>(); + + for ( String line : strings ) + { + if ( line.startsWith( "-" ) ) + { + out.add( line ); + continue; + } + + if ( line.startsWith( "\"" ) && line.endsWith( "\"" ) ) + { + out.add( line.substring( 1, line.lastIndexOf( "\"" ) ) ); + continue; + } + + out.add( line ); + } + + return out.stream(); + } + catch ( IOException e ) + { + throw new IllegalStateException( "Unable to read jlinkArgs file: " + argsFile.getAbsolutePath() ); + } + + } + + @Override + public int executeJlink( File argsFile ) throws MojoExecutionException Review comment: I was thinking of the same. But then, the execution would differ from both the original code and the Java8 code executing jlink via toolchain. Also, it might be nice for transparency. I can change that, but this will result in java8+toolchain builds having the arg file, and java9+ builds on Jenkins will not. If that's okay for you, I'll change it. Or should I change it for the java8 JLinkExecutor as well? ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: [email protected]
