From 5f87a98bc7941c3bf4bacf07550243b75cddfef2 Mon Sep 17 00:00:00 2001 From: kerr Date: Mon, 5 Sep 2022 15:18:20 +0800 Subject: [PATCH] =str Rename method parameter name from `request` to `segmentSize` for interleaveMat. (#31527) --- .../scala/akka/stream/scaladsl/Flow.scala | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) 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 e44739c5b8..38d2aa9e22 100755 --- a/akka-stream/src/main/scala/akka/stream/scaladsl/Flow.scala +++ b/akka-stream/src/main/scala/akka/stream/scaladsl/Flow.scala @@ -3690,9 +3690,12 @@ trait FlowOpsMat[+Out, +Mat] extends FlowOps[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 interleaveMat[U >: Out, Mat2, Mat3](that: Graph[SourceShape[U], Mat2], request: Int)( - matF: (Mat, Mat2) => Mat3): ReprMat[U, Mat3] = - interleaveMat(that, request, eagerClose = false)(matF) + @nowarn("msg=deprecated") + def interleaveMat[U >: Out, Mat2, Mat3]( + that: Graph[SourceShape[U], Mat2], + @deprecatedName(Symbol("request")) + segmentSize: Int)(matF: (Mat, Mat2) => Mat3): ReprMat[U, Mat3] = + interleaveMat(that, segmentSize, eagerClose = false)(matF) /** * Interleave is a deterministic merge of the given [[Source]] with elements of this [[Flow]]. @@ -3710,9 +3713,13 @@ trait FlowOpsMat[+Out, +Mat] extends FlowOps[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 interleaveMat[U >: Out, Mat2, Mat3](that: Graph[SourceShape[U], Mat2], request: Int, eagerClose: Boolean)( - matF: (Mat, Mat2) => Mat3): ReprMat[U, Mat3] = - viaMat(interleaveGraph(that, request, eagerClose))(matF) + @nowarn("msg=deprecated") + def interleaveMat[U >: Out, Mat2, Mat3]( + that: Graph[SourceShape[U], Mat2], + @deprecatedName(Symbol("request")) + segmentSize: Int, + eagerClose: Boolean)(matF: (Mat, Mat2) => Mat3): ReprMat[U, Mat3] = + viaMat(interleaveGraph(that, segmentSize, eagerClose))(matF) /** * MergeLatest joins elements from N input streams into stream of lists of size N.