merge content of stream-io.md (#23236)

akka-docs/src/main/paradox/java/stream/stream-io.md

@@ -1,112 +0,0 @@
-# Working with streaming IO
-
-Akka Streams provides a way of handling File IO and TCP connections with Streams.
-While the general approach is very similar to the @ref:[Actor based TCP handling](../io-tcp.md) using Akka IO,
-by using Akka Streams you are freed of having to manually react to back-pressure signals,
-as the library does it transparently for you.
-
-## Streaming TCP
-
-### Accepting connections: Echo Server
-
-In order to implement a simple EchoServer we `bind` to a given address, which returns a `Source<IncomingConnection, CompletionStage<ServerBinding>>`,
-which will emit an `IncomingConnection` element for each new connection that the Server should handle:
-
-@@snip [StreamTcpDocTest.java]($code$/java/jdocs/stream/io/StreamTcpDocTest.java) { #echo-server-simple-bind }
-
-![tcp-stream-bind.png](../../images/tcp-stream-bind.png)
-
-Next, we simply handle *each* incoming connection using a `Flow` which will be used as the processing stage
-to handle and emit `ByteString` s from and to the TCP Socket. Since one `ByteString` does not have to necessarily
-correspond to exactly one line of text (the client might be sending the line in chunks) we use the `delimiter`
-helper Flow from `akka.stream.javadsl.Framing` to chunk the inputs up into actual lines of text. The last boolean
-argument indicates that we require an explicit line ending even for the last message before the connection is closed.
-In this example we simply add exclamation marks to each incoming text message and push it through the flow:
-
-@@snip [StreamTcpDocTest.java]($code$/java/jdocs/stream/io/StreamTcpDocTest.java) { #echo-server-simple-handle }
-
-![tcp-stream-run.png](../../images/tcp-stream-run.png)
-
-Notice that while most building blocks in Akka Streams are reusable and freely shareable, this is *not* the case for the
-incoming connection Flow, since it directly corresponds to an existing, already accepted connection its handling can
-only ever be materialized *once*.
-
-Closing connections is possible by cancelling the *incoming connection* `Flow` from your server logic (e.g. by
-connecting its downstream to a `Sink.cancelled()` and its upstream to a `Source.empty()`).
-It is also possible to shut down the server's socket by cancelling the `IncomingConnection` source `connections`.
-
-We can then test the TCP server by sending data to the TCP Socket using `netcat`:
-
-```
-$ echo -n "Hello World" | netcat 127.0.0.1 8889
-Hello World!!!
-```
-
-### Connecting: REPL Client
-
-In this example we implement a rather naive Read Evaluate Print Loop client over TCP.
-Let's say we know a server has exposed a simple command line interface over TCP,
-and would like to interact with it using Akka Streams over TCP. To open an outgoing connection socket we use
-the `outgoingConnection` method:
-
-@@snip [StreamTcpDocTest.java]($code$/java/jdocs/stream/io/StreamTcpDocTest.java) { #repl-client }
-
-The `repl` flow we use to handle the server interaction first prints the servers response, then awaits on input from
-the command line (this blocking call is used here just for the sake of simplicity) and converts it to a
-`ByteString` which is then sent over the wire to the server. Then we simply connect the TCP pipeline to this
-processing stage–at this point it will be materialized and start processing data once the server responds with
-an *initial message*.
-
-A resilient REPL client would be more sophisticated than this, for example it should split out the input reading into
-a separate mapAsync step and have a way to let the server write more data than one ByteString chunk at any given time,
-these improvements however are left as exercise for the reader.
-
-### Avoiding deadlocks and liveness issues in back-pressured cycles
-
-When writing such end-to-end back-pressured systems you may sometimes end up in a situation of a loop,
-in which *either side is waiting for the other one to start the conversation*. One does not need to look far
-to find examples of such back-pressure loops. In the two examples shown previously, we always assumed that the side we
-are connecting to would start the conversation, which effectively means both sides are back-pressured and can not get
-the conversation started. There are multiple ways of dealing with this which are explained in depth in @ref:[Graph cycles, liveness and deadlocks](stream-graphs.md#graph-cycles),
-however in client-server scenarios it is often the simplest to make either side simply send an initial message.
-
-@@@ note
-
-In case of back-pressured cycles (which can occur even between different systems) sometimes you have to decide
-which of the sides has start the conversation in order to kick it off. This can be often done by injecting an
-initial message from one of the sides–a conversation starter.
-
-@@@
-
-To break this back-pressure cycle we need to inject some initial message, a "conversation starter".
-First, we need to decide which side of the connection should remain passive and which active.
-Thankfully in most situations finding the right spot to start the conversation is rather simple, as it often is inherent
-to the protocol we are trying to implement using Streams. In chat-like applications, which our examples resemble,
-it makes sense to make the Server initiate the conversation by emitting a "hello" message:
-
-@@snip [StreamTcpDocTest.java]($code$/java/jdocs/stream/io/StreamTcpDocTest.java) { #welcome-banner-chat-server }
-
-To emit the initial message we merge a `Source` with a single element, after the command processing but before the
-framing and transformation to `ByteString` s this way we do not have to repeat such logic.
-
-In this example both client and server may need to close the stream based on a parsed command - `BYE` in the case
-of the server, and `q` in the case of the client. This is implemented by using a custom `GraphStage`
-which completes the stream once it encounters such command.
-
-## Streaming File IO
-
-Akka Streams provide simple Sources and Sinks that can work with `ByteString` instances to perform IO operations
-on files.
-
-Streaming data from a file is as easy as creating a *FileIO.fromPath* given a target path, and an optional
-`chunkSize` which determines the buffer size determined as one "element" in such stream:
-
-@@snip [StreamFileDocTest.java]($code$/java/jdocs/stream/io/StreamFileDocTest.java) { #file-source }
-
-Please note that these processing stages are backed by Actors and by default are configured to run on a pre-configured
-threadpool-backed dispatcher dedicated for File IO. This is very important as it isolates the blocking file IO operations from the rest
-of the ActorSystem allowing each dispatcher to be utilised in the most efficient way. If you want to configure a custom
-dispatcher for file IO operations globally, you can do so by changing the `akka.stream.blocking-io-dispatcher`,
-or for a specific stage by specifying a custom Dispatcher in code, like this:
-
-@@snip [StreamFileDocTest.java]($code$/java/jdocs/stream/io/StreamFileDocTest.java) { #custom-dispatcher-code }

akka-docs/src/main/paradox/java/stream/stream-io.md

@@ -0,0 +1 @@
+../../scala/stream/stream-io.md

akka-docs/src/main/paradox/scala/stream/stream-io.md

@@ -1,7 +1,7 @@
 # Working with streaming IO
 
 Akka Streams provides a way of handling File IO and TCP connections with Streams.
-While the general approach is very similar to the @ref:[Actor based TCP handling](../io-tcp.md) using Akka IO,
+While the general approach is very similar to the @ref[Actor based TCP handling](../io-tcp.md) using Akka IO,
 by using Akka Streams you are freed of having to manually react to back-pressure signals,
 as the library does it transparently for you.
 
@@ -9,21 +9,29 @@ as the library does it transparently for you.
 
 ### Accepting connections: Echo Server
 
-In order to implement a simple EchoServer we `bind` to a given address, which returns a `Source[IncomingConnection, Future[ServerBinding]]`,
+In order to implement a simple EchoServer we `bind` to a given address, which returns a @scala[`Source[IncomingConnection, Future[ServerBinding]]`]@java[`Source<IncomingConnection, CompletionStage<ServerBinding>>`],
 which will emit an `IncomingConnection` element for each new connection that the Server should handle:
 
-@@snip [StreamTcpDocSpec.scala]($code$/scala/docs/stream/io/StreamTcpDocSpec.scala) { #echo-server-simple-bind }
+Scala
+:   @@snip [StreamTcpDocSpec.scala]($code$/scala/docs/stream/io/StreamTcpDocSpec.scala) { #echo-server-simple-bind }
+
+Java
+:   @@snip [StreamTcpDocTest.java]($code$/java/jdocs/stream/io/StreamTcpDocTest.java) { #echo-server-simple-bind }
 
 ![tcp-stream-bind.png](../../images/tcp-stream-bind.png)
 
 Next, we simply handle *each* incoming connection using a `Flow` which will be used as the processing stage
 to handle and emit `ByteString` s from and to the TCP Socket. Since one `ByteString` does not have to necessarily
-correspond to exactly one line of text (the client might be sending the line in chunks) we use the `Framing.delimiter`
+correspond to exactly one line of text (the client might be sending the line in chunks) we use the @scala[`Framing.delimiter`]@java[`delimiter`]
-helper Flow to chunk the inputs up into actual lines of text. The last boolean
+helper Flow @scala[]@java[from `akka.stream.javadsl.Framing`] to chunk the inputs up into actual lines of text. The last boolean
 argument indicates that we require an explicit line ending even for the last message before the connection is closed.
 In this example we simply add exclamation marks to each incoming text message and push it through the flow:
 
-@@snip [StreamTcpDocSpec.scala]($code$/scala/docs/stream/io/StreamTcpDocSpec.scala) { #echo-server-simple-handle }
+Scala
+:   @@snip [StreamTcpDocSpec.scala]($code$/scala/docs/stream/io/StreamTcpDocSpec.scala) { #echo-server-simple-handle }
+
+Java
+:   @@snip [StreamTcpDocTest.java]($code$/java/jdocs/stream/io/StreamTcpDocTest.java) { #echo-server-simple-handle }
 
 ![tcp-stream-run.png](../../images/tcp-stream-run.png)
 
@@ -32,15 +40,22 @@ incoming connection Flow, since it directly corresponds to an existing, already
 only ever be materialized *once*.
 
 Closing connections is possible by cancelling the *incoming connection* `Flow` from your server logic (e.g. by
-connecting its downstream to a `Sink.cancelled` and its upstream to a `Source.empty`).
+connecting its downstream to a @scala[`Sink.cancelled`]@java[`Sink.cancelled()`] and its upstream to a @scala[`Source.empty`]@java[`Source.empty()`]).
 It is also possible to shut down the server's socket by cancelling the `IncomingConnection` source `connections`.
 
 We can then test the TCP server by sending data to the TCP Socket using `netcat`:
 
+@scala[
 ```
 $ echo -n "Hello World" | netcat 127.0.0.1 8888
 Hello World!!!
 ```
+]@java[
+```
+$ echo -n "Hello World" | netcat 127.0.0.1 8889
+Hello World!!!
+```
+]
 
 ### Connecting: REPL Client
 
@@ -49,7 +64,11 @@ Let's say we know a server has exposed a simple command line interface over TCP,
 and would like to interact with it using Akka Streams over TCP. To open an outgoing connection socket we use
 the `outgoingConnection` method:
 
-@@snip [StreamTcpDocSpec.scala]($code$/scala/docs/stream/io/StreamTcpDocSpec.scala) { #repl-client }
+Scala
+:   @@snip [StreamTcpDocSpec.scala]($code$/scala/docs/stream/io/StreamTcpDocSpec.scala) { #repl-client }
+
+Java
+:   @@snip [StreamTcpDocTest.java]($code$/java/jdocs/stream/io/StreamTcpDocTest.java) { #repl-client }
 
 The `repl` flow we use to handle the server interaction first prints the servers response, then awaits on input from
 the command line (this blocking call is used here just for the sake of simplicity) and converts it to a
@@ -67,7 +86,7 @@ When writing such end-to-end back-pressured systems you may sometimes end up in
 in which *either side is waiting for the other one to start the conversation*. One does not need to look far
 to find examples of such back-pressure loops. In the two examples shown previously, we always assumed that the side we
 are connecting to would start the conversation, which effectively means both sides are back-pressured and can not get
-the conversation started. There are multiple ways of dealing with this which are explained in depth in @ref:[Graph cycles, liveness and deadlocks](stream-graphs.md#graph-cycles),
+the conversation started. There are multiple ways of dealing with this which are explained in depth in @ref[Graph cycles, liveness and deadlocks](stream-graphs.md#graph-cycles),
 however in client-server scenarios it is often the simplest to make either side simply send an initial message.
 
 @@@ note
@@ -84,14 +103,19 @@ Thankfully in most situations finding the right spot to start the conversation i
 to the protocol we are trying to implement using Streams. In chat-like applications, which our examples resemble,
 it makes sense to make the Server initiate the conversation by emitting a "hello" message:
 
-@@snip [StreamTcpDocSpec.scala]($code$/scala/docs/stream/io/StreamTcpDocSpec.scala) { #welcome-banner-chat-server }
+Scala
+:   @@snip [StreamTcpDocSpec.scala]($code$/scala/docs/stream/io/StreamTcpDocSpec.scala) { #welcome-banner-chat-server }
+
+Java
+:   @@snip [StreamTcpDocTest.java]($code$/java/jdocs/stream/io/StreamTcpDocTest.java) { #welcome-banner-chat-server }
 
 To emit the initial message we merge a `Source` with a single element, after the command processing but before the
 framing and transformation to `ByteString` s this way we do not have to repeat such logic.
 
 In this example both client and server may need to close the stream based on a parsed command - `BYE` in the case
-of the server, and `q` in the case of the client. This is implemented by taking from the stream until `q` and
+of the server, and `q` in the case of the client. This is implemented by @scala[taking from the stream until `q` and
-and concatenating a `Source` with a single `BYE` element which will then be sent after the original source completed.
+and concatenating a `Source` with a single `BYE` element which will then be sent after the original source completed]@java[using a custom `GraphStage`
+which completes the stream once it encounters such command].
 
 ## Streaming File IO
 
@@ -101,7 +125,11 @@ on files.
 Streaming data from a file is as easy as creating a *FileIO.fromPath* given a target path, and an optional
 `chunkSize` which determines the buffer size determined as one "element" in such stream:
 
-@@snip [StreamFileDocSpec.scala]($code$/scala/docs/stream/io/StreamFileDocSpec.scala) { #file-source }
+Scala
+:   @@snip [StreamFileDocSpec.scala]($code$/scala/docs/stream/io/StreamFileDocSpec.scala) { #file-source }
+
+Java
+:   @@snip [StreamFileDocTest.java]($code$/java/jdocs/stream/io/StreamFileDocTest.java) { #file-source } 
 
 Please note that these processing stages are backed by Actors and by default are configured to run on a pre-configured
 threadpool-backed dispatcher dedicated for File IO. This is very important as it isolates the blocking file IO operations from the rest
@@ -109,4 +137,8 @@ of the ActorSystem allowing each dispatcher to be utilised in the most efficient
 dispatcher for file IO operations globally, you can do so by changing the `akka.stream.blocking-io-dispatcher`,
 or for a specific stage by specifying a custom Dispatcher in code, like this:
 
-@@snip [StreamFileDocSpec.scala]($code$/scala/docs/stream/io/StreamFileDocSpec.scala) { #custom-dispatcher-code }
+Scala
+:   @@snip [StreamFileDocSpec.scala]($code$/scala/docs/stream/io/StreamFileDocSpec.scala) { #custom-dispatcher-code }
+
+Java
+:   @@snip [StreamFileDocTest.java]($code$/java/jdocs/stream/io/StreamFileDocTest.java) { #custom-dispatcher-code }