This is an automated email from the ASF dual-hosted git repository.
hepin pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/incubator-pekko.git
The following commit(s) were added to refs/heads/main by this push:
new 83650437cd =str Remove the deprecation annotation on Flow#recoverWith.
83650437cd is described below
commit 83650437cdb15416719b4eefe4630f47dfdfa7d7
Author: He-Pin <[email protected]>
AuthorDate: Sat Mar 4 13:32:23 2023 +0800
=str Remove the deprecation annotation on Flow#recoverWith.
---
stream/src/main/scala/org/apache/pekko/stream/javadsl/Flow.scala | 1 -
stream/src/main/scala/org/apache/pekko/stream/javadsl/Source.scala | 3 ---
stream/src/main/scala/org/apache/pekko/stream/javadsl/SubFlow.scala | 1 -
stream/src/main/scala/org/apache/pekko/stream/javadsl/SubSource.scala | 1 -
stream/src/main/scala/org/apache/pekko/stream/scaladsl/Flow.scala | 1 -
5 files changed, 7 deletions(-)
diff --git a/stream/src/main/scala/org/apache/pekko/stream/javadsl/Flow.scala
b/stream/src/main/scala/org/apache/pekko/stream/javadsl/Flow.scala
index 14e7c02604..d6135ba3d2 100755
--- a/stream/src/main/scala/org/apache/pekko/stream/javadsl/Flow.scala
+++ b/stream/src/main/scala/org/apache/pekko/stream/javadsl/Flow.scala
@@ -1731,7 +1731,6 @@ final class Flow[In, Out, Mat](delegate:
scaladsl.Flow[In, Out, Mat]) extends Gr
*
* '''Cancels when''' downstream cancels
*/
- @nowarn("msg=deprecated")
def recoverWith(pf: PartialFunction[Throwable, _ <: Graph[SourceShape[Out],
NotUsed]]): javadsl.Flow[In, Out, Mat] =
new Flow(delegate.recoverWith(pf))
diff --git a/stream/src/main/scala/org/apache/pekko/stream/javadsl/Source.scala
b/stream/src/main/scala/org/apache/pekko/stream/javadsl/Source.scala
index 3dc7257ce9..95d0801db6 100755
--- a/stream/src/main/scala/org/apache/pekko/stream/javadsl/Source.scala
+++ b/stream/src/main/scala/org/apache/pekko/stream/javadsl/Source.scala
@@ -2275,9 +2275,6 @@ final class Source[Out, Mat](delegate:
scaladsl.Source[Out, Mat]) extends Graph[
*
* @deprecated use `recoverWithRetries` instead
*/
- @Deprecated
- @deprecated("Use recoverWithRetries instead.", "Akka 2.6.6")
- @nowarn("msg=deprecated")
def recoverWith(pf: PartialFunction[Throwable, _ <: Graph[SourceShape[Out],
NotUsed]]): Source[Out, Mat] =
new Source(delegate.recoverWith(pf))
diff --git
a/stream/src/main/scala/org/apache/pekko/stream/javadsl/SubFlow.scala
b/stream/src/main/scala/org/apache/pekko/stream/javadsl/SubFlow.scala
index 9086516bc8..affc0c1e9e 100755
--- a/stream/src/main/scala/org/apache/pekko/stream/javadsl/SubFlow.scala
+++ b/stream/src/main/scala/org/apache/pekko/stream/javadsl/SubFlow.scala
@@ -1067,7 +1067,6 @@ class SubFlow[In, Out, Mat](
*
* '''Cancels when''' downstream cancels
*/
- @deprecated("Use recoverWithRetries instead.", "2.4.4")
def recoverWith(
pf: PartialFunction[Throwable, Graph[SourceShape[Out], NotUsed]]):
SubFlow[In, Out, Mat @uncheckedVariance] =
new SubFlow(delegate.recoverWith(pf))
diff --git
a/stream/src/main/scala/org/apache/pekko/stream/javadsl/SubSource.scala
b/stream/src/main/scala/org/apache/pekko/stream/javadsl/SubSource.scala
index 2fee19e448..f9cca0fd7d 100755
--- a/stream/src/main/scala/org/apache/pekko/stream/javadsl/SubSource.scala
+++ b/stream/src/main/scala/org/apache/pekko/stream/javadsl/SubSource.scala
@@ -1050,7 +1050,6 @@ class SubSource[Out, Mat](
*
* '''Cancels when''' downstream cancels
*/
- @deprecated("Use recoverWithRetries instead.", "2.4.4")
def recoverWith(pf: PartialFunction[Throwable, Graph[SourceShape[Out],
NotUsed]]): SubSource[Out, Mat] =
new SubSource(delegate.recoverWith(pf))
diff --git a/stream/src/main/scala/org/apache/pekko/stream/scaladsl/Flow.scala
b/stream/src/main/scala/org/apache/pekko/stream/scaladsl/Flow.scala
index 549c538fbe..f0c8830002 100755
--- a/stream/src/main/scala/org/apache/pekko/stream/scaladsl/Flow.scala
+++ b/stream/src/main/scala/org/apache/pekko/stream/scaladsl/Flow.scala
@@ -886,7 +886,6 @@ trait FlowOps[+Out, +Mat] {
*
* '''Cancels when''' downstream cancels
*/
- @deprecated("Use recoverWithRetries instead.", "2.4.4")
def recoverWith[T >: Out](pf: PartialFunction[Throwable,
Graph[SourceShape[T], NotUsed]]): Repr[T] =
via(new RecoverWith(-1, pf))
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
