This is an automated email from the ASF dual-hosted git repository. He-Pin pushed a commit to branch fix/remove-stale-akka-todo-fixme in repository https://gitbox.apache.org/repos/asf/pekko.git
commit 3bae4c6cd176b7b0b81b11cf84e550f29eb7023e Author: 虎鸣 <[email protected]> AuthorDate: Sun Jul 26 01:01:34 2026 +0800 fix: remove stale Akka-era FIXME/TODO comments in dispatch module Motivation: Issue #2168 requests removal of stale FIXME/TODO comments. The dispatch module contained three comments referencing Akka 2.3/2.4 migration periods that are long over. Modification: - Remove the BalancingDispatcher shortcut case in Dispatchers that threw a deprecation migration error (FIXME remove in Akka 2.4). Users can still use BalancingDispatcherConfigurator via full class name. - Remove the mailbox-size warning in Mailboxes (TODO remove in Akka 2.3) along with its associated state variable. - Remove the stale TODO comment on unbounded/bounded mailbox shortcuts which are still actively used in reference.conf. Result: Cleaner codebase without misleading stale migration comments. No behavioral change for supported configurations. Tests: - sbt "actor-tests/Test/testOnly org.apache.pekko.actor.dispatch.DispatchersSpec" - sbt "actor-tests/Test/testOnly org.apache.pekko.actor.dispatch.BalancingDispatcherSpec org.apache.pekko.actor.ActorMailboxSpec" - All 56 tests passed. References: Refs #2168 --- .../main/scala/org/apache/pekko/dispatch/Dispatchers.scala | 8 +------- .../src/main/scala/org/apache/pekko/dispatch/Mailboxes.scala | 12 ------------ 2 files changed, 1 insertion(+), 19 deletions(-) diff --git a/actor/src/main/scala/org/apache/pekko/dispatch/Dispatchers.scala b/actor/src/main/scala/org/apache/pekko/dispatch/Dispatchers.scala index 55aea4ae97..4c43a2f12b 100644 --- a/actor/src/main/scala/org/apache/pekko/dispatch/Dispatchers.scala +++ b/actor/src/main/scala/org/apache/pekko/dispatch/Dispatchers.scala @@ -266,13 +266,7 @@ class Dispatchers @InternalApi private[pekko] ( cfg.renderWithRedactions()) cfg.getString("type") match { - case "Dispatcher" => new DispatcherConfigurator(cfg, prerequisites) - case "BalancingDispatcher" => - // FIXME remove this case in Akka 2.4 - throw new IllegalArgumentException( - "BalancingDispatcher is deprecated, use a BalancingPool instead. " + - "During a migration period you can still use BalancingDispatcher by specifying the full class name: " + - classOf[BalancingDispatcherConfigurator].getName) + case "Dispatcher" => new DispatcherConfigurator(cfg, prerequisites) case "PinnedDispatcher" => new PinnedDispatcherConfigurator(cfg, prerequisites) case fqn => val args = List(classOf[Config] -> cfg, classOf[DispatcherPrerequisites] -> prerequisites) diff --git a/actor/src/main/scala/org/apache/pekko/dispatch/Mailboxes.scala b/actor/src/main/scala/org/apache/pekko/dispatch/Mailboxes.scala index f255eb832d..75950fa81c 100644 --- a/actor/src/main/scala/org/apache/pekko/dispatch/Mailboxes.scala +++ b/actor/src/main/scala/org/apache/pekko/dispatch/Mailboxes.scala @@ -127,7 +127,6 @@ private[pekko] class Mailboxes( } // don’t care if this happens twice - private var mailboxSizeWarningIssued = false private var mailboxNonZeroPushTimeoutWarningIssued = false def getMailboxRequirement(config: Config) = config.getString("mailbox-requirement") match { @@ -169,16 +168,6 @@ private[pekko] class Mailboxes( dispatcherConfig.hasPath("mailbox-type") && dispatcherConfig.getString("mailbox-type") != Deploy.NoMailboxGiven - // TODO remove in Akka 2.3 - if (!hasMailboxType && !mailboxSizeWarningIssued && dispatcherConfig.hasPath("mailbox-size")) { - eventStream.publish( - Warning( - "mailboxes", - getClass, - s"ignoring setting 'mailbox-size' for dispatcher [$id], you need to specify 'mailbox-type=bounded'")) - mailboxSizeWarningIssued = true - } - def verifyRequirements(mailboxType: MailboxType): MailboxType = { lazy val mqType: Class[?] = getProducedMessageQueueType(mailboxType) if (hasMailboxRequirement && !mailboxRequirement.isAssignableFrom(mqType)) @@ -227,7 +216,6 @@ private[pekko] class Mailboxes( case null => // It doesn't matter if we create a mailbox type configurator that isn't used due to concurrent lookup. val newConfigurator = id match { - // TODO RK remove these two for Akka 2.3 case "unbounded" => UnboundedMailbox() case "bounded" => new BoundedMailbox(settings, config(id)) case _ if id.startsWith(BoundedCapacityPrefix) => --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
