You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by zr...@apache.org on 2018/11/12 23:01:04 UTC
[camel] 05/17: Upgrade Scala to 2.12.7
This is an automated email from the ASF dual-hosted git repository.
zregvart pushed a commit to branch java-10-test
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 8752b462e7486bc1f51073a8a926819d47f0202f
Author: Zoran Regvart <zr...@apache.org>
AuthorDate: Thu Nov 1 12:59:13 2018 +0100
Upgrade Scala to 2.12.7
---
.mvn/wrapper/maven-wrapper.properties | 2 +-
components/camel-scala/pom.xml | 5 +++++
.../src/main/scala/org/apache/camel/scala/Preamble.scala | 4 ++--
.../scala/org/apache/camel/scala/dsl/SAbstractDefinition.scala | 9 ++++++++-
.../scala/org/apache/camel/scala/dsl/SOnCompletionWhenTest.scala | 4 ++--
parent/pom.xml | 4 ++--
6 files changed, 20 insertions(+), 8 deletions(-)
diff --git a/.mvn/wrapper/maven-wrapper.properties b/.mvn/wrapper/maven-wrapper.properties
index b573bb5..6c8c0e0 100644
--- a/.mvn/wrapper/maven-wrapper.properties
+++ b/.mvn/wrapper/maven-wrapper.properties
@@ -1 +1 @@
-distributionUrl=https://repo1.maven.org/maven2/org/apache/maven/apache-maven/3.5.3/apache-maven-3.5.3-bin.zip
+distributionUrl=https://repo1.maven.org/maven2/org/apache/maven/apache-maven/3.5.4/apache-maven-3.5.4-bin.zip
diff --git a/components/camel-scala/pom.xml b/components/camel-scala/pom.xml
index cdb1574..0722cca 100644
--- a/components/camel-scala/pom.xml
+++ b/components/camel-scala/pom.xml
@@ -62,6 +62,11 @@
<version>${scalaxml-version}</version>
<scope>provided</scope>
</dependency>
+ <dependency>
+ <groupId>javax.activation</groupId>
+ <artifactId>javax.activation-api</artifactId>
+ <version>${activation-api-version}</version>
+ </dependency>
<!-- test dependencies -->
<dependency>
diff --git a/components/camel-scala/src/main/scala/org/apache/camel/scala/Preamble.scala b/components/camel-scala/src/main/scala/org/apache/camel/scala/Preamble.scala
index a28beeb..1e90953 100644
--- a/components/camel-scala/src/main/scala/org/apache/camel/scala/Preamble.scala
+++ b/components/camel-scala/src/main/scala/org/apache/camel/scala/Preamble.scala
@@ -82,7 +82,7 @@ trait Preamble {
(exchange: Exchange) =>
run(exchange) map {
case () => throw new RuntimeTransformException("Unit result cannot be used in Predicate")
- case v => v
+ case v : Boolean => v
} getOrElse false
override def process(exchange: Exchange) {
@@ -148,4 +148,4 @@ trait Preamble {
* `import org.apache.camel.scala.Preamble._`
*
*/
-object Preamble extends Preamble
\ No newline at end of file
+object Preamble extends Preamble
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 bc5084e..ff01bce 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
@@ -135,7 +135,14 @@ abstract class SAbstractDefinition[P <: ProcessorDefinition[_]] extends DSL with
def routingSlip(expression: Exchange => Any) = wrap(target.routingSlip(expression))
def script(expression: Exchange => Any) = wrap(target.script(expression))
- def setBody(expression: Exchange => Any) = wrap(target.setBody(expression))
+ def setBody(expression: Exchange => Any) = {
+ val fn = new java.util.function.Function[Exchange, Any] {
+ override def apply(exchange: Exchange) = {
+ expression(exchange)
+ }
+ }
+ wrap(target.setBody(fn))
+ }
def setFaultBody(expression: Exchange => Any) = wrap(target.setFaultBody(expression))
def setHeader(name: String, expression: Exchange => Any) = wrap(target.setHeader(name, expression))
def setExchangePattern(mep: ExchangePattern) = wrap(target.setExchangePattern(mep))
diff --git a/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/SOnCompletionWhenTest.scala b/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/SOnCompletionWhenTest.scala
index a1db7a4..21347a0 100644
--- a/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/SOnCompletionWhenTest.scala
+++ b/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/SOnCompletionWhenTest.scala
@@ -25,7 +25,7 @@ class SOnCompletionWhenTest extends OnCompletionWhenTest with RouteBuilderSuppor
override def createRouteBuilder = new RouteBuilder {
"direct:start" ==> {
- onCompletion(containsHello(_)) {
+ onCompletion(containsHello(_: Exchange)) {
to("mock:sync")
}
to("mock:result")
@@ -34,4 +34,4 @@ class SOnCompletionWhenTest extends OnCompletionWhenTest with RouteBuilderSuppor
def containsHello(exchange: Exchange) = exchange.getIn.getBody(classOf[String]).contains("Hello")
}
-}
\ No newline at end of file
+}
diff --git a/parent/pom.xml b/parent/pom.xml
index 76aa3c2..1d86c4a 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -602,8 +602,8 @@
<saaj-impl-version>1.3.2_2</saaj-impl-version>
<saxon-bundle-version>9.8.0-14_1</saxon-bundle-version>
<saxon-version>9.8.0-14</saxon-version>
- <scala-version>2.11.7</scala-version>
- <scala-maven-plugin-version>3.2.2</scala-maven-plugin-version>
+ <scala-version>2.12.7</scala-version>
+ <scala-maven-plugin-version>3.4.2</scala-maven-plugin-version>
<scalatest-version>2.2.5</scalatest-version>
<scalaxml-version>1.0.6</scalaxml-version>
<scribe-version>1.3.7</scribe-version>