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

!str #15851 Rename FlowMaterializer and settings

akka-docs-dev/rst/scala/code/docs/http/HttpServerExampleSpec.scala

@@ -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)
 

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

@@ -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>`)
   }

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

@@ -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>`)
   }

akka-docs-dev/rst/scala/code/docs/stream/ActorPublisherDocSpec.scala

@@ -5,7 +5,7 @@ package docs.stream
 
 import scala.annotation.tailrec
 import akka.actor.Props
-import akka.stream.FlowMaterializer
+import akka.stream.ActorFlowMaterializer
 import akka.stream.actor.ActorPublisher
 import akka.stream.scaladsl.Sink
 import akka.stream.scaladsl.Source
@@ -70,7 +70,7 @@ object ActorPublisherDocSpec {
 class ActorPublisherDocSpec extends AkkaSpec {
   import ActorPublisherDocSpec._
 
-  implicit val mat = FlowMaterializer()
+  implicit val mat = ActorFlowMaterializer()
 
   "illustrate usage of ActorPublisher" in {
     def println(s: String): Unit =

akka-docs-dev/rst/scala/code/docs/stream/ActorSubscriberDocSpec.scala

@@ -9,7 +9,7 @@ import akka.actor.Props
 import akka.routing.ActorRefRoutee
 import akka.routing.RoundRobinRoutingLogic
 import akka.routing.Router
-import akka.stream.FlowMaterializer
+import akka.stream.ActorFlowMaterializer
 import akka.stream.actor.ActorSubscriber
 import akka.stream.actor.ActorSubscriberMessage
 import akka.stream.actor.MaxInFlightRequestStrategy
@@ -72,7 +72,7 @@ object ActorSubscriberDocSpec {
 class ActorSubscriberDocSpec extends AkkaSpec {
   import ActorSubscriberDocSpec._
 
-  implicit val mat = FlowMaterializer()
+  implicit val mat = ActorFlowMaterializer()
 
   "illustrate usage of ActorSubscriber" in {
     val replyTo = testActor

akka-docs-dev/rst/scala/code/docs/stream/FlexiDocSpec.scala

@@ -3,7 +3,7 @@
  */
 package docs.stream
 
-import akka.stream.FlowMaterializer
+import akka.stream.ActorFlowMaterializer
 import akka.stream.scaladsl._
 import akka.stream.testkit.AkkaSpec
 
@@ -15,7 +15,7 @@ import scala.util.control.NoStackTrace
 class FlexiDocSpec extends AkkaSpec {
 
   implicit val ec = system.dispatcher
-  implicit val mat = FlowMaterializer()
+  implicit val mat = ActorFlowMaterializer()
 
   "implement zip using readall" in {
     //#fleximerge-zip-readall

akka-docs-dev/rst/scala/code/docs/stream/FlowDocSpec.scala

@@ -14,10 +14,10 @@ class FlowDocSpec extends AkkaSpec {
   implicit val ec = system.dispatcher
 
   //#imports
-  import akka.stream.FlowMaterializer
+  import akka.stream.ActorFlowMaterializer
   //#imports
 
-  implicit val mat = FlowMaterializer()
+  implicit val mat = ActorFlowMaterializer()
 
   "source is immutable" in {
     //#source-immutable

akka-docs-dev/rst/scala/code/docs/stream/FlowGraphDocSpec.scala

@@ -3,7 +3,7 @@
  */
 package docs.stream
 
-import akka.stream.FlowMaterializer
+import akka.stream.ActorFlowMaterializer
 import akka.stream.scaladsl.Broadcast
 import akka.stream.scaladsl.Flow
 import akka.stream.scaladsl.FlowGraph
@@ -22,7 +22,7 @@ class FlowGraphDocSpec extends AkkaSpec {
 
   implicit val ec = system.dispatcher
 
-  implicit val mat = FlowMaterializer()
+  implicit val mat = ActorFlowMaterializer()
 
   "build simple graph" in {
     //format: OFF

akka-docs-dev/rst/scala/code/docs/stream/FlowStagesSpec.scala

@@ -1,6 +1,6 @@
 package docs.stream
 
-import akka.stream.FlowMaterializer
+import akka.stream.ActorFlowMaterializer
 import akka.stream.scaladsl.{ RunnableFlow, Sink, Source, Flow }
 import akka.stream.stage.PushPullStage
 import akka.stream.testkit.AkkaSpec
@@ -14,7 +14,7 @@ class FlowStagesSpec extends AkkaSpec {
   import akka.stream.stage._
   //#import-stage
 
-  implicit val mat = FlowMaterializer()
+  implicit val mat = ActorFlowMaterializer()
 
   "stages demo" must {
 

akka-docs-dev/rst/scala/code/docs/stream/GraphCyclesSpec.scala

@@ -1,12 +1,12 @@
 package docs.stream
 
-import akka.stream.{ OverflowStrategy, FlowMaterializer }
+import akka.stream.{ OverflowStrategy, ActorFlowMaterializer }
 import akka.stream.scaladsl._
 import akka.stream.testkit.AkkaSpec
 
 class GraphCyclesSpec extends AkkaSpec {
 
-  implicit val mat = FlowMaterializer()
+  implicit val mat = ActorFlowMaterializer()
 
   "Cycle demonstration" must {
     val source = Source(() => Iterator.from(0))

akka-docs-dev/rst/scala/code/docs/stream/IntegrationDocSpec.scala

@@ -7,7 +7,7 @@ import scala.concurrent.duration._
 import akka.stream.testkit.AkkaSpec
 import akka.stream.scaladsl.Source
 import java.util.Date
-import akka.stream.FlowMaterializer
+import akka.stream.ActorFlowMaterializer
 import scala.concurrent.Future
 import akka.stream.scaladsl.RunnableFlow
 import akka.stream.scaladsl.Sink
@@ -20,7 +20,7 @@ import akka.pattern.ask
 import akka.util.Timeout
 import akka.stream.scaladsl.OperationAttributes
 import scala.concurrent.ExecutionContext
-import akka.stream.MaterializerSettings
+import akka.stream.ActorFlowMaterializerSettings
 import java.util.concurrent.atomic.AtomicInteger
 
 object IntegrationDocSpec {
@@ -117,7 +117,7 @@ class IntegrationDocSpec extends AkkaSpec(IntegrationDocSpec.config) {
   import TwitterStreamQuickstartDocSpec._
   import IntegrationDocSpec._
 
-  implicit val mat = FlowMaterializer()
+  implicit val mat = ActorFlowMaterializer()
 
   "calling external service with mapAsync" in {
     val probe = TestProbe()
@@ -301,8 +301,8 @@ class IntegrationDocSpec extends AkkaSpec(IntegrationDocSpec.config) {
     implicit val blockingExecutionContext = system.dispatchers.lookup("blocking-dispatcher")
     val service = new SometimesSlowService
 
-    implicit val mat = FlowMaterializer(
-      MaterializerSettings(system).withInputBuffer(initialSize = 4, maxSize = 4))
+    implicit val mat = ActorFlowMaterializer(
+      ActorFlowMaterializerSettings(system).withInputBuffer(initialSize = 4, maxSize = 4))
 
     Source(List("a", "B", "C", "D", "e", "F", "g", "H", "i", "J"))
       .map(elem => { println(s"before: $elem"); elem })
@@ -333,8 +333,8 @@ class IntegrationDocSpec extends AkkaSpec(IntegrationDocSpec.config) {
     implicit val blockingExecutionContext = system.dispatchers.lookup("blocking-dispatcher")
     val service = new SometimesSlowService
 
-    implicit val mat = FlowMaterializer(
-      MaterializerSettings(system).withInputBuffer(initialSize = 4, maxSize = 4))
+    implicit val mat = ActorFlowMaterializer(
+      ActorFlowMaterializerSettings(system).withInputBuffer(initialSize = 4, maxSize = 4))
 
     Source(List("a", "B", "C", "D", "e", "F", "g", "H", "i", "J"))
       .map(elem => { println(s"before: $elem"); elem })

akka-docs-dev/rst/scala/code/docs/stream/ReactiveStreamsDocSpec.scala

@@ -3,7 +3,7 @@
  */
 package docs.stream
 
-import akka.stream.FlowMaterializer
+import akka.stream.ActorFlowMaterializer
 import akka.stream.scaladsl.Flow
 import akka.stream.testkit.AkkaSpec
 import akka.stream.scaladsl.Sink
@@ -13,7 +13,7 @@ import akka.stream.scaladsl.Source
 class ReactiveStreamsDocSpec extends AkkaSpec {
   import TwitterStreamQuickstartDocSpec._
 
-  implicit val mat = FlowMaterializer()
+  implicit val mat = ActorFlowMaterializer()
 
   //#imports
   import org.reactivestreams.Publisher

akka-docs-dev/rst/scala/code/docs/stream/StreamBuffersRateSpec.scala

@@ -1,11 +1,11 @@
 package docs.stream
 
-import akka.stream.{ OverflowStrategy, MaterializerSettings, FlowMaterializer }
+import akka.stream.{ OverflowStrategy, ActorFlowMaterializerSettings, ActorFlowMaterializer }
 import akka.stream.scaladsl._
 import akka.stream.testkit.AkkaSpec
 
 class StreamBuffersRateSpec extends AkkaSpec {
-  implicit val mat = FlowMaterializer()
+  implicit val mat = ActorFlowMaterializer()
 
   "Demonstrate pipelining" in {
     def println(s: Any) = ()
@@ -20,8 +20,8 @@ class StreamBuffersRateSpec extends AkkaSpec {
 
   "Demonstrate buffer sizes" in {
     //#materializer-buffer
-    val materializer = FlowMaterializer(
-      MaterializerSettings(system)
+    val materializer = ActorFlowMaterializer(
+      ActorFlowMaterializerSettings(system)
         .withInputBuffer(
           initialSize = 64,
           maxSize = 64))

akka-docs-dev/rst/scala/code/docs/stream/StreamPartialFlowGraphDocSpec.scala

@@ -3,7 +3,7 @@
  */
 package docs.stream
 
-import akka.stream.FlowMaterializer
+import akka.stream.ActorFlowMaterializer
 import akka.stream.scaladsl.Broadcast
 import akka.stream.scaladsl.Flow
 import akka.stream.scaladsl.FlowGraph
@@ -25,7 +25,7 @@ class StreamPartialFlowGraphDocSpec extends AkkaSpec {
 
   implicit val ec = system.dispatcher
 
-  implicit val mat = FlowMaterializer()
+  implicit val mat = ActorFlowMaterializer()
 
   "build with open ports" in {
     // format: OFF

akka-docs-dev/rst/scala/code/docs/stream/StreamTcpDocSpec.scala

@@ -21,12 +21,12 @@ class StreamTcpDocSpec extends AkkaSpec {
   implicit val ec = system.dispatcher
 
   //#setup
-  import akka.stream.FlowMaterializer
+  import akka.stream.ActorFlowMaterializer
   import akka.stream.scaladsl.StreamTcp
   import akka.stream.scaladsl.StreamTcp._
 
   implicit val sys = ActorSystem("stream-tcp-system")
-  implicit val mat = FlowMaterializer()
+  implicit val mat = ActorFlowMaterializer()
   //#setup
 
   val localhost = new InetSocketAddress("127.0.0.1", 8888)

akka-docs-dev/rst/scala/code/docs/stream/TwitterStreamQuickstartDocSpec.scala

@@ -6,7 +6,7 @@ package docs.stream
 //#imports
 
 import akka.actor.ActorSystem
-import akka.stream.FlowMaterializer
+import akka.stream.ActorFlowMaterializer
 import akka.stream.OverflowStrategy
 import akka.stream.scaladsl.Broadcast
 import akka.stream.scaladsl.Flow
@@ -66,11 +66,11 @@ class TwitterStreamQuickstartDocSpec extends AkkaSpec {
   trait Example1 {
     //#materializer-setup
     implicit val system = ActorSystem("reactive-tweets")
-    implicit val mat = FlowMaterializer()
+    implicit val mat = ActorFlowMaterializer()
     //#materializer-setup
   }
 
-  implicit val mat = FlowMaterializer()
+  implicit val mat = ActorFlowMaterializer()
 
   "filter and map" in {
     //#authors-filter-map

akka-docs-dev/rst/scala/code/docs/stream/cookbook/RecipeCollectingMetrics.scala

@@ -1,6 +1,6 @@
 package docs.stream.cookbook
 
-import akka.stream.{ MaterializerSettings, FlowMaterializer }
+import akka.stream.{ ActorFlowMaterializerSettings, ActorFlowMaterializer }
 import akka.stream.scaladsl._
 import akka.stream.testkit.StreamTestKit
 import akka.stream.testkit.StreamTestKit.{ SubscriberProbe, PublisherProbe }
@@ -11,7 +11,7 @@ import scala.concurrent.duration._
 
 class RecipeCollectingMetrics extends RecipeSpec {
   import HoldOps._
-  implicit val m2 = FlowMaterializer(MaterializerSettings(system).withInputBuffer(1, 1))
+  implicit val m2 = ActorFlowMaterializer(ActorFlowMaterializerSettings(system).withInputBuffer(1, 1))
 
   "Recipe for periodically collecting metrics" must {
 

akka-docs-dev/rst/scala/code/docs/stream/cookbook/RecipeSpec.scala

@@ -1,11 +1,11 @@
 package docs.stream.cookbook
 
-import akka.stream.FlowMaterializer
+import akka.stream.ActorFlowMaterializer
 import akka.stream.testkit.AkkaSpec
 
 trait RecipeSpec extends AkkaSpec {
 
-  implicit val m = FlowMaterializer()
+  implicit val m = ActorFlowMaterializer()
   type Message = String
   type Trigger = Unit
   type Job = String