Merge pull request #16730 from akka/wip-15851-ActorBasedFlowMaterializer-patriknw

!str #15851 Rename FlowMaterializer and settings
This commit is contained in:
Patrik Nordwall 2015-01-29 10:30:08 +01:00
commit 580ba8c484
146 changed files with 601 additions and 595 deletions

View file

@ -16,10 +16,10 @@ class HttpServerExampleSpec
"binding example" in {
//#bind-example
import akka.http.Http
import akka.stream.FlowMaterializer
import akka.stream.ActorFlowMaterializer
implicit val system = ActorSystem()
implicit val materializer = FlowMaterializer()
implicit val materializer = ActorFlowMaterializer()
val serverBinding = Http(system).bind(interface = "localhost", port = 8080)
serverBinding.connections.runForeach { connection => // foreach materializes the source
@ -30,10 +30,10 @@ class HttpServerExampleSpec
"full-server-example" in {
import akka.http.Http
import akka.stream.FlowMaterializer
import akka.stream.ActorFlowMaterializer
implicit val system = ActorSystem()
implicit val materializer = FlowMaterializer()
implicit val materializer = ActorFlowMaterializer()
val serverBinding = Http(system).bind(interface = "localhost", port = 8080)