Author: gertv
Date: Thu Jun 4 14:22:30 2009
New Revision: 781748
URL: http://svn.apache.org/viewvc?rev=781748&view=rev
Log:
CAMEL-463: We no longer need the Strategy class in SOnCompletionDefinition
Modified:
camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SDelayDefinition.scala
camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SOnCompletionDefinition.scala
camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/SOnCompletionOnCompleteOnlyTest.scala
camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/SOnCompletionOnFailureOnlyTest.scala
Modified:
camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SDelayDefinition.scala
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SDelayDefinition.scala?rev=781748&r1=781747&r2=781748&view=diff
==============================================================================
---
camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SDelayDefinition.scala
(original)
+++
camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SDelayDefinition.scala
Thu Jun 4 14:22:30 2009
@@ -40,7 +40,8 @@
this
}
def minutes = min
-
- def valueInMs : Long = target.getExpression().asInstanceOf[Long]
- def valueInMs_=(period: Long) = target.setExpression(new
ExpressionDefinition(ExpressionBuilder.constantExpression(period)))
+
+ // we need this to match the valueInMs_= for now, can be removed once Scala
2.8.0 is out
+ def valueInMs : Long = 0
+ def valueInMs_=(period: Long) = target.delay(period)
}
Modified:
camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SOnCompletionDefinition.scala
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SOnCompletionDefinition.scala?rev=781748&r1=781747&r2=781748&view=diff
==============================================================================
---
camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SOnCompletionDefinition.scala
(original)
+++
camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SOnCompletionDefinition.scala
Thu Jun 4 14:22:30 2009
@@ -1,37 +1,35 @@
+/**
+ * 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 model.{WhenDefinition,OnCompletionDefinition}
import org.apache.camel.scala.dsl.builder.RouteBuilder;
+/**
+ * Scala enrichment for the Camel OnCompletionDefinition
+ */
case class SOnCompletionDefinition(override val target :
OnCompletionDefinition)(implicit val builder : RouteBuilder) extends
SAbstractDefinition[OnCompletionDefinition] {
- import
org.apache.camel.scala.dsl.SOnCompletionDefinition.{Strategy,FailureOnly}
-
override def when(predicate : Exchange => Boolean) : SOnCompletionDefinition
=
wrap(target.setOnWhen(new WhenDefinition(new ScalaPredicate(predicate))))
- def strategy(strategy : Strategy) : SOnCompletionDefinition = {
- strategy.applyTo(target)
- this
- }
-
def onFailureOnly = wrap(target.onFailureOnly)
def onCompleteOnly = wrap(target.onCompleteOnly)
override def wrap(block: => Unit) =
super.wrap(block).asInstanceOf[SOnCompletionDefinition]
}
-
-object SOnCompletionDefinition {
-
- abstract class Strategy {
- def applyTo(target: OnCompletionDefinition)
- }
- case class FailureOnly extends Strategy {
- def applyTo(target: OnCompletionDefinition) : Unit = target.onFailureOnly
- }
- case class CompleteOnly extends Strategy {
- def applyTo(target: OnCompletionDefinition) : Unit = target.onCompleteOnly
- }
-
-}
Modified:
camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/SOnCompletionOnCompleteOnlyTest.scala
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/SOnCompletionOnCompleteOnlyTest.scala?rev=781748&r1=781747&r2=781748&view=diff
==============================================================================
---
camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/SOnCompletionOnCompleteOnlyTest.scala
(original)
+++
camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/SOnCompletionOnCompleteOnlyTest.scala
Thu Jun 4 14:22:30 2009
@@ -16,7 +16,6 @@
*/
package org.apache.camel.scala.dsl;
-import dsl.SOnCompletionDefinition.CompleteOnly
import org.apache.camel.processor.OnCompletionGlobalTest.MyProcessor
import org.apache.camel.scala.dsl.builder.{RouteBuilderSupport, RouteBuilder}
import processor.OnCompletionOnCompleteOnlyTest
Modified:
camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/SOnCompletionOnFailureOnlyTest.scala
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/SOnCompletionOnFailureOnlyTest.scala?rev=781748&r1=781747&r2=781748&view=diff
==============================================================================
---
camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/SOnCompletionOnFailureOnlyTest.scala
(original)
+++
camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/SOnCompletionOnFailureOnlyTest.scala
Thu Jun 4 14:22:30 2009
@@ -16,7 +16,6 @@
*/
package org.apache.camel.scala.dsl;
-import dsl.SOnCompletionDefinition.{FailureOnly}
import org.apache.camel.processor.OnCompletionGlobalTest.MyProcessor
import org.apache.camel.scala.dsl.builder.{RouteBuilderSupport, RouteBuilder}
import processor.OnCompletionOnFailureOnlyTest
