MongoImplicits removed from package object

Author: sfxcode

src/main/scala/com/sfxcode/nosql/mongo/Filter.scala

@@ -23,6 +23,9 @@ trait Filter {
       case _ => DefaultBson
     }
 
+  def fieldComparisonFilter(firstFieldName: String, secondFieldName: String, operator: String): Bson =
+    where("this.%s %s this.%s".format(firstFieldName, operator, secondFieldName))
+
   def nullFilter(fieldName: String): Bson = equal(fieldName, value = null)
 
   def notNullFilter(fieldName: String): Bson = not(nullFilter(fieldName))

src/main/scala/com/sfxcode/nosql/mongo/package.scala

@@ -18,7 +18,7 @@ import org.mongodb.scala.{Document, FindObservable, Observable, ObservableImplic
 import scala.collection.JavaConverters._
 import scala.language.implicitConversions
 
-package object mongo extends MongoIncludes with DocumentIncludes {
+package object mongo extends ObservableIncludes with DocumentIncludes {
 
   implicit class DocumentExtensions[A <: Document](val document: A) extends AnyVal {
 
@@ -74,8 +74,7 @@ package object mongo extends MongoIncludes with DocumentIncludes {
   }
 }
 
-trait MongoIncludes extends ObservableIncludes with ObservableImplicits {
-  implicit def stringToConfig(database: String): MongoConfig = MongoConfig(database)
+trait MongoImplicits extends ObservableImplicits with ObservableIncludes {
 
   implicit def observableToResult[T](obs: Observable[T]): T = obs.result()
 

src/test/scala/com/sfxcode/nosql/mongo/dao/PersonDAOSpec.scala

@@ -2,6 +2,7 @@ package com.sfxcode.nosql.mongo.dao
 
 import java.util.concurrent.TimeUnit
 
+import com.sfxcode.nosql.MongoImplicits
 import com.sfxcode.nosql.mongo.test.TestDatabase.PersonDAO
 import com.sfxcode.nosql.mongo._
 import com.sfxcode.nosql.mongo.model.Person
@@ -10,7 +11,7 @@ import scala.concurrent.ExecutionContext.Implicits.global
 import scala.concurrent.duration.Duration
 import scala.concurrent.{Await, Future}
 
-class PersonDAOSpec extends PersonSpecification {
+class PersonDAOSpec extends PersonSpecification with MongoImplicits {
 
   "PersonDAO" should {
 

src/test/scala/com/sfxcode/nosql/mongo/dao/StudentDAOSpec.scala

@@ -1,13 +1,14 @@
 package com.sfxcode.nosql.mongo.dao
 
 import better.files.{File, Resource}
+import com.sfxcode.nosql.MongoImplicits
 import com.sfxcode.nosql.mongo._
 import com.sfxcode.nosql.mongo.model.Student
 import com.sfxcode.nosql.mongo.test.UniversityDatabase.{GradeDAO, StudentDAO}
 import org.specs2.mutable.Specification
 import org.specs2.specification.BeforeAll
 
-class StudentDAOSpec extends Specification with BeforeAll {
+class StudentDAOSpec extends Specification with BeforeAll with MongoImplicits {
   sequential
 
   override def beforeAll(): Unit = {

src/test/scala/com/sfxcode/nosql/mongo/database/DatabaseProviderSpec.scala

@@ -1,12 +1,10 @@
 package com.sfxcode.nosql.mongo.database
 
 import better.files.{File, Resource}
-import com.mongodb.MongoBulkWriteException
-import com.sfxcode.nosql.mongo.test.TestDatabase._
 import com.sfxcode.nosql.mongo._
 import com.sfxcode.nosql.mongo.dao.PersonSpecification
+import com.sfxcode.nosql.mongo.test.TestDatabase._
 import org.mongodb.scala.Document
-import org.specs2.mutable.Specification
 
 class DatabaseProviderSpec extends PersonSpecification {
 
@@ -24,7 +22,7 @@ class DatabaseProviderSpec extends PersonSpecification {
 
     "must evaluate dao by name" in {
       val dao         = provider.dao("people")
-      val count: Long = dao.count()
+      val count: Long = dao.count().result()
       count mustEqual 200
     }
 
@@ -36,7 +34,7 @@ class DatabaseProviderSpec extends PersonSpecification {
       provider.dropDatabase(databaseName).result()
 
       dao.importJsonFile(File(Resource.getUrl("json/people.json"))).result()
-      val count: Long = dao.count()
+      val count: Long = dao.count().result()
       count mustEqual 200
     }
 

src/test/scala/com/sfxcode/nosql/mongo/gridfs/GridfsDatabaseFunctions.scala

@@ -1,14 +1,15 @@
 package com.sfxcode.nosql.mongo.gridfs
 
 import better.files.File
+import com.sfxcode.nosql.MongoImplicits
 import com.sfxcode.nosql.mongo._
 import com.sfxcode.nosql.mongo.test.TestDatabase.ImageFilesDAO
 import org.bson.types.ObjectId
 import org.mongodb.scala.bson.conversions.Bson
 import org.mongodb.scala.gridfs.GridFSFile
 import org.mongodb.scala.result.UpdateResult
 
-trait GridfsDatabaseFunctions {
+trait GridfsDatabaseFunctions extends MongoImplicits {
 
   def createIndexOnImages(key: String): String =
     ImageFilesDAO.createMetadataIndex(key)

src/test/scala/com/sfxcode/nosql/mongo/operation/AggregationSpec.scala

@@ -46,7 +46,7 @@ class AggregationSpec extends PersonSpecification {
       // #agg_convert
       val list: List[Map[String, Any]] = aggregated
       // #agg_convert
-      list.foreach(m => println(m("age") + " -> " + m("balance")))
+      list.foreach(m => println(m("age").toString + " -> " + m("balance")))
 
       list.head("age") must be equalTo 20
       list.head("balance") must be equalTo 8333.0

src/test/scala/com/sfxcode/nosql/mongo/operation/IndexSpec.scala

@@ -31,15 +31,15 @@ class IndexSpec extends PersonSpecification {
 
     "create / drop indexes for key" in {
 
-      var createIndexResult: String = PersonDAO.createIndexForField("name")
+      var createIndexResult: String = PersonDAO.createIndexForField("name").result()
 
       createIndexResult mustEqual "name_1"
 
       PersonDAO.indexList must haveSize(2)
       val index: MongoIndex = PersonDAO.indexForName("name_1").get
       index.expire must beFalse
 
-      val dropIndexResult: Void = PersonDAO.dropIndexForName(createIndexResult)
+      val dropIndexResult: Void = PersonDAO.dropIndexForName(createIndexResult).result()
 
       PersonDAO.indexList must haveSize(1)
     }
@@ -53,7 +53,8 @@ class IndexSpec extends PersonSpecification {
 
     "create descending index for key" in {
 
-      var createIndexResult: String = PersonDAO.createIndexForFieldWithName("name", sortAscending = false, "myIndex")
+      var createIndexResult: String =
+        PersonDAO.createIndexForFieldWithName("name", sortAscending = false, "myIndex").result()
 
       createIndexResult mustEqual "myIndex"
 
@@ -68,7 +69,7 @@ class IndexSpec extends PersonSpecification {
     "create unique index for key" in {
 
       var createIndexResult: String =
-        PersonDAO.createUniqueIndexForField("id", sortAscending = false, Some("myUniqueIndex"))
+        PersonDAO.createUniqueIndexForField("id", sortAscending = false, Some("myUniqueIndex")).result()
 
       createIndexResult mustEqual "myUniqueIndex"
 
@@ -82,7 +83,7 @@ class IndexSpec extends PersonSpecification {
 
     "create text index for key" in {
 
-      var createIndexResult: String = PersonDAO.createTextIndexForField("email")
+      var createIndexResult: String = PersonDAO.createTextIndexForField("email").result()
 
       createIndexResult mustEqual "email_text"
 
@@ -96,7 +97,7 @@ class IndexSpec extends PersonSpecification {
 
     "create hashed index for key" in {
 
-      var createIndexResult: String = PersonDAO.createHashedIndexForField("email")
+      var createIndexResult: String = PersonDAO.createHashedIndexForField("email").result()
 
       createIndexResult mustEqual "email_hashed"
 
@@ -110,7 +111,8 @@ class IndexSpec extends PersonSpecification {
 
     "create expiring index for key" in {
 
-      var createIndexResult: String = PersonDAO.createExpiringIndexForField("email", Duration(1, TimeUnit.SECONDS))
+      var createIndexResult: String =
+        PersonDAO.createExpiringIndexForField("email", Duration(1, TimeUnit.SECONDS)).result()
 
       createIndexResult mustEqual "email_1"
 

src/test/scala/com/sfxcode/nosql/mongo/operation/SearchSpec.scala

@@ -1,12 +1,13 @@
 package com.sfxcode.nosql.mongo.operation
 
+import com.sfxcode.nosql.MongoImplicits
 import com.sfxcode.nosql.mongo.Sort._
 import com.sfxcode.nosql.mongo.test.TestDatabase._
 import com.sfxcode.nosql.mongo._
 import com.sfxcode.nosql.mongo.dao.PersonSpecification
 import com.sfxcode.nosql.mongo.model.Person
 
-class SearchSpec extends PersonSpecification {
+class SearchSpec extends PersonSpecification with MongoImplicits {
 
   "Search Operations" should {
 

src/test/scala/com/sfxcode/nosql/mongo/relation/RelationDemoDatabase.scala

@@ -53,7 +53,7 @@ object RelationDemoDatabase {
   // #registry
   private val registry = fromProviders(classOf[Node], classOf[User], classOf[Login], classOf[SimplePerson])
 
-  val provider = DatabaseProvider("relation_test", registry)
+  val provider = DatabaseProvider.fromPath("relation_test", registry)
 
   object NodeDAO extends MongoDAO[Node](provider, "nodes") {
     lazy val parentRelation   = OneToOneRelationship(this, "id")