Moves implementation to internal package #26156

akka · Mar 7, 2019 · c4ea439 · c4ea439
1 parent 4bf1ba0
commit c4ea439
Show file tree

Hide file tree

Showing 9 changed files with 17 additions and 10 deletions.
diff --git a/akka-actor/src/main/mima-filters/2.5.1.backwards.excludes b/akka-actor/src/main/mima-filters/2.5.1.backwards.excludes
@@ -13,7 +13,7 @@ ProblemFilters.exclude[DirectMissingMethodProblem]("akka.pattern.BackoffOptionsI
 ProblemFilters.exclude[DirectMissingMethodProblem]("akka.pattern.BackoffOptionsImpl.this")
 ProblemFilters.exclude[MissingTypesProblem]("akka.pattern.BackoffOptionsImpl$")
 ProblemFilters.exclude[DirectMissingMethodProblem]("akka.pattern.BackoffOptionsImpl.apply")
-ProblemFilters.exclude[DirectMissingMethodProblem]("akka.pattern.BackoffOnRestartSupervisor.this")
+ProblemFilters.exclude[DirectMissingMethodProblem]("akka.pattern.internal.BackoffOnRestartSupervisor.this")
 ProblemFilters.exclude[ReversedMissingMethodProblem]("akka.pattern.HandleBackoff.replyWhileStopped")
 ProblemFilters.exclude[ReversedMissingMethodProblem]("akka.pattern.BackoffOptions.withReplyWhileStopped")
 
diff --git a/akka-actor/src/main/mima-filters/2.5.18.backwards.excludes b/akka-actor/src/main/mima-filters/2.5.18.backwards.excludes
@@ -65,7 +65,7 @@ ProblemFilters.exclude[DirectMissingMethodProblem]("akka.pattern.BackoffOptionsI
 ProblemFilters.exclude[DirectMissingMethodProblem]("akka.pattern.BackoffOptionsImpl.this")
 ProblemFilters.exclude[MissingTypesProblem]("akka.pattern.BackoffOptionsImpl$")
 # private
-ProblemFilters.exclude[DirectMissingMethodProblem]("akka.pattern.BackoffOnRestartSupervisor.this")
+ProblemFilters.exclude[DirectMissingMethodProblem]("akka.pattern.internal.BackoffOnRestartSupervisor.this")
 # DoNotInherit (should have been) new method
 ProblemFilters.exclude[ReversedMissingMethodProblem]("akka.pattern.BackoffOptions.withFinalStopMessage")
 # private[akka]

diff --git a/akka-actor/src/main/mima-filters/2.5.21.backwards.excludes b/akka-actor/src/main/mima-filters/2.5.21.backwards.excludes
@@ -6,9 +6,10 @@ ProblemFilters.exclude[DirectMissingMethodProblem]("akka.util.ccompat.package.fr
 ProblemFilters.exclude[ReversedMissingMethodProblem]("akka.annotation.ApiMayChange.issue")
 
 # Simplify backoff supervision API #19016
-ProblemFilters.exclude[DirectMissingMethodProblem]("akka.pattern.BackoffOnRestartSupervisor.replyWhileStopped")
-ProblemFilters.exclude[DirectMissingMethodProblem]("akka.pattern.BackoffOnRestartSupervisor.finalStopMessage")
-ProblemFilters.exclude[DirectMissingMethodProblem]("akka.pattern.BackoffOnRestartSupervisor.this")
+ProblemFilters.exclude[MissingClassProblem]("akka.pattern.BackoffOnRestartSupervisor")
+ProblemFilters.exclude[DirectMissingMethodProblem]("akka.pattern.internal.BackoffOnRestartSupervisor.replyWhileStopped")
+ProblemFilters.exclude[DirectMissingMethodProblem]("akka.pattern.internal.BackoffOnRestartSupervisor.finalStopMessage")
+ProblemFilters.exclude[DirectMissingMethodProblem]("akka.pattern.internal.BackoffOnRestartSupervisor.this")
 ProblemFilters.exclude[DirectMissingMethodProblem]("akka.pattern.HandleBackoff.replyWhileStopped")
 ProblemFilters.exclude[DirectMissingMethodProblem]("akka.pattern.HandleBackoff.finalStopMessage")
-ProblemFilters.exclude[ReversedMissingMethodProblem]("akka.pattern.HandleBackoff.handleMessageToChild")
+ProblemFilters.exclude[ReversedMissingMethodProblem]("akka.pattern.HandleBackoff.handleMessageToChild")
diff --git a/akka-actor/src/main/scala/akka/pattern/Backoff.scala b/akka-actor/src/main/scala/akka/pattern/Backoff.scala
@@ -6,6 +6,7 @@ package akka.pattern
 
 import akka.actor.{ OneForOneStrategy, Props, SupervisorStrategy }
 import akka.annotation.DoNotInherit
+import akka.pattern.internal.{ BackoffOnRestartSupervisor, BackoffOnStopSupervisor }
 import akka.util.JavaDurationConverters._
 
 import scala.concurrent.duration.{ Duration, FiniteDuration }

diff --git a/akka-actor/src/main/scala/akka/pattern/BackoffOptions.scala b/akka-actor/src/main/scala/akka/pattern/BackoffOptions.scala
@@ -6,6 +6,7 @@ package akka.pattern
 
 import akka.actor.{ OneForOneStrategy, Props, SupervisorStrategy }
 import akka.annotation.DoNotInherit
+import akka.pattern.internal.{ BackoffOnRestartSupervisor, BackoffOnStopSupervisor }
 import akka.util.JavaDurationConverters._
 
 import scala.concurrent.duration.{ Duration, FiniteDuration }

diff --git a/akka-actor/src/main/scala/akka/pattern/BackoffSupervisor.scala b/akka-actor/src/main/scala/akka/pattern/BackoffSupervisor.scala
@@ -8,6 +8,7 @@ import java.util.Optional
 import java.util.concurrent.ThreadLocalRandom
 
 import akka.actor.{ ActorRef, DeadLetterSuppression, OneForOneStrategy, Props, SupervisorStrategy }
+import akka.pattern.internal.BackoffOnStopSupervisor
 import akka.util.JavaDurationConverters._
 
 import scala.concurrent.duration.{ Duration, FiniteDuration }

diff --git a/akka-actor/src/main/scala/akka/pattern/HandleBackoff.scala b/akka-actor/src/main/scala/akka/pattern/HandleBackoff.scala
@@ -6,6 +6,7 @@ package akka.pattern
 
 import akka.actor.{ Actor, ActorRef, Props }
 import akka.annotation.InternalApi
+import akka.pattern.internal.{ BackoffOnRestartSupervisor, BackoffOnStopSupervisor }
 
 /**
  * INTERNAL API

diff --git a/.../pattern/BackoffOnRestartSupervisor.scala → ...internal/BackoffOnRestartSupervisor.scala b/.../pattern/BackoffOnRestartSupervisor.scala → ...internal/BackoffOnRestartSupervisor.scala
@@ -2,11 +2,12 @@
  * Copyright (C) 2015-2019 Lightbend Inc. <https://www.lightbend.com>
  */
 
-package akka.pattern
+package akka.pattern.internal
 
 import akka.actor.SupervisorStrategy._
 import akka.actor.{ OneForOneStrategy, _ }
 import akka.annotation.InternalApi
+import akka.pattern.{ BackoffReset, BackoffSupervisor, HandleBackoff }
 
 import scala.concurrent.duration._
 
@@ -17,7 +18,7 @@ import scala.concurrent.duration._
  * This back-off supervisor is created by using ``akka.pattern.BackoffSupervisor.props``
  * with ``akka.pattern.BackoffOpts.onFailure``.
  */
-@InternalApi private class BackoffOnRestartSupervisor(
+@InternalApi private[pattern] class BackoffOnRestartSupervisor(
   val childProps:    Props,
   val childName:     String,
   minBackoff:        FiniteDuration,

diff --git a/...kka/pattern/BackoffOnStopSupervisor.scala → ...rn/internal/BackoffOnStopSupervisor.scala b/...kka/pattern/BackoffOnStopSupervisor.scala → ...rn/internal/BackoffOnStopSupervisor.scala
@@ -2,11 +2,12 @@
  * Copyright (C) 2018-2019 Lightbend Inc. <https://www.lightbend.com>
  */
 
-package akka.pattern
+package akka.pattern.internal
 
 import akka.actor.SupervisorStrategy.{ Directive, Escalate }
 import akka.actor.{ Actor, ActorLogging, OneForOneStrategy, Props, SupervisorStrategy, Terminated }
 import akka.annotation.InternalApi
+import akka.pattern.{ BackoffReset, BackoffSupervisor, HandleBackoff }
 
 import scala.concurrent.duration.FiniteDuration
 
@@ -17,7 +18,7 @@ import scala.concurrent.duration.FiniteDuration
  * This back-off supervisor is created by using `akka.pattern.BackoffSupervisor.props`
  * with `BackoffOpts.onStop`.
  */
-@InternalApi private[akka] class BackoffOnStopSupervisor(
+@InternalApi private[pattern] class BackoffOnStopSupervisor(
   val childProps:    Props,
   val childName:     String,
   minBackoff:        FiniteDuration,