reverted update of Scala lang module

McHunkyTrunk · McHunkyTrunk · commit ba7c69d09c0f · 2014-04-07T10:04:49.000+02:00
Signed-off-by: Joern Bernhardt &lt;jb@campudus.com&gt;
diff --git a/gradle.properties b/gradle.properties
@@ -20,7 +20,7 @@ pullInDeps=true
 produceJar=false
 
 # The version of the Scala module
-scalaLangModVersion=1.0.0-RC1
+scalaLangModVersion=0.3.0
 
 # The version of Scala to use
 scalaVersion=2.10.2
@@ -29,7 +29,7 @@ scalaVersion=2.10.2
 gradleVersion=1.11
 
 # The version of Vert.x
-vertxVersion=2.1RC1
+vertxVersion=2.1RC3
 
 # The version of Vert.x test tools
 toolsVersion=2.0.2-final
diff --git a/src/main/resources/langs.properties b/src/main/resources/langs.properties
@@ -1,2 +1,2 @@
-scala=io.vertx~lang-scala~1.0.0-RC1:org.vertx.scala.platform.impl.ScalaVerticleFactory
+scala=io.vertx~lang-scala~0.3.0:org.vertx.scala.platform.impl.ScalaVerticleFactory
 .scala=scala
diff --git a/src/main/scala/io/vertx/asyncsql/database/ConnectionHandler.scala b/src/main/scala/io/vertx/asyncsql/database/ConnectionHandler.scala
@@ -12,7 +12,6 @@ import org.vertx.scala.mods.replies._
 import org.vertx.scala.core.Vertx
 import org.vertx.scala.platform.Container
 import io.vertx.asyncsql.Starter
-import org.vertx.scala.mods.ScalaBusMod.Receive
 
 trait ConnectionHandler extends ScalaBusMod {
   val verticle: Starter
@@ -30,7 +29,7 @@ trait ConnectionHandler extends ScalaBusMod {
   def statementDelimiter: String = ";"
 
   import org.vertx.scala.core.eventbus._
-  override def receive: Receive = (msg: Message[JsonObject]) => {
+  override def receive(msg: Message[JsonObject]) = {
     case "select" => select(msg.body)
     case "insert" => insert(msg.body)
     case "prepared" => AsyncReply(sendWithPool(prepared(msg.body)))
@@ -44,9 +43,9 @@ trait ConnectionHandler extends ScalaBusMod {
   protected def escapeString(str: String): String = "'" + str.replace("'", "''") + "'"
 
   protected def escapeValue(v: Any): String = v match {
+    case null => "NULL"
     case x: Int => x.toString
     case x: Boolean => x.toString
-    case null => "NULL"
     case x => escapeString(x.toString)
   }
 
diff --git a/src/main/scala/io/vertx/asyncsql/database/pool/AsyncConnectionPool.scala b/src/main/scala/io/vertx/asyncsql/database/pool/AsyncConnectionPool.scala
@@ -8,11 +8,9 @@ import com.github.mauricio.async.db.{ Configuration, Connection }
 import io.vertx.asyncsql.Starter
 import org.vertx.scala.core.VertxExecutionContext
 
-trait AsyncConnectionPool {
+trait AsyncConnectionPool extends VertxExecutionContext {
 
   val maxPoolSize: Int
-  val verticle: Starter
-  implicit val executionContext = VertxExecutionContext.fromVertxAccess(verticle)
 
   private var poolSize: Int = 0
   private val availableConnections: Queue[Connection] = Queue.empty
diff --git a/src/main/scala/io/vertx/asyncsql/database/pool/MySqlAsyncConnectionPool.scala b/src/main/scala/io/vertx/asyncsql/database/pool/MySqlAsyncConnectionPool.scala
@@ -1,20 +1,12 @@
 package io.vertx.asyncsql.database.pool
 
-import scala.concurrent.{ ExecutionContext, Future }
-import com.github.mauricio.async.db.{ Configuration, Connection }
+import com.github.mauricio.async.db.Configuration
 import com.github.mauricio.async.db.mysql.MySQLConnection
-import com.github.mauricio.async.db.postgresql.PostgreSQLConnection
 import io.netty.channel.EventLoop
-import org.vertx.scala.core.VertxExecutionContext
-import org.vertx.scala.core.Vertx
-import org.vertx.scala.platform.Verticle
 import io.vertx.asyncsql.Starter
 
 class MySqlAsyncConnectionPool(val verticle: Starter, config: Configuration, eventLoop: EventLoop, val maxPoolSize: Int) extends AsyncConnectionPool {
 
-  implicit val executionContext = VertxExecutionContext.fromVertxAccess(verticle)
-  verticle.
-
   override def create() = new MySQLConnection(configuration = config, group = eventLoop).connect
 
 }
diff --git a/src/main/scala/io/vertx/asyncsql/database/pool/PostgreSqlAsyncConnectionPool.scala b/src/main/scala/io/vertx/asyncsql/database/pool/PostgreSqlAsyncConnectionPool.scala
@@ -1,11 +1,8 @@
 package io.vertx.asyncsql.database.pool
 
-import scala.concurrent.{ ExecutionContext, Future }
-import com.github.mauricio.async.db.{ Configuration, Connection }
+import com.github.mauricio.async.db.Configuration
 import com.github.mauricio.async.db.postgresql.PostgreSQLConnection
 import io.netty.channel.EventLoop
-import org.vertx.scala.core.VertxExecutionContext
-import org.vertx.scala.platform.Verticle
 import io.vertx.asyncsql.Starter
 
 class PostgreSqlAsyncConnectionPool(val verticle: Starter, config: Configuration, eventLoop: EventLoop, val maxPoolSize: Int) extends AsyncConnectionPool {

Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`		`-scala=io.vertx~lang-scala~1.0.0-RC1:org.vertx.scala.platform.impl.ScalaVerticleFactory`
	`1`	`+scala=io.vertx~lang-scala~0.3.0:org.vertx.scala.platform.impl.ScalaVerticleFactory`
`2`	`2`	`.scala=scala`