Author: ningjiang
Date: Wed Mar 6 06:54:22 2013
New Revision: 1453173
URL: http://svn.apache.org/r1453173
Log:
CAMEL-6131 RouteDefinition.toString() should include the route Id
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/model/RouteDefinition.java
camel/trunk/camel-core/src/test/java/org/apache/camel/model/StartingRoutesErrorReportedTest.java
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/model/RouteDefinition.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/RouteDefinition.java?rev=1453173&r1=1453172&r2=1453173&view=diff
==============================================================================
---
camel/trunk/camel-core/src/main/java/org/apache/camel/model/RouteDefinition.java
(original)
+++
camel/trunk/camel-core/src/main/java/org/apache/camel/model/RouteDefinition.java
Wed Mar 6 06:54:22 2013
@@ -117,7 +117,11 @@ public class RouteDefinition extends Pro
@Override
public String toString() {
- return "Route[" + inputs + " -> " + outputs + "]";
+ if (getId() != null) {
+ return "Route(" + getId() + ")[" + inputs + " -> " + outputs + "]";
+ } else {
+ return "Route[" + inputs + " -> " + outputs + "]";
+ }
}
@Override
Modified:
camel/trunk/camel-core/src/test/java/org/apache/camel/model/StartingRoutesErrorReportedTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/model/StartingRoutesErrorReportedTest.java?rev=1453173&r1=1453172&r2=1453173&view=diff
==============================================================================
---
camel/trunk/camel-core/src/test/java/org/apache/camel/model/StartingRoutesErrorReportedTest.java
(original)
+++
camel/trunk/camel-core/src/test/java/org/apache/camel/model/StartingRoutesErrorReportedTest.java
Wed Mar 6 06:54:22 2013
@@ -36,7 +36,7 @@ public class StartingRoutesErrorReported
context.start();
fail();
} catch (FailedToCreateRouteException e) {
- assertTrue(e.getMessage().startsWith("Failed to create route
route1: Route[[From[direct:start?foo=bar]] -> [To[mock:result]]] because of"));
+ assertTrue(e.getMessage().startsWith("Failed to create route
route1: Route(route1)[[From[direct:start?foo=bar]] -> [To[mock:resul... because
of"));
}
}
@@ -52,7 +52,7 @@ public class StartingRoutesErrorReported
fail();
} catch (FailedToCreateRouteException e) {
assertTrue(e.getMessage().startsWith("Failed to create route
route2 at: >>> To[direct:result?foo=bar] <<< in route:"
- + " Route[[From[direct:start]] ->
[To[direct:result?foo=bar]]] because of"));
+ + " Route(route2)[[From[direct:start]] ->
[To[direct:result?foo=... because of"));
}
}
@@ -70,7 +70,7 @@ public class StartingRoutesErrorReported
fail("Should have thrown exception");
} catch (FailedToCreateRouteException e) {
assertTrue(e.getMessage().startsWith("Failed to create route
route3 at: >>> Bean[ref:] <<< in route:"
- + " Route[[From[direct:start]] -> [To[mock:foo],
Bean[ref:]]] because of"));
+ + " Route(route3)[[From[direct:start]] -> [To[mock:foo],
Bean[re... because of"));
}
}