Updated Branches: refs/heads/master e6eff40bc -> 3cb60dd92
CAMEL-6315: Fixed some scala compile warnings. Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/3cb60dd9 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/3cb60dd9 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/3cb60dd9 Branch: refs/heads/master Commit: 3cb60dd92cf006002a6aa601b8b13385c9f1555b Parents: e6eff40 Author: Claus Ibsen <davscl...@apache.org> Authored: Sat May 11 08:49:41 2013 +0200 Committer: Claus Ibsen <davscl...@apache.org> Committed: Sat May 11 08:49:41 2013 +0200 ---------------------------------------------------------------------- .../org/apache/camel/scala/RichExchange.scala | 2 +- .../camel/scala/converter/ScalaCollections.scala | 3 --- .../camel/scala/dsl/SAbstractDefinition.scala | 2 +- .../camel/scala/dsl/builder/RouteBuilder.scala | 2 +- .../camel/scala/converter/ConverterSpec.scala | 2 +- .../org/apache/camel/scala/dsl/RollbackTest.scala | 4 ++-- 6 files changed, 6 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/3cb60dd9/components/camel-scala/src/main/scala/org/apache/camel/scala/RichExchange.scala ---------------------------------------------------------------------- diff --git a/components/camel-scala/src/main/scala/org/apache/camel/scala/RichExchange.scala b/components/camel-scala/src/main/scala/org/apache/camel/scala/RichExchange.scala index 690609e..467cd97 100644 --- a/components/camel-scala/src/main/scala/org/apache/camel/scala/RichExchange.scala +++ b/components/camel-scala/src/main/scala/org/apache/camel/scala/RichExchange.scala @@ -32,7 +32,7 @@ class RichExchange(val exchange : Exchange) extends Exchange { def in(header:String) : Any = exchange.getIn.getHeader(header) def in = exchange.getIn.getBody - def in[T](implicit manifest: Manifest[T]) : T = exchange.getIn.getBody(manifest.erasure).asInstanceOf[T] + def in[T](implicit manifest: Manifest[T]) : T = exchange.getIn.getBody(manifest.runtimeClass).asInstanceOf[T] def out = exchange.getOut.getBody http://git-wip-us.apache.org/repos/asf/camel/blob/3cb60dd9/components/camel-scala/src/main/scala/org/apache/camel/scala/converter/ScalaCollections.scala ---------------------------------------------------------------------- diff --git a/components/camel-scala/src/main/scala/org/apache/camel/scala/converter/ScalaCollections.scala b/components/camel-scala/src/main/scala/org/apache/camel/scala/converter/ScalaCollections.scala index 0869243..0f57b2b 100644 --- a/components/camel-scala/src/main/scala/org/apache/camel/scala/converter/ScalaCollections.scala +++ b/components/camel-scala/src/main/scala/org/apache/camel/scala/converter/ScalaCollections.scala @@ -18,9 +18,6 @@ package org.apache.camel.scala.converter import org.apache.camel.Converter import collection.JavaConversions._ -/** - * @author Alexander Azarov <aza...@osinka.ru> - */ @Converter class ScalaImmutableCollections { import collection.{Iterator, Iterable, Map, Seq, Set} http://git-wip-us.apache.org/repos/asf/camel/blob/3cb60dd9/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SAbstractDefinition.scala ---------------------------------------------------------------------- diff --git a/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SAbstractDefinition.scala b/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SAbstractDefinition.scala index e4ad9c6..9cc34c4 100644 --- a/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SAbstractDefinition.scala +++ b/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SAbstractDefinition.scala @@ -74,7 +74,7 @@ abstract class SAbstractDefinition[P <: ProcessorDefinition[_]] extends DSL with def filter(predicate: Exchange => Any) = SFilterDefinition(target.filter(predicateBuilder(predicate))) - def handle[E <: Throwable](block: => Unit)(implicit manifest: Manifest[E]) = SOnExceptionDefinition[E](target.onException(manifest.erasure.asInstanceOf[Class[Throwable]])).apply(block) + def handle[E <: Throwable](block: => Unit)(implicit manifest: Manifest[E]) = SOnExceptionDefinition[E](target.onException(manifest.runtimeClass.asInstanceOf[Class[Throwable]])).apply(block) def id(id : String) = wrap(target.id(id)) def idempotentConsumer(expression: Exchange => Any) = SIdempotentConsumerDefinition(target.idempotentConsumer(expression, null)) http://git-wip-us.apache.org/repos/asf/camel/blob/3cb60dd9/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/builder/RouteBuilder.scala ---------------------------------------------------------------------- diff --git a/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/builder/RouteBuilder.scala b/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/builder/RouteBuilder.scala index c283c6d..16b42e0 100644 --- a/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/builder/RouteBuilder.scala +++ b/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/builder/RouteBuilder.scala @@ -85,7 +85,7 @@ class RouteBuilder extends Preamble with DSL with RoutesBuilder with Languages w */ def handle[E <: Throwable](block: => Unit)(implicit manifest: Manifest[E]) = { stack.size match { - case 0 => SOnExceptionDefinition[E](builder.onException(manifest.erasure.asInstanceOf[Class[Throwable]]))(this).apply(block) + case 0 => SOnExceptionDefinition[E](builder.onException(manifest.runtimeClass.asInstanceOf[Class[Throwable]]))(this).apply(block) case _ => stack.top.handle[E](block) } } http://git-wip-us.apache.org/repos/asf/camel/blob/3cb60dd9/components/camel-scala/src/test/scala/org/apache/camel/scala/converter/ConverterSpec.scala ---------------------------------------------------------------------- diff --git a/components/camel-scala/src/test/scala/org/apache/camel/scala/converter/ConverterSpec.scala b/components/camel-scala/src/test/scala/org/apache/camel/scala/converter/ConverterSpec.scala index 166920b..b5d1c62 100644 --- a/components/camel-scala/src/test/scala/org/apache/camel/scala/converter/ConverterSpec.scala +++ b/components/camel-scala/src/test/scala/org/apache/camel/scala/converter/ConverterSpec.scala @@ -200,5 +200,5 @@ class ConverterSpec extends FunSpec with CamelSpec with MustMatchers { } - private def to[T](x: AnyRef)(implicit m: Manifest[T]): Option[T] = Option( context.getTypeConverter.mandatoryConvertTo(m.erasure, createExchange, x).asInstanceOf[T] ) + private def to[T](x: AnyRef)(implicit m: Manifest[T]): Option[T] = Option( context.getTypeConverter.mandatoryConvertTo(m.runtimeClass, createExchange, x).asInstanceOf[T] ) } http://git-wip-us.apache.org/repos/asf/camel/blob/3cb60dd9/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/RollbackTest.scala ---------------------------------------------------------------------- diff --git a/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/RollbackTest.scala b/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/RollbackTest.scala index 16e789b..b594fda 100644 --- a/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/RollbackTest.scala +++ b/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/RollbackTest.scala @@ -37,7 +37,7 @@ class RollbackTest extends ScalaTestSupport { } 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 unknown => fail("We didn't expect " + unknown) + case unknown : Throwable => fail("We didn't expect " + unknown) } } } @@ -53,7 +53,7 @@ class RollbackTest extends ScalaTestSupport { } 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 unknown => fail("We didn't expect " + unknown) + case unknown : Throwable => fail("We didn't expect " + unknown) } } }
