!str #18692 javadsl.FlowGraph.Builder.add()

* also make factories more consistent by only offering
  FlowGraph.create()
* also remove secondary (edge-based) FlowGraph.Builder DSL
* also improve naming for conversions from Graph to
  Source/Flow/BidiFlow/Sink

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

@@ -1,6 +1,6 @@
 package docs.stream.cookbook
 
-import akka.stream.OverflowStrategy
+import akka.stream.{ ClosedShape, OverflowStrategy }
 import akka.stream.scaladsl._
 import akka.stream.testkit._
 
@@ -24,7 +24,7 @@ class RecipeDroppyBroadcast extends RecipeSpec {
       val mySink3 = Sink(sub3)
 
       //#droppy-bcast
-      val graph = FlowGraph.closed(mySink1, mySink2, mySink3)((_, _, _)) { implicit b =>
+      val graph = RunnableGraph.fromGraph(FlowGraph.create(mySink1, mySink2, mySink3)((_, _, _)) { implicit b =>
         (sink1, sink2, sink3) =>
           import FlowGraph.Implicits._
 
@@ -34,7 +34,8 @@ class RecipeDroppyBroadcast extends RecipeSpec {
           bcast.buffer(10, OverflowStrategy.dropHead) ~> sink1
           bcast.buffer(10, OverflowStrategy.dropHead) ~> sink2
           bcast.buffer(10, OverflowStrategy.dropHead) ~> sink3
-      }
+          ClosedShape
+      })
       //#droppy-bcast
 
       graph.run()

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

@@ -2,6 +2,7 @@ package docs.stream.cookbook
 
 import akka.actor.{ Props, ActorRef, Actor }
 import akka.actor.Actor.Receive
+import akka.stream.ClosedShape
 import akka.stream.scaladsl._
 import akka.stream.testkit._
 
@@ -98,12 +99,13 @@ class RecipeGlobalRateLimit extends RecipeSpec {
 
       val probe = TestSubscriber.manualProbe[String]()
 
-      FlowGraph.closed() { implicit b =>
+      RunnableGraph.fromGraph(FlowGraph.create() { implicit b =>
         import FlowGraph.Implicits._
         val merge = b.add(Merge[String](2))
         source1 ~> merge ~> Sink(probe)
         source2 ~> merge
-      }.run()
+        ClosedShape
+      }).run()
 
       probe.expectSubscription().request(1000)
 

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

@@ -1,5 +1,6 @@
 package docs.stream.cookbook
 
+import akka.stream.ClosedShape
 import akka.stream.scaladsl._
 import akka.stream.testkit._
 import akka.util.ByteString
@@ -25,14 +26,15 @@ class RecipeKeepAlive extends RecipeSpec {
       val tickToKeepAlivePacket: Flow[Tick, ByteString, Unit] = Flow[Tick]
         .conflate(seed = (tick) => keepaliveMessage)((msg, newTick) => msg)
 
-      val graph = FlowGraph.closed() { implicit builder =>
+      val graph = RunnableGraph.fromGraph(FlowGraph.create() { implicit builder =>
         import FlowGraph.Implicits._
         val unfairMerge = builder.add(MergePreferred[ByteString](1))
 
         // If data is available then no keepalive is injected
         dataStream ~> unfairMerge.preferred
         ticks ~> tickToKeepAlivePacket ~> unfairMerge ~> sink
-      }
+        ClosedShape
+      })
       //#inject-keepalive
 
       graph.run()

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

@@ -1,5 +1,6 @@
 package docs.stream.cookbook
 
+import akka.stream.ClosedShape
 import akka.stream.scaladsl._
 import akka.stream.testkit._
 import scala.concurrent.duration._
@@ -17,13 +18,14 @@ class RecipeManualTrigger extends RecipeSpec {
       val sink = Sink(sub)
 
       //#manually-triggered-stream
-      val graph = FlowGraph.closed() { implicit builder =>
+      val graph = RunnableGraph.fromGraph(FlowGraph.create() { implicit builder =>
         import FlowGraph.Implicits._
         val zip = builder.add(Zip[Message, Trigger]())
         elements ~> zip.in0
         triggerSource ~> zip.in1
         zip.out ~> Flow[(Message, Trigger)].map { case (msg, trigger) => msg } ~> sink
-      }
+        ClosedShape
+      })
       //#manually-triggered-stream
 
       graph.run()
@@ -55,14 +57,15 @@ class RecipeManualTrigger extends RecipeSpec {
       val sink = Sink(sub)
 
       //#manually-triggered-stream-zipwith
-      val graph = FlowGraph.closed() { implicit builder =>
+      val graph = RunnableGraph.fromGraph(FlowGraph.create() { implicit builder =>
         import FlowGraph.Implicits._
         val zip = builder.add(ZipWith((msg: Message, trigger: Trigger) => msg))
 
         elements ~> zip.in0
         triggerSource ~> zip.in1
         zip.out ~> sink
-      }
+        ClosedShape
+      })
       //#manually-triggered-stream-zipwith
 
       graph.run()

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

@@ -1,5 +1,6 @@
 package docs.stream.cookbook
 
+import akka.stream.FlowShape
 import akka.stream.scaladsl._
 import akka.testkit.TestProbe
 
@@ -20,7 +21,7 @@ class RecipeWorkerPool extends RecipeSpec {
       def balancer[In, Out](worker: Flow[In, Out, Any], workerCount: Int): Flow[In, Out, Unit] = {
         import FlowGraph.Implicits._
 
-        Flow() { implicit b =>
+        Flow.fromGraph(FlowGraph.create() { implicit b =>
           val balancer = b.add(Balance[In](workerCount, waitForAllDownstreams = true))
           val merge = b.add(Merge[Out](workerCount))
 
@@ -30,8 +31,8 @@ class RecipeWorkerPool extends RecipeSpec {
             balancer ~> worker ~> merge
           }
 
-          (balancer.in, merge.out)
-        }
+          FlowShape(balancer.in, merge.out)
+        })
       }
 
       val processedJobs: Source[Result, Unit] = myJobs.via(balancer(worker, 3))