Author: gertv
Date: Thu Jul 31 00:14:30 2008
New Revision: 681285
URL: http://svn.apache.org/viewvc?rev=681285&view=rev
Log:
CAMEL-463: Getting rid of _. when using Camel languages in expressions and
predicates
Modified:
activemq/camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/languages/JXPath.scala
activemq/camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/languages/XPath.scala
activemq/camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/RecipientListRouteTest.scala
activemq/camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/SplitterRouteBuilderTest.scala
Modified:
activemq/camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/languages/JXPath.scala
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/languages/JXPath.scala?rev=681285&r1=681284&r2=681285&view=diff
==============================================================================
---
activemq/camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/languages/JXPath.scala
(original)
+++
activemq/camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/languages/JXPath.scala
Thu Jul 31 00:14:30 2008
@@ -25,12 +25,13 @@
implicit def exchangeToJXpath(exchange: Exchange) = new
RichJXPathExchange(exchange)
+ def language(exchange: Exchange) =
exchange.getContext().resolveLanguage("jxpath")
+ def jxpath(jxpath: String)(exchange: Exchange) : Any =
+ language(exchange).createExpression(jxpath).evaluate(exchange)
+
class RichJXPathExchange(val exchange: Exchange) {
- val language = exchange.getContext().resolveLanguage("jxpath")
-
- def jxpath(jxpath: String) : Any =
- language.createExpression(jxpath).evaluate(exchange)
+ def jxpath(jxpath: String) : Any = JXPath.this.jxpath(jxpath)(exchange)
}
Modified:
activemq/camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/languages/XPath.scala
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/languages/XPath.scala?rev=681285&r1=681284&r2=681285&view=diff
==============================================================================
---
activemq/camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/languages/XPath.scala
(original)
+++
activemq/camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/languages/XPath.scala
Thu Jul 31 00:14:30 2008
@@ -25,12 +25,14 @@
implicit def exchangeToXpath(exchange: Exchange) = new
RichXPathExchange(exchange)
- class RichXPathExchange(val exchange: Exchange) {
-
- def xpath(xpath: String) : Any = {
+ def xpath(xpath: String)(exchange: Exchange) : Any = {
val builder = new XPathBuilder[Exchange](xpath)
builder.evaluate(exchange)
- }
+ }
+
+ class RichXPathExchange(val exchange: Exchange) {
+
+ def xpath(xpath: String) : Any = XPath.this.xpath(xpath)(exchange)
}
Modified:
activemq/camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/RecipientListRouteTest.scala
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/RecipientListRouteTest.scala?rev=681285&r1=681284&r2=681285&view=diff
==============================================================================
---
activemq/camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/RecipientListRouteTest.scala
(original)
+++
activemq/camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/RecipientListRouteTest.scala
Thu Jul 31 00:14:30 2008
@@ -56,7 +56,7 @@
//START SNIPPET: block
"direct:c" ==> {
to("mock:c")
- recipients(_.jxpath("./in/body/destination"))
+ recipients(jxpath("./in/body/destination"))
}
//END SNIPPET: block
}
Modified:
activemq/camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/SplitterRouteBuilderTest.scala
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/SplitterRouteBuilderTest.scala?rev=681285&r1=681284&r2=681285&view=diff
==============================================================================
---
activemq/camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/SplitterRouteBuilderTest.scala
(original)
+++
activemq/camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/SplitterRouteBuilderTest.scala
Thu Jul 31 00:14:30 2008
@@ -44,13 +44,13 @@
new RouteBuilder with XPath {
//END SNIPPET: xpath
//START SNIPPET: simple
- "direct:a" as(classOf[Document]) splitter(_.xpath("/persons/person"))
to "mock:a"
+ "direct:a" as(classOf[Document]) splitter(xpath("/persons/person")) to
"mock:a"
//END SNIPPET: simple
//START SNIPPET: block
"direct:b" ==> {
as(classOf[Document])
- splitter(_.xpath("/persons/person")) {
+ splitter(xpath("/persons/person")) {
to("mock:b")
to("mock:c")
}
