Author: davsclaus
Date: Sat Jan 5 13:30:14 2013
New Revision: 1429280
URL: http://svn.apache.org/viewvc?rev=1429280&view=rev
Log:
CAMEL-5872: Added convertBodyTo to scala DSL to make it aligned with the other
DSLs
Added:
camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/ConvertBodyToAsTest.scala
camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/ConvertBodyToTest.scala
- copied, changed from r1429271,
camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/SplitterTokenizeTest.scala
Modified:
camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/DSL.scala
camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SAbstractDefinition.scala
camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/builder/RouteBuilder.scala
Modified:
camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/DSL.scala
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/DSL.scala?rev=1429280&r1=1429279&r2=1429280&view=diff
==============================================================================
---
camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/DSL.scala
(original)
+++
camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/DSL.scala
Sat Jan 5 13:30:14 2013
@@ -37,6 +37,7 @@ trait DSL {
def bean(bean: Any) : DSL
def choice : SChoiceDefinition
+ def convertBodyTo[Target](toType: Class[Target]) : DSL
def delay(delay: Period) : SDelayDefinition
def dynamicRouter(expression: Exchange => Any) : DSL
Modified:
camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SAbstractDefinition.scala
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SAbstractDefinition.scala?rev=1429280&r1=1429279&r2=1429280&view=diff
==============================================================================
---
camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SAbstractDefinition.scala
(original)
+++
camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SAbstractDefinition.scala
Sat Jan 5 13:30:14 2013
@@ -65,6 +65,7 @@ abstract class SAbstractDefinition[P <:
}
def choice = SChoiceDefinition(target.choice)
+ def convertBodyTo[Target](toType: Class[Target]) =
wrap(target.convertBodyTo(toType))
def delay(period: Period) =
SDelayDefinition(target.delay(period.milliseconds))
def dynamicRouter(expression: Exchange => Any) =
wrap(target.dynamicRouter(expression))
Modified:
camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/builder/RouteBuilder.scala
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/builder/RouteBuilder.scala?rev=1429280&r1=1429279&r2=1429280&view=diff
==============================================================================
---
camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/builder/RouteBuilder.scala
(original)
+++
camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/builder/RouteBuilder.scala
Sat Jan 5 13:30:14 2013
@@ -103,6 +103,7 @@ class RouteBuilder extends Preamble with
def bean(bean: Any) = stack.top.bean(bean)
+ def convertBodyTo[Target](toType: Class[Target]) =
stack.top.convertBodyTo(toType)
def choice = stack.top.choice
def delay(delay: Period) = stack.top.delay(delay)
Added:
camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/ConvertBodyToAsTest.scala
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/ConvertBodyToAsTest.scala?rev=1429280&view=auto
==============================================================================
---
camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/ConvertBodyToAsTest.scala
(added)
+++
camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/ConvertBodyToAsTest.scala
Sat Jan 5 13:30:14 2013
@@ -0,0 +1,37 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.scala.dsl
+
+import builder.RouteBuilder
+import org.junit.Test
+
+/**
+ * Test case for convert body to
+ */
+class ConvertBodyToAsTest extends ConvertBodyToTest {
+
+ override val builder =
+ new RouteBuilder {
+ "direct:b" ==> {
+ // we can use as as shorthand for convertBodyTo
+ as(classOf[java.lang.Integer])
+ to("log:b")
+ to("mock:b")
+ }
+ }
+
+}
Copied:
camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/ConvertBodyToTest.scala
(from r1429271,
camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/SplitterTokenizeTest.scala)
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/ConvertBodyToTest.scala?p2=camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/ConvertBodyToTest.scala&p1=camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/SplitterTokenizeTest.scala&r1=1429271&r2=1429280&rev=1429280&view=diff
==============================================================================
---
camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/SplitterTokenizeTest.scala
(original)
+++
camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/ConvertBodyToTest.scala
Sat Jan 5 13:30:14 2013
@@ -20,17 +20,18 @@ import builder.RouteBuilder
import org.junit.Test
/**
- * Test case for Splitter
+ * Test case for convert body to
*/
-class SplitterTokenizeTest extends ScalaTestSupport {
+class ConvertBodyToTest extends ScalaTestSupport {
@Test
- def testSplitterTokenize() = {
+ def testConvertBody() = {
val mock = getMockEndpoint("mock:b")
- mock.expectedBodiesReceived("Claus", "James", "Willem")
+ mock.expectedMessageCount(1);
+ mock.message(0).body().isInstanceOf(classOf[java.lang.Integer]);
- val data: String = "Claus,James,Willem"
- template.sendBody("direct:b", data)
+ // send a string
+ template.sendBody("direct:b", "74")
assertMockEndpointsSatisfied()
}
@@ -39,10 +40,9 @@ class SplitterTokenizeTest extends Scala
//START SNIPPET: e1
new RouteBuilder {
"direct:b" ==> {
- split(tokenize(",")) {
- to("log:b")
- to("mock:b")
- }
+ convertBodyTo(classOf[java.lang.Integer])
+ to("log:b")
+ to("mock:b")
}
}
//END SNIPPET: e1
