Fix implicit ambiguity when compile for scala 2.12

null-vector · Dec 27, 2019 · 49952af · 49952af
1 parent dca5294
commit 49952af
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/src/main/scala/org/nullvector/ReactiveMongoDriver.scala b/src/main/scala/org/nullvector/ReactiveMongoDriver.scala
@@ -6,7 +6,7 @@ import reactivemongo.api.bson.BSONDocument
 import reactivemongo.api.bson.collection.{BSONCollection, BSONSerializationPack}
 import reactivemongo.api.commands.CommandError
 import reactivemongo.api.indexes.{CollectionIndexesManager, Index, IndexType}
-import reactivemongo.api.{DefaultDB, MongoConnection, MongoDriver}
+import reactivemongo.api.{AsyncDriver, DefaultDB, MongoConnection, MongoDriver}
 
 import scala.collection.mutable
 import scala.concurrent.duration._
@@ -30,13 +30,13 @@ class ReactiveMongoDriver(system: ExtendedActorSystem) extends Extension {
 
   private val database: DefaultDB = {
     val mongoUri = system.settings.config.getString("akka-persistence-reactivemongo.mongo-uri")
-    val parsedUri = MongoConnection.parseURI(mongoUri) match {
+    val parsedUri: MongoConnection.ParsedURI = MongoConnection.parseURI(mongoUri) match {
       case Success(_parsedURI) => _parsedURI
       case Failure(exception) => throw exception
     }
     val databaseName = parsedUri.db.getOrElse(throw new Exception("Missing database name"))
     Await.result(
-      MongoDriver(system.settings.config).connection(parsedUri, strictUri = false).get.database(databaseName),
+      AsyncDriver(system.settings.config).connect(parsedUri).flatMap(_.database(databaseName)),
       30.seconds
     )
   }

diff --git a/src/main/scala/org/nullvector/journal/ReactiveMongoAsyncReplay.scala b/src/main/scala/org/nullvector/journal/ReactiveMongoAsyncReplay.scala
@@ -22,7 +22,7 @@ trait ReactiveMongoAsyncReplay {
         Fields.to_sn -> BSONDocument("$lte" -> toSequenceNr)
       )
       collection
-        .find(query, Option.empty)
+        .find(query, Option.empty[BSONDocument])
         .sort(BSONDocument(Fields.to_sn -> 1))
         .cursor[BSONDocument]()
         .documentSource()

diff --git a/src/main/scala/org/nullvector/query/PersistenceIdsQueries.scala b/src/main/scala/org/nullvector/query/PersistenceIdsQueries.scala
@@ -48,7 +48,7 @@ trait PersistenceIdsQueries
 
   private def buildFindAllIds(coll: collection.BSONCollection, offset: Offset): Source[PersistenceId, Future[State]] = {
     coll
-      .find(BSONDocument(Fields.from_sn -> 1L) ++ filterByOffset(offset), None)
+      .find(BSONDocument(Fields.from_sn -> 1L) ++ filterByOffset(offset), Option.empty[BSONDocument])
       .sort(BSONDocument("_id" -> 1))
       .cursor[BSONDocument]()
       .documentSource()

diff --git a/src/main/scala/org/nullvector/snapshot/ReactiveMongoSnapshotImpl.scala b/src/main/scala/org/nullvector/snapshot/ReactiveMongoSnapshotImpl.scala
@@ -20,7 +20,7 @@ trait ReactiveMongoSnapshotImpl extends ReactiveMongoPlugin {
           Fields.sequence -> BSONDocument("$lte" -> criteria.maxSequenceNr),
           Fields.snapshot_ts -> BSONDocument("$gte" -> criteria.minTimestamp),
           Fields.snapshot_ts -> BSONDocument("$lte" -> criteria.maxTimestamp),
-        ), None).one[BSONDocument]
+        ), Option.empty[BSONDocument]).one[BSONDocument]
 
       maybeSelected <- maybeDoc.map { doc =>
         val payloadDoc = (doc.getAsOpt[BSONDocument](Fields.payload), doc.getAsOpt[BSONDocument](Fields.snapshot_payload)) match {