Fixed scala compiler warnings
Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/683b0ffe Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/683b0ffe Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/683b0ffe Branch: refs/heads/master Commit: 683b0ffe8f958c90052f9fbdbb3910337c186e28 Parents: 43d1462 Author: Claus Ibsen <davscl...@apache.org> Authored: Thu Jul 24 10:31:31 2014 +0200 Committer: Claus Ibsen <davscl...@apache.org> Committed: Thu Jul 24 10:31:31 2014 +0200 ---------------------------------------------------------------------- components/camel-scala/pom.xml | 4 +- .../org/apache/camel/scala/RichMessage.scala | 74 +++++++++++--------- .../camel/scala/dsl/SAbstractDefinition.scala | 10 ++- .../camel/scala/dsl/builder/RouteBuilder.scala | 4 +- 4 files changed, 47 insertions(+), 45 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/683b0ffe/components/camel-scala/pom.xml ---------------------------------------------------------------------- diff --git a/components/camel-scala/pom.xml b/components/camel-scala/pom.xml index 434c802..382507d 100644 --- a/components/camel-scala/pom.xml +++ b/components/camel-scala/pom.xml @@ -31,7 +31,7 @@ <properties> <camel.osgi.import.before.defaults> - scala.*;version="[2.10,2.11)" + scala.*;version="[2.11,2.12)" </camel.osgi.import.before.defaults> <camel.osgi.export.pkg>org.apache.camel.scala.*</camel.osgi.export.pkg> </properties> @@ -134,7 +134,7 @@ </goals> </pluginExecutionFilter> <action> - <ignore /> + <ignore/> </action> </pluginExecution> </pluginExecutions> http://git-wip-us.apache.org/repos/asf/camel/blob/683b0ffe/components/camel-scala/src/main/scala/org/apache/camel/scala/RichMessage.scala ---------------------------------------------------------------------- diff --git a/components/camel-scala/src/main/scala/org/apache/camel/scala/RichMessage.scala b/components/camel-scala/src/main/scala/org/apache/camel/scala/RichMessage.scala index e45ed08..63737c4 100644 --- a/components/camel-scala/src/main/scala/org/apache/camel/scala/RichMessage.scala +++ b/components/camel-scala/src/main/scala/org/apache/camel/scala/RichMessage.scala @@ -6,7 +6,7 @@ * (the "License"); you may not use this file except in compliance with * the License. You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, @@ -17,77 +17,81 @@ package org.apache.camel.scala import org.apache.camel.Message -import java.util.Map import java.lang.{Class, String} import javax.activation.DataHandler +import java.util class RichMessage(val message: Message) extends Message { // Delegate methods //------------------------------------------------------------------------- - def setMessageId(messageId: String) { message.setMessageId(messageId) } + def addAttachment(id: String, content: DataHandler) { + message.addAttachment(id, content) + } - def setHeaders(headers: Map[String, Object]) { message.setHeaders(headers) } + def copy = new RichMessage(message.copy) - def setHeader(name: String, value: Any) { message.setHeader(name, value) } + def copyFrom(message: Message) { + message.copyFrom(message) + } - def setFault(fault: Boolean) { message.setFault(fault) } + @Deprecated + def createExchangeId = message.createExchangeId - def setBody[T](body: Any, bodyType : Class[T]) { message.setBody(body, bodyType) } + def getAttachment(id: String) = message.getAttachment(id) - def setBody(body: Any) {message.setBody()} + def getAttachmentNames = message.getAttachmentNames - def setAttachments(attachments: Map[String, DataHandler]) { message.setAttachments(attachments) } + def getAttachments = message.getAttachments - def removeHeader(name: String) = message.removeHeader(name) + def getBody = message.getBody - def removeHeaders(pattern: String) = message.removeHeaders(pattern) + def getBody[T](bodyType: Class[T]) = message.getBody(bodyType) - def removeHeaders(pattern: String, excludePatterns: String*) = message.removeHeaders(pattern, excludePatterns: _*) - - def removeAttachment(id: String) { message.removeAttachment(id) } + def getExchange = message.getExchange - def isFault = message.isFault + def getHeader(name: String) = message.getHeader(name) - def hasHeaders = message.hasHeaders + def getHeader(name: String, defaultValue: Any) = message.getHeader(name, defaultValue) - def hasAttachments = message.hasAttachments + def getHeader[T](name: String, defaultValue: Any, headerType: Class[T]) = message.getHeader(name, defaultValue, headerType) - def getMessageId = message.getMessageId + def getHeader[T](name: String, headerType: Class[T]) = message.getHeader(name, headerType) - def getMandatoryBody[T](bodyType : Class[T]) = message.getMandatoryBody(bodyType) + def getHeaders = message.getHeaders def getMandatoryBody = message.getMandatoryBody - def getHeaders = message.getHeaders + def getMandatoryBody[T](bodyType: Class[T]) = message.getMandatoryBody(bodyType) - def getHeader[T](name: String, headerType : Class[T]) = message.getHeader(name, headerType) + def getMessageId = message.getMessageId - def getHeader[T](name: String, defaultValue: Any, headerType : Class[T]) = message.getHeader(name, defaultValue, headerType) + def hasAttachments = message.hasAttachments - def getHeader(name: String, defaultValue: Any) = message.getHeader(name, defaultValue) + def hasHeaders = message.hasHeaders - def getHeader(name: String) = message.getHeader(name) + def isFault = message.isFault - def getExchange = message.getExchange + def removeAttachment(id: String) = message.removeAttachment(id) - def getBody[T](bodyType : Class[T]) = message.getBody(bodyType) + def removeHeader(name: String) = message.removeHeader(name) - def getBody = message.getBody + def removeHeaders(pattern: String) = message.removeHeaders(pattern) - def getAttachments = message.getAttachments + def removeHeaders(pattern: String, excludePatterns: String*) = message.removeHeaders(pattern, excludePatterns: _*) - def getAttachmentNames = message.getAttachmentNames + def setAttachments(attachments: util.Map[String, DataHandler]) = message.setAttachments(attachments) - def getAttachment(id: String) = message.getAttachment(id) + def setBody(body: Any) = message.setBody(body) - @Deprecated - def createExchangeId = message.createExchangeId + def setBody[T](body: Any, bodyType: Class[T]) = message.setBody(body, bodyType) - def copyFrom(message: Message) {message.copyFrom(message)} + def setFault(fault: Boolean) = message.setFault(fault) - def copy = new RichMessage(message.copy) + def setHeader(name: String, value: Any) = message.setHeader(name, value) + + def setHeaders(headers: util.Map[String, Object]) = message.setHeaders(headers) - def addAttachment(id: String, content: DataHandler) { message.addAttachment(id, content) } + def setMessageId(messageId: String) = message.setMessageId(messageId) } http://git-wip-us.apache.org/repos/asf/camel/blob/683b0ffe/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 cf07e40..a488997 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 @@ -99,11 +99,10 @@ abstract class SAbstractDefinition[P <: ProcessorDefinition[_]] extends DSL with completion.target.end completion } - def onCompletion(predicate: Exchange => Boolean) = onCompletion().when(predicate).asInstanceOf[SOnCompletionDefinition] + def onCompletion(predicate: Exchange => Boolean) = onCompletion.when(predicate).asInstanceOf[SOnCompletionDefinition] def onCompletion(config: Config[SOnCompletionDefinition]) = { - val completion = onCompletion().asInstanceOf[SOnCompletionDefinition] - config.configure(completion) - completion + config.configure(onCompletion) + onCompletion } def otherwise: SChoiceDefinition = throw new Exception("otherwise is only supported in a choice block or after a when statement") @@ -155,10 +154,9 @@ abstract class SAbstractDefinition[P <: ProcessorDefinition[_]] extends DSL with def to(uris: String*) = { uris.length match { case 1 => target.to(uris(0)) - case _ => { + case _ => val multi = multicast uris.foreach(multi.to(_)) - } } this } http://git-wip-us.apache.org/repos/asf/camel/blob/683b0ffe/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 7920793..05fb0aa 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 @@ -50,11 +50,11 @@ class RouteBuilder extends Preamble with DSL with RoutesBuilder with Languages w val serialization = new org.apache.camel.model.dataformat.SerializationDataFormat val failureOnly = new Config[SOnCompletionDefinition] { - def configure(target: SOnCompletionDefinition) { target.onFailureOnly() } + def configure(target: SOnCompletionDefinition) { target.onFailureOnly } } val completeOnly = new Config[SOnCompletionDefinition] { - def configure(target: SOnCompletionDefinition) { target.onCompleteOnly() } + def configure(target: SOnCompletionDefinition) { target.onCompleteOnly } } /**
