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

= rename FlowGraph* to GraphDSL

Browse source
This commit is contained in:
hepin1989(虎鸣) 2016-04-12 20:24:08 +08:00 • committed by kerr
parent 66a0aa280d
commit e9670ee91d
19 changed files with 130 additions and 135 deletions
Download patch file Download diff file Expand all files Collapse all files

2
akka-docs/rst/scala/code/docs/http/scaladsl/HttpServerExampleSpec.scala
View file

@ -132,7 +132,7 @@ class HttpServerExampleSpec extends WordSpec with Matchers
"connection-stream-failure-handling" in compileOnlySpec {
import akka.actor.ActorSystem
import akka.http.scaladsl.Http
import akka.http.scaladsl.model.{ContentTypes, HttpEntity}
import akka.http.scaladsl.model.{ ContentTypes, HttpEntity }
import akka.stream.ActorMaterializer
implicit val system = ActorSystem()

44
akka-docs/rst/scala/code/docs/stream/FlowGraphDocSpec.scala → akka-docs/rst/scala/code/docs/stream/GraphDSLDocSpec.scala
View file

@ -9,11 +9,10 @@ import akka.stream.scaladsl._
import akka.testkit.AkkaSpec
import scala.collection.immutable
import scala.concurrent.{ Future, Await }
import scala.concurrent.duration._
import akka.stream.Attributes
import scala.concurrent.{ Await, Future }
class FlowGraphDocSpec extends AkkaSpec {
class GraphDSLDocSpec extends AkkaSpec {
implicit val ec = system.dispatcher
@ -21,7 +20,7 @@ class FlowGraphDocSpec extends AkkaSpec {
"build simple graph" in {
//format: OFF
//#simple-flow-graph
//#simple-graph-dsl
val g = RunnableGraph.fromGraph(GraphDSL.create() { implicit builder: GraphDSL.Builder[NotUsed] =>
import GraphDSL.Implicits._
val in = Source(1 to 10)
@ -36,7 +35,7 @@ class FlowGraphDocSpec extends AkkaSpec {
bcast ~> f4 ~> merge
ClosedShape
})
//#simple-flow-graph
//#simple-graph-dsl
//format: ON
//#simple-graph-run
@ -64,17 +63,17 @@ class FlowGraphDocSpec extends AkkaSpec {
}
"reusing a flow in a graph" in {
//#flow-graph-reusing-a-flow
//#graph-dsl-reusing-a-flow
val topHeadSink = Sink.head[Int]
val bottomHeadSink = Sink.head[Int]
val sharedDoubler = Flow[Int].map(_ * 2)
//#flow-graph-reusing-a-flow
//#graph-dsl-reusing-a-flow
// format: OFF
val g =
//#flow-graph-reusing-a-flow
//#graph-dsl-reusing-a-flow
RunnableGraph.fromGraph(GraphDSL.create(topHeadSink, bottomHeadSink)((_, _)) { implicit builder =>
(topHS, bottomHS) =>
import GraphDSL.Implicits._
@ -85,7 +84,7 @@ class FlowGraphDocSpec extends AkkaSpec {
broadcast.out(1) ~> sharedDoubler ~> bottomHS.in
ClosedShape
})
//#flow-graph-reusing-a-flow
//#graph-dsl-reusing-a-flow
// format: ON
val (topFuture, bottomFuture) = g.run()
Await.result(topFuture, 300.millis) shouldEqual 2
@ -94,7 +93,7 @@ class FlowGraphDocSpec extends AkkaSpec {
"building a reusable component" in {
//#flow-graph-components-shape
//#graph-dsl-components-shape
// A shape represents the input and output ports of a reusable
// processing module
case class PriorityWorkerPoolShape[In, Out](
@ -126,9 +125,9 @@ class FlowGraphDocSpec extends AkkaSpec {
PriorityWorkerPoolShape[In, Out](inlets(0).as[In], inlets(1).as[In], outlets(0).as[Out])
}
}
//#flow-graph-components-shape
//#graph-dsl-components-shape
//#flow-graph-components-create
//#graph-dsl-components-create
object PriorityWorkerPool {
def apply[In, Out](
worker: Flow[In, Out, Any],
@ -161,11 +160,11 @@ class FlowGraphDocSpec extends AkkaSpec {
}
}
//#flow-graph-components-create
//#graph-dsl-components-create
def println(s: Any): Unit = ()
//#flow-graph-components-use
//#graph-dsl-components-use
val worker1 = Flow[String].map("step 1 " + _)
val worker2 = Flow[String].map("step 2 " + _)
@ -184,11 +183,10 @@ class FlowGraphDocSpec extends AkkaSpec {
priorityPool2.resultsOut ~> Sink.foreach(println)
ClosedShape
}).run()
//#flow-graph-components-use
//#graph-dsl-components-use
//#flow-graph-components-shape2
import FanInShape.Name
import FanInShape.Init
//#graph-dsl-components-shape2
import FanInShape.{ Init, Name }
class PriorityWorkerPoolShape2[In, Out](_init: Init[Out] = Name("PriorityWorkerPool"))
extends FanInShape[Out](_init) {
@ -198,23 +196,23 @@ class FlowGraphDocSpec extends AkkaSpec {
val priorityJobsIn = newInlet[In]("priorityJobsIn")
// Outlet[Out] with name "out" is automatically created
}
//#flow-graph-components-shape2
//#graph-dsl-components-shape2
}
"access to materialized value" in {
//#flow-graph-matvalue
//#graph-dsl-matvalue
import GraphDSL.Implicits._
val foldFlow: Flow[Int, Int, Future[Int]] = Flow.fromGraph(GraphDSL.create(Sink.fold[Int, Int](0)(_ + _)) {
implicit builder ⇒
fold ⇒
FlowShape(fold.in, builder.materializedValue.mapAsync(4)(identity).outlet)
})
//#flow-graph-matvalue
//#graph-dsl-matvalue
Await.result(Source(1 to 10).via(foldFlow).runWith(Sink.head), 3.seconds) should ===(55)
//#flow-graph-matvalue-cycle
//#graph-dsl-matvalue-cycle
import GraphDSL.Implicits._
// This cannot produce any value:
val cyclicFold: Source[Int, Future[Int]] = Source.fromGraph(GraphDSL.create(Sink.fold[Int, Int](0)(_ + _)) {
@ -228,7 +226,7 @@ class FlowGraphDocSpec extends AkkaSpec {
builder.materializedValue.mapAsync(4)(identity) ~> fold
SourceShape(builder.materializedValue.mapAsync(4)(identity).outlet)
})
//#flow-graph-matvalue-cycle
//#graph-dsl-matvalue-cycle
}
}

22
akka-docs/rst/scala/code/docs/stream/StreamPartialFlowGraphDocSpec.scala → akka-docs/rst/scala/code/docs/stream/StreamPartialGraphDSLDocSpec.scala
View file

@ -11,14 +11,14 @@ import akka.testkit.AkkaSpec
import scala.concurrent.{ Await, Future }
import scala.concurrent.duration._
class StreamPartialFlowGraphDocSpec extends AkkaSpec {
class StreamPartialGraphDSLDocSpec extends AkkaSpec {
implicit val ec = system.dispatcher
implicit val materializer = ActorMaterializer()
"build with open ports" in {
//#simple-partial-flow-graph
//#simple-partial-graph-dsl
val pickMaxOfThree = GraphDSL.create() { implicit b =>
import GraphDSL.Implicits._
@ -47,11 +47,11 @@ class StreamPartialFlowGraphDocSpec extends AkkaSpec {
val max: Future[Int] = g.run()
Await.result(max, 300.millis) should equal(3)
//#simple-partial-flow-graph
//#simple-partial-graph-dsl
}
"build source from partial flow graph" in {
//#source-from-partial-flow-graph
"build source from partial graph" in {
//#source-from-partial-graph-dsl
val pairs = Source.fromGraph(GraphDSL.create() { implicit b =>
import GraphDSL.Implicits._
@ -68,12 +68,12 @@ class StreamPartialFlowGraphDocSpec extends AkkaSpec {
})
val firstPair: Future[(Int, Int)] = pairs.runWith(Sink.head)
//#source-from-partial-flow-graph
//#source-from-partial-graph-dsl
Await.result(firstPair, 300.millis) should equal(1 -> 2)
}
"build flow from partial flow graph" in {
//#flow-from-partial-flow-graph
"build flow from partial graph" in {
//#flow-from-partial-graph-dsl
val pairUpWithToString =
Flow.fromGraph(GraphDSL.create() { implicit b =>
import GraphDSL.Implicits._
@ -90,13 +90,13 @@ class StreamPartialFlowGraphDocSpec extends AkkaSpec {
FlowShape(broadcast.in, zip.out)
})
//#flow-from-partial-flow-graph
//#flow-from-partial-graph-dsl
// format: OFF
val (_, matSink: Future[(Int, String)]) =
//#flow-from-partial-flow-graph
//#flow-from-partial-graph-dsl
pairUpWithToString.runWith(Source(List(1)), Sink.head)
//#flow-from-partial-flow-graph
//#flow-from-partial-graph-dsl
// format: ON
Await.result(matSink, 300.millis) should equal(1 -> "1")

8
akka-docs/rst/scala/code/docs/stream/TwitterStreamQuickstartDocSpec.scala
View file

@ -104,10 +104,10 @@ class TwitterStreamQuickstartDocSpec extends AkkaSpec {
}
trait HiddenDefinitions {
//#flow-graph-broadcast
//#graph-dsl-broadcast
val writeAuthors: Sink[Author, Unit] = ???
val writeHashtags: Sink[Hashtag, Unit] = ???
//#flow-graph-broadcast
//#graph-dsl-broadcast
}
"simple broadcast" in {
@ -115,7 +115,7 @@ class TwitterStreamQuickstartDocSpec extends AkkaSpec {
val writeHashtags: Sink[Hashtag, Future[Done]] = Sink.ignore
// format: OFF
//#flow-graph-broadcast
//#graph-dsl-broadcast
val g = RunnableGraph.fromGraph(GraphDSL.create() { implicit b =>
import GraphDSL.Implicits._
@ -126,7 +126,7 @@ class TwitterStreamQuickstartDocSpec extends AkkaSpec {
ClosedShape
})
g.run()
//#flow-graph-broadcast
//#graph-dsl-broadcast
// format: ON
}

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

@ -24,7 +24,7 @@ class RecipeCollectingMetrics extends RecipeSpec {
// val currentLoad = loadUpdates.transform(() => new HoldWithWait)
//
// val graph = GraphDSL { implicit builder =>
// import FlowGraphImplicits._
// import GraphDSLImplicits._
// val collector = ZipWith[Int, Tick, String](
// (load: Int, tick: Tick) => s"current load is $load")
//