elharo commented on a change in pull request #16: URL: https://github.com/apache/maven-jlink-plugin/pull/16#discussion_r526427117
########## File path: src/main/java/org/apache/maven/plugins/jlink/AbstractJLinkToolchainExecutor.java ########## @@ -0,0 +1,204 @@ +package org.apache.maven.plugins.jlink; + +/* + * 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. + */ + +import org.apache.commons.lang3.SystemUtils; +import org.apache.maven.plugin.MojoExecutionException; +import org.apache.maven.plugin.logging.Log; +import org.apache.maven.shared.utils.cli.CommandLineException; +import org.apache.maven.shared.utils.cli.CommandLineUtils; +import org.apache.maven.shared.utils.cli.Commandline; +import org.apache.maven.toolchain.Toolchain; +import org.codehaus.plexus.util.StringUtils; Review comment: can you use commons lang instead? ########## File path: src/main/java/org/apache/maven/plugins/jlink/AbstractJLinkToolchainExecutor.java ########## @@ -0,0 +1,204 @@ +package org.apache.maven.plugins.jlink; + +/* Review comment: copyright usually goes above package ########## File path: src/main/java9/org/apache/maven/plugins/jlink/JLinkExecutor.java ########## @@ -0,0 +1,143 @@ +/* + * 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.util.List; +import java.util.Optional; +import java.util.spi.ToolProvider; + +/** + * 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 AbstractJLinkToolchainExecutor +{ + private final ToolProvider toolProvider; + + public JLinkExecutor( Toolchain toolchain, Log log ) throws IOException + { + super( toolchain, log ); + this.toolProvider = getJLinkExecutable(); + } + + protected final ToolProvider getJLinkExecutable() + { + return ToolProvider + .findFirst( "jlink" ) + .orElseThrow( () -> new IllegalStateException( "No jlink tool found." ) ); + } + + @Override + public int executeJlink( List<String> jlinkArgs ) throws MojoExecutionException + { + if (getToolchain().isPresent()) + { + return super.executeJlink( jlinkArgs ); + } + + if ( getLog().isDebugEnabled() ) + { + // no quoted arguments ??? + getLog().debug( this.toolProvider.name() + " " + jlinkArgs ); + } + + try ( ByteArrayOutputStream baosErr = new ByteArrayOutputStream(); + PrintWriter err = new PrintWriter( baosErr ); + ByteArrayOutputStream baosOut = new ByteArrayOutputStream(); + PrintWriter out = new PrintWriter( baosOut ) ) Review comment: dangerous! eats IO exceptions. Don't use PrintWriter. ########## File path: src/main/java/org/apache/maven/plugins/jlink/AbstractJLinkToolchainExecutor.java ########## @@ -0,0 +1,204 @@ +package org.apache.maven.plugins.jlink; + +/* + * 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. + */ + +import org.apache.commons.lang3.SystemUtils; +import org.apache.maven.plugin.MojoExecutionException; +import org.apache.maven.plugin.logging.Log; Review comment: use SLF4J ########## File path: src/main/java/org/apache/maven/plugins/jlink/JLinkMojo.java ########## @@ -443,15 +416,14 @@ public void execute() return modulepathElements; } - private String getExecutable() - throws MojoFailureException + private JLinkExecutor getExecutor() throws MojoFailureException { - String jLinkExec; + JLinkExecutor jLinkExec; try { - jLinkExec = getJLinkExecutable(); + jLinkExec = getJlinkExecutor(); } - catch ( IOException e ) + catch ( RuntimeException e ) Review comment: can you be more specific here? ########## File path: src/main/java/org/apache/maven/plugins/jlink/AbstractJLinkExecutor.java ########## @@ -0,0 +1,63 @@ +package org.apache.maven.plugins.jlink; + +/* + * 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. + */ + +import org.apache.maven.plugin.MojoExecutionException; +import org.apache.maven.plugin.logging.Log; Review comment: No need to use this. SLF4J is the decision for new code in the project. ########## File path: src/main/java9/org/apache/maven/plugins/jlink/JLinkExecutor.java ########## @@ -0,0 +1,143 @@ +/* + * 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.util.List; +import java.util.Optional; +import java.util.spi.ToolProvider; + +/** + * 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 AbstractJLinkToolchainExecutor +{ + private final ToolProvider toolProvider; + + public JLinkExecutor( Toolchain toolchain, Log log ) throws IOException Review comment: don't need a public constructor in a non-public class ########## File path: src/main/java/org/apache/maven/plugins/jlink/JLinkMojo.java ########## @@ -443,15 +416,14 @@ public void execute() return modulepathElements; } - private String getExecutable() - throws MojoFailureException + private JLinkExecutor getExecutor() throws MojoFailureException { - String jLinkExec; + JLinkExecutor jLinkExec; try { - jLinkExec = getJLinkExecutable(); + jLinkExec = getJlinkExecutor(); Review comment: try block should be larger and not split the declaration from initialization ---------------------------------------------------------------- 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: us...@infra.apache.org
