Skip to content

use strings instead of file for describe and list ocmmands #34

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.

Sign up for GitHub

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

Merged
elharo merged 9 commits into from
Dec 18, 2024
Merged

use strings instead of file for describe and list ocmmands #34

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
b48e911
Use modern I/O
elharo Dec 18, 2024
901f3c6
fix
elharo Dec 18, 2024
c2b4a97
private
elharo Dec 18, 2024
476ea84
avoid IO
elharo Dec 18, 2024
ea371e0
avoid IO
elharo Dec 18, 2024
90ead03
wip
elharo Dec 18, 2024
3e63207
fix
elharo Dec 18, 2024
9d1fb84
fix
elharo Dec 18, 2024
39a8ff3
describe
elharo Dec 18, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
52 changes: 14 additions & 38 deletions src/main/java/org/apache/maven/plugins/jmod/JModDescribeMojo.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,6 @@

import java.io.File;
import java.io.IOException;
import java.io.Writer;
import java.nio.file.Files;

import org.apache.maven.plugin.MojoExecutionException;
import org.apache.maven.plugin.MojoFailureException;
Expand Down Expand Up @@ -62,50 +60,28 @@ public JModDescribeMojo(ToolchainManager toolchainManager) {
}

public void execute() throws MojoExecutionException, MojoFailureException {

String jModExecutable;
try {
jModExecutable = getJModExecutable();
} catch (IOException e) {
throw new MojoFailureException("Unable to find jmod command: " + e.getMessage(), e);
}
String jModExecutable = getJModExecutable();
getLog().debug("Toolchain in maven-jmod-plugin: jmod [ " + jModExecutable + " ]");

getLog().debug("Toolchain in maven-jmod-plugin: jmod [ " + jModExecutable + " ]");
Commandline cmd = createJModDescribeCommandLine();
cmd.setExecutable(jModExecutable);

if (!jmodFile.exists() || !jmodFile.isFile()) {
throw new MojoFailureException("Unable to find " + jmodFile.getAbsolutePath());
}

Commandline cmd;
try {
cmd = createJModDescribeCommandLine(jmodFile);
getLog().info("The following information is contained in the module file " + jmodFile.getAbsolutePath());
executeCommand(cmd, outputDirectory);
} catch (IOException e) {
throw new MojoExecutionException(e.getMessage());
throw new MojoFailureException("Unable to find jmod command: " + e.getMessage(), e);
}
cmd.setExecutable(jModExecutable);

getLog().info("The following information is contained in the module file " + jmodFile.getAbsolutePath());
executeCommand(cmd, outputDirectory);
}

private Commandline createJModDescribeCommandLine(File resultingJModFile) throws IOException {
File file = new File(outputDirectory, "jmodDescribeArgs");
if (!getLog().isDebugEnabled()) {
file.deleteOnExit();
private Commandline createJModDescribeCommandLine() throws MojoFailureException {
if (!jmodFile.exists() || !jmodFile.isFile()) {
throw new MojoFailureException("Unable to find " + jmodFile.getAbsolutePath());
}
file.getParentFile().mkdirs();
file.createNewFile();

try (Writer out = Files.newBufferedWriter(file.toPath())) {
out.write("describe\n");

out.write(resultingJModFile.getAbsolutePath());
out.write("\n");

Commandline cmd = new Commandline();
cmd.createArg().setValue('@' + file.getAbsolutePath());

return cmd;
}
Commandline commandLine = new Commandline();
commandLine.createArg().setValue("describe");
commandLine.createArg().setValue(jmodFile.getAbsolutePath());
return commandLine;
}
}
54 changes: 15 additions & 39 deletions src/main/java/org/apache/maven/plugins/jmod/JModListMojo.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,6 @@

import java.io.File;
import java.io.IOException;
import java.io.Writer;
import java.nio.file.Files;

import org.apache.maven.plugin.MojoExecutionException;
import org.apache.maven.plugin.MojoFailureException;
Expand All @@ -46,7 +44,7 @@ public class JModListMojo extends AbstractJModMojo {
private File outputDirectory;

/**
* The name of the jmod file which is used to be examined via <code>jmod list jmodFile</code>
* The name of the jmod file which is examined via <code>jmod list jmodFile</code>.
*/
// @formatter:off
@Parameter(
Expand All @@ -62,50 +60,28 @@ public JModListMojo(ToolchainManager toolchainManager) {
}

public void execute() throws MojoExecutionException, MojoFailureException {

String jModExecutable;
try {
jModExecutable = getJModExecutable();
} catch (IOException e) {
throw new MojoFailureException("Unable to find jmod command: " + e.getMessage(), e);
}
String jModExecutable = getJModExecutable();
getLog().debug("Toolchain in maven-jmod-plugin: jmod [ " + jModExecutable + " ]");

getLog().info("Toolchain in maven-jmod-plugin: jmod [ " + jModExecutable + " ]");
Commandline cmd = createJModListCommandLine();
cmd.setExecutable(jModExecutable);

if (!jmodFile.exists() || !jmodFile.isFile()) {
throw new MojoFailureException("Unable to find " + jmodFile.getAbsolutePath());
}

Commandline cmd;
try {
cmd = createJModListCommandLine(jmodFile);
getLog().info("The following files are contained in the module file " + jmodFile.getAbsolutePath());
executeCommand(cmd, outputDirectory);
} catch (IOException e) {
throw new MojoExecutionException(e.getMessage());
throw new MojoFailureException("Unable to find jmod command: " + e.getMessage(), e);
}
cmd.setExecutable(jModExecutable);

getLog().info("The following files are contained in the module file " + jmodFile.getAbsolutePath());
executeCommand(cmd, outputDirectory);
}

private Commandline createJModListCommandLine(File resultingJModFile) throws IOException {
File file = new File(outputDirectory, "jmodListArgs");
if (!getLog().isDebugEnabled()) {
file.deleteOnExit();
private Commandline createJModListCommandLine() throws MojoFailureException {
if (!jmodFile.exists() || !jmodFile.isFile()) {
throw new MojoFailureException("Unable to find " + jmodFile.getAbsolutePath());
}
file.getParentFile().mkdirs();
file.createNewFile();

try (Writer out = Files.newBufferedWriter(file.toPath())) {
out.write("list\n");

out.write(resultingJModFile.getAbsolutePath());
out.write("\n");

Commandline cmd = new Commandline();
cmd.createArg().setValue('@' + file.getAbsolutePath());

return cmd;
}
Commandline commandLine = new Commandline();
commandLine.createArg().setValue("list");
commandLine.createArg().setValue(jmodFile.getAbsolutePath());
return commandLine;
}
}