FlatMap document result

Author: mathieuancelin

driver/src/main/scala/org/reactivecouchbase/client/Queries.scala

@@ -69,7 +69,7 @@ class QueryEnumerator[T](futureEnumerator: () => Future[Enumerator[T]]) {
   def toEnumerator: Future[Enumerator[T]] = futureEnumerator()
 
   /**
-   * 
+   *
    * @param ec ExecutionContext for async processing
    * @return the query result as enumerator
    */
@@ -86,7 +86,7 @@ class QueryEnumerator[T](futureEnumerator: () => Future[Enumerator[T]]) {
     futureEnumerator().flatMap(_(Iteratee.getChunks[T]).flatMap(_.run))
 
   /**
-   * 
+   *
    * @param ec ExecutionContext for async processing
    * @return the optinal head
    */
@@ -222,10 +222,12 @@ trait Queries {
     QueryEnumerator(() => rawSearch(view)(query)(bucket, ec).toEnumerator.map { enumerator =>
       enumerator &>
         Enumeratee.map[RawRow] { row =>
-          row.document.map { doc =>
-            if (doc != null)
-              JsRow[T](r.reads(Json.parse(doc)), row.id, row.key, row.value)
-            else null
+          row.document.flatMap { doc =>
+            if (doc != null) {
+              Some(JsRow[T](r.reads(Json.parse(doc)), row.id, row.key, row.value))
+            } else {
+              None
+            }
           }.getOrElse(
             JsRow[T](JsError(), row.id, row.key, row.value)
           )