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 a27eab7e8ba CAMEL-20860: camel-core - Endpoint should have isRemote method a27eab7e8ba is described below commit a27eab7e8bad9207c5a3a1cafb7e82e810c01533 Author: Claus Ibsen <claus.ib...@gmail.com> AuthorDate: Wed Jun 12 10:56:08 2024 +0200 CAMEL-20860: camel-core - Endpoint should have isRemote method --- .../org/apache/camel/dsl/jbang/core/commands/Debug.java | 9 ++++++--- .../dsl/jbang/core/commands/action/CamelTraceAction.java | 15 ++++++++++----- 2 files changed, 16 insertions(+), 8 deletions(-) diff --git a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Debug.java b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Debug.java index f20d7c80735..dbe70c24e01 100644 --- a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Debug.java +++ b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Debug.java @@ -749,12 +749,14 @@ public class Debug extends Run { } private String getStatus(SuspendedRow r) { + boolean remote = r.endpoint != null && r.endpoint.getBooleanOrDefault("remote", false); + if (r.first) { String s = "Created"; if (loggingColor) { return Ansi.ansi().fg(Ansi.Color.GREEN).a(s).reset().toString(); } else { - return "Input"; + return s; } } else if (r.last) { String done = r.exception != null ? "Completed (exception)" : "Completed (success)"; @@ -778,10 +780,11 @@ public class Debug extends Run { return fail; } } else { + String s = remote ? "Sent" : "Processed"; if (loggingColor) { - return Ansi.ansi().fg(Ansi.Color.GREEN).a("Processed").reset().toString(); + return Ansi.ansi().fg(Ansi.Color.GREEN).a(s).reset().toString(); } else { - return "Processed"; + return s; } } } diff --git a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/action/CamelTraceAction.java b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/action/CamelTraceAction.java index e15cba05773..28e5b962b10 100644 --- a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/action/CamelTraceAction.java +++ b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/action/CamelTraceAction.java @@ -439,6 +439,7 @@ public class CamelTraceAction extends ActionBaseCommand { uri = URISupport.sanitizeUri(uri); } row.endpoint.put("endpoint", uri); + row.endpoint.put("remote", jo.getBooleanOrDefault("remoteEndpoint", true)); } JsonObject es = jo.getMap("endpointService"); if (es != null) { @@ -736,12 +737,14 @@ public class CamelTraceAction extends ActionBaseCommand { } private String getStatus(Row r) { + boolean remote = r.endpoint != null && r.endpoint.getBooleanOrDefault("remote", false); + if (r.first) { String s = r.parent.depth == 1 ? "Created" : "Routing to " + r.routeId; if (loggingColor) { return Ansi.ansi().fg(Ansi.Color.GREEN).a(s).reset().toString(); } else { - return "Input"; + return s; } } else if (r.last) { String done = r.exception != null ? "Completed (exception)" : "Completed (success)"; @@ -753,10 +756,11 @@ public class CamelTraceAction extends ActionBaseCommand { } } if (!r.done) { + String s = remote ? "Sending" : "Processing"; if (loggingColor) { - return Ansi.ansi().fg(Ansi.Color.BLUE).a("Processing").reset().toString(); + return Ansi.ansi().fg(Ansi.Color.BLUE).a(s).reset().toString(); } else { - return "Processing"; + return s; } } else if (r.failed) { String fail = r.exception != null ? "Exception" : "Failed"; @@ -766,10 +770,11 @@ public class CamelTraceAction extends ActionBaseCommand { return fail; } } else { + String s = remote ? "Sent" : "Processed"; if (loggingColor) { - return Ansi.ansi().fg(Ansi.Color.GREEN).a("Processed").reset().toString(); + return Ansi.ansi().fg(Ansi.Color.GREEN).a(s).reset().toString(); } else { - return "Processed"; + return s; } } }