From a06ce8eaaa7909839cc131b0b43162c33409ef33 Mon Sep 17 00:00:00 2001 From: "Erik C. Thauvin" Date: Sun, 4 Aug 2024 20:16:55 -0700 Subject: [PATCH] Renamed fileOptions to cmdFiles --- .../rife/bld/operations/JlinkOperation.java | 57 ++++++++++--------- .../rife/bld/operations/JmodOperation.java | 44 +++++++------- .../bld/operations/TestJlinkOperation.java | 6 +- .../bld/operations/TestJmodOperation.java | 20 +++---- 4 files changed, 64 insertions(+), 63 deletions(-) diff --git a/src/main/java/rife/bld/operations/JlinkOperation.java b/src/main/java/rife/bld/operations/JlinkOperation.java index 0bf7994..31aafc7 100644 --- a/src/main/java/rife/bld/operations/JlinkOperation.java +++ b/src/main/java/rife/bld/operations/JlinkOperation.java @@ -15,14 +15,35 @@ import java.util.Map; * @since 2.0.2 */ public class JlinkOperation extends AbstractToolProviderOperation { + private final List cmdFiles_ = new ArrayList<>(); private final List disabledPlugins_ = new ArrayList<>(); private final JlinkOptions jlinkOptions_ = new JlinkOptions(); - private final List fileOptions_ = new ArrayList<>(); public JlinkOperation() { super("jlink"); } + + /** + * Read options and/or mode from file(s). + * + * @param file one or more file + * @return this operation instance + */ + public JlinkOperation cmdFiles(String... file) { + cmdFiles_.addAll(List.of(file)); + return this; + } + + /** + * Retrieves the list of files containing options or mode. + * + * @return the list of files + */ + public List cmdFiles() { + return cmdFiles_; + } + /** * Disable the plugin mentioned. * @@ -36,23 +57,12 @@ public class JlinkOperation extends AbstractToolProviderOperation toolArgs("--disable-plugin", plugin)); toolArgs(jlinkOptions_); super.execute(); } - /** - * Retrieves the list of options for the jlink tool. - *

- * This is a modifiable list that can be retrieved and changed. - * - * @return the map of jlink options - */ - public JlinkOptions jlinkOptions() { - return jlinkOptions_; - } - /** * Provides a list of options to provide to the jlink tool. *

@@ -67,22 +77,13 @@ public class JlinkOperation extends AbstractToolProviderOperation + * This is a modifiable list that can be retrieved and changed. * - * @param file one or more file - * @return this operation instance + * @return the map of jlink options */ - public JlinkOperation fileOptions(String... file) { - fileOptions_.addAll(List.of(file)); - return this; - } - - /** - * Retrieves the list of files containing options or mode. - * - * @return the list of files - */ - public List fileOptions() { - return fileOptions_; + public JlinkOptions jlinkOptions() { + return jlinkOptions_; } } diff --git a/src/main/java/rife/bld/operations/JmodOperation.java b/src/main/java/rife/bld/operations/JmodOperation.java index f75d825..85f11d1 100644 --- a/src/main/java/rife/bld/operations/JmodOperation.java +++ b/src/main/java/rife/bld/operations/JmodOperation.java @@ -15,7 +15,7 @@ import java.util.Map; * @since 2.0.2 */ public class JmodOperation extends AbstractToolProviderOperation { - private final List fileOptions_ = new ArrayList<>(); + private final List cmdFiles = new ArrayList<>(); private final JmodOptions jmodOptions_ = new JmodOptions(); private String jmodFile_; private OperationMode operationMode_; @@ -24,13 +24,33 @@ public class JmodOperation extends AbstractToolProviderOperation super("jmod"); } + /** + * Retrieves the list of files containing options or mode. + * + * @return the list of files + */ + public List cmdFiles() { + return cmdFiles; + } + + /** + * Read options and/or mode from file(s). + * + * @param file one or more file + * @return this operation instance + */ + public JmodOperation cmdFiles(String... file) { + cmdFiles.addAll(List.of(file)); + return this; + } + @Override public void execute() throws Exception { if (operationMode_ != null) { toolArgs(operationMode_.mode); } - toolArgsFromFile(fileOptions_); + toolArgsFromFile(cmdFiles); toolArgs(jmodOptions_); if (jmodFile_ != null) { @@ -40,26 +60,6 @@ public class JmodOperation extends AbstractToolProviderOperation super.execute(); } - /** - * Retrieves the list of files containing options or mode. - * - * @return the list of files - */ - public List fileOptions() { - return fileOptions_; - } - - /** - * Read options and/or mode from a file. - * - * @param file one or more file - * @return this operation instance - */ - public JmodOperation fileOptions(String... file) { - fileOptions_.addAll(List.of(file)); - return this; - } - /** * Retrieves the name of the JMOD file to create or from which to retrieve information. * diff --git a/src/test/java/rife/bld/operations/TestJlinkOperation.java b/src/test/java/rife/bld/operations/TestJlinkOperation.java index 00b9f1c..e8bea79 100644 --- a/src/test/java/rife/bld/operations/TestJlinkOperation.java +++ b/src/test/java/rife/bld/operations/TestJlinkOperation.java @@ -116,7 +116,7 @@ public class TestJlinkOperation { @Test void testFileOptions() { System.setOut(new PrintStream(outputStreamCaptor)); - var jlink = new JlinkOperation().fileOptions("src/test/resources/jlink/options_verbose.txt", + var jlink = new JlinkOperation().cmdFiles("src/test/resources/jlink/options_verbose.txt", "src/test/resources/jlink/options_version.txt"); assertDoesNotThrow(jlink::execute); var out = outputStreamCaptor.toString(); @@ -134,14 +134,14 @@ public class TestJlinkOperation { void testNoArguments() { var jlink = new JlinkOperation(); assertTrue(jlink.jlinkOptions().isEmpty(), "jlink options not empty"); - assertTrue(jlink.fileOptions().isEmpty(), "file options not empty"); + assertTrue(jlink.cmdFiles().isEmpty(), "file options not empty"); assertThrows(ExitStatusException.class, jlink::execute); } @Test void testParseOptions() { System.setOut(new PrintStream(outputStreamCaptor)); - var jlink = new JlinkOperation().fileOptions("src/test/resources/jlink/options_jlink.txt"); + var jlink = new JlinkOperation().cmdFiles("src/test/resources/jlink/options_jlink.txt"); assertDoesNotThrow(jlink::execute); var out = outputStreamCaptor.toString(); assertTrue(out.contains("List of available plugins:"), out); diff --git a/src/test/java/rife/bld/operations/TestJmodOperation.java b/src/test/java/rife/bld/operations/TestJmodOperation.java index ceda755..e3cfb94 100644 --- a/src/test/java/rife/bld/operations/TestJmodOperation.java +++ b/src/test/java/rife/bld/operations/TestJmodOperation.java @@ -138,6 +138,15 @@ public class TestJmodOperation { } } + @Test + void testFileOptions() { + System.setOut(new PrintStream(outputStreamCaptor)); + var jmod = new JmodOperation().cmdFiles("src/test/resources/jlink/options_version.txt"); + assertDoesNotThrow(jmod::execute); + var out = outputStreamCaptor.toString(); + assertTrue(out.matches("[\\d.]+[\\r\\n]+"), out); + } + @Test void testHelp() { var jmod = new JmodOperation().toolArgs("--help-extra"); @@ -148,20 +157,11 @@ public class TestJmodOperation { @Test void testNoArguments() { var jmod = new JmodOperation(); - assertTrue(jmod.fileOptions().isEmpty(), "file options not empty"); + assertTrue(jmod.cmdFiles().isEmpty(), "file options not empty"); assertTrue(jmod.jmodOptions().isEmpty(), "jmod options not empty"); assertThrows(ExitStatusException.class, jmod::execute); } - @Test - void testFileOptions() { - System.setOut(new PrintStream(outputStreamCaptor)); - var jmod = new JmodOperation().fileOptions("src/test/resources/jlink/options_version.txt"); - assertDoesNotThrow(jmod::execute); - var out = outputStreamCaptor.toString(); - assertTrue(out.matches("[\\d.]+[\\r\\n]+"), out); - } - @Test void testVersion() { System.setOut(new PrintStream(outputStreamCaptor));