This is an automated email from the ASF dual-hosted git repository.

davsclaus pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git


The following commit(s) were added to refs/heads/main by this push:
     new aa878290df71 CAMEL-27048: camel-jbang - camel cmd creates only its own 
command, not all commands and plugins (#30201)
aa878290df71 is described below

commit aa878290df713d33c7de80f9eaa8378ce0b6e86c
Author: Claus Ibsen <[email protected]>
AuthorDate: Mon Nov 16 17:02:41 2026 +0100

    CAMEL-27048: camel-jbang - camel cmd creates only its own command, not all 
commands and plugins (#30201)
    
    cmd was a plugin-consuming built-in, so camel cmd created all commands and 
loaded every plugin (3277 classes against 1486 for camel ps). No plugin adds 
anything under cmd, so it now creates only its own command, as the other 
commands do. camel cmd reset-stats goes from 276 ms to 195 ms.
    
    Co-Authored-By: Claude Opus 5.5 <[email protected]>
---
 .../apache/camel/dsl/jbang/core/common/PluginHelper.java   | 13 +++++++------
 .../jbang/core/commands/CamelJBangMainOnlyCommandTest.java | 14 +++++++++++++-
 .../camel/dsl/jbang/core/common/PluginHelperTest.java      |  2 +-
 3 files changed, 21 insertions(+), 8 deletions(-)

diff --git 
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/common/PluginHelper.java
 
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/common/PluginHelper.java
index a35275313e61..8612de852122 100644
--- 
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/common/PluginHelper.java
+++ 
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/common/PluginHelper.java
@@ -79,10 +79,11 @@ public final class PluginHelper {
 
     /**
      * Built-in top-level commands that consume plugins — either by accepting 
plugin-contributed sub-options (run,
-     * export) or by dispatching to plugin-provided commands (shell, cmd). 
Plugin discovery must still run for these
-     * even if the target name is registered as a built-in subcommand.
+     * export) or by dispatching to plugin-provided commands (shell). Plugin 
discovery must still run for these even if
+     * the target name is registered as a built-in subcommand. Not cmd: no 
plugin adds to it, and creating all commands
+     * and plugins for it made camel cmd take twice as long as the other 
commands.
      */
-    private static final Set<String> PLUGIN_CONSUMING_BUILTINS = 
Set.of("shell", "run", "export", "cmd");
+    private static final Set<String> PLUGIN_CONSUMING_BUILTINS = 
Set.of("shell", "run", "export");
 
     // the plugins warned about by compatibilityCheck, to warn once
     private static final Set<String> COMPATIBILITY_WARNED = 
ConcurrentHashMap.newKeySet();
@@ -145,8 +146,8 @@ public final class PluginHelper {
     /**
      * Decides whether plugin discovery (classpath scan + JSON config + Maven 
resolution) is needed for the current
      * invocation. Returns false when the target command is a built-in that 
does not consume plugins, skipping all
-     * plugin-related IO. Returns true for plugin-consuming built-ins 
(run/export/cmd/shell), for unknown commands
-     * (likely plugin-provided), and when no target is given (e.g. --help 
listing).
+     * plugin-related IO. Returns true for plugin-consuming built-ins 
(run/export/shell), for unknown commands (likely
+     * plugin-provided), and when no target is given (e.g. --help listing).
      *
      * @param  commandLine the command line with all built-in subcommands 
already registered
      * @param  args        the raw CLI args; only args[0] is inspected
@@ -181,7 +182,7 @@ public final class PluginHelper {
      * {@link #shouldDiscoverPlugins(CommandTree, String...)}).
      *
      * @param  command the name of the command
-     * @return         {@code true} for shell, run, export and cmd
+     * @return         {@code true} for shell, run and export
      */
     public static boolean isPluginConsumingCommand(String command) {
         return PLUGIN_CONSUMING_BUILTINS.contains(command);
diff --git 
a/dsl/camel-jbang/camel-jbang-core/src/test/java/org/apache/camel/dsl/jbang/core/commands/CamelJBangMainOnlyCommandTest.java
 
b/dsl/camel-jbang/camel-jbang-core/src/test/java/org/apache/camel/dsl/jbang/core/commands/CamelJBangMainOnlyCommandTest.java
index 3a08e0ebc737..1b08e161bb8a 100644
--- 
a/dsl/camel-jbang/camel-jbang-core/src/test/java/org/apache/camel/dsl/jbang/core/commands/CamelJBangMainOnlyCommandTest.java
+++ 
b/dsl/camel-jbang/camel-jbang-core/src/test/java/org/apache/camel/dsl/jbang/core/commands/CamelJBangMainOnlyCommandTest.java
@@ -51,6 +51,16 @@ class CamelJBangMainOnlyCommandTest extends 
CamelCommandBaseTestSupport {
         assertTrue(CamelJBangMain.hasOnlyCommand(commandLine, "config", 
"list"));
     }
 
+    @Test
+    public void cmdCreatesOnlyItself() {
+        // no plugin adds to cmd, so it needs neither the other commands nor 
the plugins
+        CommandTree commandLine = execute("cmd", "reset-stats", "--help");
+
+        assertEquals(Set.of("cmd"), commandLine.getSubcommands().keySet());
+        
assertTrue(commandLine.getSubcommands().get("cmd").getSubcommands().containsKey("send"));
+        assertTrue(CamelJBangMain.hasOnlyCommand(commandLine, "cmd", 
"reset-stats", "--help"));
+    }
+
     @Test
     public void theHelpCreatesAllCommands() {
         assertAllCommands(execute("--help"));
@@ -89,12 +99,14 @@ class CamelJBangMainOnlyCommandTest extends 
CamelCommandBaseTestSupport {
 
     @Test
     public void 
theCommandsThatUseTheOtherCommandsOrThePluginsCreateAllCommands() {
-        for (String command : List.of("shell", "completion", "run", "export", 
"cmd")) {
+        for (String command : List.of("shell", "completion", "run", "export")) 
{
             assertNull(CamelJBangMain.onlyCommand(command, "--foo"), command);
         }
         assertNull(CamelJBangMain.onlyCommand("--verbose", "version"));
         assertEquals("version", CamelJBangMain.onlyCommand("version", "get"));
         assertEquals("version", CamelJBangMain.onlyCommand("version", 
"--help"));
+        // no plugin adds to cmd
+        assertEquals("cmd", CamelJBangMain.onlyCommand("cmd", "send", 
"--body=hello"));
         assertNull(CamelJBangMain.onlyCommand("--help"));
     }
 
diff --git 
a/dsl/camel-jbang/camel-jbang-core/src/test/java/org/apache/camel/dsl/jbang/core/common/PluginHelperTest.java
 
b/dsl/camel-jbang/camel-jbang-core/src/test/java/org/apache/camel/dsl/jbang/core/common/PluginHelperTest.java
index 1bdfc09aa8c9..3c9ac7f453e4 100644
--- 
a/dsl/camel-jbang/camel-jbang-core/src/test/java/org/apache/camel/dsl/jbang/core/common/PluginHelperTest.java
+++ 
b/dsl/camel-jbang/camel-jbang-core/src/test/java/org/apache/camel/dsl/jbang/core/common/PluginHelperTest.java
@@ -199,12 +199,12 @@ public class PluginHelperTest {
         // built-in non-plugin-consuming commands → short-circuit
         assertFalse(PluginHelper.shouldDiscoverPlugins(cl, "version"));
         assertFalse(PluginHelper.shouldDiscoverPlugins(cl, "get", "bean"));
+        assertFalse(PluginHelper.shouldDiscoverPlugins(cl, "cmd", "browse"));
 
         // plugin-consuming built-ins → must load
         assertTrue(PluginHelper.shouldDiscoverPlugins(cl, "run", "foo.yaml"));
         assertTrue(PluginHelper.shouldDiscoverPlugins(cl, "export"));
         assertTrue(PluginHelper.shouldDiscoverPlugins(cl, "shell"));
-        assertTrue(PluginHelper.shouldDiscoverPlugins(cl, "cmd", "browse"));
 
         // unknown command (likely plugin-provided) → must load
         assertTrue(PluginHelper.shouldDiscoverPlugins(cl, "kubernetes", 
"run"));

Reply via email to