diff --git a/src/main/java/rife/bld/operations/JlinkOperation.java b/src/main/java/rife/bld/operations/JlinkOperation.java index a266117..907a817 100644 --- a/src/main/java/rife/bld/operations/JlinkOperation.java +++ b/src/main/java/rife/bld/operations/JlinkOperation.java @@ -100,7 +100,7 @@ public List options() { return options_; } - // Shouldn't be needed, but for some reason jlink doesn't like @filename when called via ToolProvider + // Shouldn't be needed, but jlink doesn't support @filename when called via ToolProvider private List parseOptions() throws FileNotFoundException { var list = new ArrayList(); @@ -109,10 +109,10 @@ private List parseOptions() throws FileNotFoundException { while (scanner.hasNext()) { var splitLine = scanner.nextLine().split("--"); for (String args : splitLine) { - if (!args.isEmpty()) { + if (!args.isBlank()) { var splitArgs = args.split(" ", 2); list.add("--" + splitArgs[0]); - if (splitArgs.length > 1 && !splitArgs[1].isEmpty()) { + if (splitArgs.length > 1 && !splitArgs[1].isBlank()) { list.add(splitArgs[1]); } } diff --git a/src/test/java/rife/bld/operations/TestJlinkOperation.java b/src/test/java/rife/bld/operations/TestJlinkOperation.java index c47f02f..2b04b72 100644 --- a/src/test/java/rife/bld/operations/TestJlinkOperation.java +++ b/src/test/java/rife/bld/operations/TestJlinkOperation.java @@ -110,7 +110,14 @@ void testNoArguments() { @Test void testOptions() { - var jlink = new JlinkOperation().options("src/test/resources/jlink/options_verbose.txt"); + var jlink = new JlinkOperation().options("src/test/resources/jlink/options_verbose.txt", + "src/test/resources/jlink/options_version.txt"); + assertDoesNotThrow(jlink::execute); + } + + @Test + void testParseOptions() { + var jlink = new JlinkOperation().options("src/test/resources/jlink/options_jlink.txt"); assertDoesNotThrow(jlink::execute); } diff --git a/src/test/java/rife/bld/operations/TestJmodOperation.java b/src/test/java/rife/bld/operations/TestJmodOperation.java index aa4550b..8a63920 100644 --- a/src/test/java/rife/bld/operations/TestJmodOperation.java +++ b/src/test/java/rife/bld/operations/TestJmodOperation.java @@ -142,7 +142,8 @@ void testNoArguments() { @Test void testOptions() { - var jpackage = new JpackageOperation().options("src/test/resources/jlink/options_version.txt"); + var jpackage = new JpackageOperation().options("src/test/resources/jlink/options_verbose.txt", + "src/test/resources/jlink/options_version.txt"); assertDoesNotThrow(jpackage::execute); } diff --git a/src/test/java/rife/bld/operations/TestJpackageOperation.java b/src/test/java/rife/bld/operations/TestJpackageOperation.java index 4c32c01..9bccef0 100644 --- a/src/test/java/rife/bld/operations/TestJpackageOperation.java +++ b/src/test/java/rife/bld/operations/TestJpackageOperation.java @@ -199,7 +199,8 @@ void testNoArguments() { @Test void testOptions() { - var jpackage = new JpackageOperation().options("src/test/resources/jlink/options_verbose.txt"); + var jpackage = new JpackageOperation().options("src/test/resources/jlink/options_verbose.txt", + "src/test/resources/jlink/options_version.txt"); assertDoesNotThrow(jpackage::execute); } diff --git a/src/test/resources/jlink/options_jlink.txt b/src/test/resources/jlink/options_jlink.txt new file mode 100644 index 0000000..f991ca7 --- /dev/null +++ b/src/test/resources/jlink/options_jlink.txt @@ -0,0 +1,2 @@ + --verbose --version + --list-plugins diff --git a/src/test/resources/jlink/options_verbose.txt b/src/test/resources/jlink/options_verbose.txt index 2aa4b63..4342561 100644 --- a/src/test/resources/jlink/options_verbose.txt +++ b/src/test/resources/jlink/options_verbose.txt @@ -1 +1 @@ ---verbose --version \ No newline at end of file +--verbose \ No newline at end of file