upgrade to latest reactive mongo

modules/bookmark/src/main/BookmarkRepo.scala

@@ -6,7 +6,7 @@ import tube.bookmarkTube
 
 import play.api.libs.json._
 
-import play.modules.reactivemongo.Implicits._
+import play.modules.reactivemongo.json.ImplicitBSONHandlers._
 
 import org.joda.time.DateTime
 import scala.concurrent.Future

modules/bookmark/src/main/PaginatorBuilder.scala

@@ -10,7 +10,7 @@ import lila.db.api._
 import tube.bookmarkTube
 
 import play.api.libs.json._
-import play.modules.reactivemongo.Implicits._
+import play.modules.reactivemongo.json.ImplicitBSONHandlers._
 import org.joda.time.DateTime
 
 final class PaginatorBuilder(maxPerPage: Int) {

modules/db/src/main/Tube.scala

@@ -6,7 +6,7 @@ import play.api.libs.json._
 import play.api.libs.functional.syntax._
 import Reads.constraints._
 import reactivemongo.bson._
-import play.modules.reactivemongo.Implicits._
+import play.modules.reactivemongo.json.ImplicitBSONHandlers._
 
 trait InColl[A] { implicit def coll: Types.Coll }
 

modules/db/src/main/api/count.scala

@@ -5,7 +5,7 @@ import Types._
 
 import play.api.libs.json._
 import reactivemongo.core.commands.Count
-import play.modules.reactivemongo.Implicits._
+import play.modules.reactivemongo.json.ImplicitBSONHandlers._
 
 object $count {
 

modules/db/src/main/api/find.scala

@@ -4,7 +4,7 @@ package api
 import Implicits._
 
 import reactivemongo.bson._
-import play.modules.reactivemongo.Implicits._
+import play.modules.reactivemongo.json.ImplicitBSONHandlers._
 import play.api.libs.json._
 import scalaz.{ OptionT, OptionTs }
 

modules/db/src/main/api/insert.scala

@@ -4,7 +4,7 @@ package api
 import Types.Coll
 
 import reactivemongo.bson._
-import play.modules.reactivemongo.Implicits._
+import play.modules.reactivemongo.json.ImplicitBSONHandlers._
 import play.api.libs.json._
 
 object $insert {

modules/db/src/main/api/operator.scala

@@ -5,6 +5,7 @@ import play.api.libs.json._
 import Json.JsValueWrapper
 
 import reactivemongo.bson._
+import play.modules.reactivemongo.json.BSONFormats
 
 import org.joda.time.DateTime
 
@@ -31,8 +32,9 @@ trait $operator {
 
   def $or[A: Writes](conditions: A) = Json.obj("$or" -> conditions)
 
-  def $reg(value: String, flags: String = "") = BSONRegex(value, flags)
-  def $date(value: DateTime) = Json.obj("$date" -> value.getMillis)
+  def $regex(value: String, flags: String = "") = BSONFormats toJSON BSONRegex(value, flags)
+
+  def $date(value: DateTime) = BSONFormats toJSON BSONDateTime(value.getMillis)
 
   private def wrap[K, V: Writes](pairs: Seq[(K, V)]): Seq[(K, JsValueWrapper)] = pairs map {
     case (k, v) ⇒ k -> Json.toJsFieldJsValueWrapper(v)

modules/db/src/main/api/primitive.scala

@@ -4,7 +4,7 @@ package api
 import Types._
 
 import reactivemongo.bson._
-import play.modules.reactivemongo.Implicits._
+import play.modules.reactivemongo.json.ImplicitBSONHandlers._
 import play.api.libs.json._
 
 object $primitive {

modules/db/src/main/api/projection.scala

@@ -4,7 +4,7 @@ package api
 import Types._
 
 import reactivemongo.bson._
-import play.modules.reactivemongo.Implicits._
+import play.modules.reactivemongo.json.ImplicitBSONHandlers._
 import play.api.libs.json._
 
 object $projection {

modules/db/src/main/api/query.scala

@@ -4,7 +4,7 @@ package api
 import Types._
 
 import reactivemongo.bson._
-import play.modules.reactivemongo.Implicits._
+import play.modules.reactivemongo.json.ImplicitBSONHandlers._
 import play.api.libs.json._
 
 object $query {

modules/db/src/main/api/remove.scala

@@ -4,7 +4,7 @@ package api
 import Types._
 
 import play.api.libs.json._
-import play.modules.reactivemongo.Implicits._
+import play.modules.reactivemongo.json.ImplicitBSONHandlers._
 
 object $remove {
 

modules/db/src/main/api/save.scala

@@ -4,7 +4,7 @@ package api
 import Types._
 
 import play.api.libs.json._
-import play.modules.reactivemongo.Implicits._
+import play.modules.reactivemongo.json.ImplicitBSONHandlers._
 
 object $save {
 

modules/db/src/main/api/select.scala

@@ -6,7 +6,7 @@ import Implicits._
 import play.api.libs.json._
 import Json.JsValueWrapper
 
-import play.modules.reactivemongo.Implicits._
+import play.modules.reactivemongo.json.ImplicitBSONHandlers._
 
 import reactivemongo.api._
 import reactivemongo.bson._

modules/db/src/main/api/update.scala

@@ -4,7 +4,7 @@ package api
 import Types._
 
 import play.api.libs.json._
-import play.modules.reactivemongo.Implicits._
+import play.modules.reactivemongo.json.ImplicitBSONHandlers._
 
 object $update {
 

modules/db/src/test/DateTest.scala

@@ -17,7 +17,7 @@ class DateTest extends Specification {
 
   val date = DateTime.now
   import api.Free._
-  import play.modules.reactivemongo.Implicits._
+  import play.modules.reactivemongo.json.ImplicitBSONHandlers._
 
   "date conversion" should {
     "js to bson" in {

modules/game/src/main/PgnRepo.scala

@@ -6,7 +6,7 @@ import tube.pgnTube
 
 import play.api.libs.json._
 
-import play.modules.reactivemongo.Implicits._
+import play.modules.reactivemongo.json.ImplicitBSONHandlers._
 
 object PgnRepo {
 

modules/lobby/src/main/MessageRepo.scala

@@ -7,8 +7,8 @@ import lila.db.api._
 import play.api.libs.json._
 
 import reactivemongo.api._
-import reactivemongo.bson._
-import play.modules.reactivemongo.MongoJSONHelpers.RegEx
+
+import scala.util.matching.Regex
 
 private[lobby] object MessageRepo {
 
@@ -18,9 +18,9 @@ private[lobby] object MessageRepo {
   def censorUsername(userId: String): Funit =
     $update(Json.obj("userId" -> userId), $set("text" -> ""), multi = true)
 
-  def removeRegex(regex: scala.util.matching.Regex): Funit =
+  def removeRegex(regex: Regex): Funit =
     $update(
-      Json.obj("text" -> RegEx(regex.toString)),
+      Json.obj("text" -> $regex(regex.toString)),
       $set("text" -> ""),
       multi = true)
 }

modules/monitor/src/main/MongoStatus.scala

@@ -3,7 +3,7 @@ package lila.monitor
 import reactivemongo.core.commands.Status
 import reactivemongo.api.DB
 import reactivemongo.bson._
-import play.modules.reactivemongo.Implicits._
+import play.modules.reactivemongo.json.ImplicitBSONHandlers._
 
 import play.api.libs.json.JsObject
 

modules/security/src/main/Firewall.scala

@@ -9,7 +9,7 @@ import scala.concurrent.duration._
 import play.api.mvc.{ RequestHeader, Handler, Action, Cookies }
 import play.api.mvc.Results.Redirect
 import play.api.libs.json._
-import play.modules.reactivemongo.Implicits._
+import play.modules.reactivemongo.json.ImplicitBSONHandlers._
 import spray.caching.{ LruCache, Cache }
 import org.joda.time.DateTime
 import ornicar.scalalib.Random

modules/security/src/main/Store.scala

@@ -9,7 +9,7 @@ import tube.storeTube
 import play.api.mvc.RequestHeader
 import play.api.libs.json._
 
-import play.modules.reactivemongo.Implicits._
+import play.modules.reactivemongo.json.ImplicitBSONHandlers._
 
 import org.joda.time.DateTime
 import scala.concurrent.Future

modules/user/src/main/HistoryRepo.scala

@@ -7,7 +7,7 @@ import tube.historyTube
 
 import play.api.libs.json._
 
-import play.modules.reactivemongo.Implicits._
+import play.modules.reactivemongo.json.ImplicitBSONHandlers._
 
 import org.joda.time.DateTime
 

modules/user/src/main/UserRepo.scala

@@ -7,9 +7,6 @@ import tube.userTube
 import play.api.libs.json.Json
 
 import reactivemongo.api._
-import reactivemongo.bson._
-
-import play.modules.reactivemongo.MongoJSONHelpers.RegEx
 
 import com.roundeights.hasher.Implicits._
 import org.joda.time.DateTime
@@ -99,7 +96,7 @@ object UserRepo {
     val escaped = """^([\w-]*).*$""".r.replaceAllIn(normalize(username), m ⇒ quoteReplacement(m group 1))
     val regex = "^" + escaped + ".*$"
     $primitive(
-      Json.obj("_id" -> RegEx(regex)),
+      Json.obj("_id" -> $regex(regex)),
       "username",
       _ sort ("_id" -> $sort.desc) limit max
     )(_.asOpt[String])