You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2015/03/06 10:34:03 UTC
camel git commit: CAMEL-8443: Added routeDescription to java dsl to
make it easier to set it. And use that for route description over JMX.
Repository: camel
Updated Branches:
refs/heads/master 4a0dfd0b6 -> 18dffc32d
CAMEL-8443: Added routeDescription to java dsl to make it easier to set it. And use that for route description over JMX.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/18dffc32
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/18dffc32
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/18dffc32
Branch: refs/heads/master
Commit: 18dffc32deb4b9db331e32d132734bc784f4d783
Parents: 4a0dfd0
Author: Claus Ibsen <da...@apache.org>
Authored: Fri Mar 6 10:35:22 2015 +0100
Committer: Claus Ibsen <da...@apache.org>
Committed: Fri Mar 6 10:35:22 2015 +0100
----------------------------------------------------------------------
.../src/main/scala/org/apache/camel/scala/dsl/DSL.scala | 1 +
.../scala/org/apache/camel/scala/dsl/SAbstractDefinition.scala | 1 +
.../scala/org/apache/camel/scala/dsl/builder/RouteBuilder.scala | 1 +
.../src/test/scala/org/apache/camel/scala/dsl/RouteIdTest.scala | 3 ++-
4 files changed, 5 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/18dffc32/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/DSL.scala
----------------------------------------------------------------------
diff --git a/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/DSL.scala b/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/DSL.scala
index 9900246..7ee6a8d 100644
--- a/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/DSL.scala
+++ b/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/DSL.scala
@@ -80,6 +80,7 @@ trait DSL {
def resequence(expression: Exchange => Any) : SResequenceDefinition
def rollback : DSL
def routeId(id: String) : DSL
+ def routeDescription(description: String): DSL
def routingSlip(header: String) : DSL
def routingSlip(header: String, separator: String) : DSL
def routingSlip(expression: Exchange => Any) : DSL
http://git-wip-us.apache.org/repos/asf/camel/blob/18dffc32/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SAbstractDefinition.scala
----------------------------------------------------------------------
diff --git a/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SAbstractDefinition.scala b/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SAbstractDefinition.scala
index 95c26e4..6c51449 100644
--- a/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SAbstractDefinition.scala
+++ b/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SAbstractDefinition.scala
@@ -126,6 +126,7 @@ abstract class SAbstractDefinition[P <: ProcessorDefinition[_]] extends DSL with
def removeProperties(pattern: String, excludePatterns: String*) = wrap(target.removeProperties(pattern, excludePatterns:_*))
def rollback = wrap(target.rollback)
def routeId(routeId: String) = wrap(target.routeId(routeId))
+ def routeDescription(description: String) = wrap(target.routeDescription(description))
@Deprecated
def routingSlip(header: String) = wrap(target.routingSlip(header))
@Deprecated
http://git-wip-us.apache.org/repos/asf/camel/blob/18dffc32/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/builder/RouteBuilder.scala
----------------------------------------------------------------------
diff --git a/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/builder/RouteBuilder.scala b/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/builder/RouteBuilder.scala
index 1c58e78..5b746f5 100644
--- a/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/builder/RouteBuilder.scala
+++ b/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/builder/RouteBuilder.scala
@@ -176,6 +176,7 @@ class RouteBuilder extends Preamble with DSL with RoutesBuilder with Languages w
def resequence(expression: Exchange => Any) = stack.top.resequence(expression)
def rollback = stack.top.rollback
def routeId(id: String) = stack.top.routeId(id)
+ def routeDescription(description: String) = stack.top.routeDescription(description)
def routingSlip(header: String) = stack.top.routingSlip(header)
def routingSlip(header: String, separator: String) = stack.top.routingSlip(header, separator)
def routingSlip(expression: Exchange => Any) = stack.top.routingSlip(expression)
http://git-wip-us.apache.org/repos/asf/camel/blob/18dffc32/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/RouteIdTest.scala
----------------------------------------------------------------------
diff --git a/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/RouteIdTest.scala b/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/RouteIdTest.scala
index 87de3bd..f0164f8 100644
--- a/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/RouteIdTest.scala
+++ b/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/RouteIdTest.scala
@@ -34,6 +34,7 @@ class RouteIdTest extends ScalaTestSupport {
assertMockEndpointsSatisfied()
assertEquals("route-a", context.getRouteDefinitions.get(0).getId)
+ assertEquals("This is the a route", context.getRouteDefinitions.get(0).getDescriptionText)
}
@Test
@@ -52,7 +53,7 @@ class RouteIdTest extends ScalaTestSupport {
val builder = new RouteBuilder {
// java DSL
- from("direct:a").routeId("route-a").to("mock:a")
+ from("direct:a") routeId "route-a" routeDescription "This is the a route" to "mock:a"
// scala DSL
"direct:b" routeId "route-b" to "mock:b"