make downloadFileResult, downloadStreamResult explicit

Author: sfxcode

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

@@ -69,11 +69,21 @@ abstract class Base extends LazyLogging {
   def download(id: ObjectId, file: File): GridFSStreamObserver =
     download(id, file.newOutputStream)
 
+  def downloadFileResult(id: ObjectId, file: File): Long = streamObserverResult(download(id, file))
+
   def download(oid: ObjectId, outputStream: OutputStream): GridFSStreamObserver = {
     val observable: GridFSDownloadObservable = gridfsBucket.downloadToObservable(oid)
     val observer                             = GridFSStreamObserver(outputStream)
     observable.subscribe(observer)
     observer
   }
 
+  def downloadStreamResult(id: ObjectId, outputStream: OutputStream): Long =
+    streamObserverResult(download(id, outputStream))
+
+  protected def streamObserverResult(observer: GridFSStreamObserver): Long = {
+    while (!observer.completed.get) {}
+    observer.resultLength.get()
+  }
+
 }

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

@@ -74,7 +74,7 @@ package object mongo extends ObservableIncludes with DocumentIncludes {
   }
 }
 
-trait MongoImplicits extends ObservableImplicits with ObservableIncludes {
+trait MongoImplicits extends ObservableIncludes with ObservableImplicits {
 
   implicit def observableToResult[T](obs: Observable[T]): T = obs.result()
 
@@ -93,11 +93,6 @@ trait MongoImplicits extends ObservableImplicits with ObservableIncludes {
 
   implicit def gridFSFileToBSonIdValue(file: GridFSFile): BsonValue = file.getId
 
-  implicit def observerToResultLength(observer: GridFSStreamObserver): Long = {
-    while (!observer.completed.get) {}
-    observer.resultLength.get()
-  }
-
 }
 
 trait DocumentIncludes {

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

@@ -32,7 +32,7 @@ trait GridfsDatabaseFunctions extends MongoImplicits {
   def downloadImage(id: ObjectId, path: String): Long = {
     val file       = File(path)
     val start      = System.currentTimeMillis()
-    val size: Long = ImageFilesDAO.download(id, file)
+    val size: Long = ImageFilesDAO.downloadFileResult(id, file)
 
     println(
       "file: %s with size %s Bytes written in %s ms "