You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ni...@apache.org on 2012/12/06 07:45:09 UTC
svn commit: r1417746 - in
/camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala:
RichMessage.scala dsl/builder/RouteBuilder.scala
Author: ningjiang
Date: Thu Dec 6 06:45:09 2012
New Revision: 1417746
URL: http://svn.apache.org/viewvc?rev=1417746&view=rev
Log:
Fixed bunch of scala related warning in idea12
Modified:
camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/RichMessage.scala
camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/builder/RouteBuilder.scala
Modified: camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/RichMessage.scala
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/RichMessage.scala?rev=1417746&r1=1417745&r2=1417746&view=diff
==============================================================================
--- camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/RichMessage.scala (original)
+++ camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/RichMessage.scala Thu Dec 6 06:45:09 2012
@@ -26,19 +26,19 @@ class RichMessage(val message: Message)
// Delegate methods
//-------------------------------------------------------------------------
- def setMessageId(messageId: String) = message.setMessageId(messageId)
+ def setMessageId(messageId: String) { message.setMessageId(messageId) }
- def setHeaders(headers: Map[String, Object]) = message.setHeaders(headers)
+ def setHeaders(headers: Map[String, Object]) { message.setHeaders(headers) }
- def setHeader(name: String, value: Any) = message.setHeader(name, value)
+ def setHeader(name: String, value: Any) { message.setHeader(name, value) }
- def setFault(fault: Boolean) = message.setFault(fault)
+ def setFault(fault: Boolean) { message.setFault(fault) }
- def setBody[T](body: Any, bodyType : Class[T]) = message.setBody(body, bodyType)
+ def setBody[T](body: Any, bodyType : Class[T]) { message.setBody(body, bodyType) }
- def setBody(body: Any) = message.setBody()
+ def setBody(body: Any) {message.setBody()}
- def setAttachments(attachments: Map[String, DataHandler]) = message.setAttachments(attachments)
+ def setAttachments(attachments: Map[String, DataHandler]) { message.setAttachments(attachments) }
def removeHeader(name: String) = message.removeHeader(name)
@@ -46,7 +46,7 @@ class RichMessage(val message: Message)
def removeHeaders(pattern: String, excludePatterns: String*) = message.removeHeaders(pattern, excludePatterns: _*)
- def removeAttachment(id: String) = message.removeAttachment(id)
+ def removeAttachment(id: String) { message.removeAttachment(id) }
def isFault = message.isFault
@@ -81,13 +81,13 @@ class RichMessage(val message: Message)
def getAttachmentNames = message.getAttachmentNames
def getAttachment(id: String) = message.getAttachment(id)
-
+
@Deprecated
def createExchangeId = message.createExchangeId
- def copyFrom(message: Message) = message.copyFrom(message)
+ def copyFrom(message: Message) {message.copyFrom(message)}
def copy = new RichMessage(message.copy)
- def addAttachment(id: String, content: DataHandler) = message.addAttachment(id, content)
+ def addAttachment(id: String, content: DataHandler) { message.addAttachment(id, content) }
}
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=1417746&r1=1417745&r2=1417746&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 Thu Dec 6 06:45:09 2012
@@ -40,7 +40,7 @@ import org.slf4j.{Logger, LoggerFactory}
class RouteBuilder extends Preamble with DSL with RoutesBuilder with Languages with Functions {
val builder = new org.apache.camel.builder.RouteBuilder {
- override def configure() = {
+ override def configure() {
onJavaBuilder(this)
}
}
@@ -50,17 +50,17 @@ class RouteBuilder extends Preamble with
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() }
}
/**
* Callback method to allow people to interact with the Java DSL builder directly
*/
- def onJavaBuilder(builder: org.apache.camel.builder.RouteBuilder) = {}
+ def onJavaBuilder(builder: org.apache.camel.builder.RouteBuilder) {}
implicit def stringToRoute(target: String) : SRouteDefinition = new SRouteDefinition(builder.from(target), this)
implicit def unwrap[W](wrapper: Wrapper[W]) = wrapper.unwrap
@@ -93,7 +93,7 @@ class RouteBuilder extends Preamble with
def getContext = builder.getContext
// implementing the Routes interface to allow RouteBuilder to be discovered by Spring
- def addRoutesToCamelContext(context: CamelContext) = builder.addRoutesToCamelContext(context)
+ def addRoutesToCamelContext(context: CamelContext) { builder.addRoutesToCamelContext(context) }
// EIPs
//-----------------------------------------------------------------
@@ -109,7 +109,7 @@ class RouteBuilder extends Preamble with
def dynamicRouter(expression: Exchange => Any) = stack.top.dynamicRouter(expression)
def enrich(uri: String, strategy: AggregationStrategy) = stack.top.enrich(uri, strategy)
- def errorHandler(error: ErrorHandlerBuilder) = builder.setErrorHandlerBuilder(error)
+ def errorHandler(error: ErrorHandlerBuilder) { builder.setErrorHandlerBuilder(error) }
def deadLetterChannel(uri: String) = {
val dlc = new DeadLetterChannelBuilder
dlc.setDeadLetterUri(uri)