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 6e7c2dd7f2f3 CAMEL-23771: Java route dump should skip auto generated
IDs (#24058)
6e7c2dd7f2f3 is described below
commit 6e7c2dd7f2f35c16c819d24a44d0d2a79e77d3ee
Author: Claus Ibsen <[email protected]>
AuthorDate: Tue Jun 16 20:35:39 2026 +0200
CAMEL-23771: Java route dump should skip auto generated IDs (#24058)
* CAMEL-23771: Java route dump should skip auto generated IDs
Co-Authored-By: Claude <[email protected]>
Signed-off-by: Claus Ibsen <[email protected]>
* CAMEL-23763: Fix tests after rest/template/kamelet made @XmlTransient
The rest attribute on RouteDefinition was made @XmlTransient in
commit 517829d57c63, but these two tests still asserted its presence
in XML dump output.
Signed-off-by: Claus Ibsen <[email protected]>
Co-Authored-By: Claude <[email protected]>
Signed-off-by: Claus Ibsen <[email protected]>
---------
Signed-off-by: Claus Ibsen <[email protected]>
Co-authored-by: Claude <[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 +++++++-
.../java/org/apache/camel/management/ManagedFromRestGetTest.java | 4 ++--
.../apache/camel/management/ManagedFromRestPlaceholderTest.java | 5 +++--
7 files changed, 26 insertions(+), 8 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;
diff --git
a/core/camel-management/src/test/java/org/apache/camel/management/ManagedFromRestGetTest.java
b/core/camel-management/src/test/java/org/apache/camel/management/ManagedFromRestGetTest.java
index 58e43893f3a0..9797ba8904f8 100644
---
a/core/camel-management/src/test/java/org/apache/camel/management/ManagedFromRestGetTest.java
+++
b/core/camel-management/src/test/java/org/apache/camel/management/ManagedFromRestGetTest.java
@@ -76,8 +76,8 @@ public class ManagedFromRestGetTest extends
ManagementTestSupport {
String xml2 = (String) mbeanServer.invoke(on, "dumpRoutesAsXml", null,
null);
log.info(xml2);
- // and we should have rest in the routes that indicate its from a rest
dsl
- assertTrue(xml2.contains("rest=\"true\""));
+ // rest/template/kamelet are @XmlTransient so not in XML dump
+ assertFalse(xml2.contains("rest=\"true\""));
// routes are inlined
assertFalse(xml2.matches("[\\S\\s]* <to id=\"to[0-9]+\"
uri=\"direct:hello\"/>[\\S\\s]*"));
diff --git
a/core/camel-management/src/test/java/org/apache/camel/management/ManagedFromRestPlaceholderTest.java
b/core/camel-management/src/test/java/org/apache/camel/management/ManagedFromRestPlaceholderTest.java
index 54642a91ae24..02bc075cb3dc 100644
---
a/core/camel-management/src/test/java/org/apache/camel/management/ManagedFromRestPlaceholderTest.java
+++
b/core/camel-management/src/test/java/org/apache/camel/management/ManagedFromRestPlaceholderTest.java
@@ -31,6 +31,7 @@ import org.junit.jupiter.api.condition.DisabledOnOs;
import org.junit.jupiter.api.condition.OS;
import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertTrue;
@@ -76,8 +77,8 @@ public class ManagedFromRestPlaceholderTest extends
ManagementTestSupport {
String xml2 = (String) mbeanServer.invoke(on, "dumpRoutesAsXml", null,
null);
log.info(xml2);
- // and we should have rest in the routes that indicate its from a rest
dsl
- assertTrue(xml2.contains("rest=\"true\""));
+ // rest/template/kamelet are @XmlTransient so not in XML dump
+ assertFalse(xml2.contains("rest=\"true\""));
// there should be 3 routes (inlined)
assertEquals(3, context.getRouteDefinitions().size());
