You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2025/08/02 16:41:47 UTC

(camel) 12/13: CAMEL-22310: camel-core - Add route group jbang command

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

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

commit cb0d747c539b49aa32bc6bc80e553f290c780ba5
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Sat Aug 2 17:57:54 2025 +0200

    CAMEL-22310: camel-core - Add route group jbang command
---
 .../camel/cli/connector/LocalCliConnector.java     |  1 +
 .../dsl/jbang/core/commands/CamelJBangMain.java    |  2 ++
 .../core/commands/action/CamelRouteAction.java     |  5 ---
 .../action/CamelRouteGroupStartAction.java         | 37 ++++++++++++++++++++++
 .../commands/action/CamelRouteGroupStopAction.java | 37 ++++++++++++++++++++++
 5 files changed, 77 insertions(+), 5 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 d527061f8a9..55a9b26b142 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
@@ -819,6 +819,7 @@ public class LocalCliConnector extends ServiceSupport implements CliConnector, C
                         }
                         return false;
                     })
+                    .distinct()
                     .toList();
         }
         for (String id : ids) {
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 4124e3f49c2..6636764820d 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
@@ -135,6 +135,8 @@ public class CamelJBangMain implements Callable<Integer> {
                         .addSubcommand("stop-route", new CommandLine(new CamelRouteStopAction(main)))
                         .addSubcommand("suspend-route", new CommandLine(new CamelRouteSuspendAction(main)))
                         .addSubcommand("resume-route", new CommandLine(new CamelRouteResumeAction(main)))
+                        .addSubcommand("start-group", new CommandLine(new CamelRouteGroupStartAction(main)))
+                        .addSubcommand("stop-group", new CommandLine(new CamelRouteGroupStopAction(main)))
                         .addSubcommand("reset-stats", new CommandLine(new CamelResetStatsAction(main)))
                         .addSubcommand("reload", new CommandLine(new CamelReloadAction(main)))
                         .addSubcommand("send", new CommandLine(new CamelSendAction(main)))
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 d652a4ab0f9..a4122151298 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
@@ -33,10 +33,6 @@ public abstract class CamelRouteAction extends ActionBaseCommand {
                         description = "Route ids (multiple ids can be separated by comma)", defaultValue = "*")
     String id = "*";
 
-    @CommandLine.Option(names = { "--group" },
-                        description = "Perform the action on a group of routes")
-    boolean group;
-
     public CamelRouteAction(CamelJBangMain main) {
         super(main);
     }
@@ -48,7 +44,6 @@ public abstract class CamelRouteAction extends ActionBaseCommand {
         for (long pid : pids) {
             JsonObject root = new JsonObject();
             root.put("action", "route");
-            root.put("group", group);
             root.put("id", id);
             Path f = getActionFile(Long.toString(pid));
             onAction(root);
diff --git a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/action/CamelRouteGroupStartAction.java b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/action/CamelRouteGroupStartAction.java
new file mode 100644
index 00000000000..8afcba88d2a
--- /dev/null
+++ b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/action/CamelRouteGroupStartAction.java
@@ -0,0 +1,37 @@
+/*
+ * 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.action;
+
+import org.apache.camel.dsl.jbang.core.commands.CamelJBangMain;
+import org.apache.camel.util.json.JsonObject;
+import picocli.CommandLine;
+
+@CommandLine.Command(name = "start-group",
+                     description = "Start Camel route groups", sortOptions = false, showDefaultValues = true)
+public class CamelRouteGroupStartAction extends CamelRouteAction {
+
+    public CamelRouteGroupStartAction(CamelJBangMain main) {
+        super(main);
+    }
+
+    @Override
+    protected void onAction(JsonObject root) {
+        root.put("group", true);
+        root.put("command", "start");
+    }
+
+}
diff --git a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/action/CamelRouteGroupStopAction.java b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/action/CamelRouteGroupStopAction.java
new file mode 100644
index 00000000000..5ad3fe823a1
--- /dev/null
+++ b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/action/CamelRouteGroupStopAction.java
@@ -0,0 +1,37 @@
+/*
+ * 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.action;
+
+import org.apache.camel.dsl.jbang.core.commands.CamelJBangMain;
+import org.apache.camel.util.json.JsonObject;
+import picocli.CommandLine;
+
+@CommandLine.Command(name = "stop-group",
+                     description = "Stop Camel route groups", sortOptions = false, showDefaultValues = true)
+public class CamelRouteGroupStopAction extends CamelRouteAction {
+
+    public CamelRouteGroupStopAction(CamelJBangMain main) {
+        super(main);
+    }
+
+    @Override
+    protected void onAction(JsonObject root) {
+        root.put("group", true);
+        root.put("command", "stop");
+    }
+
+}