diff --git a/pom.xml b/pom.xml index b25d6d0..6192bc7 100644 --- a/pom.xml +++ b/pom.xml @@ -170,16 +170,16 @@ bcprov-jdk18on 1.77 - - info.picocli - picocli - 4.5.2 - commons-io commons-io 2.11.0 test + + info.picocli + picocli + 4.5.2 + diff --git a/src/main/java/sg/edu/ntu/sce/sands/crypto/BasicCommand.java b/src/main/java/sg/edu/ntu/sce/sands/crypto/BasicCommand.java index 0aa1a6a..37f043e 100644 --- a/src/main/java/sg/edu/ntu/sce/sands/crypto/BasicCommand.java +++ b/src/main/java/sg/edu/ntu/sce/sands/crypto/BasicCommand.java @@ -77,7 +77,6 @@ public void validateFileOutput() { } static abstract class ForcibleCommand extends BasicCommand { - @Option(names = { "-f", "--force" }, description = "Enables overwriting. Disabled by default") void setForceOverwrite(boolean forceFlag) { this.overwriteEnabled = forceFlag; diff --git a/src/main/java/sg/edu/ntu/sce/sands/crypto/DCPABETool.java b/src/main/java/sg/edu/ntu/sce/sands/crypto/DCPABETool.java index c18c795..d67442f 100644 --- a/src/main/java/sg/edu/ntu/sce/sands/crypto/DCPABETool.java +++ b/src/main/java/sg/edu/ntu/sce/sands/crypto/DCPABETool.java @@ -45,7 +45,6 @@ }, footer = {"","Run COMMAND --help for more information on a command."}) public class DCPABETool implements Runnable { - @Spec CommandSpec commandSpec; @Option(names = {"--version", "-V"}, versionHelp = true, description = "print version information and exit") diff --git a/src/test/java/sg/edu/ntu/sce/sands/crypto/DCPABEToolTest.java b/src/test/java/sg/edu/ntu/sce/sands/crypto/DCPABEToolTest.java index a057898..1ffcecc 100644 --- a/src/test/java/sg/edu/ntu/sce/sands/crypto/DCPABEToolTest.java +++ b/src/test/java/sg/edu/ntu/sce/sands/crypto/DCPABEToolTest.java @@ -11,10 +11,10 @@ import java.io.PrintStream; import java.io.PrintWriter; import java.nio.file.Files; -import java.nio.file.Path; import java.util.ArrayList; import java.util.Arrays; import java.util.List; +import java.util.Objects; import java.util.stream.Stream; import static org.junit.jupiter.api.Assertions.assertEquals; @@ -43,7 +43,7 @@ public static void beforeAll() throws Exception { gpFile = Files.createTempFile("dcpabe", "gp").toFile(); cmd = new CommandLine(new DCPABETool()); cmd.execute("gsetup", "-f", gpFile.getPath()); - resFile = new File(DCPABEToolTest.class.getResource("/testResource.txt").toURI()); + resFile = new File(Objects.requireNonNull(DCPABEToolTest.class.getResource("/testResource.txt")).toURI()); } @BeforeEach