Skip to content
This repository was archived by the owner on Mar 2, 2022. It is now read-only.

Fix conversion to Scala Future #36

Merged
merged 2 commits into from
Oct 10, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions src/main/scala/reactor/core/scala/publisher/SMono.scala
Original file line number Diff line number Diff line change
Expand Up @@ -1300,8 +1300,10 @@ trait SMono[T] extends SMonoLike[T, SMono] with MapablePublisher[T] with ScalaCo
final def toFuture: Future[T] = {
val promise = Promise[T]()
coreMono.toFuture.handle[Unit]((value: T, throwable: Throwable) => {
Option(value).foreach(v => promise.complete(Try(v)))
Option(throwable).foreach(t => promise.failure(t))
Option(throwable) match {
case Some(_) => promise.failure(throwable)
case None => promise.complete(Success(value))
}
()
})
promise.future
Expand Down
7 changes: 7 additions & 0 deletions src/test/scala/reactor/core/scala/publisher/SMonoTest.scala
Original file line number Diff line number Diff line change
Expand Up @@ -1155,5 +1155,12 @@ class SMonoAsyncTest extends AsyncFreeSpec {
}
}
}
".toFuture should convert this mono to future with void return" in {
val future: Future[Int] = SMono.empty[Unit].toFuture.map(_ => 1)
future map { v => {
assert(v == 1)
}
}
}
}
}