Tweak so no value has to be supplied with the -j parameter when

invoked from the command line.
OWASP-Benchmark · May 1, 2024 · a5fdb8f · a5fdb8f
1 parent 65b445b
commit a5fdb8f
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 3 deletions.
diff --git a/plugin/src/main/java/org/owasp/benchmarkutils/tools/BenchmarkCrawler.java b/plugin/src/main/java/org/owasp/benchmarkutils/tools/BenchmarkCrawler.java
@@ -450,6 +450,11 @@ protected void processCommandLineArgs(String[] args) {
         }
     }
 
+    /**
+     * The execute() method is invoked when this class is invoked as a maven plugin, rather than via
+     * the command line. So what we do here is set up the command line parameters and then invoke
+     * main() so this can be called both as a plugin, or via the command line.
+     */
     @Override
     public void execute() throws MojoExecutionException, MojoFailureException {
         if (null == this.pluginFilenameParam) {

diff --git a/plugin/src/main/java/org/owasp/benchmarkutils/tools/BenchmarkCrawlerVerification.java b/plugin/src/main/java/org/owasp/benchmarkutils/tools/BenchmarkCrawlerVerification.java
@@ -573,7 +573,6 @@ protected void processCommandLineArgs(String[] args) {
                 Option.builder("j")
                         .longOpt("json")
                         .desc("generate json version of verification results")
-                        .hasArg()
                         .build());
         options.addOption("m", "", false, "verify fixed test suite");
         options.addOption(
@@ -616,7 +615,7 @@ protected void processCommandLineArgs(String[] args) {
                 formatter.printHelp("BenchmarkCrawlerVerification", options, true);
             }
             if (line.hasOption("j")) {
-                generateJSONResults = line.getOptionValue("j");
+                generateJSONResults = "true";
             }
             if (line.hasOption("n")) {
                 selectedTestCaseName = line.getOptionValue("n");
@@ -630,6 +629,11 @@ protected void processCommandLineArgs(String[] args) {
         }
     }
 
+    /**
+     * The execute() method is invoked when this class is invoked as a maven plugin, rather than via
+     * the command line. So what we do here is set up the command line parameters and then invoke
+     * main() so this can be called both as a plugin, or via the command line.
+     */
     @Override
     public void execute() throws MojoExecutionException, MojoFailureException {
         if (null == this.pluginFilenameParam) {
@@ -643,8 +647,8 @@ public void execute() throws MojoExecutionException, MojoFailureException {
                 mainArgs.add(this.pluginTestCaseNameParam);
             }
             if (this.generateJSONResults != null) {
+                // At the command line, only the -j is required, with no value needed
                 mainArgs.add("-j");
-                mainArgs.add(this.generateJSONResults);
             }
             main(mainArgs.stream().toArray(String[]::new));
         }