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 2023/06/09 15:23:05 UTC
[camel] branch main updated: camel-jbang - Fix watch mode and make some commands auto detect single running camel app
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 1886879ef9f camel-jbang - Fix watch mode and make some commands auto detect single running camel app
1886879ef9f is described below
commit 1886879ef9f4b6065a420bd8528ee07ceef14464
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Fri Jun 9 17:22:45 2023 +0200
camel-jbang - Fix watch mode and make some commands auto detect single running camel app
---
.../camel/dsl/jbang/core/commands/action/ActionWatchCommand.java | 2 +-
.../camel/dsl/jbang/core/commands/action/CamelRouteDumpAction.java | 4 ++--
.../apache/camel/dsl/jbang/core/commands/action/CamelSendAction.java | 4 ++--
.../camel/dsl/jbang/core/commands/action/CamelSourceAction.java | 4 ++--
.../apache/camel/dsl/jbang/core/commands/action/CamelSourceTop.java | 4 ++--
.../apache/camel/dsl/jbang/core/commands/action/CamelThreadDump.java | 4 ++--
.../camel/dsl/jbang/core/commands/action/RouteControllerAction.java | 4 ++--
7 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/action/ActionWatchCommand.java b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/action/ActionWatchCommand.java
index 165aa2d9c6f..0e979c4df96 100644
--- a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/action/ActionWatchCommand.java
+++ b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/action/ActionWatchCommand.java
@@ -36,7 +36,7 @@ abstract class ActionWatchCommand extends ActionBaseCommand {
int exit;
if (watch) {
do {
- exit = doCall();
+ exit = doWatchCall();
if (exit == 0) {
// use 2-sec delay in watch mode
Thread.sleep(2000);
diff --git a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/action/CamelRouteDumpAction.java b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/action/CamelRouteDumpAction.java
index 8365f894323..1974a709710 100644
--- a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/action/CamelRouteDumpAction.java
+++ b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/action/CamelRouteDumpAction.java
@@ -50,8 +50,8 @@ public class CamelRouteDumpAction extends ActionBaseCommand {
}
- @CommandLine.Parameters(description = "Name or pid of running Camel integration", arity = "1")
- String name;
+ @CommandLine.Parameters(description = "Name or pid of running Camel integration", arity = "0..1")
+ String name = "*";
@CommandLine.Option(names = { "--format" },
description = "Output format (xml or yaml)", defaultValue = "xml")
diff --git a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/action/CamelSendAction.java b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/action/CamelSendAction.java
index eca9d63b2d0..b2168f18d00 100644
--- a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/action/CamelSendAction.java
+++ b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/action/CamelSendAction.java
@@ -39,8 +39,8 @@ import picocli.CommandLine;
description = "Sends a message to a system via an existing running Camel integration")
public class CamelSendAction extends ActionBaseCommand {
- @CommandLine.Parameters(description = "Name or pid of running Camel integration", arity = "1")
- String name;
+ @CommandLine.Parameters(description = "Name or pid of running Camel integration", arity = "0..1")
+ String name = "*";
@CommandLine.Option(names = { "--endpoint" },
description = "Endpoint where to send the message (can be uri, pattern, or refer to a route id)")
diff --git a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/action/CamelSourceAction.java b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/action/CamelSourceAction.java
index dc8cec880a2..5c99dfcf616 100644
--- a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/action/CamelSourceAction.java
+++ b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/action/CamelSourceAction.java
@@ -39,8 +39,8 @@ public class CamelSourceAction extends ActionBaseCommand {
// TODO: strip license header
- @CommandLine.Parameters(description = "Name or pid of running Camel integration", arity = "1")
- String name;
+ @CommandLine.Parameters(description = "Name or pid of running Camel integration", arity = "0..1")
+ String name = "*";
@CommandLine.Option(names = { "--filter" },
description = "Filter source by filename (multiple names can be separated by comma)")
diff --git a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/action/CamelSourceTop.java b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/action/CamelSourceTop.java
index a83eb250f0b..2bd7585a510 100644
--- a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/action/CamelSourceTop.java
+++ b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/action/CamelSourceTop.java
@@ -35,8 +35,8 @@ import picocli.CommandLine.Command;
@Command(name = "source", description = "List top processors (source) in a running Camel integration")
public class CamelSourceTop extends ActionWatchCommand {
- @CommandLine.Parameters(description = "Name or pid of running Camel integration", arity = "1")
- String name;
+ @CommandLine.Parameters(description = "Name or pid of running Camel integration", arity = "0..1")
+ String name = "*";
@CommandLine.Option(names = { "--limit" },
description = "Filter processors by limiting to the given number of rows")
diff --git a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/action/CamelThreadDump.java b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/action/CamelThreadDump.java
index 20d0a866592..9292568c31b 100644
--- a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/action/CamelThreadDump.java
+++ b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/action/CamelThreadDump.java
@@ -53,8 +53,8 @@ public class CamelThreadDump extends ActionWatchCommand {
}
- @CommandLine.Parameters(description = "Name or pid of running Camel integration", arity = "1")
- String name;
+ @CommandLine.Parameters(description = "Name or pid of running Camel integration", arity = "0..1")
+ String name = "*";
@CommandLine.Option(names = { "--sort" }, completionCandidates = IdNameStateCompletionCandidates.class,
description = "Sort by id, name or state", defaultValue = "id")
diff --git a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/action/RouteControllerAction.java b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/action/RouteControllerAction.java
index f54c75ed57c..10a1e9c02d2 100644
--- a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/action/RouteControllerAction.java
+++ b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/action/RouteControllerAction.java
@@ -54,8 +54,8 @@ public class RouteControllerAction extends ActionWatchCommand {
}
- @CommandLine.Parameters(description = "Name or pid of running Camel integration", arity = "1")
- String name;
+ @CommandLine.Parameters(description = "Name or pid of running Camel integration", arity = "0..1")
+ String name = "*";
@CommandLine.Option(names = { "--sort" }, completionCandidates = IdStateCompletionCandidates.class,
description = "Sort by id, or state", defaultValue = "id")