This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a commit to branch filter-kamelet2 in repository https://gitbox.apache.org/repos/asf/camel.git
commit f23c0ec9e00a5f17ff41b1bcd10f2135470fa76c Author: Claus Ibsen <claus.ib...@gmail.com> AuthorDate: Sat Feb 24 11:29:22 2024 +0100 CAMEL-18858: camel-core - Mark route as created by Kamelet so we know this, so we can filter out in tooling and whereelse (kamelet is a blackbox) --- .../main/java/org/apache/camel/impl/console/ConsumerDevConsole.java | 2 +- .../src/main/java/org/apache/camel/impl/console/RouteDevConsole.java | 5 +++-- .../main/java/org/apache/camel/impl/console/RouteDumpDevConsole.java | 2 ++ .../main/java/org/apache/camel/impl/console/SourceDevConsole.java | 2 ++ .../src/main/java/org/apache/camel/impl/console/TopDevConsole.java | 3 +++ 5 files changed, 11 insertions(+), 3 deletions(-) diff --git a/core/camel-console/src/main/java/org/apache/camel/impl/console/ConsumerDevConsole.java b/core/camel-console/src/main/java/org/apache/camel/impl/console/ConsumerDevConsole.java index 3341c80c43d..a75ea58d2fb 100644 --- a/core/camel-console/src/main/java/org/apache/camel/impl/console/ConsumerDevConsole.java +++ b/core/camel-console/src/main/java/org/apache/camel/impl/console/ConsumerDevConsole.java @@ -139,7 +139,7 @@ public class ConsumerDevConsole extends AbstractDevConsole { String id = route.getId(); ManagedRouteMBean mr = mcc.getManagedRoute(id); ManagedConsumerMBean mc = mcc.getManagedConsumer(id); - if (mc != null) { + if (mr != null && mc != null) { JsonObject jo = new JsonObject(); Integer inflight = mc.getInflightExchanges(); if (inflight == 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 e060fb93607..1e6ee27a284 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 @@ -22,6 +22,7 @@ import java.util.Comparator; import java.util.Date; import java.util.List; import java.util.Map; +import java.util.Objects; import java.util.function.Function; import org.apache.camel.Exchange; @@ -359,6 +360,7 @@ public class RouteDevConsole extends AbstractDevConsole { routes.sort((o1, o2) -> o1.getRouteId().compareToIgnoreCase(o2.getRouteId())); routes.stream() .map(route -> mcc.getManagedRoute(route.getRouteId())) + .filter(Objects::nonNull) .filter(r -> accept(r, filter)) .filter(r -> accept(r, subPath)) .sorted(RouteDevConsole::sort) @@ -378,8 +380,7 @@ public class RouteDevConsole extends AbstractDevConsole { } private static int sort(ManagedRouteMBean o1, ManagedRouteMBean o2) { - // sort by id - return o1.getRouteId().compareTo(o2.getRouteId()); + return o1.getRouteId().compareToIgnoreCase(o2.getRouteId()); } private String getLoad1(ManagedRouteMBean mrb) { diff --git a/core/camel-console/src/main/java/org/apache/camel/impl/console/RouteDumpDevConsole.java b/core/camel-console/src/main/java/org/apache/camel/impl/console/RouteDumpDevConsole.java index 659f388c439..63c127b0d82 100644 --- a/core/camel-console/src/main/java/org/apache/camel/impl/console/RouteDumpDevConsole.java +++ b/core/camel-console/src/main/java/org/apache/camel/impl/console/RouteDumpDevConsole.java @@ -20,6 +20,7 @@ import java.io.StringReader; import java.util.ArrayList; import java.util.List; import java.util.Map; +import java.util.Objects; import java.util.function.Function; import org.apache.camel.Exchange; @@ -151,6 +152,7 @@ public class RouteDumpDevConsole extends AbstractDevConsole { routes.sort((o1, o2) -> o1.getRouteId().compareToIgnoreCase(o2.getRouteId())); routes.stream() .map(route -> mcc.getManagedRoute(route.getRouteId())) + .filter(Objects::nonNull) .filter(r -> accept(r, filter)) .filter(r -> accept(r, subPath)) .sorted(RouteDumpDevConsole::sort) diff --git a/core/camel-console/src/main/java/org/apache/camel/impl/console/SourceDevConsole.java b/core/camel-console/src/main/java/org/apache/camel/impl/console/SourceDevConsole.java index ea96a307af6..c848030b181 100644 --- a/core/camel-console/src/main/java/org/apache/camel/impl/console/SourceDevConsole.java +++ b/core/camel-console/src/main/java/org/apache/camel/impl/console/SourceDevConsole.java @@ -20,6 +20,7 @@ import java.io.LineNumberReader; import java.util.ArrayList; import java.util.List; import java.util.Map; +import java.util.Objects; import java.util.function.Function; import org.apache.camel.Exchange; @@ -138,6 +139,7 @@ public class SourceDevConsole extends AbstractDevConsole { routes.sort((o1, o2) -> o1.getRouteId().compareToIgnoreCase(o2.getRouteId())); routes.stream() .map(route -> mcc.getManagedRoute(route.getRouteId())) + .filter(Objects::nonNull) .filter(r -> accept(r, filter)) .filter(r -> accept(r, subPath)) .sorted(SourceDevConsole::sort) diff --git a/core/camel-console/src/main/java/org/apache/camel/impl/console/TopDevConsole.java b/core/camel-console/src/main/java/org/apache/camel/impl/console/TopDevConsole.java index 995c25a952a..54358b71059 100644 --- a/core/camel-console/src/main/java/org/apache/camel/impl/console/TopDevConsole.java +++ b/core/camel-console/src/main/java/org/apache/camel/impl/console/TopDevConsole.java @@ -21,6 +21,7 @@ import java.util.ArrayList; import java.util.Collection; import java.util.List; import java.util.Map; +import java.util.Objects; import java.util.function.Function; import org.apache.camel.Exchange; @@ -270,6 +271,7 @@ public class TopDevConsole extends AbstractDevConsole { List<Route> routes = getCamelContext().getRoutes(); routes.stream() .map(route -> mcc.getManagedRoute(route.getRouteId())) + .filter(Objects::nonNull) .filter(r -> acceptRoute(r, filter)) .sorted(TopDevConsole::top) .limit(max) @@ -284,6 +286,7 @@ public class TopDevConsole extends AbstractDevConsole { routes.stream() .map(route -> mcc.getManagedRoute(route.getRouteId())) + .filter(Objects::nonNull) .filter(r -> acceptRoute(r, subPath)) .forEach(r -> { try {