Deprecation removal hunt (#27250)

akka-actor/src/main/mima-filters/2.5.x.backwards.excludes

@@ -72,3 +72,11 @@ ProblemFilters.exclude[FinalMethodProblem]("akka.actor.TimerScheduler.startSingl
 # only in current version
 ProblemFilters.exclude[ReversedMissingMethodProblem]("akka.actor.TimerScheduler.startTimerAtFixedRate")
 ProblemFilters.exclude[ReversedMissingMethodProblem]("akka.actor.TimerScheduler.startTimerWithFixedDelay")
+
+# Remove deprecated features
+ProblemFilters.exclude[DirectMissingMethodProblem]("akka.actor.AbstractActor#ActorContext.getChild")
+ProblemFilters.exclude[DirectMissingMethodProblem]("akka.actor.ActorIdentity.getRef")
+ProblemFilters.exclude[IncompatibleMethTypeProblem]("akka.pattern.CircuitBreaker.onClose")
+ProblemFilters.exclude[IncompatibleMethTypeProblem]("akka.pattern.CircuitBreaker.onOpen")
+ProblemFilters.exclude[IncompatibleMethTypeProblem]("akka.pattern.CircuitBreaker.onHalfOpen")
+

akka-actor/src/main/scala/akka/actor/AbstractActor.scala

@@ -85,13 +85,6 @@ object AbstractActor {
      */
     def getChildren(): java.lang.Iterable[ActorRef]
 
-    /**
-     * Returns a reference to the named child or null if no child with
-     * that name exists.
-     */
-    @deprecated("Use findChild instead", "2.5.0")
-    def getChild(name: String): ActorRef
-
     /**
      * Returns a reference to the named child if it exists.
      *

akka-actor/src/main/scala/akka/actor/Actor.scala

@@ -84,13 +84,6 @@ final case class ActorIdentity(correlationId: Any, ref: Option[ActorRef]) {
       "this could happen when serializing with Scala 2.12 and deserializing with Scala 2.11 which is not supported.")
   }
 
-  /**
-   * Java API: `ActorRef` of the actor replying to the request or
-   * null if no actor matched the request.
-   */
-  @deprecated("Use getActorRef instead", "2.5.0")
-  def getRef: ActorRef = ref.orNull
-
   /**
    * Java API: `ActorRef` of the actor replying to the request or
    * not defined if no actor matched the request.

akka-actor/src/main/scala/akka/actor/ActorRef.scala

@@ -259,6 +259,7 @@ private[akka] abstract class InternalActorRef extends ActorRef with ScalaActorRe
    * INTERNAL API: Returns “true” if the actor is locally known to be terminated, “false” if
    * alive or uncertain.
    */
+  @InternalApi
   private[akka] def isTerminated: Boolean
 }
 
@@ -462,7 +463,7 @@ private[akka] trait MinimalActorRef extends InternalActorRef with LocalRef {
   override def suspend(): Unit = ()
   override def resume(causedByFailure: Throwable): Unit = ()
   override def stop(): Unit = ()
-  @deprecated("Use context.watch(actor) and receive Terminated(actor)", "2.2")
+
   override private[akka] def isTerminated = false
 
   override def !(message: Any)(implicit sender: ActorRef = Actor.noSender): Unit = ()
@@ -554,7 +555,6 @@ private[akka] class EmptyLocalActorRef(
     val eventStream: EventStream)
     extends MinimalActorRef {
 
-  @deprecated("Use context.watch(actor) and receive Terminated(actor)", "2.2")
   override private[akka] def isTerminated = true
 
   override def sendSystemMessage(message: SystemMessage): Unit = {
@@ -775,7 +775,11 @@ private[akka] final class FunctionRef(
   private[this] var watching = ActorCell.emptyActorRefSet
   private[this] var _watchedBy: OptionVal[Set[ActorRef]] = OptionVal.Some(ActorCell.emptyActorRefSet)
 
-  override def isTerminated: Boolean = _watchedBy.isEmpty
+  /**
+   * INTERNAL API
+   */
+  @InternalApi
+  override private[akka] def isTerminated: Boolean = _watchedBy.isEmpty
 
   //noinspection EmptyCheck
   protected def sendTerminated(): Unit = {

akka-actor/src/main/scala/akka/actor/ActorRefProvider.scala

@@ -416,7 +416,10 @@ private[akka] class LocalActorRefProvider private[akka] (
       terminationPromise.completeWith(causeOfTermination.future) // Signal termination downstream, idempotent
     }
 
-    @deprecated("Use context.watch(actor) and receive Terminated(actor)", "2.2")
+    /**
+     * INTERNAL API
+     */
+    @InternalApi
     override private[akka] def isTerminated: Boolean = !isWalking
 
     override def !(message: Any)(implicit sender: ActorRef = Actor.noSender): Unit =

akka-actor/src/main/scala/akka/pattern/AskSupport.scala

@@ -603,7 +603,6 @@ private[akka] final class PromiseActorRef private (
     case _ =>
   }
 
-  @deprecated("Use context.watch(actor) and receive Terminated(actor)", "2.2")
   override private[akka] def isTerminated: Boolean = state match {
     case Stopped | _: StoppedWithPath => true
     case _                            => false

akka-actor/src/main/scala/akka/pattern/CircuitBreaker.scala

@@ -434,15 +434,6 @@ class CircuitBreaker(
    */
   def onOpen(callback: => Unit): CircuitBreaker = addOnOpenListener(new Runnable { def run = callback })
 
-  /**
-   * Java API for onOpen
-   *
-   * @param callback Handler to be invoked on state change
-   * @return CircuitBreaker for fluent usage
-   */
-  @deprecated("Use addOnOpenListener instead", "2.5.0")
-  def onOpen(callback: Runnable): CircuitBreaker = addOnOpenListener(callback)
-
   /**
    * Java API for onOpen
    *
@@ -463,15 +454,6 @@ class CircuitBreaker(
    */
   def onHalfOpen(callback: => Unit): CircuitBreaker = addOnHalfOpenListener(new Runnable { def run = callback })
 
-  /**
-   * JavaAPI for onHalfOpen
-   *
-   * @param callback Handler to be invoked on state change
-   * @return CircuitBreaker for fluent usage
-   */
-  @deprecated("Use addOnHalfOpenListener instead", "2.5.0")
-  def onHalfOpen(callback: Runnable): CircuitBreaker = addOnHalfOpenListener(callback)
-
   /**
    * JavaAPI for onHalfOpen
    *
@@ -493,15 +475,6 @@ class CircuitBreaker(
    */
   def onClose(callback: => Unit): CircuitBreaker = addOnCloseListener(new Runnable { def run = callback })
 
-  /**
-   * JavaAPI for onClose
-   *
-   * @param callback Handler to be invoked on state change
-   * @return CircuitBreaker for fluent usage
-   */
-  @deprecated("Use addOnCloseListener instead", "2.5.0")
-  def onClose(callback: Runnable): CircuitBreaker = addOnCloseListener(callback)
-
   /**
    * JavaAPI for onClose
    *

akka-docs/src/main/paradox/project/migration-guide-2.5.x-2.6.x.md

@@ -68,6 +68,11 @@ Use @apidoc[AbstractPersistentActorWithAtLeastOnceDelivery] instead.
 * `Logging.getLogger(UntypedActor)` Untyped actor has been removed, use AbstractActor instead.
 * `LoggingReceive.create(Receive, ActorContext)` use `AbstractActor.Receive` instead.
 * `ActorMaterialzierSettings.withAutoFusing` disabling fusing is no longer possible.
+* `AbstractActor.getChild` use `findChild` instead.
+* `Actor.getRef` use `Actor.getActorRef` instead.
+* `CircuitBreaker.onOpen` use `CircuitBreaker.addOnOpenListener`
+* `CircuitBreaker.onHalfOpen` use `CircuitBreaker.addOnHalfOpenListener`
+* `CircuitBreaker.onClose` use `CircuitBreaker.addOnCloseListener`
 
 ### JavaTestKit removed