From 05e35488b7dfc544511cd85409ea3062b493dcf6 Mon Sep 17 00:00:00 2001 From: heraklos Date: Tue, 30 Apr 2019 16:46:10 +0900 Subject: [PATCH] rename type parameter for join and joinMat --- .../src/main/scala/akka/stream/javadsl/Flow.scala | 12 ++++++------ .../src/main/scala/akka/stream/scaladsl/Flow.scala | 10 +++++----- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/akka-stream/src/main/scala/akka/stream/javadsl/Flow.scala b/akka-stream/src/main/scala/akka/stream/javadsl/Flow.scala index 766daec987..3d0e05ee02 100755 --- a/akka-stream/src/main/scala/akka/stream/javadsl/Flow.scala +++ b/akka-stream/src/main/scala/akka/stream/javadsl/Flow.scala @@ -440,7 +440,7 @@ final class Flow[In, Out, Mat](delegate: scaladsl.Flow[In, Out, Mat]) extends Gr * | Resulting Flow | * | | * | +------+ +------+ | - * | | | ~Out~> | | ~~> O2 + * | | | ~Out~> | | ~~> O1 * | | flow | | bidi | | * | | | <~In~ | | <~~ I2 * | +------+ +------+ | @@ -450,7 +450,7 @@ final class Flow[In, Out, Mat](delegate: scaladsl.Flow[In, Out, Mat]) extends Gr * value of the current flow (ignoring the [[BidiFlow]]’s value), use * [[Flow#joinMat[I2* joinMat]] if a different strategy is needed. */ - def join[I2, O2, Mat2](bidi: Graph[BidiShape[Out, O2, I2, In], Mat2]): Flow[I2, O2, Mat] = + def join[I2, O1, Mat2](bidi: Graph[BidiShape[Out, O1, I2, In], Mat2]): Flow[I2, O1, Mat] = new Flow(delegate.join(bidi)) /** @@ -460,7 +460,7 @@ final class Flow[In, Out, Mat](delegate: scaladsl.Flow[In, Out, Mat]) extends Gr * | Resulting Flow | * | | * | +------+ +------+ | - * | | | ~Out~> | | ~~> O2 + * | | | ~Out~> | | ~~> O1 * | | flow | | bidi | | * | | | <~In~ | | <~~ I2 * | +------+ +------+ | @@ -474,9 +474,9 @@ final class Flow[In, Out, Mat](delegate: scaladsl.Flow[In, Out, Mat]) extends Gr * * See also [[viaMat]] when access to materialized values of the parameter is needed. */ - def joinMat[I2, O2, Mat2, M]( - bidi: Graph[BidiShape[Out, O2, I2, In], Mat2], - combine: function.Function2[Mat, Mat2, M]): Flow[I2, O2, M] = + def joinMat[I2, O1, Mat2, M]( + bidi: Graph[BidiShape[Out, O1, I2, In], Mat2], + combine: function.Function2[Mat, Mat2, M]): Flow[I2, O1, M] = new Flow(delegate.joinMat(bidi)(combinerToScala(combine))) /** diff --git a/akka-stream/src/main/scala/akka/stream/scaladsl/Flow.scala b/akka-stream/src/main/scala/akka/stream/scaladsl/Flow.scala index 47579dd43b..5c99cf654c 100755 --- a/akka-stream/src/main/scala/akka/stream/scaladsl/Flow.scala +++ b/akka-stream/src/main/scala/akka/stream/scaladsl/Flow.scala @@ -187,7 +187,7 @@ final class Flow[-In, +Out, +Mat]( * | Resulting Flow | * | | * | +------+ +------+ | - * | | | ~Out~> | | ~~> O2 + * | | | ~Out~> | | ~~> O1 * | | flow | | bidi | | * | | | <~In~ | | <~~ I2 * | +------+ +------+ | @@ -197,7 +197,7 @@ final class Flow[-In, +Out, +Mat]( * value of the current flow (ignoring the [[BidiFlow]]’s value), use * [[Flow#joinMat[I2* joinMat]] if a different strategy is needed. */ - def join[I2, O2, Mat2](bidi: Graph[BidiShape[Out, O2, I2, In], Mat2]): Flow[I2, O2, Mat] = joinMat(bidi)(Keep.left) + def join[I2, O1, Mat2](bidi: Graph[BidiShape[Out, O1, I2, In], Mat2]): Flow[I2, O1, Mat] = joinMat(bidi)(Keep.left) /** * Join this [[Flow]] to a [[BidiFlow]] to close off the “top” of the protocol stack: @@ -206,7 +206,7 @@ final class Flow[-In, +Out, +Mat]( * | Resulting Flow | * | | * | +------+ +------+ | - * | | | ~Out~> | | ~~> O2 + * | | | ~Out~> | | ~~> O1 * | | flow | | bidi | | * | | | <~In~ | | <~~ I2 * | +------+ +------+ | @@ -218,8 +218,8 @@ final class Flow[-In, +Out, +Mat]( * It is recommended to use the internally optimized `Keep.left` and `Keep.right` combiners * where appropriate instead of manually writing functions that pass through one of the values. */ - def joinMat[I2, O2, Mat2, M](bidi: Graph[BidiShape[Out, O2, I2, In], Mat2])( - combine: (Mat, Mat2) => M): Flow[I2, O2, M] = { + def joinMat[I2, O1, Mat2, M](bidi: Graph[BidiShape[Out, O1, I2, In], Mat2])( + combine: (Mat, Mat2) => M): Flow[I2, O1, M] = { val newBidiShape = bidi.shape.deepCopy() val newFlowShape = shape.deepCopy()