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 71a03a27f41b CAMEL-27230: Upgrade to aesh 3.19.2 and skip its class
path scan at start-up (#30374)
71a03a27f41b is described below
commit 71a03a27f41bbdc7c7d6b054e8159dbd14e813fd
Author: Claus Ibsen <[email protected]>
AuthorDate: Thu Nov 19 13:00:17 2026 +0100
CAMEL-27230: Upgrade to aesh 3.19.2 and skip its class path scan at
start-up (#30374)
* CAMEL-27230: Upgrade to aesh 3.19.2
* CAMEL-27230: camel-jbang - aesh skips its class path scan for metadata
registries
The CLI commands have no generated aesh metadata, so the CLI tells aesh
3.19.2 to use only its internal
registry (MetadataProviderRegistry.useOnly) instead of looking through
every JAR on the class path. The
test plugin registers the generated aesh metadata of the Citrus commands it
extends. Takes 30-40 ms off
camel version, ps, get route and catalog component.
Co-Authored-By: Claude Opus 5.5 <[email protected]>
Signed-off-by: Claus Ibsen <[email protected]>
---
.../org/apache/camel/dsl/jbang/core/commands/CamelJBangMain.java | 6 ++++++
.../dsl/jbang/core/commands/CamelJBangMainArgumentFileTest.java | 9 +++++++++
.../apache/camel/dsl/jbang/core/commands/test/TestPlugin.java | 6 ++++++
parent/pom.xml | 2 +-
4 files changed, 22 insertions(+), 1 deletion(-)
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 65f322728bdb..317585b95f00 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
@@ -27,7 +27,9 @@ import org.aesh.command.Command;
import org.aesh.command.CommandDefinition;
import org.aesh.command.CommandResult;
import org.aesh.command.impl.parser.ArgfileExpander;
+import org.aesh.command.internal.InternalCommandMetadataRegistry;
import org.aesh.command.invocation.CommandInvocation;
+import org.aesh.command.metadata.MetadataProviderRegistry;
import org.aesh.command.option.Option;
import org.aesh.command.parser.CommandLineParserException;
import org.aesh.command.validator.OptionValidatorException;
@@ -132,6 +134,10 @@ public class CamelJBangMain implements
Command<CommandInvocation> {
// ignore
}
+ // the commands of the CLI have no generated aesh metadata, so aesh
does not need to look through every JAR on
+ // the class path for registries of it (a plugin with generated
metadata registers its own registry)
+ MetadataProviderRegistry.useOnly(new
InternalCommandMetadataRegistry());
+
args = expandArgumentFiles(args);
if (args == null) {
quit(CliExitCode.USAGE);
diff --git
a/dsl/camel-jbang/camel-jbang-core/src/test/java/org/apache/camel/dsl/jbang/core/commands/CamelJBangMainArgumentFileTest.java
b/dsl/camel-jbang/camel-jbang-core/src/test/java/org/apache/camel/dsl/jbang/core/commands/CamelJBangMainArgumentFileTest.java
index f6002f4fbbff..b2b8545d50b4 100644
---
a/dsl/camel-jbang/camel-jbang-core/src/test/java/org/apache/camel/dsl/jbang/core/commands/CamelJBangMainArgumentFileTest.java
+++
b/dsl/camel-jbang/camel-jbang-core/src/test/java/org/apache/camel/dsl/jbang/core/commands/CamelJBangMainArgumentFileTest.java
@@ -83,6 +83,15 @@ class CamelJBangMainArgumentFileTest extends
CamelCommandBaseTestSupport {
.containsExactly("run", "orders.yaml", "payments.yaml",
"--dev", "--property=app.name=My Shop");
}
+ @Test
+ public void spacesInARowSeparateOnce() throws Exception {
+ Path file = dir.resolve("spaces.txt");
+ Files.writeString(file, "run orders.yaml \t --dev \n");
+ CamelJBangMain main = new CamelJBangMain().withPrinter(printer);
+
+ assertThat(main.expandArgumentFiles("@" +
file)).containsExactly("run", "orders.yaml", "--dev");
+ }
+
@Test
public void aDoubleAtIsALiteralAt() {
CamelJBangMain main = new CamelJBangMain().withPrinter(printer);
diff --git
a/dsl/camel-jbang/camel-jbang-plugin-test/src/main/java/org/apache/camel/dsl/jbang/core/commands/test/TestPlugin.java
b/dsl/camel-jbang/camel-jbang-plugin-test/src/main/java/org/apache/camel/dsl/jbang/core/commands/test/TestPlugin.java
index 50a781ecb078..6dad32cb9df4 100644
---
a/dsl/camel-jbang/camel-jbang-plugin-test/src/main/java/org/apache/camel/dsl/jbang/core/commands/test/TestPlugin.java
+++
b/dsl/camel-jbang/camel-jbang-plugin-test/src/main/java/org/apache/camel/dsl/jbang/core/commands/test/TestPlugin.java
@@ -22,6 +22,7 @@ import java.util.Optional;
import org.aesh.command.CommandException;
import org.aesh.command.CommandResult;
import org.aesh.command.invocation.CommandInvocation;
+import org.aesh.command.metadata.MetadataProviderRegistry;
import org.apache.camel.catalog.VersionHelper;
import org.apache.camel.dsl.jbang.core.commands.CamelJBangMain;
import org.apache.camel.dsl.jbang.core.common.CamelJBangPlugin;
@@ -31,6 +32,7 @@ import org.apache.camel.dsl.jbang.run.common.PluginExporter;
import org.apache.camel.dsl.jbang.run.common.Printer;
import org.citrusframework.CitrusVersion;
import org.citrusframework.jbang.cli.CitrusJBangMain;
+import org.citrusframework.jbang.cli._AeshMetadataRegistry;
@CamelJBangPlugin(name = "camel-jbang-plugin-test", firstVersion = "4.14.0",
appliesTo = { "export" })
public class TestPlugin implements Plugin {
@@ -39,6 +41,10 @@ public class TestPlugin implements Plugin {
@Override
public void customize(CommandTree commandLine, CamelJBangMain main) {
+ // the CLI tells aesh to use only its own metadata registry (no class
path scan), so register the generated
+ // aesh metadata of the Citrus commands, which the commands of this
plugin extend (see TestInit)
+ MetadataProviderRegistry.register(new _AeshMetadataRegistry());
+
CitrusJBangMain citrus = new CitrusJBangMain();
citrus.withPrinter(new PipedPrinter(main.getOut()));
diff --git a/parent/pom.xml b/parent/pom.xml
index add281243092..7941abfacce7 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -61,7 +61,7 @@
<activemq-version>5.19.12</activemq-version>
<activemq6-version>6.3.2</activemq6-version>
<activemq-artemis-version>2.57.0</activemq-artemis-version>
- <aesh-version>3.19.1</aesh-version>
+ <aesh-version>3.19.2</aesh-version>
<agroal-version>3.2.1</agroal-version>
<allegro-converter-version>0.3.0</allegro-converter-version>
<alibabacloud-oss-version>0.6.1</alibabacloud-oss-version>