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 8a972166d90 CAMEL-18406: camel-jbang - Add commands to control routes
(start and stop)
8a972166d90 is described below
commit 8a972166d90f6da39161859df5faeb9360a23b74
Author: Claus Ibsen <[email protected]>
AuthorDate: Tue Aug 30 09:46:50 2022 +0200
CAMEL-18406: camel-jbang - Add commands to control routes (start and stop)
---
.../org/apache/camel/cli/connector/LocalCliConnector.java | 11 +++++++++--
.../dsl/jbang/core/commands/action/CamelRouteAction.java | 2 +-
2 files changed, 10 insertions(+), 3 deletions(-)
diff --git
a/dsl/camel-cli-connector/src/main/java/org/apache/camel/cli/connector/LocalCliConnector.java
b/dsl/camel-cli-connector/src/main/java/org/apache/camel/cli/connector/LocalCliConnector.java
index ded9845fe3b..541d2e716c6 100644
---
a/dsl/camel-cli-connector/src/main/java/org/apache/camel/cli/connector/LocalCliConnector.java
+++
b/dsl/camel-cli-connector/src/main/java/org/apache/camel/cli/connector/LocalCliConnector.java
@@ -188,11 +188,18 @@ public class LocalCliConnector extends ServiceSupport
implements CliConnector, C
String action = root.getString("action");
if ("route".equals(action)) {
// id is a pattern
- String pattern = root.getString("id");
+ String[] patterns = root.getString("id").split(",");
// find matching IDs
List<String> ids = camelContext.getRoutes()
.stream().map(Route::getRouteId)
- .filter(routeId -> PatternHelper.matchPattern(routeId,
pattern))
+ .filter(routeId -> {
+ for (String p : patterns) {
+ if (PatternHelper.matchPattern(routeId, p)) {
+ return true;
+ }
+ }
+ return false;
+ })
.collect(Collectors.toList());
for (String id : ids) {
try {
diff --git
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/action/CamelRouteAction.java
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/action/CamelRouteAction.java
index d9a89696ecc..df875a1c08e 100644
---
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/action/CamelRouteAction.java
+++
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/action/CamelRouteAction.java
@@ -34,7 +34,7 @@ public abstract class CamelRouteAction extends
ActionBaseCommand {
boolean all;
@CommandLine.Option(names = { "--id" },
- description = "Route ids (supports wildcards)",
defaultValue = "*")
+ description = "Route ids (multiple ids can be
separated by comma)", defaultValue = "*")
String id = "*";
public CamelRouteAction(CamelJBangMain main) {