Merge pull request #16007 from akka/wip-15977-changin-all-the-small-dsl-things-ban

+str #15977 Rename and change types in the new DSL

akka-http-core/src/main/scala/akka/http/engine/rendering/RenderSupport.scala

@@ -40,7 +40,7 @@ private object RenderSupport {
     val messageBytes =
       if (!skipEntity) Flow(messageStart).concat(entityBytes).toPublisher()
       else {
-        // FIXME: This should be fixed by a CancelledSink once #15903 is done. Currently this is needed for the tests
+        // FIXME: This should be fixed by a CancelledDrain once #15903 is done. Currently this is needed for the tests
         entityBytes.subscribe(cancelledSusbcriber)
         messageStart
       }

akka-http-core/src/main/scala/akka/http/util/package.scala

@@ -53,7 +53,7 @@ package object util {
         })
   }
 
-  // FIXME: This should be fixed by a CancelledSink once #15903 is done. Currently this is needed for the tests
+  // FIXME: This should be fixed by a CancelledDrain once #15903 is done. Currently this is needed for the tests
   private[http] def cancelledSusbcriber[T]: Subscriber[T] = new Subscriber[T] {
     override def onSubscribe(s: Subscription): Unit = s.cancel()
     override def onError(t: Throwable): Unit = ()

akka-http-core/src/test/scala/io/akka/integrationtest/http/HttpModelIntegrationSpec.scala

@@ -62,7 +62,7 @@ class HttpModelIntegrationSpec extends WordSpec with Matchers with BeforeAndAfte
         entity = HttpEntity.Default(
           contentType = ContentTypes.`application/json`,
           contentLength = 5,
-          FlowFrom(List(ByteString("hello"))).toPublisher()))
+          Source(List(ByteString("hello"))).toPublisher()))
 
       // Our library uses a simple model of headers: a Seq[(String, String)].
       // The body is represented as an Array[Byte]. To get the headers in
@@ -141,7 +141,7 @@ class HttpModelIntegrationSpec extends WordSpec with Matchers with BeforeAndAfte
       // convert the body into a Publisher[ByteString].
 
       val byteStringBody = ByteString(byteArrayBody)
-      val publisherBody = FlowFrom(List(byteStringBody)).toPublisher()
+      val publisherBody = Source(List(byteStringBody)).toPublisher()
 
       // Finally we can create our HttpResponse.