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

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

Browse source 
!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
Download patch file Download diff file Expand all files Collapse all files

8
akka-docs-dev/rst/scala/code/docs/http/HttpServerExampleSpec.scala
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)

4
akka-docs-dev/rst/scala/code/docs/http/server/ExceptionHandlerExamplesSpec.scala
View file

@ -6,7 +6,7 @@ package docs.http.server
import akka.actor.ActorSystem
import akka.http.server.Route
import akka.stream.FlowMaterializer
import akka.stream.ActorFlowMaterializer
object MyHandler {
//# example-1
@ -27,7 +27,7 @@ object MyHandler {
object MyApp {
implicit val system = ActorSystem()
import system.dispatcher
implicit val materializer = FlowMaterializer()
implicit val materializer = ActorFlowMaterializer()
def handler = Route.handlerFlow(`<my-route-definition>`)
}

4
akka-docs-dev/rst/scala/code/docs/http/server/RejectionHandlerExamplesSpec.scala
View file

@ -5,7 +5,7 @@
package docs.http.server
import akka.actor.ActorSystem
import akka.stream.FlowMaterializer
import akka.stream.ActorFlowMaterializer
import akka.http.server.{ Route, MissingCookieRejection }
@ -26,7 +26,7 @@ object MyRejectionHandler {
object MyApp {
implicit val system = ActorSystem()
import system.dispatcher
implicit val materializer = FlowMaterializer()
implicit val materializer = ActorFlowMaterializer()
def handler = Route.handlerFlow(`<my-route-definition>`)
}