diff --git a/akka-bench-jmh-dev/src/main/scala/akka/stream/MaterializationBenchmark.scala b/akka-bench-jmh-dev/src/main/scala/akka/stream/MaterializationBenchmark.scala index 48db4f24c0..01a6f80e4f 100644 --- a/akka-bench-jmh-dev/src/main/scala/akka/stream/MaterializationBenchmark.scala +++ b/akka-bench-jmh-dev/src/main/scala/akka/stream/MaterializationBenchmark.scala @@ -76,7 +76,7 @@ class MaterializationBenchmark { import MaterializationBenchmark._ implicit val system = ActorSystem("MaterializationBenchmark") - implicit val mat = ActorMaterializer() + implicit val materializer = ActorMaterializer() var flowWithMap: RunnableGraph[Unit] = _ var graphWithJunctions: RunnableGraph[Unit] = _ diff --git a/akka-bench-jmh-dev/src/main/scala/akka/stream/io/FileSourcesBenchmark.scala b/akka-bench-jmh-dev/src/main/scala/akka/stream/io/FileSourcesBenchmark.scala index 319e1d566a..a043908b43 100644 --- a/akka-bench-jmh-dev/src/main/scala/akka/stream/io/FileSourcesBenchmark.scala +++ b/akka-bench-jmh-dev/src/main/scala/akka/stream/io/FileSourcesBenchmark.scala @@ -26,7 +26,7 @@ import scala.concurrent.{Promise, Await, Future} class FileSourcesBenchmark { implicit val system = ActorSystem("file-sources-benchmark") - implicit val mat = ActorMaterializer() + implicit val materializer = ActorMaterializer() val file: File = { val line = ByteString("x" * 2048 + "\n") diff --git a/akka-docs-dev/rst/scala/code/docs/http/scaladsl/server/directives/BasicDirectivesExamplesSpec.scala b/akka-docs-dev/rst/scala/code/docs/http/scaladsl/server/directives/BasicDirectivesExamplesSpec.scala index f6dcf2693e..fcf6bccba9 100644 --- a/akka-docs-dev/rst/scala/code/docs/http/scaladsl/server/directives/BasicDirectivesExamplesSpec.scala +++ b/akka-docs-dev/rst/scala/code/docs/http/scaladsl/server/directives/BasicDirectivesExamplesSpec.scala @@ -77,11 +77,11 @@ class BasicDirectivesExamplesSpec extends RoutingSpec { "extractMaterializer-0" in { val route = path("sample") { - extractMaterializer { mat => + extractMaterializer { materializer => complete { - // explicitly use the `mat` materializer: - Source.single(s"Materialized by ${mat.##}!") - .runWith(Sink.head)(mat) + // explicitly use the `materializer`: + Source.single(s"Materialized by ${materializer.##}!") + .runWith(Sink.head)(materializer) } } } // default materializer will be used diff --git a/akka-docs-dev/rst/scala/code/docs/http/scaladsl/server/directives/FileUploadDirectivesExamplesSpec.scala b/akka-docs-dev/rst/scala/code/docs/http/scaladsl/server/directives/FileUploadDirectivesExamplesSpec.scala index f259adc1eb..94b2a200fd 100644 --- a/akka-docs-dev/rst/scala/code/docs/http/scaladsl/server/directives/FileUploadDirectivesExamplesSpec.scala +++ b/akka-docs-dev/rst/scala/code/docs/http/scaladsl/server/directives/FileUploadDirectivesExamplesSpec.scala @@ -42,7 +42,7 @@ class FileUploadDirectivesExamplesSpec extends RoutingSpec { // adding integers as a service ;) val route = extractRequestContext { ctx => - implicit val mat = ctx.materializer + implicit val materializer = ctx.materializer implicit val ec = ctx.executionContext fileUpload("csv") { diff --git a/akka-docs-dev/rst/scala/code/docs/stream/ActorPublisherDocSpec.scala b/akka-docs-dev/rst/scala/code/docs/stream/ActorPublisherDocSpec.scala index d3676720d2..8b1fc10935 100644 --- a/akka-docs-dev/rst/scala/code/docs/stream/ActorPublisherDocSpec.scala +++ b/akka-docs-dev/rst/scala/code/docs/stream/ActorPublisherDocSpec.scala @@ -69,7 +69,7 @@ object ActorPublisherDocSpec { class ActorPublisherDocSpec extends AkkaSpec { import ActorPublisherDocSpec._ - implicit val mat = ActorMaterializer() + implicit val materializer = ActorMaterializer() "illustrate usage of ActorPublisher" in { def println(s: String): Unit = diff --git a/akka-docs-dev/rst/scala/code/docs/stream/ActorSubscriberDocSpec.scala b/akka-docs-dev/rst/scala/code/docs/stream/ActorSubscriberDocSpec.scala index 91a64a13e7..099b605cf0 100644 --- a/akka-docs-dev/rst/scala/code/docs/stream/ActorSubscriberDocSpec.scala +++ b/akka-docs-dev/rst/scala/code/docs/stream/ActorSubscriberDocSpec.scala @@ -72,7 +72,7 @@ object ActorSubscriberDocSpec { class ActorSubscriberDocSpec extends AkkaSpec { import ActorSubscriberDocSpec._ - implicit val mat = ActorMaterializer() + implicit val materializer = ActorMaterializer() "illustrate usage of ActorSubscriber" in { val replyTo = testActor diff --git a/akka-docs-dev/rst/scala/code/docs/stream/BidiFlowDocSpec.scala b/akka-docs-dev/rst/scala/code/docs/stream/BidiFlowDocSpec.scala index 3ae58d4fd3..f58052ebbc 100644 --- a/akka-docs-dev/rst/scala/code/docs/stream/BidiFlowDocSpec.scala +++ b/akka-docs-dev/rst/scala/code/docs/stream/BidiFlowDocSpec.scala @@ -130,7 +130,7 @@ object BidiFlowDocSpec { class BidiFlowDocSpec extends AkkaSpec with ConversionCheckedTripleEquals { import BidiFlowDocSpec._ - implicit val mat = ActorMaterializer() + implicit val materializer = ActorMaterializer() "A BidiFlow" must { diff --git a/akka-docs-dev/rst/scala/code/docs/stream/CompositionDocSpec.scala b/akka-docs-dev/rst/scala/code/docs/stream/CompositionDocSpec.scala index e10e91e7d5..b7439c0f74 100644 --- a/akka-docs-dev/rst/scala/code/docs/stream/CompositionDocSpec.scala +++ b/akka-docs-dev/rst/scala/code/docs/stream/CompositionDocSpec.scala @@ -14,7 +14,7 @@ import scala.concurrent.{ Future, Promise } class CompositionDocSpec extends AkkaSpec { implicit val ec = system.dispatcher - implicit val mat = ActorMaterializer() + implicit val materializer = ActorMaterializer() "nonnested flow" in { //#non-nested-flow diff --git a/akka-docs-dev/rst/scala/code/docs/stream/FlowDocSpec.scala b/akka-docs-dev/rst/scala/code/docs/stream/FlowDocSpec.scala index b6567a29e0..5b983e43d2 100644 --- a/akka-docs-dev/rst/scala/code/docs/stream/FlowDocSpec.scala +++ b/akka-docs-dev/rst/scala/code/docs/stream/FlowDocSpec.scala @@ -18,7 +18,7 @@ class FlowDocSpec extends AkkaSpec { import akka.stream.ActorMaterializer //#imports - implicit val mat = ActorMaterializer() + implicit val materializer = ActorMaterializer() "source is immutable" in { //#source-immutable diff --git a/akka-docs-dev/rst/scala/code/docs/stream/FlowErrorDocSpec.scala b/akka-docs-dev/rst/scala/code/docs/stream/FlowErrorDocSpec.scala index f1ca85b5c0..fce4597308 100644 --- a/akka-docs-dev/rst/scala/code/docs/stream/FlowErrorDocSpec.scala +++ b/akka-docs-dev/rst/scala/code/docs/stream/FlowErrorDocSpec.scala @@ -17,7 +17,7 @@ class FlowErrorDocSpec extends AkkaSpec { "demonstrate fail stream" in { //#stop - implicit val mat = ActorMaterializer() + implicit val materializer = ActorMaterializer() val source = Source(0 to 5).map(100 / _) val result = source.runWith(Sink.fold(0)(_ + _)) // division by zero will fail the stream and the @@ -35,7 +35,7 @@ class FlowErrorDocSpec extends AkkaSpec { case _: ArithmeticException => Supervision.Resume case _ => Supervision.Stop } - implicit val mat = ActorMaterializer( + implicit val materializer = ActorMaterializer( ActorMaterializerSettings(system).withSupervisionStrategy(decider)) val source = Source(0 to 5).map(100 / _) val result = source.runWith(Sink.fold(0)(_ + _)) @@ -48,7 +48,7 @@ class FlowErrorDocSpec extends AkkaSpec { "demonstrate resume section" in { //#resume-section - implicit val mat = ActorMaterializer() + implicit val materializer = ActorMaterializer() val decider: Supervision.Decider = { case _: ArithmeticException => Supervision.Resume case _ => Supervision.Stop @@ -68,7 +68,7 @@ class FlowErrorDocSpec extends AkkaSpec { "demonstrate restart section" in { //#restart-section - implicit val mat = ActorMaterializer() + implicit val materializer = ActorMaterializer() val decider: Supervision.Decider = { case _: IllegalArgumentException => Supervision.Restart case _ => Supervision.Stop diff --git a/akka-docs-dev/rst/scala/code/docs/stream/FlowGraphDocSpec.scala b/akka-docs-dev/rst/scala/code/docs/stream/FlowGraphDocSpec.scala index 86ecec7527..8beaa33d78 100644 --- a/akka-docs-dev/rst/scala/code/docs/stream/FlowGraphDocSpec.scala +++ b/akka-docs-dev/rst/scala/code/docs/stream/FlowGraphDocSpec.scala @@ -16,7 +16,7 @@ class FlowGraphDocSpec extends AkkaSpec { implicit val ec = system.dispatcher - implicit val mat = ActorMaterializer() + implicit val materializer = ActorMaterializer() "build simple graph" in { //format: OFF diff --git a/akka-docs-dev/rst/scala/code/docs/stream/FlowStagesSpec.scala b/akka-docs-dev/rst/scala/code/docs/stream/FlowStagesSpec.scala index 21763ab2dd..bcddefc40f 100644 --- a/akka-docs-dev/rst/scala/code/docs/stream/FlowStagesSpec.scala +++ b/akka-docs-dev/rst/scala/code/docs/stream/FlowStagesSpec.scala @@ -15,7 +15,7 @@ class FlowStagesSpec extends AkkaSpec with ScalaFutures { import akka.stream.stage._ //#import-stage - implicit val mat = ActorMaterializer() + implicit val materializer = ActorMaterializer() "stages demo" must { diff --git a/akka-docs-dev/rst/scala/code/docs/stream/GraphCyclesSpec.scala b/akka-docs-dev/rst/scala/code/docs/stream/GraphCyclesSpec.scala index 893c01fa5b..c13f5e937c 100644 --- a/akka-docs-dev/rst/scala/code/docs/stream/GraphCyclesSpec.scala +++ b/akka-docs-dev/rst/scala/code/docs/stream/GraphCyclesSpec.scala @@ -6,7 +6,7 @@ import akka.stream.testkit.AkkaSpec class GraphCyclesSpec extends AkkaSpec { - implicit val mat = ActorMaterializer() + implicit val materializer = ActorMaterializer() "Cycle demonstration" must { val source = Source(() => Iterator.from(0)) diff --git a/akka-docs-dev/rst/scala/code/docs/stream/GraphStageDocSpec.scala b/akka-docs-dev/rst/scala/code/docs/stream/GraphStageDocSpec.scala index c317b60f04..daac5efc99 100644 --- a/akka-docs-dev/rst/scala/code/docs/stream/GraphStageDocSpec.scala +++ b/akka-docs-dev/rst/scala/code/docs/stream/GraphStageDocSpec.scala @@ -15,7 +15,7 @@ import scala.concurrent.duration._ class GraphStageDocSpec extends AkkaSpec { - implicit val mat = ActorMaterializer() + implicit val materializer = ActorMaterializer() "Demonstrate creation of GraphStage boilerplate" in { //#boilerplate-example diff --git a/akka-docs-dev/rst/scala/code/docs/stream/IntegrationDocSpec.scala b/akka-docs-dev/rst/scala/code/docs/stream/IntegrationDocSpec.scala index 0c1d6ccf7c..8364d0fdef 100644 --- a/akka-docs-dev/rst/scala/code/docs/stream/IntegrationDocSpec.scala +++ b/akka-docs-dev/rst/scala/code/docs/stream/IntegrationDocSpec.scala @@ -124,7 +124,7 @@ class IntegrationDocSpec extends AkkaSpec(IntegrationDocSpec.config) { import TwitterStreamQuickstartDocSpec._ import IntegrationDocSpec._ - implicit val mat = ActorMaterializer() + implicit val materializer = ActorMaterializer() "calling external service with mapAsync" in { val probe = TestProbe() @@ -322,7 +322,7 @@ class IntegrationDocSpec extends AkkaSpec(IntegrationDocSpec.config) { implicit val blockingExecutionContext = system.dispatchers.lookup("blocking-dispatcher") val service = new SometimesSlowService - implicit val mat = ActorMaterializer( + implicit val materializer = ActorMaterializer( ActorMaterializerSettings(system).withInputBuffer(initialSize = 4, maxSize = 4)) Source(List("a", "B", "C", "D", "e", "F", "g", "H", "i", "J")) @@ -354,7 +354,7 @@ class IntegrationDocSpec extends AkkaSpec(IntegrationDocSpec.config) { implicit val blockingExecutionContext = system.dispatchers.lookup("blocking-dispatcher") val service = new SometimesSlowService - implicit val mat = ActorMaterializer( + implicit val materializer = ActorMaterializer( ActorMaterializerSettings(system).withInputBuffer(initialSize = 4, maxSize = 4)) Source(List("a", "B", "C", "D", "e", "F", "g", "H", "i", "J")) diff --git a/akka-docs-dev/rst/scala/code/docs/stream/RateTransformationDocSpec.scala b/akka-docs-dev/rst/scala/code/docs/stream/RateTransformationDocSpec.scala index 1152a648c5..322d54594f 100644 --- a/akka-docs-dev/rst/scala/code/docs/stream/RateTransformationDocSpec.scala +++ b/akka-docs-dev/rst/scala/code/docs/stream/RateTransformationDocSpec.scala @@ -19,7 +19,7 @@ class RateTransformationDocSpec extends AkkaSpec { type Seq[+A] = immutable.Seq[A] val Seq = immutable.Seq - implicit val mat = ActorMaterializer() + implicit val materializer = ActorMaterializer() "conflate should summarize" in { //#conflate-summarize diff --git a/akka-docs-dev/rst/scala/code/docs/stream/ReactiveStreamsDocSpec.scala b/akka-docs-dev/rst/scala/code/docs/stream/ReactiveStreamsDocSpec.scala index 800e1aff4c..1c3ef615b6 100644 --- a/akka-docs-dev/rst/scala/code/docs/stream/ReactiveStreamsDocSpec.scala +++ b/akka-docs-dev/rst/scala/code/docs/stream/ReactiveStreamsDocSpec.scala @@ -11,7 +11,7 @@ import org.reactivestreams.Processor class ReactiveStreamsDocSpec extends AkkaSpec { import TwitterStreamQuickstartDocSpec._ - implicit val mat = ActorMaterializer() + implicit val materializer = ActorMaterializer() //#imports import org.reactivestreams.Publisher diff --git a/akka-docs-dev/rst/scala/code/docs/stream/StreamBuffersRateSpec.scala b/akka-docs-dev/rst/scala/code/docs/stream/StreamBuffersRateSpec.scala index bf42f79d09..0098dc1de9 100644 --- a/akka-docs-dev/rst/scala/code/docs/stream/StreamBuffersRateSpec.scala +++ b/akka-docs-dev/rst/scala/code/docs/stream/StreamBuffersRateSpec.scala @@ -5,7 +5,7 @@ import akka.stream.scaladsl._ import akka.stream.testkit.AkkaSpec class StreamBuffersRateSpec extends AkkaSpec { - implicit val mat = ActorMaterializer() + implicit val materializer = ActorMaterializer() "Demonstrate pipelining" in { def println(s: Any) = () diff --git a/akka-docs-dev/rst/scala/code/docs/stream/StreamPartialFlowGraphDocSpec.scala b/akka-docs-dev/rst/scala/code/docs/stream/StreamPartialFlowGraphDocSpec.scala index dfbad7de08..ac004d4b16 100644 --- a/akka-docs-dev/rst/scala/code/docs/stream/StreamPartialFlowGraphDocSpec.scala +++ b/akka-docs-dev/rst/scala/code/docs/stream/StreamPartialFlowGraphDocSpec.scala @@ -15,7 +15,7 @@ class StreamPartialFlowGraphDocSpec extends AkkaSpec { implicit val ec = system.dispatcher - implicit val mat = ActorMaterializer() + implicit val materializer = ActorMaterializer() "build with open ports" in { //#simple-partial-flow-graph diff --git a/akka-docs-dev/rst/scala/code/docs/stream/StreamTestKitDocSpec.scala b/akka-docs-dev/rst/scala/code/docs/stream/StreamTestKitDocSpec.scala index 25a2be694e..824d6196c1 100644 --- a/akka-docs-dev/rst/scala/code/docs/stream/StreamTestKitDocSpec.scala +++ b/akka-docs-dev/rst/scala/code/docs/stream/StreamTestKitDocSpec.scala @@ -15,7 +15,7 @@ import akka.pattern class StreamTestKitDocSpec extends AkkaSpec { - implicit val mat = ActorMaterializer() + implicit val materializer = ActorMaterializer() "strict collection" in { //#strict-collection diff --git a/akka-docs-dev/rst/scala/code/docs/stream/TwitterStreamQuickstartDocSpec.scala b/akka-docs-dev/rst/scala/code/docs/stream/TwitterStreamQuickstartDocSpec.scala index 3371ef37f6..3f54d72abb 100644 --- a/akka-docs-dev/rst/scala/code/docs/stream/TwitterStreamQuickstartDocSpec.scala +++ b/akka-docs-dev/rst/scala/code/docs/stream/TwitterStreamQuickstartDocSpec.scala @@ -67,7 +67,7 @@ class TwitterStreamQuickstartDocSpec extends AkkaSpec { //#first-sample } - implicit val mat = ActorMaterializer() + implicit val materializer = ActorMaterializer() "filter and map" in { //#first-sample diff --git a/akka-docs-dev/rst/scala/code/docs/stream/io/StreamFileDocSpec.scala b/akka-docs-dev/rst/scala/code/docs/stream/io/StreamFileDocSpec.scala index 5ddec38017..1a66b582b6 100644 --- a/akka-docs-dev/rst/scala/code/docs/stream/io/StreamFileDocSpec.scala +++ b/akka-docs-dev/rst/scala/code/docs/stream/io/StreamFileDocSpec.scala @@ -17,7 +17,7 @@ import scala.concurrent.Future class StreamFileDocSpec extends AkkaSpec(UnboundedMailboxConfig) { implicit val ec = system.dispatcher - implicit val mat = ActorMaterializer() + implicit val materializer = ActorMaterializer() // silence sysout def println(s: String) = () diff --git a/akka-docs-dev/rst/scala/code/docs/stream/io/StreamTcpDocSpec.scala b/akka-docs-dev/rst/scala/code/docs/stream/io/StreamTcpDocSpec.scala index f902e79c92..087d315da7 100644 --- a/akka-docs-dev/rst/scala/code/docs/stream/io/StreamTcpDocSpec.scala +++ b/akka-docs-dev/rst/scala/code/docs/stream/io/StreamTcpDocSpec.scala @@ -19,7 +19,7 @@ import scala.concurrent.Future class StreamTcpDocSpec extends AkkaSpec { implicit val ec = system.dispatcher - implicit val mat = ActorMaterializer() + implicit val materializer = ActorMaterializer() // silence sysout def println(s: String) = () diff --git a/akka-http-core/src/test/scala/akka/http/impl/engine/ws/EchoTestClientApp.scala b/akka-http-core/src/test/scala/akka/http/impl/engine/ws/EchoTestClientApp.scala index bd9d0d200b..f687517807 100644 --- a/akka-http-core/src/test/scala/akka/http/impl/engine/ws/EchoTestClientApp.scala +++ b/akka-http-core/src/test/scala/akka/http/impl/engine/ws/EchoTestClientApp.scala @@ -22,7 +22,7 @@ import scala.util.{ Failure, Success } object EchoTestClientApp extends App { implicit val system = ActorSystem() import system.dispatcher - implicit val mat = ActorMaterializer() + implicit val materializer = ActorMaterializer() def delayedCompletion(delay: FiniteDuration): Source[Nothing, Unit] = Source.single(1) diff --git a/akka-http-core/src/test/scala/akka/http/impl/engine/ws/WSClientAutobahnTest.scala b/akka-http-core/src/test/scala/akka/http/impl/engine/ws/WSClientAutobahnTest.scala index db24b0993e..50a42e90c3 100644 --- a/akka-http-core/src/test/scala/akka/http/impl/engine/ws/WSClientAutobahnTest.scala +++ b/akka-http-core/src/test/scala/akka/http/impl/engine/ws/WSClientAutobahnTest.scala @@ -23,7 +23,7 @@ import akka.http.scaladsl.model.ws._ object WSClientAutobahnTest extends App { implicit val system = ActorSystem() import system.dispatcher - implicit val mat = ActorMaterializer() + implicit val materializer = ActorMaterializer() val Agent = "akka-http" val Parallelism = 4 diff --git a/akka-http-tests/src/test/scala/akka/http/scaladsl/server/DontLeakActorsOnFailingConnectionSpecs.scala b/akka-http-tests/src/test/scala/akka/http/scaladsl/server/DontLeakActorsOnFailingConnectionSpecs.scala index 58f3a55a03..f2b79ad422 100644 --- a/akka-http-tests/src/test/scala/akka/http/scaladsl/server/DontLeakActorsOnFailingConnectionSpecs.scala +++ b/akka-http-tests/src/test/scala/akka/http/scaladsl/server/DontLeakActorsOnFailingConnectionSpecs.scala @@ -34,7 +34,7 @@ class DontLeakActorsOnFailingConnectionSpecs extends WordSpecLike with Matchers }""").withFallback(ConfigFactory.load()) implicit val system = ActorSystem("DontLeakActorsOnFailingConnectionSpecs", config) import system.dispatcher - implicit val mat = ActorMaterializer() + implicit val materializer = ActorMaterializer() val log = Logging(system, getClass) diff --git a/akka-http/src/main/scala/akka/http/javadsl/server/HttpService.scala b/akka-http/src/main/scala/akka/http/javadsl/server/HttpService.scala index 70efdb5c58..5e8e9a80e5 100644 --- a/akka-http/src/main/scala/akka/http/javadsl/server/HttpService.scala +++ b/akka-http/src/main/scala/akka/http/javadsl/server/HttpService.scala @@ -18,8 +18,8 @@ trait HttpServiceBase { */ def bindRoute(interface: String, port: Int, route: Route, system: ActorSystem): Future[ServerBinding] = { implicit val sys = system - implicit val mat = ActorMaterializer() - handleConnectionsWithRoute(interface, port, route, system, mat) + implicit val materializer = ActorMaterializer() + handleConnectionsWithRoute(interface, port, route, system, materializer) } /** @@ -32,8 +32,8 @@ trait HttpServiceBase { * Uses the route to handle incoming connections and requests for the ServerBinding. */ def handleConnectionsWithRoute(interface: String, port: Int, route: Route, system: ActorSystem, materializer: Materializer): Future[ServerBinding] = { - implicit val sys = system - implicit val mat = materializer + implicit val s = system + implicit val m = materializer import system.dispatcher val r: server.Route = RouteImplementation(route) diff --git a/akka-stream-testkit/src/test/scala/akka/stream/testkit/StreamTestKitSpec.scala b/akka-stream-testkit/src/test/scala/akka/stream/testkit/StreamTestKitSpec.scala index 702689468d..ef26568677 100644 --- a/akka-stream-testkit/src/test/scala/akka/stream/testkit/StreamTestKitSpec.scala +++ b/akka-stream-testkit/src/test/scala/akka/stream/testkit/StreamTestKitSpec.scala @@ -11,7 +11,7 @@ import scala.concurrent.duration._ class StreamTestKitSpec extends AkkaSpec { - implicit val mat = ActorMaterializer() + implicit val materializer = ActorMaterializer() val ex = new Exception("Boom!") diff --git a/akka-stream-tests/src/test/scala/akka/stream/impl/GraphStageLogicSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/impl/GraphStageLogicSpec.scala index 15efa87308..f424557893 100644 --- a/akka-stream-tests/src/test/scala/akka/stream/impl/GraphStageLogicSpec.scala +++ b/akka-stream-tests/src/test/scala/akka/stream/impl/GraphStageLogicSpec.scala @@ -16,7 +16,7 @@ import scala.concurrent.duration.Duration class GraphStageLogicSpec extends AkkaSpec with GraphInterpreterSpecKit with ConversionCheckedTripleEquals { - implicit val mat = ActorMaterializer() + implicit val materializer = ActorMaterializer() object emit1234 extends GraphStage[FlowShape[Int, Int]] { val in = Inlet[Int]("in") diff --git a/akka-stream-tests/src/test/scala/akka/stream/impl/TimeoutsSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/impl/TimeoutsSpec.scala index 9375afaa03..ba380006db 100644 --- a/akka-stream-tests/src/test/scala/akka/stream/impl/TimeoutsSpec.scala +++ b/akka-stream-tests/src/test/scala/akka/stream/impl/TimeoutsSpec.scala @@ -15,7 +15,7 @@ import scala.concurrent.duration._ import scala.concurrent.{ Await, Future } class TimeoutsSpec extends AkkaSpec { - implicit val mat = ActorMaterializer() + implicit val materializer = ActorMaterializer() "InitialTimeout" must { diff --git a/akka-stream-tests/src/test/scala/akka/stream/impl/fusing/ActorGraphInterpreterSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/impl/fusing/ActorGraphInterpreterSpec.scala index 60aac913ae..f098807dc9 100644 --- a/akka-stream-tests/src/test/scala/akka/stream/impl/fusing/ActorGraphInterpreterSpec.scala +++ b/akka-stream-tests/src/test/scala/akka/stream/impl/fusing/ActorGraphInterpreterSpec.scala @@ -13,7 +13,7 @@ import scala.concurrent.Await import scala.concurrent.duration._ class ActorGraphInterpreterSpec extends AkkaSpec { - implicit val mat = ActorMaterializer() + implicit val materializer = ActorMaterializer() "ActorGraphInterpreter" must { diff --git a/akka-stream-tests/src/test/scala/akka/stream/impl/fusing/KeepGoingStageSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/impl/fusing/KeepGoingStageSpec.scala index 3d217dfcfd..32c9e2e375 100644 --- a/akka-stream-tests/src/test/scala/akka/stream/impl/fusing/KeepGoingStageSpec.scala +++ b/akka-stream-tests/src/test/scala/akka/stream/impl/fusing/KeepGoingStageSpec.scala @@ -15,7 +15,7 @@ import scala.concurrent.duration._ class KeepGoingStageSpec extends AkkaSpec { - implicit val mat = ActorMaterializer() + implicit val materializer = ActorMaterializer() trait PingCmd extends NoSerializationVerificationNeeded case class Register(probe: ActorRef) extends PingCmd diff --git a/akka-stream-tests/src/test/scala/akka/stream/io/FileSinkSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/io/FileSinkSpec.scala index eec2c67ff6..2c6f58fa9a 100644 --- a/akka-stream-tests/src/test/scala/akka/stream/io/FileSinkSpec.scala +++ b/akka-stream-tests/src/test/scala/akka/stream/io/FileSinkSpec.scala @@ -94,13 +94,13 @@ class FileSinkSpec extends AkkaSpec(UnboundedMailboxConfig) { "use dedicated blocking-io-dispatcher by default" in assertAllStagesStopped { targetFile { f ⇒ val sys = ActorSystem("dispatcher-testing", UnboundedMailboxConfig) - val mat = ActorMaterializer()(sys) + val materializer = ActorMaterializer()(sys) implicit val timeout = Timeout(3.seconds) try { - Source(() ⇒ Iterator.continually(TestByteStrings.head)).runWith(Sink.file(f))(mat) + Source(() ⇒ Iterator.continually(TestByteStrings.head)).runWith(Sink.file(f))(materializer) - mat.asInstanceOf[ActorMaterializerImpl].supervisor.tell(StreamSupervisor.GetChildren, testActor) + materializer.asInstanceOf[ActorMaterializerImpl].supervisor.tell(StreamSupervisor.GetChildren, testActor) val ref = expectMsgType[Children].children.find(_.path.toString contains "fileSource").get assertDispatcher(ref, "akka.stream.default-blocking-io-dispatcher") } finally shutdown(sys) @@ -112,16 +112,16 @@ class FileSinkSpec extends AkkaSpec(UnboundedMailboxConfig) { pending targetFile { f ⇒ val sys = ActorSystem("dispatcher-testing", UnboundedMailboxConfig) - val mat = ActorMaterializer()(sys) + val materializer = ActorMaterializer()(sys) implicit val timeout = Timeout(3.seconds) try { Source(() ⇒ Iterator.continually(TestByteStrings.head)) .to(Sink.file(f)) .withAttributes(ActorAttributes.dispatcher("akka.actor.default-dispatcher")) - .run()(mat) + .run()(materializer) - mat.asInstanceOf[ActorMaterializerImpl].supervisor.tell(StreamSupervisor.GetChildren, testActor) + materializer.asInstanceOf[ActorMaterializerImpl].supervisor.tell(StreamSupervisor.GetChildren, testActor) val ref = expectMsgType[Children].children.find(_.path.toString contains "File").get assertDispatcher(ref, "akka.actor.default-dispatcher") } finally shutdown(sys) diff --git a/akka-stream-tests/src/test/scala/akka/stream/io/FileSourceSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/io/FileSourceSpec.scala index ce9feefb9b..68bb762a75 100644 --- a/akka-stream-tests/src/test/scala/akka/stream/io/FileSourceSpec.scala +++ b/akka-stream-tests/src/test/scala/akka/stream/io/FileSourceSpec.scala @@ -168,13 +168,13 @@ class FileSourceSpec extends AkkaSpec(UnboundedMailboxConfig) { "use dedicated blocking-io-dispatcher by default" in assertAllStagesStopped { val sys = ActorSystem("dispatcher-testing", UnboundedMailboxConfig) - val mat = ActorMaterializer()(sys) + val materializer = ActorMaterializer()(sys) implicit val timeout = Timeout(500.millis) try { - val p = Source.file(manyLines).runWith(TestSink.probe)(mat) + val p = Source.file(manyLines).runWith(TestSink.probe)(materializer) - mat.asInstanceOf[ActorMaterializerImpl].supervisor.tell(StreamSupervisor.GetChildren, testActor) + materializer.asInstanceOf[ActorMaterializerImpl].supervisor.tell(StreamSupervisor.GetChildren, testActor) val ref = expectMsgType[Children].children.find(_.path.toString contains "fileSource").get try assertDispatcher(ref, "akka.stream.default-blocking-io-dispatcher") finally p.cancel() } finally shutdown(sys) @@ -184,15 +184,15 @@ class FileSourceSpec extends AkkaSpec(UnboundedMailboxConfig) { "allow overriding the dispatcher using Attributes" in { pending val sys = ActorSystem("dispatcher-testing", UnboundedMailboxConfig) - val mat = ActorMaterializer()(sys) + val materializer = ActorMaterializer()(sys) implicit val timeout = Timeout(500.millis) try { val p = Source.file(manyLines) .withAttributes(ActorAttributes.dispatcher("akka.actor.default-dispatcher")) - .runWith(TestSink.probe)(mat) + .runWith(TestSink.probe)(materializer) - mat.asInstanceOf[ActorMaterializerImpl].supervisor.tell(StreamSupervisor.GetChildren, testActor) + materializer.asInstanceOf[ActorMaterializerImpl].supervisor.tell(StreamSupervisor.GetChildren, testActor) val ref = expectMsgType[Children].children.find(_.path.toString contains "File").get try assertDispatcher(ref, "akka.actor.default-dispatcher") finally p.cancel() } finally shutdown(sys) diff --git a/akka-stream-tests/src/test/scala/akka/stream/io/InputStreamSinkSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/io/InputStreamSinkSpec.scala index 031ecb5675..1da67456d7 100644 --- a/akka-stream-tests/src/test/scala/akka/stream/io/InputStreamSinkSpec.scala +++ b/akka-stream-tests/src/test/scala/akka/stream/io/InputStreamSinkSpec.scala @@ -226,11 +226,11 @@ class InputStreamSinkSpec extends AkkaSpec(UnboundedMailboxConfig) { "use dedicated default-blocking-io-dispatcher by default" in assertAllStagesStopped { val sys = ActorSystem("dispatcher-testing", UnboundedMailboxConfig) - val mat = ActorMaterializer()(sys) + val materializer = ActorMaterializer()(sys) try { - TestSource.probe[ByteString].runWith(Sink.inputStream())(mat) - mat.asInstanceOf[ActorMaterializerImpl].supervisor.tell(StreamSupervisor.GetChildren, testActor) + TestSource.probe[ByteString].runWith(Sink.inputStream())(materializer) + materializer.asInstanceOf[ActorMaterializerImpl].supervisor.tell(StreamSupervisor.GetChildren, testActor) val ref = expectMsgType[Children].children.find(_.path.toString contains "inputStreamSink").get assertDispatcher(ref, "akka.stream.default-blocking-io-dispatcher") } finally shutdown(sys) diff --git a/akka-stream-tests/src/test/scala/akka/stream/io/OutputStreamSourceSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/io/OutputStreamSourceSpec.scala index 6622a4a0df..be470c4430 100644 --- a/akka-stream-tests/src/test/scala/akka/stream/io/OutputStreamSourceSpec.scala +++ b/akka-stream-tests/src/test/scala/akka/stream/io/OutputStreamSourceSpec.scala @@ -148,11 +148,11 @@ class OutputStreamSourceSpec extends AkkaSpec(UnboundedMailboxConfig) { "use dedicated default-blocking-io-dispatcher by default" in assertAllStagesStopped { val sys = ActorSystem("dispatcher-testing", UnboundedMailboxConfig) - val mat = ActorMaterializer()(sys) + val materializer = ActorMaterializer()(sys) try { - Source.outputStream().runWith(TestSink.probe[ByteString])(mat) - mat.asInstanceOf[ActorMaterializerImpl].supervisor.tell(StreamSupervisor.GetChildren, testActor) + Source.outputStream().runWith(TestSink.probe[ByteString])(materializer) + materializer.asInstanceOf[ActorMaterializerImpl].supervisor.tell(StreamSupervisor.GetChildren, testActor) val ref = expectMsgType[Children].children.find(_.path.toString contains "outputStreamSource").get assertDispatcher(ref, "akka.stream.default-blocking-io-dispatcher") } finally shutdown(sys) diff --git a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/AcknowledgeSinkSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/AcknowledgeSinkSpec.scala index 7e399bbb25..0fc72d6f04 100644 --- a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/AcknowledgeSinkSpec.scala +++ b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/AcknowledgeSinkSpec.scala @@ -15,7 +15,7 @@ import scala.util.control.NoStackTrace class AcknowledgeSinkSpec extends AkkaSpec { implicit val ec = system.dispatcher - implicit val mat = ActorMaterializer() + implicit val materializer = ActorMaterializer() val ex = new RuntimeException("ex") with NoStackTrace diff --git a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/AcknowledgeSourceSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/AcknowledgeSourceSpec.scala index 057d35edbc..61a1077249 100644 --- a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/AcknowledgeSourceSpec.scala +++ b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/AcknowledgeSourceSpec.scala @@ -12,7 +12,7 @@ import scala.concurrent._ import akka.pattern.pipe class AcknowledgeSourceSpec extends AkkaSpec { - implicit val mat = ActorMaterializer() + implicit val materializer = ActorMaterializer() implicit val ec = system.dispatcher def assertSuccess(b: Boolean, fb: Future[Boolean]): Unit = diff --git a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/ActorRefSinkSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/ActorRefSinkSpec.scala index 44a4849bfb..3c10bd5264 100644 --- a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/ActorRefSinkSpec.scala +++ b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/ActorRefSinkSpec.scala @@ -21,7 +21,7 @@ object ActorRefSinkSpec { class ActorRefSinkSpec extends AkkaSpec { import ActorRefSinkSpec._ - implicit val mat = ActorMaterializer() + implicit val materializer = ActorMaterializer() "A ActorRefSink" must { diff --git a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/ActorRefSourceSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/ActorRefSourceSpec.scala index 3e091f9a7d..32058691d6 100644 --- a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/ActorRefSourceSpec.scala +++ b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/ActorRefSourceSpec.scala @@ -13,7 +13,7 @@ import akka.actor.PoisonPill import akka.actor.Status class ActorRefSourceSpec extends AkkaSpec { - implicit val mat = ActorMaterializer() + implicit val materializer = ActorMaterializer() "A ActorRefSource" must { diff --git a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/BidiFlowSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/BidiFlowSpec.scala index 88ae8fa4fb..8d960f3bf8 100644 --- a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/BidiFlowSpec.scala +++ b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/BidiFlowSpec.scala @@ -16,7 +16,7 @@ class BidiFlowSpec extends AkkaSpec with ConversionCheckedTripleEquals { import Attributes._ import GraphDSL.Implicits._ - implicit val mat = ActorMaterializer() + implicit val materializer = ActorMaterializer() val bidi = BidiFlow.fromFlows( Flow[Int].map(x ⇒ x.toLong + 2).withAttributes(name("top")), diff --git a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowFlattenMergeSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowFlattenMergeSpec.scala index af594d82d2..ce3b696133 100644 --- a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowFlattenMergeSpec.scala +++ b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowFlattenMergeSpec.scala @@ -15,7 +15,7 @@ import akka.stream.testkit.scaladsl.TestSink import akka.testkit.TestLatch class FlowFlattenMergeSpec extends AkkaSpec with ScalaFutures with ConversionCheckedTripleEquals { - implicit val mat = ActorMaterializer() + implicit val materializer = ActorMaterializer() import system.dispatcher def src10(i: Int) = Source(i until (i + 10)) diff --git a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowFoldSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowFoldSpec.scala index fe8a92390c..99043036f6 100644 --- a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowFoldSpec.scala +++ b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowFoldSpec.scala @@ -12,7 +12,7 @@ import akka.stream.testkit.Utils._ import scala.concurrent.duration._ class FlowFoldSpec extends AkkaSpec { - implicit val mat = ActorMaterializer() + implicit val materializer = ActorMaterializer() "A Fold" must { val input = 1 to 100 diff --git a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowForeachSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowForeachSpec.scala index 54c22583e8..e75a6e0648 100644 --- a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowForeachSpec.scala +++ b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowForeachSpec.scala @@ -12,7 +12,7 @@ import scala.concurrent.duration._ class FlowForeachSpec extends AkkaSpec { - implicit val mat = ActorMaterializer() + implicit val materializer = ActorMaterializer() import system.dispatcher "A Foreach" must { diff --git a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowGraphCompileSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowGraphCompileSpec.scala index 4050a8ca0f..b64788a7a0 100644 --- a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowGraphCompileSpec.scala +++ b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowGraphCompileSpec.scala @@ -16,7 +16,7 @@ object FlowGraphCompileSpec { class FlowGraphCompileSpec extends AkkaSpec { import FlowGraphCompileSpec._ - implicit val mat = ActorMaterializer() + implicit val materializer = ActorMaterializer() def op[In, Out]: () ⇒ PushStage[In, Out] = { () ⇒ new PushStage[In, Out] { diff --git a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowJoinSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowJoinSpec.scala index b2b12a5f1c..c3e095e46a 100644 --- a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowJoinSpec.scala +++ b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowJoinSpec.scala @@ -14,7 +14,7 @@ class FlowJoinSpec extends AkkaSpec(ConfigFactory.parseString("akka.loglevel=INF val settings = ActorMaterializerSettings(system) .withInputBuffer(initialSize = 2, maxSize = 16) - implicit val mat = ActorMaterializer(settings) + implicit val materializer = ActorMaterializer(settings) "A Flow using join" must { "allow for cycles" in { diff --git a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowSectionSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowSectionSpec.scala index 466be4790f..3f854da5d5 100644 --- a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowSectionSpec.scala +++ b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowSectionSpec.scala @@ -20,7 +20,7 @@ object FlowSectionSpec { class FlowSectionSpec extends AkkaSpec(FlowSectionSpec.config) { - implicit val mat = ActorMaterializer() + implicit val materializer = ActorMaterializer() "A flow" can { diff --git a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowSlidingSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowSlidingSpec.scala index c8414eeaa6..18c96d4fe3 100644 --- a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowSlidingSpec.scala +++ b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowSlidingSpec.scala @@ -14,7 +14,11 @@ import scala.concurrent.Await class FlowSlidingSpec extends AkkaSpec with GeneratorDrivenPropertyChecks { import system.dispatcher - implicit val mat = ActorMaterializer(ActorMaterializerSettings(system)) + val settings = ActorMaterializerSettings(system) + .withInputBuffer(initialSize = 2, maxSize = 16) + + implicit val materializer = ActorMaterializer(settings) + "Sliding" must { import org.scalacheck.Shrink.shrinkAny def check(gen: Gen[(Int, Int, Int)]): Unit = diff --git a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowSpec.scala index 96e1645cfd..a0052ea5c5 100644 --- a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowSpec.scala +++ b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowSpec.scala @@ -36,7 +36,7 @@ class FlowSpec extends AkkaSpec(ConfigFactory.parseString("akka.actor.debug.rece val settings = ActorMaterializerSettings(system) .withInputBuffer(initialSize = 2, maxSize = 2) - implicit val mat = ActorMaterializer(settings) + implicit val materializer = ActorMaterializer(settings) val identity: Flow[Any, Any, Unit] ⇒ Flow[Any, Any, Unit] = in ⇒ in.map(e ⇒ e) val identity2: Flow[Any, Any, Unit] ⇒ Flow[Any, Any, Unit] = in ⇒ identity(in) @@ -48,9 +48,9 @@ class FlowSpec extends AkkaSpec(ConfigFactory.parseString("akka.actor.debug.rece _logics: Array[GraphStageLogic], _shape: Shape, _settings: ActorMaterializerSettings, - _mat: Materializer, + _materializer: Materializer, brokenMessage: Any) - extends ActorGraphInterpreter(_assembly, _inHandlers, _outHandlers, _logics, _shape, _settings, _mat) { + extends ActorGraphInterpreter(_assembly, _inHandlers, _outHandlers, _logics, _shape, _settings, _materializer) { import akka.stream.actor.ActorSubscriberMessage._ @@ -76,7 +76,7 @@ class FlowSpec extends AkkaSpec(ConfigFactory.parseString("akka.actor.debug.rece val (inHandlers, outHandlers, logics, _) = assembly.materialize(Attributes.none) - val props = Props(new BrokenActorInterpreter(assembly, inHandlers, outHandlers, logics, stage.shape, settings, mat, "a3")) + val props = Props(new BrokenActorInterpreter(assembly, inHandlers, outHandlers, logics, stage.shape, settings, materializer, "a3")) .withDispatcher("akka.test.stream-dispatcher").withDeploy(Deploy.local) val impl = system.actorOf(props, "borken-stage-actor") diff --git a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/GraphStageTimersSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/GraphStageTimersSpec.scala index 9dd84a2117..ed0b04c4d6 100644 --- a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/GraphStageTimersSpec.scala +++ b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/GraphStageTimersSpec.scala @@ -39,7 +39,7 @@ object GraphStageTimersSpec { class GraphStageTimersSpec extends AkkaSpec { import GraphStageTimersSpec._ - implicit val mat = ActorMaterializer() + implicit val materializer = ActorMaterializer() class TestStage(probe: ActorRef, sideChannel: SideChannel) extends SimpleLinearGraphStage[Int] { override def createLogic(inheritedAttributes: Attributes) = new TimerGraphStageLogic(shape) { diff --git a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/One2OneBidiFlowSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/One2OneBidiFlowSpec.scala index 44b397b365..883a724ab0 100644 --- a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/One2OneBidiFlowSpec.scala +++ b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/One2OneBidiFlowSpec.scala @@ -12,7 +12,7 @@ import akka.stream.testkit.AkkaSpec import akka.stream.testkit._ class One2OneBidiFlowSpec extends AkkaSpec with ConversionCheckedTripleEquals { - implicit val mat = ActorMaterializer() + implicit val materializer = ActorMaterializer() "A One2OneBidiFlow" must { diff --git a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/ReverseArrowSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/ReverseArrowSpec.scala index 70c9c62add..812144c85d 100644 --- a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/ReverseArrowSpec.scala +++ b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/ReverseArrowSpec.scala @@ -9,7 +9,7 @@ import org.scalactic.ConversionCheckedTripleEquals class ReverseArrowSpec extends AkkaSpec with ConversionCheckedTripleEquals { import GraphDSL.Implicits._ - implicit val mat = ActorMaterializer() + implicit val materializer = ActorMaterializer() val source = Source(List(1, 2, 3)) val sink = Flow[Int].grouped(10).toMat(Sink.head)(Keep.right) diff --git a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/SinkForeachParallelSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/SinkForeachParallelSpec.scala index 36994f9e8e..b5870d9f3c 100644 --- a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/SinkForeachParallelSpec.scala +++ b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/SinkForeachParallelSpec.scala @@ -16,7 +16,7 @@ import scala.util.control.NoStackTrace class SinkForeachParallelSpec extends AkkaSpec { - implicit val mat = ActorMaterializer() + implicit val materializer = ActorMaterializer() "A ForeachParallel" must { "produce elements in the order they are ready" in assertAllStagesStopped { diff --git a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/SinkSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/SinkSpec.scala index 54d138ac22..f2430f97d9 100644 --- a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/SinkSpec.scala +++ b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/SinkSpec.scala @@ -11,7 +11,7 @@ class SinkSpec extends AkkaSpec { import GraphDSL.Implicits._ - implicit val mat = ActorMaterializer() + implicit val materializer = ActorMaterializer() "A Sink" must { diff --git a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/StageActorRefSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/StageActorRefSpec.scala index 44f83281a3..86ac541b62 100644 --- a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/StageActorRefSpec.scala +++ b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/StageActorRefSpec.scala @@ -17,7 +17,7 @@ import scala.concurrent.{ Future, Promise } import scala.concurrent.duration._ class StageActorRefSpec extends AkkaSpec with ImplicitSender with ScalaFutures { - implicit val mat = ActorMaterializer() + implicit val materializer = ActorMaterializer() import StageActorRefSpec._ import ControlProtocol._ diff --git a/akka-stream/src/main/scala/akka/stream/impl/io/IOSinks.scala b/akka-stream/src/main/scala/akka/stream/impl/io/IOSinks.scala index 787debe431..c7fad7964c 100644 --- a/akka-stream/src/main/scala/akka/stream/impl/io/IOSinks.scala +++ b/akka-stream/src/main/scala/akka/stream/impl/io/IOSinks.scala @@ -21,14 +21,14 @@ private[akka] final class FileSink(f: File, append: Boolean, val attributes: Att extends SinkModule[ByteString, Future[Long]](shape) { override def create(context: MaterializationContext) = { - val mat = ActorMaterializer.downcast(context.materializer) - val settings = mat.effectiveSettings(context.effectiveAttributes) + val materializer = ActorMaterializer.downcast(context.materializer) + val settings = materializer.effectiveSettings(context.effectiveAttributes) val bytesWrittenPromise = Promise[Long]() val props = FileSubscriber.props(f, bytesWrittenPromise, settings.maxInputBufferSize, append) val dispatcher = context.effectiveAttributes.get[Dispatcher](IODispatcher).dispatcher - val ref = mat.actorOf(context, props.withDispatcher(dispatcher)) + val ref = materializer.actorOf(context, props.withDispatcher(dispatcher)) (akka.stream.actor.ActorSubscriber[ByteString](ref), bytesWrittenPromise.future) } @@ -48,15 +48,15 @@ private[akka] final class OutputStreamSink(createOutput: () ⇒ OutputStream, va extends SinkModule[ByteString, Future[Long]](shape) { override def create(context: MaterializationContext) = { - val mat = ActorMaterializer.downcast(context.materializer) - val settings = mat.effectiveSettings(context.effectiveAttributes) + val materializer = ActorMaterializer.downcast(context.materializer) + val settings = materializer.effectiveSettings(context.effectiveAttributes) val bytesWrittenPromise = Promise[Long]() val os = createOutput() // if it fails, we fail the materialization val props = OutputStreamSubscriber.props(os, bytesWrittenPromise, settings.maxInputBufferSize) - val ref = mat.actorOf(context, props) + val ref = materializer.actorOf(context, props) (akka.stream.actor.ActorSubscriber[ByteString](ref), bytesWrittenPromise.future) } diff --git a/akka-stream/src/main/scala/akka/stream/impl/io/IOSources.scala b/akka-stream/src/main/scala/akka/stream/impl/io/IOSources.scala index 759160709d..84c3f8d577 100644 --- a/akka-stream/src/main/scala/akka/stream/impl/io/IOSources.scala +++ b/akka-stream/src/main/scala/akka/stream/impl/io/IOSources.scala @@ -23,14 +23,14 @@ private[akka] final class FileSource(f: File, chunkSize: Int, val attributes: At require(chunkSize > 0, "chunkSize must be greater than 0") override def create(context: MaterializationContext) = { // FIXME rewrite to be based on GraphStage rather than dangerous downcasts - val mat = ActorMaterializer.downcast(context.materializer) - val settings = mat.effectiveSettings(context.effectiveAttributes) + val materializer = ActorMaterializer.downcast(context.materializer) + val settings = materializer.effectiveSettings(context.effectiveAttributes) val bytesReadPromise = Promise[Long]() val props = FilePublisher.props(f, bytesReadPromise, chunkSize, settings.initialInputBufferSize, settings.maxInputBufferSize) val dispatcher = context.effectiveAttributes.get[Dispatcher](IODispatcher).dispatcher - val ref = mat.actorOf(context, props.withDispatcher(dispatcher)) + val ref = materializer.actorOf(context, props.withDispatcher(dispatcher)) (akka.stream.actor.ActorPublisher[ByteString](ref), bytesReadPromise.future) } @@ -49,8 +49,8 @@ private[akka] final class FileSource(f: File, chunkSize: Int, val attributes: At private[akka] final class InputStreamSource(createInputStream: () ⇒ InputStream, chunkSize: Int, val attributes: Attributes, shape: SourceShape[ByteString]) extends SourceModule[ByteString, Future[Long]](shape) { override def create(context: MaterializationContext) = { - val mat = ActorMaterializer.downcast(context.materializer) - val settings = mat.effectiveSettings(context.effectiveAttributes) + val materializer = ActorMaterializer.downcast(context.materializer) + val settings = materializer.effectiveSettings(context.effectiveAttributes) val bytesReadPromise = Promise[Long]() val pub = try { @@ -58,7 +58,7 @@ private[akka] final class InputStreamSource(createInputStream: () ⇒ InputStrea val props = InputStreamPublisher.props(is, bytesReadPromise, chunkSize, settings.initialInputBufferSize, settings.maxInputBufferSize) - val ref = mat.actorOf(context, props) + val ref = materializer.actorOf(context, props) akka.stream.actor.ActorPublisher[ByteString](ref) } catch { case ex: Exception ⇒