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

fix SinkSpec, and async boundary attribute, #22463

Browse source 
* let's keep the AsyncBoundary attribute for now,
  makeIsland is done in setAttributes
* fixing SinkSpec and RunnableGraphSpec
This commit is contained in:
Patrik Nordwall 2017-03-08 14:22:19 +01:00 • committed by Konrad `ktoso` Malawski
parent 2990edb66c
commit 6c8e24cefa
7 changed files with 32 additions and 72 deletions
Download patch file Download diff file Expand all files Collapse all files

40
akka-stream/src/main/scala/akka/stream/scaladsl/Flow.scala
View file

@ -25,8 +25,7 @@ import akka.annotation.DoNotInherit
*/
final class Flow[-In, +Out, +Mat](
override val traversalBuilder: LinearTraversalBuilder,
override val shape: FlowShape[In, Out]
)
override val shape: FlowShape[In, Out])
extends FlowOpsMat[Out, Mat] with Graph[FlowShape[In, Out], Mat] {
// TODO: debug string
@ -46,13 +45,11 @@ final class Flow[-In, +Out, +Mat](
if (this.isIdentity) {
new Flow(
LinearTraversalBuilder.fromBuilder(flow.traversalBuilder, flow.shape, combine),
flow.shape
).asInstanceOf[Flow[In, T, Mat3]]
flow.shape).asInstanceOf[Flow[In, T, Mat3]]
} else {
new Flow(
traversalBuilder.append(flow.traversalBuilder, flow.shape, combine),
FlowShape[In, T](shape.in, flow.shape.out)
)
FlowShape[In, T](shape.in, flow.shape.out))
}
}
@ -98,13 +95,11 @@ final class Flow[-In, +Out, +Mat](
if (isIdentity) {
new Sink(
LinearTraversalBuilder.fromBuilder(sink.traversalBuilder, sink.shape, combine),
SinkShape(sink.shape.in)
).asInstanceOf[Sink[In, Mat3]]
SinkShape(sink.shape.in)).asInstanceOf[Sink[In, Mat3]]
} else {
new Sink(
traversalBuilder.append(sink.traversalBuilder, sink.shape, combine),
SinkShape(shape.in)
)
SinkShape(shape.in))
}
}
@ -114,8 +109,7 @@ final class Flow[-In, +Out, +Mat](
override def mapMaterializedValue[Mat2](f: Mat ⇒ Mat2): ReprMat[Out, Mat2] =
new Flow(
traversalBuilder.transformMat(f),
shape
)
shape)
/**
* Join this [[Flow]] to another [[Flow]], by cross connecting the inputs and outputs, creating a [[RunnableGraph]].
@ -208,8 +202,7 @@ final class Flow[-In, +Out, +Mat](
new Flow(
LinearTraversalBuilder.fromBuilder(resultBuilder, newShape, Keep.right),
newShape
)
newShape)
}
/**
@ -222,8 +215,7 @@ final class Flow[-In, +Out, +Mat](
override def withAttributes(attr: Attributes): Repr[Out] =
new Flow(
traversalBuilder.setAttributes(attr),
shape
)
shape)
/**
* Add the given attributes to this Flow. Further calls to `withAttributes`
@ -241,12 +233,7 @@ final class Flow[-In, +Out, +Mat](
/**
* Put an asynchronous boundary around this `Flow`
*/
override def async: Repr[Out] = {
new Flow(
traversalBuilder.makeIsland(GraphStageTag),
shape
)
}
override def async: Repr[Out] = addAttributes(Attributes.asyncBoundary)
/**
* Connect the `Source` to this `Flow` and then connect it to the `Sink` and run it. The returned tuple contains
@ -285,8 +272,7 @@ object Flow {
private[this] val identity: Flow[Any, Any, NotUsed] = new Flow[Any, Any, NotUsed](
identityTraversalBuilder,
GraphStages.Identity.shape
)
GraphStages.Identity.shape)
/**
* Creates a Flow from a Reactive Streams [[org.reactivestreams.Processor]]
@ -322,8 +308,7 @@ object Flow {
case f: javadsl.Flow[I, O, M] ⇒ f.asScala
case other ⇒ new Flow(
LinearTraversalBuilder.fromBuilder(g.traversalBuilder, g.shape, Keep.right),
g.shape
)
g.shape)
}
/**
@ -381,8 +366,7 @@ final case class RunnableGraph[+Mat](override val traversalBuilder: TraversalBui
override def named(name: String): RunnableGraph[Mat] =
addAttributes(Attributes.name(name))
override def async: RunnableGraph[Mat] =
new RunnableGraph(traversalBuilder.makeIsland(GraphStageTag))
override def async: RunnableGraph[Mat] = addAttributes(Attributes.asyncBoundary)
}
/**