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 2024/10/10 12:49:27 UTC
(camel) 12/13: CAMEL-21193: camel-jbang - Add listen command
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch rcmd
in repository https://gitbox.apache.org/repos/asf/camel.git
commit fe9a5578b6a995dbadf8eea74031b4d598535d32
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Thu Oct 10 14:30:17 2024 +0200
CAMEL-21193: camel-jbang - Add listen command
---
.../org/apache/camel/impl/console/ReceiveDevConsole.java | 13 +++++++------
.../camel/dsl/jbang/core/commands/CamelJBangMain.java | 2 +-
.../{CamelListenAction.java => CamelReceiveAction.java} | 12 ++++++------
3 files changed, 14 insertions(+), 13 deletions(-)
diff --git a/core/camel-console/src/main/java/org/apache/camel/impl/console/ReceiveDevConsole.java b/core/camel-console/src/main/java/org/apache/camel/impl/console/ReceiveDevConsole.java
index 79898f98aa4..ff3a3215e7b 100644
--- a/core/camel-console/src/main/java/org/apache/camel/impl/console/ReceiveDevConsole.java
+++ b/core/camel-console/src/main/java/org/apache/camel/impl/console/ReceiveDevConsole.java
@@ -160,18 +160,19 @@ public class ReceiveDevConsole extends AbstractDevConsole {
String pattern = (String) options.get(ENDPOINT);
if (pattern != null) {
- this.enabled.set(true);
- Endpoint target = findMatchingEndpoint(getCamelContext(), pattern);
- if (target != null) {
- try {
+ try {
+ Endpoint target = findMatchingEndpoint(getCamelContext(), pattern);
+ if (target != null) {
+ sb.append("Starting to receive messages from: ").append(target.getEndpointUri());
Consumer consumer = createConsumer(target);
if (!consumers.contains(consumer)) {
consumers.add(consumer);
ServiceHelper.startService(consumer);
}
- } catch (Exception e) {
- // ignore
}
+ this.enabled.set(true);
+ } catch (Exception e) {
+ sb.append("Error starting to receive messages due to: ").append(e.getMessage());
}
}
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 ad13f76379d..7bf78415b32 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
@@ -123,7 +123,7 @@ public class CamelJBangMain implements Callable<Integer> {
.addSubcommand("reload", new CommandLine(new CamelReloadAction(main)))
.addSubcommand("send", new CommandLine(new CamelSendAction(main)))
.addSubcommand("browse", new CommandLine(new CamelBrowseAction(main)))
- .addSubcommand("listen", new CommandLine(new CamelListenAction(main)))
+ .addSubcommand("listen", new CommandLine(new CamelReceiveAction(main)))
.addSubcommand("stub", new CommandLine(new CamelStubAction(main)))
.addSubcommand("thread-dump", new CommandLine(new CamelThreadDump(main)))
.addSubcommand("logger", new CommandLine(new LoggerAction(main)))
diff --git a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/action/CamelListenAction.java b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/action/CamelReceiveAction.java
similarity index 98%
rename from dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/action/CamelListenAction.java
rename to dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/action/CamelReceiveAction.java
index 5aa5b7ce0e9..8aa46a3124d 100644
--- a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/action/CamelListenAction.java
+++ b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/action/CamelReceiveAction.java
@@ -55,9 +55,9 @@ import org.apache.camel.util.json.Jsoner;
import org.fusesource.jansi.Ansi;
import picocli.CommandLine;
-@CommandLine.Command(name = "listen",
- description = "Listen (receive) messages from endpoints", sortOptions = false)
-public class CamelListenAction extends ActionBaseCommand {
+@CommandLine.Command(name = "receive",
+ description = "Receive and dump messages from remote endpoints", sortOptions = false)
+public class CamelReceiveAction extends ActionBaseCommand {
private static final int NAME_MAX_WIDTH = 25;
private static final int NAME_MIN_WIDTH = 10;
@@ -166,7 +166,7 @@ public class CamelListenAction extends ActionBaseCommand {
private MessageTableHelper tableHelper;
private final Map<String, Ansi.Color> nameColors = new HashMap<>();
- public CamelListenAction(CamelJBangMain main) {
+ public CamelReceiveAction(CamelJBangMain main) {
super(main);
}
@@ -213,10 +213,10 @@ public class CamelListenAction extends ActionBaseCommand {
String url = jo.getString("url");
List<String> stackTrace = jo.getCollection("stackTrace");
if (url != null) {
- printer().println("Error starting listening on: " + url + " due to: " + error);
+ printer().println("Error starting to receive messages from: " + url + " due to: " + error);
} else {
- printer().println("Error starting listening due to: " + error);
+ printer().println("Error starting to receive messages due to: " + error);
}
printer().println(StringHelper.fillChars('-', 120));
printer().println(StringHelper.padString(1, 55) + "STACK-TRACE");