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

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

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

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

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

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