This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a commit to branch node-prefix-id in repository https://gitbox.apache.org/repos/asf/camel.git
commit f02b7f7cf6b774b1069b1b913463e650cab5183a Author: Claus Ibsen <[email protected]> AuthorDate: Mon Nov 27 14:08:05 2023 +0100 CAMEL-20155: camel-jbang - camel get processor should not show nodePrefixId as this is noisy --- .../java/org/apache/camel/impl/console/RouteDevConsole.java | 4 ++++ .../jbang/core/commands/process/CamelProcessorStatus.java | 12 +++++++++++- 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/core/camel-console/src/main/java/org/apache/camel/impl/console/RouteDevConsole.java b/core/camel-console/src/main/java/org/apache/camel/impl/console/RouteDevConsole.java index d1072f32285..69c3b25f22a 100644 --- a/core/camel-console/src/main/java/org/apache/camel/impl/console/RouteDevConsole.java +++ b/core/camel-console/src/main/java/org/apache/camel/impl/console/RouteDevConsole.java @@ -151,6 +151,9 @@ public class RouteDevConsole extends AbstractDevConsole { for (ManagedProcessorMBean mp : mps) { sb.append("\n"); sb.append(String.format("\n Id: %s", mp.getProcessorId())); + if (mp.getNodePrefixId() != null) { + sb.append(String.format("\n Node Prefix Id: %s", mp.getNodePrefixId())); + } sb.append(String.format("\n Processor: %s", mp.getProcessorName())); sb.append(String.format("\n Level: %d", mp.getLevel())); if (mp.getSourceLocation() != null) { @@ -283,6 +286,7 @@ public class RouteDevConsole extends AbstractDevConsole { arr.add(jo); jo.put("id", mp.getProcessorId()); + jo.put("nodePrefixId", mp.getNodePrefixId()); if (mp.getSourceLocation() != null) { String loc = mp.getSourceLocation(); if (mp.getSourceLineNumber() != null) { diff --git a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/process/CamelProcessorStatus.java b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/process/CamelProcessorStatus.java index 473a9409075..ec9a34e71cf 100644 --- a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/process/CamelProcessorStatus.java +++ b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/process/CamelProcessorStatus.java @@ -98,6 +98,7 @@ public class CamelProcessorStatus extends ProcessWatchCommand { } row.pid = Long.toString(ph.pid()); row.routeId = o.getString("routeId"); + row.nodePrefixId = o.getString("nodePrefixId"); row.processor = o.getString("from"); row.source = o.getString("source"); row.state = o.getString("state"); @@ -170,6 +171,7 @@ public class CamelProcessorStatus extends ProcessWatchCommand { row.routeId = route.routeId; rows.add(row); row.processorId = o.getString("id"); + row.nodePrefixId = o.getString("nodePrefixId"); row.processor = o.getString("processor"); row.level = o.getIntegerOrDefault("level", 0); row.source = o.getString("source"); @@ -285,7 +287,14 @@ public class CamelProcessorStatus extends ProcessWatchCommand { if (source && r.source != null) { answer = sourceLocLine(r.source); } else { - answer = r.processorId != null ? r.processorId : r.routeId; + if (r.processorId == null) { + answer = r.routeId; + } else { + answer = r.processorId; + if (r.nodePrefixId != null && answer.startsWith(r.nodePrefixId)) { + answer = answer.substring(r.nodePrefixId.length()); + } + } } return answer; } @@ -316,6 +325,7 @@ public class CamelProcessorStatus extends ProcessWatchCommand { String name; long uptime; String routeId; + String nodePrefixId; String processorId; String processor; int level;
