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 23e9ce91824a CAMEL-26931: camel-jbang - smaller fixes: transform route
class, catalog --filter, update run options, missing argument errors, empty
Since, <file> help labels, and plugin get / infra ps when empty (#30035)
23e9ce91824a is described below
commit 23e9ce91824aed1daaa6a43e68b62a4637715c5b
Author: Claus Ibsen <[email protected]>
AuthorDate: Sun Nov 15 19:43:24 2026 +0100
CAMEL-26931: camel-jbang - smaller fixes: transform route class, catalog
--filter, update run options, missing argument errors, empty Since, <file> help
labels, and plugin get / infra ps when empty (#30035)
- camel transform route --format=java --output=Out.java names the class
Out, after its file (it was named after the
route file, which does not compile).
- camel doc of an EIP no longer prints an empty Since: line (the catalog
has no first version for EIPs).
- The file arguments show as <file> and <files> in the help (paramLabel
"<file>" showed as <<file>>).
- camel plugin get without plugins says so (it printed nothing), and camel
infra ps with nothing running says so (it
printed the header of the table only).
- camel eval --help says "use eval --help to see sub commands" (it said
transform).
Co-Authored-By: Claude Opus 5.5 <[email protected]>
---
.../ROOT/pages/camel-4x-upgrade-guide-4_24.adoc | 9 ++
.../jbang-commands/camel-jbang-update-run.adoc | 14 +--
.../META-INF/camel-jbang-commands-metadata.json | 2 +-
.../dsl/jbang/core/commands/DependencyUpdate.java | 24 +++--
.../camel/dsl/jbang/core/commands/EvalCommand.java | 2 +-
.../camel/dsl/jbang/core/commands/Explain.java | 2 +-
.../dsl/jbang/core/commands/ExportBaseCommand.java | 2 +-
.../camel/dsl/jbang/core/commands/Harden.java | 2 +-
.../apache/camel/dsl/jbang/core/commands/Init.java | 2 +-
.../apache/camel/dsl/jbang/core/commands/Nano.java | 2 +-
.../apache/camel/dsl/jbang/core/commands/Run.java | 2 +-
.../camel/dsl/jbang/core/commands/Script.java | 2 +-
.../dsl/jbang/core/commands/TransformRoute.java | 25 ++++-
.../core/commands/action/CamelChaosLoadAction.java | 3 +-
.../commands/action/CamelRouteDiagramAction.java | 2 +-
.../commands/action/CamelRouteTopologyAction.java | 2 +-
.../core/commands/action/CamelSqlQueryAction.java | 2 +-
.../camel/dsl/jbang/core/commands/bind/Bind.java | 2 +-
.../core/commands/catalog/CatalogBaseCommand.java | 3 +-
.../jbang/core/commands/catalog/CatalogDoc.java | 22 ++--
.../dsl/jbang/core/commands/config/ConfigGet.java | 2 +-
.../dsl/jbang/core/commands/config/ConfigSet.java | 2 +-
.../jbang/core/commands/config/ConfigUnset.java | 2 +-
.../MissingPluginParameterExceptionHandler.java | 19 +++-
.../core/commands/infra/InfraBaseCommand.java | 3 +
.../jbang/core/commands/infra/InfraRestart.java | 2 +-
.../dsl/jbang/core/commands/infra/InfraRun.java | 2 +-
.../dsl/jbang/core/commands/plugin/PluginAdd.java | 2 +-
.../jbang/core/commands/plugin/PluginDelete.java | 2 +-
.../dsl/jbang/core/commands/plugin/PluginGet.java | 9 +-
.../dsl/jbang/core/commands/process/Jolokia.java | 2 +-
.../core/commands/process/RestartProcess.java | 2 +-
.../core/commands/update/CamelUpdateMixin.java | 23 ++--
.../core/commands/DependencyUpdateWriteTest.java | 63 +++++++++++
.../jbang/core/commands/ExitCodeContractTest.java | 10 ++
.../jbang/core/commands/TransformRouteTest.java | 22 ++++
.../commands/catalog/CatalogComponentTest.java | 17 ++-
.../core/commands/catalog/CatalogDocTest.java | 2 +
.../dsl/jbang/core/commands/infra/InfraPsTest.java | 3 +
.../jbang/core/commands/plugin/PluginGetTest.java | 4 +-
.../jbang/core/commands/update/UpdateRunTest.java | 2 +-
.../src/test/resources/golden/cli-help.txt | 119 ++++++++++-----------
.../dsl/jbang/core/commands/edit/EditCommand.java | 2 +-
.../commands/generate/CodeSchemaGenerator.java | 6 +-
.../commands/kubernetes/KubernetesPodLogs.java | 2 +-
.../core/commands/kubernetes/KubernetesRun.java | 2 +-
.../validate/PropertiesValidateCommand.java | 2 +-
.../commands/validate/SourceValidateCommand.java | 2 +-
.../commands/validate/YamlNormalizeCommand.java | 2 +-
.../commands/validate/YamlValidateCommand.java | 2 +-
50 files changed, 328 insertions(+), 132 deletions(-)
diff --git
a/docs/user-manual/modules/ROOT/pages/camel-4x-upgrade-guide-4_24.adoc
b/docs/user-manual/modules/ROOT/pages/camel-4x-upgrade-guide-4_24.adoc
index b4efb09fd2c6..392b3f2819f2 100644
--- a/docs/user-manual/modules/ROOT/pages/camel-4x-upgrade-guide-4_24.adoc
+++ b/docs/user-manual/modules/ROOT/pages/camel-4x-upgrade-guide-4_24.adoc
@@ -3495,6 +3495,15 @@ Spring (`@DateTimeFormat`). The OpenAPI Generator no
longer prints its banner on
lists them and exits with `2`. Use `camel stop --all` (or `camel stop '*'`) to
stop them all, as `camel stop` did. A
bare `camel stop`, such as of an AI agent, stopped the integrations of the
user and of other agents too.
+=== camel-jbang - the options of camel update and catalog --filter
+
+* The options of `camel update run` are named in kebab-case, as the options of
the other
+ commands: `--dry-run`, `--open-rewrite-version`, `--camel-artifact`,
`--camel-spring-boot-artifact`,
+ `--quarkus-maven-plugin-version`, `--quarkus-maven-plugin-group-id` and
`--upgrade-timeout`. The camelCase names
+ (`--dryRun` and so on) still work.
+* `--filter` of the `camel catalog` commands matches a part of the name, as it
does for the description:
+ `--filter=aws2` lists the `aws2-*` components (it listed nothing, as only a
whole name matched).
+
=== camel-jbang - camel version list
* `camel version list` prints the `Last updated` note on stderr, so stdout has
the table only.
diff --git
a/docs/user-manual/modules/ROOT/pages/jbang-commands/camel-jbang-update-run.adoc
b/docs/user-manual/modules/ROOT/pages/jbang-commands/camel-jbang-update-run.adoc
index 3f93a9d44de6..0b4bd4d6bf3d 100644
---
a/docs/user-manual/modules/ROOT/pages/jbang-commands/camel-jbang-update-run.adoc
+++
b/docs/user-manual/modules/ROOT/pages/jbang-commands/camel-jbang-update-run.adoc
@@ -19,21 +19,21 @@ camel update run [options]
[cols="2,5,1,2",options="header"]
|===
| Option | Description | Default | Type
-| `--camelArtifact` | The Maven artifact coordinates for the Camel upgrade
recipes. | camel-upgrade-recipes | String
-| `--camelSpringBootArtifact` | The Maven artifact coordinates for the Camel
Spring Boot upgrade recipes. | camel-spring-boot-upgrade-recipes | String
+| `--camel-artifact,--camelArtifact` | The Maven artifact coordinates for the
Camel upgrade recipes. | camel-upgrade-recipes | String
+| `--camel-spring-boot-artifact,--camelSpringBootArtifact` | The Maven
artifact coordinates for the Camel Spring Boot upgrade recipes. |
camel-spring-boot-upgrade-recipes | String
| `--debug` | Enables debug logging if set to true. | false | boolean
| `--download` | Whether to allow automatic downloading JAR dependencies (over
the internet) | true | boolean
-| `--dryRun` | If set to true, performs a dry run of the update process
without making any changes. | false | boolean
+| `--dry-run,--dryRun` | If set to true, performs a dry run of the update
process without making any changes. | false | boolean
| `--extraActiveRecipes` | Comma separated list of recipes to be executed
after the Camel one, make sure the artifact containing the recipes is added via
extraRecipeArtifactCoordinates | | List
| `--extraRecipeArtifactCoordinates` | Comma separated list of artifact
coordinates containing extraActiveRecipes, ex.my.org:recipes:1.0.0 | | List
| `--fresh` | Make sure we use fresh (i.e. non-cached) resources | false |
boolean
-| `--openRewriteVersion` | The version of OpenRewrite to use during the update
process. | 6.0.4 | String
+| `--open-rewrite-version,--openRewriteVersion` | The version of OpenRewrite
to use during the update process. | 6.0.4 | String
| `--quarkus-ext-registry` | The base URI of Quarkus Extension Registry. The
default is \https://registry.quarkus.io unless camel.jbang.quarkus.platform.url
system property is set (the "/client/platforms" suffix is removed if present).
| | String
-| `--quarkusMavenPluginGroupId` | The group ID of the Quarkus Maven plugin. |
io.quarkus.platform | String
-| `--quarkusMavenPluginVersion` | The version of the Quarkus Maven plugin to
use; the default value is looked up in Quarkus Extension Registry | | String
+| `--quarkus-maven-plugin-group-id,--quarkusMavenPluginGroupId` | The group ID
of the Quarkus Maven plugin. | io.quarkus.platform | String
+| `--quarkus-maven-plugin-version,--quarkusMavenPluginVersion` | The version
of the Quarkus Maven plugin to use; the default value is looked up in Quarkus
Extension Registry | | String
| `--repo,--repos` | Additional maven repositories for download on-demand (Use
commas to separate multiple repositories) | | String
| `--runtime` | Runtime (camel-main, spring-boot, quarkus) | camel-main |
RuntimeType
-| `--upgradeTimeout` | Time to wait, in seconds, before shutting down the
upgrade process | 240 | int
+| `--upgrade-timeout,--upgradeTimeout` | Time to wait, in seconds, before
shutting down the upgrade process | 240 | int
| `-h,--help` | Display this help and exit | | boolean
|===
diff --git
a/dsl/camel-jbang/camel-jbang-core/src/generated/resources/META-INF/camel-jbang-commands-metadata.json
b/dsl/camel-jbang/camel-jbang-core/src/generated/resources/META-INF/camel-jbang-commands-metadata.json
index a94bc7ee1d41..14d6496ca0e6 100644
---
a/dsl/camel-jbang/camel-jbang-core/src/generated/resources/META-INF/camel-jbang-commands-metadata.json
+++
b/dsl/camel-jbang/camel-jbang-core/src/generated/resources/META-INF/camel-jbang-commands-metadata.json
@@ -37,7 +37,7 @@
{ "name": "top", "fullName": "top", "description": "Top status of Camel
integrations", "sourceClass":
"org.apache.camel.dsl.jbang.core.commands.process.CamelTop", "options": [ {
"names": "--watch", "description": "Execute periodically and showing output
fullscreen", "javaType": "boolean", "type": "boolean" }, { "names":
"-h,--help", "description": "Display this help and exit", "javaType":
"boolean", "type": "boolean" } ], "subcommands": [ { "name": "context",
"fullName": "top context [...]
{ "name": "trace", "fullName": "trace", "description": "Tail message
traces from running Camel integrations", "sourceClass":
"org.apache.camel.dsl.jbang.core.commands.action.CamelTraceAction", "options":
[ { "names": "--action", "description": "Action to start, stop, clear, list
status, or dump traces", "defaultValue": "status", "javaType":
"java.lang.String", "type": "string" }, { "names": "--ago", "description": "Use
ago instead of yyyy-MM-dd HH:mm:ss in timestamp.", "javaType": "b [...]
{ "name": "transform", "fullName": "transform", "description": "Transform
message or Camel routes", "sourceClass":
"org.apache.camel.dsl.jbang.core.commands.TransformCommand", "options": [ {
"names": "-h,--help", "description": "Display this help and exit", "javaType":
"boolean", "type": "boolean" } ], "subcommands": [ { "name": "dataweave",
"fullName": "transform dataweave", "description": "Convert DataWeave scripts to
DataSonnet format", "sourceClass": "org.apache.camel.dsl.jbang.c [...]
- { "name": "update", "fullName": "update", "description": "Update Camel
project", "sourceClass":
"org.apache.camel.dsl.jbang.core.commands.update.UpdateCommand", "options": [ {
"names": "-h,--help", "description": "Display this help and exit", "javaType":
"boolean", "type": "boolean" } ], "subcommands": [ { "name": "list",
"fullName": "update list", "description": "List available update versions for
Camel and its runtime variants", "sourceClass":
"org.apache.camel.dsl.jbang.core.comma [...]
+ { "name": "update", "fullName": "update", "description": "Update Camel
project", "sourceClass":
"org.apache.camel.dsl.jbang.core.commands.update.UpdateCommand", "options": [ {
"names": "-h,--help", "description": "Display this help and exit", "javaType":
"boolean", "type": "boolean" } ], "subcommands": [ { "name": "list",
"fullName": "update list", "description": "List available update versions for
Camel and its runtime variants", "sourceClass":
"org.apache.camel.dsl.jbang.core.comma [...]
{ "name": "version", "fullName": "version", "description": "Manage Camel
versions", "sourceClass":
"org.apache.camel.dsl.jbang.core.commands.version.VersionCommand", "options": [
{ "names": "-h,--help", "description": "Display this help and exit",
"javaType": "boolean", "type": "boolean" } ], "subcommands": [ { "name": "get",
"fullName": "version get", "description": "Displays current Camel version",
"sourceClass": "org.apache.camel.dsl.jbang.core.commands.version.VersionGet",
"optio [...]
{ "name": "wrapper", "fullName": "wrapper", "description": "Install Camel
wrapper scripts for version pinning", "sourceClass":
"org.apache.camel.dsl.jbang.core.commands.WrapperCommand", "options": [ {
"names": "--camel-version", "description": "Camel version to pin (defaults to
current version)", "javaType": "java.lang.String", "type": "string" }, {
"names": "--command-name", "description": "The name of the command to use
(camel or camelw)", "defaultValue": "camel", "javaType": "java [...]
]
diff --git
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/DependencyUpdate.java
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/DependencyUpdate.java
index 121bb10b5085..4ac4d7a30b28 100644
---
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/DependencyUpdate.java
+++
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/DependencyUpdate.java
@@ -17,6 +17,7 @@
package org.apache.camel.dsl.jbang.core.commands;
import java.io.ByteArrayInputStream;
+import java.io.IOException;
import java.nio.charset.StandardCharsets;
import java.nio.file.Files;
import java.nio.file.Path;
@@ -206,6 +207,20 @@ public class DependencyUpdate extends DependencyList {
}
}
+ /**
+ * Writes the lines with the line separator of the file, and a newline at
the end when the file had one: it dropped
+ * the last newline, and wrote CRLF on Windows into a file of LF lines
(CAMEL-26931).
+ */
+ static void writeLikeTheFile(Path file, List<String> lines) throws
IOException {
+ String original = Files.exists(file) ? Files.readString(file) : "";
+ String separator = original.contains("\r\n") ? "\r\n" : "\n";
+ String text = String.join(separator, lines);
+ if (original.isEmpty() || original.endsWith("\n")) {
+ text += separator;
+ }
+ Files.writeString(file, text);
+ }
+
private void updateJBangSource(Path file) {
try {
List<String> lines = Files.readAllLines(file);
@@ -245,8 +260,7 @@ public class DependencyUpdate extends DependencyList {
answer.add(pos, dep);
}
- String text = String.join(System.lineSeparator(), answer);
- Files.writeString(file, text);
+ writeLikeTheFile(file, answer);
} catch (Exception e) {
printer().printErr("Error updating source file: " + file + " due
to: " + e.getMessage());
}
@@ -316,8 +330,7 @@ public class DependencyUpdate extends DependencyList {
answer.add(pos, dep);
}
- String text = String.join(System.lineSeparator(), answer);
- Files.writeString(file, text);
+ writeLikeTheFile(file, answer);
} catch (Exception e) {
printer().printErr("Error updating source file: " + file + " due
to: " + e.getMessage());
}
@@ -345,8 +358,7 @@ public class DependencyUpdate extends DependencyList {
}
answer.add(line);
}
- String text = String.join(System.lineSeparator(), answer);
- Files.writeString(file, text);
+ writeLikeTheFile(file, answer);
} catch (Exception e) {
printer().printErr("Error stripping //DEPS from: " + file + " due
to: " + e.getMessage());
}
diff --git
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/EvalCommand.java
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/EvalCommand.java
index ac99cc629dec..3d106a27a9cd 100644
---
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/EvalCommand.java
+++
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/EvalCommand.java
@@ -19,7 +19,7 @@ package org.apache.camel.dsl.jbang.core.commands;
import org.aesh.command.CommandDefinition;
@CommandDefinition(name = "eval",
- description = "Evaluate Camel expressions and scripts (use
transform --help to see sub commands)",
+ description = "Evaluate Camel expressions and scripts (use
eval --help to see sub commands)",
generateHelp = true)
public class EvalCommand extends CamelCommand {
diff --git
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Explain.java
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Explain.java
index d0b95fb32184..6901a2cdce89 100644
---
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Explain.java
+++
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Explain.java
@@ -85,7 +85,7 @@ public class Explain extends CamelCommand {
"marshal", "unmarshal", "convertBodyTo",
"enrich", "pollEnrich", "wireTap", "pipeline");
- @Arguments(required = true, description = "Route file(s) to explain")
+ @Arguments(paramLabel = "files", required = true, description = "Route
file(s) to explain")
List<String> files;
@Option(name = "url",
diff --git
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/ExportBaseCommand.java
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/ExportBaseCommand.java
index 2a6532dae637..bc938bcb6941 100644
---
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/ExportBaseCommand.java
+++
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/ExportBaseCommand.java
@@ -58,7 +58,7 @@ public abstract class ExportBaseCommand extends CamelCommand {
private Printer quietPrinter;
@Arguments(description = "The Camel file(s) to export. If no files is
specified then what was last run will be exported.",
- paramLabel = "<files>")
+ paramLabel = "files")
protected List<String> files = new ArrayList<>();
@OptionList(name = "dep", aliases = { "dependency" }, valueSeparator =
',', description = "Add additional dependencies")
diff --git
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Harden.java
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Harden.java
index 4af04e713baf..6c72d0bb9450 100644
---
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Harden.java
+++
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Harden.java
@@ -135,7 +135,7 @@ public class Harden extends CamelCommand {
}
}
- @Arguments(required = true, description = "Route file(s) to analyze for
security hardening")
+ @Arguments(paramLabel = "files", required = true, description = "Route
file(s) to analyze for security hardening")
List<String> files;
@Option(name = "url", description = "LLM API endpoint URL. Auto-detected
from 'camel infra' for Ollama if not specified.")
diff --git
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Init.java
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Init.java
index 99670d6cca89..98db17d8956e 100644
---
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Init.java
+++
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Init.java
@@ -65,7 +65,7 @@ import static
org.apache.camel.dsl.jbang.run.common.GitHubHelper.fetchGithubUrls
public class Init extends CamelCommand {
private Path filePath; // Defined only for file path completion; the field
never used
- @Argument(description = "Name of integration file (or a github link)",
paramLabel = "<file>")
+ @Argument(description = "Name of integration file (or a github link)",
paramLabel = "file")
private String file;
@Option(name = "list", hasValue = false, description = "List available
templates")
diff --git
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Nano.java
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Nano.java
index 2211fffebb29..cd625cf46e0b 100644
---
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Nano.java
+++
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Nano.java
@@ -34,7 +34,7 @@ import org.jline.terminal.TerminalBuilder;
public class Nano extends CamelCommand {
private Path filePath; // Defined only for file path completion; the field
never used
- @Argument(required = true, description = "Name of file", paramLabel =
"<file>")
+ @Argument(required = true, description = "Name of file", paramLabel =
"file")
private String file;
public Nano(CamelJBangMain main) {
diff --git
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Run.java
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Run.java
index e5642261c684..190b7ffe7950 100644
---
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Run.java
+++
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Run.java
@@ -128,7 +128,7 @@ public class Run extends CamelCommand implements
CommandLifecycle {
@Arguments(description = "The Camel file(s) to run. If no files specified
then application.properties is used as source for which files to run."
+ " A Citrus test is run with camel test run.",
- paramLabel = "<files>")
+ paramLabel = "files")
public List<String> files = new ArrayList<>();
@Option(name = "runtime",
diff --git
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Script.java
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Script.java
index 8c3dfc83cba2..f977f4d046a9 100644
---
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Script.java
+++
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Script.java
@@ -33,7 +33,7 @@ import
org.apache.camel.dsl.jbang.core.common.LoggingLevelCompletionCandidates;
public class Script extends CamelCommand {
Path filePath; // Defined only for file path completion; the field never
used
- @Argument(required = true, description = "Name of file", paramLabel =
"<file>")
+ @Argument(required = true, description = "Name of file", paramLabel =
"file")
String file;
@Option(name = "max-messages", description = "Max number of messages to
process before stopping", defaultValue = "0")
diff --git
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/TransformRoute.java
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/TransformRoute.java
index de3be039f90c..078e98296be7 100644
---
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/TransformRoute.java
+++
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/TransformRoute.java
@@ -27,6 +27,9 @@ import java.nio.file.Path;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
+import java.util.regex.Pattern;
+
+import javax.lang.model.SourceVersion;
import org.aesh.command.CommandDefinition;
import org.aesh.command.option.Arguments;
@@ -62,7 +65,7 @@ public class TransformRoute extends CamelCommand {
}
@Arguments(description = "The Camel file(s) to run. If no files specified
then application.properties is used as source for which files to run.",
- paramLabel = "<files>")
+ paramLabel = "files")
List<String> files = new ArrayList<>();
@Option(name = "output",
@@ -181,6 +184,24 @@ public class TransformRoute extends CamelCommand {
return printDump(target);
}
+ /**
+ * The Java route with the class named after the file it is written to: a
class must have the name of its file, and
+ * --output=Out.java got the class named after the route file
(CAMEL-26931). A file name that is no class name, such
+ * as My.Route.java, keeps the class name.
+ */
+ static String withClassName(String java, String fileName, Path out) {
+ String wanted = out.getFileName().toString();
+ if (!wanted.endsWith(".java") || fileName == null ||
!fileName.endsWith(".java")) {
+ return java;
+ }
+ wanted = wanted.substring(0, wanted.length() - ".java".length());
+ String current = fileName.substring(0, fileName.length() -
".java".length());
+ if (wanted.equals(current) || !SourceVersion.isIdentifier(wanted) ||
SourceVersion.isKeyword(wanted)) {
+ return java;
+ }
+ return java.replaceFirst("\\bclass " + Pattern.quote(current) + "\\b",
"class " + wanted);
+ }
+
/**
* To Java, each file is converted without running it (CAMEL-25254): read
into the model by the parser of its DSL
* and written as a route builder class, printed, or written into the
output directory (or file, for one file).
@@ -203,7 +224,7 @@ public class TransformRoute extends CamelCommand {
Files.createDirectories(out);
Files.writeString(out.resolve(r.fileName()), java);
} else {
- Files.writeString(out, java);
+ Files.writeString(out, withClassName(java, r.fileName(), out));
}
}
if (out == null) {
diff --git
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/action/CamelChaosLoadAction.java
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/action/CamelChaosLoadAction.java
index 8593534630da..7c2ecda01399 100644
---
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/action/CamelChaosLoadAction.java
+++
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/action/CamelChaosLoadAction.java
@@ -49,7 +49,8 @@ import org.apache.camel.util.json.JsonObject;
" camel cmd chaos-load test/chaos/outage.chaos
myApp" })
public class CamelChaosLoadAction extends CamelChaosAction {
- @Argument(index = "0", required = true, description = "The scenario file,
such as test/chaos/outage.chaos")
+ @Argument(paramLabel = "file", index = "0", required = true,
+ description = "The scenario file, such as
test/chaos/outage.chaos")
String file;
@Argument(index = "1", description = "Name or pid of the running Camel
integration (must match one); without it,"
diff --git
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/action/CamelRouteDiagramAction.java
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/action/CamelRouteDiagramAction.java
index 91825971fea6..ec8deb45a707 100644
---
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/action/CamelRouteDiagramAction.java
+++
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/action/CamelRouteDiagramAction.java
@@ -80,7 +80,7 @@ public class CamelRouteDiagramAction extends
ActionWatchCommand {
@Arguments(description = "Source file name(s) (shell-expanded wildcards),
or name/pid of a running "
+ "Camel integration",
- paramLabel = "<files>")
+ paramLabel = "files")
List<String> files = new ArrayList<>();
@Option(name = "filter", description = "Filter route by filename or route
id")
diff --git
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/action/CamelRouteTopologyAction.java
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/action/CamelRouteTopologyAction.java
index d6dccd871d07..e3eb52ea74a3 100644
---
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/action/CamelRouteTopologyAction.java
+++
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/action/CamelRouteTopologyAction.java
@@ -64,7 +64,7 @@ public class CamelRouteTopologyAction extends
ActionBaseCommand {
@Arguments(description = "Source file name(s) (shell-expanded wildcards),
or name/pid of a running "
+ "Camel integration",
- paramLabel = "<files>")
+ paramLabel = "files")
List<String> files = new ArrayList<>();
@Option(name = "json", hasValue = false, description = "Output in JSON
Format")
diff --git
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/action/CamelSqlQueryAction.java
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/action/CamelSqlQueryAction.java
index ef8b8e8c4806..d30ba5a1eb90 100644
---
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/action/CamelSqlQueryAction.java
+++
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/action/CamelSqlQueryAction.java
@@ -35,7 +35,7 @@ import org.apache.camel.util.json.JsonObject;
" camel cmd sql myApp --query=\"file:query.sql\""
})
public class CamelSqlQueryAction extends ActionBaseCommand {
- @Argument(required = true, description = "Name or pid of running Camel
integration")
+ @Argument(paramLabel = "name", required = true, description = "Name or pid
of running Camel integration")
String name;
@Option(name = "query", aliases = { "sql" }, description = "The SQL query
to execute, or file:<path> to load from a file",
diff --git
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/bind/Bind.java
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/bind/Bind.java
index 91d5a731417b..88eefb670df0 100644
---
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/bind/Bind.java
+++
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/bind/Bind.java
@@ -58,7 +58,7 @@ public class Bind extends CamelCommand {
}
Path filePath; // Defined only for file path completion; the field never
used
- @Argument(required = true, description = "Name of binding file to be
saved", paramLabel = "<file>")
+ @Argument(required = true, description = "Name of binding file to be
saved", paramLabel = "file")
String file;
@Option(name = "source", description = "Source (from) such as a Kamelet or
Camel endpoint uri", required = true)
diff --git
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/catalog/CatalogBaseCommand.java
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/catalog/CatalogBaseCommand.java
index 8748d1919136..ef37ac86f096 100644
---
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/catalog/CatalogBaseCommand.java
+++
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/catalog/CatalogBaseCommand.java
@@ -162,7 +162,8 @@ public abstract class CatalogBaseCommand extends
CamelCommand {
filterName = filterName.toLowerCase(Locale.ROOT);
rows = rows.stream()
.filter(
- r -> r.name.equalsIgnoreCase(filterName)
+ // a part of the name, as of the description:
--filter=aws2 listed nothing (CAMEL-26931)
+ r ->
r.name.toLowerCase(Locale.ROOT).contains(filterName)
|| (r.description != null
&&
r.description.toLowerCase(Locale.ROOT).contains(filterName))
|| (r.label != null &&
r.label.toLowerCase(Locale.ROOT).contains(filterName)))
diff --git
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/catalog/CatalogDoc.java
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/catalog/CatalogDoc.java
index 885b673ba91d..ab2fdfaaf2cc 100644
---
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/catalog/CatalogDoc.java
+++
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/catalog/CatalogDoc.java
@@ -79,8 +79,9 @@ import static
org.apache.camel.dsl.jbang.core.commands.catalog.CatalogBaseComman
" camel doc kafka --example" })
public class CatalogDoc extends CamelCommand {
- @Argument(required = true, description = "Name of kamelet, component,
dataformat, language, EIP, or other Camel resource"
- + " (prefix with eip: for an EIP
with the name of a component, such as eip:log)")
+ @Argument(paramLabel = "name", required = true,
+ description = "Name of kamelet, component, dataformat, language,
EIP, or other Camel resource"
+ + " (prefix with eip: for an EIP with the name of
a component, such as eip:log)")
String name;
@Option(name = "camel-version", description = "To use a different Camel
version than the default version")
@@ -542,7 +543,7 @@ public class CatalogDoc extends CamelCommand {
} else {
printer().printf("Component Name: %s%n", cm.getName());
}
- printer().printf("Since: %s%n",
fixQuarkusSince(cm.getFirstVersionShort()));
+ printSince(fixQuarkusSince(cm.getFirstVersionShort()));
printer().println("");
if (cm.isProducerOnly()) {
printer().println("Only producer is supported");
@@ -621,7 +622,7 @@ public class CatalogDoc extends CamelCommand {
} else {
printer().printf("Dataformat Name: %s%n", dm.getName());
}
- printer().printf("Since: %s%n",
fixQuarkusSince(dm.getFirstVersionShort()));
+ printSince(fixQuarkusSince(dm.getFirstVersionShort()));
printer().println("");
printer().printf("%s%n", dm.getDescription());
printer().println("");
@@ -671,7 +672,7 @@ public class CatalogDoc extends CamelCommand {
} else {
printer().printf("Language Name: %s%n", lm.getName());
}
- printer().printf("Since: %s%n",
fixQuarkusSince(lm.getFirstVersionShort()));
+ printSince(fixQuarkusSince(lm.getFirstVersionShort()));
printer().println("");
printer().printf("%s%n", lm.getDescription());
printer().println("");
@@ -721,7 +722,7 @@ public class CatalogDoc extends CamelCommand {
} else {
printer().printf("Miscellaneous Name: %s%n", om.getName());
}
- printer().printf("Since: %s%n",
fixQuarkusSince(om.getFirstVersionShort()));
+ printSince(fixQuarkusSince(om.getFirstVersionShort()));
printer().println("");
printer().printf("%s%n", om.getDescription());
printer().println("");
@@ -758,7 +759,7 @@ public class CatalogDoc extends CamelCommand {
} else {
printer().printf("EIP Name: %s%n", em.getName());
}
- printer().printf("Since: %s%n",
fixQuarkusSince(em.getFirstVersionShort()));
+ printSince(fixQuarkusSince(em.getFirstVersionShort()));
printer().println("");
printer().printf("%s%n", em.getDescription());
printer().println("");
@@ -949,4 +950,11 @@ public class CatalogDoc extends CamelCommand {
return since;
}
+ // the version a kind first came in, when the catalog has one: an EIP of
the catalog has none, which printed an empty
+ // Since line (CAMEL-26931)
+ private void printSince(String since) {
+ if (since != null && !since.isBlank()) {
+ printer().printf("Since: %s%n", since);
+ }
+ }
}
diff --git
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/config/ConfigGet.java
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/config/ConfigGet.java
index 2b914b67909a..3ab0e6d79875 100644
---
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/config/ConfigGet.java
+++
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/config/ConfigGet.java
@@ -36,7 +36,7 @@ import org.apache.camel.util.json.JsonObject;
" camel config get runtime --json" })
public class ConfigGet extends CamelCommand {
- @Argument(required = true, description = "Configuration key")
+ @Argument(paramLabel = "key", required = true, description =
"Configuration key")
String key;
@Option(name = "global", hasValue = false, description = "Use global or
local configuration")
diff --git
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/config/ConfigSet.java
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/config/ConfigSet.java
index a6bc1ec72b32..6f94f5743cc9 100644
---
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/config/ConfigSet.java
+++
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/config/ConfigSet.java
@@ -41,7 +41,7 @@ import org.apache.camel.util.StringHelper;
" camel config set runtime=spring-boot" })
public class ConfigSet extends CamelCommand {
- @Argument(required = true, description = "Configuration parameter (ex.
key=value)")
+ @Argument(paramLabel = "key=value", required = true, description =
"Configuration parameter (ex. key=value)")
String configuration;
@Option(name = "global", hasValue = false, description = "Use global or
local configuration")
diff --git
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/config/ConfigUnset.java
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/config/ConfigUnset.java
index 8346cc333bcc..9a87ce9b88c3 100644
---
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/config/ConfigUnset.java
+++
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/config/ConfigUnset.java
@@ -30,7 +30,7 @@ import
org.apache.camel.dsl.jbang.core.common.CommandLineHelper;
" camel config unset myKey" })
public class ConfigUnset extends CamelCommand {
- @Argument(required = true, description = "Configuration key")
+ @Argument(paramLabel = "key", required = true, description =
"Configuration key")
String key;
@Option(name = "global", hasValue = false, description = "Use global or
local configurations")
diff --git
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/exceptionhandler/MissingPluginParameterExceptionHandler.java
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/exceptionhandler/MissingPluginParameterExceptionHandler.java
index e5eb9a71bace..97003197b67f 100644
---
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/exceptionhandler/MissingPluginParameterExceptionHandler.java
+++
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/exceptionhandler/MissingPluginParameterExceptionHandler.java
@@ -17,6 +17,8 @@
package org.apache.camel.dsl.jbang.core.commands.exceptionhandler;
import java.util.Optional;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
import org.apache.camel.dsl.jbang.core.commands.CamelCommand;
import org.apache.camel.dsl.jbang.core.commands.CamelJBangMain;
@@ -36,6 +38,8 @@ public class MissingPluginParameterExceptionHandler {
private final CamelJBangMain main;
+ private static final Pattern MISSING_ARGUMENT = Pattern.compile("(.+)
(?:is|are) required for this command\\.?");
+
public MissingPluginParameterExceptionHandler(CamelJBangMain main) {
this.main = main;
}
@@ -58,7 +62,7 @@ public class MissingPluginParameterExceptionHandler {
return cli.getExitCode();
}
}
- String message = ex.getMessage();
+ String message = missingArgument(ex.getMessage());
if (command.getCommand() instanceof UsageErrorHandler handler) {
Integer exitCode = handler.usageError(message, args);
if (exitCode != null) {
@@ -96,6 +100,19 @@ public class MissingPluginParameterExceptionHandler {
return CliExitCode.USAGE;
}
+ /**
+ * The message of the parser for a missing argument says "{description} is
required for this command" (or "are" for
+ * several), which reads badly for most descriptions ("Service name are
required for this command"): it is "Missing
+ * argument: {description}", and the usage under it names the argument
(CAMEL-26931).
+ */
+ static String missingArgument(String message) {
+ if (message == null || message.startsWith("Option:")) {
+ return message;
+ }
+ Matcher m = MISSING_ARGUMENT.matcher(message);
+ return m.matches() ? "Missing argument: " + m.group(1) : message;
+ }
+
private static String synopsisOf(CommandTree command) {
try {
return command.synopsis();
diff --git
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/infra/InfraBaseCommand.java
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/infra/InfraBaseCommand.java
index a5d4277baa46..d1f1a085f55e 100644
---
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/infra/InfraBaseCommand.java
+++
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/infra/InfraBaseCommand.java
@@ -338,6 +338,9 @@ public abstract class InfraBaseCommand extends CamelCommand
{
parseServiceData(row.serviceData()),
row.uiSupported()))
.map(InfraBaseDTO::toMap)
.collect(Collectors.toList())));
+ } else if (rows.isEmpty() && showPidColumn()) {
+ // camel infra ps printed only the header of the table
(CAMEL-26931)
+ printer().printDiagnostic("No running infrastructure services");
} else {
int tw = terminalWidth();
// Size DESCRIPTION to fill the terminal: measure the other
columns so it gets the exact remainder.
diff --git
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/infra/InfraRestart.java
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/infra/InfraRestart.java
index 48b7cf912f24..da403219a2a2 100644
---
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/infra/InfraRestart.java
+++
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/infra/InfraRestart.java
@@ -37,7 +37,7 @@ import org.apache.camel.dsl.jbang.run.common.PathUtils;
" camel infra restart kafka --background" })
public class InfraRestart extends InfraBaseCommand {
- @Arguments(required = true, description = "Service name (and optional
implementation)")
+ @Arguments(paramLabel = "service", required = true, description = "Service
name (and optional implementation)")
private List<String> serviceName;
@Option(name = "port", description = "Override the default port for the
service")
diff --git
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/infra/InfraRun.java
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/infra/InfraRun.java
index 1041c8c6bb6f..5f091df5a51f 100644
---
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/infra/InfraRun.java
+++
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/infra/InfraRun.java
@@ -64,7 +64,7 @@ public class InfraRun extends InfraBaseCommand {
private static final Logger LOG = LoggerFactory.getLogger(InfraRun.class);
- @Arguments(required = true, description = "Service name")
+ @Arguments(paramLabel = "service", required = true, description = "Service
name")
private List<String> serviceName;
@Option(name = "log", hasValue = false, description = "Log container
output to console")
diff --git
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/plugin/PluginAdd.java
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/plugin/PluginAdd.java
index 038996976616..59dbe5866eb0 100644
---
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/plugin/PluginAdd.java
+++
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/plugin/PluginAdd.java
@@ -53,7 +53,7 @@ import org.apache.camel.util.json.JsonObject;
" camel plugin add --command=my-cmd
--gav=com.foo:bar:1.0" })
public class PluginAdd extends PluginBaseCommand {
- @Argument(required = true, description = "The Camel plugin to add",
paramLabel = "<name>")
+ @Argument(required = true, description = "The Camel plugin to add",
paramLabel = "name")
String name;
@Option(name = "command", description = "The command that the plugin uses")
diff --git
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/plugin/PluginDelete.java
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/plugin/PluginDelete.java
index 278efe66023f..f68d10cb4905 100644
---
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/plugin/PluginDelete.java
+++
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/plugin/PluginDelete.java
@@ -28,7 +28,7 @@ import org.apache.camel.util.json.JsonObject;
" camel plugin delete my-cmd" })
public class PluginDelete extends PluginBaseCommand {
- @Argument(required = true, description = "The Camel plugin to remove",
paramLabel = "<plugin>")
+ @Argument(required = true, description = "The Camel plugin to remove",
paramLabel = "plugin")
String name;
public PluginDelete(CamelJBangMain main) {
diff --git
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/plugin/PluginGet.java
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/plugin/PluginGet.java
index ffca5f2ff19a..daf2c38f9a66 100644
---
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/plugin/PluginGet.java
+++
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/plugin/PluginGet.java
@@ -70,10 +70,13 @@ public class PluginGet extends PluginBaseCommand {
return 0;
}
- if (!rows.isEmpty()) {
- printer().println("Installed plugins:");
- printer().println();
+ if (rows.isEmpty()) {
+ // it printed nothing (CAMEL-26931)
+ printer().printDiagnostic("No plugins installed (camel plugin list
lists the plugins that can be added)");
+ return 0;
}
+ printer().println("Installed plugins:");
+ printer().println();
printRows(rows);
return 0;
diff --git
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/process/Jolokia.java
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/process/Jolokia.java
index 46e2599d51a7..39bc5feea499 100644
---
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/process/Jolokia.java
+++
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/process/Jolokia.java
@@ -43,7 +43,7 @@ import
org.jolokia.jvmagent.client.util.VirtualMachineHandlerOperations;
" camel jolokia myApp --stop" })
public class Jolokia extends ProcessBaseCommand {
- @Argument(required = true, description = "Name or pid of running Camel
integration")
+ @Argument(paramLabel = "name", required = true, description = "Name or pid
of running Camel integration")
String name;
@Option(name = "stop", hasValue = false, description = "Stops the Jolokia
JVM Agent in the running Camel integration")
diff --git
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/process/RestartProcess.java
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/process/RestartProcess.java
index 80b53b6acef8..85f524a2cae2 100644
---
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/process/RestartProcess.java
+++
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/process/RestartProcess.java
@@ -50,7 +50,7 @@ public class RestartProcess extends ProcessBaseCommand {
*/
private static final int STARTED = 5;
- @Argument(required = true, description = "Name or pid of running Camel
integration")
+ @Argument(paramLabel = "name", required = true, description = "Name or pid
of running Camel integration")
String name;
@Option(name = "timeout",
diff --git
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/update/CamelUpdateMixin.java
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/update/CamelUpdateMixin.java
index 392164f14cc0..c31918f50d9a 100644
---
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/update/CamelUpdateMixin.java
+++
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/update/CamelUpdateMixin.java
@@ -34,18 +34,21 @@ import org.apache.camel.tooling.maven.MavenGav;
public class CamelUpdateMixin {
- @Argument(required = true, description = "The version to which the Camel
project should be updated.")
+ @Argument(paramLabel = "version", required = true,
+ description = "The version to which the Camel project should be
updated.")
String version;
- @Option(name = "openRewriteVersion", description = "The version of
OpenRewrite to use during the update process.",
+ @Option(name = "open-rewrite-version", aliases = { "openRewriteVersion" },
+ description = "The version of OpenRewrite to use during the update
process.",
defaultValue = "6.0.4")
String openRewriteVersion;
- @Option(name = "camelArtifact", description = "The Maven artifact
coordinates for the Camel upgrade recipes.",
+ @Option(name = "camel-artifact", aliases = { "camelArtifact" },
+ description = "The Maven artifact coordinates for the Camel
upgrade recipes.",
defaultValue = "camel-upgrade-recipes")
String camelArtifactCoordinates;
- @Option(name = "camelSpringBootArtifact",
+ @Option(name = "camel-spring-boot-artifact", aliases = {
"camelSpringBootArtifact" },
description = "The Maven artifact coordinates for the Camel Spring
Boot upgrade recipes.",
defaultValue = "camel-spring-boot-upgrade-recipes")
String camelSpringBootArtifactCoordinates;
@@ -53,15 +56,16 @@ public class CamelUpdateMixin {
@Option(name = "debug", hasValue = false, description = "Enables debug
logging if set to true.", defaultValue = "false")
boolean debug;
- @Option(name = "quarkusMavenPluginVersion",
+ @Option(name = "quarkus-maven-plugin-version", aliases = {
"quarkusMavenPluginVersion" },
description = "The version of the Quarkus Maven plugin to use; the
default value is looked up in Quarkus Extension Registry")
String quarkusMavenPluginVersion;
- @Option(name = "quarkusMavenPluginGroupId", description = "The group ID of
the Quarkus Maven plugin.",
+ @Option(name = "quarkus-maven-plugin-group-id", aliases = {
"quarkusMavenPluginGroupId" },
+ description = "The group ID of the Quarkus Maven plugin.",
defaultValue = "io.quarkus.platform")
String quarkusMavenPluginGroupId;
- @Option(name = "dryRun", hasValue = false,
+ @Option(name = "dry-run", aliases = { "dryRun" }, hasValue = false,
description = "If set to true, performs a dry run of the update
process without making any changes.",
defaultValue = "false")
boolean dryRun;
@@ -83,7 +87,8 @@ public class CamelUpdateMixin {
"ex.my.org:recipes:1.0.0")
List<String> extraRecipeArtifactCoordinates;
- @Option(name = "upgradeTimeout", description = "Time to wait, in seconds,
before shutting down the upgrade process",
+ @Option(name = "upgrade-timeout", aliases = { "upgradeTimeout" },
+ description = "Time to wait, in seconds, before shutting down the
upgrade process",
defaultValue = "240")
int upgradeTimeout;
@@ -95,7 +100,7 @@ public class CamelUpdateMixin {
return MavenGav.fromCoordinates(quarkusMavenPluginGroupId,
"quarkus-maven-plugin", quarkusMavenPluginVersion, "jar",
null);
} else if (!mavenResolver.download()) {
- throw CliException.usage("--quarkusMavenPluginVersion is required
with --download=false, as the version of "
+ throw CliException.usage("--quarkus-maven-plugin-version is
required with --download=false, as the version of "
+ "the Quarkus Maven plugin is looked up
in the Quarkus Extension Registry");
} else {
QuarkusPlatformBom result
diff --git
a/dsl/camel-jbang/camel-jbang-core/src/test/java/org/apache/camel/dsl/jbang/core/commands/DependencyUpdateWriteTest.java
b/dsl/camel-jbang/camel-jbang-core/src/test/java/org/apache/camel/dsl/jbang/core/commands/DependencyUpdateWriteTest.java
new file mode 100644
index 000000000000..d21cc8b094a5
--- /dev/null
+++
b/dsl/camel-jbang/camel-jbang-core/src/test/java/org/apache/camel/dsl/jbang/core/commands/DependencyUpdateWriteTest.java
@@ -0,0 +1,63 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.dsl.jbang.core.commands;
+
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.List;
+
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.io.TempDir;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+/**
+ * camel dependency update writes a file as it was: its line separator, and
its last newline (CAMEL-26931).
+ */
+class DependencyUpdateWriteTest {
+
+ @TempDir
+ Path dir;
+
+ @Test
+ void keepsTheLastNewline() throws Exception {
+ Path file = Files.writeString(dir.resolve("Hello.java"), "//DEPS
a\nclass Hello {}\n");
+
+ DependencyUpdate.writeLikeTheFile(file, List.of("//DEPS b", "class
Hello {}"));
+
+ assertThat(file).hasContent("//DEPS b\nclass Hello {}\n");
+
assertThat(Files.readString(file)).endsWith("}\n").doesNotContain("\r");
+ }
+
+ @Test
+ void keepsCrlf() throws Exception {
+ Path file = Files.writeString(dir.resolve("Hello.java"), "//DEPS
a\r\nclass Hello {}\r\n");
+
+ DependencyUpdate.writeLikeTheFile(file, List.of("//DEPS b", "class
Hello {}"));
+
+ assertThat(Files.readString(file)).isEqualTo("//DEPS b\r\nclass Hello
{}\r\n");
+ }
+
+ @Test
+ void noNewlineWhenTheFileHadNone() throws Exception {
+ Path file = Files.writeString(dir.resolve("Hello.java"), "//DEPS
a\nclass Hello {}");
+
+ DependencyUpdate.writeLikeTheFile(file, List.of("//DEPS b", "class
Hello {}"));
+
+ assertThat(Files.readString(file)).isEqualTo("//DEPS b\nclass Hello
{}");
+ }
+}
diff --git
a/dsl/camel-jbang/camel-jbang-core/src/test/java/org/apache/camel/dsl/jbang/core/commands/ExitCodeContractTest.java
b/dsl/camel-jbang/camel-jbang-core/src/test/java/org/apache/camel/dsl/jbang/core/commands/ExitCodeContractTest.java
index e9ab4064c710..9e8924b5a851 100644
---
a/dsl/camel-jbang/camel-jbang-core/src/test/java/org/apache/camel/dsl/jbang/core/commands/ExitCodeContractTest.java
+++
b/dsl/camel-jbang/camel-jbang-core/src/test/java/org/apache/camel/dsl/jbang/core/commands/ExitCodeContractTest.java
@@ -195,6 +195,16 @@ class ExitCodeContractTest {
.contains("Run the command again");
}
+ @Test
+ void aMissingArgumentIsNamedByItsLabel() {
+ // CAMEL-26931: without a label the error held the description of the
argument ("Service name are required")
+ assertThat(run("infra", "run")).isEqualTo(CliExitCode.USAGE);
+ assertThat(printer.getStderr()).contains("ERROR: Missing argument:
Service name", "<service>")
+ .doesNotContain("are required");
+ assertThat(run("config", "get")).isEqualTo(CliExitCode.USAGE);
+ assertThat(printer.getStderr()).contains("ERROR: Missing argument:
Configuration key", "<key>");
+ }
+
private int run(String... args) {
main.execute(args);
return main.exitCode;
diff --git
a/dsl/camel-jbang/camel-jbang-core/src/test/java/org/apache/camel/dsl/jbang/core/commands/TransformRouteTest.java
b/dsl/camel-jbang/camel-jbang-core/src/test/java/org/apache/camel/dsl/jbang/core/commands/TransformRouteTest.java
index 5d76b0704a88..c8820897bda2 100644
---
a/dsl/camel-jbang/camel-jbang-core/src/test/java/org/apache/camel/dsl/jbang/core/commands/TransformRouteTest.java
+++
b/dsl/camel-jbang/camel-jbang-core/src/test/java/org/apache/camel/dsl/jbang/core/commands/TransformRouteTest.java
@@ -87,6 +87,28 @@ class TransformRouteTest extends CamelCommandBaseTestSupport
{
assertThat(printer.getOutput()).contains("extends RouteBuilder",
"from(\"timer:tick\")", "Hello Camel");
}
+ @Test
+ void yamlToAJavaFileNamesTheClassAfterTheFile() throws Exception {
+ // CAMEL-26931: --output=Out.java got a class named after the route
file, which does not compile
+ Path yaml = Files.writeString(dir.resolve("hello.camel.yaml"), YAML);
+ Path out = dir.resolve("Out.java");
+
+ assertThat(command(List.of(yaml.toString()), "--format=java",
"--output=" + out).doCall()).isZero();
+
+ assertThat(Files.readString(out)).contains("public class Out extends
RouteBuilder");
+ }
+
+ @Test
+ void aJavaFileWhoseNameIsNoClassNameKeepsTheClassName() throws Exception {
+ // a qualified name, such as My.Route, would give class My.Route,
which does not compile
+ Path yaml = Files.writeString(dir.resolve("hello.camel.yaml"), YAML);
+ Path out = dir.resolve("My.Route.java");
+
+ assertThat(command(List.of(yaml.toString()), "--format=java",
"--output=" + out).doCall()).isZero();
+
+ assertThat(Files.readString(out)).contains("extends
RouteBuilder").doesNotContain("class My.Route");
+ }
+
@Test
void yamlToJavaFilesInADirectory() throws Exception {
Path one = Files.writeString(dir.resolve("hello.camel.yaml"), YAML);
diff --git
a/dsl/camel-jbang/camel-jbang-core/src/test/java/org/apache/camel/dsl/jbang/core/commands/catalog/CatalogComponentTest.java
b/dsl/camel-jbang/camel-jbang-core/src/test/java/org/apache/camel/dsl/jbang/core/commands/catalog/CatalogComponentTest.java
index fd0b15bd4a0e..139c35bd249b 100644
---
a/dsl/camel-jbang/camel-jbang-core/src/test/java/org/apache/camel/dsl/jbang/core/commands/catalog/CatalogComponentTest.java
+++
b/dsl/camel-jbang/camel-jbang-core/src/test/java/org/apache/camel/dsl/jbang/core/commands/catalog/CatalogComponentTest.java
@@ -77,8 +77,21 @@ class CatalogComponentTest extends
CamelCommandBaseTestSupport {
int exit = command.doCall();
assertEquals(0, exit);
String out = printer.getOutput();
- assertTrue(out.contains("Did you mean? azure-servicebus"),
- "a product name should suggest the component using it, was: "
+ out);
+ // a part of the name lists the component (CAMEL-26931: it only
suggested it)
+ assertTrue(out.contains("azure-servicebus"), "a product name should
list the component using it, was: " + out);
+ }
+
+ @Test
+ void aPartOfTheNameListsTheComponents() throws Exception {
+ // CAMEL-26931: --filter=aws2 listed nothing, as only a whole name
matched
+ CatalogComponent command = createCommand();
+ command.filterName = "aws2";
+
+ assertEquals(0, command.doCall());
+
+ String out = printer.getOutput();
+ assertTrue(out.contains("aws2-s3") && out.contains("aws2-sqs"), "the
aws2 components, was: " + out);
+ assertFalse(out.contains("No results"), out);
}
@Test
diff --git
a/dsl/camel-jbang/camel-jbang-core/src/test/java/org/apache/camel/dsl/jbang/core/commands/catalog/CatalogDocTest.java
b/dsl/camel-jbang/camel-jbang-core/src/test/java/org/apache/camel/dsl/jbang/core/commands/catalog/CatalogDocTest.java
index 7afd18c6f2da..35d85b953d8e 100644
---
a/dsl/camel-jbang/camel-jbang-core/src/test/java/org/apache/camel/dsl/jbang/core/commands/catalog/CatalogDocTest.java
+++
b/dsl/camel-jbang/camel-jbang-core/src/test/java/org/apache/camel/dsl/jbang/core/commands/catalog/CatalogDocTest.java
@@ -216,6 +216,8 @@ class CatalogDocTest extends CamelCommandBaseTestSupport {
Assertions.assertTrue(output.contains("EIP output"), output);
Assertions.assertTrue(output.contains("Steps"), output);
Assertions.assertTrue(output.contains("Each part of what the
expression gives"), output);
+ // CAMEL-26931: an EIP has no first version in the catalog, which
printed an empty Since line
+ Assertions.assertFalse(output.lines().anyMatch(l ->
l.strip().equals("Since:")), output);
}
@Test
diff --git
a/dsl/camel-jbang/camel-jbang-core/src/test/java/org/apache/camel/dsl/jbang/core/commands/infra/InfraPsTest.java
b/dsl/camel-jbang/camel-jbang-core/src/test/java/org/apache/camel/dsl/jbang/core/commands/infra/InfraPsTest.java
index 0893a7f05c15..55b7d2cb7a83 100644
---
a/dsl/camel-jbang/camel-jbang-core/src/test/java/org/apache/camel/dsl/jbang/core/commands/infra/InfraPsTest.java
+++
b/dsl/camel-jbang/camel-jbang-core/src/test/java/org/apache/camel/dsl/jbang/core/commands/infra/InfraPsTest.java
@@ -81,6 +81,9 @@ class InfraPsTest extends InfraCommandTestSupport {
String out = printer.getOutput();
assertFalse(out.contains("kafka"), "no service rows should be printed
when nothing is running, was: " + out);
assertFalse(out.contains("minio"), "no service rows should be printed
when nothing is running, was: " + out);
+ // CAMEL-26931: it printed the header of the table only
+ assertFalse(out.contains("IMPLEMENTATION"), "no table header when
nothing is running, was: " + out);
+ assertTrue(printer.getStderr().contains("No running infrastructure
services"), printer.getStderr());
}
@Test
diff --git
a/dsl/camel-jbang/camel-jbang-core/src/test/java/org/apache/camel/dsl/jbang/core/commands/plugin/PluginGetTest.java
b/dsl/camel-jbang/camel-jbang-core/src/test/java/org/apache/camel/dsl/jbang/core/commands/plugin/PluginGetTest.java
index f4c119a2d0b8..d144a1d36769 100644
---
a/dsl/camel-jbang/camel-jbang-core/src/test/java/org/apache/camel/dsl/jbang/core/commands/plugin/PluginGetTest.java
+++
b/dsl/camel-jbang/camel-jbang-core/src/test/java/org/apache/camel/dsl/jbang/core/commands/plugin/PluginGetTest.java
@@ -49,7 +49,9 @@ class PluginGetTest extends CamelCommandBaseTestSupport {
PluginGet command = new PluginGet(new
CamelJBangMain().withPrinter(printer));
command.doCall();
- Assertions.assertEquals("", printer.getOutput());
+ // CAMEL-26931: it printed nothing at all
+ Assertions.assertEquals("", printer.getStdout());
+ Assertions.assertTrue(printer.getStderr().contains("No plugins
installed"), printer.getStderr());
}
@Test
diff --git
a/dsl/camel-jbang/camel-jbang-core/src/test/java/org/apache/camel/dsl/jbang/core/commands/update/UpdateRunTest.java
b/dsl/camel-jbang/camel-jbang-core/src/test/java/org/apache/camel/dsl/jbang/core/commands/update/UpdateRunTest.java
index 8d7041202621..332369ece54f 100644
---
a/dsl/camel-jbang/camel-jbang-core/src/test/java/org/apache/camel/dsl/jbang/core/commands/update/UpdateRunTest.java
+++
b/dsl/camel-jbang/camel-jbang-core/src/test/java/org/apache/camel/dsl/jbang/core/commands/update/UpdateRunTest.java
@@ -171,7 +171,7 @@ class UpdateRunTest extends CamelCommandBaseTestSupport {
assertThatThrownBy(command::doCall)
.isInstanceOfSatisfying(CliException.class,
e ->
assertThat(e.getExitCode()).isEqualTo(CliExitCode.USAGE))
- .hasMessageContaining("--quarkusMavenPluginVersion is required
with --download=false");
+ .hasMessageContaining("--quarkus-maven-plugin-version is
required with --download=false");
}
@Test
diff --git
a/dsl/camel-jbang/camel-jbang-core/src/test/resources/golden/cli-help.txt
b/dsl/camel-jbang/camel-jbang-core/src/test/resources/golden/cli-help.txt
index 293905978d1e..ece624571934 100644
--- a/dsl/camel-jbang/camel-jbang-core/src/test/resources/golden/cli-help.txt
+++ b/dsl/camel-jbang/camel-jbang-core/src/test/resources/golden/cli-help.txt
@@ -42,8 +42,8 @@ Development:
init Creates a new Camel integration
export Export to other runtimes (Camel Main, Spring Boot, or Quarkus)
debug Debug local Camel integration
- eval Evaluate Camel expressions and scripts (use transform --help to
- see sub commands)
+ eval Evaluate Camel expressions and scripts (use eval --help to see
+ sub commands)
explain Explain what a Camel route does using AI/LLM
transform Transform message or Camel routes (use transform --help to see
sub commands)
@@ -145,7 +145,7 @@ Examples:
DEPRECATED: Bind source and sink Kamelets as a new Camel integration
Usage: camel bind [-h] --source=<source> [--step=<step>] --sink=<sink>
[--error-handler=<error-handler>] [--property=<property>]
- [--output=<output>] <<file>>
+ [--output=<output>] <file>
Options:
-h, --help Display this help and exit
@@ -166,7 +166,7 @@ Options:
--output=<output> Output format generated by this command (supports:
file, yaml, json).
Default: file
- <<file>> Name of binding file to be saved
+ <file> Name of binding file to be saved
== camel catalog --help
List artifacts from Camel Catalog (use catalog --help to see sub commands)
@@ -1434,7 +1434,7 @@ Usage: camel cmd route-diagram [-h] [--filter=<filter>]
[--width=<width>]
[--highlight-style=<highlight-style>]
[--ignore-loading-error] [--compile] [--errors]
[--timeout=<timeout>] [--watch]
- [--duration=<duration>] [<<files>>]
+ [--duration=<duration>] [<files>]
Options:
-h, --help Display this help and exit
@@ -1500,7 +1500,7 @@ Options:
How long to keep watching or following, in millis
or
as a duration such as 30s (default: until Enter is
pressed)
- <<files>> Source file name(s) (shell-expanded wildcards), or
+ <files> Source file name(s) (shell-expanded wildcards), or
name/pid of a running Camel integration
Examples:
@@ -1584,7 +1584,7 @@ Usage: camel cmd route-topology [-h] [--json]
[--theme=<theme>]
[--font-size=<font-size>] [--description]
[--metric] [--external] [--errors]
[--kamelets]
[--ignore-loading-error] [--compile]
- [--timeout=<timeout>] [<<files>>]
+ [--timeout=<timeout>] [<files>]
Options:
-h, --help Display this help and exit
@@ -1624,7 +1624,7 @@ Options:
--timeout=<timeout> How long to wait for the integration to answer, in
millis or as a duration such as 30s
Default: 10000
- <<files>> Source file name(s) (shell-expanded wildcards), or
+ <files> Source file name(s) (shell-expanded wildcards), or
name/pid of a running Camel integration
Examples:
@@ -2020,13 +2020,12 @@ Examples:
== camel config set --help
Set user configuration value
-Usage: camel config set [-h] [--global] <configuration>
+Usage: camel config set [-h] [--global] <key=value>
Options:
-h, --help Display this help and exit
--global Use global or local configuration
- <configuration>
- Configuration parameter (ex. key=value)
+ <key=value> Configuration parameter (ex. key=value)
Examples:
camel config set camel-version=4.10.0
@@ -2089,7 +2088,7 @@ Usage: camel debug [-h] [--remote-attach]
[--breakpoint=<breakpoint>]
[--local-kamelet-dir=<local-kamelet-dir>] [--modeline]
[--open-api=<open-api>] [--code=<code>] [--verbose]
[--ignore-loading-error] [--lazy-bean] [--prompt]
- [--skip-plugins] [--example] [<<files>>]
+ [--skip-plugins] [--example] [<files>]
Options:
-h, --help Display this help and exit
@@ -2400,7 +2399,7 @@ Options:
--example Run an example by name (timer-log or
route/aggregator), list the groups when no name is
given, or list one group by its name (route).
- <<files>> The Camel file(s) to run. If no files specified
then
+ <files> The Camel file(s) to run. If no files specified
then
application.properties is used as source for which
files to run. A Citrus test is run with camel test
run.
@@ -2463,7 +2462,7 @@ Usage: camel dependency copy [-hy]
[--output-directory=<output-directory>]
[--dry-run] [--ignore-loading-error]
[--lazy-bean]
[--skip-plugins] [--groovy-pre-compiled]
[--hawtio] [--hawtio-version=<hawtio-version>]
- [<<files>>]
+ [<files>]
Options:
-h, --help Display this help and exit
@@ -2629,7 +2628,7 @@ Options:
--hawtio-version=<hawtio-version>
Version of the Hawtio web console
Default: ${hawtio-version}
- <<files>> The Camel file(s) to export. If no files is
+ <files> The Camel file(s) to export. If no files is
specified then what was last run will be exported.
Examples:
@@ -2671,7 +2670,7 @@ Usage: camel dependency list [-hy] [--output=<output>]
[--dep=<dep>]
[--dry-run] [--ignore-loading-error]
[--lazy-bean]
[--skip-plugins] [--groovy-pre-compiled]
[--hawtio] [--hawtio-version=<hawtio-version>]
- [<<files>>]
+ [<files>]
Options:
-h, --help Display this help and exit
@@ -2834,7 +2833,7 @@ Options:
--hawtio-version=<hawtio-version>
Version of the Hawtio web console
Default: ${hawtio-version}
- <<files>> The Camel file(s) to export. If no files is
+ <files> The Camel file(s) to export. If no files is
specified then what was last run will be exported.
Examples:
@@ -2899,7 +2898,7 @@ Usage: camel dependency update [-hy] [--clean]
[--scan-routes]
[--verbose] [--dry-run]
[--ignore-loading-error]
[--lazy-bean] [--skip-plugins]
[--groovy-pre-compiled] [--hawtio]
- [--hawtio-version=<hawtio-version>] [<<files>>]
+ [--hawtio-version=<hawtio-version>] [<files>]
Options:
-h, --help Display this help and exit
@@ -3068,7 +3067,7 @@ Options:
--hawtio-version=<hawtio-version>
Version of the Hawtio web console
Default: ${hawtio-version}
- <<files>> The Camel file(s) to export. If no files is
+ <files> The Camel file(s) to export. If no files is
specified then what was last run will be exported.
Examples:
@@ -3111,7 +3110,7 @@ Usage: camel dev [-h] [--runtime=<runtime>]
[--source-dir=<source-dir>]
[--sanitizer] [--local-kamelet-dir=<local-kamelet-dir>]
[--modeline] [--open-api=<open-api>] [--code=<code>]
[--verbose] [--ignore-loading-error] [--lazy-bean] [--prompt]
- [--skip-plugins] [--example] [<<files>>]
+ [--skip-plugins] [--example] [<files>]
Options:
-h, --help Display this help and exit
@@ -3384,7 +3383,7 @@ Options:
--example Run an example by name (timer-log or
route/aggregator), list the groups when no name is
given, or list one group by its name (route).
- <<files>> The Camel file(s) to run. If no files specified
then
+ <files> The Camel file(s) to run. If no files specified
then
application.properties is used as source for which
files to run. A Citrus test is run with camel test
run.
@@ -3498,8 +3497,7 @@ Examples:
camel doctor --json
== camel eval --help
-Evaluate Camel expressions and scripts (use transform --help to see sub
-commands)
+Evaluate Camel expressions and scripts (use eval --help to see sub commands)
Usage: camel eval [-h] [COMMAND]
Options:
@@ -3643,7 +3641,7 @@ Usage: camel export [-hy] [--dep=<dep>]
[--runtime=<runtime>] [--name=<name>]
[--logging] [--quiet] [--verbose] [--dry-run]
[--ignore-loading-error] [--lazy-bean] [--skip-plugins]
[--groovy-pre-compiled] [--hawtio]
- [--hawtio-version=<hawtio-version>] [<<files>>]
+ [--hawtio-version=<hawtio-version>] [<files>]
Options:
-h, --help Display this help and exit
@@ -3804,7 +3802,7 @@ Options:
--hawtio-version=<hawtio-version>
Version of the Hawtio web console
Default: ${hawtio-version}
- <<files>> The Camel file(s) to export. If no files is
+ <files> The Camel file(s) to export. If no files is
specified then what was last run will be exported.
Examples:
@@ -5045,7 +5043,7 @@ Examples:
== camel infra restart --help
Restarts a running external service
Usage: camel infra restart [-h] [--port=<port>] [--log] [--background]
- [--prop=<prop>] [--kill] [--json] <serviceName>
+ [--prop=<prop>] [--kill] [--json] <service>
Options:
-h, --help Display this help and exit
@@ -5058,7 +5056,7 @@ Options:
--property=ollama.model=qwen2.5:0.5b
--kill To force killing the process (SIGKILL) when
stopping
--json Output in JSON Format
- <serviceName> Service name (and optional implementation)
+ <service> Service name (and optional implementation)
Examples:
camel infra restart kafka
@@ -5067,7 +5065,7 @@ Examples:
== camel infra run --help
Run an external service
Usage: camel infra run [-h] [--log] [--background] [--port=<port>] [--no-ui]
- [--prop=<prop>] [--json] <serviceName>
+ [--prop=<prop>] [--json] <service>
Options:
-h, --help Display this help and exit
@@ -5081,7 +5079,7 @@ Options:
Service properties, ex.
--property=ollama.model=qwen2.5:0.5b
--json Output in JSON Format
- <serviceName> Service name
+ <service> Service name
Examples:
camel infra run kafka
@@ -5106,7 +5104,7 @@ Creates a new Camel integration
Usage: camel init [-h] [--list] [--dir=<dir>] [--clean-dir] [--force]
[--from-kamelet=<from-kamelet>]
[--kamelets-version=<kamelets-version>] [--pipe]
- [--repo=<repo>] [<<file>>]
+ [--repo=<repo>] [<file>]
Options:
-h, --help Display this help and exit
@@ -5130,7 +5128,7 @@ Options:
--repo, --repos=<repo>
Additional maven repositories (Use commas to
separate multiple repositories)
- <<file>> Name of integration file (or a github link)
+ <file> Name of integration file (or a github link)
Examples:
camel init hello.java
@@ -5210,11 +5208,11 @@ Examples:
== camel nano --help
Nano editor to edit file
-Usage: camel nano [-h] <<file>>
+Usage: camel nano [-h] <file>
Options:
-h, --help Display this help and exit
- <<file>> Name of file
+ <file> Name of file
Press Ctrl-X to exit.
@@ -5291,7 +5289,7 @@ Usage: camel plugin add [-h] [--command=<command>]
[--description=<description>]
[--repo=<repo>] [--artifactId=<artifactId>]
[--groupId=<groupId>] [--version=<version>]
[--first-version=<first-version>] [--gav=<gav>]
- [--plugin-config=<plugin-config>] <<name>>
+ [--plugin-config=<plugin-config>] <name>
Options:
-h, --help Display this help and exit
@@ -5315,14 +5313,14 @@ Options:
directory. Only applies to the plugin subcommands;
for plugin commands themselves (e.g. 'camel
kubernetes'), set CAMEL_CLI_PLUGIN_CONFIG instead.
- <<name>> The Camel plugin to add
+ <name> The Camel plugin to add
Examples:
camel plugin add --command=my-cmd --gav=com.foo:bar:1.0
== camel plugin delete --help
Removes a plugin
-Usage: camel plugin delete [-h] [--plugin-config=<plugin-config>] <<plugin>>
+Usage: camel plugin delete [-h] [--plugin-config=<plugin-config>] <plugin>
Options:
-h, --help Display this help and exit
@@ -5331,7 +5329,7 @@ Options:
directory. Only applies to the plugin subcommands;
for plugin commands themselves (e.g. 'camel
kubernetes'), set CAMEL_CLI_PLUGIN_CONFIG instead.
- <<plugin>> The Camel plugin to remove
+ <plugin> The Camel plugin to remove
Examples:
camel plugin delete my-cmd
@@ -5452,7 +5450,7 @@ Usage: camel run [-h] [--runtime=<runtime>]
[--source-dir=<source-dir>]
[--sanitizer] [--local-kamelet-dir=<local-kamelet-dir>]
[--modeline] [--open-api=<open-api>] [--code=<code>]
[--verbose] [--ignore-loading-error] [--lazy-bean] [--prompt]
- [--skip-plugins] [--example] [<<files>>]
+ [--skip-plugins] [--example] [<files>]
Options:
-h, --help Display this help and exit
@@ -5725,7 +5723,7 @@ Options:
--example Run an example by name (timer-log or
route/aggregator), list the groups when no name is
given, or list one group by its name (route).
- <<files>> The Camel file(s) to run. If no files specified
then
+ <files> The Camel file(s) to run. If no files specified
then
application.properties is used as source for which
files to run. A Citrus test is run with camel test
run.
@@ -5775,7 +5773,7 @@ Usage: camel sbom [-hy]
[--output-directory=<output-directory>]
[--logging] [--quiet] [--verbose] [--dry-run]
[--ignore-loading-error] [--lazy-bean] [--skip-plugins]
[--groovy-pre-compiled] [--hawtio]
- [--hawtio-version=<hawtio-version>] [<<files>>]
+ [--hawtio-version=<hawtio-version>] [<files>]
Options:
-h, --help Display this help and exit
@@ -5956,7 +5954,7 @@ Options:
--hawtio-version=<hawtio-version>
Version of the Hawtio web console
Default: ${hawtio-version}
- <<files>> The Camel file(s) to export. If no files is
+ <files> The Camel file(s) to export. If no files is
specified then what was last run will be exported.
Examples:
@@ -5970,7 +5968,7 @@ Usage: camel script [-h] [--max-messages=<max-messages>]
[--max-seconds=<max-seconds>]
[--max-idle-seconds=<max-idle-seconds>] [--logging]
[--logging-level=<logging-level>]
- [--properties=<properties>] [--prop=<prop>] <<file>>
+ [--properties=<properties>] [--prop=<prop>] <file>
Options:
-h, --help Display this help and exit
@@ -5995,7 +5993,7 @@ Options:
/path/to/file.properties
--prop, --property=<prop>
Additional properties (override existing)
- <<file>> Name of file
+ <file> Name of file
Examples:
camel script hello.java
@@ -6634,7 +6632,7 @@ Transform Camel routes to XML, YAML or Java format
Usage: camel transform route [-h] [--output=<output>] [--format=<format>]
[--resolve-placeholders] [--uri-as-parameters]
[--ignore-loading-error] [--compile] [--download]
- [--repo=<repo>] [--fresh] [<<files>>]
+ [--repo=<repo>] [--fresh] [<files>]
Options:
-h, --help Display this help and exit
@@ -6668,7 +6666,7 @@ Options:
(Use commas to separate multiple repositories)
--fresh Make sure we use fresh (i.e. non-cached) resources
Default: false
- <<files>> The Camel file(s) to run. If no files specified
then
+ <files> The Camel file(s) to run. If no files specified
then
application.properties is used as source for which
files to run.
@@ -6705,24 +6703,25 @@ Examples:
== camel update run --help
Update Camel project
-Usage: camel update run [-h] [--camelArtifact=<camelArtifact>]
- [--camelSpringBootArtifact=<camelSpringBootArtifact>]
- [--debug] [--download] [--dryRun]
+Usage: camel update run [-h] [--camel-artifact=<camel-artifact>]
+
[--camel-spring-boot-artifact=<camel-spring-boot-artifact>]
+ [--debug] [--download] [--dry-run]
[--extraActiveRecipes=<extraActiveRecipes>]
[--extraRecipeArtifactCoordinates=<extraRecipeArtifactCoordinates>]
- [--fresh] [--openRewriteVersion=<openRewriteVersion>]
+ [--fresh]
+ [--open-rewrite-version=<open-rewrite-version>]
[--quarkus-ext-registry=<quarkus-ext-registry>]
-
[--quarkusMavenPluginGroupId=<quarkusMavenPluginGroupId>]
-
[--quarkusMavenPluginVersion=<quarkusMavenPluginVersion>]
+
[--quarkus-maven-plugin-group-id=<quarkus-maven-plugin-group-id>]
+
[--quarkus-maven-plugin-version=<quarkus-maven-plugin-version>]
[--repo=<repo>] [--runtime=<runtime>]
- [--upgradeTimeout=<upgradeTimeout>] <version>
+ [--upgrade-timeout=<upgrade-timeout>] <version>
Options:
- --camelArtifact=<camelArtifact>
+ --camel-artifact, --camelArtifact=<camel-artifact>
The Maven artifact coordinates for the Camel
upgrade
recipes.
Default: camel-upgrade-recipes
- --camelSpringBootArtifact=<camelSpringBootArtifact>
+ --camel-spring-boot-artifact,
--camelSpringBootArtifact=<camel-spring-boot-artifact>
The Maven artifact coordinates for the Camel Spring
Boot upgrade recipes.
Default: camel-spring-boot-upgrade-recipes
@@ -6731,7 +6730,7 @@ Options:
--download Whether to allow automatic downloading JAR
dependencies (over the internet)
Default: true
- --dryRun If set to true, performs a dry run of the update
+ --dry-run, --dryRun If set to true, performs a dry run of the update
process without making any changes.
Default: false
--extraActiveRecipes=<extraActiveRecipes>
@@ -6745,7 +6744,7 @@ Options:
--fresh Make sure we use fresh (i.e. non-cached) resources
Default: false
-h, --help Display this help and exit
- --openRewriteVersion=<openRewriteVersion>
+ --open-rewrite-version, --openRewriteVersion=<open-rewrite-version>
The version of OpenRewrite to use during the update
process.
Default: 6.0.4
@@ -6755,10 +6754,10 @@ Options:
camel.jbang.quarkus.platform.url system property is
set (the "/client/platforms" suffix is removed if
present).
- --quarkusMavenPluginGroupId=<quarkusMavenPluginGroupId>
+ --quarkus-maven-plugin-group-id,
--quarkusMavenPluginGroupId=<quarkus-maven-plugin-group-id>
The group ID of the Quarkus Maven plugin.
Default: io.quarkus.platform
- --quarkusMavenPluginVersion=<quarkusMavenPluginVersion>
+ --quarkus-maven-plugin-version,
--quarkusMavenPluginVersion=<quarkus-maven-plugin-version>
The version of the Quarkus Maven plugin to use; the
default value is looked up in Quarkus Extension
Registry
@@ -6767,7 +6766,7 @@ Options:
(Use commas to separate multiple repositories)
--runtime=<runtime> Runtime (camel-main, spring-boot, quarkus)
Default: camel-main
- --upgradeTimeout=<upgradeTimeout>
+ --upgrade-timeout, --upgradeTimeout=<upgrade-timeout>
Time to wait, in seconds, before shutting down the
upgrade process
Default: 240
@@ -6957,7 +6956,7 @@ stderr:
[--sanitizer] [--local-kamelet-dir=<local-kamelet-dir>]
[--modeline] [--open-api=<open-api>] [--code=<code>]
[--verbose] [--ignore-loading-error] [--lazy-bean]
[--prompt]
- [--skip-plugins] [--example] [<<files>>]
+ [--skip-plugins] [--example] [<files>]
Try 'camel run --help' for more information.
== camel get route --sort
diff --git
a/dsl/camel-jbang/camel-jbang-plugin-edit/src/main/java/org/apache/camel/dsl/jbang/core/commands/edit/EditCommand.java
b/dsl/camel-jbang/camel-jbang-plugin-edit/src/main/java/org/apache/camel/dsl/jbang/core/commands/edit/EditCommand.java
index 09aae5b1056c..c8f367f96808 100644
---
a/dsl/camel-jbang/camel-jbang-plugin-edit/src/main/java/org/apache/camel/dsl/jbang/core/commands/edit/EditCommand.java
+++
b/dsl/camel-jbang/camel-jbang-plugin-edit/src/main/java/org/apache/camel/dsl/jbang/core/commands/edit/EditCommand.java
@@ -36,7 +36,7 @@ import org.jline.terminal.TerminalBuilder;
public class EditCommand extends CamelCommand {
private Path filePath; // Defined only for file path completion; the field
never used
- @Argument(required = true, description = "Name of file", paramLabel =
"<file>")
+ @Argument(required = true, description = "Name of file", paramLabel =
"file")
private String file;
public EditCommand(CamelJBangMain main) {
diff --git
a/dsl/camel-jbang/camel-jbang-plugin-generate/src/main/java/org/apache/camel/dsl/jbang/core/commands/generate/CodeSchemaGenerator.java
b/dsl/camel-jbang/camel-jbang-plugin-generate/src/main/java/org/apache/camel/dsl/jbang/core/commands/generate/CodeSchemaGenerator.java
index c3279503347e..b1988454f839 100644
---
a/dsl/camel-jbang/camel-jbang-plugin-generate/src/main/java/org/apache/camel/dsl/jbang/core/commands/generate/CodeSchemaGenerator.java
+++
b/dsl/camel-jbang/camel-jbang-plugin-generate/src/main/java/org/apache/camel/dsl/jbang/core/commands/generate/CodeSchemaGenerator.java
@@ -63,10 +63,12 @@ import tools.jackson.databind.json.JsonMapper;
generateHelp = true, sortOptions = true)
public class CodeSchemaGenerator extends CamelCommand {
- @Argument(index = "0", required = true, description = "Camel component
name (e.g., 'fhir', 'http', 'jms')")
+ @Argument(paramLabel = "component", index = "0", required = true,
+ description = "Camel component name (e.g., 'fhir', 'http',
'jms')")
private String camelComponent;
- @Argument(index = "1", required = true, description = "Fully qualified
class name (e.g., 'org.hl7.fhir.r4.model.Patient')")
+ @Argument(paramLabel = "class", index = "1", required = true,
+ description = "Fully qualified class name (e.g.,
'org.hl7.fhir.r4.model.Patient')")
private String fullyQualifiedName;
@org.aesh.command.option.Option(name = "camel-version", description =
"Camel version to use")
diff --git
a/dsl/camel-jbang/camel-jbang-plugin-kubernetes/src/main/java/org/apache/camel/dsl/jbang/core/commands/kubernetes/KubernetesPodLogs.java
b/dsl/camel-jbang/camel-jbang-plugin-kubernetes/src/main/java/org/apache/camel/dsl/jbang/core/commands/kubernetes/KubernetesPodLogs.java
index aa257e695c13..5ce61dde78ea 100644
---
a/dsl/camel-jbang/camel-jbang-plugin-kubernetes/src/main/java/org/apache/camel/dsl/jbang/core/commands/kubernetes/KubernetesPodLogs.java
+++
b/dsl/camel-jbang/camel-jbang-plugin-kubernetes/src/main/java/org/apache/camel/dsl/jbang/core/commands/kubernetes/KubernetesPodLogs.java
@@ -38,7 +38,7 @@ import static
org.apache.camel.dsl.jbang.core.commands.kubernetes.KubernetesHelp
public class KubernetesPodLogs extends KubernetesBaseCommand {
@Argument(description = "The Camel file to get logs from. Integration name
is derived from the file name.",
- paramLabel = "<file>")
+ paramLabel = "file")
protected String filePath;
@Option(name = "label", description = "Label name and value used as a pod
selector.")
diff --git
a/dsl/camel-jbang/camel-jbang-plugin-kubernetes/src/main/java/org/apache/camel/dsl/jbang/core/commands/kubernetes/KubernetesRun.java
b/dsl/camel-jbang/camel-jbang-plugin-kubernetes/src/main/java/org/apache/camel/dsl/jbang/core/commands/kubernetes/KubernetesRun.java
index e9265db20ce9..f98978b80f5c 100644
---
a/dsl/camel-jbang/camel-jbang-plugin-kubernetes/src/main/java/org/apache/camel/dsl/jbang/core/commands/kubernetes/KubernetesRun.java
+++
b/dsl/camel-jbang/camel-jbang-plugin-kubernetes/src/main/java/org/apache/camel/dsl/jbang/core/commands/kubernetes/KubernetesRun.java
@@ -76,7 +76,7 @@ import static
org.apache.camel.dsl.jbang.core.commands.kubernetes.KubernetesHelp
public class KubernetesRun extends KubernetesBaseCommand {
@Arguments(description = "The Camel file(s) to run. If no files specified
then application.properties is used as source for which files to run.",
- paramLabel = "<files>")
+ paramLabel = "files")
public List<String> files = new ArrayList<>();
@Option(name = "service-account", description = "The service account used
to run the application.")
diff --git
a/dsl/camel-jbang/camel-jbang-plugin-validate/src/main/java/org/apache/camel/dsl/jbang/core/commands/validate/PropertiesValidateCommand.java
b/dsl/camel-jbang/camel-jbang-plugin-validate/src/main/java/org/apache/camel/dsl/jbang/core/commands/validate/PropertiesValidateCommand.java
index 0f77e6d74b2a..61228bbc4fd5 100644
---
a/dsl/camel-jbang/camel-jbang-plugin-validate/src/main/java/org/apache/camel/dsl/jbang/core/commands/validate/PropertiesValidateCommand.java
+++
b/dsl/camel-jbang/camel-jbang-plugin-validate/src/main/java/org/apache/camel/dsl/jbang/core/commands/validate/PropertiesValidateCommand.java
@@ -44,7 +44,7 @@ import org.apache.camel.util.FileUtil;
sortOptions = true)
public class PropertiesValidateCommand extends CamelCommand {
- @Arguments(required = true, description = "The properties files to
validate.", paramLabel = "<files>")
+ @Arguments(required = true, description = "The properties files to
validate.", paramLabel = "files")
List<String> files = new ArrayList<>();
@Option(name = "json", hasValue = false,
diff --git
a/dsl/camel-jbang/camel-jbang-plugin-validate/src/main/java/org/apache/camel/dsl/jbang/core/commands/validate/SourceValidateCommand.java
b/dsl/camel-jbang/camel-jbang-plugin-validate/src/main/java/org/apache/camel/dsl/jbang/core/commands/validate/SourceValidateCommand.java
index 469628479ef5..26006cea1e4b 100644
---
a/dsl/camel-jbang/camel-jbang-plugin-validate/src/main/java/org/apache/camel/dsl/jbang/core/commands/validate/SourceValidateCommand.java
+++
b/dsl/camel-jbang/camel-jbang-plugin-validate/src/main/java/org/apache/camel/dsl/jbang/core/commands/validate/SourceValidateCommand.java
@@ -44,7 +44,7 @@ import org.apache.camel.dsl.yaml.validator.YamlValidator;
generateHelp = true, sortOptions = true)
public class SourceValidateCommand extends CamelCommand {
- @Arguments(required = true, description = "The source files to validate.",
paramLabel = "<files>")
+ @Arguments(required = true, description = "The source files to validate.",
paramLabel = "files")
List<String> files = new ArrayList<>();
@Mixin
diff --git
a/dsl/camel-jbang/camel-jbang-plugin-validate/src/main/java/org/apache/camel/dsl/jbang/core/commands/validate/YamlNormalizeCommand.java
b/dsl/camel-jbang/camel-jbang-plugin-validate/src/main/java/org/apache/camel/dsl/jbang/core/commands/validate/YamlNormalizeCommand.java
index db2bea6bc184..1f3fba9861af 100644
---
a/dsl/camel-jbang/camel-jbang-plugin-validate/src/main/java/org/apache/camel/dsl/jbang/core/commands/validate/YamlNormalizeCommand.java
+++
b/dsl/camel-jbang/camel-jbang-plugin-validate/src/main/java/org/apache/camel/dsl/jbang/core/commands/validate/YamlNormalizeCommand.java
@@ -76,7 +76,7 @@ public class YamlNormalizeCommand extends CamelCommand {
+ " The output must not overwrite one of the input
files.")
private String output;
- @Arguments(required = true, description = "The Camel YAML source files to
normalize.", paramLabel = "<files>")
+ @Arguments(required = true, description = "The Camel YAML source files to
normalize.", paramLabel = "files")
List<String> files = new ArrayList<>();
public YamlNormalizeCommand(CamelJBangMain main) {
diff --git
a/dsl/camel-jbang/camel-jbang-plugin-validate/src/main/java/org/apache/camel/dsl/jbang/core/commands/validate/YamlValidateCommand.java
b/dsl/camel-jbang/camel-jbang-plugin-validate/src/main/java/org/apache/camel/dsl/jbang/core/commands/validate/YamlValidateCommand.java
index 630ee18706d8..3059b7330bfa 100644
---
a/dsl/camel-jbang/camel-jbang-plugin-validate/src/main/java/org/apache/camel/dsl/jbang/core/commands/validate/YamlValidateCommand.java
+++
b/dsl/camel-jbang/camel-jbang-plugin-validate/src/main/java/org/apache/camel/dsl/jbang/core/commands/validate/YamlValidateCommand.java
@@ -66,7 +66,7 @@ public class YamlValidateCommand extends CamelCommand {
+ " camel_validate_source answers")
boolean jsonOutput;
- @Arguments(required = true, description = "The Camel YAML source files to
parse.", paramLabel = "<files>")
+ @Arguments(required = true, description = "The Camel YAML source files to
parse.", paramLabel = "files")
List<String> files = new ArrayList<>();
public YamlValidateCommand(CamelJBangMain main) {