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/28 16:57:41 UTC
[5/6] camel git commit: CAMEL-8564: Add support for dataformat ref
param
CAMEL-8564: Add support for dataformat ref param
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/85168205
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/85168205
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/85168205
Branch: refs/heads/camel-2.15.x
Commit: 8516820581e776ef62c0f8865da3934e1759ce17
Parents: f4b6fbd
Author: Ramon Marco L. Navarro <ra...@gmail.com>
Authored: Sat Mar 28 23:28:46 2015 +0800
Committer: Claus Ibsen <da...@apache.org>
Committed: Sat Mar 28 16:59:45 2015 +0100
----------------------------------------------------------------------
.../src/main/scala/org/apache/camel/scala/dsl/DSL.scala | 2 ++
.../scala/org/apache/camel/scala/dsl/SAbstractDefinition.scala | 2 ++
.../scala/org/apache/camel/scala/dsl/builder/RouteBuilder.scala | 2 ++
3 files changed, 6 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/85168205/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 7ee6a8d..3690c39 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
@@ -62,6 +62,7 @@ trait DSL {
def loop(expression: Exchange => Any) : SLoopDefinition
def marshal(format : DataFormatDefinition) : DSL
+ def marshal(dataFormatRef: String) : DSL
def multicast : SMulticastDefinition
def onCompletion : SOnCompletionDefinition
@@ -104,6 +105,7 @@ trait DSL {
def transform(expression: Exchange => Any) : DSL
def unmarshal(format: DataFormatDefinition) : DSL
+ def unmarshal(dataFormatRef: String) : DSL
def validate(expression: Exchange => Any) : DSL
http://git-wip-us.apache.org/repos/asf/camel/blob/85168205/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 6c51449..c4b5f8b 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
@@ -92,6 +92,7 @@ abstract class SAbstractDefinition[P <: ProcessorDefinition[_]] extends DSL with
def loop(expression: Exchange => Any) = SLoopDefinition(target.loop(expression))
def marshal(format: DataFormatDefinition) = wrap(target.marshal(format))
+ def marshal(dataFormatRef: String) = wrap(target.marshal(dataFormatRef))
def multicast = SMulticastDefinition(target.multicast)
def onCompletion: SOnCompletionDefinition = {
@@ -152,6 +153,7 @@ abstract class SAbstractDefinition[P <: ProcessorDefinition[_]] extends DSL with
def transform(expression: Exchange => Any) = wrap(target.transform(expression))
def unmarshal(format: DataFormatDefinition) = wrap(target.unmarshal(format))
+ def unmarshal(dataFormatRef: String) = wrap(target.unmarshal(dataFormatRef))
def validate(expression: Exchange => Any) = wrap(target.validate(predicateBuilder(expression)))
http://git-wip-us.apache.org/repos/asf/camel/blob/85168205/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 5b746f5..1734c8e 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
@@ -153,6 +153,7 @@ class RouteBuilder extends Preamble with DSL with RoutesBuilder with Languages w
def loop(expression: Exchange => Any) = stack.top.loop(expression)
def marshal(format: DataFormatDefinition) = stack.top.marshal(format)
+ def marshal(dataFormatRef: String) = stack.top.marshal(dataFormatRef)
def multicast = stack.top.multicast
def onCompletion = {
@@ -199,6 +200,7 @@ class RouteBuilder extends Preamble with DSL with RoutesBuilder with Languages w
def transform(expression: Exchange => Any) = stack.top.transform(expression)
def unmarshal(format: DataFormatDefinition) = stack.top.unmarshal(format)
+ def unmarshal(dataFormatRef: String) = stack.top.unmarshal(dataFormatRef)
def validate(expression: (Exchange) => Any) = stack.top.validate(expression)