code cleanup

Author: sfxcode

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

@@ -8,16 +8,18 @@ case class MongoIndex(name: String, key: String, ascending: Int, version: Int, n
 
 object MongoIndex extends ObservableIncludes {
 
-  def indexOptionsWithName(name: Option[String]) =
-    if (name.isDefined)
+  def indexOptionsWithName(name: Option[String]): IndexOptions = {
+    if (name.isDefined) {
       IndexOptions().name(name.get)
-    else
+    } else {
       IndexOptions()
+    }
+  }
 
   def hasIndexForFieldWithName(listIndexesObservable: ListIndexesObservable[Map[String, Any]],
                                fieldName: String,
                                maxWait: Int = DefaultMaxWait): Boolean =
-    convertIndexDocumentsToMongoIndexList(listIndexesObservable).exists(index => index.key == fieldName)
+    convertIndexDocumentsToMongoIndexList(listIndexesObservable, maxWait).exists(index => index.key == fieldName)
 
   def convertIndexDocumentsToMongoIndexList(listIndexesObservable: ListIndexesObservable[Map[String, Any]],
                                             maxWait: Int = DefaultMaxWait): List[MongoIndex] = {

src/main/scala/com/sfxcode/nosql/mongo/gridfs/Metadata.scala

@@ -9,7 +9,7 @@ import org.mongodb.scala.bson.conversions.Bson
 import org.mongodb.scala.model.Filters.equal
 import org.mongodb.scala.model.Updates._
 import org.mongodb.scala.result.UpdateResult
-import org.mongodb.scala.{ Document, MongoDatabase, Observable }
+import org.mongodb.scala.{Document, Observable}
 
 abstract class Metadata(provider: DatabaseProvider, bucketName: String) extends Crud {
 

src/main/scala/com/sfxcode/nosql/mongo/gridfs/Search.scala

@@ -8,7 +8,7 @@ import org.mongodb.scala.model.Filters.equal
 
 abstract class Search extends Base {
 
-  def find(filter: Bson = Document(), sort: Bson = Document(), projection: Bson = Document()): GridFSFindObservable =
+  def find(filter: Bson = Document(), sort: Bson = Document()): GridFSFindObservable =
     gridfsBucket.find(filter).sort(sort)
 
   def findById(oid: ObjectId): GridFSFindObservable = find(equal("_id", oid))
@@ -19,5 +19,4 @@ abstract class Search extends Base {
   def findByMetadataValue(key: String, value: Any): GridFSFindObservable =
     find(createMetadataKey(key), value)
 
-
 }

src/main/scala/com/sfxcode/nosql/mongo/operation/Base.scala

@@ -40,10 +40,10 @@ abstract class Base[A]()(implicit ct: ClassTag[A]) extends LazyLogging {
     createIndexForField(fieldName, sortAscending, MongoIndex.indexOptionsWithName(name).unique(true))
 
   def createHashedIndexForField(fieldName: String, options: IndexOptions = IndexOptions()): SingleObservable[String] =
-    createIndex(Indexes.hashed(fieldName), IndexOptions())
+    createIndex(Indexes.hashed(fieldName), options)
 
   def createTextIndexForField(fieldName: String, options: IndexOptions = IndexOptions()): SingleObservable[String] =
-    createIndex(Indexes.text(fieldName), IndexOptions())
+    createIndex(Indexes.text(fieldName), options)
 
   def createExpiringIndexForField(fieldName: String,
                                   duration: Duration,
@@ -66,6 +66,6 @@ abstract class Base[A]()(implicit ct: ClassTag[A]) extends LazyLogging {
 
   def indexList(): List[MongoIndex] = MongoIndex.convertIndexDocumentsToMongoIndexList(listIndexes)
 
-  def hasIndexForField(fieldName: String) = MongoIndex.hasIndexForFieldWithName(listIndexes, fieldName)
+  def hasIndexForField(fieldName: String): Boolean = MongoIndex.hasIndexForFieldWithName(listIndexes, fieldName)
 
 }

src/main/scala/com/sfxcode/nosql/mongo/operation/CrudObserver.scala

@@ -21,11 +21,11 @@ trait CrudObserver[A] extends Crud[A] {
   def deleteValue(value: A, observer: Observer[DeleteResult] = new SimpleObserver[DeleteResult]): Unit = {
     val oid = Converter.toDocument(value).get("_id").get
     val filter = equal("_id", oid)
-    deleteOne(filter)
+    deleteOne(filter).subscribe(observer)
   }
 
   def deleteValues(filter: Bson, observer: Observer[DeleteResult] = new SimpleObserver[DeleteResult]): Unit =
-    deleteMany(filter)
+    deleteMany(filter).subscribe(observer)
 
 }
 

src/main/scala/com/sfxcode/nosql/mongo/operation/ObservableIncludes.scala

@@ -41,7 +41,9 @@ trait ObservableIncludes {
 
     def printResults(initial: String = ""): Unit = {
       if (initial.length > 0) print(initial)
-      results().foreach(res => println(debugString(res)))
+      results().foreach(res => {
+        println(debugString(res))
+      })
     }
 
     def printHeadResult(initial: String = ""): Unit =