[camel] branch master updated: [CAMEL-13468]Exception tag is missing when Camel Java DSL is converted into XML using dumpRouteAsXml() operation

[davsclaus]

This is an automated email from the ASF dual-hosted git repository.

davsclaus pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git


The following commit(s) were added to refs/heads/master by this push:
     new b5fddaa  [CAMEL-13468]Exception tag is missing when Camel Java DSL is 
converted into XML using dumpRouteAsXml() operation
b5fddaa is described below

commit b5fddaa27e28d143c98a70cf3b6de904218b9429
Author: Shailendra Kumar Singh <shailendra...@gmail.com>
AuthorDate: Mon Apr 29 22:41:42 2019 +0530

    [CAMEL-13468]Exception tag is missing when Camel Java DSL is converted into 
XML using dumpRouteAsXml() operation
---
 .../src/main/java/org/apache/camel/model/OnExceptionDefinition.java   | 1 +
 .../src/main/java/org/apache/camel/model/RoutesDefinition.java        | 1 +
 .../org/apache/camel/management/ManagedRouteDumpRouteAsXmlTest.java   | 4 ++++
 3 files changed, 6 insertions(+)

diff --git 
a/core/camel-core/src/main/java/org/apache/camel/model/OnExceptionDefinition.java
 
b/core/camel-core/src/main/java/org/apache/camel/model/OnExceptionDefinition.java
index 8a14940..3fe1830 100644
--- 
a/core/camel-core/src/main/java/org/apache/camel/model/OnExceptionDefinition.java
+++ 
b/core/camel-core/src/main/java/org/apache/camel/model/OnExceptionDefinition.java
@@ -178,6 +178,7 @@ public class OnExceptionDefinition extends 
ProcessorDefinition<OnExceptionDefini
     @Override
     public OnExceptionDefinition onException(Class<? extends Throwable> 
exceptionType) {
         getExceptionClasses().add(exceptionType);
+        getExceptions().add(exceptionType.getName());
         return this;
     }
 
diff --git 
a/core/camel-core/src/main/java/org/apache/camel/model/RoutesDefinition.java 
b/core/camel-core/src/main/java/org/apache/camel/model/RoutesDefinition.java
index 80f5e0b..05f38dd 100644
--- a/core/camel-core/src/main/java/org/apache/camel/model/RoutesDefinition.java
+++ b/core/camel-core/src/main/java/org/apache/camel/model/RoutesDefinition.java
@@ -249,6 +249,7 @@ public class RoutesDefinition extends 
OptionalIdentifiedDefinition<RoutesDefinit
     public OnExceptionDefinition onException(Class<? extends Throwable> 
exception) {
         OnExceptionDefinition answer = new OnExceptionDefinition(exception);
         answer.setRouteScoped(false);
+        answer.getExceptions().add(exception.getName());
         getOnExceptions().add(answer);
         return answer;
     }
diff --git 
a/core/camel-management-impl/src/test/java/org/apache/camel/management/ManagedRouteDumpRouteAsXmlTest.java
 
b/core/camel-management-impl/src/test/java/org/apache/camel/management/ManagedRouteDumpRouteAsXmlTest.java
index abbe330..858fbf6 100644
--- 
a/core/camel-management-impl/src/test/java/org/apache/camel/management/ManagedRouteDumpRouteAsXmlTest.java
+++ 
b/core/camel-management-impl/src/test/java/org/apache/camel/management/ManagedRouteDumpRouteAsXmlTest.java
@@ -58,6 +58,7 @@ public class ManagedRouteDumpRouteAsXmlTest extends 
ManagementTestSupport {
         assertTrue(xml.contains("myRoute"));
         assertTrue(xml.contains("ref:bar"));
         assertTrue(xml.contains("{{result}}"));
+        assertTrue(xml.contains("java.lang.Exception"));
     }
 
     @Test
@@ -89,6 +90,7 @@ public class ManagedRouteDumpRouteAsXmlTest extends 
ManagementTestSupport {
         assertTrue(xml.contains("myRoute"));
         assertTrue(xml.contains("ref:bar"));
         assertTrue(xml.contains("mock:result"));
+        assertTrue(xml.contains("java.lang.Exception"));
     }
 
     @Test
@@ -120,6 +122,7 @@ public class ManagedRouteDumpRouteAsXmlTest extends 
ManagementTestSupport {
         assertTrue(xml.contains("myRoute"));
         assertTrue(xml.contains("mock://bar"));
         assertTrue(xml.contains("mock:result"));
+        assertTrue(xml.contains("java.lang.Exception"));
     }
 
     static ObjectName getRouteObjectName(MBeanServer mbeanServer) throws 
Exception {
@@ -141,6 +144,7 @@ public class ManagedRouteDumpRouteAsXmlTest extends 
ManagementTestSupport {
                 Endpoint bar = context.getEndpoint("mock:bar");
                 bindToRegistry("bar", bar);
 
+                
onException(Exception.class).log("${exception.stacktrace}").logStackTrace(true).handled(true);
 
                 from("direct:start").routeId("myRoute")
                     .log("Got ${body}")