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
commit 420d6361243838d04d7c48e92be417c8a74c538f Author: Claus Ibsen <[email protected]> AuthorDate: Wed Aug 21 16:16:10 2024 +0200 CAMEL-21099: Fix filter in some dev consoles. --- .../main/java/org/apache/camel/impl/console/RouteDevConsole.java | 5 ++++- .../java/org/apache/camel/impl/console/RouteDumpDevConsole.java | 5 ++++- .../main/java/org/apache/camel/impl/console/SourceDevConsole.java | 4 +++- .../main/java/org/apache/camel/impl/console/TopDevConsole.java | 4 +++- .../src/main/java/org/apache/camel/support/LoggerHelper.java | 8 ++++++++ 5 files changed, 22 insertions(+), 4 deletions(-) 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 01358928afd..57df94a720f 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 @@ -35,6 +35,7 @@ import org.apache.camel.api.management.ManagedCamelContext; import org.apache.camel.api.management.mbean.ManagedProcessorMBean; import org.apache.camel.api.management.mbean.ManagedRouteMBean; import org.apache.camel.spi.annotations.DevConsole; +import org.apache.camel.support.LoggerHelper; import org.apache.camel.support.PatternHelper; import org.apache.camel.support.console.AbstractDevConsole; import org.apache.camel.util.StringHelper; @@ -439,9 +440,11 @@ public class RouteDevConsole extends AbstractDevConsole { return true; } + String onlyName = LoggerHelper.sourceNameOnly(mrb.getSourceLocation()); return PatternHelper.matchPattern(mrb.getRouteId(), filter) || PatternHelper.matchPattern(mrb.getEndpointUri(), filter) - || PatternHelper.matchPattern(mrb.getSourceLocationShort(), filter); + || PatternHelper.matchPattern(mrb.getSourceLocationShort(), filter) + || PatternHelper.matchPattern(onlyName, filter); } private static int sort(ManagedRouteMBean o1, ManagedRouteMBean o2) { 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 65b46aeb838..aacea236c85 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 @@ -28,6 +28,7 @@ import org.apache.camel.Route; import org.apache.camel.api.management.ManagedCamelContext; import org.apache.camel.api.management.mbean.ManagedRouteMBean; import org.apache.camel.spi.annotations.DevConsole; +import org.apache.camel.support.LoggerHelper; import org.apache.camel.support.PatternHelper; import org.apache.camel.support.console.AbstractDevConsole; import org.apache.camel.util.StringHelper; @@ -166,9 +167,11 @@ public class RouteDumpDevConsole extends AbstractDevConsole { return true; } + String onlyName = LoggerHelper.sourceNameOnly(mrb.getSourceLocation()); return PatternHelper.matchPattern(mrb.getRouteId(), filter) || PatternHelper.matchPattern(mrb.getEndpointUri(), filter) - || PatternHelper.matchPattern(mrb.getSourceLocationShort(), filter); + || PatternHelper.matchPattern(mrb.getSourceLocationShort(), filter) + || PatternHelper.matchPattern(onlyName, filter); } private static int sort(ManagedRouteMBean o1, ManagedRouteMBean o2) { 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 82c7f57fbee..e0b17232700 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 @@ -155,9 +155,11 @@ public class SourceDevConsole extends AbstractDevConsole { return true; } + String onlyName = LoggerHelper.sourceNameOnly(mrb.getSourceLocation()); return PatternHelper.matchPattern(mrb.getRouteId(), filter) || PatternHelper.matchPattern(mrb.getEndpointUri(), filter) - || PatternHelper.matchPattern(mrb.getSourceLocationShort(), filter); + || PatternHelper.matchPattern(mrb.getSourceLocationShort(), filter) + || PatternHelper.matchPattern(onlyName, filter); } private static int sort(ManagedRouteMBean o1, ManagedRouteMBean o2) { 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 6bf8d32d321..82be71ac99f 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 @@ -319,9 +319,11 @@ public class TopDevConsole extends AbstractDevConsole { return true; } + String onlyName = LoggerHelper.sourceNameOnly(mrb.getSourceLocation()); return PatternHelper.matchPattern(mrb.getRouteId(), filter) || PatternHelper.matchPattern(mrb.getEndpointUri(), filter) - || PatternHelper.matchPattern(mrb.getSourceLocationShort(), filter); + || PatternHelper.matchPattern(mrb.getSourceLocationShort(), filter) + || PatternHelper.matchPattern(onlyName, filter); } private static boolean acceptProcessor(ManagedProcessorMBean mpb, String filter) { diff --git a/core/camel-support/src/main/java/org/apache/camel/support/LoggerHelper.java b/core/camel-support/src/main/java/org/apache/camel/support/LoggerHelper.java index a871604bdc7..b0495908de6 100644 --- a/core/camel-support/src/main/java/org/apache/camel/support/LoggerHelper.java +++ b/core/camel-support/src/main/java/org/apache/camel/support/LoggerHelper.java @@ -99,6 +99,14 @@ public final class LoggerHelper { } } + public static String stripScheme(String location) { + return StringHelper.after(location, ":", location); + } + + public static String sourceNameOnly(String location) { + return stripScheme(stripSourceLocationLineNumber(location)); + } + public static Integer extractSourceLocationLineNumber(String location) { int cnt = StringHelper.countChar(location, ':'); if (cnt > 1) {
