svn commit: r1358713 - in /camel/trunk/components/camel-scala/src: main/scala/org/apache/camel/scala/dsl/ main/scala/org/apache/camel/scala/dsl/builder/ test/scala/org/apache/camel/scala/dsl/

[davsclaus-2]

Author: davsclaus
Date: Sun Jul  8 09:59:01 2012
New Revision: 1358713

URL: http://svn.apache.org/viewvc?rev=1358713&view=rev
Log:
CAMEL-3211: Fixed scala DSL with poll enrich changes in camel-core.

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/SPollEnricherTest.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=1358713&r1=1358712&r2=1358713&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 Jul  8 09:59:01 2012
@@ -69,7 +69,8 @@ trait DSL {
 
   def pipeline : SPipelineDefinition
   def policy(policy: Policy) : DSL
-  def pollEnrich(uri: String, strategy: AggregationStrategy = null, timeout: Long = 0) : DSL
+  def pollEnrich(uri: String, strategy: AggregationStrategy = null, timeout: Long = -1) : DSL
+  def pollEnrich(uri: String, timeout: Long, pollMultiple: Boolean) : DSL
   def process(function: Exchange => Unit) : DSL
   def process(processor: Processor) : 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=1358713&r1=1358712&r2=1358713&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 Jul  8 09:59:01 2012
@@ -109,6 +109,8 @@ abstract class SAbstractDefinition[P <:
   def policy(policy: Policy) = wrap(target.policy(policy))
   def pollEnrich(uri: String, strategy: AggregationStrategy = null, timeout: Long = -1) =
     wrap(target.pollEnrich(uri, timeout, strategy))
+  def pollEnrich(uri: String, timeout: Long, pollMultiple: Boolean) =
+    wrap(target.pollEnrich(uri, timeout, pollMultiple))
   def process(function: Exchange => Unit) = wrap(target.process(new ScalaProcessor(function)))
   def process(processor: Processor) = wrap(target.process(processor))
 

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=1358713&r1=1358712&r2=1358713&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 Jul  8 09:59:01 2012
@@ -156,7 +156,8 @@ class RouteBuilder extends Preamble with
   def otherwise = stack.top.otherwise
 
   def pipeline = stack.top.pipeline
-  def pollEnrich(uri: String, strategy: AggregationStrategy = null, timeout: Long = 0) = stack.top.pollEnrich(uri, strategy, timeout)
+  def pollEnrich(uri: String, strategy: AggregationStrategy = null, timeout: Long = -1) = stack.top.pollEnrich(uri, strategy, timeout)
+  def pollEnrich(uri: String, timeout: Long, pollMultiple: Boolean) = stack.top.pollEnrich(uri, timeout, pollMultiple)
   def policy(policy: Policy) = stack.top.policy(policy)
   def process(function: Exchange => Unit) = stack.top.process(function)
   def process(processor: Processor) = stack.top.process(processor)

Modified: camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/SPollEnricherTest.scala
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/SPollEnricherTest.scala?rev=1358713&r1=1358712&r2=1358713&view=diff
==============================================================================
--- camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/SPollEnricherTest.scala (original)
+++ camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/SPollEnricherTest.scala Sun Jul  8 09:59:01 2012
@@ -40,5 +40,16 @@ class SPollEnricherTest extends PollEnri
     }
 
     "direct:enricher-test-4" pollEnrich("seda:foo4", strategy)
+
+    "seda:enricher-test-5" ==> {
+      pollEnrich("seda:foo5", -1, pollMultiple = true)
+      to("mock:mock")
+    }
+
+    "seda:enricher-test-6" ==> {
+      pollEnrich("seda:foo6", 200, pollMultiple = true)
+      to("mock:mock")
+    }
+
   }
 }