binary compatibility

Author: Roiocam

akka-actor-typed/src/main/mima-filters/2.9.6.backwards.excludes/issue-32465.excludes

@@ -0,0 +1,4 @@
+# Change the return type of `Behaviors.supervise` to support flattened supervision
+ProblemFilters.exclude[IncompatibleResultTypeProblem]("akka.actor.typed.javadsl.Behaviors#Supervise.onFailure")
+ProblemFilters.exclude[IncompatibleResultTypeProblem]("akka.actor.typed.scaladsl.Behaviors#Supervise.onFailure")
+ProblemFilters.exclude[IncompatibleResultTypeProblem]("akka.actor.typed.scaladsl.Behaviors#Supervise.onFailure$extension")

akka-actor-typed/src/main/scala/akka/actor/typed/Behavior.scala

@@ -7,6 +7,7 @@ package akka.actor.typed
 import scala.annotation.switch
 import scala.annotation.tailrec
 import scala.reflect.ClassTag
+
 import akka.actor.InvalidMessageException
 import akka.actor.typed.internal.BehaviorImpl
 import akka.actor.typed.internal.BehaviorImpl.DeferredBehavior
@@ -130,24 +131,12 @@ class SuperviseBehavior[T] private[akka] (val wrapped: Behavior[T])
   }
 
   /**
-   * Java API:
    * Specify the [[SupervisorStrategy]] to be invoked when the wrapped behavior throws.
    *
    * Only exceptions of the given type (and their subclasses) will be handled by this supervision behavior.
    */
-  def onFailure[Thr <: Throwable](clazz: Class[Thr], strategy: SupervisorStrategy): SuperviseBehavior[T] = {
+  def onFailure[Thr <: Throwable](clazz: Class[Thr], strategy: SupervisorStrategy): SuperviseBehavior[T] =
     onFailure(strategy)(ClassTag(clazz))
-  }
-
-  /**
-   * Java API:
-   * Specify the [[SupervisorStrategy]] to be invoked when the wrapped behavior throws.
-   *
-   * Only exceptions of the given type (and their subclasses) will be handled by this supervision behavior.
-   */
-  def onAnyFailure[Thr <: Throwable](strategy: SupervisorStrategy): SuperviseBehavior[T] = {
-    onFailure(classOf[Exception], strategy)
-  }
 
   private[akka] def unwrap: Behavior[T] = wrapped
 }

akka-actor-typed/src/main/scala/akka/actor/typed/javadsl/Behaviors.scala

@@ -247,15 +247,23 @@ object Behaviors {
   def supervise[T](wrapped: Behavior[T]): Supervise[T] =
     new Supervise[T](wrapped)
 
-  final class Supervise[T] private[akka] (wrapped: Behavior[T]) extends SuperviseBehavior(wrapped) {
+  final class Supervise[T] private[akka] (wrapped: Behavior[T]) {
+
+    /**
+     * Specify the [[SupervisorStrategy]] to be invoked when the wrapped behavior throws.
+     *
+     * Only exceptions of the given type (and their subclasses) will be handled by this supervision behavior.
+     */
+    def onFailure[Thr <: Throwable](clazz: Class[Thr], strategy: SupervisorStrategy): SuperviseBehavior[T] =
+      new SuperviseBehavior[T](wrapped).onFailure(clazz, strategy)
 
     /**
      * Specify the [[SupervisorStrategy]] to be invoked when the wrapped behavior throws.
      *
      * All non-fatal (see [[scala.util.control.NonFatal]]) exceptions types will be handled using the given strategy.
      */
     def onFailure(strategy: SupervisorStrategy): Behavior[T] =
-      onFailure(classOf[Exception], strategy)
+      new SuperviseBehavior[T](wrapped).onFailure(strategy)
   }
 
   /**

akka-actor-typed/src/main/scala/akka/actor/typed/scaladsl/Behaviors.scala

@@ -6,7 +6,6 @@ package akka.actor.typed
 package scaladsl
 
 import scala.reflect.ClassTag
-
 import akka.actor.typed.internal._
 import akka.annotation.{ DoNotInherit, InternalApi }
 
@@ -218,7 +217,13 @@ object Behaviors {
   def supervise[T](wrapped: Behavior[T]): Supervise[T] =
     new Supervise[T](wrapped)
 
-  final class Supervise[T] private[akka] (wrapped: Behavior[T]) extends SuperviseBehavior(wrapped)
+  final class Supervise[T] private[akka] (val wrapped: Behavior[T]) extends AnyVal {
+
+    /** Specify the [[SupervisorStrategy]] to be invoked when the wrapped behavior throws. */
+    def onFailure[Thr <: Throwable](strategy: SupervisorStrategy)(implicit tag: ClassTag[Thr]): SuperviseBehavior[T] = {
+      new SuperviseBehavior[T](wrapped).onFailure(strategy)(tag)
+    }
+  }
 
   /**
    * Support for scheduled `self` messages in an actor.