fix 2.12 cross build issues

Author: sfxcode

src/main/scala/com/sfxcode/nosql/mongo/bson/BsonConverter.scala

@@ -6,7 +6,6 @@ import java.util.Date
 
 import org.mongodb.scala.Document
 import org.mongodb.scala.bson.BsonArray.fromIterable
-import org.mongodb.scala.bson._
 import org.mongodb.scala.bson.{ObjectId, _}
 
 import scala.collection.JavaConverters._
@@ -29,10 +28,14 @@ object BsonConverter {
       val newKey   = newKeyFromRelation(key)
       val relation = relationKey(key)
 
-      if (document.contains(relation) && documentValueOption(document, relation)
-            .isInstanceOf[Option[Document]]) {
-        val relatedDocument = documentValueOption(document, relation).asInstanceOf[Option[Document]].get
-        documentValueOption(relatedDocument, newKey)
+      if (document.contains(relation) && documentValueOption(document, relation).isDefined) {
+        val value = documentValueOption(document, relation).get
+        value match {
+          case document: Document =>
+            documentValueOption(document, newKey)
+          case _ =>
+            None
+        }
       }
       else {
         None
@@ -48,9 +51,9 @@ object BsonConverter {
     }
 
   def updateDocumentValue(document: Document, key: String, value: Any): Document = {
-    val doc    = org.mongodb.scala.bson.collection.mutable.Document(document)
+    val doc    = org.mongodb.scala.bson.collection.mutable.Document(document.toJson())
     val result = updateDocumentValueInternal(doc, key, value)
-    Document(result)
+    Document(result.toJson())
   }
 
   private def updateDocumentValueInternal(
@@ -64,11 +67,16 @@ object BsonConverter {
       val relation = relationKey(key)
 
       var relatedDocument = Document()
-      val relationValue   = documentValueOption(Document(document), relation)
-      if (relationValue.isDefined && relationValue.isInstanceOf[Option[Document]]) {
-        relatedDocument = relationValue.asInstanceOf[Option[Document]].get
+      val relationValue   = documentValueOption(Document(document.toJson()), relation)
+      if (relationValue.isDefined) {
+        val value = relationValue.get
+        value match {
+          case document: Document =>
+            relatedDocument = document
+          case _ =>
+        }
       }
-      val mutableDoc = org.mongodb.scala.bson.collection.mutable.Document(relatedDocument)
+      val mutableDoc = org.mongodb.scala.bson.collection.mutable.Document.apply(relatedDocument.toJson())
       document.put(relation, mutableDoc)
       if (root.isEmpty)
         updateDocumentValueInternal(mutableDoc, newKey, value, Some(document))

src/main/scala/com/sfxcode/nosql/mongo/database/MongoIndex.scala

@@ -3,6 +3,7 @@ package com.sfxcode.nosql.mongo.database
 import java.util.Date
 
 import com.sfxcode.nosql.mongo.operation.ObservableIncludes
+import com.typesafe.scalalogging.LazyLogging
 import org.mongodb.scala.ListIndexesObservable
 import org.mongodb.scala.model.IndexOptions
 
@@ -21,7 +22,7 @@ case class MongoIndex(
     map: Map[String, Any]
 )
 
-object MongoIndex extends ObservableIncludes {
+object MongoIndex extends ObservableIncludes with LazyLogging {
 
   def indexOptionsWithName(name: Option[String]): IndexOptions =
     if (name.isDefined) {
@@ -68,6 +69,10 @@ object MongoIndex extends ObservableIncludes {
           indexOptions
         )
       )
+    catch {
+      case e: Exception => logger.error(e.getMessage, e)
+    }
+
     result
   }
 

src/test/scala/com/sfxcode/nosql/mongo/bson/BsonConverterSpec.scala

@@ -62,7 +62,7 @@ class BsonConverterSpec extends Specification {
     }
 
     "evaluate dot notation" in {
-      val document: mutable.Document = mutable.Document(Document())
+      val document: mutable.Document = mutable.Document()
       val secondLevelDocument        = mutable.Document()
       secondLevelDocument.put("test", 42)
       document.put("secondLevelDocument", secondLevelDocument)
@@ -71,13 +71,13 @@ class BsonConverterSpec extends Specification {
 
       document.get("secondLevelDocument.test") must beNone
 
-      val v = BsonConverter.documentValueOption(Document(document), "secondLevelDocument.test")
+      val v = BsonConverter.documentValueOption(Document(document.toJson()), "secondLevelDocument.test")
 
       true must beTrue
     }
 
     "evaluate get with dot notation" in {
-      val document: mutable.Document = mutable.Document(Document())
+      val document: mutable.Document = mutable.Document()
       val secondLevelDocument        = mutable.Document()
       secondLevelDocument.put("test", 42)
       document.put("secondLevelDocument", secondLevelDocument)
@@ -86,7 +86,7 @@ class BsonConverterSpec extends Specification {
 
       document.get("secondLevelDocument.test") must beNone
 
-      val v = BsonConverter.documentValueOption(Document(document), "secondLevelDocument.test")
+      val v = BsonConverter.documentValueOption(Document(document.toJson()), "secondLevelDocument.test")
 
       true must beTrue
     }