This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a commit to branch sort in repository https://gitbox.apache.org/repos/asf/camel.git
commit 5611c5a8077d9f766e16e325158846fcf02ef273 Author: Claus Ibsen <[email protected]> AuthorDate: Tue Dec 23 20:16:01 2025 +0100 CAMEL-22800: camel-jbang - Sort list of commands A..Z --- .../dsl/jbang/core/commands/CamelJBangMain.java | 184 ++++++++++----------- .../camel/dsl/jbang/core/commands/Shell.java | 2 +- .../ParameterExceptionHandlerTest.java | 2 +- 3 files changed, 93 insertions(+), 95 deletions(-) diff --git a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/CamelJBangMain.java b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/CamelJBangMain.java index addbabb952dc..0eee0f1fb046 100644 --- a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/CamelJBangMain.java +++ b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/CamelJBangMain.java @@ -82,120 +82,120 @@ public class CamelJBangMain implements Callable<Integer> { } commandLine = new CommandLine(main) - .addSubcommand("nano", new CommandLine(new Nano(main))) - .addSubcommand("shell", new CommandLine(new Shell(main))) - .addSubcommand("init", new CommandLine(new Init(main))) - .addSubcommand("run", new CommandLine(new Run(main))) + .addSubcommand("bind", new CommandLine(new Bind(main))) + .addSubcommand("catalog", new CommandLine(new CatalogCommand(main)) + .addSubcommand("component", new CommandLine(new CatalogComponent(main))) + .addSubcommand("dataformat", new CommandLine(new CatalogDataFormat(main))) + .addSubcommand("dev-console", new CommandLine(new CatalogDevConsole(main))) + .addSubcommand("kamelet", new CommandLine(new CatalogKamelet(main))) + .addSubcommand("transformer", new CommandLine(new CatalogTransformer(main))) + .addSubcommand("language", new CommandLine(new CatalogLanguage(main))) + .addSubcommand("other", new CommandLine(new CatalogOther(main)))) + .addSubcommand("cmd", new CommandLine(new CamelAction(main)) + .addSubcommand("browse", new CommandLine(new CamelBrowseAction(main))) + .addSubcommand("disable-processor", new CommandLine(new CamelProcessorDisableAction(main))) + .addSubcommand("enable-processor", new CommandLine(new CamelProcessorEnableAction(main))) + .addSubcommand("gc", new CommandLine(new CamelGCAction(main))) + .addSubcommand("load", new CommandLine(new CamelLoadAction(main))) + .addSubcommand("logger", new CommandLine(new LoggerAction(main))) + .addSubcommand("receive", new CommandLine(new CamelReceiveAction(main))) + .addSubcommand("reload", new CommandLine(new CamelReloadAction(main))) + .addSubcommand("reset-stats", new CommandLine(new CamelResetStatsAction(main))) + .addSubcommand("resume-route", new CommandLine(new CamelRouteResumeAction(main))) + .addSubcommand("route-structure", new CommandLine(new CamelRouteStructureAction(main))) + .addSubcommand("send", new CommandLine(new CamelSendAction(main))) + .addSubcommand("start-group", new CommandLine(new CamelRouteGroupStartAction(main))) + .addSubcommand("start-route", new CommandLine(new CamelRouteStartAction(main))) + .addSubcommand("stop-group", new CommandLine(new CamelRouteGroupStopAction(main))) + .addSubcommand("stop-route", new CommandLine(new CamelRouteStopAction(main))) + .addSubcommand("stub", new CommandLine(new CamelStubAction(main))) + .addSubcommand("suspend-route", new CommandLine(new CamelRouteSuspendAction(main))) + .addSubcommand("thread-dump", new CommandLine(new CamelThreadDump(main)))) + .addSubcommand("config", new CommandLine(new ConfigCommand(main)) + .addSubcommand("get", new CommandLine(new ConfigGet(main))) + .addSubcommand("list", new CommandLine(new ConfigList(main))) + .addSubcommand("set", new CommandLine(new ConfigSet(main))) + .addSubcommand("unset", new CommandLine(new ConfigUnset(main)))) + .addSubcommand("completion", new CommandLine(new Complete(main))) + .addSubcommand("doc", new CommandLine(new CatalogDoc(main))) .addSubcommand("debug", new CommandLine(new Debug(main))) - .addSubcommand("log", new CommandLine(new CamelLogAction(main))) - .addSubcommand("ps", new CommandLine(new ListProcess(main))) - .addSubcommand("stop", new CommandLine(new StopProcess(main))) + .addSubcommand("dependency", new CommandLine(new DependencyCommand(main)) + .addSubcommand("copy", new CommandLine(new DependencyCopy(main))) + .addSubcommand("list", new CommandLine(new DependencyList(main))) + .addSubcommand("runtime", new CommandLine(new DependencyRuntime(main))) + .addSubcommand("update", new CommandLine(new DependencyUpdate(main)))) + .addSubcommand("dirty", new CommandLine(new Dirty(main))) .addSubcommand("export", new CommandLine(new Export(main))) - .addSubcommand("trace", new CommandLine(new CamelTraceAction(main))) - .addSubcommand("transform", new CommandLine(new TransformCommand(main)) - .addSubcommand("route", new CommandLine(new TransformRoute(main))) - .addSubcommand("message", new CommandLine(new TransformMessageAction(main)))) .addSubcommand("get", new CommandLine(new CamelStatus(main)) + .addSubcommand("bean", new CommandLine(new CamelBeanDump(main))) + .addSubcommand("blocked", new CommandLine(new ListBlocked(main))) + .addSubcommand("circuit-breaker", new CommandLine(new ListCircuitBreaker(main))) + .addSubcommand("consumer", new CommandLine(new ListConsumer(main))) .addSubcommand("context", new CommandLine(new CamelContextStatus(main))) - .addSubcommand("route", new CommandLine(new CamelRouteStatus(main))) - .addSubcommand("group", new CommandLine(new CamelRouteGroupStatus(main))) - .addSubcommand("processor", new CommandLine(new CamelProcessorStatus(main))) .addSubcommand("count", new CommandLine(new CamelCount(main))) - .addSubcommand("health", new CommandLine(new ListHealth(main))) - .addSubcommand("properties", new CommandLine(new ListProperties(main))) - .addSubcommand("variable", new CommandLine(new ListVariable(main))) - .addSubcommand("consumer", new CommandLine(new ListConsumer(main))) - .addSubcommand("producer", new CommandLine(new ListProducer(main))) .addSubcommand("endpoint", new CommandLine(new ListEndpoint(main))) .addSubcommand("event", new CommandLine(new ListEvent(main))) + .addSubcommand("groovy", new CommandLine(new ListGroovy(main))) + .addSubcommand("group", new CommandLine(new CamelRouteGroupStatus(main))) + .addSubcommand("health", new CommandLine(new ListHealth(main))) .addSubcommand("history", new CommandLine(new CamelHistoryAction(main))) .addSubcommand("inflight", new CommandLine(new ListInflight(main))) - .addSubcommand("blocked", new CommandLine(new ListBlocked(main))) .addSubcommand("internal-task", new CommandLine(new ListInternalTask(main))) - .addSubcommand("bean", new CommandLine(new CamelBeanDump(main))) - .addSubcommand("route-controller", new CommandLine(new RouteControllerAction(main))) - .addSubcommand("transformer", new CommandLine(new ListTransformer(main))) - .addSubcommand("circuit-breaker", new CommandLine(new ListCircuitBreaker(main))) + .addSubcommand("kafka", new CommandLine(new ListKafka(main))) .addSubcommand("metric", new CommandLine(new ListMetric(main))) - .addSubcommand("service", new CommandLine(new ListService(main))) - .addSubcommand("rest", new CommandLine(new ListRest(main))) .addSubcommand("platform-http", new CommandLine(new ListPlatformHttp(main))) - .addSubcommand("kafka", new CommandLine(new ListKafka(main))) - .addSubcommand("groovy", new CommandLine(new ListGroovy(main))) - .addSubcommand("source", new CommandLine(new CamelSourceAction(main))) + .addSubcommand("processor", new CommandLine(new CamelProcessorStatus(main))) + .addSubcommand("producer", new CommandLine(new ListProducer(main))) + .addSubcommand("properties", new CommandLine(new ListProperties(main))) + .addSubcommand("rest", new CommandLine(new ListRest(main))) + .addSubcommand("route", new CommandLine(new CamelRouteStatus(main))) + .addSubcommand("route-controller", new CommandLine(new RouteControllerAction(main))) .addSubcommand("route-dump", new CommandLine(new CamelRouteDumpAction(main))) + .addSubcommand("service", new CommandLine(new ListService(main))) + .addSubcommand("source", new CommandLine(new CamelSourceAction(main))) .addSubcommand("startup-recorder", new CommandLine(new CamelStartupRecorderAction(main))) + .addSubcommand("transformer", new CommandLine(new ListTransformer(main))) + .addSubcommand("variable", new CommandLine(new ListVariable(main))) .addSubcommand("vault", new CommandLine(new ListVault(main)))) + .addSubcommand("hawtio", new CommandLine(new Hawtio(main))) + .addSubcommand("infra", new CommandLine(new InfraCommand(main)) + .addSubcommand("get", new CommandLine(new InfraGet(main))) + .addSubcommand("list", new CommandLine(new InfraList(main))) + .addSubcommand("log", new CommandLine(new InfraLog(main))) + .addSubcommand("ps", new CommandLine(new InfraPs(main))) + .addSubcommand("run", new CommandLine(new InfraRun(main))) + .addSubcommand("stop", new CommandLine(new InfraStop(main)))) + .addSubcommand("init", new CommandLine(new Init(main))) + .addSubcommand("jolokia", new CommandLine(new Jolokia(main))) + .addSubcommand("log", new CommandLine(new CamelLogAction(main))) + .addSubcommand("nano", new CommandLine(new Nano(main))) + .addSubcommand("plugin", new CommandLine(new PluginCommand(main)) + .addSubcommand("add", new CommandLine(new PluginAdd(main))) + .addSubcommand("delete", new CommandLine(new PluginDelete(main))) + .addSubcommand("get", new CommandLine(new PluginGet(main)))) + .addSubcommand("ps", new CommandLine(new ListProcess(main))) + .addSubcommand("run", new CommandLine(new Run(main))) + .addSubcommand("sbom", new CommandLine(new SBOMGenerator(main))) + .addSubcommand("script", new CommandLine(new Script(main))) + .addSubcommand("shell", new CommandLine(new Shell(main))) + .addSubcommand("stop", new CommandLine(new StopProcess(main))) .addSubcommand("top", new CommandLine(new CamelTop(main)) .addSubcommand("context", new CommandLine(new CamelContextTop(main))) - .addSubcommand("route", new CommandLine(new CamelRouteTop(main))) .addSubcommand("group", new CommandLine(new CamelRouteGroupTop(main))) .addSubcommand("processor", new CommandLine(new CamelProcessorTop(main))) + .addSubcommand("route", new CommandLine(new CamelRouteTop(main))) .addSubcommand("source", new CommandLine(new CamelSourceTop(main)))) - .addSubcommand("cmd", new CommandLine(new CamelAction(main)) - .addSubcommand("start-route", new CommandLine(new CamelRouteStartAction(main))) - .addSubcommand("stop-route", new CommandLine(new CamelRouteStopAction(main))) - .addSubcommand("suspend-route", new CommandLine(new CamelRouteSuspendAction(main))) - .addSubcommand("resume-route", new CommandLine(new CamelRouteResumeAction(main))) - .addSubcommand("start-group", new CommandLine(new CamelRouteGroupStartAction(main))) - .addSubcommand("stop-group", new CommandLine(new CamelRouteGroupStopAction(main))) - .addSubcommand("enable-processor", new CommandLine(new CamelProcessorEnableAction(main))) - .addSubcommand("disable-processor", new CommandLine(new CamelProcessorDisableAction(main))) - .addSubcommand("reset-stats", new CommandLine(new CamelResetStatsAction(main))) - .addSubcommand("load", new CommandLine(new CamelLoadAction(main))) - .addSubcommand("reload", new CommandLine(new CamelReloadAction(main))) - .addSubcommand("send", new CommandLine(new CamelSendAction(main))) - .addSubcommand("receive", new CommandLine(new CamelReceiveAction(main))) - .addSubcommand("browse", new CommandLine(new CamelBrowseAction(main))) - .addSubcommand("route-structure", new CommandLine(new CamelRouteStructureAction(main))) - .addSubcommand("stub", new CommandLine(new CamelStubAction(main))) - .addSubcommand("thread-dump", new CommandLine(new CamelThreadDump(main))) - .addSubcommand("logger", new CommandLine(new LoggerAction(main))) - .addSubcommand("gc", new CommandLine(new CamelGCAction(main)))) - .addSubcommand("dependency", new CommandLine(new DependencyCommand(main)) - .addSubcommand("list", new CommandLine(new DependencyList(main))) - .addSubcommand("copy", new CommandLine(new DependencyCopy(main))) - .addSubcommand("update", new CommandLine(new DependencyUpdate(main))) - .addSubcommand("runtime", new CommandLine(new DependencyRuntime(main)))) - .addSubcommand("catalog", new CommandLine(new CatalogCommand(main)) - .addSubcommand("component", new CommandLine(new CatalogComponent(main))) - .addSubcommand("dataformat", new CommandLine(new CatalogDataFormat(main))) - .addSubcommand("language", new CommandLine(new CatalogLanguage(main))) - .addSubcommand("transformer", new CommandLine(new CatalogTransformer(main))) - .addSubcommand("dev-console", new CommandLine(new CatalogDevConsole(main))) - .addSubcommand("other", new CommandLine(new CatalogOther(main))) - .addSubcommand("kamelet", new CommandLine(new CatalogKamelet(main)))) - .addSubcommand("doc", new CommandLine(new CatalogDoc(main))) - .addSubcommand("bind", new CommandLine(new Bind(main))) - .addSubcommand("script", new CommandLine(new Script(main))) - .addSubcommand("jolokia", new CommandLine(new Jolokia(main))) - .addSubcommand("hawtio", new CommandLine(new Hawtio(main))) - .addSubcommand("sbom", new CommandLine(new SBOMGenerator(main))) - .addSubcommand("dirty", new CommandLine(new Dirty(main))) - .addSubcommand("completion", new CommandLine(new Complete(main))) - .addSubcommand("config", new CommandLine(new ConfigCommand(main)) - .addSubcommand("list", new CommandLine(new ConfigList(main))) - .addSubcommand("get", new CommandLine(new ConfigGet(main))) - .addSubcommand("unset", new CommandLine(new ConfigUnset(main))) - .addSubcommand("set", new CommandLine(new ConfigSet(main)))) - .addSubcommand("plugin", new CommandLine(new PluginCommand(main)) - .addSubcommand("get", new CommandLine(new PluginGet(main))) - .addSubcommand("add", new CommandLine(new PluginAdd(main))) - .addSubcommand("delete", new CommandLine(new PluginDelete(main)))) - .addSubcommand("version", new CommandLine(new VersionCommand(main)) - .addSubcommand("get", new CommandLine(new VersionGet(main))) - .addSubcommand("set", new CommandLine(new VersionSet(main))) - .addSubcommand("list", new CommandLine(new VersionList(main)))) - .addSubcommand("infra", new CommandLine(new InfraCommand(main)) - .addSubcommand("list", new CommandLine(new InfraList(main))) - .addSubcommand("run", new CommandLine(new InfraRun(main))) - .addSubcommand("stop", new CommandLine(new InfraStop(main))) - .addSubcommand("get", new CommandLine(new InfraGet(main))) - .addSubcommand("ps", new CommandLine(new InfraPs(main))) - .addSubcommand("log", new CommandLine(new InfraLog(main)))) + .addSubcommand("trace", new CommandLine(new CamelTraceAction(main))) + .addSubcommand("transform", new CommandLine(new TransformCommand(main)) + .addSubcommand("message", new CommandLine(new TransformMessageAction(main))) + .addSubcommand("route", new CommandLine(new TransformRoute(main)))) .addSubcommand("update", new CommandLine(new UpdateCommand(main)) .addSubcommand("list", new CommandLine(new UpdateList(main))) .addSubcommand("run", new CommandLine(new UpdateRun(main)))) + .addSubcommand("version", new CommandLine(new VersionCommand(main)) + .addSubcommand("get", new CommandLine(new VersionGet(main))) + .addSubcommand("list", new CommandLine(new VersionList(main))) + .addSubcommand("set", new CommandLine(new VersionSet(main)))) .setParameterExceptionHandler(new MissingPluginParameterExceptionHandler()); PluginHelper.addPlugins(commandLine, main, args); @@ -214,8 +214,6 @@ public class CamelJBangMain implements Callable<Integer> { /** * Finish this main with given exit code. By default, uses system exit to terminate. Subclasses may want to * overwrite this exit behavior e.g. during unit tests. - * - * @param exitCode */ public void quit(int exitCode) { System.exit(exitCode); diff --git a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Shell.java b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Shell.java index e8546ef9913e..9ed49413dd90 100644 --- a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Shell.java +++ b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Shell.java @@ -46,7 +46,7 @@ import picocli.CommandLine; import picocli.shell.jline3.PicocliCommands; @CommandLine.Command(name = "shell", - description = "Interactive Camel JBang shell. Hit @|magenta <TAB>|@ to see available commands.", + description = "Interactive Camel JBang shell.", footer = "Press Ctrl-C to exit.") public class Shell extends CamelCommand { diff --git a/dsl/camel-jbang/camel-jbang-core/src/test/java/org/apache/camel/dsl/jbang/core/commands/exceptionhandler/ParameterExceptionHandlerTest.java b/dsl/camel-jbang/camel-jbang-core/src/test/java/org/apache/camel/dsl/jbang/core/commands/exceptionhandler/ParameterExceptionHandlerTest.java index ccb868ba48c2..83490a515a7b 100644 --- a/dsl/camel-jbang/camel-jbang-core/src/test/java/org/apache/camel/dsl/jbang/core/commands/exceptionhandler/ParameterExceptionHandlerTest.java +++ b/dsl/camel-jbang/camel-jbang-core/src/test/java/org/apache/camel/dsl/jbang/core/commands/exceptionhandler/ParameterExceptionHandlerTest.java @@ -34,7 +34,7 @@ class ParameterExceptionHandlerTest { Assertions.assertEquals(5, lines.length, "5 lines for the error is expected but received " + lines.length); Assertions.assertEquals("Unmatched argument at index 0: 'firstInvalid'", lines[0], "First line mentioning unmatched argument"); - Assertions.assertEquals("Did you mean: camel bind or camel infra or camel plugin?", lines[1], + Assertions.assertEquals("Did you mean: camel stop or camel infra or camel plugin?", lines[1], "Second line with suggestion in case it is a typo"); Assertions.assertEquals( "Maybe a specific Camel JBang plugin must be installed? (Try camel plugin --help' for more information)",
