From 35207d55aa95f49603b78c5730ec7b930e9db6ff Mon Sep 17 00:00:00 2001 From: Nicolas Vollmar Date: Thu, 7 Mar 2019 12:21:25 +0100 Subject: [PATCH] Moves implementation to internal package #26156 --- .../src/main/mima-filters/2.5.21.backwards.excludes | 9 +++++---- akka-actor/src/main/scala/akka/pattern/Backoff.scala | 1 + .../src/main/scala/akka/pattern/BackoffOptions.scala | 1 + .../src/main/scala/akka/pattern/BackoffSupervisor.scala | 1 + .../src/main/scala/akka/pattern/HandleBackoff.scala | 1 + .../{ => internal}/BackoffOnRestartSupervisor.scala | 5 +++-- .../pattern/{ => internal}/BackoffOnStopSupervisor.scala | 5 +++-- 7 files changed, 15 insertions(+), 8 deletions(-) rename akka-actor/src/main/scala/akka/pattern/{ => internal}/BackoffOnRestartSupervisor.scala (95%) rename akka-actor/src/main/scala/akka/pattern/{ => internal}/BackoffOnStopSupervisor.scala (94%) 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 index 71fbb8f8da..77d2cc2cae 100644 --- 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") \ No newline at end of file +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 index 938995518c..0531bc72a5 100644 --- 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 index 03f79517eb..f71f07e526 100644 --- 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 index 08ccaafc00..e691c1a055 100644 --- 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 index d34b915760..82e414a92b 100644 --- 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/akka-actor/src/main/scala/akka/pattern/BackoffOnRestartSupervisor.scala b/akka-actor/src/main/scala/akka/pattern/internal/BackoffOnRestartSupervisor.scala similarity index 95% rename from akka-actor/src/main/scala/akka/pattern/BackoffOnRestartSupervisor.scala rename to akka-actor/src/main/scala/akka/pattern/internal/BackoffOnRestartSupervisor.scala index 87ede87c63..38e455a34a 100644 --- a/akka-actor/src/main/scala/akka/pattern/BackoffOnRestartSupervisor.scala +++ b/akka-actor/src/main/scala/akka/pattern/internal/BackoffOnRestartSupervisor.scala @@ -2,11 +2,12 @@ * Copyright (C) 2015-2019 Lightbend Inc. */ -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/akka-actor/src/main/scala/akka/pattern/BackoffOnStopSupervisor.scala b/akka-actor/src/main/scala/akka/pattern/internal/BackoffOnStopSupervisor.scala similarity index 94% rename from akka-actor/src/main/scala/akka/pattern/BackoffOnStopSupervisor.scala rename to akka-actor/src/main/scala/akka/pattern/internal/BackoffOnStopSupervisor.scala index 666d2a8293..10cbaceed3 100644 --- a/akka-actor/src/main/scala/akka/pattern/BackoffOnStopSupervisor.scala +++ b/akka-actor/src/main/scala/akka/pattern/internal/BackoffOnStopSupervisor.scala @@ -2,11 +2,12 @@ * Copyright (C) 2018-2019 Lightbend Inc. */ -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,