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

!str #19037 rename FlowGraph to GraphDSL

Browse source
This commit is contained in:
Roland Kuhn 2015-11-30 15:45:37 +01:00
parent 5895834d98
commit f00da4daac
92 changed files with 535 additions and 542 deletions
Download patch file Download diff file Expand all files Collapse all files

8
akka-stream/src/main/scala/akka/stream/scaladsl/Source.scala
View file

@ -119,8 +119,8 @@ final class Source[+Out, +Mat](private[stream] override val module: Module)
* Combines several sources with fun-in strategy like `Merge` or `Concat` and returns `Source`.
*/
def combine[T, U](first: Source[T, _], second: Source[T, _], rest: Source[T, _]*)(strategy: Int ⇒ Graph[UniformFanInShape[T, U], Unit]): Source[U, Unit] =
Source.fromGraph(FlowGraph.create() { implicit b ⇒
import FlowGraph.Implicits._
Source.fromGraph(GraphDSL.create() { implicit b ⇒
import GraphDSL.Implicits._
val c = b.add(strategy(rest.size + 2))
first ~> c.in(0)
second ~> c.in(1)
@ -330,8 +330,8 @@ object Source {
* Combines several sources with fun-in strategy like `Merge` or `Concat` and returns `Source`.
*/
def combine[T, U](first: Source[T, _], second: Source[T, _], rest: Source[T, _]*)(strategy: Int ⇒ Graph[UniformFanInShape[T, U], Unit]): Source[U, Unit] =
Source.fromGraph(FlowGraph.create() { implicit b ⇒
import FlowGraph.Implicits._
Source.fromGraph(GraphDSL.create() { implicit b ⇒
import GraphDSL.Implicits._
val c = b.add(strategy(rest.size + 2))
first ~> c.in(0)
second ~> c.in(1)