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 e789cef62ae2aded44c434ae2003575a3f50e8ca Author: Claus Ibsen <[email protected]> AuthorDate: Mon Nov 27 12:30:48 2023 +0100 CAMEL-20155: camel-core - Add nodePrefixId to mbean. Polish route dev console. --- core/camel-api/src/main/java/org/apache/camel/Route.java | 6 ++++++ .../main/java/org/apache/camel/impl/engine/DefaultRoute.java | 5 +++++ .../java/org/apache/camel/impl/console/RouteDevConsole.java | 11 +++++++++-- .../src/main/java/org/apache/camel/reifier/RouteReifier.java | 5 ++++- .../apache/camel/api/management/mbean/ManagedRouteMBean.java | 3 +++ .../java/org/apache/camel/management/mbean/ManagedRoute.java | 5 +++++ 6 files changed, 32 insertions(+), 3 deletions(-) diff --git a/core/camel-api/src/main/java/org/apache/camel/Route.java b/core/camel-api/src/main/java/org/apache/camel/Route.java index 2491513ac7e..a7d0f0cd054 100644 --- a/core/camel-api/src/main/java/org/apache/camel/Route.java +++ b/core/camel-api/src/main/java/org/apache/camel/Route.java @@ -44,6 +44,7 @@ public interface Route extends RuntimeConfiguration { String CUSTOM_ID_PROPERTY = "customId"; String PARENT_PROPERTY = "parent"; String GROUP_PROPERTY = "group"; + String NODE_PREFIX_ID_PROPERTY = "nodePrefixId"; String REST_PROPERTY = "rest"; String TEMPLATE_PROPERTY = "template"; String DESCRIPTION_PROPERTY = "description"; @@ -57,6 +58,11 @@ public interface Route extends RuntimeConfiguration { */ String getId(); + /** + * Gets the node prefix id + */ + String getNodePrefixId(); + /** * Whether the route id is custom assigned or auto assigned * diff --git a/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultRoute.java b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultRoute.java index 216577726d4..d8ace10e795 100644 --- a/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultRoute.java +++ b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultRoute.java @@ -130,6 +130,11 @@ public class DefaultRoute extends ServiceSupport implements Route { return routeId; } + @Override + public String getNodePrefixId() { + return (String) properties.get(Route.NODE_PREFIX_ID_PROPERTY); + } + @Override public boolean isCustomId() { return "true".equals(properties.get(Route.CUSTOM_ID_PROPERTY)); 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 31f2607b583..d1072f32285 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 @@ -69,6 +69,9 @@ public class RouteDevConsole extends AbstractDevConsole { sb.append("\n"); } sb.append(String.format(" Id: %s", mrb.getRouteId())); + if (mrb.getNodePrefixId() != null) { + sb.append(String.format(" Node Prefix Id: %s", mrb.getNodePrefixId())); + } sb.append(String.format("\n From: %s", mrb.getEndpointUri())); if (mrb.getSourceLocation() != null) { sb.append(String.format("\n Source: %s", mrb.getSourceLocation())); @@ -164,8 +167,9 @@ public class RouteDevConsole extends AbstractDevConsole { 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))); + 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) { @@ -189,6 +193,9 @@ public class RouteDevConsole extends AbstractDevConsole { JsonObject jo = new JsonObject(); list.add(jo); jo.put("routeId", mrb.getRouteId()); + if (mrb.getNodePrefixId() != null) { + jo.put("nodePrefixId", mrb.getNodePrefixId()); + } jo.put("from", mrb.getEndpointUri()); if (mrb.getSourceLocation() != null) { jo.put("source", mrb.getSourceLocation()); diff --git a/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/RouteReifier.java b/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/RouteReifier.java index cea8c7e5df2..ae12fef7187 100644 --- a/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/RouteReifier.java +++ b/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/RouteReifier.java @@ -59,7 +59,7 @@ public class RouteReifier extends ProcessorReifier<RouteDefinition> { private static final String[] RESERVED_PROPERTIES = new String[] { Route.ID_PROPERTY, Route.CUSTOM_ID_PROPERTY, Route.PARENT_PROPERTY, - Route.DESCRIPTION_PROPERTY, Route.GROUP_PROPERTY, + Route.DESCRIPTION_PROPERTY, Route.GROUP_PROPERTY, Route.NODE_PREFIX_ID_PROPERTY, Route.REST_PROPERTY, Route.CONFIGURATION_ID_PROPERTY }; public RouteReifier(CamelContext camelContext, ProcessorDefinition<?> definition) { @@ -372,6 +372,9 @@ public class RouteReifier extends ProcessorReifier<RouteDefinition> { if (definition.getGroup() != null) { routeProperties.put(Route.GROUP_PROPERTY, definition.getGroup()); } + if (definition.getNodePrefixId() != null) { + routeProperties.put(Route.NODE_PREFIX_ID_PROPERTY, definition.getNodePrefixId()); + } String rest = Boolean.toString(definition.isRest() != null && definition.isRest()); routeProperties.put(Route.REST_PROPERTY, rest); String template = Boolean.toString(definition.isTemplate() != null && definition.isTemplate()); diff --git a/core/camel-management-api/src/main/java/org/apache/camel/api/management/mbean/ManagedRouteMBean.java b/core/camel-management-api/src/main/java/org/apache/camel/api/management/mbean/ManagedRouteMBean.java index 1ea2d61ca74..9687add7998 100644 --- a/core/camel-management-api/src/main/java/org/apache/camel/api/management/mbean/ManagedRouteMBean.java +++ b/core/camel-management-api/src/main/java/org/apache/camel/api/management/mbean/ManagedRouteMBean.java @@ -28,6 +28,9 @@ public interface ManagedRouteMBean extends ManagedPerformanceCounterMBean { @ManagedAttribute(description = "Route ID") String getRouteId(); + @ManagedAttribute(description = "Node Prefix ID") + String getNodePrefixId(); + @ManagedAttribute(description = "Route Group") String getRouteGroup(); diff --git a/core/camel-management/src/main/java/org/apache/camel/management/mbean/ManagedRoute.java b/core/camel-management/src/main/java/org/apache/camel/management/mbean/ManagedRoute.java index 301739c0df4..d3c559e5198 100644 --- a/core/camel-management/src/main/java/org/apache/camel/management/mbean/ManagedRoute.java +++ b/core/camel-management/src/main/java/org/apache/camel/management/mbean/ManagedRoute.java @@ -115,6 +115,11 @@ public class ManagedRoute extends ManagedPerformanceCounter implements TimerList return id; } + @Override + public String getNodePrefixId() { + return route.getNodePrefixId(); + } + @Override public String getRouteGroup() { return route.getGroup();
