MiMa and keep compatibility by extending StreamTimeoutException

akka · Aug 17, 2023 · 9d40492 · 9d40492
1 parent 159717b
commit 9d40492
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 5 deletions.
diff --git a/akka-stream/src/main/mima-filters/2.8.4.backwards.excludes/tcp-idle-timeout.excludes b/akka-stream/src/main/mima-filters/2.8.4.backwards.excludes/tcp-idle-timeout.excludes
@@ -0,0 +1,2 @@
+# Internal API changed
+ProblemFilters.exclude[DirectMissingMethodProblem]("akka.stream.impl.Timers#IdleTimeoutBidi.this")
diff --git a/akka-stream/src/main/scala/akka/stream/StreamTimeoutException.scala b/akka-stream/src/main/scala/akka/stream/StreamTimeoutException.scala
@@ -15,7 +15,7 @@ import akka.annotation.DoNotInherit
  * Not for user extension
  */
 @DoNotInherit
-sealed class StreamTimeoutException(msg: String) extends TimeoutException(msg) with NoStackTrace
+class StreamTimeoutException(msg: String) extends TimeoutException(msg) with NoStackTrace
 
 final class InitialTimeoutException(msg: String) extends StreamTimeoutException(msg)
 

diff --git a/akka-stream/src/main/scala/akka/stream/impl/Timers.scala b/akka-stream/src/main/scala/akka/stream/impl/Timers.scala
@@ -151,10 +151,13 @@ import akka.stream.stage._
 
   }
 
+  private object IdleTimeoutBidi {
+    val defaultCreateFailure: FiniteDuration => Throwable = timeout =>
+      new StreamIdleTimeoutException(s"No elements passed in the last ${timeout.toCoarsest}.")
+  }
   final class IdleTimeoutBidi[I, O](
       val timeout: FiniteDuration,
-      createFailure: FiniteDuration => Throwable = timeout =>
-        new StreamIdleTimeoutException(s"No elements passed in the last ${timeout.toCoarsest}."))
+      createFailure: FiniteDuration => Throwable = IdleTimeoutBidi.defaultCreateFailure)
       extends GraphStage[BidiShape[I, I, O, O]] {
     val in1 = Inlet[I]("in1")
     val in2 = Inlet[O]("in2")

diff --git a/akka-stream/src/main/scala/akka/stream/scaladsl/Tcp.scala b/akka-stream/src/main/scala/akka/stream/scaladsl/Tcp.scala
@@ -5,7 +5,6 @@
 package akka.stream.scaladsl
 
 import java.net.InetSocketAddress
-import java.util.concurrent.TimeoutException
 import javax.net.ssl.SSLContext
 import javax.net.ssl.SSLEngine
 import javax.net.ssl.SSLSession
@@ -508,7 +507,7 @@ final class Tcp(system: ExtendedActorSystem) extends akka.actor.Extension {
 }
 
 final class TcpIdleTimeoutException(msg: String, @unused timeout: Duration)
-    extends TimeoutException(msg: String)
+    extends StreamTimeoutException(msg: String)
     with NoStackTrace // only used from a single stage
 
 object TcpAttributes {