From e051f0a0091e5ed6dcb19557a56fa2a97021e8d1 Mon Sep 17 00:00:00 2001
From: Thibault Duplessis <thibault.duplessis@gmail.com>
Date: Sat, 13 Apr 2013 13:07:14 -0300
Subject: [PATCH] upgrade to latest reactive mongo

---
 modules/bookmark/src/main/BookmarkRepo.scala     | 2 +-
 modules/bookmark/src/main/PaginatorBuilder.scala | 2 +-
 modules/db/src/main/Tube.scala                   | 2 +-
 modules/db/src/main/api/count.scala              | 2 +-
 modules/db/src/main/api/find.scala               | 2 +-
 modules/db/src/main/api/insert.scala             | 2 +-
 modules/db/src/main/api/operator.scala           | 6 ++++--
 modules/db/src/main/api/primitive.scala          | 2 +-
 modules/db/src/main/api/projection.scala         | 2 +-
 modules/db/src/main/api/query.scala              | 2 +-
 modules/db/src/main/api/remove.scala             | 2 +-
 modules/db/src/main/api/save.scala               | 2 +-
 modules/db/src/main/api/select.scala             | 2 +-
 modules/db/src/main/api/update.scala             | 2 +-
 modules/db/src/test/DateTest.scala               | 2 +-
 modules/game/src/main/PgnRepo.scala              | 2 +-
 modules/lobby/src/main/MessageRepo.scala         | 8 ++++----
 modules/monitor/src/main/MongoStatus.scala       | 2 +-
 modules/security/src/main/Firewall.scala         | 2 +-
 modules/security/src/main/Store.scala            | 2 +-
 modules/user/src/main/HistoryRepo.scala          | 2 +-
 modules/user/src/main/UserRepo.scala             | 5 +----
 22 files changed, 28 insertions(+), 29 deletions(-)

diff --git a/modules/bookmark/src/main/BookmarkRepo.scala b/modules/bookmark/src/main/BookmarkRepo.scala
index 946544c37c..285601a463 100644
--- a/modules/bookmark/src/main/BookmarkRepo.scala
+++ b/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
diff --git a/modules/bookmark/src/main/PaginatorBuilder.scala b/modules/bookmark/src/main/PaginatorBuilder.scala
index 1047ecb7cd..e007db4784 100644
--- a/modules/bookmark/src/main/PaginatorBuilder.scala
+++ b/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) {
diff --git a/modules/db/src/main/Tube.scala b/modules/db/src/main/Tube.scala
index 0670c0436b..7eddd105c4 100644
--- a/modules/db/src/main/Tube.scala
+++ b/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 }
 
diff --git a/modules/db/src/main/api/count.scala b/modules/db/src/main/api/count.scala
index bc8aa3b547..64f50e176d 100644
--- a/modules/db/src/main/api/count.scala
+++ b/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 {
 
diff --git a/modules/db/src/main/api/find.scala b/modules/db/src/main/api/find.scala
index 3606072d27..94e429867a 100644
--- a/modules/db/src/main/api/find.scala
+++ b/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 }
 
diff --git a/modules/db/src/main/api/insert.scala b/modules/db/src/main/api/insert.scala
index ffcb71e851..03c01e79ee 100644
--- a/modules/db/src/main/api/insert.scala
+++ b/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 {
diff --git a/modules/db/src/main/api/operator.scala b/modules/db/src/main/api/operator.scala
index effec4188d..be583bbdac 100644
--- a/modules/db/src/main/api/operator.scala
+++ b/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)
diff --git a/modules/db/src/main/api/primitive.scala b/modules/db/src/main/api/primitive.scala
index d6b68aa3fc..6e33309740 100644
--- a/modules/db/src/main/api/primitive.scala
+++ b/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 {
diff --git a/modules/db/src/main/api/projection.scala b/modules/db/src/main/api/projection.scala
index b2a52024da..e7f699a409 100644
--- a/modules/db/src/main/api/projection.scala
+++ b/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 {
diff --git a/modules/db/src/main/api/query.scala b/modules/db/src/main/api/query.scala
index 387c5dbf97..73e7c445ff 100644
--- a/modules/db/src/main/api/query.scala
+++ b/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 {
diff --git a/modules/db/src/main/api/remove.scala b/modules/db/src/main/api/remove.scala
index 8a89430de3..022776f179 100644
--- a/modules/db/src/main/api/remove.scala
+++ b/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 {
 
diff --git a/modules/db/src/main/api/save.scala b/modules/db/src/main/api/save.scala
index 7bc0209da2..6574bbe7fc 100644
--- a/modules/db/src/main/api/save.scala
+++ b/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 {
 
diff --git a/modules/db/src/main/api/select.scala b/modules/db/src/main/api/select.scala
index a02d71765a..4d9b36ddf5 100644
--- a/modules/db/src/main/api/select.scala
+++ b/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._
diff --git a/modules/db/src/main/api/update.scala b/modules/db/src/main/api/update.scala
index 1c3df7f027..213c08eb31 100644
--- a/modules/db/src/main/api/update.scala
+++ b/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 {
 
diff --git a/modules/db/src/test/DateTest.scala b/modules/db/src/test/DateTest.scala
index ab6f8baa01..b9fcaf5f28 100644
--- a/modules/db/src/test/DateTest.scala
+++ b/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 {
diff --git a/modules/game/src/main/PgnRepo.scala b/modules/game/src/main/PgnRepo.scala
index f10f86b2d0..fd47b4e6c3 100644
--- a/modules/game/src/main/PgnRepo.scala
+++ b/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 {
 
diff --git a/modules/lobby/src/main/MessageRepo.scala b/modules/lobby/src/main/MessageRepo.scala
index ca09a40b98..c10d2630e4 100644
--- a/modules/lobby/src/main/MessageRepo.scala
+++ b/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)
 }
diff --git a/modules/monitor/src/main/MongoStatus.scala b/modules/monitor/src/main/MongoStatus.scala
index 88a6d1662e..ceb557625b 100644
--- a/modules/monitor/src/main/MongoStatus.scala
+++ b/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
 
diff --git a/modules/security/src/main/Firewall.scala b/modules/security/src/main/Firewall.scala
index 015e7fecc2..ac3b5fcb49 100644
--- a/modules/security/src/main/Firewall.scala
+++ b/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
diff --git a/modules/security/src/main/Store.scala b/modules/security/src/main/Store.scala
index 137a31a827..08d91ce9e8 100644
--- a/modules/security/src/main/Store.scala
+++ b/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
diff --git a/modules/user/src/main/HistoryRepo.scala b/modules/user/src/main/HistoryRepo.scala
index b2780cb4a2..8f7cff978b 100644
--- a/modules/user/src/main/HistoryRepo.scala
+++ b/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
 
diff --git a/modules/user/src/main/UserRepo.scala b/modules/user/src/main/UserRepo.scala
index 07c4a5d1ee..36a2499dab 100644
--- a/modules/user/src/main/UserRepo.scala
+++ b/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])