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

also fix FlowInterleaveSpec

Browse source 
Also-by: Johan Andrén <johan@markatta.com>
Also-by: Roland Kuhn <rk@rkuhn.info>
Also-by: Martynas Mickevičius <mmartynas@gmail.com>
This commit is contained in:
Endre Sándor Varga 2016-01-20 10:00:37 +02:00 • committed by Martynas Mickevičius
parent ef77b56e66
commit 60497f6561
195 changed files with 1110 additions and 857 deletions
Download patch file Download diff file Expand all files Collapse all files

7
akka-stream/src/main/scala/akka/stream/impl/SubFlowImpl.scala
View file

@ -3,19 +3,20 @@
*/
package akka.stream.impl
import akka.NotUsed
import akka.stream._
import akka.stream.scaladsl._
import language.higherKinds
object SubFlowImpl {
trait MergeBack[In, F[+_]] {
def apply[T](f: Flow[In, T, Unit], breadth: Int): F[T]
def apply[T](f: Flow[In, T, NotUsed], breadth: Int): F[T]
}
}
class SubFlowImpl[In, Out, Mat, F[+_], C](val subFlow: Flow[In, Out, Unit],
class SubFlowImpl[In, Out, Mat, F[+_], C](val subFlow: Flow[In, Out, NotUsed],
mergeBackFunction: SubFlowImpl.MergeBack[In, F],
finishFunction: Sink[In, Unit] ⇒ C)
finishFunction: Sink[In, NotUsed] ⇒ C)
extends SubFlow[Out, Mat, F, C] {
override def deprecatedAndThen[U](op: Stages.StageModule): SubFlow[U, Mat, F, C] =