Normalize commands and add help/version

Author: ppkarwasz

log4j-transform-cli/src/main/java/org/apache/logging/log4j/transform/cli/ConfigurationFileCommands.java

@@ -32,19 +32,32 @@
 import java.util.concurrent.Callable;
 import org.apache.logging.converter.config.ConfigurationConverter;
 import org.jspecify.annotations.Nullable;
+import picocli.CommandLine;
 import picocli.CommandLine.Command;
 import picocli.CommandLine.Option;
 import picocli.CommandLine.Parameters;
 
 @Command(
-        name = "configFile",
+        name = "config-file",
         description = "Handles the transformation of logging configuration files.",
-        subcommands = {ConfigurationFileCommands.Convert.class, ConfigurationFileCommands.ListFormats.class})
-class ConfigurationFileCommands {
+        mixinStandardHelpOptions = true,
+        subcommands = {ConfigurationFileCommands.Convert.class, ConfigurationFileCommands.ListFormats.class},
+        versionProvider = Main.VersionProvider.class)
+public final class ConfigurationFileCommands {
 
     private static final int PADDING_SIZE = 2;
 
-    @Command(name = "listFormats", description = "Lists the supported configuration file formats.")
+    public static void main(final String[] args) {
+        System.exit(new CommandLine(ConfigurationFileCommands.class).execute(args));
+    }
+
+    private ConfigurationFileCommands() {}
+
+    @Command(
+            name = "list-formats",
+            description = "Lists the supported configuration file formats.",
+            mixinStandardHelpOptions = true,
+            versionProvider = Main.VersionProvider.class)
     static class ListFormats implements Callable<Integer> {
 
         private final ConfigurationConverter converter = ConfigurationConverter.getInstance();
@@ -100,7 +113,11 @@ private static List<? extends CharSequence> formatRows(Collection<SupportedForma
         }
     }
 
-    @Command(name = "convert", description = "Converts a logging configuration file to a different format.")
+    @Command(
+            name = "convert",
+            description = "Converts a logging configuration file to a different format.",
+            mixinStandardHelpOptions = true,
+            versionProvider = Main.VersionProvider.class)
     static class Convert implements Callable<Integer> {
 
         private final ConfigurationConverter converter = ConfigurationConverter.getInstance();

log4j-transform-cli/src/main/java/org/apache/logging/log4j/transform/cli/Main.java

@@ -22,12 +22,24 @@
 @Command(
         name = "log4j-transform-cli",
         description = "Provides several utilities that transform Log4j-related files.",
-        subcommands = {ConfigurationFileCommands.class})
+        mixinStandardHelpOptions = true,
+        subcommands = ConfigurationFileCommands.class,
+        versionProvider = Main.VersionProvider.class)
 public final class Main {
 
     public static void main(final String[] args) {
         System.exit(new CommandLine(Main.class).execute(args));
     }
 
     private Main() {}
+
+    static class VersionProvider implements CommandLine.IVersionProvider {
+
+        @Override
+        public String[] getVersion() {
+            return new String[] {
+                "log4j-transform-cli " + Main.class.getPackage().getImplementationVersion()
+            };
+        }
+    }
 }