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 6d30cd68b132 camel-console: polished
6d30cd68b132 is described below
commit 6d30cd68b1325be830150caa1b5e811b0c265891
Author: Claus Ibsen <[email protected]>
AuthorDate: Thu Oct 30 08:58:16 2025 +0100
camel-console: polished
---
.../camel/impl/console/ProcessorDevConsole.java | 14 ++++--
.../apache/camel/impl/console/RouteDevConsole.java | 54 +---------------------
2 files changed, 13 insertions(+), 55 deletions(-)
diff --git
a/core/camel-console/src/main/java/org/apache/camel/impl/console/ProcessorDevConsole.java
b/core/camel-console/src/main/java/org/apache/camel/impl/console/ProcessorDevConsole.java
index 3a7218455bc6..d430b489c3ff 100644
---
a/core/camel-console/src/main/java/org/apache/camel/impl/console/ProcessorDevConsole.java
+++
b/core/camel-console/src/main/java/org/apache/camel/impl/console/ProcessorDevConsole.java
@@ -109,8 +109,13 @@ public class ProcessorDevConsole extends
AbstractDevConsole {
// sort processors by index
mps.sort(Comparator.comparingInt(ManagedProcessorMBean::getIndex));
+ includeProcessorsText(sb, max, counter, mps);
+ }
+
+ public static void includeProcessorsText(
+ StringBuilder sb, int max, AtomicInteger counter,
List<ManagedProcessorMBean> mps) {
for (ManagedProcessorMBean mp : mps) {
- if (counter.incrementAndGet() > max) {
+ if (counter != null && counter.incrementAndGet() > max) {
return;
}
sb.append("\n");
@@ -126,6 +131,7 @@ public class ProcessorDevConsole extends AbstractDevConsole
{
sb.append(String.format("\n Note: %s", mp.getNote()));
}
sb.append(String.format("\n Processor: %s",
mp.getProcessorName()));
+ sb.append(String.format("\n Step Id: %s", mp.getStepId()));
sb.append(String.format("\n Level: %d", mp.getLevel()));
if (mp.getSourceLocation() != null) {
String loc = mp.getSourceLocation();
@@ -212,10 +218,11 @@ public class ProcessorDevConsole extends
AbstractDevConsole {
mps.sort(Comparator.comparingInt(ManagedProcessorMBean::getIndex));
// include processors into the array
- includeProcessors(getCamelContext(), arr, max, mps);
+ includeProcessorsJSon(getCamelContext(), arr, max, mps);
}
- public static void includeProcessors(CamelContext camelContext, JsonArray
arr, int max, List<ManagedProcessorMBean> mps) {
+ public static void includeProcessorsJSon(
+ CamelContext camelContext, JsonArray arr, int max,
List<ManagedProcessorMBean> mps) {
for (int i = 0; i < mps.size(); i++) {
ManagedProcessorMBean mp = mps.get(i);
if (arr.size() > max) {
@@ -244,6 +251,7 @@ public class ProcessorDevConsole extends AbstractDevConsole
{
}
jo.put("state", mp.getState());
jo.put("disabled", mp.getDisabled());
+ jo.put("stepId", mp.getStepId());
// calculate end line number
ManagedProcessorMBean mp2 = i < mps.size() - 1 ? mps.get(i + 1) :
null;
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 537375f8f1d1..d81e4f237c4b 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
@@ -204,57 +204,7 @@ public class RouteDevConsole extends AbstractDevConsole {
// sort processors by index
mps.sort(Comparator.comparingInt(ManagedProcessorMBean::getIndex));
- 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()));
- }
- if (mp.getDescription() != null) {
- sb.append(String.format("\n Description: %s",
mp.getDescription()));
- }
- if (mp.getNote() != null) {
- sb.append(String.format("\n Note: %s", mp.getNote()));
- }
- sb.append(String.format("\n Processor: %s",
mp.getProcessorName()));
- sb.append(String.format("\n Level: %d", mp.getLevel()));
- if (mp.getSourceLocation() != null) {
- String loc = mp.getSourceLocation();
- if (mp.getSourceLineNumber() != null) {
- loc += ":" + mp.getSourceLineNumber();
- }
- sb.append(String.format("\n Source: %s", loc));
- }
- sb.append(String.format("\n State: %s", mp.getState()));
- sb.append(String.format("\n Disabled: %s",
mp.getDisabled()));
- sb.append(String.format("\n Total: %s",
mp.getExchangesTotal()));
- sb.append(String.format("\n Failed: %s",
mp.getExchangesFailed()));
- sb.append(String.format("\n Inflight: %s",
mp.getExchangesInflight()));
- long idle = mp.getIdleSince();
- if (idle > 0) {
- sb.append(String.format("\n Idle Since: %s",
TimeUtils.printDuration(idle)));
- } else {
- sb.append(String.format("\n Idle Since: %s", ""));
- }
- sb.append(String.format("\n Mean Time: %s",
TimeUtils.printDuration(mp.getMeanProcessingTime(), true)));
- sb.append(String.format("\n Max Time: %s",
TimeUtils.printDuration(mp.getMaxProcessingTime(), true)));
- sb.append(String.format("\n Min Time: %s",
TimeUtils.printDuration(mp.getMinProcessingTime(), true)));
- if (mp.getExchangesTotal() > 0) {
- sb.append(String.format("\n Last Time: %s",
TimeUtils.printDuration(mp.getLastProcessingTime(), true)));
- sb.append(
- String.format("\n Delta Time: %s",
TimeUtils.printDuration(mp.getDeltaProcessingTime(), true)));
- }
- Date last = mp.getLastExchangeCompletedTimestamp();
- if (last != null) {
- String ago = TimeUtils.printSince(last.getTime());
- sb.append(String.format("\n Since Last Completed: %s",
ago));
- }
- last = mp.getLastExchangeFailureTimestamp();
- if (last != null) {
- String ago = TimeUtils.printSince(last.getTime());
- sb.append(String.format("\n Since Last Failed: %s",
ago));
- }
- }
+ ProcessorDevConsole.includeProcessorsText(sb, 0, null, mps);
}
@Override
@@ -378,7 +328,7 @@ public class RouteDevConsole extends AbstractDevConsole {
.sorted(Comparator.comparingInt(ManagedProcessorMBean::getIndex))
.toList();
- ProcessorDevConsole.includeProcessors(getCamelContext(), arr,
Integer.MAX_VALUE, mps);
+ ProcessorDevConsole.includeProcessorsJSon(getCamelContext(), arr,
Integer.MAX_VALUE, mps);
}
protected void doCall(Map<String, Object> options,
Function<ManagedRouteMBean, Object> task) {
