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

-str - #18806 - Replacing flatten(FlattenStrategy) with flattenConcat

Browse source
This commit is contained in:
Viktor Klang 2015-10-29 16:55:03 +01:00
parent 06ce968b16
commit ce10456804
15 changed files with 31 additions and 84 deletions
Download patch file Download diff file Expand all files Collapse all files

9
akka-stream/src/main/scala/akka/stream/javadsl/Flow.scala
View file

@ -839,9 +839,8 @@ final class Flow[-In, +Out, +Mat](delegate: scaladsl.Flow[In, Out, Mat]) extends
/**
* Transforms a stream of streams into a contiguous stream of elements using the provided flattening strategy.
* This operation can be used on a stream of element type [[Source]].
*
* '''Emits when''' (Concat) the current consumed substream has an element available
* This operation can be used on a stream of element type `Source[U]`.
* '''Emits when''' a currently consumed substream has an element available
*
* '''Backpressures when''' downstream backpressures
*
@ -850,8 +849,8 @@ final class Flow[-In, +Out, +Mat](delegate: scaladsl.Flow[In, Out, Mat]) extends
* '''Cancels when''' downstream cancels
*
*/
def flatten[U](strategy: FlattenStrategy[Out, U]): javadsl.Flow[In, U, Mat] =
new Flow(delegate.flatten(strategy))
def flattenConcat[U](): javadsl.Flow[In, U, Mat] =
new Flow(delegate.flattenConcat[U]()(conforms[U].asInstanceOf[Out <:< scaladsl.Source[U, _]]))
/**
* Concatenate the given [[Source]] to this [[Flow]], meaning that once this