Merge pull request #18809 from akka/wip-18806-address-flattenstrategy-√

-str - #18806 - Replacing flatten(FlattenStrategy) with flattenConcat
This commit is contained in:
Viktor Klang (√) 2015-11-03 09:58:54 +01:00
commit 0f7a6408d3
15 changed files with 31 additions and 84 deletions

View file

@ -841,10 +841,10 @@ final class Source[+Out, +Mat](delegate: scaladsl.Source[Out, Mat]) extends Grap
/**
* 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]].
* This operation can be used on a stream of element type `Source[U]`.
*/
def flatten[U](strategy: FlattenStrategy[Out, U]): javadsl.Source[U, Mat] =
new Source(delegate.flatten(strategy))
def flattenConcat[U](): javadsl.Source[U, Mat] =
new Source(delegate.flattenConcat[U]()(conforms[U].asInstanceOf[Out <:< scaladsl.Source[U, _]]))
/**
* If the first element has not passed through this stage before the provided timeout, the stream is failed