Skip to content

Commit f55a0cf

Browse files
author
edgarchan
committed
fix compilation issues with the latest scala mod snapshot, mainly json's related stuff
1 parent f7bdc4e commit f55a0cf

File tree

9 files changed

+19
-26
lines changed

9 files changed

+19
-26
lines changed

‎src/main/scala/com/campudus/vertx/VertxScalaHelpers.scala

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,7 @@ package com.campudus.vertx
33
import org.vertx.java.core.Handler
44
import org.vertx.java.core.AsyncResult
55
import org.vertx.java.core.AsyncResultHandler
6-
import org.vertx.java.core.json.JsonObject
7-
import org.vertx.java.core.json.JsonArray
6+
import org.vertx.scala.core.json._
87
import scala.concurrent.Future
98

109
trait VertxScalaHelpers {
@@ -27,9 +26,7 @@ trait VertxScalaHelpers {
2726
def toInt(s: String): Option[Int] = tryOp(s.toInt)
2827

2928
implicit def listToJsonArray[X](list: List[X]): JsonArray = {
30-
val arr = new JsonArray()
31-
list.foreach(arr.add)
32-
arr
29+
Json.arr(list)
3330
}
3431

3532
}

‎src/main/scala/com/campudus/vertx/busmod/ScalaBusMod.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ package com.campudus.vertx.busmod
22

33
import scala.concurrent.Future
44

5-
import org.vertx.java.core.json.JsonObject
5+
import org.vertx.scala.core.json._
66
import org.vertx.scala.core.eventbus.Message
77

88
import com.campudus.vertx.VertxExecutionContext
@@ -34,7 +34,7 @@ trait ScalaBusMod extends MessageHelper with VertxExecutionContext with (Message
3434
// case x: BusException => msg.reply(new JsonObject().putString("status", "error").putString("message", x.getMessage()).putString("id", x.getId()))
3535
case x =>
3636
x.printStackTrace(System.err)
37-
msg.reply(new JsonObject().putString("status", "error").putString("message", x.getMessage()))
37+
msg.reply(Json.obj("status" -> "error", "message" -> x.getMessage()))
3838
}
3939
}
4040

‎src/main/scala/com/campudus/vertx/database/ConnectionHandler.scala

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
package com.campudus.vertx.database
22

33
import org.vertx.scala.core.eventbus.Message
4-
import org.vertx.java.core.json.JsonObject
54
import com.github.mauricio.async.db.Configuration
65
import com.campudus.vertx.database.pool.PostgreSqlAsyncConnectionPool
76
import com.campudus.vertx.VertxExecutionContext
@@ -13,10 +12,10 @@ import org.vertx.scala.core.Vertx
1312
import com.campudus.vertx.Verticle
1413
import com.github.mauricio.async.db.QueryResult
1514
import com.campudus.vertx.VertxScalaHelpers
16-
import org.vertx.java.core.json.JsonArray
1715
import com.github.mauricio.async.db.RowData
1816
import collection.JavaConverters._
1917
import com.github.mauricio.async.db.postgresql.exceptions.GenericDatabaseException
18+
import org.vertx.scala.core.json._
2019

2120
trait ConnectionHandler extends ScalaBusMod with VertxScalaHelpers {
2221
val verticle: Verticle

‎src/main/scala/com/campudus/vertx/database/Starter.scala

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,15 @@
11
package com.campudus.vertx.database
22

33
import com.campudus.vertx.Verticle
4-
import org.vertx.java.core.json.JsonObject
54
import com.github.mauricio.async.db.postgresql.util.URLParser
65
import com.github.mauricio.async.db.Configuration
76
import com.github.mauricio.async.db.postgresql.pool.PostgreSQLConnectionFactory
87
import com.github.mauricio.async.db.pool.ConnectionPool
98
import com.github.mauricio.async.db.pool.PoolConfiguration
109
import com.campudus.vertx.VertxExecutionContext
1110
import com.campudus.vertx.database.pool.AsyncConnectionPool
12-
import org.vertx.scala.core.json.JSON
1311
import org.vertx.scala.core.eventbus.EventBus._
12+
import org.vertx.scala.core.json._
1413

1514
class Starter extends Verticle {
1615

@@ -21,7 +20,7 @@ class Starter extends Verticle {
2120
logger.error("Starting async database module for MySQL and PostgreSQL.")
2221

2322
try {
24-
val config = Option(new JsonObject(container.config().toString())).getOrElse(new JsonObject)
23+
val config = Option(container.config()).getOrElse(Json.emptyObj())
2524

2625
val address = config.getString("address", "campudus.asyncdb")
2726
val dbType = getDatabaseType(config)

‎src/main/scala/com/campudus/vertx/messages/Reply.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package com.campudus.vertx.messages
22

3-
import org.vertx.java.core.json.JsonObject
3+
import org.vertx.scala.core.json._
44

55
trait MessageHelper {
66
sealed trait Reply {
@@ -11,7 +11,7 @@ trait MessageHelper {
1111
}
1212
case class Error(message: String, id: Option[String] = None, obj: Option[JsonObject] = None) extends Reply {
1313
def toJson = {
14-
val js = obj.getOrElse(new JsonObject()).putString("status", "error").putString("message", message)
14+
val js = obj.getOrElse(Json.obj("status" -> "error", "message" -> message))
1515
id map (x => js.putString("id", x))
1616
js
1717
}

‎src/test/scala/com/campudus/test/BaseSqlTests.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ package com.campudus.test
22

33
import scala.concurrent.Future
44

5-
import org.vertx.java.core.json.JsonArray
5+
import org.vertx.scala.core.json.JsonArray
66
import org.vertx.testtools.VertxAssert.assertEquals
77

88
trait BaseSqlTests { this: SqlTestVerticle =>

‎src/test/scala/com/campudus/test/SqlTestVerticle.scala

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ package com.campudus.test
22

33
import com.campudus.vertx.VertxExecutionContext
44
import scala.concurrent.Future
5-
import org.vertx.java.core.json.JsonObject
65
import org.vertx.java.core.Handler
76
import org.vertx.java.core.AsyncResult
87
import org.vertx.testtools.VertxAssert._
@@ -11,12 +10,11 @@ import org.junit.runner.RunWith
1110
import org.vertx.testtools.JavaClassRunner
1211
import java.lang.reflect.InvocationTargetException
1312
import org.vertx.java.core.logging.impl.LoggerFactory
14-
import org.vertx.scala.core.json.JSON
1513
import scala.concurrent.Promise
1614
import org.vertx.scala.core.eventbus.Message
1715
import org.vertx.scala.core.Vertx
18-
import org.vertx.java.core.json.JsonArray
1916
import com.campudus.vertx.VertxScalaHelpers
17+
import org.vertx.scala.core.json._
2018

2119
abstract class SqlTestVerticle extends org.vertx.testtools.TestVerticle with VertxExecutionContext with VertxScalaHelpers {
2220

@@ -44,7 +42,7 @@ abstract class SqlTestVerticle extends org.vertx.testtools.TestVerticle with Ver
4442

4543
def before(): Future[_] = Future.successful()
4644

47-
def getConfig(): JsonObject = new JsonObject()
45+
def getConfig(): JsonObject = Json.emptyObj()
4846

4947
val address: String
5048

@@ -80,12 +78,12 @@ abstract class SqlTestVerticle extends org.vertx.testtools.TestVerticle with Ver
8078
reply
8179
}
8280

83-
protected def raw(q: String) = new JsonObject().putString("action", "raw").putString("command", q)
81+
protected def raw(q: String) = Json.obj("action" -> "raw", "command" -> q)
8482

8583
protected def insert(table: String, fields: JsonArray, values: JsonArray) =
86-
new JsonObject().putString("action", "insert").putString("table", table).putArray("fields", fields).putArray("values", values)
84+
Json.obj("action" -> "insert", "table" -> table, "fields" -> fields, "values" -> values)
8785

88-
protected def select(table: String, fields: JsonArray) = new JsonObject().putString("action", "select").putString("table", table).putArray("fields", fields)
86+
protected def select(table: String, fields: JsonArray) = Json.obj("action" -> "select", "table" -> table, "fields" -> fields)
8987

9088
protected def createTable(tableName: String) = expectOk(raw("""
9189
CREATE TABLE """ + tableName + """ (

‎src/test/scala/com/campudus/test/mysql/MySqlTest.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
package com.campudus.test.postgresql
22

33
import org.junit.Test
4-
import org.vertx.java.core.json.JsonObject
4+
import org.vertx.scala.core.json._
55
import com.campudus.test.{ BaseSqlTests, SqlTestVerticle }
66
import org.vertx.testtools.VertxAssert
77

88
class MySqlTest extends SqlTestVerticle with BaseSqlTests {
99

1010
val address = "campudus.asyncdb"
11-
val config = new JsonObject().putString("address", address).putString("connection", "MySQL")
11+
val config = Json.obj("address" -> address, "connection" -> "MySQL")
1212

1313
override def getConfig = config
1414

‎src/test/scala/com/campudus/test/postgresql/PostgreSqlTest.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
package com.campudus.test.postgresql
22

33
import org.junit.Test
4-
import org.vertx.java.core.json.JsonObject
4+
import org.vertx.scala.core.json._
55

66
import com.campudus.test.{ BaseSqlTests, SqlTestVerticle }
77

88
class PostgreSqlTest extends SqlTestVerticle with BaseSqlTests {
99

1010
val address = "campudus.asyncdb"
11-
val config = new JsonObject().putString("address", address)
11+
val config = Json.obj("address" -> address)
1212

1313
override def getConfig = config
1414

0 commit comments

Comments
 (0)