resolve #263

Author: toptobes

src/main/java/com/dtsx/astra/cli/commands/CommonOptions.java

@@ -2,6 +2,7 @@
 
 import com.dtsx.astra.cli.core.completions.impls.OutputTypeCompletion;
 import com.dtsx.astra.cli.core.exceptions.internal.cli.OptionValidationException;
+import com.dtsx.astra.cli.core.mixins.HelpMixin;
 import com.dtsx.astra.cli.core.output.formats.OutputType;
 import lombok.Getter;
 import lombok.experimental.Accessors;
@@ -15,16 +16,7 @@
 import static com.dtsx.astra.cli.commands.AbstractCmd.SHOW_CUSTOM_DEFAULT;
 
 @Accessors(fluent = true)
-public class CommonOptions {
-    @Option(
-        names = { "-h", "--help" },
-        description = "Show this help message and exit.",
-        showDefaultValue = Visibility.NEVER,
-        usageHelp = true,
-        hidden = true
-    )
-    private boolean helpRequested; // unfortunately mixins not allowed in arg groups :(
-
+public class CommonOptions extends HelpMixin { // I don't like extending here but mixins don't compose w/ arg groups :(
     @Getter
     private Optional<Ansi> ansi = Optional.empty();
 

src/main/java/com/dtsx/astra/cli/commands/config/home/ConfigHomeCmd.java

@@ -1,6 +1,8 @@
 package com.dtsx.astra.cli.commands.config.home;
 
+import com.dtsx.astra.cli.core.mixins.HelpMixin;
 import picocli.CommandLine.Command;
+import picocli.CommandLine.Mixin;
 
 @Command(
     name = "home",
@@ -9,4 +11,7 @@
         ConfigHomePathCmd.class,
     }
 )
-public class ConfigHomeCmd {}
+public class ConfigHomeCmd {
+    @Mixin
+    public HelpMixin help;
+}

src/main/java/com/dtsx/astra/cli/commands/db/cqlsh/CqlshCmd.java

@@ -1,7 +1,9 @@
 package com.dtsx.astra.cli.commands.db.cqlsh;
 
 import com.dtsx.astra.cli.core.help.Example;
+import com.dtsx.astra.cli.core.mixins.HelpMixin;
 import picocli.CommandLine.Command;
+import picocli.CommandLine.Mixin;
 
 @Command(
     name = "cqlsh",
@@ -29,4 +31,7 @@
     comment = "Execute a CQL file",
     command = "${cli.name} db cqlsh exec my_db -f script.cql"
 )
-public class CqlshCmd {}
+public class CqlshCmd {
+    @Mixin
+    public HelpMixin help;
+}

src/main/java/com/dtsx/astra/cli/commands/db/dsbulk/DbDsbulkCmd.java

@@ -1,6 +1,8 @@
 package com.dtsx.astra.cli.commands.db.dsbulk;
 
+import com.dtsx.astra.cli.core.mixins.HelpMixin;
 import picocli.CommandLine.Command;
+import picocli.CommandLine.Mixin;
 
 @Command(
     name = "dsbulk",
@@ -13,4 +15,7 @@
         DbDsbulkPathCmd.class,
     }
 )
-public class DbDsbulkCmd {}
+public class DbDsbulkCmd {
+    @Mixin
+    public HelpMixin help;
+}

src/main/java/com/dtsx/astra/cli/commands/streaming/pulsar/StreamingPulsarCmd.java

@@ -1,7 +1,9 @@
 package com.dtsx.astra.cli.commands.streaming.pulsar;
 
 import com.dtsx.astra.cli.core.help.Example;
+import com.dtsx.astra.cli.core.mixins.HelpMixin;
 import picocli.CommandLine.Command;
+import picocli.CommandLine.Mixin;
 
 @Command(
     name = "pulsar",
@@ -24,4 +26,7 @@
     comment = "Get pulsar executable path",
     command = "${cli.name} streaming pulsar path"
 )
-public class StreamingPulsarCmd {}
+public class StreamingPulsarCmd {
+    @Mixin
+    public HelpMixin help;
+}