raboof/pekko
1
0
Fork 0
Code Issues Pull requests Projects Releases 6 Packages Wiki Activity Actions 10

+str #17702: Add Keep.none

Browse source
This commit is contained in:
Endre Sándor Varga 2015-06-15 13:28:50 +02:00
parent 0e6694a102
commit f3bcf89c52
6 changed files with 20 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

2
akka-http-core/src/main/scala/akka/http/impl/engine/server/HttpServerBluePrint.scala
View file

@ -296,7 +296,7 @@ private[http] object HttpServerBluePrint {
val flow =
Flow[ByteString]
.transform[FrameEvent](() ⇒ new FrameEventParser)
.via(Flow.wrap(sink, source)((_, _) ⇒ ()))
.via(Flow.wrap(sink, source)(Keep.none))
.transform(() ⇒ new FrameEventRenderer)
new WebsocketSetup {

4
akka-http-core/src/test/scala/akka/http/impl/engine/ws/WebsocketServerSpec.scala
View file

@ -6,7 +6,7 @@ package akka.http.impl.engine.ws
import akka.http.impl.engine.ws.Protocol.Opcode
import akka.http.scaladsl.model.ws._
import akka.stream.scaladsl.{ Sink, Flow, Source }
import akka.stream.scaladsl.{ Keep, Sink, Flow, Source }
import akka.stream.testkit.Utils
import akka.util.ByteString
import org.scalatest.{ Matchers, FreeSpec }
@ -42,7 +42,7 @@ class WebsocketServerSpec extends FreeSpec with Matchers with WithMaterializerSp
val source =
Source(List(1, 2, 3, 4, 5)).map(num ⇒ TextMessage.Strict(s"Message $num"))
val handler = Flow.wrap(Sink.ignore, source)((_, _) ⇒ ())
val handler = Flow.wrap(Sink.ignore, source)(Keep.none)
val response = upgrade.get.handleMessages(handler)
responsesSub.sendNext(response)