Author: davsclaus
Date: Sun May 1 10:47:04 2011
New Revision: 1098250
URL: http://svn.apache.org/viewvc?rev=1098250&view=rev
Log:
CAMEL-463: Using mixed case for scala dsl to make it consistent with Java DSL
and more readable.
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
camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/IdempotentConsumerTest.scala
camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/InterceptSendToTest.scala
camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/MulticastTest.scala
camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/SetBodyTest.scala
camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/SetHeaderTest.scala
camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/SplitterRouteBuilderTest.scala
camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/WiretapTest.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=1098250&r1=1098249&r2=1098250&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
Sun May 1 10:47:04 2011
@@ -48,7 +48,7 @@ trait DSL {
def handle[E](block: => Unit)(implicit manifest: Manifest[E]) :
SOnExceptionDefinition
def id(id : String): DSL
- def idempotentconsumer(expression: Exchange => Any):
SIdempotentConsumerDefinition
+ def idempotentConsumer(expression: Exchange => Any):
SIdempotentConsumerDefinition
def inOnly(): DSL with Block
def inOut(): DSL with Block
@@ -79,9 +79,9 @@ trait DSL {
def routingSlip(header: String, separator: String) : DSL
def routingSlip(expression: Exchange => Any) : DSL
- def setbody(expression: Exchange => Any) : DSL
- def setfaultbody(expression: Exchange => Any) : DSL
- def setheader(header: String, expression: Exchange => Any) : DSL
+ def setBody(expression: Exchange => Any) : DSL
+ def setFaultBody(expression: Exchange => Any) : DSL
+ def setHeader(header: String, expression: Exchange => Any) : DSL
def sort[T](expression: Exchange => Any, comparator: Comparator[T] = null) :
DSL
def split(expression: Exchange => Any) : SSplitDefinition
def stop : DSL
@@ -99,8 +99,8 @@ trait DSL {
def validate(expression: Exchange => Any) : DSL
def when(filter: Exchange => Any) : DSL with Block
- def wiretap(uri: String) : DSL
- def wiretap(uri: String, expression: Exchange => Any) : DSL
+ def wireTap(uri: String) : DSL
+ def wireTap(uri: String, expression: Exchange => Any) : DSL
def -->(uris: String*) : 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=1098250&r1=1098249&r2=1098250&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
Sun May 1 10:47:04 2011
@@ -76,7 +76,7 @@ abstract class SAbstractDefinition[P <:
def handle[E](block: => Unit)(implicit manifest: Manifest[E]) =
SOnExceptionDefinition(target.onException(manifest.erasure)).apply(block)
def id(id : String) = wrap(target.id(id))
- def idempotentconsumer(expression: Exchange => Any) =
SIdempotentConsumerDefinition(target.idempotentConsumer(expression, null))
+ def idempotentConsumer(expression: Exchange => Any) =
SIdempotentConsumerDefinition(target.idempotentConsumer(expression, null))
def inOnly = wrap(target.inOnly)
def inOut = wrap(target.inOut)
@@ -118,9 +118,9 @@ abstract class SAbstractDefinition[P <:
def routingSlip(header: String, separator: String) =
wrap(target.routingSlip(header, separator))
def routingSlip(expression: Exchange => Any) =
wrap(target.routingSlip(expression))
- def setbody(expression: Exchange => Any) = wrap(target.setBody(expression))
- def setfaultbody(expression: Exchange => Any) =
wrap(target.setFaultBody(expression))
- def setheader(name: String, expression: Exchange => Any) =
wrap(target.setHeader(name, expression))
+ def setBody(expression: Exchange => Any) = wrap(target.setBody(expression))
+ def setFaultBody(expression: Exchange => Any) =
wrap(target.setFaultBody(expression))
+ def setHeader(name: String, expression: Exchange => Any) =
wrap(target.setHeader(name, expression))
def sort[T](expression: (Exchange) => Any, comparator: Comparator[T] = null)
= wrap(target.sort(expression, comparator))
def split(expression: Exchange => Any) =
SSplitDefinition(target.split(expression))
def stop = wrap(target.stop)
@@ -137,8 +137,8 @@ abstract class SAbstractDefinition[P <:
def validate(expression: Exchange => Any) =
wrap(target.validate(predicateBuilder(expression)))
def when(filter: Exchange => Any): DSL with Block =
SChoiceDefinition(target.choice).when(filter)
- def wiretap(uri: String) = wrap(target.wireTap(uri))
- def wiretap(uri: String, expression: Exchange => Any) =
wrap(target.wireTap(uri).newExchangeBody(expression))
+ def wireTap(uri: String) = wrap(target.wireTap(uri))
+ def wireTap(uri: String, expression: Exchange => Any) =
wrap(target.wireTap(uri).newExchangeBody(expression))
def -->(pattern: ExchangePattern, uri: String) = wrap(target.to(pattern,
uri))
def -->(uris: String*) = to(uris:_*)
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=1098250&r1=1098249&r2=1098250&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
Sun May 1 10:47:04 2011
@@ -119,7 +119,7 @@ class RouteBuilder extends Preamble with
def filter(predicate: Exchange => Any) = stack.top.filter(predicate)
def id(id : String) = stack.top.id(id)
- def idempotentconsumer(expression: Exchange => Any) =
stack.top.idempotentconsumer(expression)
+ def idempotentConsumer(expression: Exchange => Any) =
stack.top.idempotentConsumer(expression)
def inOnly = stack.top.inOnly
def inOut = stack.top.inOut
def interceptFrom(expression: Exchange => Boolean) = {
@@ -167,9 +167,9 @@ class RouteBuilder extends Preamble with
def routingSlip(header: String, separator: String) =
stack.top.routingSlip(header, separator)
def routingSlip(expression: Exchange => Any) =
stack.top.routingSlip(expression)
- def setbody(expression : Exchange => Any) = stack.top.setbody(expression)
- def setfaultbody(expression: Exchange => Any) =
stack.top.setfaultbody(expression)
- def setheader(name: String, expression: Exchange => Any) =
stack.top.setheader(name, expression)
+ def setBody(expression : Exchange => Any) = stack.top.setBody(expression)
+ def setFaultBody(expression: Exchange => Any) =
stack.top.setFaultBody(expression)
+ def setHeader(name: String, expression: Exchange => Any) =
stack.top.setHeader(name, expression)
def sort[T](expression: (Exchange) => Any, comparator: Comparator[T] = null)
= stack.top.sort(expression, comparator)
def split(expression: Exchange => Any) = stack.top.split(expression)
def stop = stack.top.stop
@@ -186,8 +186,8 @@ class RouteBuilder extends Preamble with
def validate(expression: (Exchange) => Any) = stack.top.validate(expression)
def when(filter: Exchange => Any) = stack.top.when(filter)
- def wiretap(uri: String) = stack.top.wiretap(uri)
- def wiretap(uri: String, expression: Exchange => Any) =
stack.top.wiretap(uri, expression)
+ def wireTap(uri: String) = stack.top.wireTap(uri)
+ def wireTap(uri: String, expression: Exchange => Any) =
stack.top.wireTap(uri, expression)
def to(uris: String*) = stack.top.to(uris: _*)
def -->(uris: String*) = stack.top.to(uris: _*)
Modified:
camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/IdempotentConsumerTest.scala
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/IdempotentConsumerTest.scala?rev=1098250&r1=1098249&r2=1098250&view=diff
==============================================================================
---
camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/IdempotentConsumerTest.scala
(original)
+++
camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/IdempotentConsumerTest.scala
Sun May 1 10:47:04 2011
@@ -55,12 +55,12 @@ class IdempotentConsumerTest extends Sca
val builder = new RouteBuilder {
//START SNIPPET: simple
- "direct:a" idempotentconsumer(_.in("messageId")) memory(200) to ("mock:a")
+ "direct:a" idempotentConsumer(_.in("messageId")) memory(200) to ("mock:a")
//END SNIPPET: simple
//START SNIPPET: block
"direct:b" ==> {
- idempotentconsumer(_.in("messageId")) memory(200) apply {
+ idempotentConsumer(_.in("messageId")) memory(200) apply {
to ("mock:b")
}
}
@@ -99,7 +99,7 @@ class IdempotentConsumerEagerTest extend
"direct:start" ==> {
-
idempotentconsumer(_.getIn().getHeader("messageId")).repository(repo).eager(true)
{
+
idempotentConsumer(_.getIn().getHeader("messageId")).repository(repo).eager(true)
{
process((exchange : Exchange) =>
if
(repo.contains(exchange.getIn().getHeader("messageId").asInstanceOf[String])) {
// this is OK with the eager = true
Modified:
camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/InterceptSendToTest.scala
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/InterceptSendToTest.scala?rev=1098250&r1=1098249&r2=1098250&view=diff
==============================================================================
---
camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/InterceptSendToTest.scala
(original)
+++
camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/InterceptSendToTest.scala
Sun May 1 10:47:04 2011
@@ -115,7 +115,7 @@ class InterceptSendToSkipOriginalTest ex
class SInterceptSendToFaultTest extends InterceptSendToFaultTest with
RouteBuilderSupport {
override def createRouteBuilder = new RouteBuilder {
- interceptSendTo("mock:foo").setfaultbody("Damn")
+ interceptSendTo("mock:foo").setFaultBody("Damn")
"direct:start" to "mock:foo" transform "Bye World" to "mock:result"
}
Modified:
camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/MulticastTest.scala
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/MulticastTest.scala?rev=1098250&r1=1098249&r2=1098250&view=diff
==============================================================================
---
camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/MulticastTest.scala
(original)
+++
camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/MulticastTest.scala
Sun May 1 10:47:04 2011
@@ -70,7 +70,7 @@ class SMulticastParallelTest extends Mul
to("mock:result")
}
- "direct:a" delay(100 ms) setbody("A")
- "direct:b" setbody("B")
+ "direct:a" delay(100 ms) setBody("A")
+ "direct:b" setBody("B")
}
}
Modified:
camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/SetBodyTest.scala
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/SetBodyTest.scala?rev=1098250&r1=1098249&r2=1098250&view=diff
==============================================================================
---
camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/SetBodyTest.scala
(original)
+++
camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/SetBodyTest.scala
Sun May 1 10:47:04 2011
@@ -47,18 +47,18 @@ class SetBodyTest extends ScalaTestSuppo
val builder = new RouteBuilder {
//START SNIPPET: simple
- "direct:a" setbody "pong" to "mock:a"
- "direct:c" setbody el("${in.body.name}") to "mock:c"
+ "direct:a" setBody "pong" to "mock:a"
+ "direct:c" setBody el("${in.body.name}") to "mock:c"
//END SNIPPET: simple
//START SNIPPET: block
"direct:b" ==> {
- setbody("pong")
+ setBody("pong")
to ("mock:b")
}
"direct:d" ==> {
- setbody(el("${in.body.name}"))
+ setBody(el("${in.body.name}"))
to ("mock:d")
}
//END SNIPPET: block
Modified:
camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/SetHeaderTest.scala
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/SetHeaderTest.scala?rev=1098250&r1=1098249&r2=1098250&view=diff
==============================================================================
---
camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/SetHeaderTest.scala
(original)
+++
camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/SetHeaderTest.scala
Sun May 1 10:47:04 2011
@@ -48,18 +48,18 @@ class SetHeaderTest extends ScalaTestSup
val builder = new RouteBuilder {
//START SNIPPET: simple
- "direct:a" setheader("response", "pong?") to "mock:a"
- "direct:c" setheader("genus",el("${in.body.genus}")) to "mock:c"
+ "direct:a" setHeader("response", "pong?") to "mock:a"
+ "direct:c" setHeader("genus",el("${in.body.genus}")) to "mock:c"
//END SNIPPET: simple
//START SNIPPET: block
"direct:b" ==> {
- setheader("response", "pong?")
+ setHeader("response", "pong?")
to ("mock:b")
}
"direct:d" ==> {
- setheader("genus", el("${in.body.genus}"))
+ setHeader("genus", el("${in.body.genus}"))
to ("mock:d")
}
//END SNIPPET: block
Modified:
camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/SplitterRouteBuilderTest.scala
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/SplitterRouteBuilderTest.scala?rev=1098250&r1=1098249&r2=1098250&view=diff
==============================================================================
---
camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/SplitterRouteBuilderTest.scala
(original)
+++
camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/SplitterRouteBuilderTest.scala
Sun May 1 10:47:04 2011
@@ -17,27 +17,21 @@
package org.apache.camel
package scala.dsl
-import org.w3c.dom.Document
import builder.RouteBuilder
+import org.w3c.dom.Document
/**
* Test case for Splitter
*/
class SplitterRouteBuilderTest extends ScalaTestSupport {
- def testDummy = {
- // noop
- }
-
- // TODO: Fixme, fails on Linux
- def xxxtestSimpleSplitter = {
+ def testSimpleSplitter = {
"mock:a" expect { _.count = 3}
"direct:a" ! <persons><person id="1"/><person id="2"/><person
id="3"/></persons>
"mock:a" assert()
}
- // TODO: Fixme, fails on Linux
- def xxxtestBlockSplitter = {
+ def testBlockSplitter = {
"mock:b" expect { _.count = 3}
"mock:c" expect { _.count = 3}
"direct:b" ! <persons><person id="1"/><person id="2"/><person
id="3"/></persons>
@@ -46,9 +40,7 @@ class SplitterRouteBuilderTest extends S
}
val builder =
- //START SNIPPET: xpath
new RouteBuilder {
- //END SNIPPET: xpath
//START SNIPPET: simple
"direct:a" as(classOf[Document]) split(xpath("/persons/person")) to
"mock:a"
//END SNIPPET: simple
Modified:
camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/WiretapTest.scala
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/WiretapTest.scala?rev=1098250&r1=1098249&r2=1098250&view=diff
==============================================================================
---
camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/WiretapTest.scala
(original)
+++
camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/WiretapTest.scala
Sun May 1 10:47:04 2011
@@ -51,23 +51,23 @@ class WiretapTest extends ScalaTestSuppo
val builder =
new RouteBuilder {
//START SNIPPET: simple
- "direct:a" wiretap("direct:tap") setbody("Calling " + _.in[Adult].name)
to ("mock:a")
- "direct:c" wiretap("direct:tap-with-body", "Tapped!") to ("mock:c")
+ "direct:a" wireTap("direct:tap") setBody("Calling " + _.in[Adult].name)
to ("mock:a")
+ "direct:c" wireTap("direct:tap-with-body", "Tapped!") to ("mock:c")
//END SNIPPET: simple
//START SNIPPET: block
"direct:b" ==> {
- wiretap("direct:tap")
- setbody("Calling " + _.in[Adult].name)
+ wireTap("direct:tap")
+ setBody("Calling " + _.in[Adult].name)
to ("mock:b")
}
"direct:d" ==> {
- wiretap("direct:tap-with-body", "Tapped!")
+ wireTap("direct:tap-with-body", "Tapped!")
to ("mock:d")
}
//END SNIPPET: block
- "direct:tap" setbody(_.in match {
+ "direct:tap" setBody(_.in match {
case Adult("Elvis") => "Elvis is alive!"
case Adult(_) => "Stop singing, you're not Elvis"
}) to "mock:tap"
