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

Merge pull request #26828 from heraklos/rename-bidiflow-join-type-parameter

Browse source 
Rename type parameter for join and joinMat in Flow instance
This commit is contained in:
Patrik Nordwall 2019-08-30 15:00:19 +02:00 • committed by GitHub
commit 53505d8880
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -454,7 +454,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
* | +------+ +------+ |
@ -464,7 +464,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))
/**
@ -474,7 +474,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
* | +------+ +------+ |
@ -488,9 +488,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)))
/**

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

@ -188,7 +188,7 @@ final class Flow[-In, +Out, +Mat](
* | Resulting Flow |
* | |
* | +------+ +------+ |
* | | | ~Out~> | | ~~> O2
* | | | ~Out~> | | ~~> O1
* | | flow | | bidi | |
* | | | <~In~ | | <~~ I2
* | +------+ +------+ |
@ -198,7 +198,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:
@ -207,7 +207,7 @@ final class Flow[-In, +Out, +Mat](
* | Resulting Flow |
* | |
* | +------+ +------+ |
* | | | ~Out~> | | ~~> O2
* | | | ~Out~> | | ~~> O1
* | | flow | | bidi | |
* | | | <~In~ | | <~~ I2
* | +------+ +------+ |
@ -219,8 +219,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()