From f4b6e308103517c0b5ec019b66b83faef4762ee7 Mon Sep 17 00:00:00 2001 From: Nicolas Vollmar Date: Wed, 6 Mar 2019 14:14:44 +0100 Subject: [PATCH] Small fixes/improvements #26156 --- .../src/main/mima-filters/2.5.21.backwards.excludes | 8 ++++++++ .../src/main/mima-filters/2.5.22.backwards.excludes | 7 ------- akka-actor/src/main/scala/akka/pattern/Backoff.scala | 2 +- akka-docs/src/main/paradox/cluster-sharding.md | 2 +- 4 files changed, 10 insertions(+), 9 deletions(-) delete mode 100644 akka-actor/src/main/mima-filters/2.5.22.backwards.excludes 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 ed4a04254e..71fbb8f8da 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 @@ -4,3 +4,11 @@ ProblemFilters.exclude[DirectMissingMethodProblem]("akka.pattern.AskableActorRef ProblemFilters.exclude[DirectMissingMethodProblem]("akka.util.ccompat.package.fromCanBuildFrom") # Add optional field to ApiMayChange annotation #26409 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[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 diff --git a/akka-actor/src/main/mima-filters/2.5.22.backwards.excludes b/akka-actor/src/main/mima-filters/2.5.22.backwards.excludes deleted file mode 100644 index d0b5506993..0000000000 --- a/akka-actor/src/main/mima-filters/2.5.22.backwards.excludes +++ /dev/null @@ -1,7 +0,0 @@ -# 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[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 diff --git a/akka-actor/src/main/scala/akka/pattern/Backoff.scala b/akka-actor/src/main/scala/akka/pattern/Backoff.scala index a127760571..bfcbe61a61 100644 --- a/akka-actor/src/main/scala/akka/pattern/Backoff.scala +++ b/akka-actor/src/main/scala/akka/pattern/Backoff.scala @@ -517,7 +517,7 @@ object Backoff { */ @DoNotInherit @Deprecated -@deprecated("Use new API from BackoffOptions object instead", since = "2.5.20") +@deprecated("Use new API from BackoffOptions object instead", since = "2.5.22") trait BackoffOptions { /** diff --git a/akka-docs/src/main/paradox/cluster-sharding.md b/akka-docs/src/main/paradox/cluster-sharding.md index 239e7e4fd8..bc34ceaff5 100644 --- a/akka-docs/src/main/paradox/cluster-sharding.md +++ b/akka-docs/src/main/paradox/cluster-sharding.md @@ -413,7 +413,7 @@ Java Note that stopped entities will be started again when a new message is targeted to the entity. -If 'on stop' backoff supervision strategy is used, a final termination message must be set and used for passivation, see #ref:[Supervision](general/supervision.md#Sharding) +If 'on stop' backoff supervision strategy is used, a final termination message must be set and used for passivation, see @ref:[Supervision](general/supervision.md#Sharding) ## Graceful Shutdown