You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2012/11/19 16:57:37 UTC
svn commit: r1411260 [1/2] - in /camel/trunk/components/camel-scala/src:
main/scala/org/apache/camel/scala/
main/scala/org/apache/camel/scala/converter/
main/scala/org/apache/camel/scala/dsl/
main/scala/org/apache/camel/scala/dsl/builder/ main/scala/or...
Author: davsclaus
Date: Mon Nov 19 15:57:24 2012
New Revision: 1411260
URL: http://svn.apache.org/viewvc?rev=1411260&view=rev
Log:
Polished camel-scala and fixed some hints reported by IDEA
Added:
camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SPipelineDefinition.scala
- copied unchanged from r1411131, camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SPipelineDefinitionDefinition.scala
Removed:
camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SPipelineDefinitionDefinition.scala
Modified:
camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/Frequency.scala
camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/Period.scala
camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/RichExchange.scala
camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/ScalaExpression.scala
camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/Wrapper.scala
camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/converter/ScalaTypeConverter.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/SAggregateDefinition.scala
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/SEnrichDefinition.scala
camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SFilterDefinition.scala
camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SInterceptDefinition.scala
camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SInterceptFromDefinition.scala
camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SInterceptSendToEndpointDefinition.scala
camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SLoopDefinition.scala
camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SMulticastDefinition.scala
camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SOnCompletionDefinition.scala
camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SResequenceDefinition.scala
camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SRouteDefinition.scala
camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SThreadsDefinition.scala
camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SThrottleDefinition.scala
camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/STryDefinition.scala
camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/builder/RouteBuilder.scala
camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/builder/RouteBuilderSupport.scala
camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/languages/Languages.scala
camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/CamelTestSupportTest.scala
camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/RichMockEndpoint.scala
camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/UsingModelTest.scala
camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/converter/ScalaTypeConverterTest.scala
camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/AggregatorTest.scala
camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/BasicRouteBuilderTest.scala
camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/BlockBeanTest.scala
camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/CamelCBRTest.scala
camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/ContentBasedRouterTest.scala
camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/ContentEnricherTest.scala
camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/DataFormatTest.scala
camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/DelayerTest.scala
camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/EnricherTest.scala
camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/ExceptionHandlerTest.scala
camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/FilterRouteBuilderTest.scala
camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/HeaderContentBasedRouterTest.scala
camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/IdTest.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/InterceptFromTest.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/LoadBalancerTest.scala
camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/LoopTest.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/OnExceptionTest.scala
camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/PipelineAndMulticastTest.scala
camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/PipelineRouteBuilderTest.scala
camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/PipelineTest.scala
camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/RecipientListRouteTest.scala
camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/ResequencerTest.scala
camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/RichTestUri.scala
camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/RollbackTest.scala
camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/RouteErrorHandlerTest.scala
camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/RouteIdTest.scala
camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/SOnCompletionGlobalTest.scala
camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/SOnCompletionOnFailureOnlyTest.scala
camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/SOnCompletionWhenTest.scala
camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/SSortTest.scala
camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/SThrowExceptionTest.scala
camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/STransformProcessorTest.scala
camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/SValidateTest.scala
camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/ScalaTestSupport.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/SetExchangePatternTest.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/SplitterTokenizeXMLTest.scala
camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/ThrottlerTest.scala
camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/TryCatchFinallyTest.scala
camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/WiretapTest.scala
camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/XPathContentBasedRouterTest.scala
camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/builder/RouteBuilderUnwrapTest.scala
camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/test/Animal.scala
camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/test/Envelope.scala
camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/test/Person.scala
Modified: camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/Frequency.scala
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/Frequency.scala?rev=1411260&r1=1411259&r2=1411260&view=diff
==============================================================================
--- camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/Frequency.scala (original)
+++ camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/Frequency.scala Mon Nov 19 15:57:24 2012
@@ -24,6 +24,4 @@ package org.apache.camel.scala
*/
class Frequency(val count: Int, val period: Period) {
-
-
}
Modified: camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/Period.scala
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/Period.scala?rev=1411260&r1=1411259&r2=1411260&view=diff
==============================================================================
--- camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/Period.scala (original)
+++ camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/Period.scala Mon Nov 19 15:57:24 2012
@@ -85,7 +85,7 @@ class SimplePeriod(var milliseconds: Lon
* "2 hours 15 minutes"
*/
class CompositePeriod(val left: Period, val right: SimplePeriod) extends Period {
- def ref = right;
+ def ref = right
def milliseconds = left.milliseconds + right.milliseconds
}
Modified: camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/RichExchange.scala
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/RichExchange.scala?rev=1411260&r1=1411259&r2=1411260&view=diff
==============================================================================
--- camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/RichExchange.scala (original)
+++ camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/RichExchange.scala Mon Nov 19 15:57:24 2012
@@ -66,7 +66,7 @@ class RichExchange(val exchange : Exchan
def isTransacted = exchange.isTransacted
- def isExternalRedelivered = exchange.isExternalRedelivered;
+ def isExternalRedelivered = exchange.isExternalRedelivered
def isRollbackOnly = exchange.isRollbackOnly
Modified: camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/ScalaExpression.scala
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/ScalaExpression.scala?rev=1411260&r1=1411259&r2=1411260&view=diff
==============================================================================
--- camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/ScalaExpression.scala (original)
+++ camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/ScalaExpression.scala Mon Nov 19 15:57:24 2012
@@ -34,7 +34,7 @@ class ScalaExpression(val expression: Ex
def evaluate[Target](exchange: Exchange, toType: Class[Target]) = {
val value = evaluate(exchange)
- exchange.getContext().getTypeConverter().convertTo(toType, value)
+ exchange.getContext.getTypeConverter.convertTo(toType, value)
}
}
Modified: camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/Wrapper.scala
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/Wrapper.scala?rev=1411260&r1=1411259&r2=1411260&view=diff
==============================================================================
--- camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/Wrapper.scala (original)
+++ camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/Wrapper.scala Mon Nov 19 15:57:24 2012
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.scala;
+package org.apache.camel.scala
/**
* Wraps a given type T and supports unwrapping it on demand
Modified: camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/converter/ScalaTypeConverter.scala
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/converter/ScalaTypeConverter.scala?rev=1411260&r1=1411259&r2=1411260&view=diff
==============================================================================
--- camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/converter/ScalaTypeConverter.scala (original)
+++ camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/converter/ScalaTypeConverter.scala Mon Nov 19 15:57:24 2012
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.scala.converter;
+package org.apache.camel.scala.converter
import java.io.InputStream
@@ -33,7 +33,7 @@ object ScalaTypeConverter {
@Converter
def convertToDocument(xml: Elem, exchange : Exchange) : Document = {
- exchange.getContext.getTypeConverter.convertTo(classOf[Document], exchange, xml.toString)
+ exchange.getContext.getTypeConverter.convertTo(classOf[Document], exchange, xml.toString())
}
@Converter
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=1411260&r1=1411259&r2=1411260&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 Mon Nov 19 15:57:24 2012
@@ -18,16 +18,15 @@ package org.apache.camel
package scala
package dsl
-import languages.LanguageFunction
import org.apache.camel.Exchange
import org.apache.camel.model._
import org.apache.camel.processor.aggregate.AggregationStrategy
import org.apache.camel.scala.dsl.builder.RouteBuilder
+import spi.Policy
import reflect.Manifest
import java.lang.String
import java.util.Comparator
-import spi.{Language, Policy}
abstract class SAbstractDefinition[P <: ProcessorDefinition[_]] extends DSL with Wrapper[P] with Block {
@@ -57,7 +56,7 @@ abstract class SAbstractDefinition[P <:
def aggregate(expression: Exchange => Any, strategy: AggregationStrategy) = SAggregateDefinition(target.aggregate(expression, strategy))
def as[Target](toType: Class[Target]) = wrap(target.convertBodyTo(toType))
- def attempt: STryDefinition = STryDefinition(target.doTry)
+ def attempt: STryDefinition = STryDefinition(target.doTry())
def bean(bean: Any) = bean match {
case cls: Class[_] => wrap(target.bean(cls))
Modified: camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SAggregateDefinition.scala
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SAggregateDefinition.scala?rev=1411260&r1=1411259&r2=1411260&view=diff
==============================================================================
--- camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SAggregateDefinition.scala (original)
+++ camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SAggregateDefinition.scala Mon Nov 19 15:57:24 2012
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.scala.dsl;
+package org.apache.camel.scala.dsl
import java.util.concurrent.ExecutorService
import java.util.concurrent.ScheduledExecutorService
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=1411260&r1=1411259&r2=1411260&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 Mon Nov 19 15:57:24 2012
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.scala.dsl;
+package org.apache.camel.scala.dsl
import org.apache.camel.model.DelayDefinition
import org.apache.camel.scala.dsl.builder.RouteBuilder
Modified: camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SEnrichDefinition.scala
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SEnrichDefinition.scala?rev=1411260&r1=1411259&r2=1411260&view=diff
==============================================================================
--- camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SEnrichDefinition.scala (original)
+++ camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SEnrichDefinition.scala Mon Nov 19 15:57:24 2012
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.scala.dsl;
+package org.apache.camel.scala.dsl
import org.apache.camel.model.EnrichDefinition
import org.apache.camel.processor.aggregate.AggregationStrategy
Modified: camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SFilterDefinition.scala
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SFilterDefinition.scala?rev=1411260&r1=1411259&r2=1411260&view=diff
==============================================================================
--- camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SFilterDefinition.scala (original)
+++ camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SFilterDefinition.scala Mon Nov 19 15:57:24 2012
@@ -17,7 +17,7 @@
package org.apache.camel.scala.dsl
import builder.RouteBuilder
-import org.apache.camel.model.FilterDefinition;
+import org.apache.camel.model.FilterDefinition
/**
* Scala enrichment for Camel's FilterDefinition
Modified: camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SInterceptDefinition.scala
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SInterceptDefinition.scala?rev=1411260&r1=1411259&r2=1411260&view=diff
==============================================================================
--- camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SInterceptDefinition.scala (original)
+++ camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SInterceptDefinition.scala Mon Nov 19 15:57:24 2012
@@ -17,7 +17,7 @@
package org.apache.camel.scala.dsl
import builder.RouteBuilder
-import org.apache.camel.model.InterceptDefinition;
+import org.apache.camel.model.InterceptDefinition
/**
* Scala enrichment for Camel's InterceptFromDefinition
Modified: camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SInterceptFromDefinition.scala
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SInterceptFromDefinition.scala?rev=1411260&r1=1411259&r2=1411260&view=diff
==============================================================================
--- camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SInterceptFromDefinition.scala (original)
+++ camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SInterceptFromDefinition.scala Mon Nov 19 15:57:24 2012
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.scala.dsl;
+package org.apache.camel.scala.dsl
import org.apache.camel.model.InterceptFromDefinition
import org.apache.camel.scala.dsl.builder.RouteBuilder
Modified: camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SInterceptSendToEndpointDefinition.scala
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SInterceptSendToEndpointDefinition.scala?rev=1411260&r1=1411259&r2=1411260&view=diff
==============================================================================
--- camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SInterceptSendToEndpointDefinition.scala (original)
+++ camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SInterceptSendToEndpointDefinition.scala Mon Nov 19 15:57:24 2012
@@ -17,7 +17,7 @@
package org.apache.camel.scala.dsl
import builder.RouteBuilder
-import org.apache.camel.model.InterceptSendToEndpointDefinition;
+import org.apache.camel.model.InterceptSendToEndpointDefinition
/**
* Scala enrichment for Camel's InterceptSendToEndpointDefinition
Modified: camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SLoopDefinition.scala
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SLoopDefinition.scala?rev=1411260&r1=1411259&r2=1411260&view=diff
==============================================================================
--- camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SLoopDefinition.scala (original)
+++ camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SLoopDefinition.scala Mon Nov 19 15:57:24 2012
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.scala.dsl;
+package org.apache.camel.scala.dsl
import org.apache.camel.model.LoopDefinition
import org.apache.camel.scala.dsl.builder.RouteBuilder
Modified: camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SMulticastDefinition.scala
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SMulticastDefinition.scala?rev=1411260&r1=1411259&r2=1411260&view=diff
==============================================================================
--- camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SMulticastDefinition.scala (original)
+++ camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SMulticastDefinition.scala Mon Nov 19 15:57:24 2012
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.scala.dsl;
+package org.apache.camel.scala.dsl
import java.util.concurrent.ExecutorService
import org.apache.camel.model.MulticastDefinition
@@ -46,9 +46,7 @@ case class SMulticastDefinition(override
def executorServiceRef(ref: String) = wrap(target.setExecutorServiceRef(ref))
def timeout(timeout: Long) = wrap(target.timeout(timeout))
-
-
-
+
override def wrap(block: => Unit) = super.wrap(block).asInstanceOf[SMulticastDefinition]
}
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=1411260&r1=1411259&r2=1411260&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 Mon Nov 19 15:57:24 2012
@@ -19,7 +19,7 @@ package scala.dsl
import java.util.concurrent.ExecutorService
import model.{WhenDefinition,OnCompletionDefinition}
-import org.apache.camel.scala.dsl.builder.RouteBuilder;
+import org.apache.camel.scala.dsl.builder.RouteBuilder
/**
* Scala enrichment for the Camel OnCompletionDefinition
Modified: camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SResequenceDefinition.scala
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SResequenceDefinition.scala?rev=1411260&r1=1411259&r2=1411260&view=diff
==============================================================================
--- camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SResequenceDefinition.scala (original)
+++ camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SResequenceDefinition.scala Mon Nov 19 15:57:24 2012
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.scala.dsl;
+package org.apache.camel.scala.dsl
import org.apache.camel.model.ResequenceDefinition
import org.apache.camel.model.config.BatchResequencerConfig
Modified: camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SRouteDefinition.scala
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SRouteDefinition.scala?rev=1411260&r1=1411259&r2=1411260&view=diff
==============================================================================
--- camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SRouteDefinition.scala (original)
+++ camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SRouteDefinition.scala Mon Nov 19 15:57:24 2012
@@ -14,13 +14,13 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.scala.dsl;
+package org.apache.camel.scala.dsl
import org.apache.camel.model.RouteDefinition
import org.apache.camel.scala.dsl.builder.RouteBuilder
import org.apache.camel.builder.ErrorHandlerBuilder
-case class SRouteDefinition(override val target: RouteDefinition, val builder: RouteBuilder) extends SAbstractDefinition[RouteDefinition] {
+case class SRouteDefinition(override val target: RouteDefinition, builder: RouteBuilder) extends SAbstractDefinition[RouteDefinition] {
def ==> (block: => Unit) : SRouteDefinition = this.apply(block).asInstanceOf[SRouteDefinition]
Modified: camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SThreadsDefinition.scala
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SThreadsDefinition.scala?rev=1411260&r1=1411259&r2=1411260&view=diff
==============================================================================
--- camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SThreadsDefinition.scala (original)
+++ camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SThreadsDefinition.scala Mon Nov 19 15:57:24 2012
@@ -17,10 +17,9 @@
package org.apache.camel.scala.dsl
import java.util.concurrent.ExecutorService
-import java.util.concurrent.ScheduledExecutorService
import java.util.concurrent.TimeUnit
import builder.RouteBuilder
-import org.apache.camel.ThreadPoolRejectedPolicy;
+import org.apache.camel.ThreadPoolRejectedPolicy
import org.apache.camel.model.ThreadsDefinition
Modified: camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SThrottleDefinition.scala
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SThrottleDefinition.scala?rev=1411260&r1=1411259&r2=1411260&view=diff
==============================================================================
--- camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SThrottleDefinition.scala (original)
+++ camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SThrottleDefinition.scala Mon Nov 19 15:57:24 2012
@@ -14,10 +14,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.scala.dsl;
+package org.apache.camel.scala.dsl
import java.util.concurrent.ExecutorService
-import java.util.concurrent.ScheduledExecutorService
import org.apache.camel.model.ThrottleDefinition
import org.apache.camel.scala.dsl.builder.RouteBuilder
Modified: camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/STryDefinition.scala
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/STryDefinition.scala?rev=1411260&r1=1411259&r2=1411260&view=diff
==============================================================================
--- camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/STryDefinition.scala (original)
+++ camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/STryDefinition.scala Mon Nov 19 15:57:24 2012
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.scala.dsl;
+package org.apache.camel.scala.dsl
import org.apache.camel.model.TryDefinition
import org.apache.camel.scala.dsl.builder.RouteBuilder
@@ -32,7 +32,7 @@ case class STryDefinition(override val t
}
def ensure = {
- target.doFinally
+ target.doFinally()
this
}
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=1411260&r1=1411259&r2=1411260&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 Mon Nov 19 15:57:24 2012
@@ -45,7 +45,7 @@ class RouteBuilder extends Preamble with
}
}
- val stack = new Stack[DSL];
+ val stack = new Stack[DSL]
val serialization = new org.apache.camel.model.dataformat.SerializationDataFormat
@@ -153,7 +153,7 @@ class RouteBuilder extends Preamble with
def onCompletion = {
stack.size match {
case 0 => SOnCompletionDefinition(builder.onCompletion)(this)
- case _ => stack.top.onCompletion;
+ case _ => stack.top.onCompletion
}
}
def onCompletion(predicate: Exchange => Boolean) = stack.top.onCompletion(predicate)
Modified: camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/builder/RouteBuilderSupport.scala
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/builder/RouteBuilderSupport.scala?rev=1411260&r1=1411259&r2=1411260&view=diff
==============================================================================
--- camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/builder/RouteBuilderSupport.scala (original)
+++ camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/builder/RouteBuilderSupport.scala Mon Nov 19 15:57:24 2012
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.scala.dsl.builder;
+package org.apache.camel.scala.dsl.builder
trait RouteBuilderSupport {
Modified: camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/languages/Languages.scala
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/languages/Languages.scala?rev=1411260&r1=1411259&r2=1411260&view=diff
==============================================================================
--- camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/languages/Languages.scala (original)
+++ camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/languages/Languages.scala Mon Nov 19 15:57:24 2012
@@ -92,7 +92,7 @@ trait Languages {
object Languages {
def evaluate(expression: String)(exchange: Exchange)(lang: String) : Any = {
- val language = exchange.getContext().resolveLanguage(lang)
+ val language = exchange.getContext.resolveLanguage(lang)
// return a language function as the language should support being
// evaluated as a predicate or expression depending on its usage
new LanguageFunction(language, expression)
Modified: camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/CamelTestSupportTest.scala
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/CamelTestSupportTest.scala?rev=1411260&r1=1411259&r2=1411260&view=diff
==============================================================================
--- camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/CamelTestSupportTest.scala (original)
+++ camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/CamelTestSupportTest.scala Mon Nov 19 15:57:24 2012
@@ -17,7 +17,6 @@
package org.apache.camel.scala
import org.apache.camel.test.junit4.CamelTestSupport
-import org.apache.camel.component.mock.MockEndpoint
import org.apache.camel.scala.dsl.builder.{RouteBuilder,RouteBuilderSupport}
import org.junit.Test
@@ -26,13 +25,13 @@ class CamelTestSupportTest extends Camel
override protected def createRouteBuilder = builder
@Test
- def testValidRequest{
+ def testValidRequest() {
val mock = getMockEndpoint("mock:output")
val message = "HelloWorld"
mock.expectedBodiesReceived(message)
template.sendBody("direct:start", message)
- assertMockEndpointsSatisfied
+ assertMockEndpointsSatisfied()
}
val builder = new RouteBuilder {
Modified: camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/RichMockEndpoint.scala
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/RichMockEndpoint.scala?rev=1411260&r1=1411259&r2=1411260&view=diff
==============================================================================
--- camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/RichMockEndpoint.scala (original)
+++ camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/RichMockEndpoint.scala Mon Nov 19 15:57:24 2012
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.scala;
+package org.apache.camel.scala
import org.apache.camel.component.mock.MockEndpoint
Modified: camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/UsingModelTest.scala
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/UsingModelTest.scala?rev=1411260&r1=1411259&r2=1411260&view=diff
==============================================================================
--- camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/UsingModelTest.scala (original)
+++ camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/UsingModelTest.scala Mon Nov 19 15:57:24 2012
@@ -21,7 +21,6 @@ import junit.framework.Assert._
import org.apache.camel.model._
-
/**
* Test using the low level processor definition API from Scala.
*
@@ -30,14 +29,14 @@ import org.apache.camel.model._
*/
class UsingModelTest extends TestCase {
- def testUsingModel: Unit = {
+ def testUsingModel() = {
val routes = new RoutesDefinition
val route = routes.route
route.from("seda:foo")
val bean = new BeanDefinition("myBean", "someMethod")
route.addOutput(bean)
- assertEquals("Route[[From[seda:foo]] -> [Bean[ref:myBean method: someMethod]]]", route.toString())
+ assertEquals("Route[[From[seda:foo]] -> [Bean[ref:myBean method: someMethod]]]", route.toString)
}
}
Modified: camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/converter/ScalaTypeConverterTest.scala
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/converter/ScalaTypeConverterTest.scala?rev=1411260&r1=1411259&r2=1411260&view=diff
==============================================================================
--- camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/converter/ScalaTypeConverterTest.scala (original)
+++ camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/converter/ScalaTypeConverterTest.scala Mon Nov 19 15:57:24 2012
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.scala.converter;
+package org.apache.camel.scala.converter
import javax.xml.parsers.DocumentBuilderFactory
import org.apache.camel.test.junit4.CamelTestSupport
@@ -25,7 +25,6 @@ import org.w3c.dom.Document
import scala.xml.Elem
-
/**
* Test case for ScalaTypeConverter
*/
@@ -40,6 +39,7 @@ class ScalaTypeConverterTest extends Cam
assertNotNull(result.getElementsByTagName("persons"))
}
+ @Test
def testXmlStringToElemConverter = {
val exchange = context.getEndpoint("direct:start").createExchange
Modified: camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/AggregatorTest.scala
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/AggregatorTest.scala?rev=1411260&r1=1411259&r2=1411260&view=diff
==============================================================================
--- camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/AggregatorTest.scala (original)
+++ camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/AggregatorTest.scala Mon Nov 19 15:57:24 2012
@@ -14,9 +14,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.scala.dsl;
+package org.apache.camel.scala.dsl
-import org.apache.camel.processor.aggregate.UseLatestAggregationStrategy;
+import org.apache.camel.processor.aggregate.UseLatestAggregationStrategy
import org.junit.Test
import builder.RouteBuilder
Modified: camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/BasicRouteBuilderTest.scala
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/BasicRouteBuilderTest.scala?rev=1411260&r1=1411259&r2=1411260&view=diff
==============================================================================
--- camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/BasicRouteBuilderTest.scala (original)
+++ camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/BasicRouteBuilderTest.scala Mon Nov 19 15:57:24 2012
@@ -24,6 +24,7 @@ class BasicRouteBuilderTest extends Scal
@Test
def testBasicRouteArrowSyntax() = assertBasicRoute("direct:a", "mock:a")
+
@Test
def testBasicRouteTextSyntax() = assertBasicRoute("direct:b", "mock:b")
Modified: camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/BlockBeanTest.scala
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/BlockBeanTest.scala?rev=1411260&r1=1411259&r2=1411260&view=diff
==============================================================================
--- camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/BlockBeanTest.scala (original)
+++ camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/BlockBeanTest.scala Mon Nov 19 15:57:24 2012
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.scala.dsl;
+package org.apache.camel.scala.dsl
import builder.RouteBuilder
import org.apache.camel.scala.test.CartoonService
Modified: camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/CamelCBRTest.scala
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/CamelCBRTest.scala?rev=1411260&r1=1411259&r2=1411260&view=diff
==============================================================================
--- camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/CamelCBRTest.scala (original)
+++ camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/CamelCBRTest.scala Mon Nov 19 15:57:24 2012
@@ -31,7 +31,7 @@ class CamelCBRTest extends CamelTestSupp
template.sendBody("direct:start", "foo")
- assertMockEndpointsSatisfied
+ assertMockEndpointsSatisfied()
}
@Test
@@ -41,7 +41,7 @@ class CamelCBRTest extends CamelTestSupp
template.sendBody("direct:start", "bar")
- assertMockEndpointsSatisfied
+ assertMockEndpointsSatisfied()
}
val builder = new RouteBuilder {
Modified: camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/ContentBasedRouterTest.scala
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/ContentBasedRouterTest.scala?rev=1411260&r1=1411259&r2=1411260&view=diff
==============================================================================
--- camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/ContentBasedRouterTest.scala (original)
+++ camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/ContentBasedRouterTest.scala Mon Nov 19 15:57:24 2012
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.scala.dsl;
+package org.apache.camel.scala.dsl
import org.junit.Test
import builder.RouteBuilder
@@ -22,7 +22,7 @@ import builder.RouteBuilder
class ContentBasedRouterTest extends ScalaTestSupport {
@Test
- def testSimpleContentBasedRouter = {
+ def testSimpleContentBasedRouter() = {
"mock:polyglot" expect {_.expectedMessageCount(3)}
"mock:english" expect {_.received("<hello/>")}
"mock:dutch" expect {_.received("<hallo/>")}
Modified: camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/ContentEnricherTest.scala
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/ContentEnricherTest.scala?rev=1411260&r1=1411259&r2=1411260&view=diff
==============================================================================
--- camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/ContentEnricherTest.scala (original)
+++ camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/ContentEnricherTest.scala Mon Nov 19 15:57:24 2012
@@ -15,14 +15,15 @@
* limitations under the License.
*/
package org.apache.camel
-package scala.dsl;
+package scala.dsl
import org.junit.Test
import builder.RouteBuilder
class ContentEnricherTest extends ScalaTestSupport {
+
@Test
- def testContentEnricherBySimpleProcessor = {
+ def testContentEnricherBySimpleProcessor() = {
"mock:a" expect { _.received ("James says hello",
"Hadrian says hello",
"Willem says hello")}
@@ -31,7 +32,7 @@ class ContentEnricherTest extends ScalaT
}
@Test
- def testContentEnricherByProcessorDef = {
+ def testContentEnricherByProcessorDef() = {
"mock:b" expect { _.received ("hello from the UK",
"hallo vanuit Belgie",
"bonjour de la douce France")}
@@ -40,7 +41,7 @@ class ContentEnricherTest extends ScalaT
}
@Test
- def testContentEnricherWithVelocity = {
+ def testContentEnricherWithVelocity() = {
"mock:c" expect { _.received ("<hello>James</hello>",
"<hello>Hadrian</hello>",
"<hello>Willem</hello>")}
Modified: camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/DataFormatTest.scala
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/DataFormatTest.scala?rev=1411260&r1=1411259&r2=1411260&view=diff
==============================================================================
--- camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/DataFormatTest.scala (original)
+++ camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/DataFormatTest.scala Mon Nov 19 15:57:24 2012
@@ -15,7 +15,7 @@
* limitations under the License.
*/
package org.apache.camel.scala
-package dsl;
+package dsl
import org.junit.Test
import builder.RouteBuilder
@@ -27,12 +27,12 @@ import test.Adult
class DataFormatTest extends ScalaTestSupport {
@Test
- def testSimpleTrottler = {
+ def testSimpleTrottler() = {
val person = new Adult("Captain Nemo")
"mock:a" expect { _.received(person) }
- test {
- "direct:a" ! person
- }
+ test {
+ "direct:a" ! person
+ }
}
val builder =
Modified: camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/DelayerTest.scala
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/DelayerTest.scala?rev=1411260&r1=1411259&r2=1411260&view=diff
==============================================================================
--- camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/DelayerTest.scala (original)
+++ camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/DelayerTest.scala Mon Nov 19 15:57:24 2012
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.scala.dsl;
+package org.apache.camel.scala.dsl
import org.junit.Test
import builder.RouteBuilder
@@ -25,17 +25,18 @@ import builder.RouteBuilder
class DelayerTest extends ScalaTestSupport {
@Test
- def testSimpleDelayer = {
+ def testSimpleDelayer() = {
"mock:a" expect { _.count = 0 }
"seda:a" ! "any given message"
"mock:a" assert()
//messages should only arrive after waiting a while
"mock:a" expect { _.count = 1 }
"mock:a" expect { _.setResultWaitTime(2500)}
- "mock:a" assert();
+ "mock:a" assert()
}
-
- def testBlockDelayer = {
+
+ @Test
+ def testBlockDelayer() = {
"mock:b" expect { _.count = 1 }
"mock:c" expect { _.count = 0 }
"seda:b" ! "any given message"
Modified: camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/EnricherTest.scala
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/EnricherTest.scala?rev=1411260&r1=1411259&r2=1411260&view=diff
==============================================================================
--- camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/EnricherTest.scala (original)
+++ camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/EnricherTest.scala Mon Nov 19 15:57:24 2012
@@ -26,9 +26,10 @@ import builder.RouteBuilder
class EnricherTest extends ScalaTestSupport {
@Test
- def testSimpleEnricher = testEnricher("direct:a", "mock:a")
+ def testSimpleEnricher() = testEnricher("direct:a", "mock:a")
+
@Test
- def testBlockEnricher = testEnricher("direct:b", "mock:b")
+ def testBlockEnricher() = testEnricher("direct:b", "mock:b")
def testEnricher(direct: String, mock: String) = {
mock expect { _.received ("France:Paris", "UK:London") }
Modified: camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/ExceptionHandlerTest.scala
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/ExceptionHandlerTest.scala?rev=1411260&r1=1411259&r2=1411260&view=diff
==============================================================================
--- camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/ExceptionHandlerTest.scala (original)
+++ camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/ExceptionHandlerTest.scala Mon Nov 19 15:57:24 2012
@@ -15,7 +15,7 @@
* limitations under the License.
*/
package org.apache.camel
-package scala.dsl;
+package scala.dsl
import org.junit.Test
import builder.RouteBuilder
@@ -26,10 +26,10 @@ import junit.framework.Assert._
*/
class ExceptionHandlerTest extends ScalaTestSupport {
- var handled = false;
+ var handled = false
@Test
- def testTryCatchFinally = {
+ def testTryCatchFinally() = {
"mock:a" expect { _.count = 1 }
"mock:b" expect { _.count = 1 }
"mock:c" expect { _.count = 1 }
@@ -52,7 +52,7 @@ class ExceptionHandlerTest extends Scala
val catchProcessor = (exchange: Exchange) => {
// we shouldn't get any Strings here
- assertFalse(exchange.getIn().getBody().getClass().equals(classOf[String]))
+ assertFalse(exchange.getIn.getBody.getClass.equals(classOf[String]))
// the exchange shouldn't have been marked failed
assertFalse(exchange.isFailed)
}
Modified: camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/FilterRouteBuilderTest.scala
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/FilterRouteBuilderTest.scala?rev=1411260&r1=1411259&r2=1411260&view=diff
==============================================================================
--- camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/FilterRouteBuilderTest.scala (original)
+++ camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/FilterRouteBuilderTest.scala Mon Nov 19 15:57:24 2012
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.scala.dsl;
+package org.apache.camel.scala.dsl
import org.junit.Test
import builder.RouteBuilder
@@ -25,7 +25,7 @@ class FilterRouteBuilderTest extends Sca
def testSimpleFilter() = {
"mock:a" expect {_.expectedMessageCount(1)}
"direct:a" ! ("<hello/>", "<hellos/>")
- "mock:a" assert
+ "mock:a" assert()
}
@Test
Modified: camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/HeaderContentBasedRouterTest.scala
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/HeaderContentBasedRouterTest.scala?rev=1411260&r1=1411259&r2=1411260&view=diff
==============================================================================
--- camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/HeaderContentBasedRouterTest.scala (original)
+++ camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/HeaderContentBasedRouterTest.scala Mon Nov 19 15:57:24 2012
@@ -25,7 +25,7 @@ import builder.RouteBuilder
class HeaderContentBasedRouterTest extends ScalaTestSupport {
@Test
- def testXPathContentBasedRouter = {
+ def testXPathContentBasedRouter() = {
"mock:foo" expect {_.expectedBodiesReceived("Hello Foo")}
"mock:bar" expect {_.expectedBodiesReceived("Hello Bar")}
"mock:other" expect {_.expectedBodiesReceived("Hello World")}
Modified: camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/IdTest.scala
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/IdTest.scala?rev=1411260&r1=1411259&r2=1411260&view=diff
==============================================================================
--- camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/IdTest.scala (original)
+++ camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/IdTest.scala Mon Nov 19 15:57:24 2012
@@ -32,13 +32,13 @@ class IdTest extends ScalaTestSupport {
"direct:a" ! "Hello World"
}
- assertMockEndpointsSatisfied
+ assertMockEndpointsSatisfied()
- assertEquals("foo", context.getRouteDefinition("route-a").getOutputs.get(0).getId())
+ assertEquals("foo", context.getRouteDefinition("route-a").getOutputs.get(0).getId)
}
@Test
- def testRouteB = {
+ def testRouteB() = {
"mock:b" expect { _.expectedMessageCount(1)}
"mock:result" expect { _.expectedMessageCount(1)}
@@ -46,9 +46,9 @@ class IdTest extends ScalaTestSupport {
"direct:b" ! "Hello World"
}
- assertMockEndpointsSatisfied
+ assertMockEndpointsSatisfied()
- assertEquals("bar", context.getRouteDefinition("route-b").getOutputs.get(0).getId())
+ assertEquals("bar", context.getRouteDefinition("route-b").getOutputs.get(0).getId)
}
val builder = new RouteBuilder {
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=1411260&r1=1411259&r2=1411260&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 Mon Nov 19 15:57:24 2012
@@ -14,13 +14,13 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.scala.dsl;
+package org.apache.camel.scala.dsl
import org.junit.Test
import builder.RouteBuilder
import org.apache.camel.processor.idempotent.MemoryIdempotentRepository
import org.apache.camel.spi.IdempotentRepository
-import org.apache.camel.{Processor, Exchange};
+import org.apache.camel.{Processor, Exchange}
/**
* Test for an idempotent consumer
@@ -29,10 +29,10 @@ class IdempotentConsumerTest extends Sca
@Test
def testSimple() = doTest("direct:a", "mock:a")
+
@Test
def testBlock() = doTest("direct:b", "mock:b")
-
-
+
def doTest(from: String, to: String) = {
to expect { _.received("message 1", "message 2", "message 3")}
def send = sendMessage(from, _:String, _:String)
@@ -49,7 +49,7 @@ class IdempotentConsumerTest extends Sca
def sendMessage(from: String, header: String, body: String) = {
template.send(from, new Processor() {
def process(exchange: Exchange) = {
- val in = exchange.getIn()
+ val in = exchange.getIn
in.setBody(body)
in.setHeader("messageId", header)
}
@@ -77,7 +77,7 @@ class IdempotentConsumerTest extends Sca
*/
class IdempotentConsumerEagerTest extends ScalaTestSupport {
- def testEagerIdempotentConsumer = {
+ def testEagerIdempotentConsumer() = {
"mock:result" expect { _.received("one", "two", "three")}
test {
sendMessage("1", "one")
@@ -90,21 +90,20 @@ class IdempotentConsumerEagerTest extend
template.send("direct:start", new Processor() {
def process(exchange: Exchange) {
// now lets fire in a message
- val in = exchange.getIn();
- in.setBody(body);
- in.setHeader("messageId", messageId);
+ val in = exchange.getIn
+ in.setBody(body)
+ in.setHeader("messageId", messageId)
}
- });
+ })
}
val builder = new RouteBuilder {
- val repo : IdempotentRepository[String] = MemoryIdempotentRepository.memoryIdempotentRepository(200);
-
+ val repo : IdempotentRepository[String] = MemoryIdempotentRepository.memoryIdempotentRepository(200)
"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])) {
+ if (repo.contains(exchange.getIn.getHeader("messageId").asInstanceOf[String])) {
// this is OK with the eager = true
} else {
throw new RuntimeException("IdemPotentConsumer eager handling is not working properly")
Modified: camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/InterceptFromTest.scala
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/InterceptFromTest.scala?rev=1411260&r1=1411259&r2=1411260&view=diff
==============================================================================
--- camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/InterceptFromTest.scala (original)
+++ camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/InterceptFromTest.scala Mon Nov 19 15:57:24 2012
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.scala.dsl;
+package org.apache.camel.scala.dsl
import builder.{RouteBuilderSupport, RouteBuilder}
import org.apache.camel.Exchange
@@ -32,9 +32,9 @@ class SInterceptFromSimpleRouteTest exte
override def createRouteBuilder = new RouteBuilder {
interceptFrom().when(livingIn("London")) {
to ("mock:intercepted")
- } stop
+ }.stop
- from("seda:a").to("mock:result");
+ from("seda:a").to("mock:result")
}
}
@@ -60,7 +60,7 @@ class SInterceptFromUriSimpleLogTest ext
class SInterceptFromWhenWithChoiceTest extends InterceptFromWhenWithChoiceTest with RouteBuilderSupport {
override def createRouteBuilder = new RouteBuilder {
- context.addInterceptStrategy(new Tracer());
+ context.addInterceptStrategy(new Tracer())
interceptFrom().when(simple("${body} contains 'Goofy'")) {
choice {
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=1411260&r1=1411259&r2=1411260&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 Mon Nov 19 15:57:24 2012
@@ -26,7 +26,7 @@ import org.apache.camel.processor.interc
class InterceptSendToTest extends ScalaTestSupport {
@Test
- def testSimpleSendTo = {
+ def testSimpleSendTo() = {
"mock:bar" expect {_.received("Hello World")}
"mock:detour" expect {_.received("Hello World")}
"mock:foo" expect {_.received("Bye World")}
@@ -56,7 +56,8 @@ class InterceptSendToTest extends ScalaT
*/
class InterceptSendToWithPredicateTest extends ScalaTestSupport {
- def testSendToWithWhen = {
+ @Test
+ def testSendToWithWhen() = {
"mock:bar" expect {_.received("Hello World", "Hi")}
"mock:detour" expect {_.received("Hello World")}
"mock:foo" expect {_.received("Bye World", "Hi")}
@@ -86,7 +87,8 @@ class InterceptSendToWithPredicateTest e
*/
class InterceptSendToSkipOriginalTest extends ScalaTestSupport {
- def testSendToAndSkipOriginal = {
+ @Test
+ def testSendToAndSkipOriginal() = {
"mock:bar" expect {_.received("Hello World")}
"mock:detour" expect {_.received("Bye World")}
"mock:foo" expect {_.count = 0}
Modified: camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/LoadBalancerTest.scala
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/LoadBalancerTest.scala?rev=1411260&r1=1411259&r2=1411260&view=diff
==============================================================================
--- camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/LoadBalancerTest.scala (original)
+++ camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/LoadBalancerTest.scala Mon Nov 19 15:57:24 2012
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.scala.dsl;
+package org.apache.camel.scala.dsl
import org.junit.Test
import builder.RouteBuilder
@@ -25,7 +25,7 @@ import builder.RouteBuilder
class LoadBalancerTest extends ScalaTestSupport {
@Test
- def testSimpleTrottler = {
+ def testSimpleTrottler() = {
"mock:a" expect { _.received("message 1", "message 4") }
"mock:b" expect { _.received("message 2", "message 5") }
"mock:c" expect { _.received("message 3", "message 6") }
Modified: camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/LoopTest.scala
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/LoopTest.scala?rev=1411260&r1=1411259&r2=1411260&view=diff
==============================================================================
--- camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/LoopTest.scala (original)
+++ camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/LoopTest.scala Mon Nov 19 15:57:24 2012
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.scala.dsl;
+package org.apache.camel.scala.dsl
import builder.RouteBuilder
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=1411260&r1=1411259&r2=1411260&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 Mon Nov 19 15:57:24 2012
@@ -23,7 +23,8 @@ import org.apache.camel.processor.Multic
class ExplicitMulticastTest extends ScalaTestSupport {
- def testExplicitMulticast = {
+ @Test
+ def testExplicitMulticast() = {
"mock:a" expect { _.count = 3 }
"mock:b" expect { _.count = 3 }
"mock:c" expect { _.count = 3 }
Modified: camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/OnExceptionTest.scala
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/OnExceptionTest.scala?rev=1411260&r1=1411259&r2=1411260&view=diff
==============================================================================
--- camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/OnExceptionTest.scala (original)
+++ camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/OnExceptionTest.scala Mon Nov 19 15:57:24 2012
@@ -75,19 +75,19 @@ class SOnExceptionRetryUntilWithDefaultE
var invoked = 0
@Test
- def testRetryUntil = {
- val out = template.requestBody("direct:start", "Hello World");
- assertEquals("Sorry", out);
- assertEquals(3, invoked);
+ def testRetryUntil() = {
+ val out = template.requestBody("direct:start", "Hello World")
+ assertEquals("Sorry", out)
+ assertEquals(3, invoked)
}
def threeTimes(exchange: Exchange) = {
- invoked += 1;
+ invoked += 1
- assertEquals("Hello World", exchange.in);
- assertTrue(exchange.getException.isInstanceOf[MyFunctionalException]);
+ assertEquals("Hello World", exchange.in)
+ assertTrue(exchange.getException.isInstanceOf[MyFunctionalException])
- exchange.getIn().getHeader(Exchange.REDELIVERY_COUNTER, classOf[Int]) < 3;
+ exchange.getIn.getHeader(Exchange.REDELIVERY_COUNTER, classOf[Int]) < 3
}
val builder = new RouteBuilder {
Modified: camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/PipelineAndMulticastTest.scala
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/PipelineAndMulticastTest.scala?rev=1411260&r1=1411259&r2=1411260&view=diff
==============================================================================
--- camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/PipelineAndMulticastTest.scala (original)
+++ camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/PipelineAndMulticastTest.scala Mon Nov 19 15:57:24 2012
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.scala.dsl;
+package org.apache.camel.scala.dsl
import builder.RouteBuilder
import org.junit.Test
@@ -22,13 +22,16 @@ import org.junit.Test
class PipelineAndMulticastTest extends ScalaTestSupport {
@Test
- def testArrowRoute = testRoute("direct:a", "mock:c", "mock:a", "mock:b")
+ def testArrowRoute() = testRoute("direct:a", "mock:c", "mock:a", "mock:b")
+
@Test
- def testToRoute = testRoute("direct:d", "mock:f", "mock:d", "mock:e")
+ def testToRoute() = testRoute("direct:d", "mock:f", "mock:d", "mock:e")
+
@Test
- def testArrowBlockRoute = testRoute("direct:g", "mock:i", "mock:g", "mock:h")
+ def testArrowBlockRoute() = testRoute("direct:g", "mock:i", "mock:g", "mock:h")
+
@Test
- def testToBlockRoute = testRoute("direct:j", "mock:l", "mock:j", "mock:k")
+ def testToBlockRoute() = testRoute("direct:j", "mock:l", "mock:j", "mock:k")
def testRoute(from: String, end: String, multis: String*) = {
multis.foreach ( _.expect { _.received("<hello/>")})
@@ -36,7 +39,7 @@ class PipelineAndMulticastTest extends S
val exchange = in("<hello/>")
exchange.out = "<olleh/>"
- getTemplate().send(from, exchange)
+ getTemplate.send(from, exchange)
multis.foreach( _.assert())
end assert()
Modified: camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/PipelineRouteBuilderTest.scala
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/PipelineRouteBuilderTest.scala?rev=1411260&r1=1411259&r2=1411260&view=diff
==============================================================================
--- camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/PipelineRouteBuilderTest.scala (original)
+++ camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/PipelineRouteBuilderTest.scala Mon Nov 19 15:57:24 2012
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.scala.dsl;
+package org.apache.camel.scala.dsl
import builder.RouteBuilder
import org.junit.Test
@@ -22,10 +22,13 @@ import org.junit.Test
class PipelineRouteBuilderTest extends ScalaTestSupport {
@Test
def testPipelineWithArrows() = testPipeline("direct:a", "mock:a", "mock:b")
+
@Test
def testPipelineWithTos() = testPipeline("direct:c", "mock:c", "mock:d")
+
@Test
def testPipelineBlockWithArrows() = testPipeline("direct:e", "mock:e", "mock:f")
+
@Test
def testPipelineBlockWithTos() = testPipeline("direct:g", "mock:g", "mock:h")
Modified: camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/PipelineTest.scala
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/PipelineTest.scala?rev=1411260&r1=1411259&r2=1411260&view=diff
==============================================================================
--- camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/PipelineTest.scala (original)
+++ camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/PipelineTest.scala Mon Nov 19 15:57:24 2012
@@ -25,7 +25,7 @@ import org.junit.Assert.assertNotNull
/**
* Unit tests for the explicit 'pipeline' DSL keyword
*/
-class SPipelineTest extends ScalaTestSupport {
+class PipelineTest extends ScalaTestSupport {
val increment = (exchange: Exchange) => {
val integer = exchange.getIn.getBody(classOf[Int])
@@ -36,8 +36,8 @@ class SPipelineTest extends ScalaTestSup
val out = exchange.getOut
out.copyFrom(exchange.getIn)
- out.setHeader("test", "testValue");
- out.addAttachment("test1.xml", new DataHandler(new FileDataSource("pom.xml")));
+ out.setHeader("test", "testValue")
+ out.addAttachment("test1.xml", new DataHandler(new FileDataSource("pom.xml")))
}
val removeHeaderAndAttachment = (exchange: Exchange) => {
@@ -51,7 +51,7 @@ class SPipelineTest extends ScalaTestSup
}
@Test
- def testIncrementSimple = {
+ def testIncrementSimple() = {
"mock:result" expect { _.received(new java.lang.Integer(4))}
test {
"direct:a" ! 1
@@ -59,7 +59,7 @@ class SPipelineTest extends ScalaTestSup
}
@Test
- def testIncrementBlock = {
+ def testIncrementBlock() = {
"mock:result" expect { _.received(new java.lang.Integer(4))}
test {
"direct:b" ! 1
@@ -67,7 +67,7 @@ class SPipelineTest extends ScalaTestSup
}
@Test
- def testExplicitPipeline = {
+ def testExplicitPipeline() = {
test {
"direct:start" ! "Hello world"
}
@@ -90,8 +90,8 @@ class SPipelineTest extends ScalaTestSup
"direct:start" ==> {
pipeline {
- process(setHeaderAndAttachment);
- process(removeHeaderAndAttachment);
+ process(setHeaderAndAttachment)
+ process(removeHeaderAndAttachment)
}
}
}
Modified: camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/RecipientListRouteTest.scala
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/RecipientListRouteTest.scala?rev=1411260&r1=1411259&r2=1411260&view=diff
==============================================================================
--- camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/RecipientListRouteTest.scala (original)
+++ camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/RecipientListRouteTest.scala Mon Nov 19 15:57:24 2012
@@ -24,21 +24,21 @@ import test.{Adult, Toddler, Envelope}
class RecipientListRouteTest extends ScalaTestSupport {
@Test
- def testRecipientList = {
+ def testRecipientList() = {
"mock:a" expect {_.count = 1}
"direct:a" ! ("send this message to mock:a", "send this message to mock:z")
"mock:a" assert()
}
@Test
- def testRecipientListWithPatternMatching = {
+ def testRecipientListWithPatternMatching() = {
"mock:playgarden" expect {_.count = 1}
"direct:b" ! (new Adult("Gert"), new Toddler("Ewan"))
"mock:playgarden" assert()
}
@Test
- def testRecipientListWithJXPath = {
+ def testRecipientListWithJXPath() = {
"mock:c" expect {_.count = 2}
"mock:d" expect {_.count = 1}
"direct:c" ! (new Envelope("mock:d"), new Envelope("mock:y"))
@@ -52,7 +52,7 @@ class RecipientListRouteTest extends Sca
//END SNIPPET: simple
//START SNIPPET: pattern
- "direct:b" recipients(_.getIn().getBody() match {
+ "direct:b" recipients(_.getIn.getBody match {
case Toddler(_) => "mock:playgarden"
case _ => "mock:work"
})
Modified: camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/ResequencerTest.scala
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/ResequencerTest.scala?rev=1411260&r1=1411259&r2=1411260&view=diff
==============================================================================
--- camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/ResequencerTest.scala (original)
+++ camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/ResequencerTest.scala Mon Nov 19 15:57:24 2012
@@ -14,10 +14,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.scala.dsl;
+package org.apache.camel.scala.dsl
import org.junit.Test
-import org.w3c.dom.Document
import builder.RouteBuilder
/**
@@ -26,7 +25,7 @@ import builder.RouteBuilder
class ResequencerTest extends ScalaTestSupport {
@Test
- def testSimpleResequencer = {
+ def testSimpleResequencer() = {
"mock:a" expect { _.received("message 1", "message 2", "message 3", "message 4", "message 5") }
test {
"direct:a" ! ("message 5", "message 1", "message 3", "message 2", "message 4")
@@ -34,7 +33,7 @@ class ResequencerTest extends ScalaTestS
}
@Test
- def testBlockResequencer = {
+ def testBlockResequencer() = {
"mock:b" expect (_.received("message 5", "message 1", "message 3", "message 2", "message 4"))
"mock:c" expect (_.received("message 1", "message 2", "message 3", "message 4", "message 5"))
test {
@@ -43,7 +42,7 @@ class ResequencerTest extends ScalaTestS
}
@Test
- def testBatchResequencer = {
+ def testBatchResequencer() = {
"mock:d" expect (_.received("message 5", "message 1", "message 3", "message 2"))
"mock:e" expect (_.count = 0)
test {
@@ -81,5 +80,4 @@ class ResequencerTest extends ScalaTestS
//END SNIPPET: batch
}
-
}
Modified: camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/RichTestUri.scala
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/RichTestUri.scala?rev=1411260&r1=1411259&r2=1411260&view=diff
==============================================================================
--- camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/RichTestUri.scala (original)
+++ camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/RichTestUri.scala Mon Nov 19 15:57:24 2012
@@ -24,8 +24,8 @@ class RichTestUri(uri: String, support:
def !(messages: Any*) = {
messages.foreach {
_ match {
- case exchange: Exchange => support.getTemplate().send(uri, exchange)
- case anything: Any => support.getTemplate().sendBody(uri, anything)
+ case exchange: Exchange => support.getTemplate.send(uri, exchange)
+ case anything: Any => support.getTemplate.sendBody(uri, anything)
}
}
}
Modified: camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/RollbackTest.scala
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/RollbackTest.scala?rev=1411260&r1=1411259&r2=1411260&view=diff
==============================================================================
--- camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/RollbackTest.scala (original)
+++ camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/RollbackTest.scala Mon Nov 19 15:57:24 2012
@@ -26,24 +26,24 @@ import junit.framework.Assert._
*/
class RollbackTest extends ScalaTestSupport {
- var handled = false;
+ var handled = false
@Test
- def testSimple = {
+ def testSimple() = {
test {
try {
template.requestBody("direct:a", "The Joker")
fail("Expected a RollbackExchangeException")
} catch {
// oh no, not the Joker again, let's send Batman
- case e: RuntimeCamelException if (e.getCause().isInstanceOf[RollbackExchangeException]) => template.requestBody("direct:a", "Batman")
+ case e: RuntimeCamelException if (e.getCause.isInstanceOf[RollbackExchangeException]) => template.requestBody("direct:a", "Batman")
case unknown => fail("We didn't expect " + unknown)
}
}
}
@Test
- def testBlock = {
+ def testBlock() = {
"mock:b" expect { _.count = 2 }
"mock:ok" expect { _.count = 1 }
test {
@@ -52,7 +52,7 @@ class RollbackTest extends ScalaTestSupp
fail("Expected a RollbackExchangeException")
} catch {
// oh no, not Lex Luthor again, let's send Superman
- case e: RuntimeCamelException if (e.getCause().isInstanceOf[RollbackExchangeException]) => template.requestBody("direct:b", "Superman")
+ case e: RuntimeCamelException if (e.getCause.isInstanceOf[RollbackExchangeException]) => template.requestBody("direct:b", "Superman")
case unknown => fail("We didn't expect " + unknown)
}
}
@@ -61,7 +61,7 @@ class RollbackTest extends ScalaTestSupp
val builder =
new RouteBuilder {
//START SNIPPET: simple
- "direct:a" to("mock:a") when(_.in != "Batman") rollback;
+ "direct:a" to("mock:a") when(_.in != "Batman") rollback
//END SNIPPET: simple
//START SNIPPET: block
Modified: camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/RouteErrorHandlerTest.scala
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/RouteErrorHandlerTest.scala?rev=1411260&r1=1411259&r2=1411260&view=diff
==============================================================================
--- camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/RouteErrorHandlerTest.scala (original)
+++ camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/RouteErrorHandlerTest.scala Mon Nov 19 15:57:24 2012
@@ -24,7 +24,7 @@ import org.junit.Assert._
class RouteErrorHandlerTest extends ScalaTestSupport {
@Test
- def testRouteHandlerActive {
+ def testRouteHandlerActive() {
"mock:deadLetter" expect {
_.expectedMessageCount(1)
}
@@ -36,7 +36,7 @@ class RouteErrorHandlerTest extends Scal
}
@Test
- def testContextHandlerStillActive {
+ def testContextHandlerStillActive() {
try {
test {
"direct:noHandler" ! "hello world"
@@ -53,5 +53,5 @@ class RouteErrorHandlerTest extends Scal
"direct:hasHandler" errorHandler (deadLetterChannel("mock:deadLetter")) process (causeError _) to "mock:hasHandler"
}
- def causeError(exch: Exchange) = throw new Exception("Error in route.")
+ def causeError(exchange: Exchange) = throw new Exception("Error in route.")
}
\ No newline at end of file
Modified: camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/RouteIdTest.scala
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/RouteIdTest.scala?rev=1411260&r1=1411259&r2=1411260&view=diff
==============================================================================
--- camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/RouteIdTest.scala (original)
+++ camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/RouteIdTest.scala Mon Nov 19 15:57:24 2012
@@ -24,29 +24,29 @@ import org.junit.Assert.assertEquals
class RouteIdTest extends ScalaTestSupport {
@Test
- def testRouteA = {
+ def testRouteA() = {
"mock:a" expect { _.expectedMessageCount(1)}
test {
"direct:a" ! "Hello World"
}
- assertMockEndpointsSatisfied
+ assertMockEndpointsSatisfied()
- assertEquals("route-a", context.getRouteDefinitions.get(0).getId());
+ assertEquals("route-a", context.getRouteDefinitions.get(0).getId)
}
@Test
- def testRouteB = {
+ def testRouteB() = {
"mock:b" expect { _.expectedMessageCount(1)}
test {
"direct:b" ! "Hello World"
}
- assertMockEndpointsSatisfied
+ assertMockEndpointsSatisfied()
- assertEquals("route-b", context.getRouteDefinitions.get(1).getId());
+ assertEquals("route-b", context.getRouteDefinitions.get(1).getId)
}
val builder = new RouteBuilder {
Modified: camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/SOnCompletionGlobalTest.scala
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/SOnCompletionGlobalTest.scala?rev=1411260&r1=1411259&r2=1411260&view=diff
==============================================================================
--- camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/SOnCompletionGlobalTest.scala (original)
+++ camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/SOnCompletionGlobalTest.scala Mon Nov 19 15:57:24 2012
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.scala.dsl;
+package org.apache.camel.scala.dsl
import org.apache.camel.processor.OnCompletionGlobalTest
import org.apache.camel.processor.OnCompletionGlobalTest.MyProcessor
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=1411260&r1=1411259&r2=1411260&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 Mon Nov 19 15:57:24 2012
@@ -33,7 +33,7 @@ class SOnCompletionOnFailureOnlyTest ext
to("mock:result")
}
- def containsHello(exchange: Exchange) = exchange.getIn().getBody(classOf[String]).contains("Hello");
+ def containsHello(exchange: Exchange) = exchange.getIn.getBody(classOf[String]).contains("Hello")
}
}
Modified: camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/SOnCompletionWhenTest.scala
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/SOnCompletionWhenTest.scala?rev=1411260&r1=1411259&r2=1411260&view=diff
==============================================================================
--- camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/SOnCompletionWhenTest.scala (original)
+++ camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/SOnCompletionWhenTest.scala Mon Nov 19 15:57:24 2012
@@ -31,7 +31,7 @@ class SOnCompletionWhenTest extends OnCo
to("mock:result")
}
- def containsHello(exchange: Exchange) = exchange.getIn().getBody(classOf[String]).contains("Hello");
+ def containsHello(exchange: Exchange) = exchange.getIn.getBody(classOf[String]).contains("Hello")
}
}
\ No newline at end of file
Modified: camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/SSortTest.scala
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/SSortTest.scala?rev=1411260&r1=1411259&r2=1411260&view=diff
==============================================================================
--- camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/SSortTest.scala (original)
+++ camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/SSortTest.scala Mon Nov 19 15:57:24 2012
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.scala.dsl;
+package org.apache.camel.scala.dsl
import builder.{RouteBuilder, RouteBuilderSupport}
import org.apache.camel.processor.SortExpressionTest.MyReverseComparator
Modified: camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/SThrowExceptionTest.scala
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/SThrowExceptionTest.scala?rev=1411260&r1=1411259&r2=1411260&view=diff
==============================================================================
--- camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/SThrowExceptionTest.scala (original)
+++ camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/SThrowExceptionTest.scala Mon Nov 19 15:57:24 2012
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.scala.dsl;
+package org.apache.camel.scala.dsl
import builder.{RouteBuilder, RouteBuilderSupport}
import org.apache.camel.processor.ThrowExceptionTest
@@ -28,7 +28,7 @@ class SThrowExceptionTest extends ThrowE
"direct:start" ==> {
to("mock:start")
throwException(new IllegalArgumentException("Forced"))
- to("mock:result");
+ to("mock:result")
}
}
}
Modified: camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/STransformProcessorTest.scala
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/STransformProcessorTest.scala?rev=1411260&r1=1411259&r2=1411260&view=diff
==============================================================================
--- camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/STransformProcessorTest.scala (original)
+++ camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/STransformProcessorTest.scala Mon Nov 19 15:57:24 2012
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.scala.dsl;
+package org.apache.camel.scala.dsl
import builder.{RouteBuilder, RouteBuilderSupport}
import org.apache.camel.processor.TransformProcessorTest
@@ -35,7 +35,6 @@ class STransformProcessorSimpleTest exte
class STransformProcessorBlockTest extends TransformProcessorTest with RouteBuilderSupport {
override def createRouteBuilder = new RouteBuilder {
-
"direct:start" ==> {
transform(_.in[String] + " World!")
to("mock:result")