remove Future from StreamRefs mat val, #24372 (#26847)

This commit is contained in:
Patrik Nordwall 2019-05-02 16:54:37 +02:00 committed by GitHub
parent 1128024797
commit 82c761f026
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
14 changed files with 109 additions and 117 deletions

View file

@ -39,25 +39,23 @@ object StreamRefsSpec {
* For them it's a Source; for us it is a Sink we run data "into"
*/
val source: Source[String, NotUsed] = Source(List("hello", "world"))
val ref: Future[SourceRef[String]] = source.runWith(StreamRefs.sourceRef())
val ref: SourceRef[String] = source.runWith(StreamRefs.sourceRef())
ref.pipeTo(sender())
sender() ! ref
case "give-infinite" =>
val source: Source[String, NotUsed] = Source.fromIterator(() => Iterator.from(1)).map("ping-" + _)
val (r: NotUsed, ref: Future[SourceRef[String]]) = source.toMat(StreamRefs.sourceRef())(Keep.both).run()
val (r: NotUsed, ref: SourceRef[String]) = source.toMat(StreamRefs.sourceRef())(Keep.both).run()
ref.pipeTo(sender())
sender() ! ref
case "give-fail" =>
val ref = Source.failed[String](new Exception("Booooom!") with NoStackTrace).runWith(StreamRefs.sourceRef())
ref.pipeTo(sender())
sender() ! ref
case "give-complete-asap" =>
val ref = Source.empty.runWith(StreamRefs.sourceRef())
ref.pipeTo(sender())
sender() ! ref
case "give-subscribe-timeout" =>
val ref = Source
@ -65,8 +63,8 @@ object StreamRefsSpec {
.toMat(StreamRefs.sourceRef())(Keep.right) // attributes like this so they apply to the Sink.sourceRef
.withAttributes(StreamRefAttributes.subscriptionTimeout(500.millis))
.run()
sender() ! ref
ref.pipeTo(sender())
// case "send-bulk" =>
// /*
// * Here we're able to send a source to a remote recipient
@ -86,14 +84,12 @@ object StreamRefsSpec {
*/
val sink =
StreamRefs.sinkRef[String]().to(Sink.actorRef(probe, "<COMPLETE>")).run()
sink.pipeTo(sender())
sender() ! sink
case "receive-ignore" =>
val sink =
StreamRefs.sinkRef[String]().to(Sink.ignore).run()
sink.pipeTo(sender())
sender() ! sink
case "receive-subscribe-timeout" =>
val sink = StreamRefs
@ -101,8 +97,7 @@ object StreamRefsSpec {
.withAttributes(StreamRefAttributes.subscriptionTimeout(500.millis))
.to(Sink.actorRef(probe, "<COMPLETE>"))
.run()
sink.pipeTo(sender())
sender() ! sink
case "receive-32" =>
val (sink, driver) = StreamRefs.sinkRef[String]().toMat(TestSink.probe(context.system))(Keep.both).run()
@ -120,7 +115,7 @@ object StreamRefsSpec {
"<COMPLETED>"
}.pipeTo(probe)
sink.pipeTo(sender())
sender() ! sink
// case "receive-bulk" =>
// /*