This is an automated email from the ASF dual-hosted git repository.

hepin pushed a commit to branch 1.0.x
in repository https://gitbox.apache.org/repos/asf/incubator-pekko.git


The following commit(s) were added to refs/heads/1.0.x by this push:
     new 46c38f6b01 Having `@deprecated` and `@Deprecated` annotations on same 
function breaks scala3 build
46c38f6b01 is described below

commit 46c38f6b01e2c62beef115c1868c202a8696d335
Author: PJ Fanning <[email protected]>
AuthorDate: Sun Sep 3 09:30:08 2023 +0100

    Having `@deprecated` and `@Deprecated` annotations on same function breaks 
scala3 build
---
 stream/src/main/scala/org/apache/pekko/stream/javadsl/Flow.scala      | 1 -
 stream/src/main/scala/org/apache/pekko/stream/javadsl/Source.scala    | 1 -
 stream/src/main/scala/org/apache/pekko/stream/javadsl/SubFlow.scala   | 1 -
 stream/src/main/scala/org/apache/pekko/stream/javadsl/SubSource.scala | 1 -
 4 files changed, 4 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 1314c7b594..96bca18fb5 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
@@ -789,7 +789,6 @@ final class Flow[In, Out, Mat](delegate: scaladsl.Flow[In, 
Out, Mat]) extends Gr
    * '''Cancels when''' downstream cancels
    */
   @deprecated("Use `statefulMap` with `mapConcat` instead.", "1.0.2")
-  @Deprecated
   def statefulMapConcat[T](
       f: function.Creator[function.Function[Out, java.lang.Iterable[T]]]): 
javadsl.Flow[In, T, Mat] =
     new Flow(delegate.statefulMapConcat { () =>
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 65b0cbd29a..2237fef9eb 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
@@ -2459,7 +2459,6 @@ final class Source[Out, Mat](delegate: 
scaladsl.Source[Out, Mat]) extends Graph[
    * '''Cancels when''' downstream cancels
    */
   @deprecated("Use `statefulMap` with `mapConcat` instead.", "1.0.2")
-  @Deprecated
   def statefulMapConcat[T](f: function.Creator[function.Function[Out, 
java.lang.Iterable[T]]]): javadsl.Source[T, Mat] =
     new Source(delegate.statefulMapConcat { () =>
       val fun = f.create()
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 b9c7d089ab..1b6309ff83 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
@@ -274,7 +274,6 @@ class SubFlow[In, Out, Mat](
    * '''Cancels when''' downstream cancels
    */
   @deprecated("Use `statefulMap` with `mapConcat` instead.", "1.0.2")
-  @Deprecated
   def statefulMapConcat[T](f: function.Creator[function.Function[Out, 
java.lang.Iterable[T]]]): SubFlow[In, T, Mat] =
     new SubFlow(delegate.statefulMapConcat { () =>
       val fun = f.create()
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 0de91a896a..6104422b66 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
@@ -265,7 +265,6 @@ class SubSource[Out, Mat](
    * '''Cancels when''' downstream cancels
    */
   @deprecated("Use `statefulMap` with `mapConcat` instead.", "1.0.2")
-  @Deprecated
   def statefulMapConcat[T](f: function.Creator[function.Function[Out, 
java.lang.Iterable[T]]]): SubSource[T, Mat] =
     new SubSource(delegate.statefulMapConcat { () =>
       val fun = f.create()


---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to