MID-8842 ninja - fixed error messages, display (un-hide) option for d…

…ownload version (cherry picked from commit 89ba961)
Evolveum · Sep 18, 2023 · c1ab315 · c1ab315
1 parent ec6f728
commit c1ab315
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 7 deletions.
diff --git a/tools/ninja/src/main/java/com/evolveum/midpoint/ninja/action/HelpAction.java b/tools/ninja/src/main/java/com/evolveum/midpoint/ninja/action/HelpAction.java
@@ -7,22 +7,20 @@
 
 package com.evolveum.midpoint.ninja.action;
 
-import java.util.List;
-
 import com.beust.jcommander.JCommander;
 import org.apache.commons.lang3.StringUtils;
 
 import com.evolveum.midpoint.ninja.util.NinjaUtils;
 
-public class HelpAction extends Action<HelpOptions, ActionResult> {
+public class HelpAction extends Action<HelpOptions, ActionResult<Void>> {
 
     @Override
     public String getOperationName() {
         return null;
     }
 
     @Override
-    public ActionResult execute() throws Exception {
+    public ActionResult<Void> execute() throws Exception {
         String command = options.getCommand();
 
         JCommander jc = NinjaUtils.setupCommandLineParser();
@@ -33,8 +31,8 @@ public ActionResult execute() throws Exception {
                 log.error(
                         "Unknown command {}, known commands: {}",
                         command,
-                        StringUtils.join(", ", List.of(jc.getCommands().keySet()).stream().sorted()));
-                return new ActionResult(null, 1);
+                        StringUtils.join(jc.getCommands().keySet().stream().sorted().iterator(), ", "));
+                return new ActionResult<>(null, 1);
             }
         }
 

diff --git a/...n/java/com/evolveum/midpoint/ninja/action/upgrade/action/DownloadDistributionOptions.java b/...n/java/com/evolveum/midpoint/ninja/action/upgrade/action/DownloadDistributionOptions.java
@@ -22,7 +22,7 @@ public class DownloadDistributionOptions extends UpgradeCommonOptions {
     @Parameter(names = { P_DISTRIBUTION_DIRECTORY }, descriptionKey = "upgradeDistribution.distributionDirectory")
     private File distributionDirectory;
 
-    @Parameter(names = { P_DISTRIBUTION_VERSION }, descriptionKey = "upgradeDistribution.distributionVersion", hidden = true)
+    @Parameter(names = { P_DISTRIBUTION_VERSION }, descriptionKey = "upgradeDistribution.distributionVersion")
     private String distributionVersion = UpgradeConstants.SUPPORTED_VERSION_TARGET;
 
     public File getDistributionArchive() {