This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a commit to branch feature/CAMEL-23771-tui-dsl-format-tabs in repository https://gitbox.apache.org/repos/asf/camel.git
commit 5a3c4c3e54b7920e6626d9558e8dfea68edfdeab Author: Claus Ibsen <[email protected]> AuthorDate: Tue Jun 16 19:38:01 2026 +0200 CAMEL-23771: Java route dump should skip auto generated IDs Co-Authored-By: Claude <[email protected]> Signed-off-by: Claus Ibsen <[email protected]> --- .../java/org/apache/camel/impl/console/RouteDumpDevConsole.java | 4 ++-- .../camel/api/management/mbean/ManagedCamelContextMBean.java | 3 +++ .../org/apache/camel/api/management/mbean/ManagedRouteMBean.java | 3 +++ .../org/apache/camel/management/mbean/ManagedCamelContext.java | 7 ++++++- .../main/java/org/apache/camel/management/mbean/ManagedRoute.java | 8 +++++++- 5 files changed, 21 insertions(+), 4 deletions(-) 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 01db8c942baa..2580f03897c5 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 @@ -84,7 +84,7 @@ public class RouteDumpDevConsole extends AbstractDevConsole { } else if ("yaml".equals(format)) { dump = mrb.dumpRouteAsYaml(true, "true".equals(uriAsParameters)); } else if ("java".equals(format)) { - dump = mrb.dumpRouteAsJava(true); + dump = mrb.dumpRouteAsJava(true, false); } } catch (Exception e) { // ignore @@ -136,7 +136,7 @@ public class RouteDumpDevConsole extends AbstractDevConsole { dump = mrb.dumpRouteAsYaml(true, "true".equals(uriAsParameters), false, true); } else if ("java".equals(format)) { jo.put("format", "java"); - dump = mrb.dumpRouteAsJava(true); + dump = mrb.dumpRouteAsJava(true, false); } if (dump != null) { JsonArray code; diff --git a/core/camel-management-api/src/main/java/org/apache/camel/api/management/mbean/ManagedCamelContextMBean.java b/core/camel-management-api/src/main/java/org/apache/camel/api/management/mbean/ManagedCamelContextMBean.java index e396931362a0..d8936b269b57 100644 --- a/core/camel-management-api/src/main/java/org/apache/camel/api/management/mbean/ManagedCamelContextMBean.java +++ b/core/camel-management-api/src/main/java/org/apache/camel/api/management/mbean/ManagedCamelContextMBean.java @@ -263,6 +263,9 @@ public interface ManagedCamelContextMBean extends ManagedPerformanceCounterMBean @ManagedOperation(description = "Dumps the routes as Java DSL") String dumpRoutesAsJava(boolean resolvePlaceholders) throws Exception; + @ManagedOperation(description = "Dumps the routes as Java DSL") + String dumpRoutesAsJava(boolean resolvePlaceholders, boolean generatedIds) throws Exception; + /** * Creates the endpoint by the given uri * 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 0519b423ff8b..fa3f1abb3397 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 @@ -161,6 +161,9 @@ public interface ManagedRouteMBean extends ManagedPerformanceCounterMBean { @ManagedOperation(description = "Dumps the route as Java DSL") String dumpRouteAsJava(boolean resolvePlaceholders) throws Exception; + @ManagedOperation(description = "Dumps the route as Java DSL") + String dumpRouteAsJava(boolean resolvePlaceholders, boolean generatedIds) throws Exception; + @ManagedOperation(description = "Dumps the route stats as XML") String dumpRouteStatsAsXml(boolean fullStats, boolean includeProcessors) throws Exception; diff --git a/core/camel-management/src/main/java/org/apache/camel/management/mbean/ManagedCamelContext.java b/core/camel-management/src/main/java/org/apache/camel/management/mbean/ManagedCamelContext.java index 37e8ab2c38ad..49e7136a3161 100644 --- a/core/camel-management/src/main/java/org/apache/camel/management/mbean/ManagedCamelContext.java +++ b/core/camel-management/src/main/java/org/apache/camel/management/mbean/ManagedCamelContext.java @@ -642,6 +642,11 @@ public class ManagedCamelContext extends ManagedPerformanceCounter implements Ti @Override public String dumpRoutesAsJava(boolean resolvePlaceholders) throws Exception { + return dumpRoutesAsJava(resolvePlaceholders, true); + } + + @Override + public String dumpRoutesAsJava(boolean resolvePlaceholders, boolean generatedIds) throws Exception { List<RouteDefinition> routes = context.getCamelContextExtension().getContextPlugin(Model.class).getRouteDefinitions(); if (routes.isEmpty()) { return null; @@ -650,7 +655,7 @@ public class ManagedCamelContext extends ManagedPerformanceCounter implements Ti RoutesDefinition def = new RoutesDefinition(); def.setRoutes(routes); - return PluginHelper.getModelToJavaDumper(context).dumpModelAsJava(context, def, resolvePlaceholders, true); + return PluginHelper.getModelToJavaDumper(context).dumpModelAsJava(context, def, resolvePlaceholders, generatedIds); } @Override 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 deac037f2286..ff1ca3bd36a1 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 @@ -501,10 +501,16 @@ public class ManagedRoute extends ManagedPerformanceCounter implements TimerList @Override public String dumpRouteAsJava(boolean resolvePlaceholders) throws Exception { + return dumpRouteAsJava(resolvePlaceholders, true); + } + + @Override + public String dumpRouteAsJava(boolean resolvePlaceholders, boolean generatedIds) throws Exception { String id = route.getId(); RouteDefinition def = context.getCamelContextExtension().getContextPlugin(Model.class).getRouteDefinition(id); if (def != null) { - return PluginHelper.getModelToJavaDumper(context).dumpModelAsJava(context, def, resolvePlaceholders, true); + return PluginHelper.getModelToJavaDumper(context).dumpModelAsJava(context, def, resolvePlaceholders, + generatedIds); } return null;
