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

Remove simple line parsing, exposing explicit delimiter stage instead

Browse source
This commit is contained in:
Endre Sándor Varga 2015-06-23 16:55:27 +02:00
parent 79e24c5976
commit 8702f09f10
7 changed files with 21 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

3
akka-docs-dev/rst/scala/code/docs/stream/cookbook/RecipeParseLines.scala
View file

@ -22,7 +22,8 @@ class RecipeParseLines extends RecipeSpec {
//#parse-lines
import akka.stream.io.Framing
val linesStream = rawData.via(Framing.lines("\r\n", maximumLineBytes = 100))
val linesStream = rawData.via(
Framing.delimiter(ByteString("\r\n"), maximumFrameLength = 100, allowTruncation = true)).map(_.utf8String)
//#parse-lines
Await.result(linesStream.grouped(10).runWith(Sink.head), 3.seconds) should be(List(

9
akka-docs-dev/rst/scala/code/docs/stream/io/StreamTcpDocSpec.scala
View file

@ -47,7 +47,8 @@ class StreamTcpDocSpec extends AkkaSpec {
println(s"New connection from: ${connection.remoteAddress}")
val echo = Flow[ByteString]
.via(Framing.lines("\n", maximumLineBytes = 256, allowTruncation = false))
.via(Framing.delimiter(ByteString("\n"), maximumFrameLength = 256, allowTruncation = true))
.map(_.utf8String)
.map(_ + "!!!\n")
.map(ByteString(_))
@ -85,7 +86,8 @@ class StreamTcpDocSpec extends AkkaSpec {
val welcome = Source.single(ByteString(welcomeMsg))
val echo = b.add(Flow[ByteString]
.via(Framing.lines("\n", maximumLineBytes = 256, allowTruncation = false))
.via(Framing.delimiter(ByteString("\n"), maximumFrameLength = 256, allowTruncation = true))
.map(_.utf8String)
//#welcome-banner-chat-server
.map { command ⇒ serverProbe.ref ! command; command }
//#welcome-banner-chat-server
@ -136,7 +138,8 @@ class StreamTcpDocSpec extends AkkaSpec {
}
val repl = Flow[ByteString]
.via(Framing.lines("\n", maximumLineBytes = 256, allowTruncation = false))
.via(Framing.delimiter(ByteString("\n"), maximumFrameLength = 256, allowTruncation = true))
.map(_.utf8String)
.map(text => println("Server: " + text))
.map(_ => readLine("> "))
.transform(() ⇒ replParser)