You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pekko.apache.org by he...@apache.org on 2026/07/13 17:45:02 UTC
(pekko) branch refactor/replace-sort-imports-with-organize-imports created (now ba97a4b0d7)
This is an automated email from the ASF dual-hosted git repository.
He-Pin pushed a change to branch refactor/replace-sort-imports-with-organize-imports
in repository https://gitbox.apache.org/repos/asf/pekko.git
at ba97a4b0d7 refactor: replace sort-imports plugin with scalafix OrganizeImports
This branch includes the following new commits:
new ba97a4b0d7 refactor: replace sort-imports plugin with scalafix OrganizeImports
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@pekko.apache.org
For additional commands, e-mail: commits-help@pekko.apache.org
(pekko) 01/01: refactor: replace sort-imports plugin with scalafix OrganizeImports
Posted by he...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
He-Pin pushed a commit to branch refactor/replace-sort-imports-with-organize-imports
in repository https://gitbox.apache.org/repos/asf/pekko.git
commit ba97a4b0d78d2af68cbb62606c5652dbe0023148
Author: 虎鸣 <he...@alibaba-inc.com>
AuthorDate: Tue Jul 14 01:44:37 2026 +0800
refactor: replace sort-imports plugin with scalafix OrganizeImports
Motivation:
The com.nequissimus:sort-imports:0.6.1 plugin has not been updated since
December 2021 and is effectively unmaintained. Scalafix's built-in
OrganizeImports rule (available since 0.11.0) is more powerful, actively
maintained, and requires no external dependency.
Modification:
- Replace SortImports rule with OrganizeImports in .scalafix.conf,
configured with 10 import groups matching Pekko's existing style
(java/javax, scala, third-party, com.sun, pekko/akka, reactivestreams,
netty, scalatest, slf4j, typesafe)
- Remove SortImports from .scalafmt.conf rewrite.rules to avoid conflict
- Remove com.nequissimus:sort-imports:0.6.1 dependency from
ScalaFixExtraRulesPlugin
- Update sortImports command alias in build.sbt, ScalaFixForJdk21Plugin,
and ScalafixForMultiNodePlugin to use OrganizeImports
- Add -Wunused:imports compiler option for Scala 2.13 and Scala 3 to
support OrganizeImports.removeUnused
- Disable RemoveUnused.imports (conflicts with OrganizeImports) and
enable OrganizeImports.removeUnused instead
- Apply full project import reformatting (main + test sources)
Result:
Import sorting now uses scalafix's built-in OrganizeImports rule with no
external dependency. The sortImports command continues to work as before,
now also removing unused imports automatically.
Tests:
- sbt "Test / compile" passed with Java 21
References:
None - build tooling improvement
---
.scalafix.conf | 40 +++++++++++++---------
.scalafmt.conf | 2 +-
.../actor/testkit/typed/CapturedLogEvent.scala | 5 +--
.../apache/pekko/actor/testkit/typed/Effect.scala | 1 +
.../pekko/actor/testkit/typed/FishingOutcome.scala | 1 +
.../actor/testkit/typed/TestKitSettings.scala | 5 +--
.../testkit/typed/internal/ActorSystemStub.scala | 11 +++---
.../typed/internal/BehaviorTestKitImpl.scala | 1 +
.../testkit/typed/internal/CapturingAppender.scala | 1 +
.../actor/testkit/typed/internal/DebugRef.scala | 1 +
.../typed/internal/EffectfulActorContext.scala | 1 +
.../typed/internal/LoggingTestKitImpl.scala | 5 +--
.../typed/internal/StubbedActorContext.scala | 7 ++--
.../testkit/typed/internal/TestAppender.scala | 5 +--
.../testkit/typed/internal/TestInboxImpl.scala | 1 +
.../testkit/typed/internal/TestKitUtils.scala | 3 +-
.../testkit/typed/internal/TestProbeImpl.scala | 3 +-
.../actor/testkit/typed/javadsl/ActorTestKit.scala | 5 +--
.../testkit/typed/javadsl/BehaviorTestKit.scala | 5 +--
.../actor/testkit/typed/javadsl/Effects.scala | 1 +
.../typed/javadsl/JUnit5TestKitBuilder.scala | 5 +--
.../typed/javadsl/JUnitJupiterTestKitBuilder.scala | 5 +--
.../typed/javadsl/LogCapturingExtension.scala | 2 +-
.../testkit/typed/javadsl/LoggingTestKit.scala | 5 +--
.../actor/testkit/typed/javadsl/ManualTime.scala | 5 +--
.../typed/javadsl/SerializationTestKit.scala | 1 +
.../actor/testkit/typed/javadsl/TestInbox.scala | 1 +
.../typed/javadsl/TestKitJunitResource.scala | 7 ++--
.../actor/testkit/typed/javadsl/TestProbe.scala | 3 +-
.../testkit/typed/scaladsl/ActorTestKit.scala | 11 +++---
.../testkit/typed/scaladsl/ActorTestKitBase.scala | 7 ++--
.../testkit/typed/scaladsl/BehaviorTestKit.scala | 5 +--
.../actor/testkit/typed/scaladsl/Effects.scala | 1 +
.../testkit/typed/scaladsl/LoggingTestKit.scala | 5 +--
.../actor/testkit/typed/scaladsl/ManualTime.scala | 5 +--
.../typed/scaladsl/ScalaTestWithActorTestKit.scala | 7 ++--
.../typed/scaladsl/SerializationTestKit.scala | 1 +
.../actor/testkit/typed/scaladsl/TestInbox.scala | 1 +
.../actor/testkit/typed/scaladsl/TestProbe.scala | 1 +
.../testkit/typed/scaladsl/ActorTestKitSpec.scala | 13 +++----
.../typed/scaladsl/BehaviorTestKitSpec.scala | 11 +++---
.../actor/testkit/typed/scaladsl/GreeterMain.scala | 1 +
.../typed/scaladsl/JUnit5TestKitBuilderSpec.scala | 3 +-
.../scaladsl/JUnitJupiterTestKitBuilderSpec.scala | 3 +-
.../testkit/typed/scaladsl/ManualTimeSpec.scala | 9 ++---
.../org/apache/pekko/util/LineNumberSpec.scala | 1 +
.../actor/ActorConfigurationVerificationSpec.scala | 5 +--
.../apache/pekko/actor/ActorCreationPerfSpec.scala | 7 ++--
.../apache/pekko/actor/ActorLifeCycleSpec.scala | 5 +--
.../org/apache/pekko/actor/ActorMailboxSpec.scala | 7 ++--
.../org/apache/pekko/actor/ActorRefSpec.scala | 1 +
.../apache/pekko/actor/ActorSelectionSpec.scala | 1 +
.../pekko/actor/ActorSystemDispatcherSpec.scala | 5 +--
.../org/apache/pekko/actor/ActorSystemSpec.scala | 9 ++---
.../org/apache/pekko/actor/ActorTimeoutSpec.scala | 3 +-
.../pekko/actor/ActorWithBoundedStashSpec.scala | 9 ++---
.../apache/pekko/actor/ActorWithStashSpec.scala | 5 +--
.../org/apache/pekko/actor/ConsistencySpec.scala | 1 +
.../pekko/actor/CoordinatedShutdownSpec.scala | 7 ++--
.../pekko/actor/DeadLetterSupressionSpec.scala | 1 +
.../pekko/actor/DeadLetterSuspensionSpec.scala | 1 +
.../org/apache/pekko/actor/DeathWatchSpec.scala | 1 +
.../org/apache/pekko/actor/DeployerSpec.scala | 5 +--
.../org/apache/pekko/actor/ExtensionSpec.scala | 5 +--
.../org/apache/pekko/actor/FSMActorSpec.scala | 5 +--
.../org/apache/pekko/actor/FSMTransitionSpec.scala | 1 +
.../org/apache/pekko/actor/ForwardActorSpec.scala | 1 +
.../org/apache/pekko/actor/FunctionRefSpec.scala | 1 +
.../pekko/actor/LocalActorRefProviderSpec.scala | 1 +
.../org/apache/pekko/actor/PropsCreationSpec.scala | 1 +
.../apache/pekko/actor/ProviderSelectionSpec.scala | 5 +--
.../apache/pekko/actor/RestartStrategySpec.scala | 1 +
.../org/apache/pekko/actor/SchedulerSpec.scala | 14 ++++----
.../pekko/actor/SupervisorHierarchySpec.scala | 12 +++----
.../apache/pekko/actor/SupervisorMiscSpec.scala | 3 +-
.../org/apache/pekko/actor/SupervisorSpec.scala | 11 +++---
.../apache/pekko/actor/SupervisorTreeSpec.scala | 1 +
.../org/apache/pekko/actor/Ticket669Spec.scala | 7 ++--
.../org/apache/pekko/actor/UidClashTest.scala | 1 +
.../pekko/actor/dispatch/ActorModelSpec.scala | 13 +++----
.../actor/dispatch/BalancingDispatcherSpec.scala | 1 +
.../pekko/actor/dispatch/DispatcherActorSpec.scala | 3 +-
.../actor/dispatch/DispatcherActorsSpec.scala | 1 +
.../pekko/actor/dispatch/DispatchersSpec.scala | 7 ++--
.../pekko/actor/dispatch/PinnedActorSpec.scala | 5 +--
.../apache/pekko/actor/dungeon/DispatchSpec.scala | 1 +
.../apache/pekko/actor/routing/ListenerSpec.scala | 1 +
.../pekko/actor/setup/ActorSystemSetupSpec.scala | 5 +--
.../scala/org/apache/pekko/config/ConfigSpec.scala | 9 ++---
.../org/apache/pekko/dataflow/Future2Actor.scala | 1 +
.../dispatch/ControlAwareDispatcherSpec.scala | 1 +
.../pekko/dispatch/DispatcherShutdownSpec.scala | 7 ++--
.../pekko/dispatch/ExecutionContextSpec.scala | 7 ++--
.../ForkJoinExecutorConfiguratorSpec.scala | 5 +--
.../dispatch/ForkJoinPoolStarvationSpec.scala | 5 +--
.../apache/pekko/dispatch/MailboxConfigSpec.scala | 7 ++--
.../pekko/dispatch/PriorityDispatcherSpec.scala | 5 +--
.../dispatch/SameThreadExecutionContextSpec.scala | 5 +--
.../dispatch/StablePriorityDispatcherSpec.scala | 5 +--
.../dispatch/sysmsg/SystemMessageListSpec.scala | 1 +
.../event/AddressTerminatedTopicBenchSpec.scala | 1 +
.../event/DeadLetterListenerShutdownSpec.scala | 3 +-
.../org/apache/pekko/event/EventBusSpec.scala | 7 ++--
.../org/apache/pekko/event/EventStreamSpec.scala | 5 +--
.../scala/org/apache/pekko/event/LoggerSpec.scala | 13 +++----
.../apache/pekko/event/LoggingReceiveSpec.scala | 5 +--
.../org/apache/pekko/event/MarkerLoggingSpec.scala | 1 +
.../org/apache/pekko/io/CapacityLimitSpec.scala | 4 +--
.../org/apache/pekko/io/InetSocketOptionSpec.scala | 1 +
.../org/apache/pekko/io/SimpleDnsCacheSpec.scala | 7 ++--
.../org/apache/pekko/io/TcpConnectionSpec.scala | 13 +++----
.../org/apache/pekko/io/TcpIntegrationSpec.scala | 5 +--
.../pekko/io/TcpIntegrationSpecSupport.scala | 4 +--
.../org/apache/pekko/io/TcpListenerSpec.scala | 6 ++--
.../pekko/io/UdpConnectedIntegrationSpec.scala | 1 +
.../org/apache/pekko/io/UdpIntegrationSpec.scala | 1 +
.../UnsynchronizedByteArrayInputStreamSpec.scala | 3 +-
.../io/dns/AsyncDnsResolverIntegrationSpec.scala | 14 ++++----
.../org/apache/pekko/io/dns/DnsSettingsSpec.scala | 5 +--
.../apache/pekko/io/dns/DockerBindDnsService.scala | 9 ++---
.../io/dns/internal/AsyncDnsManagerSpec.scala | 1 +
.../io/dns/internal/AsyncDnsResolverSpec.scala | 5 +--
.../pekko/io/dns/internal/DnsClientSpec.scala | 1 +
.../apache/pekko/io/dns/internal/MessageSpec.scala | 5 +--
.../pekko/io/dns/internal/TcpDnsClientSpec.scala | 1 +
.../scala/org/apache/pekko/pattern/AskSpec.scala | 1 +
.../pattern/BackoffOnRestartSupervisorSpec.scala | 3 +-
.../pekko/pattern/BackoffSupervisorSpec.scala | 5 +--
.../pekko/pattern/CircuitBreakerMTSpec.scala | 2 +-
.../apache/pekko/pattern/CircuitBreakerSpec.scala | 1 +
.../pekko/pattern/CircuitBreakerStressSpec.scala | 1 +
.../org/apache/pekko/pattern/PatternSpec.scala | 3 +-
.../org/apache/pekko/pattern/PipeToSpec.scala | 1 +
.../org/apache/pekko/pattern/PromiseRefSpec.scala | 3 +-
.../scala/org/apache/pekko/pattern/RetrySpec.scala | 3 +-
.../org/apache/pekko/pattern/StatusReplySpec.scala | 7 ++--
.../pekko/pattern/extended/ExplicitAskSpec.scala | 1 +
.../org/apache/pekko/routing/BalancingSpec.scala | 7 ++--
.../org/apache/pekko/routing/BroadcastSpec.scala | 1 +
.../pekko/routing/ConfiguredLocalRoutingSpec.scala | 5 +--
.../routing/ConsistentHashingRouterSpec.scala | 1 +
.../pekko/routing/MetricsBasedResizerSpec.scala | 4 +--
.../org/apache/pekko/routing/RandomSpec.scala | 1 +
.../org/apache/pekko/routing/ResizerSpec.scala | 5 +--
.../org/apache/pekko/routing/RoundRobinSpec.scala | 1 +
.../apache/pekko/routing/RouteeCreationSpec.scala | 1 +
.../org/apache/pekko/routing/RoutingSpec.scala | 5 +--
.../routing/ScatterGatherFirstCompletedSpec.scala | 1 +
.../apache/pekko/routing/SmallestMailboxSpec.scala | 1 +
.../apache/pekko/routing/TailChoppingSpec.scala | 3 +-
.../pekko/serialization/AsyncSerializeSpec.scala | 5 +--
.../DisabledJavaSerializerWarningSpec.scala | 1 +
.../PrimitivesSerializationSpec.scala | 5 +--
.../serialization/SerializationSetupSpec.scala | 9 ++---
.../apache/pekko/serialization/SerializeSpec.scala | 9 ++---
.../testkit/CallingThreadDispatcherModelSpec.scala | 5 +--
.../pekko/util/BoundedBlockingQueueSpec.scala | 7 ++--
.../pekko/util/ByteStringInputStreamSpec.scala | 3 +-
.../org/apache/pekko/util/ByteStringSpec.scala | 9 ++---
.../scala/org/apache/pekko/util/IndexSpec.scala | 5 +--
.../pekko/actor/typed/ActorContextSpec.scala | 5 +--
.../pekko/actor/typed/ActorRefIgnoreSpec.scala | 7 ++--
.../pekko/actor/typed/ActorRefResolverSpec.scala | 9 ++---
.../apache/pekko/actor/typed/ActorSystemSpec.scala | 5 +--
.../org/apache/pekko/actor/typed/AskSpec.scala | 5 +--
.../apache/pekko/actor/typed/BehaviorSpec.scala | 7 ++--
.../actor/typed/CancelReceiveTimeoutSpec.scala | 5 +--
.../apache/pekko/actor/typed/DeferredSpec.scala | 7 ++--
.../apache/pekko/actor/typed/ExtensionsSpec.scala | 9 ++---
.../apache/pekko/actor/typed/InterceptSpec.scala | 5 +--
.../LocalActorRefProviderLogMessagesSpec.scala | 5 +--
.../apache/pekko/actor/typed/LogMessagesSpec.scala | 9 ++---
.../pekko/actor/typed/MailboxSelectorSpec.scala | 5 +--
.../org/apache/pekko/actor/typed/MonitorSpec.scala | 5 +--
.../org/apache/pekko/actor/typed/OrElseSpec.scala | 5 +--
.../pekko/actor/typed/SpawnProtocolSpec.scala | 7 ++--
.../apache/pekko/actor/typed/SupervisionSpec.scala | 13 +++----
.../apache/pekko/actor/typed/TerminatedSpec.scala | 5 +--
.../org/apache/pekko/actor/typed/TimerSpec.scala | 5 +--
.../pekko/actor/typed/TransformMessagesSpec.scala | 5 +--
.../org/apache/pekko/actor/typed/WatchSpec.scala | 5 +--
.../coexistence/ClassicSupervisingTypedSpec.scala | 11 +++---
.../coexistence/TypedSupervisingClassicSpec.scala | 5 +--
.../typed/delivery/ConsumerControllerSpec.scala | 9 ++---
.../delivery/DurableProducerControllerSpec.scala | 9 ++---
.../typed/delivery/DurableProducerQueueSpec.scala | 9 ++---
.../typed/delivery/DurableWorkPullingSpec.scala | 8 ++---
.../typed/delivery/ProducerControllerSpec.scala | 9 ++---
.../delivery/ReliableDeliveryRandomSpec.scala | 11 +++---
.../typed/delivery/ReliableDeliverySpec.scala | 5 +--
.../pekko/actor/typed/delivery/TestConsumer.scala | 9 ++---
.../typed/delivery/TestDurableProducerQueue.scala | 1 +
.../pekko/actor/typed/delivery/TestProducer.scala | 3 +-
.../actor/typed/delivery/TestProducerWithAsk.scala | 3 +-
.../typed/delivery/TestProducerWorkPulling.scala | 1 +
.../actor/typed/delivery/WorkPullingSpec.scala | 5 +--
.../typed/eventstream/EventStreamDocSpec.scala | 2 +-
.../actor/typed/eventstream/EventStreamSpec.scala | 5 +--
.../typed/internal/ActorRefSerializationSpec.scala | 9 ++---
.../actor/typed/internal/ActorSystemSpec.scala | 17 ++++-----
.../typed/internal/adapter/PropsAdapterSpec.scala | 7 ++--
.../receptionist/LocalReceptionistSpec.scala | 7 ++--
.../receptionist/ServiceKeySerializationSpec.scala | 5 +--
.../typed/internal/routing/PoolRouterSpec.scala | 5 +--
.../typed/internal/routing/RoutingLogicSpec.scala | 7 ++--
.../typed/javadsl/AdaptationFailureSpec.scala | 5 +--
.../pekko/actor/typed/pubsub/LocalPubSubSpec.scala | 5 +--
.../typed/receptionist/ReceptionistApiSpec.scala | 1 +
.../actor/typed/scaladsl/ActorContextAskSpec.scala | 9 ++---
.../typed/scaladsl/ActorContextDelegateSpec.scala | 5 +--
.../scaladsl/ActorContextPipeToSelfSpec.scala | 11 +++---
.../actor/typed/scaladsl/ActorLoggingSpec.scala | 17 ++++-----
.../actor/typed/scaladsl/ActorThreadSpec.scala | 5 +--
.../typed/scaladsl/AdaptationFailureSpec.scala | 5 +--
.../typed/scaladsl/DispatcherSelectorSpec.scala | 11 +++---
.../actor/typed/scaladsl/GracefulStopSpec.scala | 5 +--
.../pekko/actor/typed/scaladsl/LoggerOpsSpec.scala | 7 ++--
.../actor/typed/scaladsl/MailboxSelectorSpec.scala | 11 +++---
.../actor/typed/scaladsl/MessageAdapterSpec.scala | 13 +++----
.../pekko/actor/typed/scaladsl/OnSignalSpec.scala | 5 +--
.../actor/typed/scaladsl/ReceivePartialSpec.scala | 5 +--
.../pekko/actor/typed/scaladsl/RoutersSpec.scala | 7 ++--
.../actor/typed/scaladsl/StashBufferSpec.scala | 7 ++--
.../pekko/actor/typed/scaladsl/StashSpec.scala | 5 +--
.../pekko/actor/typed/scaladsl/StopSpec.scala | 5 +--
.../actor/typed/scaladsl/adapter/AdapterSpec.scala | 9 ++---
.../scaladsl/adapter/GuardianStartupSpec.scala | 9 ++---
.../typed/internal/receptionist/Platform.scala | 1 +
.../org/apache/pekko/actor/typed/ActorRef.scala | 1 +
.../pekko/actor/typed/ActorRefResolver.scala | 1 +
.../org/apache/pekko/actor/typed/ActorSystem.scala | 11 +++---
.../org/apache/pekko/actor/typed/Behavior.scala | 1 +
.../pekko/actor/typed/BehaviorInterceptor.scala | 1 +
.../org/apache/pekko/actor/typed/Extensions.scala | 1 +
.../pekko/actor/typed/MessageAndSignals.scala | 1 +
.../scala/org/apache/pekko/actor/typed/Props.scala | 1 +
.../org/apache/pekko/actor/typed/Scheduler.scala | 1 +
.../apache/pekko/actor/typed/SpawnProtocol.scala | 1 +
.../pekko/actor/typed/SupervisorStrategy.scala | 5 +--
.../actor/typed/delivery/ConsumerController.scala | 5 +--
.../typed/delivery/DurableProducerQueue.scala | 1 +
.../actor/typed/delivery/ProducerController.scala | 5 +--
.../delivery/WorkPullingProducerController.scala | 5 +--
.../typed/delivery/internal/ChunkedMessage.scala | 1 +
.../delivery/internal/ConsumerControllerImpl.scala | 1 +
.../delivery/internal/ProducerControllerImpl.scala | 1 +
.../WorkPullingProducerControllerImpl.scala | 1 +
.../actor/typed/eventstream/EventStream.scala | 1 +
.../actor/typed/internal/ActorContextImpl.scala | 9 ++---
.../actor/typed/internal/ActorFlightRecorder.scala | 1 +
.../pekko/actor/typed/internal/BehaviorImpl.scala | 1 +
.../typed/internal/EventStreamExtension.scala | 1 +
.../actor/typed/internal/ExtensionsImpl.scala | 1 +
.../actor/typed/internal/InterceptorImpl.scala | 7 ++--
.../actor/typed/internal/InternalMessage.scala | 1 +
.../typed/internal/InternalRecipientRef.scala | 1 +
.../pekko/actor/typed/internal/LoggerClass.scala | 1 +
.../typed/internal/MiscMessageSerializer.scala | 1 +
.../pekko/actor/typed/internal/PoisonPill.scala | 1 +
.../pekko/actor/typed/internal/PropsImpl.scala | 1 +
.../actor/typed/internal/StashBufferImpl.scala | 3 +-
.../pekko/actor/typed/internal/Supervision.scala | 5 +--
.../actor/typed/internal/TimerSchedulerImpl.scala | 5 +--
.../internal/WithMdcBehaviorInterceptor.scala | 5 +--
.../typed/internal/adapter/ActorAdapter.scala | 1 +
.../internal/adapter/ActorContextAdapter.scala | 1 +
.../typed/internal/adapter/ActorRefAdapter.scala | 1 +
.../internal/adapter/ActorRefFactoryAdapter.scala | 1 +
.../internal/adapter/ActorSystemAdapter.scala | 5 +--
.../typed/internal/adapter/AdapterExtension.scala | 1 +
.../internal/adapter/EventStreamAdapter.scala | 1 +
.../internal/adapter/GuardianStartupBehavior.scala | 1 +
.../typed/internal/adapter/PropsAdapter.scala | 1 +
.../typed/internal/adapter/SchedulerAdapter.scala | 1 +
.../internal/jfr/JFRActorFlightRecorder.scala | 1 +
.../actor/typed/internal/pubsub/TopicImpl.scala | 1 +
.../internal/receptionist/LocalReceptionist.scala | 1 +
.../internal/receptionist/ReceptionistImpl.scala | 1 +
.../receptionist/ReceptionistMessages.scala | 1 +
.../typed/internal/receptionist/ServiceKey.scala | 1 +
.../receptionist/ServiceKeySerializer.scala | 1 +
.../typed/internal/routing/GroupRouterImpl.scala | 1 +
.../typed/internal/routing/PoolRouterImpl.scala | 1 +
.../typed/internal/routing/RoutingLogic.scala | 1 +
.../actor/typed/javadsl/AbstractBehavior.scala | 1 +
.../typed/javadsl/AbstractMatchingBehavior.scala | 1 +
.../pekko/actor/typed/javadsl/ActorContext.scala | 5 +--
.../apache/pekko/actor/typed/javadsl/Adapter.scala | 1 +
.../pekko/actor/typed/javadsl/AskPattern.scala | 1 +
.../actor/typed/javadsl/BehaviorBuilder.scala | 4 +--
.../pekko/actor/typed/javadsl/Behaviors.scala | 1 +
.../apache/pekko/actor/typed/javadsl/Receive.scala | 1 +
.../pekko/actor/typed/javadsl/ReceiveBuilder.scala | 1 +
.../apache/pekko/actor/typed/javadsl/Routers.scala | 1 +
.../pekko/actor/typed/javadsl/StashBuffer.scala | 3 +-
.../apache/pekko/actor/typed/pubsub/Topic.scala | 1 +
.../actor/typed/receptionist/Receptionist.scala | 1 +
.../actor/typed/scaladsl/AbstractBehavior.scala | 1 +
.../pekko/actor/typed/scaladsl/ActorContext.scala | 7 ++--
.../pekko/actor/typed/scaladsl/AskPattern.scala | 1 +
.../pekko/actor/typed/scaladsl/Behaviors.scala | 1 +
.../pekko/actor/typed/scaladsl/Routers.scala | 1 +
.../pekko/actor/typed/scaladsl/StashBuffer.scala | 1 +
.../typed/scaladsl/adapter/PropsAdapter.scala | 1 +
.../actor/typed/scaladsl/adapter/package.scala | 1 +
.../org/apache/pekko/actor/AbstractActor.scala | 1 +
.../scala/org/apache/pekko/actor/AbstractFSM.scala | 1 +
.../org/apache/pekko/actor/AbstractProps.scala | 1 +
.../main/scala/org/apache/pekko/actor/Actor.scala | 1 +
.../scala/org/apache/pekko/actor/ActorCell.scala | 3 +-
.../org/apache/pekko/actor/ActorLogMarker.scala | 1 +
.../scala/org/apache/pekko/actor/ActorRef.scala | 1 +
.../org/apache/pekko/actor/ActorRefProvider.scala | 1 +
.../org/apache/pekko/actor/ActorSelection.scala | 1 +
.../scala/org/apache/pekko/actor/ActorSystem.scala | 9 ++---
.../scala/org/apache/pekko/actor/Address.scala | 1 +
.../pekko/actor/ClassicActorSystemProvider.scala | 1 +
.../apache/pekko/actor/CoordinatedShutdown.scala | 13 +++----
.../scala/org/apache/pekko/actor/Deployer.scala | 5 +--
.../org/apache/pekko/actor/DynamicAccess.scala | 1 +
.../main/scala/org/apache/pekko/actor/FSM.scala | 6 ++--
.../org/apache/pekko/actor/FaultHandling.scala | 3 +-
.../apache/pekko/actor/IndirectActorProducer.scala | 1 +
.../pekko/actor/LightArrayRevolverScheduler.scala | 7 ++--
.../main/scala/org/apache/pekko/actor/Props.scala | 1 +
.../pekko/actor/ReflectiveDynamicAccess.scala | 1 +
.../apache/pekko/actor/RepointableActorRef.scala | 3 +-
.../scala/org/apache/pekko/actor/Scheduler.scala | 1 +
.../main/scala/org/apache/pekko/actor/Stash.scala | 1 +
.../main/scala/org/apache/pekko/actor/Timers.scala | 1 +
.../org/apache/pekko/actor/dungeon/Children.scala | 1 +
.../pekko/actor/dungeon/ChildrenContainer.scala | 1 +
.../apache/pekko/actor/dungeon/DeathWatch.scala | 1 +
.../org/apache/pekko/actor/dungeon/Dispatch.scala | 3 +-
.../apache/pekko/actor/dungeon/FaultHandling.scala | 1 +
.../pekko/actor/dungeon/ReceiveTimeout.scala | 1 +
.../pekko/actor/dungeon/TimerSchedulerImpl.scala | 1 +
.../pekko/actor/setup/ActorSystemSetup.scala | 1 +
.../apache/pekko/dispatch/AbstractDispatcher.scala | 11 +++---
.../pekko/dispatch/BalancingDispatcher.scala | 3 +-
.../apache/pekko/dispatch/BatchingExecutor.scala | 1 +
.../apache/pekko/dispatch/CompletionStages.scala | 2 +-
.../org/apache/pekko/dispatch/Dispatcher.scala | 3 +-
.../org/apache/pekko/dispatch/Dispatchers.scala | 5 +--
.../scala/org/apache/pekko/dispatch/Future.scala | 3 +-
.../scala/org/apache/pekko/dispatch/Mailbox.scala | 7 ++--
.../org/apache/pekko/dispatch/Mailboxes.scala | 5 +--
.../apache/pekko/dispatch/PinnedDispatcher.scala | 1 +
.../apache/pekko/dispatch/ThreadPoolBuilder.scala | 5 +--
.../pekko/dispatch/VirtualThreadSupport.scala | 1 +
.../dispatch/VirtualizedExecutorService.scala | 2 +-
.../pekko/dispatch/affinity/AffinityPool.scala | 7 ++--
.../pekko/dispatch/internal/ScalaBatchable.scala | 1 +
.../pekko/dispatch/sysmsg/SystemMessage.scala | 1 +
.../event/ActorClassificationUnsubscriber.scala | 1 +
.../pekko/event/AddressTerminatedTopic.scala | 1 +
.../apache/pekko/event/DeadLetterListener.scala | 1 +
.../scala/org/apache/pekko/event/EventBus.scala | 1 +
.../scala/org/apache/pekko/event/EventStream.scala | 1 +
.../pekko/event/EventStreamUnsubscriber.scala | 1 +
.../org/apache/pekko/event/LoggerMailbox.scala | 5 +--
.../scala/org/apache/pekko/event/Logging.scala | 1 +
.../org/apache/pekko/event/LoggingReceive.scala | 4 +--
.../apache/pekko/event/japi/EventBusJavaAPI.scala | 1 +
actor/src/main/scala/org/apache/pekko/io/Dns.scala | 5 +--
.../scala/org/apache/pekko/io/DnsProvider.scala | 1 +
actor/src/main/scala/org/apache/pekko/io/IO.scala | 1 +
.../apache/pekko/io/InetAddressDnsResolver.scala | 7 ++--
.../org/apache/pekko/io/SelectionHandler.scala | 9 ++---
.../scala/org/apache/pekko/io/SimpleDnsCache.scala | 1 +
.../org/apache/pekko/io/SimpleDnsManager.scala | 1 +
actor/src/main/scala/org/apache/pekko/io/Tcp.scala | 5 +--
.../scala/org/apache/pekko/io/TcpConnection.scala | 3 +-
.../apache/pekko/io/TcpIncomingConnection.scala | 1 +
.../scala/org/apache/pekko/io/TcpListener.scala | 1 +
.../scala/org/apache/pekko/io/TcpManager.scala | 4 +--
.../apache/pekko/io/TcpOutgoingConnection.scala | 1 +
actor/src/main/scala/org/apache/pekko/io/Udp.scala | 5 +--
.../scala/org/apache/pekko/io/UdpConnected.scala | 1 +
.../org/apache/pekko/io/UdpConnectedManager.scala | 1 +
.../scala/org/apache/pekko/io/UdpConnection.scala | 1 +
.../scala/org/apache/pekko/io/UdpListener.scala | 1 +
.../scala/org/apache/pekko/io/UdpManager.scala | 1 +
.../main/scala/org/apache/pekko/io/UdpSender.scala | 1 +
.../scala/org/apache/pekko/io/WithUdpSend.scala | 1 +
.../org/apache/pekko/io/dns/CachePolicy.scala | 1 +
.../org/apache/pekko/io/dns/DnsProtocol.scala | 1 +
.../apache/pekko/io/dns/DnsResourceRecords.scala | 4 +--
.../org/apache/pekko/io/dns/DnsSettings.scala | 5 +--
.../pekko/io/dns/internal/AsyncDnsManager.scala | 5 +--
.../pekko/io/dns/internal/AsyncDnsProvider.scala | 1 +
.../pekko/io/dns/internal/AsyncDnsResolver.scala | 5 +--
.../apache/pekko/io/dns/internal/DnsClient.scala | 1 +
.../apache/pekko/io/dns/internal/DnsMessage.scala | 1 +
.../apache/pekko/io/dns/internal/DomainName.scala | 1 +
.../apache/pekko/io/dns/internal/Question.scala | 1 +
.../io/dns/internal/RecordClassSerializer.scala | 1 +
.../io/dns/internal/RecordTypeSerializer.scala | 1 +
.../pekko/io/dns/internal/TcpDnsClient.scala | 1 +
.../org/apache/pekko/io/dns/internal/package.scala | 1 +
.../main/scala/org/apache/pekko/japi/JavaAPI.scala | 1 +
.../org/apache/pekko/japi/pf/CaseStatements.scala | 1 +
.../org/apache/pekko/pattern/AskSupport.scala | 5 +--
.../org/apache/pekko/pattern/BackoffOptions.scala | 1 +
.../apache/pekko/pattern/BackoffSupervisor.scala | 1 +
.../org/apache/pekko/pattern/CircuitBreaker.scala | 7 ++--
.../pekko/pattern/CircuitBreakersRegistry.scala | 1 +
.../pekko/pattern/FutureTimeoutSupport.scala | 3 +-
.../apache/pekko/pattern/GracefulStopSupport.scala | 1 +
.../org/apache/pekko/pattern/HandleBackoff.scala | 1 +
.../scala/org/apache/pekko/pattern/Patterns.scala | 1 +
.../org/apache/pekko/pattern/PipeToSupport.scala | 4 +--
.../org/apache/pekko/pattern/PromiseRef.scala | 1 +
.../org/apache/pekko/pattern/RetrySupport.scala | 5 +--
.../org/apache/pekko/pattern/StatusReply.scala | 5 +--
.../internal/BackoffOnRestartSupervisor.scala | 1 +
.../pattern/internal/BackoffOnStopSupervisor.scala | 1 +
.../pattern/internal/CircuitBreakerTelemetry.scala | 1 +
.../scala/org/apache/pekko/routing/Balancing.scala | 7 ++--
.../scala/org/apache/pekko/routing/Broadcast.scala | 5 +--
.../apache/pekko/routing/ConsistentHashing.scala | 5 +--
.../routing/OptimalSizeExploringResizer.scala | 8 ++---
.../scala/org/apache/pekko/routing/Random.scala | 5 +--
.../scala/org/apache/pekko/routing/Resizer.scala | 5 +--
.../org/apache/pekko/routing/RoundRobin.scala | 5 +--
.../org/apache/pekko/routing/RoutedActorCell.scala | 1 +
.../org/apache/pekko/routing/RoutedActorRef.scala | 1 +
.../scala/org/apache/pekko/routing/Router.scala | 1 +
.../org/apache/pekko/routing/RouterConfig.scala | 1 +
.../routing/ScatterGatherFirstCompleted.scala | 5 +--
.../org/apache/pekko/routing/SmallestMailbox.scala | 5 +--
.../org/apache/pekko/routing/TailChopping.scala | 9 ++---
.../pekko/serialization/AsyncSerializer.scala | 3 +-
.../pekko/serialization/PrimitiveSerializers.scala | 3 +-
.../apache/pekko/serialization/Serialization.scala | 7 ++--
.../serialization/SerializationExtension.scala | 1 +
.../pekko/serialization/SerializationSetup.scala | 1 +
.../apache/pekko/serialization/Serializer.scala | 1 +
.../apache/pekko/util/BoundedBlockingQueue.scala | 4 +--
.../scala/org/apache/pekko/util/ByteString.scala | 4 +--
.../main/scala/org/apache/pekko/util/Clock.scala | 1 +
.../scala/org/apache/pekko/util/ConstantFun.scala | 1 +
.../apache/pekko/util/FlightRecorderLoader.scala | 1 +
.../main/scala/org/apache/pekko/util/Helpers.scala | 4 +--
.../scala/org/apache/pekko/util/ManifestInfo.scala | 1 +
.../org/apache/pekko/util/MessageBuffer.scala | 1 +
.../apache/pekko/util/StablePriorityQueue.scala | 2 +-
.../scala/org/apache/pekko/util/WallClock.scala | 1 +
.../org/apache/pekko/actor/ActorBenchmark.scala | 3 +-
.../pekko/actor/ActorPathValidationBenchmark.scala | 2 +-
.../actor/AffinityPoolComparativeBenchmark.scala | 5 +--
.../AffinityPoolRequestResponseBenchmark.scala | 5 +--
.../org/apache/pekko/actor/BenchmarkActors.scala | 2 +-
.../pekko/actor/ForkJoinActorBenchmark.scala | 3 +-
.../org/apache/pekko/actor/JCToolsMailbox.scala | 5 +--
.../apache/pekko/actor/ManyToOneArrayMailbox.scala | 5 +--
.../pekko/actor/RouterPoolCreationBenchmark.scala | 1 +
.../org/apache/pekko/actor/ScheduleBenchmark.scala | 2 +-
.../org/apache/pekko/actor/TellOnlyBenchmark.scala | 5 +--
.../pekko/actor/typed/TypedActorBenchmark.scala | 3 +-
.../pekko/actor/typed/TypedBenchmarkActors.scala | 1 +
.../actor/typed/TypedForkJoinActorBenchmark.scala | 3 +-
.../typed/delivery/ReliableDeliveryBenchmark.scala | 5 +--
.../pekko/cluster/ddata/ORSetMergeBenchmark.scala | 3 +-
.../ddata/ORSetSerializationBenchmark.scala | 7 ++--
.../cluster/ddata/VersionVectorBenchmark.scala | 3 +-
.../apache/pekko/dispatch/NodeQueueBenchmark.scala | 5 +--
.../pekko/event/LogLevelAccessBenchmark.scala | 1 +
.../persistence/LevelDbBatchingBenchmark.scala | 1 +
.../PersistenceActorDeferBenchmark.scala | 3 +-
.../persistence/PersistentActorBenchmark.scala | 3 +-
...tentActorWithAtLeastOnceDeliveryBenchmark.scala | 3 +-
.../pekko/remote/artery/BenchTestSource.scala | 1 +
.../pekko/remote/artery/CodecBenchmark.scala | 5 +--
.../org/apache/pekko/remote/artery/LatchSink.scala | 1 +
.../pekko/remote/artery/SendQueueBenchmark.scala | 5 +--
.../SerializationFormatCacheBenchmark.scala | 1 +
.../jackson/JacksonSerializationBench.scala | 7 ++--
.../ActorGraphInterpreterBoundaryBenchmark.scala | 10 +++---
.../pekko/stream/ActorRefSourceBenchmark.scala | 1 +
.../org/apache/pekko/stream/AskBenchmark.scala | 5 +--
.../stream/AsyncBoundaryThroughputBenchmark.scala | 5 +--
.../org/apache/pekko/stream/CollectBenchmark.scala | 5 +--
.../apache/pekko/stream/EmptySourceBenchmark.scala | 1 +
.../pekko/stream/FlatMapConcatBenchmark.scala | 7 ++--
.../pekko/stream/FlatMapMergeBenchmark.scala | 1 +
.../org/apache/pekko/stream/FlowMapBenchmark.scala | 5 +--
.../org/apache/pekko/stream/FramingBenchmark.scala | 7 ++--
.../apache/pekko/stream/FusedGraphsBenchmark.scala | 7 ++--
.../pekko/stream/GraphBuilderBenchmark.scala | 1 +
.../apache/pekko/stream/InterpreterBenchmark.scala | 1 +
.../pekko/stream/InvokeWithFeedbackBenchmark.scala | 1 +
.../apache/pekko/stream/JsonFramingBenchmark.scala | 1 +
.../pekko/stream/LazyFutureSourceBenchmark.scala | 5 +--
.../apache/pekko/stream/MapAsyncBenchmark.scala | 5 +--
.../pekko/stream/MaterializationBenchmark.scala | 1 +
.../pekko/stream/MaterializerWiringBenchmark.scala | 1 +
.../pekko/stream/PartitionHubBenchmark.scala | 5 +--
.../apache/pekko/stream/RangeSourceBenchmark.scala | 1 +
.../apache/pekko/stream/SourceRefBenchmark.scala | 5 +--
.../pekko/stream/StageActorRefBenchmark.scala | 1 +
.../pekko/stream/ZipWithIndexBenchmark.scala | 5 +--
.../impl/OutputStreamSourceStageBenchmark.scala | 3 +-
.../pekko/stream/io/FileSourcesBenchmark.scala | 1 +
.../stream/io/FileSourcesScaleBenchmark.scala | 3 +-
.../org/apache/pekko/stream/io/TlsBenchmark.scala | 5 +--
.../util/ByteStringParser_readNum_Benchmark.scala | 1 +
build.sbt | 2 +-
.../cluster/metrics/ClusterMetricsCollector.scala | 1 +
.../cluster/metrics/ClusterMetricsExtension.scala | 5 +--
.../cluster/metrics/ClusterMetricsRouting.scala | 5 +--
.../cluster/metrics/ClusterMetricsSettings.scala | 5 +--
.../cluster/metrics/ClusterMetricsStrategy.scala | 5 +--
.../org/apache/pekko/cluster/metrics/Metric.scala | 1 +
.../pekko/cluster/metrics/MetricsCollector.scala | 1 +
.../metrics/protobuf/MessageSerializer.scala | 3 +-
.../metrics/protobuf/NumberInputStream.scala | 1 +
.../metrics/ClusterMetricsExtensionSpec.scala | 5 +--
.../metrics/ClusterMetricsRoutingSpec.scala | 7 ++--
.../cluster/metrics/sample/StatsService.scala | 1 +
.../metrics/ClusterMetricsExtensionSpec.scala | 1 +
.../metrics/ClusterMetricsRoutingSpec.scala | 5 +--
.../metrics/ClusterMetricsSettingsSpec.scala | 5 +--
.../apache/pekko/cluster/metrics/MetricSpec.scala | 7 ++--
.../cluster/metrics/MetricsCollectorSpec.scala | 1 +
.../apache/pekko/cluster/metrics/TestUtil.scala | 5 +--
.../cluster/metrics/WeightedRouteesSpec.scala | 5 +--
.../metrics/protobuf/MessageSerializerSpec.scala | 1 +
.../sharding/typed/ClusterShardingQuery.scala | 1 +
.../sharding/typed/ClusterShardingSettings.scala | 5 +--
.../sharding/typed/Murmur2MessageExtractor.scala | 1 +
.../sharding/typed/ReplicatedEntityProvider.scala | 1 +
.../typed/ReplicatedShardingExtension.scala | 1 +
.../typed/ShardedDaemonProcessCommand.scala | 1 +
.../typed/ShardedDaemonProcessSettings.scala | 5 +--
.../sharding/typed/ShardingDirectReplication.scala | 1 +
.../sharding/typed/ShardingMessageExtractor.scala | 1 +
.../delivery/ShardingConsumerController.scala | 5 +--
.../delivery/ShardingProducerController.scala | 5 +--
.../internal/ShardingConsumerControllerImpl.scala | 1 +
.../internal/ShardingProducerControllerImpl.scala | 1 +
.../typed/internal/ClusterShardingImpl.scala | 1 +
.../JoinConfigCompatCheckerClusterSharding.scala | 5 +--
.../internal/ReplicatedShardingExtensionImpl.scala | 7 ++--
.../internal/ShardedDaemonProcessCoordinator.scala | 1 +
.../typed/internal/ShardedDaemonProcessId.scala | 1 +
.../typed/internal/ShardedDaemonProcessImpl.scala | 1 +
.../typed/internal/ShardedDaemonProcessState.scala | 1 +
.../typed/internal/ShardingSerializer.scala | 1 +
.../sharding/typed/internal/ShardingState.scala | 1 +
.../typed/internal/testkit/TestEntityRefImpl.scala | 1 +
.../sharding/typed/javadsl/ClusterSharding.scala | 1 +
.../typed/javadsl/ShardedDaemonProcess.scala | 3 +-
.../sharding/typed/scaladsl/ClusterSharding.scala | 1 +
.../typed/scaladsl/ShardedDaemonProcess.scala | 1 +
.../sharding/typed/testkit/javadsl/EntityRef.scala | 1 +
.../typed/testkit/scaladsl/EntityRef.scala | 1 +
.../ClusterShardingRememberEntitiesPerfSpec.scala | 5 +--
.../ClusterShardingPreparingForShutdownSpec.scala | 5 +--
.../sharding/typed/ClusterShardingStatsSpec.scala | 9 ++---
.../typed/MultiDcClusterShardingSpec.scala | 9 ++---
.../sharding/typed/ReplicatedShardingSpec.scala | 13 +++----
.../sharding/typed/ShardedDaemonProcessSpec.scala | 9 ++---
.../typed/delivery/DeliveryThroughputSpec.scala | 5 +--
...oinConfigCompatCheckerClusterShardingSpec.scala | 11 +++---
.../ReplicatedShardingDirectReplicationSpec.scala | 5 +--
.../sharding/typed/ReplicatedShardingSpec.scala | 13 +++----
.../sharding/typed/ShardingSerializerSpec.scala | 5 +--
.../typed/delivery/DurableShardingSpec.scala | 11 +++---
.../delivery/ReliableDeliveryShardingSpec.scala | 9 ++---
.../scaladsl/ClusterShardingPersistenceSpec.scala | 9 ++---
.../typed/scaladsl/ClusterShardingSpec.scala | 9 ++---
.../typed/scaladsl/ClusterShardingStateSpec.scala | 5 +--
.../typed/scaladsl/ClusterShardingStatsSpec.scala | 5 +--
.../typed/scaladsl/ShardedDaemonProcessSpec.scala | 9 ++---
.../typed/testkit/scaladsl/TestEntityRefSpec.scala | 5 +--
.../pekko/cluster/sharding/ClusterSharding.scala | 1 +
.../sharding/ClusterShardingHealthCheck.scala | 5 +--
.../cluster/sharding/ClusterShardingSettings.scala | 5 +--
.../ConsistentHashingShardAllocationStrategy.scala | 1 +
.../sharding/JoinConfigCompatCheckSharding.scala | 5 +--
.../OldCoordinatorStateMigrationEventAdapter.scala | 1 +
.../RemoveInternalClusterShardingData.scala | 1 +
.../org/apache/pekko/cluster/sharding/Shard.scala | 1 +
.../pekko/cluster/sharding/ShardCoordinator.scala | 3 +-
.../pekko/cluster/sharding/ShardRegion.scala | 3 +-
.../cluster/sharding/ShardingFlightRecorder.scala | 1 +
.../pekko/cluster/sharding/ShardingLogMarker.scala | 1 +
.../external/ExternalShardAllocation.scala | 1 +
.../external/ExternalShardAllocationStrategy.scala | 1 +
.../cluster/sharding/external/ShardLocations.scala | 1 +
.../ExternalShardAllocationClientImpl.scala | 1 +
.../javadsl/ExternalShardAllocationClient.scala | 1 +
.../scaladsl/ExternalShardAllocationClient.scala | 1 +
.../AbstractLeastShardAllocationStrategy.scala | 1 +
.../internal/ClusterShardAllocationMixin.scala | 1 +
.../internal/CustomStateStoreModeProvider.scala | 1 +
.../DDataRememberEntitiesCoordinatorStore.scala | 1 +
.../internal/DDataRememberEntitiesProvider.scala | 1 +
.../internal/DDataRememberEntitiesShardStore.scala | 1 +
.../internal/EntityPassivationStrategy.scala | 1 +
...ntSourcedRememberEntitiesCoordinatorStore.scala | 1 +
.../EventSourcedRememberEntitiesProvider.scala | 1 +
.../EventSourcedRememberEntitiesShardStore.scala | 1 +
.../internal/LeastShardAllocationStrategy.scala | 1 +
.../sharding/internal/RememberEntitiesStore.scala | 1 +
.../sharding/internal/RememberEntityStarter.scala | 1 +
.../ClusterShardingMessageSerializer.scala | 1 +
.../apache/pekko/cluster/sbr/GlobalRegistry.scala | 1 +
.../pekko/cluster/sbr/GremlinController.scala | 1 +
.../RandomizedBrainResolverIntegrationSpec.scala | 11 +++---
.../pekko/cluster/sbr/SbrTestLeaseActor.scala | 1 +
.../sbr/SplitBrainResolverIntegrationSpec.scala | 13 +++----
.../ClusterShardCoordinatorDowning2Spec.scala | 1 +
.../ClusterShardCoordinatorDowningSpec.scala | 1 +
.../ClusterShardingCoordinatorRoleSpec.scala | 7 ++--
.../ClusterShardingCustomShardAllocationSpec.scala | 1 +
.../sharding/ClusterShardingFailureSpec.scala | 1 +
.../sharding/ClusterShardingGetStateSpec.scala | 5 +--
.../sharding/ClusterShardingGetStatsSpec.scala | 5 +--
...ClusterShardingGracefulShutdownOldestSpec.scala | 1 +
.../ClusterShardingGracefulShutdownSpec.scala | 1 +
.../sharding/ClusterShardingLeavingSpec.scala | 1 +
.../sharding/ClusterShardingMinMembersSpec.scala | 1 +
.../sharding/ClusterShardingQueriesSpec.scala | 5 +--
...ardingRegistrationCoordinatedShutdownSpec.scala | 1 +
...rShardingRememberEntitiesNewExtractorSpec.scala | 5 +--
.../ClusterShardingRememberEntitiesSpec.scala | 5 +--
.../ClusterShardingRolePartitioningSpec.scala | 5 +--
.../ClusterShardingSingleShardPerEntitySpec.scala | 1 +
.../cluster/sharding/ClusterShardingSpec.scala | 5 +--
.../sharding/ExternalShardAllocationSpec.scala | 7 ++--
.../sharding/MultiDcClusterShardingSpec.scala | 5 +--
.../sharding/MultiNodeClusterShardingConfig.scala | 5 +--
.../sharding/MultiNodeClusterShardingSpec.scala | 1 +
.../RollingUpdateShardAllocationSpec.scala | 5 +--
.../sharding/ClusterShardingHealthCheckSpec.scala | 9 ++---
.../sharding/ClusterShardingInternalsSpec.scala | 1 +
.../sharding/ClusterShardingLeaseSpec.scala | 5 +--
.../sharding/ClusterShardingSettingsSpec.scala | 5 +--
.../sharding/ConcurrentStartupShardingSpec.scala | 1 +
...sistentHashingShardAllocationStrategySpec.scala | 1 +
.../sharding/CoordinatedShutdownShardingSpec.scala | 1 +
...eprecatedLeastShardAllocationStrategySpec.scala | 1 +
.../pekko/cluster/sharding/EntitiesSpec.scala | 7 ++--
.../cluster/sharding/EntityTerminationSpec.scala | 5 +--
.../cluster/sharding/GetShardTypeNamesSpec.scala | 1 +
.../JoinConfigCompatCheckShardingSpec.scala | 5 +--
...eastShardAllocationStrategyRandomizedSpec.scala | 1 +
.../LeastShardAllocationStrategySpec.scala | 1 +
.../sharding/PersistentShardingMigrationSpec.scala | 5 +--
.../pekko/cluster/sharding/ProxyShardingSpec.scala | 3 +-
.../RememberEntitiesAndStartEntitySpec.scala | 9 ++---
.../RememberEntitiesBatchedUpdatesSpec.scala | 7 ++--
.../sharding/RememberEntitiesFailureSpec.scala | 9 ++---
...ememberEntitiesShardIdExtractorChangeSpec.scala | 5 +--
.../RemoveInternalClusterShardingDataSpec.scala | 1 +
.../pekko/cluster/sharding/ShardRegionSpec.scala | 5 +--
.../cluster/sharding/ShardWithLeaseSpec.scala | 1 +
.../cluster/sharding/ShardingQueriesSpec.scala | 1 +
.../pekko/cluster/sharding/StartEntitySpec.scala | 5 +--
.../pekko/cluster/sharding/StopShardsSpec.scala | 5 +--
.../pekko/cluster/sharding/SupervisionSpec.scala | 5 +--
.../ExternalShardAllocationStrategySpec.scala | 1 +
.../internal/RememberEntitiesShardStoreSpec.scala | 9 ++---
.../internal/RememberEntitiesStarterSpec.scala | 5 +--
.../passivation/EntityPassivationSpec.scala | 11 +++---
.../passivation/simulator/AccessPattern.scala | 1 +
.../sharding/passivation/simulator/Simulator.scala | 5 +--
.../passivation/simulator/SimulatorSettings.scala | 5 +--
.../ClusterShardingMessageSerializerSpec.scala | 1 +
.../pekko/cluster/client/ClusterClient.scala | 5 +--
.../protobuf/ClusterClientMessageSerializer.scala | 1 +
.../cluster/pubsub/DistributedPubSubMediator.scala | 5 +--
.../pekko/cluster/pubsub/PerGroupingBuffer.scala | 1 +
.../DistributedPubSubMessageSerializer.scala | 1 +
.../singleton/ClusterSingletonManager.scala | 5 +--
.../cluster/singleton/ClusterSingletonProxy.scala | 5 +--
.../ClusterSingletonMessageSerializer.scala | 1 +
.../cluster/client/ClusterClientHandoverSpec.scala | 5 +--
.../pekko/cluster/client/ClusterClientSpec.scala | 5 +--
.../cluster/client/ClusterClientStopSpec.scala | 5 +--
.../pubsub/DistributedPubSubMediatorSpec.scala | 5 +--
.../pubsub/DistributedPubSubRestartSpec.scala | 5 +--
.../ClusterSingletonManagerChaosSpec.scala | 5 +--
.../ClusterSingletonManagerDownedSpec.scala | 5 +--
.../ClusterSingletonManagerLeaseSpec.scala | 5 +--
.../ClusterSingletonManagerLeave2Spec.scala | 5 +--
.../ClusterSingletonManagerLeaveSpec.scala | 5 +--
...rSingletonManagerPreparingForShutdownSpec.scala | 5 +--
.../singleton/ClusterSingletonManagerSpec.scala | 5 +--
.../ClusterSingletonManagerStartupSpec.scala | 5 +--
.../singleton/MultiDcSingletonManagerSpec.scala | 5 +--
.../ClusterClientMessageSerializerSpec.scala | 1 +
.../DistributedPubSubMediatorDeadLettersSpec.scala | 1 +
.../DistributedPubSubMediatorRouterSpec.scala | 7 ++--
.../DistributedPubSubMessageSerializerSpec.scala | 1 +
.../singleton/ClusterSingletonLeaseSpec.scala | 5 +--
.../ClusterSingletonLeavingSpeedSpec.scala | 5 +--
.../singleton/ClusterSingletonProxySpec.scala | 7 ++--
.../singleton/ClusterSingletonRestart2Spec.scala | 5 +--
.../singleton/ClusterSingletonRestartSpec.scala | 5 +--
.../ClusterSingletonMessageSerializerSpec.scala | 1 +
.../receptionist/ClusterReceptionistProtocol.scala | 1 +
.../ddata/typed/internal/ReplicatorBehavior.scala | 1 +
.../ddata/typed/javadsl/DistributedData.scala | 1 +
.../cluster/ddata/typed/javadsl/Replicator.scala | 1 +
.../typed/javadsl/ReplicatorMessageAdapter.scala | 1 +
.../ddata/typed/javadsl/ReplicatorSettings.scala | 5 +--
.../ddata/typed/scaladsl/DistributedData.scala | 5 +--
.../cluster/ddata/typed/scaladsl/Replicator.scala | 1 +
.../typed/scaladsl/ReplicatorMessageAdapter.scala | 1 +
.../ddata/typed/scaladsl/ReplicatorSettings.scala | 5 +--
.../cluster/ddata/typed/scaladsl/package.scala | 1 +
.../org/apache/pekko/cluster/typed/Cluster.scala | 1 +
.../pekko/cluster/typed/ClusterSingleton.scala | 5 +--
.../typed/internal/AdaptedClusterImpl.scala | 1 +
.../internal/AdaptedClusterSingletonImpl.scala | 1 +
.../internal/PekkoClusterTypedSerializer.scala | 1 +
.../delivery/ReliableDeliverySerializer.scala | 1 +
.../receptionist/ClusterReceptionist.scala | 1 +
.../ClusterReceptionistConfigCompatChecker.scala | 5 +--
.../receptionist/ClusterReceptionistSettings.scala | 5 +--
.../typed/internal/receptionist/Registry.scala | 1 +
.../cluster/typed/ChunkLargeMessageSpec.scala | 5 +--
.../typed/MultiDcClusterSingletonSpec.scala | 5 +--
.../apache/pekko/cluster/typed/MultiDcPinger.scala | 1 +
.../cluster/typed/MultiNodeTypedClusterSpec.scala | 7 ++--
.../apache/pekko/cluster/typed/PubSubSpec.scala | 5 +--
.../ClusterReceptionistUnreachabilitySpec.scala | 5 +--
.../typed/scaladsl/ReplicatorCompileOnlyTest.scala | 1 +
.../ddata/typed/scaladsl/ReplicatorSpec.scala | 5 +--
.../typed/ActorRefIgnoreSerializationSpec.scala | 11 +++---
.../pekko/cluster/typed/ActorSystemSpec.scala | 19 +++++-----
.../cluster/typed/ClusterActorLoggingSpec.scala | 11 +++---
.../pekko/cluster/typed/ClusterApiSpec.scala | 9 ++---
.../cluster/typed/ClusterSingletonApiSpec.scala | 9 ++---
.../typed/ClusterSingletonPoisonPillSpec.scala | 5 +--
.../pekko/cluster/typed/GroupRouterSpec.scala | 9 ++---
.../pekko/cluster/typed/RemoteContextAskSpec.scala | 9 ++---
.../cluster/typed/RemoteDeployNotAllowedSpec.scala | 9 ++---
.../pekko/cluster/typed/RemoteMessageSpec.scala | 5 +--
.../internal/PekkoClusterTypedSerializerSpec.scala | 5 +--
.../delivery/ReliableDeliverySerializerSpec.scala | 5 +--
.../receptionist/ClusterReceptionistSpec.scala | 13 +++----
.../ClusterReceptionistStateSpec.scala | 9 ++---
.../scala/org/apache/pekko/cluster/Cluster.scala | 7 ++--
.../pekko/cluster/ClusterActorRefProvider.scala | 7 ++--
.../org/apache/pekko/cluster/ClusterDaemon.scala | 5 +--
.../org/apache/pekko/cluster/ClusterEvent.scala | 1 +
.../apache/pekko/cluster/ClusterHeartbeat.scala | 1 +
.../org/apache/pekko/cluster/ClusterJmx.scala | 1 +
.../apache/pekko/cluster/ClusterLogMarker.scala | 1 +
.../org/apache/pekko/cluster/ClusterReadView.scala | 1 +
.../pekko/cluster/ClusterRemoteWatcher.scala | 1 +
.../org/apache/pekko/cluster/ClusterSettings.scala | 9 ++---
.../org/apache/pekko/cluster/ConfigUtil.scala | 3 +-
.../pekko/cluster/CoordinatedShutdownLeave.scala | 1 +
.../pekko/cluster/CrossDcClusterHeartbeat.scala | 1 +
.../org/apache/pekko/cluster/DowningProvider.scala | 1 +
.../scala/org/apache/pekko/cluster/Gossip.scala | 4 +--
.../cluster/JoinConfigCompatCheckCluster.scala | 3 +-
.../pekko/cluster/JoinConfigCompatChecker.scala | 5 +--
.../scala/org/apache/pekko/cluster/Member.scala | 1 +
.../org/apache/pekko/cluster/MembershipState.scala | 1 +
.../org/apache/pekko/cluster/Reachability.scala | 1 +
.../org/apache/pekko/cluster/SeedNodeProcess.scala | 1 +
.../protobuf/ClusterMessageSerializer.scala | 5 +--
.../cluster/routing/ClusterRouterConfig.scala | 7 ++--
.../apache/pekko/cluster/sbr/DowningStrategy.scala | 1 +
.../pekko/cluster/sbr/SplitBrainResolver.scala | 1 +
.../cluster/sbr/SplitBrainResolverProvider.scala | 1 +
.../cluster/sbr/SplitBrainResolverSettings.scala | 7 ++--
.../cluster/AttemptSysMsgRedeliverySpec.scala | 1 +
.../ClientDowningNodeThatIsUnreachableSpec.scala | 1 +
.../cluster/ClientDowningNodeThatIsUpSpec.scala | 1 +
.../ClusterAccrualFailureDetectorSpec.scala | 5 +--
.../pekko/cluster/ClusterDeathWatchSpec.scala | 9 ++---
.../apache/pekko/cluster/ClusterShutdownSpec.scala | 5 +--
.../ClusterWatcherNoClusterWatcheeSpec.scala | 9 ++---
.../org/apache/pekko/cluster/ConvergenceSpec.scala | 5 +--
.../DeterministicOldestWhenJoiningSpec.scala | 5 +--
.../cluster/DisallowJoinOfTwoClustersSpec.scala | 1 +
...henOtherHasQuarantinedThisActorSystemSpec.scala | 5 +--
.../pekko/cluster/InitialHeartbeatSpec.scala | 5 +--
.../pekko/cluster/InitialMembersOfNewDcSpec.scala | 5 +--
.../apache/pekko/cluster/JoinInProgressSpec.scala | 5 +--
.../apache/pekko/cluster/JoinSeedNodeSpec.scala | 5 +--
.../pekko/cluster/LargeMessageClusterSpec.scala | 5 +--
.../cluster/LeaderDowningAllOtherNodesSpec.scala | 5 +--
.../LeaderDowningNodeThatIsUnreachableSpec.scala | 5 +--
.../apache/pekko/cluster/LeaderElectionSpec.scala | 1 +
.../apache/pekko/cluster/LeaderLeavingSpec.scala | 5 +--
.../scala/org/apache/pekko/cluster/MBeanSpec.scala | 5 +--
.../apache/pekko/cluster/MemberWeaklyUpSpec.scala | 5 +--
.../MembershipChangeListenerExitingSpec.scala | 1 +
.../cluster/MembershipChangeListenerUpSpec.scala | 1 +
.../pekko/cluster/MinMembersBeforeUpSpec.scala | 5 +--
.../apache/pekko/cluster/MultiDcClusterSpec.scala | 5 +--
.../cluster/MultiDcHeartbeatTakingOverSpec.scala | 5 +--
.../apache/pekko/cluster/MultiDcJoin2Spec.scala | 5 +--
.../org/apache/pekko/cluster/MultiDcJoinSpec.scala | 5 +--
.../pekko/cluster/MultiDcSplitBrainSpec.scala | 5 +--
.../pekko/cluster/MultiDcSunnyWeatherSpec.scala | 5 +--
.../pekko/cluster/MultiNodeClusterSpec.scala | 11 +++---
.../org/apache/pekko/cluster/NodeChurnSpec.scala | 5 +--
.../cluster/NodeDowningAndBeingRemovedSpec.scala | 5 +--
.../NodeLeavingAndExitingAndBeingRemovedSpec.scala | 1 +
.../pekko/cluster/NodeLeavingAndExitingSpec.scala | 1 +
.../apache/pekko/cluster/NodeMembershipSpec.scala | 1 +
.../org/apache/pekko/cluster/NodeUpSpec.scala | 1 +
.../apache/pekko/cluster/QuickRestartSpec.scala | 5 +--
.../cluster/RemoteFeaturesWithClusterSpec.scala | 9 ++---
.../pekko/cluster/RestartFirstSeedNodeSpec.scala | 5 +--
.../apache/pekko/cluster/RestartNode2Spec.scala | 5 +--
.../apache/pekko/cluster/RestartNode3Spec.scala | 5 +--
.../org/apache/pekko/cluster/RestartNodeSpec.scala | 5 +--
.../pekko/cluster/SharedMediaDriverSupport.scala | 5 +--
.../pekko/cluster/SingletonClusterSpec.scala | 5 +--
.../pekko/cluster/SplitBrainQuarantineSpec.scala | 5 +--
.../org/apache/pekko/cluster/SplitBrainSpec.scala | 5 +--
.../org/apache/pekko/cluster/StreamRefSpec.scala | 5 +--
.../org/apache/pekko/cluster/StressSpec.scala | 11 +++---
.../apache/pekko/cluster/SunnyWeatherSpec.scala | 5 +--
.../cluster/SurviveNetworkInstabilitySpec.scala | 5 +--
.../org/apache/pekko/cluster/TransitionSpec.scala | 8 ++---
.../cluster/UnreachableNodeJoinsAgainSpec.scala | 5 +--
.../ClusterConsistentHashingGroupSpec.scala | 1 +
.../ClusterConsistentHashingRouterSpec.scala | 5 +--
.../cluster/routing/ClusterRoundRobinSpec.scala | 5 +--
.../pekko/cluster/routing/UseRoleIgnoredSpec.scala | 5 +--
.../sbr/DownAllIndirectlyConnected5NodeSpec.scala | 5 +--
.../cluster/sbr/DownAllUnstable5NodeSpec.scala | 5 +--
.../cluster/sbr/IndirectlyConnected3NodeSpec.scala | 5 +--
.../cluster/sbr/IndirectlyConnected5NodeSpec.scala | 5 +--
.../pekko/cluster/sbr/LeaseMajority5NodeSpec.scala | 5 +--
.../apache/pekko/cluster/ClusterConfigSpec.scala | 5 +--
.../ClusterDeathWatchNotificationSpec.scala | 5 +--
.../apache/pekko/cluster/ClusterDeployerSpec.scala | 5 +--
.../cluster/ClusterDomainEventPublisherSpec.scala | 5 +--
.../cluster/ClusterHeartbeatReceiverSpec.scala | 1 +
.../pekko/cluster/ClusterHeartbeatSenderSpec.scala | 1 +
.../cluster/ClusterHeartbeatSenderStateSpec.scala | 7 ++--
.../org/apache/pekko/cluster/ClusterLogSpec.scala | 5 +--
.../org/apache/pekko/cluster/ClusterSpec.scala | 5 +--
.../org/apache/pekko/cluster/ClusterTestKit.scala | 5 +--
.../org/apache/pekko/cluster/ConfigUtilSpec.scala | 3 +-
.../pekko/cluster/CrossDcHeartbeatSenderSpec.scala | 1 +
.../apache/pekko/cluster/DowningProviderSpec.scala | 11 +++---
.../pekko/cluster/FailureDetectorPuppet.scala | 5 +--
.../org/apache/pekko/cluster/GossipSpec.scala | 7 ++--
.../pekko/cluster/GossipTargetSelectorSpec.scala | 7 ++--
.../cluster/JoinConfigCompatCheckClusterSpec.scala | 5 +--
.../JoinConfigCompatCheckerRollingUpdateSpec.scala | 5 +--
.../apache/pekko/cluster/MemberOrderingSpec.scala | 7 ++--
.../apache/pekko/cluster/MembershipStateSpec.scala | 5 +--
.../pekko/cluster/MixedProtocolClusterSpec.scala | 6 ++--
.../cluster/ResetSystemMessageSeqNrSpec.scala | 1 +
.../cluster/ShutdownAfterJoinSeedNodesSpec.scala | 1 +
.../pekko/cluster/StartupWithOneThreadSpec.scala | 1 +
.../org/apache/pekko/cluster/TestMember.scala | 1 +
.../protobuf/ClusterMessageSerializerSpec.scala | 8 ++---
.../routing/ClusterRouterSupervisorSpec.scala | 1 +
.../pekko/cluster/sbr/SplitBrainResolverSpec.scala | 9 ++---
.../apache/pekko/cluster/sbr/TestAddresses.scala | 1 +
.../apache/pekko/cluster/testkit/AutoDown.scala | 1 +
.../pekko/cluster/testkit/AutoDownSpec.scala | 1 +
.../coordination/lease/LeaseUsageSettings.scala | 1 +
.../coordination/lease/internal/LeaseAdapter.scala | 1 +
.../pekko/coordination/lease/javadsl/Lease.scala | 1 +
.../coordination/lease/javadsl/LeaseProvider.scala | 1 +
.../pekko/coordination/lease/scaladsl/Lease.scala | 1 +
.../lease/scaladsl/LeaseProvider.scala | 1 +
.../pekko/coordination/lease/TestLease.scala | 5 +--
.../pekko/coordination/lease/TestLeaseActor.scala | 1 +
.../lease/scaladsl/LeaseProviderSpec.scala | 5 +--
.../org/apache/pekko/discovery/Discovery.scala | 1 +
.../apache/pekko/discovery/ServiceDiscovery.scala | 1 +
.../aggregate/AggregateServiceDiscovery.scala | 5 +--
.../discovery/config/ConfigServiceDiscovery.scala | 5 +--
.../pekko/discovery/dns/DnsServiceDiscovery.scala | 3 +-
.../discovery/DiscoveryConfigurationSpec.scala | 7 ++--
.../aggregate/AggregateServiceDiscoverySpec.scala | 9 ++---
.../config/ConfigServiceDiscoverySpec.scala | 9 ++---
.../config/ConfigServicesParserSpec.scala | 5 +--
.../pekko/discovery/dns/DnsDiscoverySpec.scala | 5 +--
.../discovery/dns/DnsServiceDiscoverySpec.scala | 9 ++---
.../cluster/ddata/DeltaPropagationSelector.scala | 1 +
.../pekko/cluster/ddata/DistributedData.scala | 1 +
.../apache/pekko/cluster/ddata/DurableStore.scala | 5 +--
.../org/apache/pekko/cluster/ddata/GCounter.scala | 1 +
.../org/apache/pekko/cluster/ddata/LWWMap.scala | 1 +
.../apache/pekko/cluster/ddata/LWWRegister.scala | 1 +
.../org/apache/pekko/cluster/ddata/ORMap.scala | 1 +
.../apache/pekko/cluster/ddata/ORMultiMap.scala | 1 +
.../org/apache/pekko/cluster/ddata/ORSet.scala | 1 +
.../org/apache/pekko/cluster/ddata/PNCounter.scala | 1 +
.../apache/pekko/cluster/ddata/PNCounterMap.scala | 1 +
.../cluster/ddata/PayloadSizeAggregator.scala | 1 +
.../apache/pekko/cluster/ddata/PruningState.scala | 1 +
.../pekko/cluster/ddata/ReplicatedData.scala | 1 +
.../apache/pekko/cluster/ddata/Replicator.scala | 9 ++---
.../apache/pekko/cluster/ddata/VersionVector.scala | 1 +
.../ddata/protobuf/ReplicatedDataSerializer.scala | 3 +-
.../protobuf/ReplicatorMessageSerializer.scala | 3 +-
.../ddata/protobuf/SerializationSupport.scala | 1 +
.../pekko/cluster/ddata/DurableDataSpec.scala | 9 ++---
.../pekko/cluster/ddata/DurablePruningSpec.scala | 5 +--
.../cluster/ddata/JepsenInspiredInsertSpec.scala | 5 +--
.../pekko/cluster/ddata/PerformanceSpec.scala | 5 +--
.../pekko/cluster/ddata/ReplicatorChaosSpec.scala | 5 +--
.../pekko/cluster/ddata/ReplicatorDeltaSpec.scala | 5 +--
.../pekko/cluster/ddata/ReplicatorGossipSpec.scala | 5 +--
.../cluster/ddata/ReplicatorMapDeltaSpec.scala | 5 +--
.../cluster/ddata/ReplicatorORSetDeltaSpec.scala | 5 +--
.../cluster/ddata/ReplicatorPruningSpec.scala | 5 +--
.../pekko/cluster/ddata/ReplicatorSpec.scala | 5 +--
.../pekko/cluster/ddata/DataEnvelopeSpec.scala | 7 ++--
.../ddata/DeltaPropagationSelectorSpec.scala | 7 ++--
.../apache/pekko/cluster/ddata/GCounterSpec.scala | 7 ++--
.../apache/pekko/cluster/ddata/LWWMapSpec.scala | 7 ++--
.../pekko/cluster/ddata/LWWRegisterSpec.scala | 7 ++--
.../pekko/cluster/ddata/LocalConcurrencySpec.scala | 13 +++----
.../apache/pekko/cluster/ddata/LotsOfDataBot.scala | 5 +--
.../org/apache/pekko/cluster/ddata/ORMapSpec.scala | 7 ++--
.../pekko/cluster/ddata/ORMultiMapSpec.scala | 7 ++--
.../org/apache/pekko/cluster/ddata/ORSetSpec.scala | 7 ++--
.../pekko/cluster/ddata/PNCounterMapSpec.scala | 7 ++--
.../apache/pekko/cluster/ddata/PNCounterSpec.scala | 7 ++--
.../pekko/cluster/ddata/PruningStateSpec.scala | 5 +--
.../ddata/ReplicatorWildcardSubscriptionSpec.scala | 11 +++---
.../pekko/cluster/ddata/VersionVectorSpec.scala | 9 ++---
.../pekko/cluster/ddata/WriteAggregatorSpec.scala | 1 +
.../protobuf/ReplicatedDataSerializerSpec.scala | 13 +++----
.../protobuf/ReplicatorMessageSerializerSpec.scala | 13 +++----
.../pekko/remote/testconductor/Conductor.scala | 10 +++---
.../pekko/remote/testconductor/DataTypes.scala | 10 +++---
.../pekko/remote/testconductor/Extension.scala | 5 +--
.../apache/pekko/remote/testconductor/Player.scala | 13 +++----
.../remote/testconductor/RemoteConnection.scala | 7 ++--
.../pekko/remote/testkit/MultiNodeSpec.scala | 14 ++++----
.../pekko/remote/testkit/PerfFlamesSupport.scala | 1 +
.../apache/pekko/osgi/ActorSystemActivator.scala | 3 +-
.../pekko/osgi/BundleDelegatingClassLoader.scala | 2 +-
.../org/apache/pekko/osgi/DefaultOSGiLogger.scala | 1 +
.../apache/pekko/osgi/OsgiActorSystemFactory.scala | 3 +-
.../pekko/osgi/ActorSystemActivatorTest.scala | 13 +++----
.../org/apache/pekko/osgi/PojoSRTestSupport.scala | 2 +-
.../apache/pekko/osgi/test/TestActivators.scala | 3 +-
.../pekko/persistence/query/EventEnvelope.scala | 1 +
.../apache/pekko/persistence/query/Offset.scala | 1 +
.../pekko/persistence/query/PersistenceQuery.scala | 5 +--
.../query/internal/QuerySerializer.scala | 1 +
.../CurrentEventsByPersistenceIdQuery.scala | 1 +
.../query/javadsl/CurrentEventsByTagQuery.scala | 1 +
.../query/javadsl/CurrentPersistenceIdsQuery.scala | 1 +
...DurableStateStorePagedPersistenceIdsQuery.scala | 1 +
.../query/javadsl/DurableStateStoreQuery.scala | 1 +
.../query/javadsl/EventsByPersistenceIdQuery.scala | 1 +
.../query/javadsl/EventsByTagQuery.scala | 1 +
.../query/javadsl/PagedPersistenceIdsQuery.scala | 1 +
.../query/javadsl/PersistenceIdsQuery.scala | 1 +
.../journal/leveldb/AllPersistenceIdsStage.scala | 1 +
.../persistence/query/journal/leveldb/Buffer.scala | 1 +
.../leveldb/EventsByPersistenceIdStage.scala | 1 +
.../query/journal/leveldb/EventsByTagStage.scala | 1 +
.../leveldb/LeveldbReadJournalProvider.scala | 5 +--
.../leveldb/javadsl/LeveldbReadJournal.scala | 1 +
.../leveldb/scaladsl/LeveldbReadJournal.scala | 5 +--
.../CurrentEventsByPersistenceIdQuery.scala | 1 +
.../query/scaladsl/CurrentEventsByTagQuery.scala | 1 +
.../scaladsl/CurrentPersistenceIdsQuery.scala | 1 +
...DurableStateStorePagedPersistenceIdsQuery.scala | 1 +
.../query/scaladsl/DurableStateStoreQuery.scala | 1 +
.../scaladsl/EventsByPersistenceIdQuery.scala | 1 +
.../query/scaladsl/EventsByTagQuery.scala | 1 +
.../query/scaladsl/PagedPersistenceIdsQuery.scala | 1 +
.../query/scaladsl/PersistenceIdsQuery.scala | 1 +
.../persistence/query/typed/EventEnvelope.scala | 3 +-
.../EventsBySliceFirehoseReadJournalProvider.scala | 3 +-
.../typed/internal/EventsBySliceFirehose.scala | 5 +--
...sByPersistenceIdStartingFromSnapshotQuery.scala | 1 +
.../CurrentEventsByPersistenceIdTypedQuery.scala | 1 +
.../typed/javadsl/CurrentEventsBySliceQuery.scala | 1 +
...ntEventsBySliceStartingFromSnapshotsQuery.scala | 1 +
.../javadsl/DurableStateStoreBySliceQuery.scala | 1 +
.../query/typed/javadsl/EventTimestampQuery.scala | 1 +
...sByPersistenceIdStartingFromSnapshotQuery.scala | 1 +
.../javadsl/EventsByPersistenceIdTypedQuery.scala | 1 +
.../typed/javadsl/EventsBySliceFirehoseQuery.scala | 1 +
.../query/typed/javadsl/EventsBySliceQuery.scala | 1 +
.../EventsBySliceStartingFromSnapshotsQuery.scala | 1 +
.../query/typed/javadsl/LoadEventQuery.scala | 1 +
...sByPersistenceIdStartingFromSnapshotQuery.scala | 1 +
.../CurrentEventsByPersistenceIdTypedQuery.scala | 1 +
.../typed/scaladsl/CurrentEventsBySliceQuery.scala | 1 +
...ntEventsBySliceStartingFromSnapshotsQuery.scala | 1 +
.../scaladsl/DurableStateStoreBySliceQuery.scala | 1 +
.../query/typed/scaladsl/EventTimestampQuery.scala | 1 +
...sByPersistenceIdStartingFromSnapshotQuery.scala | 1 +
.../scaladsl/EventsByPersistenceIdTypedQuery.scala | 1 +
.../scaladsl/EventsBySliceFirehoseQuery.scala | 3 +-
.../query/typed/scaladsl/EventsBySliceQuery.scala | 1 +
.../EventsBySliceStartingFromSnapshotsQuery.scala | 1 +
.../query/typed/scaladsl/LoadEventQuery.scala | 1 +
.../pekko/persistence/query/DummyReadJournal.scala | 5 +--
.../persistence/query/PersistenceQuerySpec.scala | 5 +--
.../apache/pekko/persistence/query/TestClock.scala | 2 +-
.../query/internal/QuerySerializerSpec.scala | 1 +
.../journal/leveldb/AllPersistenceIdsSpec.scala | 1 +
.../leveldb/EventsByPersistenceIdSpec.scala | 1 +
.../query/journal/leveldb/EventsByTagSpec.scala | 1 +
.../query/journal/leveldb/TestActor.scala | 1 +
.../query/typed/EventEnvelopeSpec.scala | 1 +
.../typed/internal/EventsBySliceFirehoseSpec.scala | 8 +++--
.../leveldb/PersistencePluginProxySpec.scala | 5 +--
.../journal/leveldb/SharedLeveldbJournalSpec.scala | 5 +--
.../persistence/serialization/SerializerSpec.scala | 5 +--
.../org/apache/pekko/persistence/PluginSpec.scala | 5 +--
.../apache/pekko/persistence/TestSerializer.scala | 1 +
.../japi/journal/JavaJournalPerfSpec.scala | 5 +--
.../persistence/japi/journal/JavaJournalSpec.scala | 5 +--
.../japi/snapshot/JavaSnapshotStoreSpec.scala | 5 +--
.../japi/state/JavaDurableStateStoreSpec.scala | 5 +--
.../persistence/journal/JournalPerfSpec.scala | 7 ++--
.../pekko/persistence/journal/JournalSpec.scala | 5 +--
.../persistence/snapshot/SnapshotStoreSpec.scala | 7 ++--
.../persistence/state/DurableStateStoreSpec.scala | 7 ++--
.../journal/inmem/InmemJournalSpec.scala | 1 +
.../journal/leveldb/LeveldbJournalJavaSpec.scala | 1 +
.../journal/leveldb/LeveldbJournalNativeSpec.scala | 1 +
...bJournalNoAtomicPersistMultipleEventsSpec.scala | 1 +
.../snapshot/local/LocalSnapshotStoreSpec.scala | 5 +--
.../pekko/persistence/testkit/EventStorage.scala | 1 +
.../testkit/PersistenceTestKitPlugin.scala | 5 +--
.../persistence/testkit/SnapshotStorage.scala | 1 +
.../internal/EventSourcedBehaviorTestKitImpl.scala | 1 +
.../testkit/internal/InMemStorageExtension.scala | 1 +
.../testkit/internal/PersistenceInitImpl.scala | 1 +
.../testkit/internal/PersistenceProbeImpl.scala | 1 +
.../internal/SerializedEventStorageImpl.scala | 1 +
.../internal/SerializedSnapshotStorageImpl.scala | 1 +
.../testkit/internal/SimpleEventStorageImpl.scala | 1 +
.../internal/SimpleSnapshotStorageImpl.scala | 1 +
.../SnapshotStorageEmulatorExtension.scala | 1 +
.../testkit/internal/TestKitStorage.scala | 1 +
.../javadsl/EventSourcedBehaviorTestKit.scala | 7 ++--
.../testkit/javadsl/PersistenceInit.scala | 1 +
.../testkit/javadsl/PersistenceProbeBehavior.scala | 1 +
.../testkit/javadsl/PersistenceTestKit.scala | 1 +
.../testkit/javadsl/SnapshotTestKit.scala | 1 +
.../PersistenceTestKitReadJournalProvider.scala | 5 +--
.../internal/EventsByPersistenceIdStage.scala | 1 +
.../query/internal/EventsBySliceStage.scala | 1 +
.../testkit/query/internal/EventsByTagStage.scala | 1 +
.../internal/TypedEventsByPersistenceIdStage.scala | 1 +
.../javadsl/PersistenceTestKitReadJournal.scala | 1 +
.../scaladsl/PersistenceTestKitReadJournal.scala | 9 ++---
.../scaladsl/EventSourcedBehaviorTestKit.scala | 7 ++--
.../testkit/scaladsl/PersistenceInit.scala | 1 +
.../scaladsl/PersistenceProbeBehavior.scala | 1 +
.../testkit/scaladsl/PersistenceTestKit.scala | 5 +--
.../persistence/testkit/scaladsl/TestOps.scala | 1 +
...rsistenceTestKitDurableStateStoreProvider.scala | 5 ++-
.../PersistenceTestKitDurableStateStore.scala | 1 +
.../PersistenceTestKitDurableStateStore.scala | 1 +
.../pekko/persistence/testkit/CommonUtils.scala | 7 ++--
.../testkit/javadsl/CommonSnapshotTests.scala | 5 +--
.../testkit/javadsl/CommonTestKitTests.scala | 5 +--
.../persistence/testkit/javadsl/JavaDslUtils.scala | 1 +
.../testkit/javadsl/SnapshotNotSerializeSpec.scala | 1 +
.../testkit/javadsl/SnapshotSerializeSpec.scala | 1 +
.../testkit/javadsl/TestKitNotSerializeSpec.scala | 1 +
.../testkit/javadsl/TestKitSerializeSpec.scala | 1 +
.../testkit/query/CurrentEventsBySlicesSpec.scala | 5 +--
.../testkit/query/CurrentEventsByTagSpec.scala | 5 +--
.../testkit/query/EventsByPersistenceIdSpec.scala | 9 ++---
.../query/EventsByPersistenceIdTypedSpec.scala | 9 ++---
.../testkit/query/EventsBySliceSpec.scala | 11 +++---
.../testkit/query/EventsByTagSpec.scala | 9 ++---
.../testkit/scaladsl/CommonSnapshotTests.scala | 5 +--
.../testkit/scaladsl/CommonTestKitTests.scala | 5 +--
...EventSourcedBehaviorNoSnapshotTestKitSpec.scala | 9 ++---
.../scaladsl/EventSourcedBehaviorTestKitSpec.scala | 5 +--
.../testkit/scaladsl/MultipleJournalsSpec.scala | 9 ++---
.../PersistenceProbeDurableStateSpec.scala | 7 ++--
.../PersistenceProbeEventSourcedSpec.scala | 7 ++--
.../PersistenceTestKitJournalCompatSpec.scala | 1 +
.../testkit/scaladsl/RuntimeJournalsSpec.scala | 11 +++---
.../testkit/scaladsl/ScalaDslUtils.scala | 1 +
.../scaladsl/SnapshotNotSerializeSpec.scala | 1 +
.../testkit/scaladsl/SnapshotSerializeSpec.scala | 1 +
.../testkit/scaladsl/TestKitNotSerializeSpec.scala | 1 +
.../testkit/scaladsl/TestKitSerializeSpec.scala | 1 +
.../PersistenceTestKitDurableStateStoreSpec.scala | 9 ++---
...ersistenceTestKitDurableStateStoreTCKSpec.scala | 5 +--
.../persistence/typed/EventPublishingSpec.scala | 5 +--
.../typed/EventSourcedBehaviorLoggingSpec.scala | 9 ++---
.../typed/MultiJournalReplicationSpec.scala | 13 +++----
.../typed/ReplicatedEventPublishingSpec.scala | 5 +--
.../typed/ReplicatedEventSourcingSpec.scala | 7 ++--
.../typed/ReplicatedEventSourcingTaggingSpec.scala | 7 ++--
.../persistence/typed/ReplicationBaseSpec.scala | 5 +--
.../typed/ReplicationIllegalAccessSpec.scala | 7 ++--
.../typed/ReplicationSnapshotSpec.scala | 7 ++--
.../pekko/persistence/typed/crdt/CounterSpec.scala | 1 +
.../pekko/persistence/typed/crdt/LwwSpec.scala | 1 +
.../pekko/persistence/typed/crdt/ORSetSpec.scala | 4 +--
.../ReplicatedEventSourcingJacksonSpec.scala | 5 +--
.../scaladsl/EventSourcedBehaviorFailureSpec.scala | 11 +++---
.../EventSourcedBehaviorInterceptorSpec.scala | 11 +++---
.../EventSourcedBehaviorRecoveryTimeoutSpec.scala | 11 +++---
.../scaladsl/EventSourcedBehaviorReplySpec.scala | 5 +--
...urcedBehaviorRetentionOnlyOneSnapshotSpec.scala | 9 ++---
.../EventSourcedBehaviorRetentionSpec.scala | 7 ++--
.../scaladsl/EventSourcedBehaviorSignalSpec.scala | 11 +++---
.../typed/scaladsl/EventSourcedBehaviorSpec.scala | 11 +++---
.../scaladsl/EventSourcedBehaviorStashSpec.scala | 11 +++---
.../scaladsl/EventSourcedBehaviorTimersSpec.scala | 5 +--
.../scaladsl/EventSourcedBehaviorWatchSpec.scala | 9 ++---
.../scaladsl/EventSourcedEventAdapterSpec.scala | 9 ++---
.../scaladsl/EventSourcedSequenceNumberSpec.scala | 9 ++---
.../scaladsl/EventSourcedSnapshotAdapterSpec.scala | 5 +--
.../scaladsl/EventSourcedStashOverflowSpec.scala | 9 ++---
.../typed/scaladsl/LoggerSourceSpec.scala | 9 ++---
.../typed/scaladsl/NullEmptyStateSpec.scala | 9 ++---
.../typed/scaladsl/OptionalSnapshotStoreSpec.scala | 5 +--
.../typed/scaladsl/PerformanceSpec.scala | 9 ++---
.../typed/scaladsl/PrimitiveStateSpec.scala | 9 ++---
.../typed/scaladsl/SlowInMemorySnapshotStore.scala | 1 +
.../typed/scaladsl/SnapshotMutableStateSpec.scala | 11 +++---
.../SnapshotRecoveryWithEmptyJournalSpec.scala | 11 +++---
.../DurableStateBehaviorInterceptorSpec.scala | 11 +++---
.../scaladsl/DurableStateBehaviorReplySpec.scala | 11 +++---
.../state/scaladsl/DurableStateBehaviorSpec.scala | 11 +++---
.../DurableStateBehaviorStashOverflowSpec.scala | 11 +++---
.../scaladsl/DurableStateBehaviorTimersSpec.scala | 11 +++---
.../state/scaladsl/DurableStateRevisionSpec.scala | 11 +++---
.../typed/state/scaladsl/NullEmptyStateSpec.scala | 11 +++---
.../typed/state/scaladsl/PrimitiveStateSpec.scala | 11 +++---
.../scaladsl/RuntimeDurableStateStoreSpec.scala | 10 +++---
.../pekko/persistence/typed/EventAdapter.scala | 1 +
.../persistence/typed/EventSourcedSignal.scala | 1 +
.../pekko/persistence/typed/PublishedEvent.scala | 1 +
.../typed/SnapshotSelectionCriteria.scala | 1 +
.../pekko/persistence/typed/crdt/ORSet.scala | 1 +
.../typed/delivery/EventSourcedProducerQueue.scala | 5 +--
.../persistence/typed/internal/BehaviorSetup.scala | 11 +++---
.../persistence/typed/internal/EffectImpl.scala | 1 +
.../typed/internal/EventSourcedBehaviorImpl.scala | 9 ++---
.../typed/internal/EventSourcedSettings.scala | 5 +--
.../typed/internal/ExternalInteractions.scala | 1 +
.../typed/internal/FastForwardingFilter.scala | 1 +
.../typed/internal/JournalFailureException.scala | 1 +
.../typed/internal/NoOpSnapshotAdapter.scala | 1 +
.../persistence/typed/internal/RecoveryImpl.scala | 3 +-
.../typed/internal/ReplayingEvents.scala | 1 +
.../typed/internal/ReplayingSnapshot.scala | 1 +
.../typed/internal/ReplicationSetup.scala | 1 +
.../typed/internal/RequestingRecoveryPermit.scala | 1 +
.../typed/internal/RetentionCriteriaImpl.scala | 1 +
.../pekko/persistence/typed/internal/Running.scala | 1 +
.../persistence/typed/internal/SideEffect.scala | 1 +
.../typed/internal/StashManagement.scala | 1 +
.../persistence/typed/javadsl/CommandHandler.scala | 1 +
.../typed/javadsl/CommandHandlerWithReply.scala | 1 +
.../pekko/persistence/typed/javadsl/Effect.scala | 1 +
.../persistence/typed/javadsl/EventHandler.scala | 1 +
.../typed/javadsl/EventSourcedBehavior.scala | 5 +--
.../typed/javadsl/PersistentFSMMigration.scala | 1 +
.../pekko/persistence/typed/javadsl/Recovery.scala | 1 +
.../javadsl/ReplicatedEventSourcedBehavior.scala | 1 +
.../typed/javadsl/ReplicatedEventSourcing.scala | 3 +-
.../typed/javadsl/RetentionCriteria.scala | 1 +
.../persistence/typed/javadsl/SignalHandler.scala | 1 +
.../pekko/persistence/typed/scaladsl/Effect.scala | 1 +
.../typed/scaladsl/EventSourcedBehavior.scala | 5 +--
.../typed/scaladsl/PersistentFSMMigration.scala | 1 +
.../persistence/typed/scaladsl/Recovery.scala | 1 +
.../typed/scaladsl/ReplicatedEventSourcing.scala | 1 +
.../typed/scaladsl/RetentionCriteria.scala | 1 +
.../ReplicatedEventSourcingSerializer.scala | 3 +-
.../typed/state/DurableStateSignal.scala | 1 +
.../typed/state/internal/BehaviorSetup.scala | 11 +++---
.../state/internal/DurableStateBehaviorImpl.scala | 9 ++---
.../state/internal/DurableStateSettings.scala | 7 ++--
.../internal/DurableStateStoreException.scala | 1 +
.../internal/DurableStateStoreInteractions.scala | 1 +
.../typed/state/internal/EffectImpl.scala | 1 +
.../typed/state/internal/NoOpSnapshotAdapter.scala | 1 +
.../typed/state/internal/Recovering.scala | 1 +
.../state/internal/RequestingRecoveryPermit.scala | 1 +
.../persistence/typed/state/internal/Running.scala | 1 +
.../typed/state/internal/SideEffect.scala | 1 +
.../typed/state/internal/StashManagement.scala | 1 +
.../typed/state/javadsl/CommandHandler.scala | 3 +-
.../state/javadsl/CommandHandlerWithReply.scala | 3 +-
.../typed/state/javadsl/DurableStateBehavior.scala | 9 ++---
.../persistence/typed/state/javadsl/Effect.scala | 1 +
.../typed/state/javadsl/SignalHandler.scala | 1 +
.../state/scaladsl/DurableStateBehavior.scala | 3 +-
.../persistence/typed/state/scaladsl/Effect.scala | 1 +
.../typed/ClusterSingletonPersistenceSpec.scala | 9 ++---
.../persistence/typed/ManyRecoveriesSpec.scala | 5 +--
.../ReplicatedEventSourcingSerializationSpec.scala | 5 +--
.../typed/StashingWhenSnapshottingSpec.scala | 9 ++---
.../delivery/EventSourcedProducerQueueSpec.scala | 11 +++---
...DeliveryWithEventSourcedProducerQueueSpec.scala | 11 +++---
...kPullingWithEventSourcedProducerQueueSpec.scala | 11 +++---
.../typed/internal/RecoveryPermitterSpec.scala | 5 +--
.../typed/internal/RetentionCriteriaSpec.scala | 5 +--
.../typed/internal/StashStateSpec.scala | 5 +--
.../scaladsl/PersistentActorCompileOnlyTest.scala | 1 +
.../typed/scaladsl/SnapshotIsOptionalSpec.scala | 11 +++---
.../ReplicatedEventSourcingSerializerSpec.scala | 5 +--
.../pekko/persistence/AtLeastOnceDelivery.scala | 1 +
.../apache/pekko/persistence/Eventsourced.scala | 5 +--
.../org/apache/pekko/persistence/Persistence.scala | 5 +--
.../pekko/persistence/PersistencePlugin.scala | 5 +--
.../org/apache/pekko/persistence/Persistent.scala | 1 +
.../apache/pekko/persistence/PersistentActor.scala | 5 +--
.../pekko/persistence/RecoveryPermitter.scala | 1 +
.../org/apache/pekko/persistence/Snapshotter.scala | 1 +
.../pekko/persistence/fsm/PersistentFSM.scala | 5 +--
.../pekko/persistence/fsm/PersistentFSMBase.scala | 4 +--
.../pekko/persistence/journal/AsyncRecovery.scala | 1 +
.../persistence/journal/AsyncWriteJournal.scala | 3 +-
.../persistence/journal/AsyncWriteProxy.scala | 1 +
.../pekko/persistence/journal/EventAdapters.scala | 5 +--
.../journal/PersistencePluginProxy.scala | 5 +--
.../pekko/persistence/journal/ReplayFilter.scala | 1 +
.../persistence/journal/WriteJournalBase.scala | 1 +
.../persistence/journal/inmem/InmemJournal.scala | 7 ++--
.../persistence/journal/japi/AsyncRecovery.scala | 1 +
.../journal/japi/AsyncWriteJournal.scala | 1 +
.../journal/leveldb/LeveldbIdMapping.scala | 1 +
.../journal/leveldb/LeveldbJournal.scala | 7 ++--
.../journal/leveldb/LeveldbRecovery.scala | 1 +
.../persistence/journal/leveldb/LeveldbStore.scala | 5 +--
.../journal/leveldb/SharedLeveldbStore.scala | 5 +--
.../serialization/FilteredPayloadSerializer.scala | 1 +
.../serialization/MessageSerializer.scala | 1 +
.../serialization/SnapshotSerializer.scala | 1 +
.../persistence/snapshot/NoSnapshotStore.scala | 1 +
.../pekko/persistence/snapshot/SnapshotStore.scala | 1 +
.../persistence/snapshot/japi/SnapshotStore.scala | 1 +
.../snapshot/local/LocalSnapshotStore.scala | 5 +--
.../state/DurableStateStoreRegistry.scala | 7 ++--
.../state/javadsl/DurableStateStore.scala | 1 +
.../state/javadsl/DurableStateUpdateStore.scala | 1 +
.../state/scaladsl/DurableStateStore.scala | 1 +
.../state/scaladsl/DurableStateUpdateStore.scala | 1 +
.../persistence/AtLeastOnceDeliveryCrashSpec.scala | 1 +
.../AtLeastOnceDeliveryFailureSpec.scala | 5 +--
.../persistence/AtLeastOnceDeliverySpec.scala | 2 ++
.../persistence/EndToEndEventAdapterSpec.scala | 7 ++--
.../pekko/persistence/EventAdapterSpec.scala | 5 +--
.../EventSourcedActorDeleteFailureSpec.scala | 1 +
.../persistence/EventSourcedActorFailureSpec.scala | 3 +-
.../apache/pekko/persistence/LoadPluginSpec.scala | 5 +--
.../pekko/persistence/ManyRecoveriesSpec.scala | 5 +--
.../pekko/persistence/OptimizedRecoverySpec.scala | 1 +
.../persistence/OptionalSnapshotStoreSpec.scala | 5 +--
.../apache/pekko/persistence/PerformanceSpec.scala | 5 +--
.../apache/pekko/persistence/PersistenceSpec.scala | 5 +--
.../PersistentActorBoundedStashingSpec.scala | 9 ++---
.../PersistentActorJournalProtocolSpec.scala | 5 +--
.../PersistentActorRecoveryTimeoutSpec.scala | 5 +--
.../pekko/persistence/PersistentActorSpec.scala | 7 ++--
.../persistence/PersistentActorStashingSpec.scala | 5 +--
.../pekko/persistence/RecoveryPermitterSpec.scala | 5 +--
.../apache/pekko/persistence/SliceRangesSpec.scala | 1 +
.../persistence/SnapshotDecodeFailureSpec.scala | 1 +
.../persistence/SnapshotDirectoryFailureSpec.scala | 1 +
.../SnapshotFailureRobustnessSpec.scala | 5 +--
.../SnapshotRecoveryLocalStoreSpec.scala | 1 +
.../SnapshotRecoveryWithEmptyJournalSpec.scala | 1 +
.../persistence/SnapshotSerializationSpec.scala | 1 +
.../apache/pekko/persistence/SnapshotSpec.scala | 1 +
.../persistence/TimerPersistentActorSpec.scala | 5 +--
.../pekko/persistence/fsm/PersistentFSMSpec.scala | 5 +--
.../AsyncWriteJournalResponseOrderSpec.scala | 2 +-
.../journal/InmemEventAdaptersSpec.scala | 5 +--
.../persistence/journal/ReplayFilterSpec.scala | 1 +
.../persistence/journal/SteppingInmemJournal.scala | 7 ++--
.../persistence/journal/chaos/ChaosJournal.scala | 1 +
.../journal/inmem/InmemJournalSpec.scala | 1 +
.../journal/leveldb/JournalCompactionSpec.scala | 5 +--
.../FilteredPayloadSerializerSpec.scala | 1 +
.../serialization/MessageSerializerSpec.scala | 1 +
.../SnapshotSerializerMigrationAkkaSpec.scala | 5 +--
.../SnapshotSerializerNoMigrationSpec.scala | 1 +
.../serialization/SnapshotSerializerSpec.scala | 4 +--
.../apache/pekko/pki/pem/DERPrivateKeyLoader.scala | 1 +
project/PekkoBuild.scala | 8 +++--
project/ScalaFixExtraRulesPlugin.scala | 9 ++---
project/ScalaFixForJdk21Plugin.scala | 2 +-
project/ScalafixForMultiNodePlugin.scala | 2 +-
.../pekko/remote/AttemptSysMsgRedeliverySpec.scala | 8 ++---
.../pekko/remote/LookupRemoteActorSpec.scala | 8 ++---
.../apache/pekko/remote/NewRemoteActorSpec.scala | 8 ++---
.../remote/PiercingShouldKeepQuarantineSpec.scala | 5 +--
.../apache/pekko/remote/RemoteDeliverySpec.scala | 5 +--
.../remote/RemoteDeploymentDeathWatchSpec.scala | 5 +--
.../apache/pekko/remote/RemoteFeaturesSpec.scala | 5 +--
.../pekko/remote/RemoteNodeDeathWatchSpec.scala | 5 +--
.../remote/RemoteNodeRestartDeathWatchSpec.scala | 5 +--
.../remote/RemoteQuarantinePiercingSpec.scala | 5 +--
.../pekko/remote/RemoteReDeploymentSpec.scala | 5 +--
.../pekko/remote/RemotingMultiNodeSpec.scala | 7 ++--
.../apache/pekko/remote/TransportFailSpec.scala | 7 ++--
.../pekko/remote/artery/DirectMemorySpec.scala | 5 +--
.../pekko/remote/artery/FanInThrougputSpec.scala | 5 +--
.../pekko/remote/artery/FanOutThrougputSpec.scala | 5 +--
.../artery/HandshakeRestartReceiverSpec.scala | 5 +--
.../apache/pekko/remote/artery/LatencySpec.scala | 5 +--
.../pekko/remote/artery/MaxThroughputSpec.scala | 5 +--
.../artery/RemoteRestartedQuarantinedSpec.scala | 5 +--
...dStreamRestartWithCompressionInFlightSpec.scala | 9 ++---
.../artery/SurviveNetworkPartitionSpec.scala | 5 +--
.../apache/pekko/remote/artery/TestMessage.scala | 1 +
.../apache/pekko/remote/artery/UdpPortActor.scala | 1 +
.../artery/aeron/AeronStreamConcistencySpec.scala | 5 +--
.../artery/aeron/AeronStreamLatencySpec.scala | 5 +--
.../aeron/AeronStreamMaxThroughputSpec.scala | 5 +--
.../artery/aeron/AeronStreamMultiNodeSpec.scala | 1 +
.../remote/classic/RemoteGatePiercingSpec.scala | 5 +--
.../remote/classic/RemoteNodeRestartGateSpec.scala | 5 +--
.../RemoteNodeShutdownAndComesBackSpec.scala | 5 +--
.../pekko/remote/classic/Ticket15109Spec.scala | 5 +--
.../pekko/remote/routing/RemoteRandomSpec.scala | 5 +--
.../remote/routing/RemoteScatterGatherSpec.scala | 2 +-
.../remote/testconductor/TestConductorSpec.scala | 5 +--
.../pekko/remote/testkit/MultiNodeSpecSpec.scala | 1 +
.../remote/artery/ArteryFailedToBindSpec.scala | 11 +++---
.../remote/classic/RemotingFailedToBindSpec.scala | 5 +--
.../pekko/remote/testconductor/BarrierSpec.scala | 1 +
.../remote/testconductor/ControllerSpec.scala | 1 +
.../org/apache/pekko/remote/AckedDelivery.scala | 1 +
.../apache/pekko/remote/AddressUidExtension.scala | 1 +
.../pekko/remote/BoundAddressesExtension.scala | 1 +
.../org/apache/pekko/remote/ByteStringUtils.scala | 1 +
.../pekko/remote/DeadlineFailureDetector.scala | 5 +--
.../scala/org/apache/pekko/remote/Endpoint.scala | 3 +-
.../pekko/remote/FailureDetectorRegistry.scala | 5 +--
.../apache/pekko/remote/MessageSerializer.scala | 1 +
.../pekko/remote/PhiAccrualFailureDetector.scala | 5 +--
.../pekko/remote/RemoteActorRefProvider.scala | 1 +
.../org/apache/pekko/remote/RemoteDaemon.scala | 1 +
.../org/apache/pekko/remote/RemoteDeployer.scala | 5 +--
.../pekko/remote/RemoteDeploymentWatcher.scala | 1 +
.../org/apache/pekko/remote/RemoteLogMarker.scala | 1 +
.../pekko/remote/RemoteMetricsExtension.scala | 1 +
.../org/apache/pekko/remote/RemoteSettings.scala | 7 ++--
.../org/apache/pekko/remote/RemoteTransport.scala | 1 +
.../org/apache/pekko/remote/RemoteWatcher.scala | 1 +
.../scala/org/apache/pekko/remote/Remoting.scala | 9 ++---
.../pekko/remote/RemotingLifecycleEvent.scala | 1 +
.../pekko/remote/artery/ArterySettings.scala | 7 ++--
.../pekko/remote/artery/ArteryTransport.scala | 1 +
.../apache/pekko/remote/artery/Association.scala | 1 +
.../org/apache/pekko/remote/artery/Codecs.scala | 1 +
.../org/apache/pekko/remote/artery/Control.scala | 1 +
.../pekko/remote/artery/EnvelopeBufferPool.scala | 1 +
.../remote/artery/FixedSizePartitionHub.scala | 1 +
.../artery/FlushBeforeDeathWatchNotification.scala | 1 +
.../pekko/remote/artery/FlushOnShutdown.scala | 1 +
.../org/apache/pekko/remote/artery/Handshake.scala | 1 +
.../pekko/remote/artery/ImmutableLongMap.scala | 1 +
.../pekko/remote/artery/InboundEnvelope.scala | 1 +
.../remote/artery/InboundQuarantineCheck.scala | 1 +
.../pekko/remote/artery/MessageDispatcher.scala | 1 +
.../pekko/remote/artery/OutboundEnvelope.scala | 1 +
.../pekko/remote/artery/RemoteInstrument.scala | 1 +
.../remote/artery/RemotingFlightRecorder.scala | 1 +
.../org/apache/pekko/remote/artery/SendQueue.scala | 1 +
.../remote/artery/SystemMessageDelivery.scala | 1 +
.../org/apache/pekko/remote/artery/TestStage.scala | 1 +
.../pekko/remote/artery/aeron/AeronSink.scala | 1 +
.../pekko/remote/artery/aeron/AeronSource.scala | 3 +-
.../artery/aeron/ArteryAeronUdpTransport.scala | 3 +-
.../pekko/remote/artery/aeron/TaskRunner.scala | 1 +
.../artery/compress/CompressionProtocol.scala | 1 +
.../remote/artery/compress/CompressionTable.scala | 1 +
.../artery/compress/InboundCompressions.scala | 1 +
.../apache/pekko/remote/artery/jfr/Events.scala | 1 +
.../artery/jfr/JFRRemotingFlightRecorder.scala | 1 +
.../remote/artery/tcp/ArteryTcpTransport.scala | 1 +
.../artery/tcp/ConfigSSLEngineProvider.scala | 5 +--
.../remote/artery/tcp/SSLEngineProvider.scala | 1 +
.../remote/artery/tcp/SecureRandomFactory.scala | 5 +--
.../pekko/remote/artery/tcp/TcpFraming.scala | 1 +
.../artery/tcp/ssl/PemManagersProvider.scala | 3 +-
.../tcp/ssl/RotatingKeysSSLEngineProvider.scala | 5 +--
.../remote/artery/tcp/ssl/SSLEngineConfig.scala | 5 +--
.../pekko/remote/artery/tcp/ssl/X509Readers.scala | 1 +
.../pekko/remote/routing/RemoteRouterConfig.scala | 5 +--
.../serialization/ActorRefResolveCache.scala | 1 +
.../serialization/ArteryMessageSerializer.scala | 1 +
.../serialization/DaemonMsgCreateSerializer.scala | 8 ++---
.../serialization/MessageContainerSerializer.scala | 1 +
.../serialization/MiscMessageSerializer.scala | 5 +--
.../remote/serialization/ProtobufSerializer.scala | 1 +
.../serialization/SystemMessageSerializer.scala | 1 +
.../remote/serialization/ThrowableSupport.scala | 1 +
.../serialization/WrappedPayloadSupport.scala | 1 +
.../transport/AbstractTransportAdapter.scala | 3 +-
.../FailureInjectorTransportAdapter.scala | 4 +--
.../pekko/remote/transport/PekkoPduCodec.scala | 1 +
.../remote/transport/PekkoProtocolTransport.scala | 7 ++--
.../pekko/remote/transport/TestTransport.scala | 7 ++--
.../transport/ThrottlerTransportAdapter.scala | 7 ++--
.../apache/pekko/remote/transport/Transport.scala | 1 +
.../remote/transport/netty/NettyHelpers.scala | 3 +-
.../remote/transport/netty/NettySSLSupport.scala | 3 +-
.../remote/transport/netty/NettyTransport.scala | 33 +++++++++---------
.../remote/transport/netty/SSLEngineProvider.scala | 1 +
.../pekko/remote/transport/netty/TcpSupport.scala | 9 ++---
.../pekko/remote/AccrualFailureDetectorSpec.scala | 1 +
.../pekko/remote/ConfigSSLEngineProviderSpec.scala | 5 +--
.../org/apache/pekko/remote/DaemonicSpec.scala | 5 +--
.../pekko/remote/DeadlineFailureDetectorSpec.scala | 1 +
.../apache/pekko/remote/EndpointRegistrySpec.scala | 1 +
.../pekko/remote/FailureDetectorRegistrySpec.scala | 1 +
.../org/apache/pekko/remote/LogSourceSpec.scala | 1 +
.../apache/pekko/remote/MessageLoggingSpec.scala | 8 ++---
.../apache/pekko/remote/NetworkFailureSpec.scala | 1 +
.../remote/ReliableDeliverySupervisorSpec.scala | 5 +--
.../org/apache/pekko/remote/RemoteConfigSpec.scala | 5 +--
.../remote/RemoteConsistentHashingRouterSpec.scala | 1 +
.../apache/pekko/remote/RemoteDeployerSpec.scala | 5 +--
.../apache/pekko/remote/RemoteFeaturesSpec.scala | 7 ++--
.../org/apache/pekko/remote/RemoteRouterSpec.scala | 5 +--
.../pekko/remote/Ticket1978CommunicationSpec.scala | 9 ++---
.../apache/pekko/remote/Ticket1978ConfigSpec.scala | 1 +
.../remote/TransientSerializationErrorSpec.scala | 5 +--
.../ActorRefResolveCacheQuarantineSpec.scala | 1 +
.../ActorSelectionQueueDistributionSpec.scala | 7 ++--
.../pekko/remote/artery/ArteryMultiNodeSpec.scala | 9 ++---
.../remote/artery/BindCanonicalAddressSpec.scala | 7 ++--
.../pekko/remote/artery/DuplicateFlushSpec.scala | 1 +
.../remote/artery/DuplicateHandshakeSpec.scala | 1 +
.../pekko/remote/artery/EnvelopeBufferSpec.scala | 1 +
.../pekko/remote/artery/FlushOnShutdownSpec.scala | 1 +
.../pekko/remote/artery/HandshakeDenySpec.scala | 5 +--
.../pekko/remote/artery/HandshakeFailureSpec.scala | 5 +--
.../pekko/remote/artery/HandshakeRetrySpec.scala | 5 +--
.../remote/artery/HarmlessQuarantineSpec.scala | 7 ++--
.../remote/artery/InboundControlJunctionSpec.scala | 1 +
.../pekko/remote/artery/InboundHandshakeSpec.scala | 1 +
.../remote/artery/LargeMessagesStreamSpec.scala | 1 +
.../pekko/remote/artery/LateConnectSpec.scala | 5 +--
.../pekko/remote/artery/LruBoundedCacheSpec.scala | 1 +
.../pekko/remote/artery/MetadataCarryingSpec.scala | 3 +-
.../artery/OutboundControlJunctionSpec.scala | 1 +
.../remote/artery/OutboundHandshakeSpec.scala | 1 +
.../remote/artery/OutboundIdleShutdownSpec.scala | 9 ++---
.../remote/artery/RemoteActorRefProviderSpec.scala | 1 +
.../remote/artery/RemoteActorSelectionSpec.scala | 1 +
.../pekko/remote/artery/RemoteConnectionSpec.scala | 1 +
.../pekko/remote/artery/RemoteDeathWatchSpec.scala | 5 +--
.../pekko/remote/artery/RemoteDeployerSpec.scala | 5 +--
.../pekko/remote/artery/RemoteDeploymentSpec.scala | 5 +--
.../pekko/remote/artery/RemoteFailureSpec.scala | 1 +
.../RemoteInstrumentsSerializationSpec.scala | 3 +-
.../artery/RemoteMessageSerializationSpec.scala | 1 +
.../pekko/remote/artery/RemoteRouterSpec.scala | 5 +--
.../remote/artery/RemoteSendConsistencySpec.scala | 5 +--
.../pekko/remote/artery/RemoteWatcherSpec.scala | 5 +--
.../remote/artery/RemotingFlightRecorderSpec.scala | 3 +-
.../apache/pekko/remote/artery/SendQueueSpec.scala | 1 +
.../remote/artery/SerializationErrorSpec.scala | 1 +
.../remote/artery/SystemMessageAckerSpec.scala | 1 +
.../remote/artery/SystemMessageDeliverySpec.scala | 7 ++--
.../apache/pekko/remote/artery/TestContext.scala | 5 +--
.../apache/pekko/remote/artery/UntrustedSpec.scala | 5 +--
.../pekko/remote/artery/aeron/AeronSinkSpec.scala | 1 +
.../compress/CompressionIntegrationSpec.scala | 5 +--
.../HandshakeShouldDropCompressionTableSpec.scala | 9 ++---
.../artery/compress/OutboundCompressionSpec.scala | 1 +
.../artery/jfr/JFRRemotingFlightRecorderSpec.scala | 5 +--
.../tcp/ArteryConfigSSLEngineProviderSpec.scala | 3 +-
.../artery/tcp/SecureRandomFactorySpec.scala | 1 +
.../pekko/remote/artery/tcp/TcpFramingSpec.scala | 1 +
.../pekko/remote/artery/tcp/TlsTcpSpec.scala | 11 +++---
.../artery/tcp/ssl/CipherSuiteSupportCheck.scala | 5 +--
.../ssl/RotatingKeysSSLEngineProviderSpec.scala | 9 ++---
.../pekko/remote/classic/ActorsLeakSpec.scala | 5 +--
.../remote/classic/RemoteDeathWatchSpec.scala | 5 +--
.../classic/RemoteDeploymentAllowListSpec.scala | 5 +--
.../pekko/remote/classic/RemoteInitErrorSpec.scala | 3 +-
.../pekko/remote/classic/RemoteSettingsSpec.scala | 7 ++--
.../pekko/remote/classic/RemoteWatcherSpec.scala | 1 +
.../apache/pekko/remote/classic/RemotingSpec.scala | 7 ++--
.../pekko/remote/classic/UntrustedSpec.scala | 5 +--
.../classic/transport/GenericTransportSpec.scala | 1 +
.../classic/transport/PekkoProtocolSpec.scala | 7 ++--
.../transport/PekkoProtocolStressTest.scala | 5 +--
.../transport/SwitchableLoggedBehaviorSpec.scala | 1 +
.../SystemMessageDeliveryStressTest.scala | 5 +--
.../classic/transport/TestTransportSpec.scala | 1 +
.../classic/transport/ThrottleModeSpec.scala | 1 +
.../transport/ThrottlerTransportAdapterSpec.scala | 5 +--
.../AllowJavaSerializationOffSpec.scala | 5 +--
.../ArteryMessageSerializerSpec.scala | 1 +
...reateSerializerAllowJavaSerializationSpec.scala | 5 +--
.../MessageContainerSerializerSpec.scala | 1 +
.../serialization/MiscMessageSerializerSpec.scala | 5 +--
.../serialization/ProtobufSerializerSpec.scala | 1 +
.../SerializationTransportInformationSpec.scala | 7 ++--
.../SystemMessageSerializationSpec.scala | 5 +--
.../remote/transport/NettyTransportSpec.scala | 9 ++---
.../remote/transport/ThrottlerHandleSpec.scala | 1 +
.../serialization/jackson/ActorRefModule.scala | 1 +
.../serialization/jackson/ActorSystemAccess.scala | 1 +
.../serialization/jackson/AddressModule.scala | 1 +
.../jackson/FiniteDurationModule.scala | 1 +
.../serialization/jackson/JacksonModule.scala | 1 +
.../jackson/JacksonObjectMapperProvider.scala | 13 +++----
.../serialization/jackson/JacksonSerializer.scala | 3 +-
.../jackson/PekkoSerializationModule.scala | 2 +-
.../serialization/jackson/StreamRefModule.scala | 1 +
.../jackson/TypedActorRefModule.scala | 1 +
.../serialization/jackson/JacksonFactorySpec.scala | 5 +--
.../jackson/JacksonSerializerSpec.scala | 15 ++++----
.../serialization/jackson3/ActorRefModule.scala | 1 +
.../serialization/jackson3/ActorSystemAccess.scala | 1 +
.../serialization/jackson3/AddressModule.scala | 1 +
.../jackson3/FiniteDurationModule.scala | 1 +
.../serialization/jackson3/JacksonModule.scala | 1 +
.../jackson3/JacksonObjectMapperProvider.scala | 13 +++----
.../serialization/jackson3/JacksonSerializer.scala | 3 +-
.../jackson3/PekkoSerializationModule.scala | 2 +-
.../serialization/jackson3/StreamRefModule.scala | 1 +
.../jackson3/TypedActorRefModule.scala | 1 +
.../jackson3/JacksonFactorySpec.scala | 5 +--
.../jackson3/JacksonSerializerSpec.scala | 27 ++++++++-------
.../org/apache/pekko/event/slf4j/Slf4jLogger.scala | 5 +--
.../apache/pekko/event/slf4j/Slf4jLoggerSpec.scala | 7 ++--
.../pekko/event/slf4j/Slf4jLoggingFilterSpec.scala | 5 +--
.../pekko/stream/testkit/StreamTestKit.scala | 5 +--
.../pekko/stream/testkit/TestGraphStage.scala | 1 +
.../stream/testkit/javadsl/StreamTestKit.scala | 1 +
.../pekko/stream/testkit/javadsl/TestSink.scala | 1 +
.../pekko/stream/testkit/javadsl/TestSource.scala | 1 +
.../stream/testkit/scaladsl/StreamTestKit.scala | 3 +-
.../pekko/stream/testkit/scaladsl/TestSink.scala | 1 +
.../pekko/stream/testkit/scaladsl/TestSource.scala | 1 +
.../impl/fusing/GraphInterpreterSpecKit.scala | 1 +
.../pekko/stream/testkit/BaseTwoStreamsSetup.scala | 5 +--
.../apache/pekko/stream/testkit/ChainSetup.scala | 5 +--
.../apache/pekko/stream/testkit/ScriptedTest.scala | 9 ++---
.../apache/pekko/stream/testkit/StreamSpec.scala | 9 ++---
.../stream/testkit/StreamTestDefaultMailbox.scala | 5 +--
.../pekko/stream/testkit/StreamTestKitSpec.scala | 1 +
.../testkit/TestPublisherSubscriberSpec.scala | 5 +--
.../pekko/stream/testkit/TwoStreamsSetup.scala | 5 +--
.../org/apache/pekko/stream/testkit/Utils.scala | 5 +--
.../pekko/stream/tck/ActorSystemLifecycle.scala | 7 ++--
.../org/apache/pekko/stream/tck/ConcatTest.scala | 5 +--
.../pekko/stream/tck/FanoutPublisherTest.scala | 5 +--
.../pekko/stream/tck/FilePublisherTest.scala | 5 +--
.../tck/FlatMapConcatDoubleSubscriberTest.scala | 2 +-
.../org/apache/pekko/stream/tck/FlattenTest.scala | 5 +--
.../pekko/stream/tck/FusableProcessorTest.scala | 5 +--
.../pekko/stream/tck/FuturePublisherTest.scala | 5 +--
.../org/apache/pekko/stream/tck/GroupByTest.scala | 5 +--
.../pekko/stream/tck/InputStreamSourceTest.scala | 5 +--
.../pekko/stream/tck/IterablePublisherTest.scala | 5 +--
...IterablePublisherViaJavaFlowPublisherTest.scala | 5 +--
.../tck/PekkoIdentityProcessorVerification.scala | 2 +-
.../pekko/stream/tck/PrefixAndTailTest.scala | 5 +--
.../pekko/stream/tck/SingleElementSourceTest.scala | 5 +--
.../pekko/stream/tck/SinkholeSubscriberTest.scala | 9 ++---
.../apache/pekko/stream/tck/SplitWhenTest.scala | 5 +--
.../pekko/stream/tck/TransformProcessorTest.scala | 5 +--
.../pekko/stream/tck/VirtualPublisherTest.scala | 5 +--
.../pekko/stream/ActorMaterializerSpec.scala | 5 +--
.../scala/org/apache/pekko/stream/FusingSpec.scala | 6 ++--
.../pekko/stream/SourceLocationAttributeSpec.scala | 1 +
.../pekko/stream/StreamAttributeDocSpec.scala | 1 +
.../apache/pekko/stream/StreamDispatcherSpec.scala | 1 +
.../pekko/stream/SystemMaterializerSpec.scala | 5 +--
.../stream/impl/FanoutPublisherBehaviorSpec.scala | 1 +
.../apache/pekko/stream/impl/FixedBufferSpec.scala | 1 +
.../pekko/stream/impl/GraphStageLogicSpec.scala | 5 +--
.../stream/impl/LinearTraversalBuilderSpec.scala | 1 +
.../pekko/stream/impl/SubInletOutletSpec.scala | 1 +
.../apache/pekko/stream/impl/TimeoutsSpec.scala | 7 ++--
.../pekko/stream/impl/TraversalBuilderSpec.scala | 1 +
.../pekko/stream/impl/TraversalTestUtils.scala | 1 +
.../impl/fusing/ActorGraphInterpreterSpec.scala | 9 ++---
.../stream/impl/fusing/AsyncCallbackSpec.scala | 1 +
.../stream/impl/fusing/ChasingEventsSpec.scala | 1 +
.../fusing/GraphInterpreterFailureModesSpec.scala | 1 +
.../impl/fusing/GraphInterpreterPortsSpec.scala | 1 +
.../stream/impl/fusing/GraphInterpreterSpec.scala | 1 +
.../pekko/stream/impl/fusing/InterpreterSpec.scala | 1 +
.../stream/impl/fusing/InterpreterStressSpec.scala | 1 +
.../impl/fusing/InterpreterSupervisionSpec.scala | 1 +
.../stream/impl/fusing/KeepGoingStageSpec.scala | 1 +
.../impl/fusing/LifecycleInterpreterSpec.scala | 1 +
.../apache/pekko/stream/impl/io/TLSUtilsSpec.scala | 5 +--
.../pekko/stream/io/ByteStringParserSpec.scala | 1 +
.../org/apache/pekko/stream/io/FileSinkSpec.scala | 7 ++--
.../apache/pekko/stream/io/FileSourceSpec.scala | 1 +
.../pekko/stream/io/InputStreamSinkSpec.scala | 1 +
.../pekko/stream/io/InputStreamSourceSpec.scala | 1 +
.../pekko/stream/io/OutputStreamSinkSpec.scala | 5 +--
.../pekko/stream/io/OutputStreamSourceSpec.scala | 3 +-
.../org/apache/pekko/stream/io/TcpHelper.scala | 1 +
.../scala/org/apache/pekko/stream/io/TcpSpec.scala | 13 +++----
.../stream/io/TlsGraphStageEdgeCasesSpec.scala | 5 +--
.../stream/io/TlsGraphStageIsolatedSpec.scala | 1 +
.../scala/org/apache/pekko/stream/io/TlsSpec.scala | 1 +
.../stream/io/compression/CodecSpecSupport.scala | 7 ++--
.../pekko/stream/io/compression/CoderSpec.scala | 7 ++--
.../io/compression/CompressionTestingTools.scala | 3 +-
.../pekko/stream/io/compression/DeflateSpec.scala | 1 +
.../pekko/stream/io/compression/GzipSpec.scala | 1 +
.../GzipWithCustomCompressionLevelSpec.scala | 1 +
.../scaladsl/ActorRefBackpressureSinkSpec.scala | 1 +
.../scaladsl/ActorRefBackpressureSourceSpec.scala | 1 +
.../pekko/stream/scaladsl/ActorRefSinkSpec.scala | 1 +
.../pekko/stream/scaladsl/ActorRefSourceSpec.scala | 5 +--
.../scaladsl/AggregateWithBoundarySpec.scala | 11 +++---
.../pekko/stream/scaladsl/AttributesSpec.scala | 5 +--
.../pekko/stream/scaladsl/BidiFlowSpec.scala | 1 +
.../stream/scaladsl/BoundedSourceQueueSpec.scala | 7 ++--
.../stream/scaladsl/CancellationStrategySpec.scala | 1 +
.../pekko/stream/scaladsl/CollectionSinkSpec.scala | 1 +
.../pekko/stream/scaladsl/CompressionSpec.scala | 1 +
.../scaladsl/CoupledTerminationFlowSpec.scala | 13 +++----
.../stream/scaladsl/EagerFutureSinkSpec.scala | 1 +
.../pekko/stream/scaladsl/FailedSourceSpec.scala | 1 +
.../pekko/stream/scaladsl/FlowAlsoToAllSpec.scala | 1 +
.../pekko/stream/scaladsl/FlowAlsoToSpec.scala | 5 +--
.../pekko/stream/scaladsl/FlowAppendSpec.scala | 7 ++--
.../apache/pekko/stream/scaladsl/FlowAskSpec.scala | 1 +
.../pekko/stream/scaladsl/FlowBatchSpec.scala | 1 +
.../pekko/stream/scaladsl/FlowBufferSpec.scala | 1 +
.../stream/scaladsl/FlowCollectFirstSpec.scala | 1 +
.../pekko/stream/scaladsl/FlowCollectSpec.scala | 1 +
.../stream/scaladsl/FlowCollectWhileSpec.scala | 1 +
.../pekko/stream/scaladsl/FlowCompileSpec.scala | 5 +--
.../stream/scaladsl/FlowConcatAllLazySpec.scala | 1 +
.../pekko/stream/scaladsl/FlowConcatAllSpec.scala | 1 +
.../pekko/stream/scaladsl/FlowConcatSpec.scala | 9 ++---
.../pekko/stream/scaladsl/FlowConflateSpec.scala | 1 +
.../pekko/stream/scaladsl/FlowDelaySpec.scala | 9 ++---
.../pekko/stream/scaladsl/FlowDetacherSpec.scala | 1 +
.../pekko/stream/scaladsl/FlowDispatcherSpec.scala | 1 +
.../pekko/stream/scaladsl/FlowDoOnCancelSpec.scala | 1 +
.../pekko/stream/scaladsl/FlowDoOnFirstSpec.scala | 1 +
.../stream/scaladsl/FlowDropRepeatedSpec.scala | 1 +
.../pekko/stream/scaladsl/FlowDropWhileSpec.scala | 1 +
.../pekko/stream/scaladsl/FlowExpandSpec.scala | 1 +
.../stream/scaladsl/FlowExtrapolateSpec.scala | 1 +
.../pekko/stream/scaladsl/FlowFilterSpec.scala | 1 +
.../FlowFlatMapConcatParallelismSpec.scala | 5 +--
.../stream/scaladsl/FlowFlatMapPrefixSpec.scala | 1 +
.../stream/scaladsl/FlowFlattenMergeSpec.scala | 5 +--
.../pekko/stream/scaladsl/FlowFoldAsyncSpec.scala | 5 +--
.../pekko/stream/scaladsl/FlowFoldSpec.scala | 1 +
.../pekko/stream/scaladsl/FlowFoldWhileSpec.scala | 1 +
.../pekko/stream/scaladsl/FlowForeachSpec.scala | 1 +
.../pekko/stream/scaladsl/FlowFutureFlowSpec.scala | 1 +
.../pekko/stream/scaladsl/FlowGroupBySpec.scala | 9 ++---
.../FlowGroupedAdjacentByWeightedSpec.scala | 1 +
.../pekko/stream/scaladsl/FlowGroupedSpec.scala | 1 +
.../stream/scaladsl/FlowGroupedWeightedSpec.scala | 1 +
.../stream/scaladsl/FlowGroupedWithinSpec.scala | 1 +
.../pekko/stream/scaladsl/FlowIdleInjectSpec.scala | 1 +
.../stream/scaladsl/FlowInitialDelaySpec.scala | 1 +
.../stream/scaladsl/FlowInterleaveAllSpec.scala | 1 +
.../pekko/stream/scaladsl/FlowInterleaveSpec.scala | 5 +--
.../stream/scaladsl/FlowIntersperseSpec.scala | 1 +
.../pekko/stream/scaladsl/FlowIteratorSpec.scala | 1 +
.../pekko/stream/scaladsl/FlowJoinSpec.scala | 5 +--
.../pekko/stream/scaladsl/FlowKillSwitchSpec.scala | 1 +
.../pekko/stream/scaladsl/FlowLimitSpec.scala | 1 +
.../stream/scaladsl/FlowLimitWeightedSpec.scala | 1 +
.../apache/pekko/stream/scaladsl/FlowLogSpec.scala | 1 +
.../stream/scaladsl/FlowLogWithMarkerSpec.scala | 1 +
.../scaladsl/FlowMapAsyncPartitionedSpec.scala | 9 ++---
.../pekko/stream/scaladsl/FlowMapAsyncSpec.scala | 5 +--
.../scaladsl/FlowMapAsyncUnorderedSpec.scala | 5 +--
.../pekko/stream/scaladsl/FlowMapConcatSpec.scala | 1 +
.../pekko/stream/scaladsl/FlowMapErrorSpec.scala | 1 +
.../stream/scaladsl/FlowMapWithResourceSpec.scala | 5 +--
.../pekko/stream/scaladsl/FlowMergeAllSpec.scala | 1 +
.../pekko/stream/scaladsl/FlowMergeSpec.scala | 5 +--
.../pekko/stream/scaladsl/FlowMonitorSpec.scala | 1 +
.../pekko/stream/scaladsl/FlowOnCompleteSpec.scala | 1 +
.../stream/scaladsl/FlowOnErrorCompleteSpec.scala | 1 +
.../stream/scaladsl/FlowOnErrorContinueSpec.scala | 1 +
.../pekko/stream/scaladsl/FlowOrElseSpec.scala | 1 +
.../stream/scaladsl/FlowPrefixAndTailSpec.scala | 1 +
.../stream/scaladsl/FlowPublisherSinkSpec.scala | 1 +
.../pekko/stream/scaladsl/FlowRecoverSpec.scala | 1 +
.../stream/scaladsl/FlowRecoverWithSpec.scala | 7 ++--
.../pekko/stream/scaladsl/FlowReduceSpec.scala | 1 +
.../pekko/stream/scaladsl/FlowScanAsyncSpec.scala | 5 +--
.../pekko/stream/scaladsl/FlowScanSpec.scala | 1 +
.../pekko/stream/scaladsl/FlowSectionSpec.scala | 1 +
.../pekko/stream/scaladsl/FlowSlidingSpec.scala | 5 +--
.../apache/pekko/stream/scaladsl/FlowSpec.scala | 9 ++---
.../pekko/stream/scaladsl/FlowSplitAfterSpec.scala | 7 ++--
.../pekko/stream/scaladsl/FlowSplitWhenSpec.scala | 5 +--
.../scaladsl/FlowStatefulMapConcatSpec.scala | 1 +
.../stream/scaladsl/FlowStatefulMapSpec.scala | 1 +
.../stream/scaladsl/FlowSupervisionSpec.scala | 1 +
.../pekko/stream/scaladsl/FlowSwitchSpec.scala | 5 +--
.../pekko/stream/scaladsl/FlowTakeSpec.scala | 1 +
.../pekko/stream/scaladsl/FlowTakeWhileSpec.scala | 1 +
.../pekko/stream/scaladsl/FlowThrottleSpec.scala | 1 +
.../pekko/stream/scaladsl/FlowWatchSpec.scala | 1 +
.../stream/scaladsl/FlowWatchTerminationSpec.scala | 1 +
.../pekko/stream/scaladsl/FlowWireTapSpec.scala | 1 +
.../stream/scaladsl/FlowWithContextLogSpec.scala | 1 +
.../stream/scaladsl/FlowWithContextSpec.scala | 1 +
.../scaladsl/FlowWithContextThrottleSpec.scala | 1 +
.../pekko/stream/scaladsl/FlowZipAllSpec.scala | 5 +--
.../scaladsl/ForComprehensionsCompileSpec.scala | 1 +
.../apache/pekko/stream/scaladsl/FramingSpec.scala | 1 +
.../stream/scaladsl/FromMaterializationSpec.scala | 3 +-
.../stream/scaladsl/GraphBackedFlowSpec.scala | 9 ++---
.../pekko/stream/scaladsl/GraphBalanceSpec.scala | 1 +
.../pekko/stream/scaladsl/GraphBroadcastSpec.scala | 1 +
.../pekko/stream/scaladsl/GraphConcatSpec.scala | 1 +
.../stream/scaladsl/GraphDSLCompileSpec.scala | 1 +
.../pekko/stream/scaladsl/GraphMatValueSpec.scala | 1 +
.../stream/scaladsl/GraphMergeLatestSpec.scala | 1 +
.../stream/scaladsl/GraphMergePreferredSpec.scala | 1 +
.../scaladsl/GraphMergePrioritizedNSpec.scala | 1 +
.../scaladsl/GraphMergePrioritizedSpec.scala | 1 +
.../stream/scaladsl/GraphMergeSequenceSpec.scala | 1 +
.../stream/scaladsl/GraphMergeSortedSpec.scala | 1 +
.../pekko/stream/scaladsl/GraphMergeSpec.scala | 1 +
.../stream/scaladsl/GraphOpsIntegrationSpec.scala | 1 +
.../pekko/stream/scaladsl/GraphPartialSpec.scala | 1 +
.../pekko/stream/scaladsl/GraphPartitionSpec.scala | 1 +
.../stream/scaladsl/GraphStageTimersSpec.scala | 1 +
.../pekko/stream/scaladsl/GraphUnzipSpec.scala | 1 +
.../pekko/stream/scaladsl/GraphUnzipWithSpec.scala | 5 +--
.../pekko/stream/scaladsl/GraphWireTapSpec.scala | 1 +
.../pekko/stream/scaladsl/GraphZipLatestSpec.scala | 5 +--
.../stream/scaladsl/GraphZipLatestWithSpec.scala | 5 +--
.../pekko/stream/scaladsl/GraphZipNSpec.scala | 1 +
.../pekko/stream/scaladsl/GraphZipSpec.scala | 1 +
.../pekko/stream/scaladsl/GraphZipWithNSpec.scala | 1 +
.../pekko/stream/scaladsl/GraphZipWithSpec.scala | 1 +
.../pekko/stream/scaladsl/HeadSinkSpec.scala | 1 +
.../org/apache/pekko/stream/scaladsl/HubSpec.scala | 7 ++--
.../pekko/stream/scaladsl/JsonFramingSpec.scala | 1 +
.../pekko/stream/scaladsl/LazyFlowSpec.scala | 3 +-
.../pekko/stream/scaladsl/LazySinkSpec.scala | 1 +
.../pekko/stream/scaladsl/LazySourceSpec.scala | 5 +--
.../pekko/stream/scaladsl/MaybeSourceSpec.scala | 1 +
.../pekko/stream/scaladsl/NeverSourceSpec.scala | 1 +
.../pekko/stream/scaladsl/PublisherSinkSpec.scala | 1 +
.../pekko/stream/scaladsl/QueueSinkSpec.scala | 1 +
.../pekko/stream/scaladsl/QueueSourceSpec.scala | 5 +--
.../apache/pekko/stream/scaladsl/RestartSpec.scala | 1 +
.../pekko/stream/scaladsl/RetryFlowSpec.scala | 5 +--
.../pekko/stream/scaladsl/ReverseArrowSpec.scala | 1 +
.../pekko/stream/scaladsl/RunnableGraphSpec.scala | 1 +
.../apache/pekko/stream/scaladsl/SeqSinkSpec.scala | 1 +
.../stream/scaladsl/SinkAsJavaStreamSpec.scala | 1 +
.../stream/scaladsl/SinkForeachAsyncSpec.scala | 1 +
.../apache/pekko/stream/scaladsl/SinkSpec.scala | 11 +++---
.../stream/scaladsl/SourceFromPublisherSpec.scala | 7 ++--
.../pekko/stream/scaladsl/SourceSinkSpec.scala | 1 +
.../stream/scaladsl/SourceWithContextSpec.scala | 1 +
.../pekko/stream/scaladsl/StageActorRefSpec.scala | 1 +
.../stream/scaladsl/StreamConvertersSpec.scala | 9 ++---
.../pekko/stream/scaladsl/StreamRefsSpec.scala | 11 +++---
.../SubstreamSubscriptionTimeoutSpec.scala | 1 +
.../pekko/stream/scaladsl/TakeLastSinkSpec.scala | 5 +--
.../pekko/stream/scaladsl/TickSourceSpec.scala | 1 +
.../scaladsl/UnfoldResourceAsyncSourceSpec.scala | 1 +
.../stream/scaladsl/UnfoldResourceSourceSpec.scala | 1 +
.../stream/scaladsl/WithContextUsageSpec.scala | 1 +
.../stream/snapshot/MaterializerStateSpec.scala | 1 +
.../pekko/stream/MapAsyncPartitionedSpec.scala | 13 +++----
.../pekko/stream/typed/javadsl/ActorFlow.scala | 1 +
.../pekko/stream/typed/javadsl/ActorSink.scala | 1 +
.../pekko/stream/typed/javadsl/ActorSource.scala | 1 +
.../apache/pekko/stream/typed/javadsl/PubSub.scala | 1 +
.../pekko/stream/typed/scaladsl/ActorFlow.scala | 1 +
.../pekko/stream/typed/scaladsl/ActorSink.scala | 1 +
.../pekko/stream/typed/scaladsl/ActorSource.scala | 1 +
.../pekko/stream/typed/scaladsl/PubSub.scala | 1 +
.../typed/scaladsl/ActorSourceSinkSpec.scala | 5 +--
.../typed/scaladsl/MaterializerForTypedSpec.scala | 5 +--
.../pekko/stream/typed/scaladsl/PubSubSpec.scala | 5 +--
.../apache/pekko/stream/ActorMaterializer.scala | 5 +--
.../scala/org/apache/pekko/stream/Attributes.scala | 3 +-
.../apache/pekko/stream/BoundedSourceQueue.scala | 1 +
.../main/scala/org/apache/pekko/stream/Graph.scala | 1 +
.../scala/org/apache/pekko/stream/IOResult.scala | 1 +
.../scala/org/apache/pekko/stream/KillSwitch.scala | 1 +
.../apache/pekko/stream/MapAsyncPartitioned.scala | 3 +-
.../org/apache/pekko/stream/Materializer.scala | 1 +
.../pekko/stream/MaterializerLoggingProvider.scala | 1 +
.../org/apache/pekko/stream/OverflowStrategy.scala | 4 +--
.../org/apache/pekko/stream/RestartSettings.scala | 1 +
.../main/scala/org/apache/pekko/stream/Shape.scala | 1 +
.../org/apache/pekko/stream/SslTlsOptions.scala | 1 +
.../scala/org/apache/pekko/stream/StreamRefs.scala | 1 +
.../pekko/stream/StreamTimeoutException.scala | 1 +
.../apache/pekko/stream/SystemMaterializer.scala | 1 +
.../pekko/stream/impl/ActorMaterializerImpl.scala | 1 +
.../apache/pekko/stream/impl/ActorProcessor.scala | 5 +--
.../apache/pekko/stream/impl/ActorPublisher.scala | 7 ++--
.../impl/ActorRefBackpressureSinkStage.scala | 1 +
.../stream/impl/ActorRefBackpressureSource.scala | 1 +
.../pekko/stream/impl/ActorRefSinkStage.scala | 1 +
.../apache/pekko/stream/impl/ActorRefSource.scala | 1 +
.../pekko/stream/impl/ActorSubscriberMessage.scala | 5 +--
.../pekko/stream/impl/BoundedSourceQueue.scala | 1 +
.../org/apache/pekko/stream/impl/Buffers.scala | 1 +
.../org/apache/pekko/stream/impl/EmptySource.scala | 1 +
.../apache/pekko/stream/impl/FailedConcat.scala | 1 +
.../apache/pekko/stream/impl/FailedSource.scala | 1 +
.../scala/org/apache/pekko/stream/impl/FanIn.scala | 5 +--
.../org/apache/pekko/stream/impl/FanOut.scala | 5 +--
.../stream/impl/FanoutPublisherBridgeStage.scala | 5 +--
.../apache/pekko/stream/impl/FutureConcat.scala | 1 +
.../apache/pekko/stream/impl/IterableConcat.scala | 1 +
.../stream/impl/JavaFlowAndRsConverters.scala | 3 +-
.../pekko/stream/impl/JavaStreamConcat.scala | 1 +
.../pekko/stream/impl/JavaStreamSource.scala | 1 +
.../pekko/stream/impl/JsonObjectParser.scala | 1 +
.../org/apache/pekko/stream/impl/LazySource.scala | 1 +
.../pekko/stream/impl/MaterializerGuardian.scala | 1 +
.../org/apache/pekko/stream/impl/MaybeSource.scala | 1 +
.../org/apache/pekko/stream/impl/Messages.scala | 1 +
.../org/apache/pekko/stream/impl/Modules.scala | 5 +--
.../impl/PhasedFusingActorMaterializer.scala | 9 ++---
.../org/apache/pekko/stream/impl/QueueSource.scala | 1 +
.../stream/impl/ReactiveStreamsCompliance.scala | 5 +--
.../apache/pekko/stream/impl/RepeatConcat.scala | 1 +
.../impl/ResizableMultiReaderRingBuffer.scala | 4 +--
.../pekko/stream/impl/RetryFlowCoordinator.scala | 1 +
.../org/apache/pekko/stream/impl/SetupStage.scala | 1 +
.../apache/pekko/stream/impl/SingleConcat.scala | 1 +
.../pekko/stream/impl/SinkholeSubscriber.scala | 5 +--
.../scala/org/apache/pekko/stream/impl/Sinks.scala | 7 ++--
.../org/apache/pekko/stream/impl/Stages.scala | 1 +
.../apache/pekko/stream/impl/StreamLayout.scala | 9 ++---
.../stream/impl/StreamSubscriptionTimeout.scala | 5 +--
.../org/apache/pekko/stream/impl/SubFlowImpl.scala | 1 +
.../org/apache/pekko/stream/impl/Throttle.scala | 1 +
.../org/apache/pekko/stream/impl/Timers.scala | 1 +
.../org/apache/pekko/stream/impl/Transfer.scala | 1 +
.../pekko/stream/impl/TraversalBuilder.scala | 1 +
.../org/apache/pekko/stream/impl/Unfold.scala | 3 +-
.../pekko/stream/impl/UnfoldResourceSource.scala | 1 +
.../stream/impl/UnfoldResourceSourceAsync.scala | 5 +--
.../stream/impl/fusing/ActorGraphInterpreter.scala | 9 ++---
.../stream/impl/fusing/AggregateWithBoundary.scala | 1 +
.../pekko/stream/impl/fusing/ArraySource.scala | 1 +
.../pekko/stream/impl/fusing/CollectFirst.scala | 1 +
.../pekko/stream/impl/fusing/CollectWhile.scala | 1 +
.../pekko/stream/impl/fusing/CountSink.scala | 1 +
.../pekko/stream/impl/fusing/DoOnCancel.scala | 1 +
.../pekko/stream/impl/fusing/DoOnFirst.scala | 1 +
.../pekko/stream/impl/fusing/DropRepeated.scala | 1 +
.../pekko/stream/impl/fusing/FlatMapPrefix.scala | 1 +
.../pekko/stream/impl/fusing/FlattenConcat.scala | 1 +
.../pekko/stream/impl/fusing/FutureFlow.scala | 5 +--
.../stream/impl/fusing/GraphInterpreter.scala | 1 +
.../pekko/stream/impl/fusing/GraphStages.scala | 3 +-
.../impl/fusing/GroupedAdjacentByWeighted.scala | 1 +
.../pekko/stream/impl/fusing/InflightSources.scala | 3 +-
.../pekko/stream/impl/fusing/IterableSource.scala | 1 +
.../pekko/stream/impl/fusing/IteratorSource.scala | 1 +
.../stream/impl/fusing/LazyFutureSource.scala | 1 +
.../stream/impl/fusing/LazySingleSource.scala | 1 +
.../pekko/stream/impl/fusing/MapConcat.scala | 1 +
.../org/apache/pekko/stream/impl/fusing/Ops.scala | 5 +--
.../pekko/stream/impl/fusing/RangeSource.scala | 1 +
.../pekko/stream/impl/fusing/SourceSink.scala | 1 +
.../pekko/stream/impl/fusing/StreamOfStreams.scala | 3 +-
.../apache/pekko/stream/impl/fusing/Switch.scala | 1 +
.../pekko/stream/impl/fusing/ZipWithIndex.scala | 1 +
.../pekko/stream/impl/io/ByteStringParser.scala | 1 +
.../pekko/stream/impl/io/FileOutputStage.scala | 1 +
.../apache/pekko/stream/impl/io/IOSources.scala | 3 +-
.../stream/impl/io/InputStreamSinkStage.scala | 3 +-
.../pekko/stream/impl/io/InputStreamSource.scala | 1 +
.../stream/impl/io/OutputStreamGraphStage.scala | 1 +
.../stream/impl/io/OutputStreamSourceStage.scala | 1 +
.../org/apache/pekko/stream/impl/io/TLSActor.scala | 5 +--
.../apache/pekko/stream/impl/io/TcpStages.scala | 3 +-
.../pekko/stream/impl/io/TlsGraphStage.scala | 5 +--
.../apache/pekko/stream/impl/io/TlsModule.scala | 1 +
.../impl/io/compression/CompressionUtils.scala | 1 +
.../stream/impl/io/compression/Compressor.scala | 1 +
.../impl/io/compression/DeflateCompressor.scala | 1 +
.../impl/io/compression/DeflateDecompressor.scala | 1 +
.../io/compression/DeflateDecompressorBase.scala | 1 +
.../impl/io/compression/GzipCompressor.scala | 1 +
.../impl/io/compression/GzipDecompressor.scala | 1 +
.../pekko/stream/impl/streamref/SinkRefImpl.scala | 1 +
.../stream/impl/streamref/SourceRefImpl.scala | 1 +
.../impl/streamref/StreamRefDefaultSettings.scala | 1 +
.../impl/streamref/StreamRefResolverImpl.scala | 1 +
.../stream/impl/streamref/StreamRefsMaster.scala | 1 +
.../stream/impl/streamref/StreamRefsProtocol.scala | 1 +
.../org/apache/pekko/stream/javadsl/BidiFlow.scala | 1 +
.../apache/pekko/stream/javadsl/Compression.scala | 1 +
.../pekko/stream/javadsl/DelayStrategy.scala | 1 +
.../org/apache/pekko/stream/javadsl/FileIO.scala | 3 +-
.../org/apache/pekko/stream/javadsl/Flow.scala | 5 +--
.../pekko/stream/javadsl/FlowWithContext.scala | 7 ++--
.../org/apache/pekko/stream/javadsl/Framing.scala | 1 +
.../org/apache/pekko/stream/javadsl/Graph.scala | 3 +-
.../org/apache/pekko/stream/javadsl/Hub.scala | 1 +
.../apache/pekko/stream/javadsl/JsonFraming.scala | 1 +
.../org/apache/pekko/stream/javadsl/Keep.scala | 1 +
.../apache/pekko/stream/javadsl/MergeLatest.scala | 3 +-
.../org/apache/pekko/stream/javadsl/Queue.scala | 1 +
.../apache/pekko/stream/javadsl/RestartFlow.scala | 1 +
.../apache/pekko/stream/javadsl/RestartSink.scala | 1 +
.../pekko/stream/javadsl/RestartSource.scala | 1 +
.../apache/pekko/stream/javadsl/RetryFlow.scala | 1 +
.../org/apache/pekko/stream/javadsl/Sink.scala | 5 +--
.../org/apache/pekko/stream/javadsl/Source.scala | 14 ++++----
.../pekko/stream/javadsl/SourceWithContext.scala | 5 +--
.../javadsl/StatefulMapConcatAccumulator.scala | 1 +
.../pekko/stream/javadsl/StreamConverters.scala | 1 +
.../org/apache/pekko/stream/javadsl/SubFlow.scala | 5 +--
.../apache/pekko/stream/javadsl/SubSource.scala | 5 +--
.../org/apache/pekko/stream/javadsl/TLS.scala | 1 +
.../org/apache/pekko/stream/javadsl/Tcp.scala | 1 +
.../apache/pekko/stream/scaladsl/BidiFlow.scala | 1 +
.../apache/pekko/stream/scaladsl/Compression.scala | 1 +
.../stream/scaladsl/CoupledTerminationFlow.scala | 1 +
.../org/apache/pekko/stream/scaladsl/FileIO.scala | 3 +-
.../org/apache/pekko/stream/scaladsl/Flow.scala | 11 +++---
.../pekko/stream/scaladsl/FlowWithContext.scala | 1 +
.../pekko/stream/scaladsl/FlowWithContextOps.scala | 1 +
.../org/apache/pekko/stream/scaladsl/Framing.scala | 1 +
.../org/apache/pekko/stream/scaladsl/Graph.scala | 1 +
.../org/apache/pekko/stream/scaladsl/Hub.scala | 3 +-
.../pekko/stream/scaladsl/JavaFlowSupport.scala | 1 +
.../apache/pekko/stream/scaladsl/JsonFraming.scala | 1 +
.../apache/pekko/stream/scaladsl/MergeLatest.scala | 1 +
.../org/apache/pekko/stream/scaladsl/Queue.scala | 1 +
.../apache/pekko/stream/scaladsl/RestartFlow.scala | 1 +
.../apache/pekko/stream/scaladsl/RestartSink.scala | 1 +
.../pekko/stream/scaladsl/RestartSource.scala | 1 +
.../apache/pekko/stream/scaladsl/RetryFlow.scala | 1 +
.../org/apache/pekko/stream/scaladsl/Sink.scala | 7 ++--
.../org/apache/pekko/stream/scaladsl/Source.scala | 11 +++---
.../pekko/stream/scaladsl/SourceWithContext.scala | 1 +
.../scaladsl/StatefulMapConcatAccumulator.scala | 1 +
.../pekko/stream/scaladsl/StreamConverters.scala | 5 +--
.../apache/pekko/stream/scaladsl/StreamRefs.scala | 1 +
.../org/apache/pekko/stream/scaladsl/SubFlow.scala | 1 +
.../org/apache/pekko/stream/scaladsl/TLS.scala | 5 +--
.../org/apache/pekko/stream/scaladsl/Tcp.scala | 1 +
.../stream/serialization/StreamRefSerializer.scala | 1 +
.../pekko/stream/snapshot/MaterializerState.scala | 3 +-
.../org/apache/pekko/stream/stage/GraphStage.scala | 5 +--
.../apache/pekko/stream/stage/StageLogging.scala | 1 +
.../pekko/testkit/CallingThreadDispatcher.scala | 7 ++--
.../testkit/ExplicitlyTriggeredScheduler.scala | 5 +--
.../org/apache/pekko/testkit/TestActorRef.scala | 1 +
.../apache/pekko/testkit/TestEventListener.scala | 1 +
.../org/apache/pekko/testkit/TestFSMRef.scala | 1 +
.../apache/pekko/testkit/TestJavaSerializer.scala | 1 +
.../scala/org/apache/pekko/testkit/TestKit.scala | 3 +-
.../apache/pekko/testkit/TestKitExtension.scala | 5 +--
.../scala/org/apache/pekko/testkit/TestLatch.scala | 2 +-
.../apache/pekko/testkit/javadsl/EventFilter.scala | 1 +
.../org/apache/pekko/testkit/javadsl/TestKit.scala | 3 +-
.../scala/org/apache/pekko/testkit/package.scala | 1 +
.../scala/org/apache/pekko/testkit/Coroner.scala | 2 +-
.../scala/org/apache/pekko/testkit/PekkoSpec.scala | 11 +++---
.../org/apache/pekko/testkit/PekkoSpecSpec.scala | 9 ++---
.../apache/pekko/testkit/TestActorRefSpec.scala | 7 ++--
.../pekko/testkit/TestEventListenerSpec.scala | 1 +
.../org/apache/pekko/testkit/TestProbeSpec.scala | 5 +--
.../apache/pekko/testkit/WithLogCapturing.scala | 5 +--
.../testkit/metrics/FileDescriptorMetricSet.scala | 2 +-
.../metrics/FileDescriptorMetricSetSpec.scala | 2 ++
.../apache/pekko/testkit/metrics/MetricsKit.scala | 3 +-
.../metrics/reporter/PekkoConsoleReporter.scala | 1 +
1991 files changed, 4487 insertions(+), 2548 deletions(-)
diff --git a/.scalafix.conf b/.scalafix.conf
index 5dbe0328dc..1a31caa353 100644
--- a/.scalafix.conf
+++ b/.scalafix.conf
@@ -1,7 +1,7 @@
// .scalafix.conf
rules = [
RemoveUnused
- SortImports
+ OrganizeImports
ExplicitResultTypes
fix.scala213.DottyMigrate
// fix.scala213.NullaryOverride
@@ -14,7 +14,7 @@ ExplicitResultTypes {
ExplicitImplicitTypes.symbolReplacements {
"scala/concurrent/ExecutionContextExecutor#" = "scala/concurrent/ExecutionContext#"
}
-RemoveUnused.imports = true
+RemoveUnused.imports = false
RemoveUnused.privates = false
RemoveUnused.locals = false
@@ -38,17 +38,25 @@ ignored-packages = [
"jdoc"
]
-//sort imports, see https://github.com/NeQuissimus/sort-imports
-SortImports.asciiSort = false
-SortImports.blocks = [
- "re:javax?\\.",
- "scala.",
- "*",
- "com.sun."
- "re:^(org\\.apache\\.pekko|pekko\\.)\\w*"
- "org.reactivestreams."
- "io.netty."
- "org.scalatest."
- "org.slf4j."
- "com.typesafe."
-]
+OrganizeImports {
+ blankLines = Auto
+ coalesceToWildcardImportThreshold = null
+ expandRelative = false
+ groupedImports = Keep
+ groups = [
+ "re:javax?\\.",
+ "scala.",
+ "*",
+ "com.sun.",
+ "re:^(org\\.apache\\.pekko|pekko\\.)\\w*",
+ "org.reactivestreams.",
+ "io.netty.",
+ "org.scalatest.",
+ "org.slf4j.",
+ "com.typesafe."
+ ]
+ importSelectorsOrder = Ascii
+ importsOrder = Ascii
+ removeUnused = true
+ targetDialect = StandardLayout
+}
diff --git a/.scalafmt.conf b/.scalafmt.conf
index 8afbc99e93..e10a7fe925 100644
--- a/.scalafmt.conf
+++ b/.scalafmt.conf
@@ -7,7 +7,7 @@ docstrings.wrap = false
indentOperator.preset = spray
maxColumn = 120
lineEndings = preserve
-rewrite.rules = [RedundantParens, SortImports, AvoidInfix]
+rewrite.rules = [RedundantParens, AvoidInfix]
indentOperator.exemptScope = all
align.preset = some
align.tokens."+" = [
diff --git a/actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/CapturedLogEvent.scala b/actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/CapturedLogEvent.scala
index 836156e042..b958d3d3e7 100644
--- a/actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/CapturedLogEvent.scala
+++ b/actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/CapturedLogEvent.scala
@@ -18,12 +18,13 @@ import java.util.Optional
import scala.jdk.OptionConverters._
import org.apache.pekko
-import pekko.annotation.InternalApi
-import pekko.util.OptionVal
import org.slf4j.Marker
import org.slf4j.event.Level
+import pekko.annotation.InternalApi
+import pekko.util.OptionVal
+
/**
* Representation of a Log Event issued by a [[pekko.actor.typed.Behavior]]
* when testing with [[pekko.actor.testkit.typed.scaladsl.BehaviorTestKit]]
diff --git a/actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/Effect.scala b/actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/Effect.scala
index 350639e4c8..23b924d29d 100644
--- a/actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/Effect.scala
+++ b/actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/Effect.scala
@@ -22,6 +22,7 @@ import scala.jdk.FunctionConverters._
import scala.util.{ Failure, Success, Try }
import org.apache.pekko
+
import pekko.actor.typed.{ ActorRef, Behavior, Props, RecipientRef }
import pekko.annotation.{ DoNotInherit, InternalApi }
diff --git a/actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/FishingOutcome.scala b/actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/FishingOutcome.scala
index 1fff22037f..16387e1722 100644
--- a/actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/FishingOutcome.scala
+++ b/actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/FishingOutcome.scala
@@ -14,6 +14,7 @@
package org.apache.pekko.actor.testkit.typed
import org.apache.pekko
+
import pekko.annotation.DoNotInherit
/**
diff --git a/actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/TestKitSettings.scala b/actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/TestKitSettings.scala
index 6c04373658..086de4ed67 100644
--- a/actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/TestKitSettings.scala
+++ b/actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/TestKitSettings.scala
@@ -17,13 +17,14 @@ import scala.concurrent.duration.{ Duration, FiniteDuration }
import scala.jdk.DurationConverters._
import org.apache.pekko
+
+import com.typesafe.config.Config
+
import pekko.actor.typed.ActorSystem
import pekko.actor.typed.Extension
import pekko.actor.typed.ExtensionId
import pekko.util.Timeout
-import com.typesafe.config.Config
-
object TestKitSettings {
/**
diff --git a/actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/internal/ActorSystemStub.scala b/actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/internal/ActorSystemStub.scala
index 71882d690d..17d78f7676 100644
--- a/actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/internal/ActorSystemStub.scala
+++ b/actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/internal/ActorSystemStub.scala
@@ -20,6 +20,12 @@ import scala.concurrent._
import scala.jdk.FutureConverters._
import org.apache.pekko
+
+import org.slf4j.Logger
+import org.slf4j.LoggerFactory
+
+import com.typesafe.config.{ Config, ConfigFactory }
+
import pekko.{ actor => classic }
import pekko.Done
import pekko.actor.{ ActorPath, ActorRefProvider, Address, ReflectiveDynamicAccess }
@@ -38,11 +44,6 @@ import pekko.actor.typed.internal.InternalRecipientRef
import pekko.actor.typed.receptionist.Receptionist
import pekko.annotation.InternalApi
-import org.slf4j.Logger
-import org.slf4j.LoggerFactory
-
-import com.typesafe.config.{ Config, ConfigFactory }
-
/**
* INTERNAL API
*/
diff --git a/actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/internal/BehaviorTestKitImpl.scala b/actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/internal/BehaviorTestKitImpl.scala
index 624e47351b..1b928ec719 100644
--- a/actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/internal/BehaviorTestKitImpl.scala
+++ b/actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/internal/BehaviorTestKitImpl.scala
@@ -23,6 +23,7 @@ import scala.util.control.Exception.Catcher
import scala.util.control.NonFatal
import org.apache.pekko
+
import pekko.actor.ActorPath
import pekko.actor.testkit.typed.{ CapturedLogEvent, Effect }
import pekko.actor.testkit.typed.Effect._
diff --git a/actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/internal/CapturingAppender.scala b/actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/internal/CapturingAppender.scala
index 5afa793ace..7f92b2d1ea 100644
--- a/actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/internal/CapturingAppender.scala
+++ b/actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/internal/CapturingAppender.scala
@@ -17,6 +17,7 @@ import ch.qos.logback.classic.spi.ILoggingEvent
import ch.qos.logback.core.AppenderBase
import org.apache.pekko
+
import pekko.annotation.InternalApi
/**
diff --git a/actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/internal/DebugRef.scala b/actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/internal/DebugRef.scala
index 8593e4ec56..b3bdfac113 100644
--- a/actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/internal/DebugRef.scala
+++ b/actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/internal/DebugRef.scala
@@ -18,6 +18,7 @@ import java.util.concurrent.ConcurrentLinkedQueue
import scala.annotation.tailrec
import org.apache.pekko
+
import pekko.{ actor => classic }
import pekko.actor.ActorRefProvider
import pekko.actor.typed.ActorRef
diff --git a/actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/internal/EffectfulActorContext.scala b/actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/internal/EffectfulActorContext.scala
index 0c3df99008..376352f940 100644
--- a/actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/internal/EffectfulActorContext.scala
+++ b/actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/internal/EffectfulActorContext.scala
@@ -23,6 +23,7 @@ import scala.util.Try
import scala.util.control.NonFatal
import org.apache.pekko
+
import pekko.actor.{ ActorPath, Cancellable }
import pekko.actor.testkit.typed.Effect
import pekko.actor.testkit.typed.Effect._
diff --git a/actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/internal/LoggingTestKitImpl.scala b/actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/internal/LoggingTestKitImpl.scala
index 66a3727e99..59ff5859fd 100644
--- a/actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/internal/LoggingTestKitImpl.scala
+++ b/actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/internal/LoggingTestKitImpl.scala
@@ -20,6 +20,9 @@ import scala.reflect.ClassTag
import scala.util.matching.Regex
import org.apache.pekko
+
+import org.slf4j.event.Level
+
import pekko.actor.testkit.typed.LoggingEvent
import pekko.actor.testkit.typed.TestKitSettings
import pekko.actor.testkit.typed.javadsl
@@ -28,8 +31,6 @@ import pekko.actor.typed.ActorSystem
import pekko.annotation.InternalApi
import pekko.testkit.TestKit
-import org.slf4j.event.Level
-
/**
* INTERNAL API
*/
diff --git a/actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/internal/StubbedActorContext.scala b/actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/internal/StubbedActorContext.scala
index ca892ae39d..6016cd955d 100644
--- a/actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/internal/StubbedActorContext.scala
+++ b/actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/internal/StubbedActorContext.scala
@@ -21,6 +21,10 @@ import scala.concurrent.ExecutionContextExecutor
import scala.concurrent.duration.FiniteDuration
import org.apache.pekko
+
+import org.slf4j.helpers.{ MessageFormatter, SubstituteLoggerFactory }
+import org.slf4j.{ Logger, Marker }
+
import pekko.{ actor => classic }
import pekko.actor.{ ActorPath, ActorRefProvider, InvalidMessageException }
import pekko.actor.testkit.typed.CapturedLogEvent
@@ -29,9 +33,6 @@ import pekko.actor.typed.internal._
import pekko.annotation.InternalApi
import pekko.util.Helpers
-import org.slf4j.{ Logger, Marker }
-import org.slf4j.helpers.{ MessageFormatter, SubstituteLoggerFactory }
-
/**
* INTERNAL API
*
diff --git a/actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/internal/TestAppender.scala b/actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/internal/TestAppender.scala
index 917ed1119b..4cef655af0 100644
--- a/actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/internal/TestAppender.scala
+++ b/actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/internal/TestAppender.scala
@@ -20,11 +20,12 @@ import ch.qos.logback.classic.spi.ThrowableProxy
import ch.qos.logback.core.AppenderBase
import org.apache.pekko
-import pekko.actor.testkit.typed.LoggingEvent
-import pekko.annotation.InternalApi
import org.slf4j.{ MDC, Marker }
+import pekko.actor.testkit.typed.LoggingEvent
+import pekko.annotation.InternalApi
+
/**
* INTERNAL API
*
diff --git a/actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/internal/TestInboxImpl.scala b/actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/internal/TestInboxImpl.scala
index 9dc91cc678..6f9fd967c1 100644
--- a/actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/internal/TestInboxImpl.scala
+++ b/actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/internal/TestInboxImpl.scala
@@ -19,6 +19,7 @@ import scala.annotation.tailrec
import scala.collection.immutable
import org.apache.pekko
+
import pekko.actor.{ ActorPath, Address, RootActorPath }
import pekko.actor.typed.ActorRef
import pekko.annotation.InternalApi
diff --git a/actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/internal/TestKitUtils.scala b/actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/internal/TestKitUtils.scala
index 6445998cda..7920fc9280 100644
--- a/actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/internal/TestKitUtils.scala
+++ b/actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/internal/TestKitUtils.scala
@@ -13,12 +13,13 @@
package org.apache.pekko.actor.testkit.typed.internal
-import scala.concurrent.{ Await, TimeoutException }
import scala.concurrent.duration.Duration
+import scala.concurrent.{ Await, TimeoutException }
import scala.util.control.Exception.Catcher
import scala.util.control.NonFatal
import org.apache.pekko
+
import pekko.actor.typed.{ ActorRef, ActorSystem, Behavior, Props }
import pekko.actor.typed.scaladsl.ActorContext
import pekko.actor.typed.scaladsl.Behaviors
diff --git a/actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/internal/TestProbeImpl.scala b/actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/internal/TestProbeImpl.scala
index 0be9c61f41..453c0cc89e 100644
--- a/actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/internal/TestProbeImpl.scala
+++ b/actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/internal/TestProbeImpl.scala
@@ -14,10 +14,10 @@
package org.apache.pekko.actor.testkit.typed.internal
import java.time.{ Duration => JDuration }
-import java.util.{ List => JList }
import java.util.concurrent.BlockingDeque
import java.util.concurrent.LinkedBlockingDeque
import java.util.function.Supplier
+import java.util.{ List => JList }
import scala.annotation.tailrec
import scala.collection.immutable
@@ -28,6 +28,7 @@ import scala.reflect.ClassTag
import scala.util.control.NonFatal
import org.apache.pekko
+
import pekko.actor.ActorRefProvider
import pekko.actor.ExtendedActorSystem
import pekko.actor.testkit.typed.FishingOutcome
diff --git a/actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/javadsl/ActorTestKit.scala b/actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/javadsl/ActorTestKit.scala
index d6ce52aca4..0609fd5235 100644
--- a/actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/javadsl/ActorTestKit.scala
+++ b/actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/javadsl/ActorTestKit.scala
@@ -18,6 +18,9 @@ import java.time.Duration
import scala.jdk.DurationConverters._
import org.apache.pekko
+
+import com.typesafe.config.Config
+
import pekko.actor.DeadLetter
import pekko.actor.Dropped
import pekko.actor.UnhandledMessage
@@ -31,8 +34,6 @@ import pekko.actor.typed.Props
import pekko.actor.typed.Scheduler
import pekko.util.Timeout
-import com.typesafe.config.Config
-
object ActorTestKit {
/**
diff --git a/actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/javadsl/BehaviorTestKit.scala b/actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/javadsl/BehaviorTestKit.scala
index 52b3a87b66..316369a870 100644
--- a/actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/javadsl/BehaviorTestKit.scala
+++ b/actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/javadsl/BehaviorTestKit.scala
@@ -18,6 +18,9 @@ import java.util.concurrent.ThreadLocalRandom
import scala.annotation.nowarn
import org.apache.pekko
+
+import com.typesafe.config.Config
+
import pekko.actor.testkit.typed.{ CapturedLogEvent, Effect }
import pekko.actor.testkit.typed.internal.{ ActorSystemStub, BehaviorTestKitImpl }
import pekko.actor.typed.{ ActorRef, Behavior, Signal }
@@ -26,8 +29,6 @@ import pekko.annotation.{ ApiMayChange, DoNotInherit }
import pekko.japi.function.{ Function => JFunction }
import pekko.pattern.StatusReply
-import com.typesafe.config.Config
-
object BehaviorTestKit {
/**
diff --git a/actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/javadsl/Effects.scala b/actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/javadsl/Effects.scala
index 59800e9b8a..b88fb9d8f9 100644
--- a/actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/javadsl/Effects.scala
+++ b/actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/javadsl/Effects.scala
@@ -18,6 +18,7 @@ import java.time.Duration
import scala.jdk.DurationConverters._
import org.apache.pekko
+
import pekko.actor.typed.{ ActorRef, Behavior, Props, RecipientRef }
/**
diff --git a/actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/javadsl/JUnit5TestKitBuilder.scala b/actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/javadsl/JUnit5TestKitBuilder.scala
index d71359d099..b34196e9b3 100644
--- a/actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/javadsl/JUnit5TestKitBuilder.scala
+++ b/actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/javadsl/JUnit5TestKitBuilder.scala
@@ -18,12 +18,13 @@
package org.apache.pekko.actor.testkit.typed.javadsl
import org.apache.pekko
+
+import com.typesafe.config.Config
+
import pekko.actor.testkit.typed.internal.TestKitUtils
import pekko.actor.testkit.typed.scaladsl.ActorTestKit.ApplicationTestConfig
import pekko.actor.typed.ActorSystem
-import com.typesafe.config.Config
-
@deprecated("Use JUnitJupiterTestKitBuilder instead", "2.0.0")
final class JUnit5TestKitBuilder() {
diff --git a/actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/javadsl/JUnitJupiterTestKitBuilder.scala b/actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/javadsl/JUnitJupiterTestKitBuilder.scala
index c384620fba..f3b4e29fb2 100644
--- a/actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/javadsl/JUnitJupiterTestKitBuilder.scala
+++ b/actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/javadsl/JUnitJupiterTestKitBuilder.scala
@@ -18,12 +18,13 @@
package org.apache.pekko.actor.testkit.typed.javadsl
import org.apache.pekko
+
+import com.typesafe.config.Config
+
import pekko.actor.testkit.typed.internal.TestKitUtils
import pekko.actor.testkit.typed.scaladsl.ActorTestKit.ApplicationTestConfig
import pekko.actor.typed.ActorSystem
-import com.typesafe.config.Config
-
final class JUnitJupiterTestKitBuilder() {
var system: Option[ActorSystem[?]] = None
diff --git a/actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/javadsl/LogCapturingExtension.scala b/actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/javadsl/LogCapturingExtension.scala
index 4caaa8ddb8..18fc2beb50 100644
--- a/actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/javadsl/LogCapturingExtension.scala
+++ b/actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/javadsl/LogCapturingExtension.scala
@@ -17,8 +17,8 @@ import java.lang.reflect.Method
import scala.util.control.NonFatal
-import org.junit.jupiter.api.extension.{ ExtensionContext, InvocationInterceptor, ReflectiveInvocationContext }
import org.junit.jupiter.api.extension.InvocationInterceptor.Invocation
+import org.junit.jupiter.api.extension.{ ExtensionContext, InvocationInterceptor, ReflectiveInvocationContext }
import org.apache.pekko.actor.testkit.typed.internal.CapturingAppender
diff --git a/actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/javadsl/LoggingTestKit.scala b/actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/javadsl/LoggingTestKit.scala
index 5323c25cd9..14393c7a44 100644
--- a/actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/javadsl/LoggingTestKit.scala
+++ b/actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/javadsl/LoggingTestKit.scala
@@ -16,13 +16,14 @@ package org.apache.pekko.actor.testkit.typed.javadsl
import java.util.function.Supplier
import org.apache.pekko
+
+import org.slf4j.event.Level
+
import pekko.actor.testkit.typed.LoggingEvent
import pekko.actor.testkit.typed.internal.LoggingTestKitImpl
import pekko.actor.typed.ActorSystem
import pekko.annotation.DoNotInherit
-import org.slf4j.event.Level
-
/**
* Facilities for verifying logs.
*
diff --git a/actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/javadsl/ManualTime.scala b/actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/javadsl/ManualTime.scala
index 9f0d7c35c5..708a992939 100644
--- a/actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/javadsl/ManualTime.scala
+++ b/actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/javadsl/ManualTime.scala
@@ -19,11 +19,12 @@ import scala.annotation.varargs
import scala.jdk.DurationConverters._
import org.apache.pekko
-import pekko.actor.typed.ActorSystem
-import pekko.actor.typed.internal.adapter.SchedulerAdapter
import com.typesafe.config.Config
+import pekko.actor.typed.ActorSystem
+import pekko.actor.typed.internal.adapter.SchedulerAdapter
+
/**
* Manual time allows you to do async tests while controlling the scheduler of the system.
*
diff --git a/actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/javadsl/SerializationTestKit.scala b/actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/javadsl/SerializationTestKit.scala
index 768e5c7ab8..c5a4a0b49a 100644
--- a/actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/javadsl/SerializationTestKit.scala
+++ b/actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/javadsl/SerializationTestKit.scala
@@ -14,6 +14,7 @@
package org.apache.pekko.actor.testkit.typed.javadsl
import org.apache.pekko
+
import pekko.actor.testkit.typed.scaladsl
import pekko.actor.typed.ActorSystem
diff --git a/actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/javadsl/TestInbox.scala b/actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/javadsl/TestInbox.scala
index 69876fc9b4..70fe55fa67 100644
--- a/actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/javadsl/TestInbox.scala
+++ b/actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/javadsl/TestInbox.scala
@@ -19,6 +19,7 @@ import scala.collection.immutable
import scala.jdk.CollectionConverters._
import org.apache.pekko
+
import pekko.actor.testkit.typed.internal.TestInboxImpl
import pekko.actor.typed.ActorRef
import pekko.annotation.{ ApiMayChange, DoNotInherit }
diff --git a/actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/javadsl/TestKitJunitResource.scala b/actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/javadsl/TestKitJunitResource.scala
index 5b85c2d386..e499d15d84 100644
--- a/actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/javadsl/TestKitJunitResource.scala
+++ b/actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/javadsl/TestKitJunitResource.scala
@@ -19,6 +19,10 @@ import org.junit.Rule
import org.junit.rules.ExternalResource
import org.apache.pekko
+
+import com.typesafe.config.Config
+import com.typesafe.config.ConfigFactory
+
import pekko.actor.DeadLetter
import pekko.actor.Dropped
import pekko.actor.UnhandledMessage
@@ -31,9 +35,6 @@ import pekko.actor.typed.Props
import pekko.actor.typed.Scheduler
import pekko.util.Timeout
-import com.typesafe.config.Config
-import com.typesafe.config.ConfigFactory
-
/**
* A Junit external resource for the [[ActorTestKit]], making it possible to have Junit manage the lifecycle of the testkit.
* The testkit will be automatically shut down when the test completes or fails.
diff --git a/actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/javadsl/TestProbe.scala b/actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/javadsl/TestProbe.scala
index b972630cfd..c51bcb919c 100644
--- a/actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/javadsl/TestProbe.scala
+++ b/actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/javadsl/TestProbe.scala
@@ -14,12 +14,13 @@
package org.apache.pekko.actor.testkit.typed.javadsl
import java.time.Duration
-import java.util.{ List => JList }
import java.util.function.Supplier
+import java.util.{ List => JList }
import scala.annotation.nowarn
import org.apache.pekko
+
import pekko.actor.testkit.typed.FishingOutcome
import pekko.actor.testkit.typed.TestKitSettings
import pekko.actor.testkit.typed.internal.TestProbeImpl
diff --git a/actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/scaladsl/ActorTestKit.scala b/actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/scaladsl/ActorTestKit.scala
index 7476271ffd..f901090587 100644
--- a/actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/scaladsl/ActorTestKit.scala
+++ b/actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/scaladsl/ActorTestKit.scala
@@ -21,6 +21,12 @@ import scala.concurrent.duration._
import scala.reflect.ClassTag
import org.apache.pekko
+
+import org.slf4j.LoggerFactory
+
+import com.typesafe.config.Config
+import com.typesafe.config.ConfigFactory
+
import pekko.actor.DeadLetter
import pekko.actor.DeadLetterSuppression
import pekko.actor.Dropped
@@ -39,11 +45,6 @@ import pekko.actor.typed.scaladsl.adapter._
import pekko.annotation.InternalApi
import pekko.util.Timeout
-import org.slf4j.LoggerFactory
-
-import com.typesafe.config.Config
-import com.typesafe.config.ConfigFactory
-
object ActorTestKit {
private val testKitGuardianCounter = new AtomicInteger(0)
diff --git a/actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/scaladsl/ActorTestKitBase.scala b/actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/scaladsl/ActorTestKitBase.scala
index 357f3c5f7b..c8942f2619 100644
--- a/actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/scaladsl/ActorTestKitBase.scala
+++ b/actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/scaladsl/ActorTestKitBase.scala
@@ -14,6 +14,10 @@
package org.apache.pekko.actor.testkit.typed.scaladsl
import org.apache.pekko
+
+import com.typesafe.config.Config
+import com.typesafe.config.ConfigFactory
+
import pekko.actor.DeadLetter
import pekko.actor.Dropped
import pekko.actor.UnhandledMessage
@@ -25,9 +29,6 @@ import pekko.actor.typed.Behavior
import pekko.actor.typed.Props
import pekko.util.Timeout
-import com.typesafe.config.Config
-import com.typesafe.config.ConfigFactory
-
object ActorTestKitBase {
@noinline def testNameFromCallStack(): String = TestKitUtils.testNameFromCallStack(classOf[ActorTestKitBase])
}
diff --git a/actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/scaladsl/BehaviorTestKit.scala b/actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/scaladsl/BehaviorTestKit.scala
index ef5fd4cb0f..86c8878804 100644
--- a/actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/scaladsl/BehaviorTestKit.scala
+++ b/actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/scaladsl/BehaviorTestKit.scala
@@ -19,6 +19,9 @@ import scala.collection.immutable
import scala.reflect.ClassTag
import org.apache.pekko
+
+import com.typesafe.config.Config
+
import pekko.actor.testkit.typed.{ CapturedLogEvent, Effect }
import pekko.actor.testkit.typed.internal.{ ActorSystemStub, BehaviorTestKitImpl }
import pekko.actor.typed.{ ActorRef, Behavior, Signal, TypedActorContext }
@@ -26,8 +29,6 @@ import pekko.actor.typed.receptionist.Receptionist
import pekko.annotation.{ ApiMayChange, DoNotInherit }
import pekko.pattern.StatusReply
-import com.typesafe.config.Config
-
@ApiMayChange
object BehaviorTestKit {
diff --git a/actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/scaladsl/Effects.scala b/actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/scaladsl/Effects.scala
index 9b6e80eca0..f9af339dfd 100644
--- a/actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/scaladsl/Effects.scala
+++ b/actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/scaladsl/Effects.scala
@@ -16,6 +16,7 @@ package org.apache.pekko.actor.testkit.typed.scaladsl
import scala.concurrent.duration.FiniteDuration
import org.apache.pekko
+
import pekko.actor.typed.{ ActorRef, Behavior, Props, RecipientRef }
/**
diff --git a/actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/scaladsl/LoggingTestKit.scala b/actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/scaladsl/LoggingTestKit.scala
index c0bb5c02b0..9c930766ca 100644
--- a/actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/scaladsl/LoggingTestKit.scala
+++ b/actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/scaladsl/LoggingTestKit.scala
@@ -16,13 +16,14 @@ package org.apache.pekko.actor.testkit.typed.scaladsl
import scala.reflect.ClassTag
import org.apache.pekko
+
+import org.slf4j.event.Level
+
import pekko.actor.testkit.typed.LoggingEvent
import pekko.actor.testkit.typed.internal.LoggingTestKitImpl
import pekko.actor.typed.ActorSystem
import pekko.annotation.DoNotInherit
-import org.slf4j.event.Level
-
/**
* Facilities for verifying logs.
*
diff --git a/actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/scaladsl/ManualTime.scala b/actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/scaladsl/ManualTime.scala
index c631307343..0dd717a61b 100644
--- a/actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/scaladsl/ManualTime.scala
+++ b/actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/scaladsl/ManualTime.scala
@@ -17,11 +17,12 @@ import scala.annotation.varargs
import scala.concurrent.duration.FiniteDuration
import org.apache.pekko
-import pekko.actor.typed.ActorSystem
-import pekko.actor.typed.internal.adapter.SchedulerAdapter
import com.typesafe.config.{ Config, ConfigFactory }
+import pekko.actor.typed.ActorSystem
+import pekko.actor.typed.internal.adapter.SchedulerAdapter
+
/**
* Manual time allows you to do async tests while controlling the scheduler of the system.
*
diff --git a/actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/scaladsl/ScalaTestWithActorTestKit.scala b/actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/scaladsl/ScalaTestWithActorTestKit.scala
index a922ff7bbe..ae9f4c7094 100644
--- a/actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/scaladsl/ScalaTestWithActorTestKit.scala
+++ b/actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/scaladsl/ScalaTestWithActorTestKit.scala
@@ -14,18 +14,19 @@
package org.apache.pekko.actor.testkit.typed.scaladsl
import org.apache.pekko
-import pekko.actor.testkit.typed.TestKitSettings
-import pekko.actor.typed.ActorSystem
-import org.scalatest.{ BeforeAndAfterAll, TestSuite }
import org.scalatest.concurrent.Eventually
import org.scalatest.concurrent.ScalaFutures
import org.scalatest.matchers.should.Matchers
import org.scalatest.time.Span
+import org.scalatest.{ BeforeAndAfterAll, TestSuite }
import com.typesafe.config.Config
import com.typesafe.config.ConfigFactory
+import pekko.actor.testkit.typed.TestKitSettings
+import pekko.actor.typed.ActorSystem
+
/**
* A ScalaTest base class for the [[ActorTestKit]], making it possible to have ScalaTest manage the lifecycle of the testkit.
* The testkit will be automatically shut down when the test completes or fails using ScalaTest's BeforeAndAfterAll trait. If
diff --git a/actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/scaladsl/SerializationTestKit.scala b/actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/scaladsl/SerializationTestKit.scala
index 691291aa15..71c6df0ddb 100644
--- a/actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/scaladsl/SerializationTestKit.scala
+++ b/actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/scaladsl/SerializationTestKit.scala
@@ -14,6 +14,7 @@
package org.apache.pekko.actor.testkit.typed.scaladsl
import org.apache.pekko
+
import pekko.actor.typed.ActorSystem
import pekko.actor.typed.scaladsl.adapter._
import pekko.serialization.SerializationExtension
diff --git a/actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/scaladsl/TestInbox.scala b/actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/scaladsl/TestInbox.scala
index 8b9086344e..18a1c0087a 100644
--- a/actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/scaladsl/TestInbox.scala
+++ b/actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/scaladsl/TestInbox.scala
@@ -18,6 +18,7 @@ import java.util.concurrent.ThreadLocalRandom
import scala.collection.immutable
import org.apache.pekko
+
import pekko.Done
import pekko.actor.{ Address, RootActorPath }
import pekko.actor.testkit.typed.internal.TestInboxImpl
diff --git a/actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/scaladsl/TestProbe.scala b/actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/scaladsl/TestProbe.scala
index ff215bc741..2fea1d3d8f 100644
--- a/actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/scaladsl/TestProbe.scala
+++ b/actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/scaladsl/TestProbe.scala
@@ -18,6 +18,7 @@ import scala.concurrent.duration._
import scala.reflect.ClassTag
import org.apache.pekko
+
import pekko.actor.testkit.typed.FishingOutcome
import pekko.actor.testkit.typed.TestKitSettings
import pekko.actor.testkit.typed.internal.TestProbeImpl
diff --git a/actor-testkit-typed/src/test/scala/org/apache/pekko/actor/testkit/typed/scaladsl/ActorTestKitSpec.scala b/actor-testkit-typed/src/test/scala/org/apache/pekko/actor/testkit/typed/scaladsl/ActorTestKitSpec.scala
index 25d4edd98c..c645c61248 100644
--- a/actor-testkit-typed/src/test/scala/org/apache/pekko/actor/testkit/typed/scaladsl/ActorTestKitSpec.scala
+++ b/actor-testkit-typed/src/test/scala/org/apache/pekko/actor/testkit/typed/scaladsl/ActorTestKitSpec.scala
@@ -16,6 +16,13 @@ package org.apache.pekko.actor.testkit.typed.scaladsl
import scala.concurrent.Promise
import org.apache.pekko
+
+import org.scalatest.BeforeAndAfterAll
+import org.scalatest.matchers.should.Matchers
+import org.scalatest.wordspec.{ AnyWordSpec, AnyWordSpecLike }
+
+import com.typesafe.config.ConfigFactory
+
import pekko.Done
import pekko.actor.Dropped
import pekko.actor.UnhandledMessage
@@ -24,12 +31,6 @@ import pekko.actor.typed.ActorSystem
import pekko.actor.typed.eventstream.EventStream
import pekko.actor.typed.scaladsl.Behaviors
-import org.scalatest.BeforeAndAfterAll
-import org.scalatest.matchers.should.Matchers
-import org.scalatest.wordspec.{ AnyWordSpec, AnyWordSpecLike }
-
-import com.typesafe.config.ConfigFactory
-
class ActorTestKitSpec extends ScalaTestWithActorTestKit with AnyWordSpecLike with LogCapturing {
"the Scala testkit" should {
diff --git a/actor-testkit-typed/src/test/scala/org/apache/pekko/actor/testkit/typed/scaladsl/BehaviorTestKitSpec.scala b/actor-testkit-typed/src/test/scala/org/apache/pekko/actor/testkit/typed/scaladsl/BehaviorTestKitSpec.scala
index dd88f16c83..83782c9a48 100644
--- a/actor-testkit-typed/src/test/scala/org/apache/pekko/actor/testkit/typed/scaladsl/BehaviorTestKitSpec.scala
+++ b/actor-testkit-typed/src/test/scala/org/apache/pekko/actor/testkit/typed/scaladsl/BehaviorTestKitSpec.scala
@@ -17,6 +17,12 @@ import scala.concurrent.duration.{ FiniteDuration, _ }
import scala.reflect.ClassTag
import org.apache.pekko
+
+import org.scalatest.matchers.should.Matchers
+import org.scalatest.wordspec.AnyWordSpec
+
+import org.slf4j.event.Level
+
import pekko.Done
import pekko.actor.Address
import pekko.actor.testkit.typed.{ CapturedLogEvent, Effect }
@@ -28,11 +34,6 @@ import pekko.actor.typed.receptionist.{ Receptionist, ServiceKey }
import pekko.actor.typed.scaladsl.Behaviors
import pekko.util.Timeout
-import org.scalatest.matchers.should.Matchers
-import org.scalatest.wordspec.AnyWordSpec
-
-import org.slf4j.event.Level
-
object BehaviorTestKitSpec {
object Parent {
diff --git a/actor-testkit-typed/src/test/scala/org/apache/pekko/actor/testkit/typed/scaladsl/GreeterMain.scala b/actor-testkit-typed/src/test/scala/org/apache/pekko/actor/testkit/typed/scaladsl/GreeterMain.scala
index e1aea1103e..5b32a23ed8 100644
--- a/actor-testkit-typed/src/test/scala/org/apache/pekko/actor/testkit/typed/scaladsl/GreeterMain.scala
+++ b/actor-testkit-typed/src/test/scala/org/apache/pekko/actor/testkit/typed/scaladsl/GreeterMain.scala
@@ -14,6 +14,7 @@
package org.apache.pekko.actor.testkit.typed.scaladsl
import org.apache.pekko
+
import pekko.actor.typed.{ ActorRef, Behavior }
import pekko.actor.typed.scaladsl.Behaviors
diff --git a/actor-testkit-typed/src/test/scala/org/apache/pekko/actor/testkit/typed/scaladsl/JUnit5TestKitBuilderSpec.scala b/actor-testkit-typed/src/test/scala/org/apache/pekko/actor/testkit/typed/scaladsl/JUnit5TestKitBuilderSpec.scala
index 5aaacd2346..85b531dfa3 100644
--- a/actor-testkit-typed/src/test/scala/org/apache/pekko/actor/testkit/typed/scaladsl/JUnit5TestKitBuilderSpec.scala
+++ b/actor-testkit-typed/src/test/scala/org/apache/pekko/actor/testkit/typed/scaladsl/JUnit5TestKitBuilderSpec.scala
@@ -21,12 +21,13 @@ import scala.annotation.nowarn
import org.apache.pekko
import org.apache.pekko.actor.testkit.typed.javadsl.JUnit5TestKitBuilder
-import pekko.actor.typed.ActorSystem
import org.scalatest.wordspec.AnyWordSpec
import com.typesafe.config.ConfigFactory
+import pekko.actor.typed.ActorSystem
+
@nowarn("msg=deprecated")
class JUnit5TestKitBuilderSpec extends AnyWordSpec {
diff --git a/actor-testkit-typed/src/test/scala/org/apache/pekko/actor/testkit/typed/scaladsl/JUnitJupiterTestKitBuilderSpec.scala b/actor-testkit-typed/src/test/scala/org/apache/pekko/actor/testkit/typed/scaladsl/JUnitJupiterTestKitBuilderSpec.scala
index 9b142c54d6..2dc22df25d 100644
--- a/actor-testkit-typed/src/test/scala/org/apache/pekko/actor/testkit/typed/scaladsl/JUnitJupiterTestKitBuilderSpec.scala
+++ b/actor-testkit-typed/src/test/scala/org/apache/pekko/actor/testkit/typed/scaladsl/JUnitJupiterTestKitBuilderSpec.scala
@@ -19,12 +19,13 @@ package org.apache.pekko.actor.testkit.typed.scaladsl
import org.apache.pekko
import org.apache.pekko.actor.testkit.typed.javadsl.JUnitJupiterTestKitBuilder
-import pekko.actor.typed.ActorSystem
import org.scalatest.wordspec.AnyWordSpec
import com.typesafe.config.ConfigFactory
+import pekko.actor.typed.ActorSystem
+
class JUnitJupiterTestKitBuilderSpec extends AnyWordSpec {
"the JUnitJupiterTestKitBuilder" should {
diff --git a/actor-testkit-typed/src/test/scala/org/apache/pekko/actor/testkit/typed/scaladsl/ManualTimeSpec.scala b/actor-testkit-typed/src/test/scala/org/apache/pekko/actor/testkit/typed/scaladsl/ManualTimeSpec.scala
index e9e308bd0f..3ced93e74d 100644
--- a/actor-testkit-typed/src/test/scala/org/apache/pekko/actor/testkit/typed/scaladsl/ManualTimeSpec.scala
+++ b/actor-testkit-typed/src/test/scala/org/apache/pekko/actor/testkit/typed/scaladsl/ManualTimeSpec.scala
@@ -23,15 +23,16 @@ import java.util.concurrent.{ CountDownLatch, TimeUnit }
import scala.concurrent.duration._
import org.apache.pekko
-import pekko.Done
-import pekko.actor.testkit.typed.scaladsl.ManualTimeSpec.config
-import pekko.actor.typed.DispatcherSelector
-import pekko.actor.typed.scaladsl.Behaviors
import org.scalatest.wordspec.AnyWordSpecLike
import com.typesafe.config.ConfigFactory
+import pekko.Done
+import pekko.actor.testkit.typed.scaladsl.ManualTimeSpec.config
+import pekko.actor.typed.DispatcherSelector
+import pekko.actor.typed.scaladsl.Behaviors
+
object ManualTimeSpec {
val config = ConfigFactory
.parseString("""
diff --git a/actor-tests/src/test/scala-2/org/apache/pekko/util/LineNumberSpec.scala b/actor-tests/src/test/scala-2/org/apache/pekko/util/LineNumberSpec.scala
index f3783d831b..89df800211 100644
--- a/actor-tests/src/test/scala-2/org/apache/pekko/util/LineNumberSpec.scala
+++ b/actor-tests/src/test/scala-2/org/apache/pekko/util/LineNumberSpec.scala
@@ -14,6 +14,7 @@
package org.apache.pekko.util
import org.apache.pekko
+
import pekko.testkit.PekkoSpec
import pekko.util.LineNumbers._
diff --git a/actor-tests/src/test/scala/org/apache/pekko/actor/ActorConfigurationVerificationSpec.scala b/actor-tests/src/test/scala/org/apache/pekko/actor/ActorConfigurationVerificationSpec.scala
index cf47b35b54..7e7d6f0588 100644
--- a/actor-tests/src/test/scala/org/apache/pekko/actor/ActorConfigurationVerificationSpec.scala
+++ b/actor-tests/src/test/scala/org/apache/pekko/actor/ActorConfigurationVerificationSpec.scala
@@ -16,14 +16,15 @@ package org.apache.pekko.actor
import scala.concurrent.duration._
import org.apache.pekko
+
+import org.scalatest.BeforeAndAfterEach
+
import pekko.ConfigurationException
import pekko.routing._
import pekko.testkit._
import pekko.testkit.DefaultTimeout
import pekko.testkit.TestEvent._
-import org.scalatest.BeforeAndAfterEach
-
object ActorConfigurationVerificationSpec {
class TestActor extends Actor {
diff --git a/actor-tests/src/test/scala/org/apache/pekko/actor/ActorCreationPerfSpec.scala b/actor-tests/src/test/scala/org/apache/pekko/actor/ActorCreationPerfSpec.scala
index 606e6f22f1..c4a3743375 100644
--- a/actor-tests/src/test/scala/org/apache/pekko/actor/ActorCreationPerfSpec.scala
+++ b/actor-tests/src/test/scala/org/apache/pekko/actor/ActorCreationPerfSpec.scala
@@ -18,14 +18,15 @@ import scala.concurrent.duration._
import com.codahale.metrics.Histogram
import org.apache.pekko
-import pekko.testkit.{ ImplicitSender, PekkoSpec, PerformanceTest }
-import pekko.testkit.metrics._
-import pekko.testkit.metrics.HeapMemoryUsage
import org.scalatest.BeforeAndAfterAll
import com.typesafe.config.ConfigFactory
+import pekko.testkit.{ ImplicitSender, PekkoSpec, PerformanceTest }
+import pekko.testkit.metrics._
+import pekko.testkit.metrics.HeapMemoryUsage
+
object ActorCreationPerfSpec {
val config = ConfigFactory.parseString("""
diff --git a/actor-tests/src/test/scala/org/apache/pekko/actor/ActorLifeCycleSpec.scala b/actor-tests/src/test/scala/org/apache/pekko/actor/ActorLifeCycleSpec.scala
index 9ae6d2480e..cab1d1fd9d 100644
--- a/actor-tests/src/test/scala/org/apache/pekko/actor/ActorLifeCycleSpec.scala
+++ b/actor-tests/src/test/scala/org/apache/pekko/actor/ActorLifeCycleSpec.scala
@@ -20,12 +20,13 @@ import java.util.concurrent.atomic._
import scala.concurrent.{ Await, Future }
import org.apache.pekko
+
+import org.scalatest.BeforeAndAfterEach
+
import pekko.actor.Actor._
import pekko.pattern.ask
import pekko.testkit._
-import org.scalatest.BeforeAndAfterEach
-
object ActorLifeCycleSpec {
class LifeCycleTestActor(testActor: ActorRef, id: String, generationProvider: AtomicInteger) extends Actor {
diff --git a/actor-tests/src/test/scala/org/apache/pekko/actor/ActorMailboxSpec.scala b/actor-tests/src/test/scala/org/apache/pekko/actor/ActorMailboxSpec.scala
index 21ad5613dc..af365371da 100644
--- a/actor-tests/src/test/scala/org/apache/pekko/actor/ActorMailboxSpec.scala
+++ b/actor-tests/src/test/scala/org/apache/pekko/actor/ActorMailboxSpec.scala
@@ -17,14 +17,15 @@ import scala.annotation.nowarn
import scala.concurrent.duration.{ Duration, FiniteDuration }
import org.apache.pekko
+
+import com.typesafe.config.Config
+import com.typesafe.config.ConfigFactory
+
import pekko.ConfigurationException
import pekko.dispatch._
import pekko.testkit._
import pekko.util.Helpers.ConfigOps
-import com.typesafe.config.Config
-import com.typesafe.config.ConfigFactory
-
object ActorMailboxSpec {
val mailboxConf = ConfigFactory.parseString(s"""
unbounded-dispatcher {
diff --git a/actor-tests/src/test/scala/org/apache/pekko/actor/ActorRefSpec.scala b/actor-tests/src/test/scala/org/apache/pekko/actor/ActorRefSpec.scala
index 23f864c9d6..3da7bbf31d 100644
--- a/actor-tests/src/test/scala/org/apache/pekko/actor/ActorRefSpec.scala
+++ b/actor-tests/src/test/scala/org/apache/pekko/actor/ActorRefSpec.scala
@@ -20,6 +20,7 @@ import scala.concurrent.Promise
import scala.concurrent.duration._
import org.apache.pekko
+
import pekko.pattern.ask
import pekko.serialization.JavaSerializer
import pekko.testkit._
diff --git a/actor-tests/src/test/scala/org/apache/pekko/actor/ActorSelectionSpec.scala b/actor-tests/src/test/scala/org/apache/pekko/actor/ActorSelectionSpec.scala
index a8e9108e1d..0f4a47b3ae 100644
--- a/actor-tests/src/test/scala/org/apache/pekko/actor/ActorSelectionSpec.scala
+++ b/actor-tests/src/test/scala/org/apache/pekko/actor/ActorSelectionSpec.scala
@@ -17,6 +17,7 @@ import scala.concurrent.Await
import scala.concurrent.duration._
import org.apache.pekko
+
import pekko.pattern.ask
import pekko.testkit._
diff --git a/actor-tests/src/test/scala/org/apache/pekko/actor/ActorSystemDispatcherSpec.scala b/actor-tests/src/test/scala/org/apache/pekko/actor/ActorSystemDispatcherSpec.scala
index 26593792f0..5c9f7ea3cb 100644
--- a/actor-tests/src/test/scala/org/apache/pekko/actor/ActorSystemDispatcherSpec.scala
+++ b/actor-tests/src/test/scala/org/apache/pekko/actor/ActorSystemDispatcherSpec.scala
@@ -17,13 +17,14 @@ import scala.concurrent.ExecutionContext
import scala.concurrent.duration._
import org.apache.pekko
+
+import com.typesafe.config.ConfigFactory
+
import pekko.ConfigurationException
import pekko.actor.setup.ActorSystemSetup
import pekko.dispatch.{ Dispatchers, ExecutionContexts }
import pekko.testkit.{ ImplicitSender, PekkoSpec, TestActors, TestProbe }
-import com.typesafe.config.ConfigFactory
-
object ActorSystemDispatchersSpec {
class SnitchingExecutionContext(testActor: ActorRef, underlying: ExecutionContext) extends ExecutionContext {
diff --git a/actor-tests/src/test/scala/org/apache/pekko/actor/ActorSystemSpec.scala b/actor-tests/src/test/scala/org/apache/pekko/actor/ActorSystemSpec.scala
index ac1326debe..47865303ca 100644
--- a/actor-tests/src/test/scala/org/apache/pekko/actor/ActorSystemSpec.scala
+++ b/actor-tests/src/test/scala/org/apache/pekko/actor/ActorSystemSpec.scala
@@ -13,17 +13,20 @@
package org.apache.pekko.actor
-import java.util.concurrent.{ ConcurrentLinkedQueue, RejectedExecutionException }
import java.util.concurrent.atomic.AtomicInteger
+import java.util.concurrent.{ ConcurrentLinkedQueue, RejectedExecutionException }
import scala.annotation.nowarn
-import scala.concurrent.{ Await, Future }
import scala.concurrent.duration._
+import scala.concurrent.{ Await, Future }
import scala.util.Using
import org.scalatestplus.scalacheck.ScalaCheckPropertyChecks
import org.apache.pekko
+
+import com.typesafe.config.{ Config, ConfigFactory }
+
import pekko.actor.setup.ActorSystemSetup
import pekko.dispatch._
import pekko.japi.Util.immutableSeq
@@ -32,8 +35,6 @@ import pekko.testkit.{ TestKit, _ }
import pekko.util.{ Switch, Timeout }
import pekko.util.Helpers.ConfigOps
-import com.typesafe.config.{ Config, ConfigFactory }
-
object ActorSystemSpec {
class Waves extends Actor {
diff --git a/actor-tests/src/test/scala/org/apache/pekko/actor/ActorTimeoutSpec.scala b/actor-tests/src/test/scala/org/apache/pekko/actor/ActorTimeoutSpec.scala
index 94c2f464c8..0dcb44533e 100644
--- a/actor-tests/src/test/scala/org/apache/pekko/actor/ActorTimeoutSpec.scala
+++ b/actor-tests/src/test/scala/org/apache/pekko/actor/ActorTimeoutSpec.scala
@@ -17,7 +17,8 @@ import scala.concurrent.Await
import scala.concurrent.duration._
import org.apache.pekko
-import pekko.pattern.{ ask, AskTimeoutException }
+
+import pekko.pattern.{ AskTimeoutException, ask }
import pekko.testkit._
import pekko.testkit.TestEvent._
import pekko.util.Timeout
diff --git a/actor-tests/src/test/scala/org/apache/pekko/actor/ActorWithBoundedStashSpec.scala b/actor-tests/src/test/scala/org/apache/pekko/actor/ActorWithBoundedStashSpec.scala
index 45930934fa..865501ab60 100644
--- a/actor-tests/src/test/scala/org/apache/pekko/actor/ActorWithBoundedStashSpec.scala
+++ b/actor-tests/src/test/scala/org/apache/pekko/actor/ActorWithBoundedStashSpec.scala
@@ -17,16 +17,17 @@ import scala.annotation.nowarn
import scala.concurrent.duration._
import org.apache.pekko
+
+import org.scalatest.BeforeAndAfterEach
+
+import com.typesafe.config.{ Config, ConfigFactory }
+
import pekko.actor.ActorSystem.Settings
import pekko.dispatch.BoundedDequeBasedMailbox
import pekko.testkit._
import pekko.testkit.DefaultTimeout
import pekko.testkit.TestEvent._
-import org.scalatest.BeforeAndAfterEach
-
-import com.typesafe.config.{ Config, ConfigFactory }
-
object ActorWithBoundedStashSpec {
class StashingActor extends Actor with Stash {
diff --git a/actor-tests/src/test/scala/org/apache/pekko/actor/ActorWithStashSpec.scala b/actor-tests/src/test/scala/org/apache/pekko/actor/ActorWithStashSpec.scala
index c31c81c294..96ae2c2979 100644
--- a/actor-tests/src/test/scala/org/apache/pekko/actor/ActorWithStashSpec.scala
+++ b/actor-tests/src/test/scala/org/apache/pekko/actor/ActorWithStashSpec.scala
@@ -18,13 +18,14 @@ import scala.concurrent.Await
import scala.concurrent.duration._
import org.apache.pekko
+
+import org.scalatest.BeforeAndAfterEach
+
import pekko.pattern.ask
import pekko.testkit._
import pekko.testkit.DefaultTimeout
import pekko.testkit.TestEvent._
-import org.scalatest.BeforeAndAfterEach
-
object ActorWithStashSpec {
class StashingActor extends Actor with Stash {
diff --git a/actor-tests/src/test/scala/org/apache/pekko/actor/ConsistencySpec.scala b/actor-tests/src/test/scala/org/apache/pekko/actor/ConsistencySpec.scala
index 42f67440ae..b7a6489637 100644
--- a/actor-tests/src/test/scala/org/apache/pekko/actor/ConsistencySpec.scala
+++ b/actor-tests/src/test/scala/org/apache/pekko/actor/ConsistencySpec.scala
@@ -16,6 +16,7 @@ package org.apache.pekko.actor
import scala.concurrent.duration._
import org.apache.pekko
+
import pekko.dispatch.ThreadPoolConfig
import pekko.testkit.PekkoSpec
diff --git a/actor-tests/src/test/scala/org/apache/pekko/actor/CoordinatedShutdownSpec.scala b/actor-tests/src/test/scala/org/apache/pekko/actor/CoordinatedShutdownSpec.scala
index 9261674521..91137c2255 100644
--- a/actor-tests/src/test/scala/org/apache/pekko/actor/CoordinatedShutdownSpec.scala
+++ b/actor-tests/src/test/scala/org/apache/pekko/actor/CoordinatedShutdownSpec.scala
@@ -23,6 +23,10 @@ import scala.concurrent.Promise
import scala.concurrent.duration._
import org.apache.pekko
+
+import com.typesafe.config.Config
+import com.typesafe.config.ConfigFactory
+
import pekko.ConfigurationException
import pekko.Done
import pekko.actor.CoordinatedShutdown.Phase
@@ -32,9 +36,6 @@ import pekko.testkit.PekkoSpec
import pekko.testkit.TestKit
import pekko.testkit.TestProbe
-import com.typesafe.config.Config
-import com.typesafe.config.ConfigFactory
-
class CoordinatedShutdownSpec
extends PekkoSpec(ConfigFactory.parseString("""
pekko.loglevel=INFO
diff --git a/actor-tests/src/test/scala/org/apache/pekko/actor/DeadLetterSupressionSpec.scala b/actor-tests/src/test/scala/org/apache/pekko/actor/DeadLetterSupressionSpec.scala
index 3d6b03945a..5bcaf0b58f 100644
--- a/actor-tests/src/test/scala/org/apache/pekko/actor/DeadLetterSupressionSpec.scala
+++ b/actor-tests/src/test/scala/org/apache/pekko/actor/DeadLetterSupressionSpec.scala
@@ -16,6 +16,7 @@ package org.apache.pekko.actor
import scala.concurrent.duration._
import org.apache.pekko
+
import pekko.event.Logging
import pekko.testkit.ImplicitSender
import pekko.testkit.PekkoSpec
diff --git a/actor-tests/src/test/scala/org/apache/pekko/actor/DeadLetterSuspensionSpec.scala b/actor-tests/src/test/scala/org/apache/pekko/actor/DeadLetterSuspensionSpec.scala
index a05548c883..65116c6360 100644
--- a/actor-tests/src/test/scala/org/apache/pekko/actor/DeadLetterSuspensionSpec.scala
+++ b/actor-tests/src/test/scala/org/apache/pekko/actor/DeadLetterSuspensionSpec.scala
@@ -14,6 +14,7 @@
package org.apache.pekko.actor
import org.apache.pekko
+
import pekko.testkit.EventFilter
import pekko.testkit.ImplicitSender
import pekko.testkit.PekkoSpec
diff --git a/actor-tests/src/test/scala/org/apache/pekko/actor/DeathWatchSpec.scala b/actor-tests/src/test/scala/org/apache/pekko/actor/DeathWatchSpec.scala
index 60b15f3d17..92fdb4c838 100644
--- a/actor-tests/src/test/scala/org/apache/pekko/actor/DeathWatchSpec.scala
+++ b/actor-tests/src/test/scala/org/apache/pekko/actor/DeathWatchSpec.scala
@@ -18,6 +18,7 @@ import scala.concurrent.Await
import scala.concurrent.duration._
import org.apache.pekko
+
import pekko.actor.Props.EmptyActor
import pekko.dispatch.sysmsg.{ DeathWatchNotification, Failed }
import pekko.pattern.ask
diff --git a/actor-tests/src/test/scala/org/apache/pekko/actor/DeployerSpec.scala b/actor-tests/src/test/scala/org/apache/pekko/actor/DeployerSpec.scala
index 511823bb4c..c01edf03e7 100644
--- a/actor-tests/src/test/scala/org/apache/pekko/actor/DeployerSpec.scala
+++ b/actor-tests/src/test/scala/org/apache/pekko/actor/DeployerSpec.scala
@@ -16,12 +16,13 @@ package org.apache.pekko.actor
import scala.concurrent.duration._
import org.apache.pekko
-import pekko.routing._
-import pekko.testkit.PekkoSpec
import com.typesafe.config.ConfigFactory
import com.typesafe.config.ConfigParseOptions
+import pekko.routing._
+import pekko.testkit.PekkoSpec
+
object DeployerSpec {
val deployerConf = ConfigFactory.parseString(
"""
diff --git a/actor-tests/src/test/scala/org/apache/pekko/actor/ExtensionSpec.scala b/actor-tests/src/test/scala/org/apache/pekko/actor/ExtensionSpec.scala
index 43c7789082..7981b64855 100644
--- a/actor-tests/src/test/scala/org/apache/pekko/actor/ExtensionSpec.scala
+++ b/actor-tests/src/test/scala/org/apache/pekko/actor/ExtensionSpec.scala
@@ -18,14 +18,15 @@ import java.util.concurrent.atomic.AtomicInteger
import scala.util.control.NoStackTrace
import org.apache.pekko
-import pekko.testkit.EventFilter
-import pekko.testkit.TestKit._
import org.scalatest.matchers.should.Matchers
import org.scalatest.wordspec.AnyWordSpec
import com.typesafe.config.ConfigFactory
+import pekko.testkit.EventFilter
+import pekko.testkit.TestKit._
+
object TestExtension extends ExtensionId[TestExtension] with ExtensionIdProvider {
def lookup = this
def createExtension(s: ExtendedActorSystem) = new TestExtension(s)
diff --git a/actor-tests/src/test/scala/org/apache/pekko/actor/FSMActorSpec.scala b/actor-tests/src/test/scala/org/apache/pekko/actor/FSMActorSpec.scala
index a4cb514570..83c947baba 100644
--- a/actor-tests/src/test/scala/org/apache/pekko/actor/FSMActorSpec.scala
+++ b/actor-tests/src/test/scala/org/apache/pekko/actor/FSMActorSpec.scala
@@ -18,12 +18,13 @@ import scala.concurrent.Await
import scala.concurrent.duration._
import org.apache.pekko
+
+import com.typesafe.config.ConfigFactory
+
import pekko.event._
import pekko.testkit._
import pekko.util.Timeout
-import com.typesafe.config.ConfigFactory
-
object FSMActorSpec {
class Latches(implicit system: ActorSystem) {
diff --git a/actor-tests/src/test/scala/org/apache/pekko/actor/FSMTransitionSpec.scala b/actor-tests/src/test/scala/org/apache/pekko/actor/FSMTransitionSpec.scala
index 65c11e4dc4..05059c45b7 100644
--- a/actor-tests/src/test/scala/org/apache/pekko/actor/FSMTransitionSpec.scala
+++ b/actor-tests/src/test/scala/org/apache/pekko/actor/FSMTransitionSpec.scala
@@ -16,6 +16,7 @@ package org.apache.pekko.actor
import scala.concurrent.duration._
import org.apache.pekko
+
import pekko.testkit._
object FSMTransitionSpec {
diff --git a/actor-tests/src/test/scala/org/apache/pekko/actor/ForwardActorSpec.scala b/actor-tests/src/test/scala/org/apache/pekko/actor/ForwardActorSpec.scala
index d6f03c44e6..b111dabd48 100644
--- a/actor-tests/src/test/scala/org/apache/pekko/actor/ForwardActorSpec.scala
+++ b/actor-tests/src/test/scala/org/apache/pekko/actor/ForwardActorSpec.scala
@@ -17,6 +17,7 @@ import scala.concurrent.ExecutionContextExecutor
import scala.concurrent.duration._
import org.apache.pekko
+
import pekko.pattern.{ ask, pipe }
import pekko.testkit._
diff --git a/actor-tests/src/test/scala/org/apache/pekko/actor/FunctionRefSpec.scala b/actor-tests/src/test/scala/org/apache/pekko/actor/FunctionRefSpec.scala
index c897f26df1..6150bf822b 100644
--- a/actor-tests/src/test/scala/org/apache/pekko/actor/FunctionRefSpec.scala
+++ b/actor-tests/src/test/scala/org/apache/pekko/actor/FunctionRefSpec.scala
@@ -14,6 +14,7 @@
package org.apache.pekko.actor
import org.apache.pekko
+
import pekko.actor.dungeon.SerializationCheckFailedException
import pekko.testkit.EventFilter
import pekko.testkit.ImplicitSender
diff --git a/actor-tests/src/test/scala/org/apache/pekko/actor/LocalActorRefProviderSpec.scala b/actor-tests/src/test/scala/org/apache/pekko/actor/LocalActorRefProviderSpec.scala
index b0fe725657..5e6e532633 100644
--- a/actor-tests/src/test/scala/org/apache/pekko/actor/LocalActorRefProviderSpec.scala
+++ b/actor-tests/src/test/scala/org/apache/pekko/actor/LocalActorRefProviderSpec.scala
@@ -21,6 +21,7 @@ import scala.util.Failure
import scala.util.Success
import org.apache.pekko
+
import pekko.testkit._
import pekko.util.Timeout
diff --git a/actor-tests/src/test/scala/org/apache/pekko/actor/PropsCreationSpec.scala b/actor-tests/src/test/scala/org/apache/pekko/actor/PropsCreationSpec.scala
index 5923920544..44f8d13f96 100644
--- a/actor-tests/src/test/scala/org/apache/pekko/actor/PropsCreationSpec.scala
+++ b/actor-tests/src/test/scala/org/apache/pekko/actor/PropsCreationSpec.scala
@@ -16,6 +16,7 @@ package org.apache.pekko.actor
import scala.annotation.nowarn
import org.apache.pekko
+
import pekko.testkit.PekkoSpec
object PropsCreationSpec {
diff --git a/actor-tests/src/test/scala/org/apache/pekko/actor/ProviderSelectionSpec.scala b/actor-tests/src/test/scala/org/apache/pekko/actor/ProviderSelectionSpec.scala
index efc3b8d9f5..8702d7c56a 100644
--- a/actor-tests/src/test/scala/org/apache/pekko/actor/ProviderSelectionSpec.scala
+++ b/actor-tests/src/test/scala/org/apache/pekko/actor/ProviderSelectionSpec.scala
@@ -14,13 +14,14 @@
package org.apache.pekko.actor
import org.apache.pekko
+
+import com.typesafe.config.ConfigFactory
+
import pekko.actor.ActorSystem.Settings
import pekko.actor.ActorSystem.findClassLoader
import pekko.actor.setup.ActorSystemSetup
import pekko.testkit.AbstractSpec
-import com.typesafe.config.ConfigFactory
-
class ProviderSelectionSpec extends AbstractSpec {
import ProviderSelection.{ ClusterActorRefProvider, RemoteActorRefProvider }
diff --git a/actor-tests/src/test/scala/org/apache/pekko/actor/RestartStrategySpec.scala b/actor-tests/src/test/scala/org/apache/pekko/actor/RestartStrategySpec.scala
index 891a5f2995..ec006734a8 100644
--- a/actor-tests/src/test/scala/org/apache/pekko/actor/RestartStrategySpec.scala
+++ b/actor-tests/src/test/scala/org/apache/pekko/actor/RestartStrategySpec.scala
@@ -20,6 +20,7 @@ import scala.concurrent.Await
import scala.concurrent.duration._
import org.apache.pekko
+
import pekko.pattern.ask
import pekko.testkit.DefaultTimeout
import pekko.testkit.EventFilter
diff --git a/actor-tests/src/test/scala/org/apache/pekko/actor/SchedulerSpec.scala b/actor-tests/src/test/scala/org/apache/pekko/actor/SchedulerSpec.scala
index cca2a2c9e4..d3b263c011 100644
--- a/actor-tests/src/test/scala/org/apache/pekko/actor/SchedulerSpec.scala
+++ b/actor-tests/src/test/scala/org/apache/pekko/actor/SchedulerSpec.scala
@@ -14,27 +14,27 @@
package org.apache.pekko.actor
import java.io.Closeable
-import java.util.concurrent._
import java.util.concurrent.ThreadLocalRandom
+import java.util.concurrent._
import scala.annotation.nowarn
-import scala.concurrent.{ Await, ExecutionContext, Future }
import scala.concurrent.duration._
+import scala.concurrent.{ Await, ExecutionContext, Future }
import scala.util.Try
import scala.util.control.NoStackTrace
import scala.util.control.NonFatal
-import atomic.{ AtomicInteger, AtomicReference }
-
import org.apache.pekko
-import pekko.pattern.ask
-import pekko.testkit._
-import pekko.util.Helpers
import org.scalatest.BeforeAndAfterEach
import com.typesafe.config.{ Config, ConfigFactory }
+import atomic.{ AtomicInteger, AtomicReference }
+import pekko.pattern.ask
+import pekko.testkit._
+import pekko.util.Helpers
+
object SchedulerSpec {
val testConfRevolver =
ConfigFactory.parseString("""
diff --git a/actor-tests/src/test/scala/org/apache/pekko/actor/SupervisorHierarchySpec.scala b/actor-tests/src/test/scala/org/apache/pekko/actor/SupervisorHierarchySpec.scala
index 9e46e814bd..e801ac4496 100644
--- a/actor-tests/src/test/scala/org/apache/pekko/actor/SupervisorHierarchySpec.scala
+++ b/actor-tests/src/test/scala/org/apache/pekko/actor/SupervisorHierarchySpec.scala
@@ -15,9 +15,9 @@ package org.apache.pekko.actor
import java.lang.System.identityHashCode
import java.lang.ref.WeakReference
-import java.util.concurrent.{ CountDownLatch, TimeUnit }
import java.util.concurrent.ConcurrentHashMap
import java.util.concurrent.atomic.AtomicInteger
+import java.util.concurrent.{ CountDownLatch, TimeUnit }
import scala.annotation.nowarn
import scala.concurrent.Await
@@ -25,21 +25,21 @@ import scala.concurrent.duration._
import scala.util.Random
import scala.util.control.NoStackTrace
-import SupervisorStrategy.{ Directive, Restart, Resume, Stop }
-
import org.apache.pekko
+
+import com.typesafe.config.{ Config, ConfigFactory }
+
+import SupervisorStrategy.{ Directive, Restart, Resume, Stop }
import pekko.actor.SupervisorStrategy.seqThrowable2Decider
import pekko.dispatch.{ Dispatcher, DispatcherConfigurator, DispatcherPrerequisites, MessageDispatcher }
import pekko.event.Logging
import pekko.pattern.ask
import pekko.testkit.{ DefaultTimeout, EventFilter, ImplicitSender, PekkoSpec }
-import pekko.testkit.{ filterEvents, filterException, TestDuration, TestLatch }
+import pekko.testkit.{ TestDuration, TestLatch, filterEvents, filterException }
import pekko.testkit.LongRunningTest
import pekko.testkit.TestEvent.Mute
import pekko.util.Helpers.ConfigOps
-import com.typesafe.config.{ Config, ConfigFactory }
-
object SupervisorHierarchySpec {
class FireWorkerException(msg: String) extends Exception(msg)
diff --git a/actor-tests/src/test/scala/org/apache/pekko/actor/SupervisorMiscSpec.scala b/actor-tests/src/test/scala/org/apache/pekko/actor/SupervisorMiscSpec.scala
index d46996ef49..fbf6fed671 100644
--- a/actor-tests/src/test/scala/org/apache/pekko/actor/SupervisorMiscSpec.scala
+++ b/actor-tests/src/test/scala/org/apache/pekko/actor/SupervisorMiscSpec.scala
@@ -21,8 +21,9 @@ import scala.concurrent.duration._
import scala.util.control.NonFatal
import org.apache.pekko
+
import pekko.pattern.ask
-import pekko.testkit.{ filterEvents, EventFilter }
+import pekko.testkit.{ EventFilter, filterEvents }
import pekko.testkit.DefaultTimeout
import pekko.testkit.PekkoSpec
diff --git a/actor-tests/src/test/scala/org/apache/pekko/actor/SupervisorSpec.scala b/actor-tests/src/test/scala/org/apache/pekko/actor/SupervisorSpec.scala
index f75b460433..d77176a7af 100644
--- a/actor-tests/src/test/scala/org/apache/pekko/actor/SupervisorSpec.scala
+++ b/actor-tests/src/test/scala/org/apache/pekko/actor/SupervisorSpec.scala
@@ -20,6 +20,12 @@ import scala.concurrent.Await
import scala.concurrent.duration._
import org.apache.pekko
+
+import org.scalatest.BeforeAndAfterEach
+
+import com.typesafe.config.Config
+import com.typesafe.config.ConfigFactory
+
import pekko.{ Die, Ping }
import pekko.ConfigurationException
import pekko.dispatch.MailboxType
@@ -29,11 +35,6 @@ import pekko.routing.RoundRobinPool
import pekko.testkit._
import pekko.testkit.TestEvent._
-import org.scalatest.BeforeAndAfterEach
-
-import com.typesafe.config.Config
-import com.typesafe.config.ConfigFactory
-
object SupervisorSpec {
val Timeout = 5.seconds
diff --git a/actor-tests/src/test/scala/org/apache/pekko/actor/SupervisorTreeSpec.scala b/actor-tests/src/test/scala/org/apache/pekko/actor/SupervisorTreeSpec.scala
index 804fadba83..d309049840 100644
--- a/actor-tests/src/test/scala/org/apache/pekko/actor/SupervisorTreeSpec.scala
+++ b/actor-tests/src/test/scala/org/apache/pekko/actor/SupervisorTreeSpec.scala
@@ -17,6 +17,7 @@ import scala.concurrent.Await
import scala.concurrent.duration._
import org.apache.pekko
+
import pekko.pattern.ask
import pekko.testkit.{ DefaultTimeout, EventFilter, ImplicitSender, PekkoSpec }
diff --git a/actor-tests/src/test/scala/org/apache/pekko/actor/Ticket669Spec.scala b/actor-tests/src/test/scala/org/apache/pekko/actor/Ticket669Spec.scala
index 0a29353210..a80859dc4f 100644
--- a/actor-tests/src/test/scala/org/apache/pekko/actor/Ticket669Spec.scala
+++ b/actor-tests/src/test/scala/org/apache/pekko/actor/Ticket669Spec.scala
@@ -17,14 +17,15 @@ import scala.concurrent.Await
import scala.concurrent.duration._
import org.apache.pekko
+
+import org.scalatest.BeforeAndAfterAll
+
import pekko.pattern.ask
-import pekko.testkit.{ filterEvents, EventFilter }
+import pekko.testkit.{ EventFilter, filterEvents }
import pekko.testkit.DefaultTimeout
import pekko.testkit.ImplicitSender
import pekko.testkit.PekkoSpec
-import org.scalatest.BeforeAndAfterAll
-
class Ticket669Spec extends PekkoSpec with BeforeAndAfterAll with ImplicitSender with DefaultTimeout {
import Ticket669Spec._
diff --git a/actor-tests/src/test/scala/org/apache/pekko/actor/UidClashTest.scala b/actor-tests/src/test/scala/org/apache/pekko/actor/UidClashTest.scala
index f489142d8d..eee5308b51 100644
--- a/actor-tests/src/test/scala/org/apache/pekko/actor/UidClashTest.scala
+++ b/actor-tests/src/test/scala/org/apache/pekko/actor/UidClashTest.scala
@@ -16,6 +16,7 @@ package org.apache.pekko.actor
import scala.util.control.NoStackTrace
import org.apache.pekko
+
import pekko.actor.SupervisorStrategy.{ Restart, Stop }
import pekko.dispatch.sysmsg.SystemMessage
import pekko.event.EventStream
diff --git a/actor-tests/src/test/scala/org/apache/pekko/actor/dispatch/ActorModelSpec.scala b/actor-tests/src/test/scala/org/apache/pekko/actor/dispatch/ActorModelSpec.scala
index 39bc418e69..33ae0df1d3 100644
--- a/actor-tests/src/test/scala/org/apache/pekko/actor/dispatch/ActorModelSpec.scala
+++ b/actor-tests/src/test/scala/org/apache/pekko/actor/dispatch/ActorModelSpec.scala
@@ -14,15 +14,20 @@
package org.apache.pekko.actor.dispatch
import java.rmi.RemoteException
-import java.util.concurrent.{ ConcurrentHashMap, CountDownLatch, TimeUnit }
import java.util.concurrent.atomic.{ AtomicInteger, AtomicLong }
+import java.util.concurrent.{ ConcurrentHashMap, CountDownLatch, TimeUnit }
import scala.annotation.nowarn
import scala.annotation.tailrec
-import scala.concurrent.{ Await, Future }
import scala.concurrent.duration._
+import scala.concurrent.{ Await, Future }
import org.apache.pekko
+
+import org.scalatest.Assertions._
+
+import com.typesafe.config.Config
+
import pekko.actor._
import pekko.dispatch._
import pekko.event.Logging.Error
@@ -30,10 +35,6 @@ import pekko.pattern.ask
import pekko.testkit._
import pekko.util.Switch
-import org.scalatest.Assertions._
-
-import com.typesafe.config.Config
-
object ActorModelSpec {
sealed trait ActorModelMessage extends NoSerializationVerificationNeeded
diff --git a/actor-tests/src/test/scala/org/apache/pekko/actor/dispatch/BalancingDispatcherSpec.scala b/actor-tests/src/test/scala/org/apache/pekko/actor/dispatch/BalancingDispatcherSpec.scala
index 63e367b21a..12cf6471e6 100644
--- a/actor-tests/src/test/scala/org/apache/pekko/actor/dispatch/BalancingDispatcherSpec.scala
+++ b/actor-tests/src/test/scala/org/apache/pekko/actor/dispatch/BalancingDispatcherSpec.scala
@@ -16,6 +16,7 @@ package org.apache.pekko.actor.dispatch
import java.util.concurrent.{ CountDownLatch, TimeUnit }
import org.apache.pekko
+
import pekko.actor.{ Actor, ActorCell, ActorRefWithCell, Props }
import pekko.testkit.PekkoSpec
diff --git a/actor-tests/src/test/scala/org/apache/pekko/actor/dispatch/DispatcherActorSpec.scala b/actor-tests/src/test/scala/org/apache/pekko/actor/dispatch/DispatcherActorSpec.scala
index d2b3dd02e9..79d1b072ba 100644
--- a/actor-tests/src/test/scala/org/apache/pekko/actor/dispatch/DispatcherActorSpec.scala
+++ b/actor-tests/src/test/scala/org/apache/pekko/actor/dispatch/DispatcherActorSpec.scala
@@ -13,13 +13,14 @@
package org.apache.pekko.actor.dispatch
-import java.util.concurrent.{ CountDownLatch, TimeUnit }
import java.util.concurrent.atomic.AtomicBoolean
+import java.util.concurrent.{ CountDownLatch, TimeUnit }
import scala.concurrent.Await
import scala.concurrent.duration._
import org.apache.pekko
+
import pekko.actor.{ Actor, Props }
import pekko.pattern.ask
import pekko.testkit.DefaultTimeout
diff --git a/actor-tests/src/test/scala/org/apache/pekko/actor/dispatch/DispatcherActorsSpec.scala b/actor-tests/src/test/scala/org/apache/pekko/actor/dispatch/DispatcherActorsSpec.scala
index cb2e0faff0..2dc6aba7f7 100644
--- a/actor-tests/src/test/scala/org/apache/pekko/actor/dispatch/DispatcherActorsSpec.scala
+++ b/actor-tests/src/test/scala/org/apache/pekko/actor/dispatch/DispatcherActorsSpec.scala
@@ -16,6 +16,7 @@ package org.apache.pekko.actor.dispatch
import java.util.concurrent.CountDownLatch
import org.apache.pekko
+
import pekko.actor._
import pekko.testkit.PekkoSpec
diff --git a/actor-tests/src/test/scala/org/apache/pekko/actor/dispatch/DispatchersSpec.scala b/actor-tests/src/test/scala/org/apache/pekko/actor/dispatch/DispatchersSpec.scala
index 2fe8900f41..0d3107c08f 100644
--- a/actor-tests/src/test/scala/org/apache/pekko/actor/dispatch/DispatchersSpec.scala
+++ b/actor-tests/src/test/scala/org/apache/pekko/actor/dispatch/DispatchersSpec.scala
@@ -21,15 +21,16 @@ import scala.annotation.nowarn
import scala.reflect.ClassTag
import org.apache.pekko
+
+import com.typesafe.config.Config
+import com.typesafe.config.ConfigFactory
+
import pekko.ConfigurationException
import pekko.actor._
import pekko.dispatch._
import pekko.routing.FromConfig
import pekko.testkit.{ ImplicitSender, PekkoSpec }
-import com.typesafe.config.Config
-import com.typesafe.config.ConfigFactory
-
object DispatchersSpec {
val config = """
myapp {
diff --git a/actor-tests/src/test/scala/org/apache/pekko/actor/dispatch/PinnedActorSpec.scala b/actor-tests/src/test/scala/org/apache/pekko/actor/dispatch/PinnedActorSpec.scala
index 716452157e..daa7d60c20 100644
--- a/actor-tests/src/test/scala/org/apache/pekko/actor/dispatch/PinnedActorSpec.scala
+++ b/actor-tests/src/test/scala/org/apache/pekko/actor/dispatch/PinnedActorSpec.scala
@@ -18,13 +18,14 @@ import java.util.concurrent.{ CountDownLatch, TimeUnit }
import scala.concurrent.Await
import org.apache.pekko
+
+import org.scalatest.BeforeAndAfterEach
+
import pekko.actor.{ Actor, Props }
import pekko.pattern.ask
import pekko.testkit._
import pekko.testkit.PekkoSpec
-import org.scalatest.BeforeAndAfterEach
-
object PinnedActorSpec {
val config = """
pinned-dispatcher {
diff --git a/actor-tests/src/test/scala/org/apache/pekko/actor/dungeon/DispatchSpec.scala b/actor-tests/src/test/scala/org/apache/pekko/actor/dungeon/DispatchSpec.scala
index 3cefc3806c..8b97d22397 100644
--- a/actor-tests/src/test/scala/org/apache/pekko/actor/dungeon/DispatchSpec.scala
+++ b/actor-tests/src/test/scala/org/apache/pekko/actor/dungeon/DispatchSpec.scala
@@ -14,6 +14,7 @@
package org.apache.pekko.actor.dungeon
import org.apache.pekko
+
import pekko.actor.Actor
import pekko.actor.Props
import pekko.testkit._
diff --git a/actor-tests/src/test/scala/org/apache/pekko/actor/routing/ListenerSpec.scala b/actor-tests/src/test/scala/org/apache/pekko/actor/routing/ListenerSpec.scala
index 99376f2d8f..76c4c27825 100644
--- a/actor-tests/src/test/scala/org/apache/pekko/actor/routing/ListenerSpec.scala
+++ b/actor-tests/src/test/scala/org/apache/pekko/actor/routing/ListenerSpec.scala
@@ -18,6 +18,7 @@ import java.util.concurrent.atomic.AtomicInteger
import scala.concurrent.Await
import org.apache.pekko
+
import pekko.actor._
import pekko.routing._
import pekko.testkit._
diff --git a/actor-tests/src/test/scala/org/apache/pekko/actor/setup/ActorSystemSetupSpec.scala b/actor-tests/src/test/scala/org/apache/pekko/actor/setup/ActorSystemSetupSpec.scala
index ce79405f8c..22efdd124d 100644
--- a/actor-tests/src/test/scala/org/apache/pekko/actor/setup/ActorSystemSetupSpec.scala
+++ b/actor-tests/src/test/scala/org/apache/pekko/actor/setup/ActorSystemSetupSpec.scala
@@ -14,12 +14,13 @@
package org.apache.pekko.actor.setup
import org.apache.pekko
-import pekko.actor.ActorSystem
-import pekko.testkit.TestKit
import org.scalatest.matchers.should.Matchers
import org.scalatest.wordspec.AnyWordSpec
+import pekko.actor.ActorSystem
+import pekko.testkit.TestKit
+
case class DummySetup(name: String) extends Setup
case class DummySetup2(name: String) extends Setup
case class DummySetup3(name: String) extends Setup
diff --git a/actor-tests/src/test/scala/org/apache/pekko/config/ConfigSpec.scala b/actor-tests/src/test/scala/org/apache/pekko/config/ConfigSpec.scala
index 264ff45ee6..f28f2deb75 100644
--- a/actor-tests/src/test/scala/org/apache/pekko/config/ConfigSpec.scala
+++ b/actor-tests/src/test/scala/org/apache/pekko/config/ConfigSpec.scala
@@ -18,16 +18,17 @@ import java.util.concurrent.TimeUnit
import scala.concurrent.duration._
import org.apache.pekko
+
+import org.scalatest.Assertions
+
+import com.typesafe.config.ConfigFactory
+
import pekko.actor.ActorSystem
import pekko.actor.ExtendedActorSystem
import pekko.event.DefaultLoggingFilter
import pekko.event.Logging.DefaultLogger
import pekko.testkit.PekkoSpec
-import org.scalatest.Assertions
-
-import com.typesafe.config.ConfigFactory
-
class ConfigSpec extends PekkoSpec(ConfigFactory.defaultReference(ActorSystem.findClassLoader())) with Assertions {
"The default configuration file (i.e. reference.conf)" must {
diff --git a/actor-tests/src/test/scala/org/apache/pekko/dataflow/Future2Actor.scala b/actor-tests/src/test/scala/org/apache/pekko/dataflow/Future2Actor.scala
index acaf568d6d..75d3fba6fd 100644
--- a/actor-tests/src/test/scala/org/apache/pekko/dataflow/Future2Actor.scala
+++ b/actor-tests/src/test/scala/org/apache/pekko/dataflow/Future2Actor.scala
@@ -20,6 +20,7 @@ import scala.concurrent.Future
import scala.concurrent.duration._
import org.apache.pekko
+
import pekko.actor.{ Actor, Props }
import pekko.actor.ActorRef
import pekko.pattern.{ ask, pipe }
diff --git a/actor-tests/src/test/scala/org/apache/pekko/dispatch/ControlAwareDispatcherSpec.scala b/actor-tests/src/test/scala/org/apache/pekko/dispatch/ControlAwareDispatcherSpec.scala
index b6abfdb17c..b5405af9f7 100644
--- a/actor-tests/src/test/scala/org/apache/pekko/dispatch/ControlAwareDispatcherSpec.scala
+++ b/actor-tests/src/test/scala/org/apache/pekko/dispatch/ControlAwareDispatcherSpec.scala
@@ -14,6 +14,7 @@
package org.apache.pekko.dispatch
import org.apache.pekko
+
import pekko.actor.{ Actor, Props }
import pekko.testkit.{ DefaultTimeout, PekkoSpec }
diff --git a/actor-tests/src/test/scala/org/apache/pekko/dispatch/DispatcherShutdownSpec.scala b/actor-tests/src/test/scala/org/apache/pekko/dispatch/DispatcherShutdownSpec.scala
index a05f3cd5a1..4f0849f280 100644
--- a/actor-tests/src/test/scala/org/apache/pekko/dispatch/DispatcherShutdownSpec.scala
+++ b/actor-tests/src/test/scala/org/apache/pekko/dispatch/DispatcherShutdownSpec.scala
@@ -15,16 +15,17 @@ package org.apache.pekko.dispatch
import java.lang.management.ManagementFactory
-import scala.concurrent.{ Await, Future }
import scala.concurrent.duration._
+import scala.concurrent.{ Await, Future }
import org.apache.pekko
-import pekko.actor.ActorSystem
-import pekko.testkit.TestKit
import org.scalatest.matchers.should.Matchers
import org.scalatest.wordspec.AnyWordSpec
+import pekko.actor.ActorSystem
+import pekko.testkit.TestKit
+
class DispatcherShutdownSpec extends AnyWordSpec with Matchers {
"pekko dispatcher" should {
diff --git a/actor-tests/src/test/scala/org/apache/pekko/dispatch/ExecutionContextSpec.scala b/actor-tests/src/test/scala/org/apache/pekko/dispatch/ExecutionContextSpec.scala
index 36a164f9d8..3096d86fcc 100644
--- a/actor-tests/src/test/scala/org/apache/pekko/dispatch/ExecutionContextSpec.scala
+++ b/actor-tests/src/test/scala/org/apache/pekko/dispatch/ExecutionContextSpec.scala
@@ -13,14 +13,15 @@
package org.apache.pekko.dispatch
-import java.util.concurrent.{ Executor, ExecutorService, Executors }
import java.util.concurrent.atomic.AtomicInteger
+import java.util.concurrent.{ Executor, ExecutorService, Executors }
-import scala.concurrent.{ ExecutionContext, ExecutionContextExecutor, ExecutionContextExecutorService }
-import scala.concurrent.{ blocking, Await, Future, Promise }
import scala.concurrent.duration._
+import scala.concurrent.{ Await, Future, Promise, blocking }
+import scala.concurrent.{ ExecutionContext, ExecutionContextExecutor, ExecutionContextExecutorService }
import org.apache.pekko
+
import pekko.actor.Actor
import pekko.actor.Props
import pekko.testkit.{ DefaultTimeout, PekkoSpec, TestLatch }
diff --git a/actor-tests/src/test/scala/org/apache/pekko/dispatch/ForkJoinExecutorConfiguratorSpec.scala b/actor-tests/src/test/scala/org/apache/pekko/dispatch/ForkJoinExecutorConfiguratorSpec.scala
index 913b7752f5..f7caca4140 100644
--- a/actor-tests/src/test/scala/org/apache/pekko/dispatch/ForkJoinExecutorConfiguratorSpec.scala
+++ b/actor-tests/src/test/scala/org/apache/pekko/dispatch/ForkJoinExecutorConfiguratorSpec.scala
@@ -20,11 +20,12 @@ package org.apache.pekko.dispatch
import java.util.concurrent.ThreadFactory
import org.apache.pekko
-import pekko.testkit.PekkoSpec
-import pekko.util.JavaVersion
import com.typesafe.config.{ Config, ConfigFactory }
+import pekko.testkit.PekkoSpec
+import pekko.util.JavaVersion
+
object ForkJoinExecutorConfiguratorSpec {
// Keep the root config explicit so the dispatcher-config integration checks below
// see exactly the values this spec is asserting on (and not whatever the project's
diff --git a/actor-tests/src/test/scala/org/apache/pekko/dispatch/ForkJoinPoolStarvationSpec.scala b/actor-tests/src/test/scala/org/apache/pekko/dispatch/ForkJoinPoolStarvationSpec.scala
index 4816990c5d..f27a4ab1fc 100644
--- a/actor-tests/src/test/scala/org/apache/pekko/dispatch/ForkJoinPoolStarvationSpec.scala
+++ b/actor-tests/src/test/scala/org/apache/pekko/dispatch/ForkJoinPoolStarvationSpec.scala
@@ -14,12 +14,13 @@
package org.apache.pekko.dispatch
import org.apache.pekko
+
+import com.typesafe.config.ConfigFactory
+
import pekko.actor.{ Actor, Props }
import pekko.testkit.{ ImplicitSender, PekkoSpec }
import pekko.util.JavaVersion
-import com.typesafe.config.ConfigFactory
-
object ForkJoinPoolStarvationSpec {
val config = ConfigFactory.parseString("""
|actorhang {
diff --git a/actor-tests/src/test/scala/org/apache/pekko/dispatch/MailboxConfigSpec.scala b/actor-tests/src/test/scala/org/apache/pekko/dispatch/MailboxConfigSpec.scala
index 4720f9195a..a6718b50fd 100644
--- a/actor-tests/src/test/scala/org/apache/pekko/dispatch/MailboxConfigSpec.scala
+++ b/actor-tests/src/test/scala/org/apache/pekko/dispatch/MailboxConfigSpec.scala
@@ -16,17 +16,18 @@ package org.apache.pekko.dispatch
import java.util.concurrent.{ BlockingQueue, ConcurrentLinkedQueue }
import scala.annotation.nowarn
-import scala.concurrent.{ Await, ExecutionContext, Future }
import scala.concurrent.duration._
+import scala.concurrent.{ Await, ExecutionContext, Future }
import org.apache.pekko
-import pekko.actor._
-import pekko.testkit.{ EventFilter, PekkoSpec }
import org.scalatest.{ BeforeAndAfterAll, BeforeAndAfterEach }
import com.typesafe.config.{ Config, ConfigFactory }
+import pekko.actor._
+import pekko.testkit.{ EventFilter, PekkoSpec }
+
abstract class MailboxSpec extends PekkoSpec with BeforeAndAfterAll with BeforeAndAfterEach {
def name: String
diff --git a/actor-tests/src/test/scala/org/apache/pekko/dispatch/PriorityDispatcherSpec.scala b/actor-tests/src/test/scala/org/apache/pekko/dispatch/PriorityDispatcherSpec.scala
index 53511f096b..f0f4295e8e 100644
--- a/actor-tests/src/test/scala/org/apache/pekko/dispatch/PriorityDispatcherSpec.scala
+++ b/actor-tests/src/test/scala/org/apache/pekko/dispatch/PriorityDispatcherSpec.scala
@@ -17,11 +17,12 @@ import scala.annotation.nowarn
import scala.concurrent.duration._
import org.apache.pekko
-import pekko.actor.{ Actor, ActorSystem, Props }
-import pekko.testkit.{ DefaultTimeout, PekkoSpec }
import com.typesafe.config.Config
+import pekko.actor.{ Actor, ActorSystem, Props }
+import pekko.testkit.{ DefaultTimeout, PekkoSpec }
+
object PriorityDispatcherSpec {
case object Result
diff --git a/actor-tests/src/test/scala/org/apache/pekko/dispatch/SameThreadExecutionContextSpec.scala b/actor-tests/src/test/scala/org/apache/pekko/dispatch/SameThreadExecutionContextSpec.scala
index eb7681bf14..dd58e1a385 100644
--- a/actor-tests/src/test/scala/org/apache/pekko/dispatch/SameThreadExecutionContextSpec.scala
+++ b/actor-tests/src/test/scala/org/apache/pekko/dispatch/SameThreadExecutionContextSpec.scala
@@ -17,11 +17,12 @@ import scala.concurrent.ExecutionContext
import scala.concurrent.Promise
import org.apache.pekko
-import pekko.Done
-import pekko.testkit.PekkoSpec
import org.scalatest.matchers.should.Matchers
+import pekko.Done
+import pekko.testkit.PekkoSpec
+
class SameThreadExecutionContextSpec extends PekkoSpec with Matchers {
"The SameThreadExecutionContext" should {
diff --git a/actor-tests/src/test/scala/org/apache/pekko/dispatch/StablePriorityDispatcherSpec.scala b/actor-tests/src/test/scala/org/apache/pekko/dispatch/StablePriorityDispatcherSpec.scala
index 1a7c5e18a7..2e709ab88d 100644
--- a/actor-tests/src/test/scala/org/apache/pekko/dispatch/StablePriorityDispatcherSpec.scala
+++ b/actor-tests/src/test/scala/org/apache/pekko/dispatch/StablePriorityDispatcherSpec.scala
@@ -17,11 +17,12 @@ import scala.annotation.nowarn
import scala.concurrent.duration._
import org.apache.pekko
-import pekko.actor.{ Actor, ActorSystem, Props }
-import pekko.testkit.{ DefaultTimeout, PekkoSpec }
import com.typesafe.config.Config
+import pekko.actor.{ Actor, ActorSystem, Props }
+import pekko.testkit.{ DefaultTimeout, PekkoSpec }
+
object StablePriorityDispatcherSpec {
case object Result
diff --git a/actor-tests/src/test/scala/org/apache/pekko/dispatch/sysmsg/SystemMessageListSpec.scala b/actor-tests/src/test/scala/org/apache/pekko/dispatch/sysmsg/SystemMessageListSpec.scala
index 9326d8b83c..30dbfb5052 100644
--- a/actor-tests/src/test/scala/org/apache/pekko/dispatch/sysmsg/SystemMessageListSpec.scala
+++ b/actor-tests/src/test/scala/org/apache/pekko/dispatch/sysmsg/SystemMessageListSpec.scala
@@ -14,6 +14,7 @@
package org.apache.pekko.dispatch.sysmsg
import org.apache.pekko
+
import pekko.actor.Props
import pekko.testkit.PekkoSpec
diff --git a/actor-tests/src/test/scala/org/apache/pekko/event/AddressTerminatedTopicBenchSpec.scala b/actor-tests/src/test/scala/org/apache/pekko/event/AddressTerminatedTopicBenchSpec.scala
index 9215584384..2ebe1b2cbd 100644
--- a/actor-tests/src/test/scala/org/apache/pekko/event/AddressTerminatedTopicBenchSpec.scala
+++ b/actor-tests/src/test/scala/org/apache/pekko/event/AddressTerminatedTopicBenchSpec.scala
@@ -16,6 +16,7 @@ package org.apache.pekko.event
import scala.concurrent.duration._
import org.apache.pekko
+
import pekko.actor.Actor
import pekko.actor.ActorRef
import pekko.actor.ActorSystem
diff --git a/actor-tests/src/test/scala/org/apache/pekko/event/DeadLetterListenerShutdownSpec.scala b/actor-tests/src/test/scala/org/apache/pekko/event/DeadLetterListenerShutdownSpec.scala
index dd4b19eb58..0df3b2c2f3 100644
--- a/actor-tests/src/test/scala/org/apache/pekko/event/DeadLetterListenerShutdownSpec.scala
+++ b/actor-tests/src/test/scala/org/apache/pekko/event/DeadLetterListenerShutdownSpec.scala
@@ -22,9 +22,10 @@ import scala.concurrent.Future
import scala.concurrent.Promise
import scala.concurrent.duration._
+import org.apache.pekko
+
import com.typesafe.config.ConfigFactory
-import org.apache.pekko
import pekko.Done
import pekko.actor.Actor
import pekko.actor.ActorRef
diff --git a/actor-tests/src/test/scala/org/apache/pekko/event/EventBusSpec.scala b/actor-tests/src/test/scala/org/apache/pekko/event/EventBusSpec.scala
index bdffc760fb..9f4d52555d 100644
--- a/actor-tests/src/test/scala/org/apache/pekko/event/EventBusSpec.scala
+++ b/actor-tests/src/test/scala/org/apache/pekko/event/EventBusSpec.scala
@@ -14,14 +14,15 @@
package org.apache.pekko.event
import org.apache.pekko
-import pekko.actor.{ Actor, ActorRef, ActorSystem, PoisonPill, Props }
-import pekko.japi.function.Procedure
-import pekko.testkit._
import org.scalatest.BeforeAndAfterEach
import com.typesafe.config.{ Config, ConfigFactory }
+import pekko.actor.{ Actor, ActorRef, ActorSystem, PoisonPill, Props }
+import pekko.japi.function.Procedure
+import pekko.testkit._
+
object EventBusSpec {
class TestActorWrapperActor(testActor: ActorRef) extends Actor {
def receive = {
diff --git a/actor-tests/src/test/scala/org/apache/pekko/event/EventStreamSpec.scala b/actor-tests/src/test/scala/org/apache/pekko/event/EventStreamSpec.scala
index 476135829e..aa356b6079 100644
--- a/actor-tests/src/test/scala/org/apache/pekko/event/EventStreamSpec.scala
+++ b/actor-tests/src/test/scala/org/apache/pekko/event/EventStreamSpec.scala
@@ -16,11 +16,12 @@ package org.apache.pekko.event
import scala.concurrent.duration._
import org.apache.pekko
-import pekko.actor._
-import pekko.testkit.{ PekkoSpec, TestProbe }
import com.typesafe.config.ConfigFactory
+import pekko.actor._
+import pekko.testkit.{ PekkoSpec, TestProbe }
+
object EventStreamSpec {
val config = ConfigFactory.parseString("""
diff --git a/actor-tests/src/test/scala/org/apache/pekko/event/LoggerSpec.scala b/actor-tests/src/test/scala/org/apache/pekko/event/LoggerSpec.scala
index 6cb61dd31b..478cf05c2e 100644
--- a/actor-tests/src/test/scala/org/apache/pekko/event/LoggerSpec.scala
+++ b/actor-tests/src/test/scala/org/apache/pekko/event/LoggerSpec.scala
@@ -16,13 +16,19 @@ package org.apache.pekko.event
import java.nio.charset.StandardCharsets
import java.text.SimpleDateFormat
import java.time.{ LocalDateTime, ZoneOffset }
-import java.util.{ Calendar, Date, GregorianCalendar, TimeZone }
import java.util.concurrent.TimeUnit
+import java.util.{ Calendar, Date, GregorianCalendar, TimeZone }
import scala.concurrent.duration._
import scala.util.control.NoStackTrace
import org.apache.pekko
+
+import org.scalatest.matchers.should.Matchers
+import org.scalatest.wordspec.AnyWordSpec
+
+import com.typesafe.config.{ Config, ConfigFactory }
+
import pekko.actor._
import pekko.event.Logging._
import pekko.event.Logging.InitializeLogger
@@ -31,11 +37,6 @@ import pekko.serialization.SerializationExtension
import pekko.testkit._
import pekko.util.Helpers
-import org.scalatest.matchers.should.Matchers
-import org.scalatest.wordspec.AnyWordSpec
-
-import com.typesafe.config.{ Config, ConfigFactory }
-
object LoggerSpec {
val defaultConfig = ConfigFactory.parseString("""
diff --git a/actor-tests/src/test/scala/org/apache/pekko/event/LoggingReceiveSpec.scala b/actor-tests/src/test/scala/org/apache/pekko/event/LoggingReceiveSpec.scala
index febe6ea108..1aef7ef61d 100644
--- a/actor-tests/src/test/scala/org/apache/pekko/event/LoggingReceiveSpec.scala
+++ b/actor-tests/src/test/scala/org/apache/pekko/event/LoggingReceiveSpec.scala
@@ -18,14 +18,15 @@ import scala.concurrent.duration._
import scala.jdk.CollectionConverters._
import org.apache.pekko
-import pekko.actor._
-import pekko.testkit._
import org.scalatest.BeforeAndAfterAll
import org.scalatest.wordspec.AnyWordSpec
import com.typesafe.config.ConfigFactory
+import pekko.actor._
+import pekko.testkit._
+
object LoggingReceiveSpec {
class TestLogActor extends Actor {
override val supervisorStrategy =
diff --git a/actor-tests/src/test/scala/org/apache/pekko/event/MarkerLoggingSpec.scala b/actor-tests/src/test/scala/org/apache/pekko/event/MarkerLoggingSpec.scala
index 4a61fc7020..113958c799 100644
--- a/actor-tests/src/test/scala/org/apache/pekko/event/MarkerLoggingSpec.scala
+++ b/actor-tests/src/test/scala/org/apache/pekko/event/MarkerLoggingSpec.scala
@@ -14,6 +14,7 @@
package org.apache.pekko.event
import org.apache.pekko
+
import pekko.event.Logging._
import pekko.testkit._
diff --git a/actor-tests/src/test/scala/org/apache/pekko/io/CapacityLimitSpec.scala b/actor-tests/src/test/scala/org/apache/pekko/io/CapacityLimitSpec.scala
index 7ed15f5f0f..46ae8e67bc 100644
--- a/actor-tests/src/test/scala/org/apache/pekko/io/CapacityLimitSpec.scala
+++ b/actor-tests/src/test/scala/org/apache/pekko/io/CapacityLimitSpec.scala
@@ -13,9 +13,9 @@
package org.apache.pekko.io
-import Tcp._
-
import org.apache.pekko
+
+import Tcp._
import pekko.testkit.{ PekkoSpec, TestProbe }
import pekko.testkit.SocketUtil.temporaryServerAddresses
diff --git a/actor-tests/src/test/scala/org/apache/pekko/io/InetSocketOptionSpec.scala b/actor-tests/src/test/scala/org/apache/pekko/io/InetSocketOptionSpec.scala
index 1825cfd1eb..4793f1d6c2 100644
--- a/actor-tests/src/test/scala/org/apache/pekko/io/InetSocketOptionSpec.scala
+++ b/actor-tests/src/test/scala/org/apache/pekko/io/InetSocketOptionSpec.scala
@@ -24,6 +24,7 @@ import java.nio.channels.ServerSocketChannel
import java.nio.channels.SocketChannel
import org.apache.pekko
+
import pekko.testkit.PekkoSpec
class InetSocketOptionSpec extends PekkoSpec {
diff --git a/actor-tests/src/test/scala/org/apache/pekko/io/SimpleDnsCacheSpec.scala b/actor-tests/src/test/scala/org/apache/pekko/io/SimpleDnsCacheSpec.scala
index 4360018f41..299c3d13e7 100644
--- a/actor-tests/src/test/scala/org/apache/pekko/io/SimpleDnsCacheSpec.scala
+++ b/actor-tests/src/test/scala/org/apache/pekko/io/SimpleDnsCacheSpec.scala
@@ -20,14 +20,15 @@ import scala.collection.immutable
import scala.concurrent.duration._
import org.apache.pekko
+
+import org.scalatest.matchers.should.Matchers
+import org.scalatest.wordspec.AnyWordSpec
+
import pekko.io.dns.ARecord
import pekko.io.dns.CachePolicy.Ttl
import pekko.io.dns.DnsProtocol
import pekko.io.dns.DnsProtocol.Ip
-import org.scalatest.matchers.should.Matchers
-import org.scalatest.wordspec.AnyWordSpec
-
class SimpleDnsCacheSpec extends AnyWordSpec with Matchers {
"Cache" should {
"not reply with expired but not yet swept out entries" in {
diff --git a/actor-tests/src/test/scala/org/apache/pekko/io/TcpConnectionSpec.scala b/actor-tests/src/test/scala/org/apache/pekko/io/TcpConnectionSpec.scala
index f531a1a4a9..85809e944b 100644
--- a/actor-tests/src/test/scala/org/apache/pekko/io/TcpConnectionSpec.scala
+++ b/actor-tests/src/test/scala/org/apache/pekko/io/TcpConnectionSpec.scala
@@ -14,11 +14,11 @@
package org.apache.pekko.io
import java.io.IOException
-import java.net.{ InetSocketAddress, ServerSocket }
import java.net.SocketTimeoutException
+import java.net.{ InetSocketAddress, ServerSocket }
import java.nio.ByteBuffer
-import java.nio.channels._
import java.nio.channels.SelectionKey._
+import java.nio.channels._
import java.nio.channels.spi.SelectorProvider
import java.nio.file.Files
import java.util.Random
@@ -32,6 +32,11 @@ import scala.util.control.NonFatal
import com.google.common.jimfs.{ Configuration, Jimfs }
import org.apache.pekko
+
+import org.scalatest.matchers._
+
+import com.typesafe.config.ConfigFactory
+
import pekko.actor._
import pekko.io.Inet.SocketOption
import pekko.io.SelectionHandler._
@@ -41,10 +46,6 @@ import pekko.testkit.SocketUtil.temporaryServerAddress
import pekko.testkit.WithLogCapturing
import pekko.util.{ ByteString, Helpers }
-import org.scalatest.matchers._
-
-import com.typesafe.config.ConfigFactory
-
object TcpConnectionSpec {
case class Ack(i: Int) extends Event
object Ack extends Ack(0)
diff --git a/actor-tests/src/test/scala/org/apache/pekko/io/TcpIntegrationSpec.scala b/actor-tests/src/test/scala/org/apache/pekko/io/TcpIntegrationSpec.scala
index 44e8fe1756..123e68e67c 100644
--- a/actor-tests/src/test/scala/org/apache/pekko/io/TcpIntegrationSpec.scala
+++ b/actor-tests/src/test/scala/org/apache/pekko/io/TcpIntegrationSpec.scala
@@ -20,14 +20,15 @@ import java.util.concurrent.atomic.AtomicReference
import scala.concurrent.duration._
import org.apache.pekko
+
+import org.scalatest.concurrent.TimeLimits
+
import pekko.actor.{ ActorRef, PoisonPill }
import pekko.io.Tcp._
import pekko.testkit.{ PekkoSpec, TestProbe }
import pekko.testkit.WithLogCapturing
import pekko.util.ByteString
-import org.scalatest.concurrent.TimeLimits
-
class TcpIntegrationSpec extends PekkoSpec("""
pekko.loglevel = debug
pekko.loggers = ["org.apache.pekko.testkit.SilenceAllTestEventListener"]
diff --git a/actor-tests/src/test/scala/org/apache/pekko/io/TcpIntegrationSpecSupport.scala b/actor-tests/src/test/scala/org/apache/pekko/io/TcpIntegrationSpecSupport.scala
index 658f4bfd31..7d6db29f04 100644
--- a/actor-tests/src/test/scala/org/apache/pekko/io/TcpIntegrationSpecSupport.scala
+++ b/actor-tests/src/test/scala/org/apache/pekko/io/TcpIntegrationSpecSupport.scala
@@ -17,9 +17,9 @@ import scala.annotation.tailrec
import scala.collection.immutable
import scala.concurrent.ExecutionContext
-import Tcp._
-
import org.apache.pekko
+
+import Tcp._
import pekko.actor.ActorRef
import pekko.actor.ActorSystem
import pekko.io.Inet.SocketOption
diff --git a/actor-tests/src/test/scala/org/apache/pekko/io/TcpListenerSpec.scala b/actor-tests/src/test/scala/org/apache/pekko/io/TcpListenerSpec.scala
index 16d0e39125..9e7833233f 100644
--- a/actor-tests/src/test/scala/org/apache/pekko/io/TcpListenerSpec.scala
+++ b/actor-tests/src/test/scala/org/apache/pekko/io/TcpListenerSpec.scala
@@ -14,14 +14,14 @@
package org.apache.pekko.io
import java.net.Socket
-import java.nio.channels.{ SelectableChannel, SocketChannel }
import java.nio.channels.SelectionKey.OP_ACCEPT
+import java.nio.channels.{ SelectableChannel, SocketChannel }
import scala.concurrent.duration._
-import Tcp._
-
import org.apache.pekko
+
+import Tcp._
import pekko.actor._
import pekko.io.SelectionHandler._
import pekko.io.TcpListener.{ FailedRegisterIncoming, RegisterIncoming }
diff --git a/actor-tests/src/test/scala/org/apache/pekko/io/UdpConnectedIntegrationSpec.scala b/actor-tests/src/test/scala/org/apache/pekko/io/UdpConnectedIntegrationSpec.scala
index 686cd47136..8ab8394e47 100644
--- a/actor-tests/src/test/scala/org/apache/pekko/io/UdpConnectedIntegrationSpec.scala
+++ b/actor-tests/src/test/scala/org/apache/pekko/io/UdpConnectedIntegrationSpec.scala
@@ -18,6 +18,7 @@ import java.net.InetSocketAddress
import scala.concurrent.duration._
import org.apache.pekko
+
import pekko.actor.ActorRef
import pekko.testkit.ImplicitSender
import pekko.testkit.PekkoSpec
diff --git a/actor-tests/src/test/scala/org/apache/pekko/io/UdpIntegrationSpec.scala b/actor-tests/src/test/scala/org/apache/pekko/io/UdpIntegrationSpec.scala
index 9a20d7bd9a..95d0a4cc90 100644
--- a/actor-tests/src/test/scala/org/apache/pekko/io/UdpIntegrationSpec.scala
+++ b/actor-tests/src/test/scala/org/apache/pekko/io/UdpIntegrationSpec.scala
@@ -17,6 +17,7 @@ import java.net.DatagramSocket
import java.net.InetSocketAddress
import org.apache.pekko
+
import pekko.actor.ActorRef
import pekko.io.Inet._
import pekko.io.Udp._
diff --git a/actor-tests/src/test/scala/org/apache/pekko/io/UnsynchronizedByteArrayInputStreamSpec.scala b/actor-tests/src/test/scala/org/apache/pekko/io/UnsynchronizedByteArrayInputStreamSpec.scala
index 0fdff98c5a..764769bb01 100644
--- a/actor-tests/src/test/scala/org/apache/pekko/io/UnsynchronizedByteArrayInputStreamSpec.scala
+++ b/actor-tests/src/test/scala/org/apache/pekko/io/UnsynchronizedByteArrayInputStreamSpec.scala
@@ -20,11 +20,12 @@ package org.apache.pekko.util
import java.nio.charset.StandardCharsets
import org.apache.pekko
-import pekko.io.UnsynchronizedByteArrayInputStream
import org.scalatest.matchers.should.Matchers
import org.scalatest.wordspec.AnyWordSpec
+import pekko.io.UnsynchronizedByteArrayInputStream
+
class UnsynchronizedByteArrayInputStreamSpec extends AnyWordSpec with Matchers {
"UnsynchronizedByteArrayInputStream" must {
"support mark and reset" in {
diff --git a/actor-tests/src/test/scala/org/apache/pekko/io/dns/AsyncDnsResolverIntegrationSpec.scala b/actor-tests/src/test/scala/org/apache/pekko/io/dns/AsyncDnsResolverIntegrationSpec.scala
index 9959d08b53..57b664a0b9 100644
--- a/actor-tests/src/test/scala/org/apache/pekko/io/dns/AsyncDnsResolverIntegrationSpec.scala
+++ b/actor-tests/src/test/scala/org/apache/pekko/io/dns/AsyncDnsResolverIntegrationSpec.scala
@@ -17,9 +17,14 @@ import java.net.InetAddress
import scala.concurrent.duration._
-import CachePolicy.Ttl
-
import org.apache.pekko
+
+import org.scalatest.time.Millis
+import org.scalatest.time.Span
+
+import com.typesafe.config.ConfigFactory
+
+import CachePolicy.Ttl
import pekko.io.{ Dns, IO }
import pekko.io.dns.DnsProtocol.{ Ip, RequestType, Srv }
import pekko.pattern.ask
@@ -28,11 +33,6 @@ import pekko.testkit.SocketUtil.Both
import pekko.testkit.WithLogCapturing
import pekko.util.Timeout
-import org.scalatest.time.Millis
-import org.scalatest.time.Span
-
-import com.typesafe.config.ConfigFactory
-
/**
* These tests rely on a DNS server with 2 zones configured, foo.test and bar.example.
*
diff --git a/actor-tests/src/test/scala/org/apache/pekko/io/dns/DnsSettingsSpec.scala b/actor-tests/src/test/scala/org/apache/pekko/io/dns/DnsSettingsSpec.scala
index c658106a23..07293820b1 100644
--- a/actor-tests/src/test/scala/org/apache/pekko/io/dns/DnsSettingsSpec.scala
+++ b/actor-tests/src/test/scala/org/apache/pekko/io/dns/DnsSettingsSpec.scala
@@ -18,11 +18,12 @@ import java.net.InetAddress
import scala.concurrent.duration._
import org.apache.pekko
-import pekko.actor.ExtendedActorSystem
-import pekko.testkit.PekkoSpec
import com.typesafe.config.ConfigFactory
+import pekko.actor.ExtendedActorSystem
+import pekko.testkit.PekkoSpec
+
class DnsSettingsSpec extends PekkoSpec {
val eas = system.asInstanceOf[ExtendedActorSystem]
diff --git a/actor-tests/src/test/scala/org/apache/pekko/io/dns/DockerBindDnsService.scala b/actor-tests/src/test/scala/org/apache/pekko/io/dns/DockerBindDnsService.scala
index 501aa8a9e7..24f7cfd210 100644
--- a/actor-tests/src/test/scala/org/apache/pekko/io/dns/DockerBindDnsService.scala
+++ b/actor-tests/src/test/scala/org/apache/pekko/io/dns/DockerBindDnsService.scala
@@ -28,15 +28,16 @@ import com.github.dockerjava.core.{ DefaultDockerClientConfig, DockerClientConfi
import com.github.dockerjava.httpclient5.ApacheDockerHttpClient
import org.apache.pekko
-import pekko.actor.Props
-import pekko.io.dns.internal.DnsClient
-import pekko.testkit.PekkoSpec
-import pekko.util.Timeout
import org.scalatest.concurrent.Eventually
import com.typesafe.config.Config
+import pekko.actor.Props
+import pekko.io.dns.internal.DnsClient
+import pekko.testkit.PekkoSpec
+import pekko.util.Timeout
+
abstract class DockerBindDnsService(config: Config) extends PekkoSpec(config) with Eventually {
val dockerConfig: DockerClientConfig = DefaultDockerClientConfig
diff --git a/actor-tests/src/test/scala/org/apache/pekko/io/dns/internal/AsyncDnsManagerSpec.scala b/actor-tests/src/test/scala/org/apache/pekko/io/dns/internal/AsyncDnsManagerSpec.scala
index e11ba2c0e3..735f25ccf7 100644
--- a/actor-tests/src/test/scala/org/apache/pekko/io/dns/internal/AsyncDnsManagerSpec.scala
+++ b/actor-tests/src/test/scala/org/apache/pekko/io/dns/internal/AsyncDnsManagerSpec.scala
@@ -16,6 +16,7 @@ package org.apache.pekko.io.dns.internal
import scala.collection.immutable.Seq
import org.apache.pekko
+
import pekko.io.Dns
import pekko.io.dns.AAAARecord
import pekko.io.dns.CachePolicy.Ttl
diff --git a/actor-tests/src/test/scala/org/apache/pekko/io/dns/internal/AsyncDnsResolverSpec.scala b/actor-tests/src/test/scala/org/apache/pekko/io/dns/internal/AsyncDnsResolverSpec.scala
index 1f520a6d65..d287d272f6 100644
--- a/actor-tests/src/test/scala/org/apache/pekko/io/dns/internal/AsyncDnsResolverSpec.scala
+++ b/actor-tests/src/test/scala/org/apache/pekko/io/dns/internal/AsyncDnsResolverSpec.scala
@@ -19,6 +19,9 @@ import scala.collection.{ immutable => im }
import scala.concurrent.duration._
import org.apache.pekko
+
+import com.typesafe.config.{ Config, ConfigFactory, ConfigValueFactory }
+
import pekko.actor.{ ActorRef, ExtendedActorSystem, Props }
import pekko.actor.Status.Failure
import pekko.io.SimpleDnsCache
@@ -29,8 +32,6 @@ import pekko.io.dns.internal.AsyncDnsResolver.ResolveFailedException
import pekko.io.dns.internal.DnsClient.{ Answer, DropRequest, Dropped, DuplicateId, Question4, Question6, SrvQuestion }
import pekko.testkit.{ PekkoSpec, TestProbe, WithLogCapturing }
-import com.typesafe.config.{ Config, ConfigFactory, ConfigValueFactory }
-
class AsyncDnsResolverSpec extends PekkoSpec("""
pekko.loglevel = DEBUG
pekko.loggers = ["org.apache.pekko.testkit.SilenceAllTestEventListener"]
diff --git a/actor-tests/src/test/scala/org/apache/pekko/io/dns/internal/DnsClientSpec.scala b/actor-tests/src/test/scala/org/apache/pekko/io/dns/internal/DnsClientSpec.scala
index c84dc96375..5e72eb2c0f 100644
--- a/actor-tests/src/test/scala/org/apache/pekko/io/dns/internal/DnsClientSpec.scala
+++ b/actor-tests/src/test/scala/org/apache/pekko/io/dns/internal/DnsClientSpec.scala
@@ -20,6 +20,7 @@ import scala.collection.{ immutable => im }
import org.apache.pekko
import org.apache.pekko.actor.Status.Failure
+
import pekko.actor.Props
import pekko.io.Udp
import pekko.io.dns.{ ARecord, CachePolicy, RecordClass, RecordType }
diff --git a/actor-tests/src/test/scala/org/apache/pekko/io/dns/internal/MessageSpec.scala b/actor-tests/src/test/scala/org/apache/pekko/io/dns/internal/MessageSpec.scala
index cffbd246ab..5c3578d67f 100644
--- a/actor-tests/src/test/scala/org/apache/pekko/io/dns/internal/MessageSpec.scala
+++ b/actor-tests/src/test/scala/org/apache/pekko/io/dns/internal/MessageSpec.scala
@@ -14,12 +14,13 @@
package org.apache.pekko.io.dns.internal
import org.apache.pekko
-import pekko.io.dns.{ RecordClass, RecordType }
-import pekko.util.ByteString
import org.scalatest.matchers.should.Matchers
import org.scalatest.wordspec.AnyWordSpec
+import pekko.io.dns.{ RecordClass, RecordType }
+import pekko.util.ByteString
+
class MessageSpec extends AnyWordSpec with Matchers {
"The Message" should {
"parse a response that is truncated mid-message" in {
diff --git a/actor-tests/src/test/scala/org/apache/pekko/io/dns/internal/TcpDnsClientSpec.scala b/actor-tests/src/test/scala/org/apache/pekko/io/dns/internal/TcpDnsClientSpec.scala
index e756d2b24a..5e886c6dce 100644
--- a/actor-tests/src/test/scala/org/apache/pekko/io/dns/internal/TcpDnsClientSpec.scala
+++ b/actor-tests/src/test/scala/org/apache/pekko/io/dns/internal/TcpDnsClientSpec.scala
@@ -18,6 +18,7 @@ import java.net.InetSocketAddress
import scala.collection.immutable.Seq
import org.apache.pekko
+
import pekko.actor.{ ActorKilledException, Kill, Props }
import pekko.io.Tcp
import pekko.io.Tcp.{ Connected, PeerClosed, Register }
diff --git a/actor-tests/src/test/scala/org/apache/pekko/pattern/AskSpec.scala b/actor-tests/src/test/scala/org/apache/pekko/pattern/AskSpec.scala
index 57679f14d7..1cf791aa4b 100644
--- a/actor-tests/src/test/scala/org/apache/pekko/pattern/AskSpec.scala
+++ b/actor-tests/src/test/scala/org/apache/pekko/pattern/AskSpec.scala
@@ -19,6 +19,7 @@ import scala.concurrent.duration._
import scala.util.Failure
import org.apache.pekko
+
import pekko.actor._
import pekko.testkit.{ PekkoSpec, TestProbe }
import pekko.testkit.WithLogCapturing
diff --git a/actor-tests/src/test/scala/org/apache/pekko/pattern/BackoffOnRestartSupervisorSpec.scala b/actor-tests/src/test/scala/org/apache/pekko/pattern/BackoffOnRestartSupervisorSpec.scala
index f25635be66..d05d3de40f 100644
--- a/actor-tests/src/test/scala/org/apache/pekko/pattern/BackoffOnRestartSupervisorSpec.scala
+++ b/actor-tests/src/test/scala/org/apache/pekko/pattern/BackoffOnRestartSupervisorSpec.scala
@@ -19,9 +19,10 @@ import scala.annotation.nowarn
import scala.concurrent.duration._
import org.apache.pekko
+
import pekko.actor._
import pekko.pattern.TestActor.NormalException
-import pekko.testkit.{ filterException, ImplicitSender, PekkoSpec, TestProbe }
+import pekko.testkit.{ ImplicitSender, PekkoSpec, TestProbe, filterException }
import pekko.testkit.WithLogCapturing
object TestActor {
diff --git a/actor-tests/src/test/scala/org/apache/pekko/pattern/BackoffSupervisorSpec.scala b/actor-tests/src/test/scala/org/apache/pekko/pattern/BackoffSupervisorSpec.scala
index 1ae76002e2..af2898f4e4 100644
--- a/actor-tests/src/test/scala/org/apache/pekko/pattern/BackoffSupervisorSpec.scala
+++ b/actor-tests/src/test/scala/org/apache/pekko/pattern/BackoffSupervisorSpec.scala
@@ -17,12 +17,13 @@ import scala.concurrent.duration._
import scala.util.control.NoStackTrace
import org.apache.pekko
-import pekko.actor._
-import pekko.testkit._
import org.scalatest.concurrent.Eventually
import org.scalatest.prop.TableDrivenPropertyChecks._
+import pekko.actor._
+import pekko.testkit._
+
object BackoffSupervisorSpec {
class TestException extends RuntimeException with NoStackTrace
diff --git a/actor-tests/src/test/scala/org/apache/pekko/pattern/CircuitBreakerMTSpec.scala b/actor-tests/src/test/scala/org/apache/pekko/pattern/CircuitBreakerMTSpec.scala
index f1e83caad4..8efa332029 100644
--- a/actor-tests/src/test/scala/org/apache/pekko/pattern/CircuitBreakerMTSpec.scala
+++ b/actor-tests/src/test/scala/org/apache/pekko/pattern/CircuitBreakerMTSpec.scala
@@ -14,9 +14,9 @@
package org.apache.pekko.pattern
import scala.collection.immutable
-import scala.concurrent.{ Await, Future }
import scala.concurrent.ExecutionContextExecutor
import scala.concurrent.duration._
+import scala.concurrent.{ Await, Future }
import org.apache.pekko.testkit._
diff --git a/actor-tests/src/test/scala/org/apache/pekko/pattern/CircuitBreakerSpec.scala b/actor-tests/src/test/scala/org/apache/pekko/pattern/CircuitBreakerSpec.scala
index b64e0a9e59..0b889ccf59 100644
--- a/actor-tests/src/test/scala/org/apache/pekko/pattern/CircuitBreakerSpec.scala
+++ b/actor-tests/src/test/scala/org/apache/pekko/pattern/CircuitBreakerSpec.scala
@@ -24,6 +24,7 @@ import scala.util.Success
import scala.util.Try
import org.apache.pekko
+
import pekko.actor.{ ActorSystem, ExtendedActorSystem }
import pekko.testkit._
diff --git a/actor-tests/src/test/scala/org/apache/pekko/pattern/CircuitBreakerStressSpec.scala b/actor-tests/src/test/scala/org/apache/pekko/pattern/CircuitBreakerStressSpec.scala
index b74d5442da..6eabbb5cd2 100644
--- a/actor-tests/src/test/scala/org/apache/pekko/pattern/CircuitBreakerStressSpec.scala
+++ b/actor-tests/src/test/scala/org/apache/pekko/pattern/CircuitBreakerStressSpec.scala
@@ -20,6 +20,7 @@ import scala.concurrent.Promise
import scala.concurrent.duration._
import org.apache.pekko
+
import pekko.actor.Actor
import pekko.actor.ActorLogging
import pekko.actor.Props
diff --git a/actor-tests/src/test/scala/org/apache/pekko/pattern/PatternSpec.scala b/actor-tests/src/test/scala/org/apache/pekko/pattern/PatternSpec.scala
index 04111fee20..76c392ec60 100644
--- a/actor-tests/src/test/scala/org/apache/pekko/pattern/PatternSpec.scala
+++ b/actor-tests/src/test/scala/org/apache/pekko/pattern/PatternSpec.scala
@@ -13,10 +13,11 @@
package org.apache.pekko.pattern
-import scala.concurrent.{ Await, ExecutionContextExecutor, Future, Promise, TimeoutException }
import scala.concurrent.duration._
+import scala.concurrent.{ Await, ExecutionContextExecutor, Future, Promise, TimeoutException }
import org.apache.pekko
+
import pekko.actor.{ Actor, Props }
import pekko.testkit.{ PekkoSpec, TestLatch }
diff --git a/actor-tests/src/test/scala/org/apache/pekko/pattern/PipeToSpec.scala b/actor-tests/src/test/scala/org/apache/pekko/pattern/PipeToSpec.scala
index 990b8dec89..40ea069e63 100644
--- a/actor-tests/src/test/scala/org/apache/pekko/pattern/PipeToSpec.scala
+++ b/actor-tests/src/test/scala/org/apache/pekko/pattern/PipeToSpec.scala
@@ -16,6 +16,7 @@ package org.apache.pekko.pattern
import scala.concurrent.Future
import org.apache.pekko
+
import pekko.actor.Status
import pekko.testkit.PekkoSpec
import pekko.testkit.TestProbe
diff --git a/actor-tests/src/test/scala/org/apache/pekko/pattern/PromiseRefSpec.scala b/actor-tests/src/test/scala/org/apache/pekko/pattern/PromiseRefSpec.scala
index f4b8469efb..194a98953d 100644
--- a/actor-tests/src/test/scala/org/apache/pekko/pattern/PromiseRefSpec.scala
+++ b/actor-tests/src/test/scala/org/apache/pekko/pattern/PromiseRefSpec.scala
@@ -13,10 +13,11 @@
package org.apache.pekko.pattern
-import scala.concurrent.{ Await, Promise }
import scala.concurrent.duration._
+import scala.concurrent.{ Await, Promise }
import org.apache.pekko
+
import pekko.actor._
import pekko.testkit.{ ImplicitSender, PekkoSpec, TestProbe }
diff --git a/actor-tests/src/test/scala/org/apache/pekko/pattern/RetrySpec.scala b/actor-tests/src/test/scala/org/apache/pekko/pattern/RetrySpec.scala
index 1ba1bcd032..c124e551f5 100644
--- a/actor-tests/src/test/scala/org/apache/pekko/pattern/RetrySpec.scala
+++ b/actor-tests/src/test/scala/org/apache/pekko/pattern/RetrySpec.scala
@@ -15,10 +15,11 @@ package org.apache.pekko.pattern
import java.util.concurrent.atomic.AtomicInteger
-import scala.concurrent.{ Await, ExecutionContextExecutor, Future }
import scala.concurrent.duration._
+import scala.concurrent.{ Await, ExecutionContextExecutor, Future }
import org.apache.pekko
+
import pekko.actor.Scheduler
import pekko.testkit.PekkoSpec
diff --git a/actor-tests/src/test/scala/org/apache/pekko/pattern/StatusReplySpec.scala b/actor-tests/src/test/scala/org/apache/pekko/pattern/StatusReplySpec.scala
index 019311eebb..397debd238 100644
--- a/actor-tests/src/test/scala/org/apache/pekko/pattern/StatusReplySpec.scala
+++ b/actor-tests/src/test/scala/org/apache/pekko/pattern/StatusReplySpec.scala
@@ -13,18 +13,19 @@
package org.apache.pekko.pattern
-import scala.concurrent.{ Await, Future }
import scala.concurrent.duration._
+import scala.concurrent.{ Await, Future }
import org.apache.pekko
+
+import org.scalatest.concurrent.ScalaFutures
+
import pekko.Done
import pekko.testkit.PekkoSpec
import pekko.testkit.TestException
import pekko.testkit.TestProbe
import pekko.util.Timeout
-import org.scalatest.concurrent.ScalaFutures
-
class StatusReplySpec extends PekkoSpec with ScalaFutures {
"StatusReply" should {
diff --git a/actor-tests/src/test/scala/org/apache/pekko/pattern/extended/ExplicitAskSpec.scala b/actor-tests/src/test/scala/org/apache/pekko/pattern/extended/ExplicitAskSpec.scala
index 80fb90a74d..4a66345a22 100644
--- a/actor-tests/src/test/scala/org/apache/pekko/pattern/extended/ExplicitAskSpec.scala
+++ b/actor-tests/src/test/scala/org/apache/pekko/pattern/extended/ExplicitAskSpec.scala
@@ -17,6 +17,7 @@ import scala.concurrent.Await
import scala.concurrent.duration._
import org.apache.pekko
+
import pekko.actor._
import pekko.testkit.PekkoSpec
import pekko.util.Timeout
diff --git a/actor-tests/src/test/scala/org/apache/pekko/routing/BalancingSpec.scala b/actor-tests/src/test/scala/org/apache/pekko/routing/BalancingSpec.scala
index 5eec57d6bf..dd8ef22bc7 100644
--- a/actor-tests/src/test/scala/org/apache/pekko/routing/BalancingSpec.scala
+++ b/actor-tests/src/test/scala/org/apache/pekko/routing/BalancingSpec.scala
@@ -17,18 +17,19 @@ import java.net.URLEncoder
import java.nio.charset.StandardCharsets
import java.util.concurrent.atomic.AtomicInteger
-import scala.concurrent.{ Await, Future, Promise }
import scala.concurrent.duration._
+import scala.concurrent.{ Await, Future, Promise }
import org.apache.pekko
+
+import org.scalatest.BeforeAndAfterEach
+
import pekko.actor.{ Actor, ActorLogging, ActorRef, PoisonPill, Props }
import pekko.testkit.ImplicitSender
import pekko.testkit.PekkoSpec
import pekko.testkit.TestLatch
import pekko.testkit.TestProbe
-import org.scalatest.BeforeAndAfterEach
-
object BalancingSpec {
val counter = new AtomicInteger(1)
diff --git a/actor-tests/src/test/scala/org/apache/pekko/routing/BroadcastSpec.scala b/actor-tests/src/test/scala/org/apache/pekko/routing/BroadcastSpec.scala
index ee835ff0f5..a3751051e0 100644
--- a/actor-tests/src/test/scala/org/apache/pekko/routing/BroadcastSpec.scala
+++ b/actor-tests/src/test/scala/org/apache/pekko/routing/BroadcastSpec.scala
@@ -18,6 +18,7 @@ import java.util.concurrent.atomic.AtomicInteger
import scala.concurrent.Await
import org.apache.pekko
+
import pekko.actor.{ Actor, Props }
import pekko.pattern.ask
import pekko.testkit.{ DefaultTimeout, ImplicitSender, PekkoSpec, TestLatch }
diff --git a/actor-tests/src/test/scala/org/apache/pekko/routing/ConfiguredLocalRoutingSpec.scala b/actor-tests/src/test/scala/org/apache/pekko/routing/ConfiguredLocalRoutingSpec.scala
index d12addc319..cd972f9a48 100644
--- a/actor-tests/src/test/scala/org/apache/pekko/routing/ConfiguredLocalRoutingSpec.scala
+++ b/actor-tests/src/test/scala/org/apache/pekko/routing/ConfiguredLocalRoutingSpec.scala
@@ -19,6 +19,9 @@ import scala.concurrent.Await
import scala.concurrent.duration._
import org.apache.pekko
+
+import com.typesafe.config.Config
+
import pekko.ConfigurationException
import pekko.actor.{ Actor, ActorRef, Deploy, Props }
import pekko.actor.ActorPath
@@ -30,8 +33,6 @@ import pekko.testkit.{ DefaultTimeout, ImplicitSender, PekkoSpec }
import pekko.testkit.TestActors.echoActorProps
import pekko.testkit.TestProbe
-import com.typesafe.config.Config
-
object ConfiguredLocalRoutingSpec {
val config = """
pekko {
diff --git a/actor-tests/src/test/scala/org/apache/pekko/routing/ConsistentHashingRouterSpec.scala b/actor-tests/src/test/scala/org/apache/pekko/routing/ConsistentHashingRouterSpec.scala
index c20d310d8c..7b671bc8f1 100644
--- a/actor-tests/src/test/scala/org/apache/pekko/routing/ConsistentHashingRouterSpec.scala
+++ b/actor-tests/src/test/scala/org/apache/pekko/routing/ConsistentHashingRouterSpec.scala
@@ -17,6 +17,7 @@ import scala.concurrent.Await
import scala.concurrent.ExecutionContextExecutor
import org.apache.pekko
+
import pekko.actor.Actor
import pekko.actor.ActorRef
import pekko.actor.Props
diff --git a/actor-tests/src/test/scala/org/apache/pekko/routing/MetricsBasedResizerSpec.scala b/actor-tests/src/test/scala/org/apache/pekko/routing/MetricsBasedResizerSpec.scala
index 59752e01b4..e43fe7889d 100644
--- a/actor-tests/src/test/scala/org/apache/pekko/routing/MetricsBasedResizerSpec.scala
+++ b/actor-tests/src/test/scala/org/apache/pekko/routing/MetricsBasedResizerSpec.scala
@@ -19,10 +19,10 @@ import scala.concurrent.Await
import scala.concurrent.duration._
import scala.util.{ Random, Try }
+import org.apache.pekko
+
import MetricsBasedResizerSpec._
import OptimalSizeExploringResizer._
-
-import org.apache.pekko
import pekko.actor._
import pekko.pattern.ask
import pekko.testkit._
diff --git a/actor-tests/src/test/scala/org/apache/pekko/routing/RandomSpec.scala b/actor-tests/src/test/scala/org/apache/pekko/routing/RandomSpec.scala
index 0b850fe32a..c5124605d8 100644
--- a/actor-tests/src/test/scala/org/apache/pekko/routing/RandomSpec.scala
+++ b/actor-tests/src/test/scala/org/apache/pekko/routing/RandomSpec.scala
@@ -19,6 +19,7 @@ import scala.concurrent.Await
import scala.concurrent.duration._
import org.apache.pekko
+
import pekko.actor.{ Actor, Props }
import pekko.pattern.ask
import pekko.testkit.{ DefaultTimeout, ImplicitSender, PekkoSpec, TestLatch }
diff --git a/actor-tests/src/test/scala/org/apache/pekko/routing/ResizerSpec.scala b/actor-tests/src/test/scala/org/apache/pekko/routing/ResizerSpec.scala
index 198b7144cf..aa304e2adb 100644
--- a/actor-tests/src/test/scala/org/apache/pekko/routing/ResizerSpec.scala
+++ b/actor-tests/src/test/scala/org/apache/pekko/routing/ResizerSpec.scala
@@ -17,13 +17,14 @@ import scala.concurrent.Await
import scala.concurrent.duration._
import org.apache.pekko
+
+import com.typesafe.config.{ Config, ConfigFactory }
+
import pekko.actor.{ Actor, ActorRef, ActorSystem, Props }
import pekko.pattern.ask
import pekko.testkit._
import pekko.testkit.TestEvent._
-import com.typesafe.config.{ Config, ConfigFactory }
-
object ResizerSpec {
val config = """
diff --git a/actor-tests/src/test/scala/org/apache/pekko/routing/RoundRobinSpec.scala b/actor-tests/src/test/scala/org/apache/pekko/routing/RoundRobinSpec.scala
index 2e47538c5d..9b024908d8 100644
--- a/actor-tests/src/test/scala/org/apache/pekko/routing/RoundRobinSpec.scala
+++ b/actor-tests/src/test/scala/org/apache/pekko/routing/RoundRobinSpec.scala
@@ -19,6 +19,7 @@ import scala.concurrent.Await
import scala.concurrent.duration._
import org.apache.pekko
+
import pekko.actor.Actor
import pekko.actor.ActorRef
import pekko.actor.Props
diff --git a/actor-tests/src/test/scala/org/apache/pekko/routing/RouteeCreationSpec.scala b/actor-tests/src/test/scala/org/apache/pekko/routing/RouteeCreationSpec.scala
index 04bc6fc206..ba85a9cceb 100644
--- a/actor-tests/src/test/scala/org/apache/pekko/routing/RouteeCreationSpec.scala
+++ b/actor-tests/src/test/scala/org/apache/pekko/routing/RouteeCreationSpec.scala
@@ -16,6 +16,7 @@ package org.apache.pekko.routing
import scala.concurrent.duration._
import org.apache.pekko
+
import pekko.actor.Actor
import pekko.actor.ActorIdentity
import pekko.actor.Identify
diff --git a/actor-tests/src/test/scala/org/apache/pekko/routing/RoutingSpec.scala b/actor-tests/src/test/scala/org/apache/pekko/routing/RoutingSpec.scala
index 90ca2eaec1..4832f07df7 100644
--- a/actor-tests/src/test/scala/org/apache/pekko/routing/RoutingSpec.scala
+++ b/actor-tests/src/test/scala/org/apache/pekko/routing/RoutingSpec.scala
@@ -19,13 +19,14 @@ import scala.concurrent.ExecutionContextExecutor
import scala.concurrent.duration._
import org.apache.pekko
+
+import com.typesafe.config.ConfigFactory
+
import pekko.ConfigurationException
import pekko.actor._
import pekko.pattern.{ ask, pipe }
import pekko.testkit._
-import com.typesafe.config.ConfigFactory
-
object RoutingSpec {
val config = """
diff --git a/actor-tests/src/test/scala/org/apache/pekko/routing/ScatterGatherFirstCompletedSpec.scala b/actor-tests/src/test/scala/org/apache/pekko/routing/ScatterGatherFirstCompletedSpec.scala
index 6902fab230..42687ac71e 100644
--- a/actor-tests/src/test/scala/org/apache/pekko/routing/ScatterGatherFirstCompletedSpec.scala
+++ b/actor-tests/src/test/scala/org/apache/pekko/routing/ScatterGatherFirstCompletedSpec.scala
@@ -20,6 +20,7 @@ import scala.concurrent.Await
import scala.concurrent.duration._
import org.apache.pekko
+
import pekko.actor.{ Actor, Props }
import pekko.actor.ActorSystem
import pekko.actor.Status
diff --git a/actor-tests/src/test/scala/org/apache/pekko/routing/SmallestMailboxSpec.scala b/actor-tests/src/test/scala/org/apache/pekko/routing/SmallestMailboxSpec.scala
index b379f7bceb..28389b4894 100644
--- a/actor-tests/src/test/scala/org/apache/pekko/routing/SmallestMailboxSpec.scala
+++ b/actor-tests/src/test/scala/org/apache/pekko/routing/SmallestMailboxSpec.scala
@@ -18,6 +18,7 @@ import java.util.concurrent.ConcurrentHashMap
import scala.concurrent.Await
import org.apache.pekko
+
import pekko.actor.{ Actor, Props }
import pekko.testkit.{ DefaultTimeout, ImplicitSender, PekkoSpec, TestLatch }
diff --git a/actor-tests/src/test/scala/org/apache/pekko/routing/TailChoppingSpec.scala b/actor-tests/src/test/scala/org/apache/pekko/routing/TailChoppingSpec.scala
index 840daddaa3..d520c5a4a6 100644
--- a/actor-tests/src/test/scala/org/apache/pekko/routing/TailChoppingSpec.scala
+++ b/actor-tests/src/test/scala/org/apache/pekko/routing/TailChoppingSpec.scala
@@ -19,9 +19,10 @@ import scala.concurrent.Await
import scala.concurrent.duration._
import org.apache.pekko
+
import pekko.actor.{ Actor, ActorRef, ActorSystem, Props }
import pekko.actor.Status.Failure
-import pekko.pattern.{ ask, AskTimeoutException }
+import pekko.pattern.{ AskTimeoutException, ask }
import pekko.testkit._
object TailChoppingSpec {
diff --git a/actor-tests/src/test/scala/org/apache/pekko/serialization/AsyncSerializeSpec.scala b/actor-tests/src/test/scala/org/apache/pekko/serialization/AsyncSerializeSpec.scala
index 14f7bd46d8..d545b26b6b 100644
--- a/actor-tests/src/test/scala/org/apache/pekko/serialization/AsyncSerializeSpec.scala
+++ b/actor-tests/src/test/scala/org/apache/pekko/serialization/AsyncSerializeSpec.scala
@@ -19,11 +19,12 @@ import java.util.concurrent.CompletionStage
import scala.concurrent.Future
import org.apache.pekko
-import pekko.actor.ExtendedActorSystem
-import pekko.testkit.{ EventFilter, PekkoSpec }
import com.typesafe.config.ConfigFactory
+import pekko.actor.ExtendedActorSystem
+import pekko.testkit.{ EventFilter, PekkoSpec }
+
object AsyncSerializeSpec {
case class Message1(str: String)
diff --git a/actor-tests/src/test/scala/org/apache/pekko/serialization/DisabledJavaSerializerWarningSpec.scala b/actor-tests/src/test/scala/org/apache/pekko/serialization/DisabledJavaSerializerWarningSpec.scala
index ce723f9ab4..24ea058932 100644
--- a/actor-tests/src/test/scala/org/apache/pekko/serialization/DisabledJavaSerializerWarningSpec.scala
+++ b/actor-tests/src/test/scala/org/apache/pekko/serialization/DisabledJavaSerializerWarningSpec.scala
@@ -18,6 +18,7 @@ import java.nio.{ ByteBuffer, ByteOrder }
import scala.concurrent.duration._
import org.apache.pekko
+
import pekko.actor.ExtendedActorSystem
import pekko.testkit._
diff --git a/actor-tests/src/test/scala/org/apache/pekko/serialization/PrimitivesSerializationSpec.scala b/actor-tests/src/test/scala/org/apache/pekko/serialization/PrimitivesSerializationSpec.scala
index b03861dd60..a80e4d6f9c 100644
--- a/actor-tests/src/test/scala/org/apache/pekko/serialization/PrimitivesSerializationSpec.scala
+++ b/actor-tests/src/test/scala/org/apache/pekko/serialization/PrimitivesSerializationSpec.scala
@@ -19,12 +19,13 @@ import java.nio.ByteOrder
import scala.util.Random
import org.apache.pekko
+
+import com.typesafe.config.ConfigFactory
+
import pekko.testkit.PekkoSpec
import pekko.util.ByteString
import pekko.util.ByteString.ByteString2
-import com.typesafe.config.ConfigFactory
-
object PrimitivesSerializationSpec {
val serializationTestOverrides = ""
diff --git a/actor-tests/src/test/scala/org/apache/pekko/serialization/SerializationSetupSpec.scala b/actor-tests/src/test/scala/org/apache/pekko/serialization/SerializationSetupSpec.scala
index a2853cf155..6767a17a45 100644
--- a/actor-tests/src/test/scala/org/apache/pekko/serialization/SerializationSetupSpec.scala
+++ b/actor-tests/src/test/scala/org/apache/pekko/serialization/SerializationSetupSpec.scala
@@ -13,18 +13,19 @@
package org.apache.pekko.serialization
-import java.util.{ BitSet => ProgrammaticJavaDummy }
-import java.util.{ Date => SerializableDummy }
import java.util.concurrent.ConcurrentHashMap
import java.util.concurrent.atomic.AtomicInteger
+import java.util.{ BitSet => ProgrammaticJavaDummy }
+import java.util.{ Date => SerializableDummy }
import org.apache.pekko
+
+import com.typesafe.config.ConfigFactory
+
import pekko.actor.{ ActorSystem, BootstrapSetup, ExtendedActorSystem }
import pekko.actor.setup.ActorSystemSetup
import pekko.testkit.{ PekkoSpec, TestKit }
-import com.typesafe.config.ConfigFactory
-
class ConfigurationDummy
class ProgrammaticDummy
diff --git a/actor-tests/src/test/scala/org/apache/pekko/serialization/SerializeSpec.scala b/actor-tests/src/test/scala/org/apache/pekko/serialization/SerializeSpec.scala
index a94ba68368..22030ed876 100644
--- a/actor-tests/src/test/scala/org/apache/pekko/serialization/SerializeSpec.scala
+++ b/actor-tests/src/test/scala/org/apache/pekko/serialization/SerializeSpec.scala
@@ -14,17 +14,20 @@
package org.apache.pekko.serialization
import java.io._
-import java.nio.{ ByteBuffer, ByteOrder }
import java.nio.charset.StandardCharsets
+import java.nio.{ ByteBuffer, ByteOrder }
import scala.annotation.nowarn
import scala.concurrent.Await
import scala.concurrent.duration._
-import SerializationTests._
import test.org.apache.pekko.serialization.NoVerification
import org.apache.pekko
+
+import com.typesafe.config._
+
+import SerializationTests._
import pekko.actor._
import pekko.actor.dungeon.SerializationCheckFailedException
import pekko.pattern.ask
@@ -32,8 +35,6 @@ import pekko.testkit.{ EventFilter, PekkoSpec }
import pekko.util.ByteString
import pekko.util.Timeout
-import com.typesafe.config._
-
object SerializationTests {
val serializeConf = s"""
diff --git a/actor-tests/src/test/scala/org/apache/pekko/testkit/CallingThreadDispatcherModelSpec.scala b/actor-tests/src/test/scala/org/apache/pekko/testkit/CallingThreadDispatcherModelSpec.scala
index ef189a231c..c691cd8704 100644
--- a/actor-tests/src/test/scala/org/apache/pekko/testkit/CallingThreadDispatcherModelSpec.scala
+++ b/actor-tests/src/test/scala/org/apache/pekko/testkit/CallingThreadDispatcherModelSpec.scala
@@ -16,13 +16,14 @@ package org.apache.pekko.testkit
import java.util.concurrent.atomic.AtomicInteger
import org.apache.pekko
+
+import com.typesafe.config.Config
+
import pekko.actor.dispatch.ActorModelSpec
import pekko.dispatch.DispatcherPrerequisites
import pekko.dispatch.MessageDispatcher
import pekko.dispatch.MessageDispatcherConfigurator
-import com.typesafe.config.Config
-
object CallingThreadDispatcherModelSpec {
import ActorModelSpec._
diff --git a/actor-tests/src/test/scala/org/apache/pekko/util/BoundedBlockingQueueSpec.scala b/actor-tests/src/test/scala/org/apache/pekko/util/BoundedBlockingQueueSpec.scala
index 4b92b2c19b..dfa9f552a7 100644
--- a/actor-tests/src/test/scala/org/apache/pekko/util/BoundedBlockingQueueSpec.scala
+++ b/actor-tests/src/test/scala/org/apache/pekko/util/BoundedBlockingQueueSpec.scala
@@ -26,17 +26,18 @@ import scala.util.control.Exception
import org.scalactic.source.Position
import org.apache.pekko
-import pekko.testkit.TimingTest
-import pekko.util.DefaultExecutionContext._
import org.scalatest.concurrent.{ Signaler, ThreadSignaler }
import org.scalatest.exceptions.TestFailedDueToTimeoutException
-import org.scalatest.matchers.{ MatchResult, Matcher }
import org.scalatest.matchers.should.Matchers
+import org.scalatest.matchers.{ MatchResult, Matcher }
import org.scalatest.time.Span
import org.scalatest.time.SpanSugar._
import org.scalatest.wordspec.AnyWordSpec
+import pekko.testkit.TimingTest
+import pekko.util.DefaultExecutionContext._
+
class BoundedBlockingQueueSpec
extends AnyWordSpec
with Matchers
diff --git a/actor-tests/src/test/scala/org/apache/pekko/util/ByteStringInputStreamSpec.scala b/actor-tests/src/test/scala/org/apache/pekko/util/ByteStringInputStreamSpec.scala
index 3bab079071..876a27b0c2 100644
--- a/actor-tests/src/test/scala/org/apache/pekko/util/ByteStringInputStreamSpec.scala
+++ b/actor-tests/src/test/scala/org/apache/pekko/util/ByteStringInputStreamSpec.scala
@@ -21,11 +21,12 @@ import java.io.{ ByteArrayOutputStream, InputStream, OutputStream }
import java.nio.charset.StandardCharsets
import org.apache.pekko
-import pekko.util.ByteString.{ ByteString1, ByteString1C, ByteStrings }
import org.scalatest.matchers.should.Matchers
import org.scalatest.wordspec.AnyWordSpec
+import pekko.util.ByteString.{ ByteString1, ByteString1C, ByteStrings }
+
class ByteStringInputStreamSpec extends AnyWordSpec with Matchers {
"ByteString1" must {
"support asInputStream" in {
diff --git a/actor-tests/src/test/scala/org/apache/pekko/util/ByteStringSpec.scala b/actor-tests/src/test/scala/org/apache/pekko/util/ByteStringSpec.scala
index e7d15c7541..2fbeef360f 100644
--- a/actor-tests/src/test/scala/org/apache/pekko/util/ByteStringSpec.scala
+++ b/actor-tests/src/test/scala/org/apache/pekko/util/ByteStringSpec.scala
@@ -16,25 +16,26 @@ package org.apache.pekko.util
import java.io.{ ByteArrayOutputStream, ObjectInputStream, ObjectOutputStream }
import java.lang.Double.doubleToRawLongBits
import java.lang.Float.floatToRawIntBits
-import java.nio.{ ByteBuffer, ByteOrder }
import java.nio.ByteOrder.{ BIG_ENDIAN, LITTLE_ENDIAN }
import java.nio.charset.StandardCharsets
+import java.nio.{ ByteBuffer, ByteOrder }
import scala.annotation.nowarn
import scala.collection.mutable.Builder
import org.apache.commons.codec.binary.Hex.encodeHex
-import org.scalacheck.{ Arbitrary, Gen }
import org.scalacheck.Arbitrary.arbitrary
+import org.scalacheck.{ Arbitrary, Gen }
import org.scalatestplus.scalacheck.Checkers
import org.apache.pekko
-import pekko.io.UnsynchronizedByteArrayInputStream
-import pekko.util.ByteString.{ ByteString1, ByteString1C, ByteString2, ByteStrings }
import org.scalatest.matchers.should.Matchers
import org.scalatest.wordspec.AnyWordSpec
+import pekko.io.UnsynchronizedByteArrayInputStream
+import pekko.util.ByteString.{ ByteString1, ByteString1C, ByteString2, ByteStrings }
+
class ByteStringSpec extends AnyWordSpec with Matchers with Checkers {
implicit val betterGeneratorDrivenConfig: PropertyCheckConfiguration =
diff --git a/actor-tests/src/test/scala/org/apache/pekko/util/IndexSpec.scala b/actor-tests/src/test/scala/org/apache/pekko/util/IndexSpec.scala
index d08c3d6c90..aaa16e4c3c 100644
--- a/actor-tests/src/test/scala/org/apache/pekko/util/IndexSpec.scala
+++ b/actor-tests/src/test/scala/org/apache/pekko/util/IndexSpec.scala
@@ -21,11 +21,12 @@ import scala.concurrent.Future
import scala.util.Random
import org.apache.pekko
-import pekko.testkit.DefaultTimeout
-import pekko.testkit.PekkoSpec
import org.scalatest.matchers.should.Matchers
+import pekko.testkit.DefaultTimeout
+import pekko.testkit.PekkoSpec
+
class IndexSpec extends PekkoSpec with Matchers with DefaultTimeout {
implicit val ec: ExecutionContextExecutor = system.dispatcher
private def emptyIndex =
diff --git a/actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/ActorContextSpec.scala b/actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/ActorContextSpec.scala
index 05c2a56f45..af6489c004 100644
--- a/actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/ActorContextSpec.scala
+++ b/actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/ActorContextSpec.scala
@@ -18,6 +18,9 @@ import scala.concurrent.duration._
import scala.reflect.ClassTag
import org.apache.pekko
+
+import org.scalatest.wordspec.AnyWordSpecLike
+
import pekko.actor.InvalidMessageException
import pekko.actor.testkit.typed.TestException
import pekko.actor.testkit.typed.scaladsl.LogCapturing
@@ -26,8 +29,6 @@ import pekko.actor.testkit.typed.scaladsl.ScalaTestWithActorTestKit
import pekko.actor.testkit.typed.scaladsl.TestProbe
import pekko.actor.typed.scaladsl.Behaviors
-import org.scalatest.wordspec.AnyWordSpecLike
-
object ActorSpecMessages {
sealed trait Command
diff --git a/actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/ActorRefIgnoreSpec.scala b/actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/ActorRefIgnoreSpec.scala
index 3e4771bfe6..e01f0bb50d 100644
--- a/actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/ActorRefIgnoreSpec.scala
+++ b/actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/ActorRefIgnoreSpec.scala
@@ -19,15 +19,16 @@ import scala.concurrent.duration._
import scala.util.{ Failure, Success }
import org.apache.pekko
+
+import org.scalatest.concurrent.PatienceConfiguration.{ Timeout => PatienceTimeout }
+import org.scalatest.wordspec.AnyWordSpecLike
+
import pekko.actor.testkit.typed.scaladsl.{ ScalaTestWithActorTestKit, TestProbe }
import pekko.actor.typed.scaladsl.AskPattern._
import pekko.actor.typed.scaladsl.Behaviors
import pekko.actor.typed.scaladsl.adapter._
import pekko.util.Timeout
-import org.scalatest.concurrent.PatienceConfiguration.{ Timeout => PatienceTimeout }
-import org.scalatest.wordspec.AnyWordSpecLike
-
class ActorRefIgnoreSpec extends ScalaTestWithActorTestKit() with AnyWordSpecLike {
case class Request(replyTo: ActorRef[Int])
diff --git a/actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/ActorRefResolverSpec.scala b/actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/ActorRefResolverSpec.scala
index 55653d218e..5146203fba 100644
--- a/actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/ActorRefResolverSpec.scala
+++ b/actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/ActorRefResolverSpec.scala
@@ -14,6 +14,11 @@
package org.apache.pekko.actor.typed
import org.apache.pekko
+
+import org.scalatest.concurrent.ScalaFutures
+import org.scalatest.matchers.should.Matchers
+import org.scalatest.wordspec.AnyWordSpec
+
import pekko.actor.ActorPath
import pekko.actor.ActorRefProvider
import pekko.actor.ActorSystemImpl
@@ -21,10 +26,6 @@ import pekko.actor.MinimalActorRef
import pekko.actor.RootActorPath
import pekko.actor.typed.scaladsl.Behaviors
-import org.scalatest.concurrent.ScalaFutures
-import org.scalatest.matchers.should.Matchers
-import org.scalatest.wordspec.AnyWordSpec
-
class ActorRefResolverSpec extends AnyWordSpec with ScalaFutures with Matchers {
"ActorRefResolver" should {
"not allow serialization of ref originating from other system" in {
diff --git a/actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/ActorSystemSpec.scala b/actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/ActorSystemSpec.scala
index 2fb49c5ffb..1ae5a613e8 100644
--- a/actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/ActorSystemSpec.scala
+++ b/actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/ActorSystemSpec.scala
@@ -21,11 +21,12 @@ import scala.annotation.nowarn
import scala.util.Using
import org.apache.pekko
-import pekko.actor.typed.scaladsl.Behaviors
-import pekko.testkit.PekkoSpec
import com.typesafe.config.ConfigFactory
+import pekko.actor.typed.scaladsl.Behaviors
+import pekko.testkit.PekkoSpec
+
@nowarn("msg=possible missing interpolator")
class ActorSystemSpec extends PekkoSpec {
"ActorSystem" should {
diff --git a/actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/AskSpec.scala b/actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/AskSpec.scala
index 8800f5d962..e2c39a5199 100644
--- a/actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/AskSpec.scala
+++ b/actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/AskSpec.scala
@@ -21,6 +21,9 @@ import scala.util.Failure
import scala.util.Success
import org.apache.pekko
+
+import org.scalatest.wordspec.AnyWordSpecLike
+
import pekko.actor.testkit.typed.scaladsl.LogCapturing
import pekko.actor.testkit.typed.scaladsl.LoggingTestKit
import pekko.actor.testkit.typed.scaladsl.ScalaTestWithActorTestKit
@@ -33,8 +36,6 @@ import pekko.pattern.StatusReply
import pekko.testkit.TestException
import pekko.util.Timeout
-import org.scalatest.wordspec.AnyWordSpecLike
-
object AskSpec {
sealed trait Msg
final case class Foo(s: String, replyTo: ActorRef[String]) extends Msg
diff --git a/actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/BehaviorSpec.scala b/actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/BehaviorSpec.scala
index 9f9cba1715..f9172df364 100644
--- a/actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/BehaviorSpec.scala
+++ b/actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/BehaviorSpec.scala
@@ -20,6 +20,10 @@ import scala.annotation.nowarn
import org.scalactic.TypeCheckedTripleEquals
import org.apache.pekko
+
+import org.scalatest.matchers.should.Matchers
+import org.scalatest.wordspec.AnyWordSpecLike
+
import pekko.Done
import pekko.actor.testkit.typed.scaladsl.{ BehaviorTestKit, TestInbox }
import pekko.actor.testkit.typed.scaladsl.LogCapturing
@@ -30,9 +34,6 @@ import pekko.actor.typed.scaladsl.{ Behaviors => SBehaviors }
import pekko.japi.function.Function
import pekko.japi.pf.PFBuilder
-import org.scalatest.matchers.should.Matchers
-import org.scalatest.wordspec.AnyWordSpecLike
-
object BehaviorSpec {
sealed trait Command {
@nowarn
diff --git a/actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/CancelReceiveTimeoutSpec.scala b/actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/CancelReceiveTimeoutSpec.scala
index c342ba9cfd..e5dae7b8c7 100644
--- a/actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/CancelReceiveTimeoutSpec.scala
+++ b/actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/CancelReceiveTimeoutSpec.scala
@@ -21,14 +21,15 @@ import scala.concurrent.duration._
import scala.reflect.ClassTag
import org.apache.pekko
+
+import org.scalatest.wordspec.AnyWordSpecLike
+
import pekko.actor.testkit.typed.scaladsl.LogCapturing
import pekko.actor.testkit.typed.scaladsl.ScalaTestWithActorTestKit
import pekko.actor.testkit.typed.scaladsl.TestProbe
import pekko.actor.typed.scaladsl.Behaviors
import pekko.actor.typed.scaladsl.adapter._
-import org.scalatest.wordspec.AnyWordSpecLike
-
class CancelReceiveTimeoutSpec extends ScalaTestWithActorTestKit with AnyWordSpecLike with LogCapturing {
sealed trait Command
diff --git a/actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/DeferredSpec.scala b/actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/DeferredSpec.scala
index 6600bdf3f2..ae4044f4e8 100644
--- a/actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/DeferredSpec.scala
+++ b/actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/DeferredSpec.scala
@@ -16,15 +16,16 @@ package org.apache.pekko.actor.typed
import scala.util.control.NoStackTrace
import org.apache.pekko
+
+import org.scalatest.matchers.should.Matchers
+import org.scalatest.wordspec.{ AnyWordSpec, AnyWordSpecLike }
+
import pekko.actor.ActorInitializationException
import pekko.actor.testkit.typed.TestKitSettings
import pekko.actor.testkit.typed.scaladsl._
import pekko.actor.testkit.typed.scaladsl.LoggingTestKit
import pekko.actor.typed.scaladsl.Behaviors
-import org.scalatest.matchers.should.Matchers
-import org.scalatest.wordspec.{ AnyWordSpec, AnyWordSpecLike }
-
object DeferredSpec {
sealed trait Command
case object Ping extends Command
diff --git a/actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/ExtensionsSpec.scala b/actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/ExtensionsSpec.scala
index 781ea42e07..ab6cd4db8e 100644
--- a/actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/ExtensionsSpec.scala
+++ b/actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/ExtensionsSpec.scala
@@ -18,6 +18,11 @@ import java.util.concurrent.atomic.AtomicInteger
import scala.concurrent.Future
import org.apache.pekko
+
+import org.scalatest.wordspec.AnyWordSpecLike
+
+import com.typesafe.config.{ Config, ConfigFactory }
+
import pekko.actor.BootstrapSetup
import pekko.actor.setup.ActorSystemSetup
import pekko.actor.testkit.typed.scaladsl.LogCapturing
@@ -26,10 +31,6 @@ import pekko.actor.typed.receptionist.Receptionist
import pekko.actor.typed.receptionist.ServiceKey
import pekko.actor.typed.scaladsl.Behaviors
-import org.scalatest.wordspec.AnyWordSpecLike
-
-import com.typesafe.config.{ Config, ConfigFactory }
-
class DummyExtension1 extends Extension
object DummyExtension1 extends ExtensionId[DummyExtension1] {
def createExtension(system: ActorSystem[?]) = new DummyExtension1
diff --git a/actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/InterceptSpec.scala b/actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/InterceptSpec.scala
index 208258315e..82f748e5d4 100644
--- a/actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/InterceptSpec.scala
+++ b/actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/InterceptSpec.scala
@@ -18,6 +18,9 @@ import java.util.concurrent.atomic.AtomicBoolean
import scala.concurrent.duration._
import org.apache.pekko
+
+import org.scalatest.wordspec.AnyWordSpecLike
+
import pekko.actor.ActorInitializationException
import pekko.actor.testkit.typed.scaladsl.LogCapturing
import pekko.actor.testkit.typed.scaladsl.LoggingTestKit
@@ -27,8 +30,6 @@ import pekko.actor.typed.internal.PoisonPill
import pekko.actor.typed.internal.PoisonPillInterceptor
import pekko.actor.typed.scaladsl.Behaviors
-import org.scalatest.wordspec.AnyWordSpecLike
-
object InterceptSpec {
final case class Msg(hello: String, replyTo: ActorRef[String])
case object MyPoisonPill
diff --git a/actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/LocalActorRefProviderLogMessagesSpec.scala b/actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/LocalActorRefProviderLogMessagesSpec.scala
index 8a5b6fb60b..3d941e631c 100644
--- a/actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/LocalActorRefProviderLogMessagesSpec.scala
+++ b/actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/LocalActorRefProviderLogMessagesSpec.scala
@@ -14,11 +14,12 @@
package org.apache.pekko.actor.typed
import org.apache.pekko
-import pekko.actor.testkit.typed.scaladsl.{ ActorTestKit, LogCapturing, LoggingTestKit, ScalaTestWithActorTestKit }
-import pekko.actor.typed.internal.adapter.ActorSystemAdapter
import org.scalatest.wordspec.AnyWordSpecLike
+import pekko.actor.testkit.typed.scaladsl.{ ActorTestKit, LogCapturing, LoggingTestKit, ScalaTestWithActorTestKit }
+import pekko.actor.typed.internal.adapter.ActorSystemAdapter
+
object LocalActorRefProviderLogMessagesSpec {
val config = """
pekko {
diff --git a/actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/LogMessagesSpec.scala b/actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/LogMessagesSpec.scala
index f8d865bc1b..3e1dbf364e 100644
--- a/actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/LogMessagesSpec.scala
+++ b/actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/LogMessagesSpec.scala
@@ -14,6 +14,11 @@
package org.apache.pekko.actor.typed
import org.apache.pekko
+
+import org.scalatest.wordspec.AnyWordSpecLike
+
+import org.slf4j.event.Level
+
import pekko.actor
import pekko.actor.testkit.typed.scaladsl.LogCapturing
import pekko.actor.testkit.typed.scaladsl.LoggingTestKit
@@ -21,10 +26,6 @@ import pekko.actor.testkit.typed.scaladsl.ScalaTestWithActorTestKit
import pekko.actor.typed.scaladsl.Behaviors
import pekko.actor.typed.scaladsl.adapter._
-import org.scalatest.wordspec.AnyWordSpecLike
-
-import org.slf4j.event.Level
-
class LogMessagesSpec extends ScalaTestWithActorTestKit("""
pekko.loglevel = DEBUG # test verifies debug
""") with AnyWordSpecLike with LogCapturing {
diff --git a/actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/MailboxSelectorSpec.scala b/actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/MailboxSelectorSpec.scala
index acdb1ad080..69275669fd 100644
--- a/actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/MailboxSelectorSpec.scala
+++ b/actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/MailboxSelectorSpec.scala
@@ -17,6 +17,9 @@ import java.util.concurrent.CountDownLatch
import java.util.concurrent.TimeUnit
import org.apache.pekko
+
+import org.scalatest.wordspec.AnyWordSpecLike
+
import pekko.actor.ActorCell
import pekko.actor.testkit.typed.scaladsl.LogCapturing
import pekko.actor.testkit.typed.scaladsl.LoggingTestKit
@@ -29,8 +32,6 @@ import pekko.dispatch.BoundedNodeMessageQueue
import pekko.dispatch.MessageQueue
import pekko.dispatch.UnboundedMessageQueueSemantics
-import org.scalatest.wordspec.AnyWordSpecLike
-
class MailboxSelectorSpec extends ScalaTestWithActorTestKit("""
specific-mailbox {
mailbox-type = "org.apache.pekko.dispatch.NonBlockingBoundedMailbox"
diff --git a/actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/MonitorSpec.scala b/actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/MonitorSpec.scala
index 53cd0297b6..4e26b95c26 100644
--- a/actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/MonitorSpec.scala
+++ b/actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/MonitorSpec.scala
@@ -14,13 +14,14 @@
package org.apache.pekko.actor.typed
import org.apache.pekko
+
+import org.scalatest.wordspec.AnyWordSpecLike
+
import pekko.actor.testkit.typed.scaladsl.LogCapturing
import pekko.actor.testkit.typed.scaladsl.ScalaTestWithActorTestKit
import pekko.actor.testkit.typed.scaladsl.TestProbe
import pekko.actor.typed.scaladsl.Behaviors
-import org.scalatest.wordspec.AnyWordSpecLike
-
class MonitorSpec extends ScalaTestWithActorTestKit with AnyWordSpecLike with LogCapturing {
"The monitor behavior" should {
diff --git a/actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/OrElseSpec.scala b/actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/OrElseSpec.scala
index ac46eef74b..b104c52f48 100644
--- a/actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/OrElseSpec.scala
+++ b/actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/OrElseSpec.scala
@@ -16,12 +16,13 @@ package org.apache.pekko.actor.typed
import scala.annotation.tailrec
import org.apache.pekko
-import pekko.actor.testkit.typed.scaladsl._
-import pekko.actor.typed.scaladsl.Behaviors
import org.scalatest.matchers.should.Matchers
import org.scalatest.wordspec.AnyWordSpec
+import pekko.actor.testkit.typed.scaladsl._
+import pekko.actor.typed.scaladsl.Behaviors
+
/**
* Background: Originally there was an `OrElseBehavior` that could compose two `Behavior`, but that
* wasn't safe when used together with narrow so `OrElseBehavior` was removed. Kept this
diff --git a/actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/SpawnProtocolSpec.scala b/actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/SpawnProtocolSpec.scala
index 6038f3eb06..7b6ee565c7 100644
--- a/actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/SpawnProtocolSpec.scala
+++ b/actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/SpawnProtocolSpec.scala
@@ -17,14 +17,15 @@ import scala.concurrent.Future
import scala.concurrent.duration._
import org.apache.pekko
+
+import org.scalatest.matchers.should.Matchers
+import org.scalatest.wordspec.{ AnyWordSpec, AnyWordSpecLike }
+
import pekko.actor.testkit.typed.TestKitSettings
import pekko.actor.testkit.typed.scaladsl._
import pekko.actor.typed.scaladsl.Behaviors
import pekko.util.Timeout
-import org.scalatest.matchers.should.Matchers
-import org.scalatest.wordspec.{ AnyWordSpec, AnyWordSpecLike }
-
object SpawnProtocolSpec {
sealed trait Message
final case class Ping(replyTo: ActorRef[Pong.type]) extends Message
diff --git a/actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/SupervisionSpec.scala b/actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/SupervisionSpec.scala
index 9ced7d2558..47c4753912 100644
--- a/actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/SupervisionSpec.scala
+++ b/actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/SupervisionSpec.scala
@@ -26,6 +26,13 @@ import scala.util.Success
import scala.util.control.NoStackTrace
import org.apache.pekko
+
+import org.scalatest.matchers.should.Matchers
+import org.scalatest.wordspec.AnyWordSpec
+import org.scalatest.wordspec.AnyWordSpecLike
+
+import org.slf4j.event.Level
+
import pekko.actor.ActorInitializationException
import pekko.actor.Dropped
import pekko.actor.testkit.typed._
@@ -37,12 +44,6 @@ import pekko.actor.typed.scaladsl.ActorContext
import pekko.actor.typed.scaladsl.Behaviors
import pekko.actor.typed.scaladsl.Behaviors._
-import org.scalatest.matchers.should.Matchers
-import org.scalatest.wordspec.AnyWordSpec
-import org.scalatest.wordspec.AnyWordSpecLike
-
-import org.slf4j.event.Level
-
object SupervisionSpec {
sealed trait Command
diff --git a/actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/TerminatedSpec.scala b/actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/TerminatedSpec.scala
index 4709337899..50d72dd58f 100644
--- a/actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/TerminatedSpec.scala
+++ b/actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/TerminatedSpec.scala
@@ -14,12 +14,13 @@
package org.apache.pekko.actor.typed
import org.apache.pekko
-import pekko.actor.testkit.typed.scaladsl.LogCapturing
-import pekko.actor.testkit.typed.scaladsl.TestInbox
import org.scalatest.matchers.should.Matchers
import org.scalatest.wordspec.AnyWordSpec
+import pekko.actor.testkit.typed.scaladsl.LogCapturing
+import pekko.actor.testkit.typed.scaladsl.TestInbox
+
class TerminatedSpec extends AnyWordSpec with Matchers with LogCapturing {
"Child Failed" must {
diff --git a/actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/TimerSpec.scala b/actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/TimerSpec.scala
index f47e8d69c9..f7ca634c6e 100644
--- a/actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/TimerSpec.scala
+++ b/actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/TimerSpec.scala
@@ -21,6 +21,9 @@ import scala.concurrent.duration._
import scala.util.control.NoStackTrace
import org.apache.pekko
+
+import org.scalatest.wordspec.AnyWordSpecLike
+
import pekko.actor.DeadLetter
import pekko.actor.testkit.typed.TestException
import pekko.actor.testkit.typed.scaladsl._
@@ -29,8 +32,6 @@ import pekko.actor.typed.scaladsl.Behaviors
import pekko.actor.typed.scaladsl.TimerScheduler
import pekko.testkit.TimingTest
-import org.scalatest.wordspec.AnyWordSpecLike
-
class TimerSpec extends ScalaTestWithActorTestKit with AnyWordSpecLike with LogCapturing {
sealed trait Command
diff --git a/actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/TransformMessagesSpec.scala b/actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/TransformMessagesSpec.scala
index 72e8e0a7d8..9dfa79be84 100644
--- a/actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/TransformMessagesSpec.scala
+++ b/actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/TransformMessagesSpec.scala
@@ -18,6 +18,9 @@ import java.util.concurrent.atomic.AtomicInteger
import scala.concurrent.duration._
import org.apache.pekko
+
+import org.scalatest.wordspec.AnyWordSpecLike
+
import pekko.actor
import pekko.actor.ActorInitializationException
import pekko.actor.testkit.typed.scaladsl.LogCapturing
@@ -28,8 +31,6 @@ import pekko.actor.typed.scaladsl.Behaviors
import pekko.actor.typed.scaladsl.adapter._
import pekko.util.Helpers.toRootLowerCase
-import org.scalatest.wordspec.AnyWordSpecLike
-
object TransformMessagesSpec {
// this is the sample from the Scaladoc
diff --git a/actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/WatchSpec.scala b/actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/WatchSpec.scala
index ee29aaf85a..cd339e2628 100644
--- a/actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/WatchSpec.scala
+++ b/actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/WatchSpec.scala
@@ -17,6 +17,9 @@ import scala.concurrent._
import scala.concurrent.duration._
import org.apache.pekko
+
+import org.scalatest.wordspec.AnyWordSpecLike
+
import pekko.Done
import pekko.actor
import pekko.actor.testkit.typed.TestException
@@ -28,8 +31,6 @@ import pekko.actor.typed.scaladsl.AbstractBehavior
import pekko.actor.typed.scaladsl.Behaviors
import pekko.actor.typed.scaladsl.adapter._
-import org.scalatest.wordspec.AnyWordSpecLike
-
object WatchSpec {
case object Stop
diff --git a/actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/coexistence/ClassicSupervisingTypedSpec.scala b/actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/coexistence/ClassicSupervisingTypedSpec.scala
index f647146e77..8b9c384c4e 100644
--- a/actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/coexistence/ClassicSupervisingTypedSpec.scala
+++ b/actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/coexistence/ClassicSupervisingTypedSpec.scala
@@ -13,6 +13,12 @@
package org.apache.pekko.actor.typed.coexistence
import org.apache.pekko
+
+import org.scalatest.BeforeAndAfterAll
+import org.scalatest.wordspec.AnyWordSpecLike
+
+import com.typesafe.config.ConfigFactory
+
import pekko.{ actor => u }
import pekko.actor.Actor
import pekko.actor.testkit.typed.TestException
@@ -22,11 +28,6 @@ import pekko.actor.typed.scaladsl.Behaviors
import pekko.actor.typed.scaladsl.adapter._
import pekko.testkit.TestProbe
-import org.scalatest.BeforeAndAfterAll
-import org.scalatest.wordspec.AnyWordSpecLike
-
-import com.typesafe.config.ConfigFactory
-
object ProbedBehavior {
def behavior(probe: u.ActorRef): Behavior[String] = {
Behaviors
diff --git a/actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/coexistence/TypedSupervisingClassicSpec.scala b/actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/coexistence/TypedSupervisingClassicSpec.scala
index 5edfec293d..d8855c6910 100644
--- a/actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/coexistence/TypedSupervisingClassicSpec.scala
+++ b/actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/coexistence/TypedSupervisingClassicSpec.scala
@@ -13,6 +13,9 @@
package org.apache.pekko.actor.typed.coexistence
import org.apache.pekko
+
+import org.scalatest.wordspec.AnyWordSpecLike
+
import pekko.{ actor => classic }
import pekko.actor.Actor
import pekko.actor.testkit.typed.TestException
@@ -22,8 +25,6 @@ import pekko.actor.typed.ActorRef
import pekko.actor.typed.scaladsl.Behaviors
import pekko.actor.typed.scaladsl.adapter._
-import org.scalatest.wordspec.AnyWordSpecLike
-
object TypedSupervisingClassicSpec {
sealed trait Protocol
diff --git a/actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/delivery/ConsumerControllerSpec.scala b/actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/delivery/ConsumerControllerSpec.scala
index a442ddb282..0e624c2a4a 100644
--- a/actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/delivery/ConsumerControllerSpec.scala
+++ b/actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/delivery/ConsumerControllerSpec.scala
@@ -16,6 +16,11 @@ package org.apache.pekko.actor.typed.delivery
import scala.concurrent.duration._
import org.apache.pekko
+
+import org.scalatest.wordspec.AnyWordSpecLike
+
+import com.typesafe.config.ConfigFactory
+
import pekko.actor.testkit.typed.scaladsl.LogCapturing
import pekko.actor.testkit.typed.scaladsl.ScalaTestWithActorTestKit
import pekko.actor.typed.delivery.ConsumerController.DeliverThenStop
@@ -23,10 +28,6 @@ import pekko.actor.typed.delivery.internal.ConsumerControllerImpl
import pekko.actor.typed.delivery.internal.ProducerControllerImpl
import pekko.serialization.SerializationExtension
-import org.scalatest.wordspec.AnyWordSpecLike
-
-import com.typesafe.config.ConfigFactory
-
class ConsumerControllerSpec
extends ScalaTestWithActorTestKit(ConfigFactory.parseString("""
pekko.reliable-delivery.consumer-controller {
diff --git a/actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/delivery/DurableProducerControllerSpec.scala b/actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/delivery/DurableProducerControllerSpec.scala
index 429d83fdb6..9777c03098 100644
--- a/actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/delivery/DurableProducerControllerSpec.scala
+++ b/actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/delivery/DurableProducerControllerSpec.scala
@@ -18,6 +18,11 @@ import java.util.concurrent.atomic.AtomicReference
import scala.concurrent.duration._
import org.apache.pekko
+
+import org.scalatest.wordspec.AnyWordSpecLike
+
+import com.typesafe.config.ConfigFactory
+
import pekko.actor.testkit.typed.scaladsl.LogCapturing
import pekko.actor.testkit.typed.scaladsl.ScalaTestWithActorTestKit
import pekko.actor.typed.delivery.DurableProducerQueue.MessageSent
@@ -26,10 +31,6 @@ import pekko.actor.typed.delivery.internal.ChunkedMessage
import pekko.actor.typed.delivery.internal.ProducerControllerImpl
import pekko.util.ByteString
-import org.scalatest.wordspec.AnyWordSpecLike
-
-import com.typesafe.config.ConfigFactory
-
class DurableProducerControllerSpec
extends ScalaTestWithActorTestKit(
ConfigFactory.parseString("""
diff --git a/actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/delivery/DurableProducerQueueSpec.scala b/actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/delivery/DurableProducerQueueSpec.scala
index fee91853d7..9667dede1d 100644
--- a/actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/delivery/DurableProducerQueueSpec.scala
+++ b/actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/delivery/DurableProducerQueueSpec.scala
@@ -14,15 +14,16 @@
package org.apache.pekko.actor.typed.delivery
import org.apache.pekko
-import pekko.actor.typed.delivery.DurableProducerQueue.MessageSent
-import pekko.actor.typed.delivery.DurableProducerQueue.State
-import pekko.actor.typed.delivery.internal.ChunkedMessage
-import pekko.util.ByteString
import org.scalatest.TestSuite
import org.scalatest.matchers.should.Matchers
import org.scalatest.wordspec.AnyWordSpec
+import pekko.actor.typed.delivery.DurableProducerQueue.MessageSent
+import pekko.actor.typed.delivery.DurableProducerQueue.State
+import pekko.actor.typed.delivery.internal.ChunkedMessage
+import pekko.util.ByteString
+
class DurableProducerQueueSpec extends AnyWordSpec with TestSuite with Matchers {
"DurableProducerQueue.State" must {
diff --git a/actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/delivery/DurableWorkPullingSpec.scala b/actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/delivery/DurableWorkPullingSpec.scala
index 0b6ba0d436..30042f73d6 100644
--- a/actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/delivery/DurableWorkPullingSpec.scala
+++ b/actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/delivery/DurableWorkPullingSpec.scala
@@ -17,9 +17,11 @@ import java.util.concurrent.atomic.AtomicReference
import scala.concurrent.duration._
-import DurableProducerQueue.MessageSent
-
import org.apache.pekko
+
+import org.scalatest.wordspec.AnyWordSpecLike
+
+import DurableProducerQueue.MessageSent
import pekko.Done
import pekko.actor.testkit.typed.scaladsl.LogCapturing
import pekko.actor.testkit.typed.scaladsl.ScalaTestWithActorTestKit
@@ -28,8 +30,6 @@ import pekko.actor.typed.delivery.internal.ProducerControllerImpl
import pekko.actor.typed.receptionist.Receptionist
import pekko.actor.typed.receptionist.ServiceKey
-import org.scalatest.wordspec.AnyWordSpecLike
-
class DurableWorkPullingSpec
extends ScalaTestWithActorTestKit("""
pekko.reliable-delivery.consumer-controller.flow-control-window = 20
diff --git a/actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/delivery/ProducerControllerSpec.scala b/actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/delivery/ProducerControllerSpec.scala
index 77fb97e9ff..f820efdc91 100644
--- a/actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/delivery/ProducerControllerSpec.scala
+++ b/actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/delivery/ProducerControllerSpec.scala
@@ -16,16 +16,17 @@ package org.apache.pekko.actor.typed.delivery
import scala.concurrent.duration._
import org.apache.pekko
+
+import org.scalatest.wordspec.AnyWordSpecLike
+
+import com.typesafe.config.ConfigFactory
+
import pekko.actor.testkit.typed.scaladsl.LogCapturing
import pekko.actor.testkit.typed.scaladsl.ScalaTestWithActorTestKit
import pekko.actor.typed.delivery.ProducerController.MessageWithConfirmation
import pekko.actor.typed.delivery.internal.ChunkedMessage
import pekko.actor.typed.delivery.internal.ProducerControllerImpl
-import org.scalatest.wordspec.AnyWordSpecLike
-
-import com.typesafe.config.ConfigFactory
-
class ProducerControllerSpec
extends ScalaTestWithActorTestKit(
ConfigFactory.parseString("""
diff --git a/actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/delivery/ReliableDeliveryRandomSpec.scala b/actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/delivery/ReliableDeliveryRandomSpec.scala
index d229e36dbf..4a194bdd89 100644
--- a/actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/delivery/ReliableDeliveryRandomSpec.scala
+++ b/actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/delivery/ReliableDeliveryRandomSpec.scala
@@ -19,6 +19,12 @@ import scala.concurrent.duration._
import scala.util.Random
import org.apache.pekko
+
+import org.scalatest.wordspec.AnyWordSpecLike
+
+import com.typesafe.config.Config
+import com.typesafe.config.ConfigFactory
+
import pekko.actor.testkit.typed.scaladsl.LogCapturing
import pekko.actor.testkit.typed.scaladsl.ScalaTestWithActorTestKit
import pekko.actor.typed.Behavior
@@ -28,11 +34,6 @@ import pekko.actor.typed.delivery.internal.ProducerControllerImpl
import pekko.actor.typed.scaladsl.Behaviors
import pekko.actor.typed.scaladsl.LoggerOps
-import org.scalatest.wordspec.AnyWordSpecLike
-
-import com.typesafe.config.Config
-import com.typesafe.config.ConfigFactory
-
object ReliableDeliveryRandomSpec {
val config: Config = ConfigFactory.parseString("""
pekko.reliable-delivery.consumer-controller {
diff --git a/actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/delivery/ReliableDeliverySpec.scala b/actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/delivery/ReliableDeliverySpec.scala
index 66f2d57cfd..5aa649d342 100644
--- a/actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/delivery/ReliableDeliverySpec.scala
+++ b/actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/delivery/ReliableDeliverySpec.scala
@@ -16,14 +16,15 @@ package org.apache.pekko.actor.typed.delivery
import scala.concurrent.duration._
import org.apache.pekko
-import pekko.actor.testkit.typed.scaladsl.LogCapturing
-import pekko.actor.testkit.typed.scaladsl.ScalaTestWithActorTestKit
import org.scalatest.wordspec.AnyWordSpecLike
import com.typesafe.config.Config
import com.typesafe.config.ConfigFactory
+import pekko.actor.testkit.typed.scaladsl.LogCapturing
+import pekko.actor.testkit.typed.scaladsl.ScalaTestWithActorTestKit
+
object ReliableDeliverySpec {
val config: Config = ConfigFactory.parseString("""
pekko.reliable-delivery.consumer-controller.flow-control-window = 20
diff --git a/actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/delivery/TestConsumer.scala b/actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/delivery/TestConsumer.scala
index 0164d68c66..a23073351b 100644
--- a/actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/delivery/TestConsumer.scala
+++ b/actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/delivery/TestConsumer.scala
@@ -16,11 +16,15 @@ package org.apache.pekko.actor.typed.delivery
import java.io.NotSerializableException
import java.nio.charset.StandardCharsets
-import scala.concurrent.duration._
import scala.concurrent.duration.Duration
import scala.concurrent.duration.FiniteDuration
+import scala.concurrent.duration._
import org.apache.pekko
+
+import com.typesafe.config.Config
+import com.typesafe.config.ConfigFactory
+
import pekko.actor.typed.ActorRef
import pekko.actor.typed.Behavior
import pekko.actor.typed.delivery.ConsumerController.SequencedMessage
@@ -29,9 +33,6 @@ import pekko.actor.typed.scaladsl.ActorContext
import pekko.actor.typed.scaladsl.Behaviors
import pekko.serialization.SerializerWithStringManifest
-import com.typesafe.config.Config
-import com.typesafe.config.ConfigFactory
-
object TestConsumer {
final case class Job(payload: String)
diff --git a/actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/delivery/TestDurableProducerQueue.scala b/actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/delivery/TestDurableProducerQueue.scala
index d471512141..622b3e8241 100644
--- a/actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/delivery/TestDurableProducerQueue.scala
+++ b/actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/delivery/TestDurableProducerQueue.scala
@@ -19,6 +19,7 @@ import scala.concurrent.duration.Duration
import scala.concurrent.duration.FiniteDuration
import org.apache.pekko
+
import pekko.actor.testkit.typed.TestException
import pekko.actor.typed.Behavior
import pekko.actor.typed.SupervisorStrategy
diff --git a/actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/delivery/TestProducer.scala b/actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/delivery/TestProducer.scala
index de6fd1dac8..aa66c2ed2f 100644
--- a/actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/delivery/TestProducer.scala
+++ b/actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/delivery/TestProducer.scala
@@ -13,11 +13,12 @@
package org.apache.pekko.actor.typed.delivery
-import scala.concurrent.duration._
import scala.concurrent.duration.Duration
import scala.concurrent.duration.FiniteDuration
+import scala.concurrent.duration._
import org.apache.pekko
+
import pekko.actor.typed.ActorRef
import pekko.actor.typed.Behavior
import pekko.actor.typed.scaladsl.ActorContext
diff --git a/actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/delivery/TestProducerWithAsk.scala b/actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/delivery/TestProducerWithAsk.scala
index f028d45414..63716af57b 100644
--- a/actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/delivery/TestProducerWithAsk.scala
+++ b/actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/delivery/TestProducerWithAsk.scala
@@ -13,12 +13,13 @@
package org.apache.pekko.actor.typed.delivery
-import scala.concurrent.duration._
import scala.concurrent.duration.FiniteDuration
+import scala.concurrent.duration._
import scala.util.Failure
import scala.util.Success
import org.apache.pekko
+
import pekko.actor.typed.ActorRef
import pekko.actor.typed.Behavior
import pekko.actor.typed.scaladsl.Behaviors
diff --git a/actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/delivery/TestProducerWorkPulling.scala b/actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/delivery/TestProducerWorkPulling.scala
index 384f7c4a95..4e87576e3e 100644
--- a/actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/delivery/TestProducerWorkPulling.scala
+++ b/actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/delivery/TestProducerWorkPulling.scala
@@ -16,6 +16,7 @@ package org.apache.pekko.actor.typed.delivery
import scala.concurrent.duration.FiniteDuration
import org.apache.pekko
+
import pekko.actor.typed.ActorRef
import pekko.actor.typed.Behavior
import pekko.actor.typed.scaladsl.Behaviors
diff --git a/actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/delivery/WorkPullingSpec.scala b/actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/delivery/WorkPullingSpec.scala
index bf384c439d..c5d377bf39 100644
--- a/actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/delivery/WorkPullingSpec.scala
+++ b/actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/delivery/WorkPullingSpec.scala
@@ -16,6 +16,9 @@ package org.apache.pekko.actor.typed.delivery
import scala.concurrent.duration._
import org.apache.pekko
+
+import org.scalatest.wordspec.AnyWordSpecLike
+
import pekko.Done
import pekko.actor.testkit.typed.scaladsl.LogCapturing
import pekko.actor.testkit.typed.scaladsl.ScalaTestWithActorTestKit
@@ -24,8 +27,6 @@ import pekko.actor.typed.delivery.internal.ProducerControllerImpl
import pekko.actor.typed.receptionist.Receptionist
import pekko.actor.typed.receptionist.ServiceKey
-import org.scalatest.wordspec.AnyWordSpecLike
-
class WorkPullingSpec
extends ScalaTestWithActorTestKit("""
pekko.reliable-delivery.consumer-controller.flow-control-window = 20
diff --git a/actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/eventstream/EventStreamDocSpec.scala b/actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/eventstream/EventStreamDocSpec.scala
index 2bac08ea45..ffd9d9a196 100644
--- a/actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/eventstream/EventStreamDocSpec.scala
+++ b/actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/eventstream/EventStreamDocSpec.scala
@@ -17,10 +17,10 @@
package org.apache.pekko.actor.typed.eventstream
-import org.apache.pekko.actor.{ AllDeadLetters, DeadLetter, Dropped, SuppressedDeadLetter, UnhandledMessage }
import org.apache.pekko.actor.testkit.typed.scaladsl.{ LogCapturing, ScalaTestWithActorTestKit }
import org.apache.pekko.actor.typed.ActorSystem
import org.apache.pekko.actor.typed.scaladsl.Behaviors
+import org.apache.pekko.actor.{ AllDeadLetters, DeadLetter, Dropped, SuppressedDeadLetter, UnhandledMessage }
import org.scalatest.wordspec.AnyWordSpecLike
diff --git a/actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/eventstream/EventStreamSpec.scala b/actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/eventstream/EventStreamSpec.scala
index 922768cc5d..fd7a5d6805 100644
--- a/actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/eventstream/EventStreamSpec.scala
+++ b/actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/eventstream/EventStreamSpec.scala
@@ -19,13 +19,14 @@ import java.util.concurrent.TimeUnit
import scala.concurrent.duration._
import org.apache.pekko
+
+import org.scalatest.wordspec.AnyWordSpecLike
+
import pekko.actor.DeadLetter
import pekko.actor.testkit.typed.scaladsl.{ ScalaTestWithActorTestKit, TestProbe }
import pekko.actor.testkit.typed.scaladsl.LogCapturing
import pekko.actor.typed.scaladsl.Behaviors
-import org.scalatest.wordspec.AnyWordSpecLike
-
class EventStreamSpec extends ScalaTestWithActorTestKit with AnyWordSpecLike with LogCapturing {
import EventStream._
diff --git a/actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/internal/ActorRefSerializationSpec.scala b/actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/internal/ActorRefSerializationSpec.scala
index 0ac9739d46..71cf1e384d 100644
--- a/actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/internal/ActorRefSerializationSpec.scala
+++ b/actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/internal/ActorRefSerializationSpec.scala
@@ -14,16 +14,17 @@
package org.apache.pekko.actor.typed.internal
import org.apache.pekko
+
+import org.scalatest.wordspec.AnyWordSpecLike
+
+import com.typesafe.config.ConfigFactory
+
import pekko.actor.testkit.typed.scaladsl.LogCapturing
import pekko.actor.testkit.typed.scaladsl.ScalaTestWithActorTestKit
import pekko.actor.typed.ActorRef
import pekko.actor.typed.scaladsl.Behaviors
import pekko.serialization.{ JavaSerializer, SerializationExtension }
-import org.scalatest.wordspec.AnyWordSpecLike
-
-import com.typesafe.config.ConfigFactory
-
object ActorRefSerializationSpec {
def config = ConfigFactory.parseString("""
pekko.actor {
diff --git a/actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/internal/ActorSystemSpec.scala b/actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/internal/ActorSystemSpec.scala
index 094624d967..54d998807a 100644
--- a/actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/internal/ActorSystemSpec.scala
+++ b/actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/internal/ActorSystemSpec.scala
@@ -19,14 +19,6 @@ import scala.concurrent.Promise
import scala.util.control.NonFatal
import org.apache.pekko
-import pekko.Done
-import pekko.actor.{ Address, CoordinatedShutdown, InvalidMessageException }
-import pekko.actor.dungeon.Dispatch
-import pekko.actor.testkit.typed.TestKitSettings
-import pekko.actor.testkit.typed.scaladsl.LogCapturing
-import pekko.actor.testkit.typed.scaladsl.TestInbox
-import pekko.actor.testkit.typed.scaladsl.TestProbe
-import pekko.actor.typed.scaladsl.Behaviors
import org.scalatest.BeforeAndAfterAll
import org.scalatest.concurrent.Eventually
@@ -37,6 +29,15 @@ import org.scalatest.wordspec.AnyWordSpec
import com.typesafe.config.ConfigFactory
+import pekko.Done
+import pekko.actor.{ Address, CoordinatedShutdown, InvalidMessageException }
+import pekko.actor.dungeon.Dispatch
+import pekko.actor.testkit.typed.TestKitSettings
+import pekko.actor.testkit.typed.scaladsl.LogCapturing
+import pekko.actor.testkit.typed.scaladsl.TestInbox
+import pekko.actor.testkit.typed.scaladsl.TestProbe
+import pekko.actor.typed.scaladsl.Behaviors
+
class ActorSystemSpec
extends AnyWordSpec
with Matchers
diff --git a/actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/internal/adapter/PropsAdapterSpec.scala b/actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/internal/adapter/PropsAdapterSpec.scala
index c0c554e355..209c46b023 100644
--- a/actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/internal/adapter/PropsAdapterSpec.scala
+++ b/actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/internal/adapter/PropsAdapterSpec.scala
@@ -14,6 +14,10 @@
package org.apache.pekko.actor.typed.internal.adapter
import org.apache.pekko
+
+import org.scalatest.matchers.should.Matchers
+import org.scalatest.wordspec.AnyWordSpec
+
import pekko.actor
import pekko.actor.typed.ActorTags
import pekko.actor.typed.MailboxSelector
@@ -21,9 +25,6 @@ import pekko.actor.typed.Props
import pekko.actor.typed.internal.adapter.PropsAdapter
import pekko.actor.typed.scaladsl.Behaviors
-import org.scalatest.matchers.should.Matchers
-import org.scalatest.wordspec.AnyWordSpec
-
class PropsAdapterSpec extends AnyWordSpec with Matchers {
"PropsAdapter" should {
diff --git a/actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/internal/receptionist/LocalReceptionistSpec.scala b/actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/internal/receptionist/LocalReceptionistSpec.scala
index 2215a7cf80..42a7480df5 100644
--- a/actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/internal/receptionist/LocalReceptionistSpec.scala
+++ b/actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/internal/receptionist/LocalReceptionistSpec.scala
@@ -16,6 +16,10 @@ package org.apache.pekko.actor.typed.internal.receptionist
import scala.concurrent.Future
import org.apache.pekko
+
+import org.scalatest.matchers.should.Matchers
+import org.scalatest.wordspec.{ AnyWordSpec, AnyWordSpecLike }
+
import pekko.actor.testkit.typed.scaladsl.BehaviorTestKit
import pekko.actor.testkit.typed.scaladsl.LogCapturing
import pekko.actor.testkit.typed.scaladsl.ScalaTestWithActorTestKit
@@ -28,9 +32,6 @@ import pekko.actor.typed.receptionist.ServiceKey
import pekko.actor.typed.scaladsl.AskPattern._
import pekko.actor.typed.scaladsl.Behaviors
-import org.scalatest.matchers.should.Matchers
-import org.scalatest.wordspec.{ AnyWordSpec, AnyWordSpecLike }
-
object LocalReceptionistSpec {
trait ServiceA
val ServiceKeyA = ServiceKey[ServiceA]("service-a")
diff --git a/actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/internal/receptionist/ServiceKeySerializationSpec.scala b/actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/internal/receptionist/ServiceKeySerializationSpec.scala
index 16ba38012b..219d2f0d90 100644
--- a/actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/internal/receptionist/ServiceKeySerializationSpec.scala
+++ b/actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/internal/receptionist/ServiceKeySerializationSpec.scala
@@ -14,14 +14,15 @@
package org.apache.pekko.actor.typed.internal.receptionist
import org.apache.pekko
+
+import org.scalatest.wordspec.AnyWordSpecLike
+
import pekko.actor.testkit.typed.scaladsl.LogCapturing
import pekko.actor.testkit.typed.scaladsl.ScalaTestWithActorTestKit
import pekko.actor.typed.internal.ActorRefSerializationSpec
import pekko.actor.typed.receptionist.ServiceKey
import pekko.serialization.SerializationExtension
-import org.scalatest.wordspec.AnyWordSpecLike
-
class ServiceKeySerializationSpec
extends ScalaTestWithActorTestKit(ActorRefSerializationSpec.config)
with AnyWordSpecLike
diff --git a/actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/internal/routing/PoolRouterSpec.scala b/actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/internal/routing/PoolRouterSpec.scala
index 3fde4ee16f..a65d792648 100644
--- a/actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/internal/routing/PoolRouterSpec.scala
+++ b/actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/internal/routing/PoolRouterSpec.scala
@@ -14,12 +14,13 @@
package org.apache.pekko.actor.typed.internal.routing
import org.apache.pekko
+
+import org.scalatest.wordspec.AnyWordSpecLike
+
import pekko.actor.testkit.typed.scaladsl.{ LogCapturing, ScalaTestWithActorTestKit }
import pekko.actor.typed.{ ActorRef, Behavior, DispatcherSelector }
import pekko.actor.typed.scaladsl.{ Behaviors, Routers }
-import org.scalatest.wordspec.AnyWordSpecLike
-
object PoolRouterSpec {
object RouteeBehavior {
diff --git a/actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/internal/routing/RoutingLogicSpec.scala b/actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/internal/routing/RoutingLogicSpec.scala
index fd197c38ad..90cc94d449 100644
--- a/actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/internal/routing/RoutingLogicSpec.scala
+++ b/actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/internal/routing/RoutingLogicSpec.scala
@@ -14,15 +14,16 @@
package org.apache.pekko.actor.typed.internal.routing
import org.apache.pekko
+
+import org.scalatest.matchers.should.Matchers
+import org.scalatest.wordspec.AnyWordSpecLike
+
import pekko.actor.Address
import pekko.actor.testkit.typed.scaladsl.{ LogCapturing, ScalaTestWithActorTestKit, TestProbe }
import pekko.actor.typed.{ ActorSystem, Behavior }
import pekko.actor.typed.internal.routing.RoutingLogics.ConsistentHashingLogic
import pekko.actor.typed.scaladsl.Behaviors
-import org.scalatest.matchers.should.Matchers
-import org.scalatest.wordspec.AnyWordSpecLike
-
class RoutingLogicSpec extends ScalaTestWithActorTestKit with AnyWordSpecLike with Matchers with LogCapturing {
val emptyMessage: Any = ""
diff --git a/actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/javadsl/AdaptationFailureSpec.scala b/actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/javadsl/AdaptationFailureSpec.scala
index d59ea1cb5f..b295869b97 100644
--- a/actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/javadsl/AdaptationFailureSpec.scala
+++ b/actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/javadsl/AdaptationFailureSpec.scala
@@ -16,6 +16,9 @@ package org.apache.pekko.actor.typed.javadsl
import scala.concurrent.Promise
import org.apache.pekko
+
+import org.scalatest.wordspec.AnyWordSpecLike
+
import pekko.Done
import pekko.actor.testkit.typed.TestException
import pekko.actor.testkit.typed.scaladsl.LogCapturing
@@ -25,8 +28,6 @@ import pekko.actor.typed.MessageAdaptionFailure
import pekko.actor.typed.PreRestart
import pekko.actor.typed.Terminated
-import org.scalatest.wordspec.AnyWordSpecLike
-
object AdaptationFailureSpec {
def emptyAbstractBehavior: Behavior[Any] = Behaviors.setup(new EmptyAbstractBehavior(_))
class EmptyAbstractBehavior(ctx: ActorContext[Any]) extends AbstractBehavior[Any](ctx) {
diff --git a/actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/pubsub/LocalPubSubSpec.scala b/actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/pubsub/LocalPubSubSpec.scala
index 0d658409b2..5131ef26c0 100644
--- a/actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/pubsub/LocalPubSubSpec.scala
+++ b/actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/pubsub/LocalPubSubSpec.scala
@@ -16,11 +16,12 @@ package org.apache.pekko.actor.typed.pubsub
import scala.concurrent.duration._
import org.apache.pekko
-import pekko.actor.testkit.typed.scaladsl.LogCapturing
-import pekko.actor.testkit.typed.scaladsl.ScalaTestWithActorTestKit
import org.scalatest.wordspec.AnyWordSpecLike
+import pekko.actor.testkit.typed.scaladsl.LogCapturing
+import pekko.actor.testkit.typed.scaladsl.ScalaTestWithActorTestKit
+
class LocalPubSubSpec extends ScalaTestWithActorTestKit with AnyWordSpecLike with LogCapturing {
"A pub-sub topic running locally" must {
diff --git a/actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/receptionist/ReceptionistApiSpec.scala b/actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/receptionist/ReceptionistApiSpec.scala
index 81c5a55293..9e9258b925 100644
--- a/actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/receptionist/ReceptionistApiSpec.scala
+++ b/actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/receptionist/ReceptionistApiSpec.scala
@@ -18,6 +18,7 @@ import scala.concurrent.duration._
import scala.util.Success
import org.apache.pekko
+
import pekko.actor.typed.{ ActorRef, ActorSystem }
import pekko.actor.typed.scaladsl.AskPattern._
import pekko.actor.typed.scaladsl.Behaviors
diff --git a/actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/scaladsl/ActorContextAskSpec.scala b/actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/scaladsl/ActorContextAskSpec.scala
index b8e8ab731e..e3eac85aef 100644
--- a/actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/scaladsl/ActorContextAskSpec.scala
+++ b/actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/scaladsl/ActorContextAskSpec.scala
@@ -20,6 +20,11 @@ import scala.util.{ Failure, Success }
import org.apache.pekko
import org.apache.pekko.actor.testkit.typed.TestException
+
+import org.scalatest.wordspec.AnyWordSpecLike
+
+import com.typesafe.config.ConfigFactory
+
import pekko.actor.testkit.typed.scaladsl.LogCapturing
import pekko.actor.testkit.typed.scaladsl.LoggingTestKit
import pekko.actor.testkit.typed.scaladsl.ScalaTestWithActorTestKit
@@ -27,10 +32,6 @@ import pekko.actor.testkit.typed.scaladsl.TestProbe
import pekko.actor.typed.{ ActorRef, PostStop, Props }
import pekko.pattern.StatusReply
-import org.scalatest.wordspec.AnyWordSpecLike
-
-import com.typesafe.config.ConfigFactory
-
object ActorContextAskSpec {
val config = ConfigFactory.parseString("""
ping-pong-dispatcher {
diff --git a/actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/scaladsl/ActorContextDelegateSpec.scala b/actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/scaladsl/ActorContextDelegateSpec.scala
index 7c5a239132..1c589d7bb8 100644
--- a/actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/scaladsl/ActorContextDelegateSpec.scala
+++ b/actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/scaladsl/ActorContextDelegateSpec.scala
@@ -14,13 +14,14 @@
package org.apache.pekko.actor.typed.scaladsl
import org.apache.pekko
+
+import org.scalatest.wordspec.AnyWordSpecLike
+
import pekko.actor.UnhandledMessage
import pekko.actor.testkit.typed.TestKitSettings
import pekko.actor.testkit.typed.scaladsl.{ FishingOutcomes, LogCapturing, ScalaTestWithActorTestKit, TestProbe }
import pekko.actor.typed.{ ActorRef, Behavior }
-import org.scalatest.wordspec.AnyWordSpecLike
-
object ActorContextDelegateSpec {
sealed trait PingPongCommand
case object Ping extends PingPongCommand
diff --git a/actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/scaladsl/ActorContextPipeToSelfSpec.scala b/actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/scaladsl/ActorContextPipeToSelfSpec.scala
index 29b21b396c..09a4d33ff0 100644
--- a/actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/scaladsl/ActorContextPipeToSelfSpec.scala
+++ b/actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/scaladsl/ActorContextPipeToSelfSpec.scala
@@ -15,19 +15,20 @@ package org.apache.pekko.actor.typed.scaladsl
import scala.concurrent.Future
import scala.concurrent.Promise
-import scala.util.{ Failure, Success }
import scala.util.control.NoStackTrace
+import scala.util.{ Failure, Success }
import org.apache.pekko
-import pekko.actor.testkit.typed.scaladsl.{ ScalaTestWithActorTestKit, TestProbe }
-import pekko.actor.testkit.typed.scaladsl.LogCapturing
-import pekko.actor.testkit.typed.scaladsl.LoggingTestKit
-import pekko.actor.typed.Props
import org.scalatest.wordspec.AnyWordSpecLike
import com.typesafe.config.ConfigFactory
+import pekko.actor.testkit.typed.scaladsl.{ ScalaTestWithActorTestKit, TestProbe }
+import pekko.actor.testkit.typed.scaladsl.LogCapturing
+import pekko.actor.testkit.typed.scaladsl.LoggingTestKit
+import pekko.actor.typed.Props
+
object ActorContextPipeToSelfSpec {
val config = ConfigFactory.parseString("""
|pipe-to-self-spec-dispatcher {
diff --git a/actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/scaladsl/ActorLoggingSpec.scala b/actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/scaladsl/ActorLoggingSpec.scala
index b8c7d9792d..e8c77eb2cd 100644
--- a/actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/scaladsl/ActorLoggingSpec.scala
+++ b/actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/scaladsl/ActorLoggingSpec.scala
@@ -17,6 +17,15 @@ import java.util.concurrent.atomic.AtomicInteger
import java.util.concurrent.atomic.AtomicReference
import org.apache.pekko
+
+import org.scalatest.wordspec.AnyWordSpecLike
+
+import org.slf4j.LoggerFactory
+import org.slf4j.MDC
+import org.slf4j.helpers.BasicMarkerFactory
+
+import com.typesafe.config.ConfigFactory
+
import pekko.actor.ActorPath
import pekko.actor.ActorSystem
import pekko.actor.ExtendedActorSystem
@@ -35,14 +44,6 @@ import pekko.event.Logging.DefaultLogger
import pekko.event.slf4j.Slf4jLogger
import pekko.event.slf4j.Slf4jLoggingFilter
-import org.scalatest.wordspec.AnyWordSpecLike
-
-import org.slf4j.LoggerFactory
-import org.slf4j.MDC
-import org.slf4j.helpers.BasicMarkerFactory
-
-import com.typesafe.config.ConfigFactory
-
class SomeClass
object WhereTheBehaviorIsDefined {
diff --git a/actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/scaladsl/ActorThreadSpec.scala b/actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/scaladsl/ActorThreadSpec.scala
index 8f79e5ff23..9b275318ef 100644
--- a/actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/scaladsl/ActorThreadSpec.scala
+++ b/actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/scaladsl/ActorThreadSpec.scala
@@ -21,6 +21,9 @@ import scala.util.Failure
import scala.util.Success
import org.apache.pekko
+
+import org.scalatest.wordspec.AnyWordSpecLike
+
import pekko.actor.testkit.typed.scaladsl.LogCapturing
import pekko.actor.testkit.typed.scaladsl.LoggingTestKit
import pekko.actor.testkit.typed.scaladsl.ScalaTestWithActorTestKit
@@ -28,8 +31,6 @@ import pekko.actor.typed.ActorRef
import pekko.actor.typed.Behavior
import pekko.actor.typed.scaladsl.ActorThreadSpec.Echo
-import org.scalatest.wordspec.AnyWordSpecLike
-
object ActorThreadSpec {
object Echo {
final case class Msg(i: Int, replyTo: ActorRef[Int])
diff --git a/actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/scaladsl/AdaptationFailureSpec.scala b/actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/scaladsl/AdaptationFailureSpec.scala
index 2a8aa0c1aa..aef7046726 100644
--- a/actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/scaladsl/AdaptationFailureSpec.scala
+++ b/actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/scaladsl/AdaptationFailureSpec.scala
@@ -16,6 +16,9 @@ package org.apache.pekko.actor.typed.scaladsl
import scala.concurrent.Promise
import org.apache.pekko
+
+import org.scalatest.wordspec.AnyWordSpecLike
+
import pekko.Done
import pekko.actor.testkit.typed.TestException
import pekko.actor.testkit.typed.scaladsl.LogCapturing
@@ -26,8 +29,6 @@ import pekko.actor.typed.PreRestart
import pekko.actor.typed.Signal
import pekko.actor.typed.Terminated
-import org.scalatest.wordspec.AnyWordSpecLike
-
object AdaptationFailureSpec {
def emptyAbstractBehavior: Behavior[Any] = Behaviors.setup(new EmptyAbstractBehavior(_))
diff --git a/actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/scaladsl/DispatcherSelectorSpec.scala b/actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/scaladsl/DispatcherSelectorSpec.scala
index 9f8160647a..d16cf8fa15 100644
--- a/actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/scaladsl/DispatcherSelectorSpec.scala
+++ b/actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/scaladsl/DispatcherSelectorSpec.scala
@@ -14,6 +14,12 @@
package org.apache.pekko.actor.typed.scaladsl
import org.apache.pekko
+
+import org.scalatest.wordspec.AnyWordSpecLike
+
+import com.typesafe.config.Config
+import com.typesafe.config.ConfigFactory
+
import pekko.actor.BootstrapSetup
import pekko.actor.setup.ActorSystemSetup
import pekko.actor.testkit.typed.scaladsl.ActorTestKit
@@ -29,11 +35,6 @@ import pekko.actor.typed.Props
import pekko.actor.typed.SpawnProtocol
import pekko.actor.typed.scaladsl.AskPattern._
-import org.scalatest.wordspec.AnyWordSpecLike
-
-import com.typesafe.config.Config
-import com.typesafe.config.ConfigFactory
-
object DispatcherSelectorSpec {
val config = ConfigFactory.parseString("""
ping-pong-dispatcher {
diff --git a/actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/scaladsl/GracefulStopSpec.scala b/actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/scaladsl/GracefulStopSpec.scala
index d3ad36b3c8..625d77a17e 100644
--- a/actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/scaladsl/GracefulStopSpec.scala
+++ b/actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/scaladsl/GracefulStopSpec.scala
@@ -15,14 +15,15 @@ package org.apache.pekko.actor.typed
package scaladsl
import org.apache.pekko
+
+import org.scalatest.wordspec.AnyWordSpecLike
+
import pekko.Done
import pekko.NotUsed
import pekko.actor.testkit.typed.scaladsl.LogCapturing
import pekko.actor.testkit.typed.scaladsl.ScalaTestWithActorTestKit
import pekko.actor.testkit.typed.scaladsl.TestProbe
-import org.scalatest.wordspec.AnyWordSpecLike
-
final class GracefulStopSpec extends ScalaTestWithActorTestKit with AnyWordSpecLike with LogCapturing {
"Graceful stop" must {
diff --git a/actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/scaladsl/LoggerOpsSpec.scala b/actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/scaladsl/LoggerOpsSpec.scala
index b4775e4f1b..cc1efcb8b9 100644
--- a/actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/scaladsl/LoggerOpsSpec.scala
+++ b/actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/scaladsl/LoggerOpsSpec.scala
@@ -14,14 +14,15 @@
package org.apache.pekko.actor.typed.scaladsl
import org.apache.pekko
-import pekko.actor.testkit.typed.scaladsl.LogCapturing
-import pekko.actor.testkit.typed.scaladsl.LoggingTestKit
-import pekko.actor.testkit.typed.scaladsl.ScalaTestWithActorTestKit
import org.scalatest.wordspec.AnyWordSpecLike
import org.slf4j.LoggerFactory
+import pekko.actor.testkit.typed.scaladsl.LogCapturing
+import pekko.actor.testkit.typed.scaladsl.LoggingTestKit
+import pekko.actor.testkit.typed.scaladsl.ScalaTestWithActorTestKit
+
object LoggerOpsSpec {
case class Value1(i: Int)
case class Value2(i: Int)
diff --git a/actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/scaladsl/MailboxSelectorSpec.scala b/actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/scaladsl/MailboxSelectorSpec.scala
index be93d456e5..8df24fab70 100644
--- a/actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/scaladsl/MailboxSelectorSpec.scala
+++ b/actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/scaladsl/MailboxSelectorSpec.scala
@@ -18,6 +18,12 @@
package org.apache.pekko.actor.typed.scaladsl
import org.apache.pekko
+
+import org.scalatest.wordspec.AnyWordSpecLike
+
+import com.typesafe.config.Config
+import com.typesafe.config.ConfigFactory
+
import pekko.actor.ActorCell
import pekko.actor.testkit.typed.scaladsl.LogCapturing
import pekko.actor.testkit.typed.scaladsl.ScalaTestWithActorTestKit
@@ -34,11 +40,6 @@ import pekko.dispatch.Dispatchers
import pekko.dispatch.MessageQueue
import pekko.dispatch.NodeMessageQueue
-import org.scalatest.wordspec.AnyWordSpecLike
-
-import com.typesafe.config.Config
-import com.typesafe.config.ConfigFactory
-
object MailboxSelectorSpec {
val config = ConfigFactory.parseString(
"""
diff --git a/actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/scaladsl/MessageAdapterSpec.scala b/actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/scaladsl/MessageAdapterSpec.scala
index d05d42e02e..63869624b6 100644
--- a/actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/scaladsl/MessageAdapterSpec.scala
+++ b/actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/scaladsl/MessageAdapterSpec.scala
@@ -14,6 +14,13 @@
package org.apache.pekko.actor.typed.scaladsl
import org.apache.pekko
+
+import org.scalatest.wordspec.AnyWordSpecLike
+
+import org.slf4j.LoggerFactory
+
+import com.typesafe.config.ConfigFactory
+
import pekko.actor.DeadLetter
import pekko.actor.testkit.typed.TestException
import pekko.actor.testkit.typed.scaladsl.FishingOutcomes
@@ -27,12 +34,6 @@ import pekko.actor.typed.PostStop
import pekko.actor.typed.Props
import pekko.actor.typed.internal.AdaptMessage
-import org.scalatest.wordspec.AnyWordSpecLike
-
-import org.slf4j.LoggerFactory
-
-import com.typesafe.config.ConfigFactory
-
object MessageAdapterSpec {
val config = ConfigFactory.parseString("""
pekko.log-dead-letters = on
diff --git a/actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/scaladsl/OnSignalSpec.scala b/actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/scaladsl/OnSignalSpec.scala
index 6c81d4178a..be46cce661 100644
--- a/actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/scaladsl/OnSignalSpec.scala
+++ b/actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/scaladsl/OnSignalSpec.scala
@@ -15,14 +15,15 @@ package org.apache.pekko.actor.typed
package scaladsl
import org.apache.pekko
+
+import org.scalatest.wordspec.AnyWordSpecLike
+
import pekko.Done
import pekko.actor.testkit.typed.scaladsl.ActorTestKit
import pekko.actor.testkit.typed.scaladsl.LogCapturing
import pekko.actor.testkit.typed.scaladsl.ScalaTestWithActorTestKit
import pekko.actor.testkit.typed.scaladsl.TestProbe
-import org.scalatest.wordspec.AnyWordSpecLike
-
final class OnSignalSpec extends ScalaTestWithActorTestKit with AnyWordSpecLike with LogCapturing {
"An Actor.OnSignal behavior" must {
diff --git a/actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/scaladsl/ReceivePartialSpec.scala b/actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/scaladsl/ReceivePartialSpec.scala
index 9553e94f63..0e6cae5f8c 100644
--- a/actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/scaladsl/ReceivePartialSpec.scala
+++ b/actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/scaladsl/ReceivePartialSpec.scala
@@ -17,12 +17,13 @@ package scaladsl
import scala.concurrent.ExecutionContextExecutor
import org.apache.pekko
+
+import org.scalatest.wordspec.AnyWordSpecLike
+
import pekko.actor.testkit.typed.scaladsl.LogCapturing
import pekko.actor.testkit.typed.scaladsl.ScalaTestWithActorTestKit
import pekko.actor.testkit.typed.scaladsl.TestProbe
-import org.scalatest.wordspec.AnyWordSpecLike
-
class ReceivePartialSpec extends ScalaTestWithActorTestKit with AnyWordSpecLike with LogCapturing {
implicit val ec: ExecutionContextExecutor = system.executionContext
diff --git a/actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/scaladsl/RoutersSpec.scala b/actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/scaladsl/RoutersSpec.scala
index 40f867d5c7..1783d9a05d 100644
--- a/actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/scaladsl/RoutersSpec.scala
+++ b/actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/scaladsl/RoutersSpec.scala
@@ -15,6 +15,10 @@ package org.apache.pekko.actor.typed.scaladsl
import java.util.concurrent.atomic.AtomicInteger
import org.apache.pekko
+
+import org.scalatest.matchers.should.Matchers
+import org.scalatest.wordspec.AnyWordSpecLike
+
import pekko.actor.{ ActorPath, ActorSystem }
import pekko.actor.testkit.typed.scaladsl.LogCapturing
import pekko.actor.testkit.typed.scaladsl.LoggingTestKit
@@ -27,9 +31,6 @@ import pekko.actor.typed.receptionist.Receptionist
import pekko.actor.typed.receptionist.ServiceKey
import pekko.actor.typed.scaladsl.adapter._
-import org.scalatest.matchers.should.Matchers
-import org.scalatest.wordspec.AnyWordSpecLike
-
class RoutersSpec extends ScalaTestWithActorTestKit("""
pekko.loglevel=debug
""") with AnyWordSpecLike with Matchers with LogCapturing {
diff --git a/actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/scaladsl/StashBufferSpec.scala b/actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/scaladsl/StashBufferSpec.scala
index 05e4a597a1..0bca35bf27 100644
--- a/actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/scaladsl/StashBufferSpec.scala
+++ b/actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/scaladsl/StashBufferSpec.scala
@@ -14,14 +14,15 @@
package org.apache.pekko.actor.typed.scaladsl
import org.apache.pekko
+
+import org.scalatest.matchers.should.Matchers
+import org.scalatest.wordspec.AnyWordSpec
+
import pekko.actor.testkit.typed.internal.StubbedActorContext
import pekko.actor.testkit.typed.scaladsl.LogCapturing
import pekko.actor.testkit.typed.scaladsl.TestInbox
import pekko.actor.typed.Behavior
-import org.scalatest.matchers.should.Matchers
-import org.scalatest.wordspec.AnyWordSpec
-
class StashBufferSpec extends AnyWordSpec with Matchers with LogCapturing {
val context = new StubbedActorContext[String](
diff --git a/actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/scaladsl/StashSpec.scala b/actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/scaladsl/StashSpec.scala
index 496e4d1f5e..ed5433e15e 100644
--- a/actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/scaladsl/StashSpec.scala
+++ b/actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/scaladsl/StashSpec.scala
@@ -20,14 +20,15 @@ import java.util.concurrent.TimeUnit
import scala.concurrent.duration._
import org.apache.pekko
+
+import org.scalatest.wordspec.AnyWordSpecLike
+
import pekko.actor.testkit.typed.TestException
import pekko.actor.testkit.typed.scaladsl.LogCapturing
import pekko.actor.testkit.typed.scaladsl.LoggingTestKit
import pekko.actor.testkit.typed.scaladsl.ScalaTestWithActorTestKit
import pekko.actor.testkit.typed.scaladsl.TestProbe
-import org.scalatest.wordspec.AnyWordSpecLike
-
object AbstractStashSpec {
sealed trait Command
final case class Msg(s: String) extends Command
diff --git a/actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/scaladsl/StopSpec.scala b/actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/scaladsl/StopSpec.scala
index 770f1d7164..d57438116f 100644
--- a/actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/scaladsl/StopSpec.scala
+++ b/actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/scaladsl/StopSpec.scala
@@ -14,6 +14,9 @@
package org.apache.pekko.actor.typed.scaladsl
import org.apache.pekko
+
+import org.scalatest.wordspec.AnyWordSpecLike
+
import pekko.Done
import pekko.actor.testkit.typed.scaladsl.LogCapturing
import pekko.actor.testkit.typed.scaladsl.ScalaTestWithActorTestKit
@@ -23,8 +26,6 @@ import pekko.actor.typed.Behavior
import pekko.actor.typed.BehaviorInterceptor
import pekko.actor.typed.PostStop
-import org.scalatest.wordspec.AnyWordSpecLike
-
class StopSpec extends ScalaTestWithActorTestKit with AnyWordSpecLike with LogCapturing {
import BehaviorInterceptor._
diff --git a/actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/scaladsl/adapter/AdapterSpec.scala b/actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/scaladsl/adapter/AdapterSpec.scala
index 8bc0fbb73c..cf8338a57d 100644
--- a/actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/scaladsl/adapter/AdapterSpec.scala
+++ b/actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/scaladsl/adapter/AdapterSpec.scala
@@ -16,6 +16,11 @@ package org.apache.pekko.actor.typed.scaladsl.adapter
import scala.util.control.NoStackTrace
import org.apache.pekko
+
+import org.scalatest.BeforeAndAfterAll
+import org.scalatest.matchers.should.Matchers
+import org.scalatest.wordspec.AnyWordSpec
+
import pekko.{ actor => classic }
import pekko.Done
import pekko.NotUsed
@@ -33,10 +38,6 @@ import pekko.actor.typed.scaladsl.Behaviors
import pekko.serialization.SerializationExtension
import pekko.testkit._
-import org.scalatest.BeforeAndAfterAll
-import org.scalatest.matchers.should.Matchers
-import org.scalatest.wordspec.AnyWordSpec
-
object AdapterSpec {
val classic1: classic.Props = classic.Props(new Classic1)
diff --git a/actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/scaladsl/adapter/GuardianStartupSpec.scala b/actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/scaladsl/adapter/GuardianStartupSpec.scala
index 294ea4d081..6d641e19b9 100644
--- a/actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/scaladsl/adapter/GuardianStartupSpec.scala
+++ b/actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/scaladsl/adapter/GuardianStartupSpec.scala
@@ -17,16 +17,17 @@ import java.util.concurrent.CountDownLatch
import java.util.concurrent.TimeUnit
import org.apache.pekko
+
+import org.scalatest.concurrent.ScalaFutures
+import org.scalatest.matchers.should.Matchers
+import org.scalatest.wordspec.AnyWordSpec
+
import pekko.actor.ActorSystemImpl
import pekko.actor.testkit.typed.scaladsl.ActorTestKit
import pekko.actor.testkit.typed.scaladsl.LogCapturing
import pekko.actor.typed.ActorSystem
import pekko.actor.typed.scaladsl.Behaviors
-import org.scalatest.concurrent.ScalaFutures
-import org.scalatest.matchers.should.Matchers
-import org.scalatest.wordspec.AnyWordSpec
-
class GuardianStartupSpec extends AnyWordSpec with Matchers with ScalaFutures with LogCapturing {
"The user guardian" must {
diff --git a/actor-typed/src/main/scala-2.13/org/apache/pekko/actor/typed/internal/receptionist/Platform.scala b/actor-typed/src/main/scala-2.13/org/apache/pekko/actor/typed/internal/receptionist/Platform.scala
index bc464be208..977dbf760e 100644
--- a/actor-typed/src/main/scala-2.13/org/apache/pekko/actor/typed/internal/receptionist/Platform.scala
+++ b/actor-typed/src/main/scala-2.13/org/apache/pekko/actor/typed/internal/receptionist/Platform.scala
@@ -14,6 +14,7 @@
package org.apache.pekko.actor.typed.internal.receptionist
import org.apache.pekko
+
import pekko.actor.typed.ActorRef
import pekko.annotation.InternalApi
diff --git a/actor-typed/src/main/scala/org/apache/pekko/actor/typed/ActorRef.scala b/actor-typed/src/main/scala/org/apache/pekko/actor/typed/ActorRef.scala
index 3d369223b9..63f0e9a9d6 100644
--- a/actor-typed/src/main/scala/org/apache/pekko/actor/typed/ActorRef.scala
+++ b/actor-typed/src/main/scala/org/apache/pekko/actor/typed/ActorRef.scala
@@ -16,6 +16,7 @@ package org.apache.pekko.actor.typed
import scala.annotation.unchecked.uncheckedVariance
import org.apache.pekko
+
import pekko.{ actor => classic }
import pekko.actor.typed.internal.InternalRecipientRef
import pekko.annotation.DoNotInherit
diff --git a/actor-typed/src/main/scala/org/apache/pekko/actor/typed/ActorRefResolver.scala b/actor-typed/src/main/scala/org/apache/pekko/actor/typed/ActorRefResolver.scala
index ffa931d938..9e5233bb1e 100644
--- a/actor-typed/src/main/scala/org/apache/pekko/actor/typed/ActorRefResolver.scala
+++ b/actor-typed/src/main/scala/org/apache/pekko/actor/typed/ActorRefResolver.scala
@@ -14,6 +14,7 @@
package org.apache.pekko.actor.typed
import org.apache.pekko
+
import pekko.actor.{ ActorRefWithCell, ExtendedActorSystem }
import pekko.annotation.{ DoNotInherit, InternalApi }
diff --git a/actor-typed/src/main/scala/org/apache/pekko/actor/typed/ActorSystem.scala b/actor-typed/src/main/scala/org/apache/pekko/actor/typed/ActorSystem.scala
index 24b8882396..af2dab3a56 100644
--- a/actor-typed/src/main/scala/org/apache/pekko/actor/typed/ActorSystem.scala
+++ b/actor-typed/src/main/scala/org/apache/pekko/actor/typed/ActorSystem.scala
@@ -18,7 +18,12 @@ import java.util.concurrent.{ CompletionStage, ThreadFactory, TimeoutException }
import scala.concurrent.{ ExecutionContextExecutor, Future }
import org.apache.pekko
-import pekko.{ actor => classic, Done }
+
+import org.slf4j.Logger
+
+import com.typesafe.config.{ Config, ConfigFactory }
+
+import pekko.{ Done, actor => classic }
import pekko.actor.{ Address, BootstrapSetup, ClassicActorSystemProvider }
import pekko.actor.setup.ActorSystemSetup
import pekko.actor.typed.eventstream.EventStream
@@ -28,10 +33,6 @@ import pekko.actor.typed.receptionist.Receptionist
import pekko.annotation.DoNotInherit
import pekko.util.Helpers.{ ConfigOps, Requiring }
-import org.slf4j.Logger
-
-import com.typesafe.config.{ Config, ConfigFactory }
-
/**
* An ActorSystem is home to a hierarchy of Actors. It is created using
* `ActorSystem.apply` from a [[Behavior]] object that describes the root
diff --git a/actor-typed/src/main/scala/org/apache/pekko/actor/typed/Behavior.scala b/actor-typed/src/main/scala/org/apache/pekko/actor/typed/Behavior.scala
index bc0e070c84..c1647a9222 100644
--- a/actor-typed/src/main/scala/org/apache/pekko/actor/typed/Behavior.scala
+++ b/actor-typed/src/main/scala/org/apache/pekko/actor/typed/Behavior.scala
@@ -18,6 +18,7 @@ import scala.annotation.tailrec
import scala.reflect.ClassTag
import org.apache.pekko
+
import pekko.actor.InvalidMessageException
import pekko.actor.typed.internal.{ BehaviorImpl, BehaviorTags, InterceptorImpl, Supervisor }
import pekko.actor.typed.internal.BehaviorImpl.DeferredBehavior
diff --git a/actor-typed/src/main/scala/org/apache/pekko/actor/typed/BehaviorInterceptor.scala b/actor-typed/src/main/scala/org/apache/pekko/actor/typed/BehaviorInterceptor.scala
index 421b2a11fe..5fc002954f 100644
--- a/actor-typed/src/main/scala/org/apache/pekko/actor/typed/BehaviorInterceptor.scala
+++ b/actor-typed/src/main/scala/org/apache/pekko/actor/typed/BehaviorInterceptor.scala
@@ -16,6 +16,7 @@ package org.apache.pekko.actor.typed
import scala.reflect.ClassTag
import org.apache.pekko
+
import pekko.annotation.{ DoNotInherit, InternalApi }
import pekko.util.BoxedType
diff --git a/actor-typed/src/main/scala/org/apache/pekko/actor/typed/Extensions.scala b/actor-typed/src/main/scala/org/apache/pekko/actor/typed/Extensions.scala
index 92a6c112e9..abdea8a4f2 100644
--- a/actor-typed/src/main/scala/org/apache/pekko/actor/typed/Extensions.scala
+++ b/actor-typed/src/main/scala/org/apache/pekko/actor/typed/Extensions.scala
@@ -14,6 +14,7 @@
package org.apache.pekko.actor.typed
import org.apache.pekko
+
import pekko.actor.setup.Setup
import pekko.annotation.DoNotInherit
diff --git a/actor-typed/src/main/scala/org/apache/pekko/actor/typed/MessageAndSignals.scala b/actor-typed/src/main/scala/org/apache/pekko/actor/typed/MessageAndSignals.scala
index efcd06ef95..43bb9ff9a9 100644
--- a/actor-typed/src/main/scala/org/apache/pekko/actor/typed/MessageAndSignals.scala
+++ b/actor-typed/src/main/scala/org/apache/pekko/actor/typed/MessageAndSignals.scala
@@ -14,6 +14,7 @@
package org.apache.pekko.actor.typed
import org.apache.pekko
+
import pekko.annotation.DoNotInherit
/**
diff --git a/actor-typed/src/main/scala/org/apache/pekko/actor/typed/Props.scala b/actor-typed/src/main/scala/org/apache/pekko/actor/typed/Props.scala
index 45993e2220..0ee732006c 100644
--- a/actor-typed/src/main/scala/org/apache/pekko/actor/typed/Props.scala
+++ b/actor-typed/src/main/scala/org/apache/pekko/actor/typed/Props.scala
@@ -19,6 +19,7 @@ import scala.jdk.CollectionConverters._
import scala.reflect.ClassTag
import org.apache.pekko
+
import pekko.actor.typed.internal.PropsImpl._
import pekko.annotation.DoNotInherit
import pekko.annotation.InternalApi
diff --git a/actor-typed/src/main/scala/org/apache/pekko/actor/typed/Scheduler.scala b/actor-typed/src/main/scala/org/apache/pekko/actor/typed/Scheduler.scala
index e0b7537654..571ac3e32c 100644
--- a/actor-typed/src/main/scala/org/apache/pekko/actor/typed/Scheduler.scala
+++ b/actor-typed/src/main/scala/org/apache/pekko/actor/typed/Scheduler.scala
@@ -17,6 +17,7 @@ import scala.concurrent.ExecutionContext
import scala.concurrent.duration.FiniteDuration
import org.apache.pekko
+
import pekko.actor.Cancellable
import pekko.annotation.DoNotInherit
diff --git a/actor-typed/src/main/scala/org/apache/pekko/actor/typed/SpawnProtocol.scala b/actor-typed/src/main/scala/org/apache/pekko/actor/typed/SpawnProtocol.scala
index cf792d9a1c..2d4387b075 100644
--- a/actor-typed/src/main/scala/org/apache/pekko/actor/typed/SpawnProtocol.scala
+++ b/actor-typed/src/main/scala/org/apache/pekko/actor/typed/SpawnProtocol.scala
@@ -16,6 +16,7 @@ package org.apache.pekko.actor.typed
import scala.annotation.tailrec
import org.apache.pekko
+
import pekko.actor.typed.scaladsl.Behaviors
import pekko.annotation.DoNotInherit
diff --git a/actor-typed/src/main/scala/org/apache/pekko/actor/typed/SupervisorStrategy.scala b/actor-typed/src/main/scala/org/apache/pekko/actor/typed/SupervisorStrategy.scala
index 0ec45b7fe3..a8dbe562ef 100644
--- a/actor-typed/src/main/scala/org/apache/pekko/actor/typed/SupervisorStrategy.scala
+++ b/actor-typed/src/main/scala/org/apache/pekko/actor/typed/SupervisorStrategy.scala
@@ -18,11 +18,12 @@ import scala.concurrent.duration.FiniteDuration
import scala.jdk.DurationConverters._
import org.apache.pekko
-import pekko.annotation.DoNotInherit
-import pekko.annotation.InternalApi
import org.slf4j.event.Level
+import pekko.annotation.DoNotInherit
+import pekko.annotation.InternalApi
+
object SupervisorStrategy {
/**
diff --git a/actor-typed/src/main/scala/org/apache/pekko/actor/typed/delivery/ConsumerController.scala b/actor-typed/src/main/scala/org/apache/pekko/actor/typed/delivery/ConsumerController.scala
index 72ae6b08ff..cd524d1333 100644
--- a/actor-typed/src/main/scala/org/apache/pekko/actor/typed/delivery/ConsumerController.scala
+++ b/actor-typed/src/main/scala/org/apache/pekko/actor/typed/delivery/ConsumerController.scala
@@ -19,6 +19,9 @@ import scala.concurrent.duration._
import scala.jdk.DurationConverters._
import org.apache.pekko
+
+import com.typesafe.config.Config
+
import pekko.actor.DeadLetterSuppression
import pekko.actor.typed.ActorRef
import pekko.actor.typed.ActorSystem
@@ -33,8 +36,6 @@ import pekko.annotation.ApiMayChange
import pekko.annotation.DoNotInherit
import pekko.annotation.InternalApi
-import com.typesafe.config.Config
-
/**
* `ConsumerController` and [[ProducerController]] or [[WorkPullingProducerController]] are used
* together. See the descriptions in those classes or the Pekko reference documentation for
diff --git a/actor-typed/src/main/scala/org/apache/pekko/actor/typed/delivery/DurableProducerQueue.scala b/actor-typed/src/main/scala/org/apache/pekko/actor/typed/delivery/DurableProducerQueue.scala
index 82665b917f..87e72d8a5b 100644
--- a/actor-typed/src/main/scala/org/apache/pekko/actor/typed/delivery/DurableProducerQueue.scala
+++ b/actor-typed/src/main/scala/org/apache/pekko/actor/typed/delivery/DurableProducerQueue.scala
@@ -16,6 +16,7 @@ package org.apache.pekko.actor.typed.delivery
import scala.collection.immutable
import org.apache.pekko
+
import pekko.actor.typed.ActorRef
import pekko.actor.typed.delivery.internal.ChunkedMessage
import pekko.actor.typed.delivery.internal.DeliverySerializable
diff --git a/actor-typed/src/main/scala/org/apache/pekko/actor/typed/delivery/ProducerController.scala b/actor-typed/src/main/scala/org/apache/pekko/actor/typed/delivery/ProducerController.scala
index 7d4368642e..7ecc48dcd2 100644
--- a/actor-typed/src/main/scala/org/apache/pekko/actor/typed/delivery/ProducerController.scala
+++ b/actor-typed/src/main/scala/org/apache/pekko/actor/typed/delivery/ProducerController.scala
@@ -22,6 +22,9 @@ import scala.jdk.OptionConverters._
import scala.reflect.ClassTag
import org.apache.pekko
+
+import com.typesafe.config.Config
+
import pekko.actor.typed.ActorRef
import pekko.actor.typed.ActorSystem
import pekko.actor.typed.Behavior
@@ -33,8 +36,6 @@ import pekko.annotation.InternalApi
import pekko.util.Helpers.Requiring
import pekko.util.Helpers.toRootLowerCase
-import com.typesafe.config.Config
-
/**
* Point-to-point reliable delivery between a single producer actor sending messages and a single consumer
* actor receiving the messages. Used together with [[ConsumerController]].
diff --git a/actor-typed/src/main/scala/org/apache/pekko/actor/typed/delivery/WorkPullingProducerController.scala b/actor-typed/src/main/scala/org/apache/pekko/actor/typed/delivery/WorkPullingProducerController.scala
index b3a63a5858..139ddb0c4c 100644
--- a/actor-typed/src/main/scala/org/apache/pekko/actor/typed/delivery/WorkPullingProducerController.scala
+++ b/actor-typed/src/main/scala/org/apache/pekko/actor/typed/delivery/WorkPullingProducerController.scala
@@ -21,6 +21,9 @@ import scala.jdk.OptionConverters._
import scala.reflect.ClassTag
import org.apache.pekko
+
+import com.typesafe.config.Config
+
import pekko.Done
import pekko.actor.typed.ActorRef
import pekko.actor.typed.ActorSystem
@@ -30,8 +33,6 @@ import pekko.actor.typed.receptionist.ServiceKey
import pekko.actor.typed.scaladsl.Behaviors
import pekko.annotation.ApiMayChange
-import com.typesafe.config.Config
-
/**
* Work pulling is a pattern where several worker actors pull tasks in their own pace from
* a shared work manager instead of that the manager pushes work to the workers blindly
diff --git a/actor-typed/src/main/scala/org/apache/pekko/actor/typed/delivery/internal/ChunkedMessage.scala b/actor-typed/src/main/scala/org/apache/pekko/actor/typed/delivery/internal/ChunkedMessage.scala
index 7c6445fb9a..35ddbb5b99 100644
--- a/actor-typed/src/main/scala/org/apache/pekko/actor/typed/delivery/internal/ChunkedMessage.scala
+++ b/actor-typed/src/main/scala/org/apache/pekko/actor/typed/delivery/internal/ChunkedMessage.scala
@@ -14,6 +14,7 @@
package org.apache.pekko.actor.typed.delivery.internal
import org.apache.pekko
+
import pekko.annotation.InternalApi
import pekko.util.ByteString
diff --git a/actor-typed/src/main/scala/org/apache/pekko/actor/typed/delivery/internal/ConsumerControllerImpl.scala b/actor-typed/src/main/scala/org/apache/pekko/actor/typed/delivery/internal/ConsumerControllerImpl.scala
index d039a6aff1..0096174dbe 100644
--- a/actor-typed/src/main/scala/org/apache/pekko/actor/typed/delivery/internal/ConsumerControllerImpl.scala
+++ b/actor-typed/src/main/scala/org/apache/pekko/actor/typed/delivery/internal/ConsumerControllerImpl.scala
@@ -16,6 +16,7 @@ package org.apache.pekko.actor.typed.delivery.internal
import scala.concurrent.duration.FiniteDuration
import org.apache.pekko
+
import pekko.actor.typed.ActorRef
import pekko.actor.typed.Behavior
import pekko.actor.typed.PostStop
diff --git a/actor-typed/src/main/scala/org/apache/pekko/actor/typed/delivery/internal/ProducerControllerImpl.scala b/actor-typed/src/main/scala/org/apache/pekko/actor/typed/delivery/internal/ProducerControllerImpl.scala
index 46860168b7..7aeff72369 100644
--- a/actor-typed/src/main/scala/org/apache/pekko/actor/typed/delivery/internal/ProducerControllerImpl.scala
+++ b/actor-typed/src/main/scala/org/apache/pekko/actor/typed/delivery/internal/ProducerControllerImpl.scala
@@ -22,6 +22,7 @@ import scala.util.Failure
import scala.util.Success
import org.apache.pekko
+
import pekko.actor.DeadLetterSuppression
import pekko.actor.typed.ActorRef
import pekko.actor.typed.Behavior
diff --git a/actor-typed/src/main/scala/org/apache/pekko/actor/typed/delivery/internal/WorkPullingProducerControllerImpl.scala b/actor-typed/src/main/scala/org/apache/pekko/actor/typed/delivery/internal/WorkPullingProducerControllerImpl.scala
index 2e8b008bee..9a384df6a9 100644
--- a/actor-typed/src/main/scala/org/apache/pekko/actor/typed/delivery/internal/WorkPullingProducerControllerImpl.scala
+++ b/actor-typed/src/main/scala/org/apache/pekko/actor/typed/delivery/internal/WorkPullingProducerControllerImpl.scala
@@ -23,6 +23,7 @@ import scala.util.Failure
import scala.util.Success
import org.apache.pekko
+
import pekko.Done
import pekko.actor.typed.ActorRef
import pekko.actor.typed.Behavior
diff --git a/actor-typed/src/main/scala/org/apache/pekko/actor/typed/eventstream/EventStream.scala b/actor-typed/src/main/scala/org/apache/pekko/actor/typed/eventstream/EventStream.scala
index 07190a07c4..5f15f98175 100644
--- a/actor-typed/src/main/scala/org/apache/pekko/actor/typed/eventstream/EventStream.scala
+++ b/actor-typed/src/main/scala/org/apache/pekko/actor/typed/eventstream/EventStream.scala
@@ -16,6 +16,7 @@ package org.apache.pekko.actor.typed.eventstream
import scala.reflect.ClassTag
import org.apache.pekko
+
import pekko.actor.InvalidMessageException
import pekko.actor.typed.ActorRef
import pekko.annotation.{ DoNotInherit, InternalApi }
diff --git a/actor-typed/src/main/scala/org/apache/pekko/actor/typed/internal/ActorContextImpl.scala b/actor-typed/src/main/scala/org/apache/pekko/actor/typed/internal/ActorContextImpl.scala
index 7f3842dff3..f0d1e4576e 100644
--- a/actor-typed/src/main/scala/org/apache/pekko/actor/typed/internal/ActorContextImpl.scala
+++ b/actor-typed/src/main/scala/org/apache/pekko/actor/typed/internal/ActorContextImpl.scala
@@ -20,8 +20,8 @@ import java.util.Optional
import java.util.concurrent.CompletionStage
import scala.annotation.{ nowarn, switch }
-import scala.concurrent.{ ExecutionContextExecutor, Future }
import scala.concurrent.ExecutionContext
+import scala.concurrent.{ ExecutionContextExecutor, Future }
import scala.jdk.DurationConverters._
import scala.reflect.ClassTag
import scala.util.Failure
@@ -29,6 +29,10 @@ import scala.util.Success
import scala.util.Try
import org.apache.pekko
+
+import org.slf4j.Logger
+import org.slf4j.LoggerFactory
+
import pekko.actor.Address
import pekko.actor.typed.internal.adapter.ActorSystemAdapter
import pekko.annotation.InternalApi
@@ -37,9 +41,6 @@ import pekko.util.BoxedType
import pekko.util.OptionVal
import pekko.util.Timeout
-import org.slf4j.Logger
-import org.slf4j.LoggerFactory
-
/**
* INTERNAL API
*/
diff --git a/actor-typed/src/main/scala/org/apache/pekko/actor/typed/internal/ActorFlightRecorder.scala b/actor-typed/src/main/scala/org/apache/pekko/actor/typed/internal/ActorFlightRecorder.scala
index f6bdfd77cb..c10379eb35 100644
--- a/actor-typed/src/main/scala/org/apache/pekko/actor/typed/internal/ActorFlightRecorder.scala
+++ b/actor-typed/src/main/scala/org/apache/pekko/actor/typed/internal/ActorFlightRecorder.scala
@@ -14,6 +14,7 @@
package org.apache.pekko.actor.typed.internal
import org.apache.pekko
+
import pekko.actor.ActorPath
import pekko.actor.typed.{ ActorSystem, Extension, ExtensionId }
import pekko.annotation.InternalApi
diff --git a/actor-typed/src/main/scala/org/apache/pekko/actor/typed/internal/BehaviorImpl.scala b/actor-typed/src/main/scala/org/apache/pekko/actor/typed/internal/BehaviorImpl.scala
index 7fa5c7c83d..83d6fe8ae1 100644
--- a/actor-typed/src/main/scala/org/apache/pekko/actor/typed/internal/BehaviorImpl.scala
+++ b/actor-typed/src/main/scala/org/apache/pekko/actor/typed/internal/BehaviorImpl.scala
@@ -17,6 +17,7 @@ package internal
import scala.reflect.ClassTag
import org.apache.pekko
+
import pekko.actor.typed.{ TypedActorContext => AC }
import pekko.actor.typed.scaladsl.{ ActorContext => SAC }
import pekko.annotation.InternalApi
diff --git a/actor-typed/src/main/scala/org/apache/pekko/actor/typed/internal/EventStreamExtension.scala b/actor-typed/src/main/scala/org/apache/pekko/actor/typed/internal/EventStreamExtension.scala
index 899b951465..9a3cfb1a22 100644
--- a/actor-typed/src/main/scala/org/apache/pekko/actor/typed/internal/EventStreamExtension.scala
+++ b/actor-typed/src/main/scala/org/apache/pekko/actor/typed/internal/EventStreamExtension.scala
@@ -14,6 +14,7 @@
package org.apache.pekko.actor.typed.internal
import org.apache.pekko
+
import pekko.actor.typed._
import pekko.actor.typed.eventstream.EventStream
import pekko.actor.typed.internal.adapter.EventStreamAdapter
diff --git a/actor-typed/src/main/scala/org/apache/pekko/actor/typed/internal/ExtensionsImpl.scala b/actor-typed/src/main/scala/org/apache/pekko/actor/typed/internal/ExtensionsImpl.scala
index bfb75f180c..d54bc4fedb 100644
--- a/actor-typed/src/main/scala/org/apache/pekko/actor/typed/internal/ExtensionsImpl.scala
+++ b/actor-typed/src/main/scala/org/apache/pekko/actor/typed/internal/ExtensionsImpl.scala
@@ -21,6 +21,7 @@ import scala.jdk.CollectionConverters._
import scala.util.{ Failure, Success, Try }
import org.apache.pekko
+
import pekko.actor.typed.{ ActorSystem, Extension, ExtensionId, Extensions }
import pekko.actor.typed.ExtensionSetup
import pekko.annotation.InternalApi
diff --git a/actor-typed/src/main/scala/org/apache/pekko/actor/typed/internal/InterceptorImpl.scala b/actor-typed/src/main/scala/org/apache/pekko/actor/typed/internal/InterceptorImpl.scala
index c5a0fa3c69..d840e756ca 100644
--- a/actor-typed/src/main/scala/org/apache/pekko/actor/typed/internal/InterceptorImpl.scala
+++ b/actor-typed/src/main/scala/org/apache/pekko/actor/typed/internal/InterceptorImpl.scala
@@ -16,6 +16,10 @@ package org.apache.pekko.actor.typed.internal
import scala.reflect.ClassTag
import org.apache.pekko
+
+import org.slf4j.LoggerFactory
+import org.slf4j.event.Level
+
import pekko.actor.typed
import pekko.actor.typed._
import pekko.actor.typed.LogOptions
@@ -23,9 +27,6 @@ import pekko.actor.typed.scaladsl.Behaviors
import pekko.annotation.InternalApi
import pekko.util.LineNumbers
-import org.slf4j.LoggerFactory
-import org.slf4j.event.Level
-
/**
* Provides the impl of any behavior that could nest another behavior
*
diff --git a/actor-typed/src/main/scala/org/apache/pekko/actor/typed/internal/InternalMessage.scala b/actor-typed/src/main/scala/org/apache/pekko/actor/typed/internal/InternalMessage.scala
index 550f293a56..c8916d6c93 100644
--- a/actor-typed/src/main/scala/org/apache/pekko/actor/typed/internal/InternalMessage.scala
+++ b/actor-typed/src/main/scala/org/apache/pekko/actor/typed/internal/InternalMessage.scala
@@ -14,6 +14,7 @@
package org.apache.pekko.actor.typed.internal
import org.apache.pekko
+
import pekko.actor.WrappedMessage
import pekko.annotation.InternalApi
diff --git a/actor-typed/src/main/scala/org/apache/pekko/actor/typed/internal/InternalRecipientRef.scala b/actor-typed/src/main/scala/org/apache/pekko/actor/typed/internal/InternalRecipientRef.scala
index b70491d62a..94e8b35b6c 100644
--- a/actor-typed/src/main/scala/org/apache/pekko/actor/typed/internal/InternalRecipientRef.scala
+++ b/actor-typed/src/main/scala/org/apache/pekko/actor/typed/internal/InternalRecipientRef.scala
@@ -14,6 +14,7 @@
package org.apache.pekko.actor.typed.internal
import org.apache.pekko
+
import pekko.actor.ActorRefProvider
import pekko.actor.typed.RecipientRef
import pekko.annotation.InternalApi
diff --git a/actor-typed/src/main/scala/org/apache/pekko/actor/typed/internal/LoggerClass.scala b/actor-typed/src/main/scala/org/apache/pekko/actor/typed/internal/LoggerClass.scala
index 94a150a0d6..d8583e762d 100644
--- a/actor-typed/src/main/scala/org/apache/pekko/actor/typed/internal/LoggerClass.scala
+++ b/actor-typed/src/main/scala/org/apache/pekko/actor/typed/internal/LoggerClass.scala
@@ -16,6 +16,7 @@ package org.apache.pekko.actor.typed.internal
import scala.util.control.NonFatal
import org.apache.pekko
+
import pekko.annotation.InternalApi
import pekko.util.OptionVal
diff --git a/actor-typed/src/main/scala/org/apache/pekko/actor/typed/internal/MiscMessageSerializer.scala b/actor-typed/src/main/scala/org/apache/pekko/actor/typed/internal/MiscMessageSerializer.scala
index 5de797568f..ea6a5b7a4e 100644
--- a/actor-typed/src/main/scala/org/apache/pekko/actor/typed/internal/MiscMessageSerializer.scala
+++ b/actor-typed/src/main/scala/org/apache/pekko/actor/typed/internal/MiscMessageSerializer.scala
@@ -17,6 +17,7 @@ import java.io.NotSerializableException
import java.nio.charset.StandardCharsets
import org.apache.pekko
+
import pekko.actor.typed.{ ActorRef, ActorRefResolver }
import pekko.actor.typed.scaladsl.adapter._
import pekko.annotation.InternalApi
diff --git a/actor-typed/src/main/scala/org/apache/pekko/actor/typed/internal/PoisonPill.scala b/actor-typed/src/main/scala/org/apache/pekko/actor/typed/internal/PoisonPill.scala
index 76372e913e..9a56a6c750 100644
--- a/actor-typed/src/main/scala/org/apache/pekko/actor/typed/internal/PoisonPill.scala
+++ b/actor-typed/src/main/scala/org/apache/pekko/actor/typed/internal/PoisonPill.scala
@@ -14,6 +14,7 @@
package org.apache.pekko.actor.typed.internal
import org.apache.pekko
+
import pekko.actor.typed.Behavior
import pekko.actor.typed.BehaviorInterceptor
import pekko.actor.typed.BehaviorSignalInterceptor
diff --git a/actor-typed/src/main/scala/org/apache/pekko/actor/typed/internal/PropsImpl.scala b/actor-typed/src/main/scala/org/apache/pekko/actor/typed/internal/PropsImpl.scala
index 2def632421..7c2caeea8c 100644
--- a/actor-typed/src/main/scala/org/apache/pekko/actor/typed/internal/PropsImpl.scala
+++ b/actor-typed/src/main/scala/org/apache/pekko/actor/typed/internal/PropsImpl.scala
@@ -14,6 +14,7 @@
package org.apache.pekko.actor.typed.internal
import org.apache.pekko
+
import pekko.actor.typed.{ DispatcherSelector, MailboxSelector, Props }
import pekko.actor.typed.ActorTags
import pekko.annotation.InternalApi
diff --git a/actor-typed/src/main/scala/org/apache/pekko/actor/typed/internal/StashBufferImpl.scala b/actor-typed/src/main/scala/org/apache/pekko/actor/typed/internal/StashBufferImpl.scala
index b0dc053a57..3484bcd5db 100644
--- a/actor-typed/src/main/scala/org/apache/pekko/actor/typed/internal/StashBufferImpl.scala
+++ b/actor-typed/src/main/scala/org/apache/pekko/actor/typed/internal/StashBufferImpl.scala
@@ -13,14 +13,15 @@
package org.apache.pekko.actor.typed.internal
-import java.util.function.{ Function => JFunction }
import java.util.function.Predicate
+import java.util.function.{ Function => JFunction }
import scala.annotation.nowarn
import scala.annotation.tailrec
import scala.util.control.NonFatal
import org.apache.pekko
+
import pekko.actor.DeadLetter
import pekko.actor.typed.Behavior
import pekko.actor.typed.Signal
diff --git a/actor-typed/src/main/scala/org/apache/pekko/actor/typed/internal/Supervision.scala b/actor-typed/src/main/scala/org/apache/pekko/actor/typed/internal/Supervision.scala
index 396637bd2b..2f41633cf3 100644
--- a/actor-typed/src/main/scala/org/apache/pekko/actor/typed/internal/Supervision.scala
+++ b/actor-typed/src/main/scala/org/apache/pekko/actor/typed/internal/Supervision.scala
@@ -25,6 +25,9 @@ import scala.util.control.Exception.Catcher
import scala.util.control.NonFatal
import org.apache.pekko
+
+import org.slf4j.event.Level
+
import pekko.actor.DeadLetterSuppression
import pekko.actor.Dropped
import pekko.actor.typed.BehaviorInterceptor.PreStartTarget
@@ -37,8 +40,6 @@ import pekko.annotation.InternalApi
import pekko.event.Logging
import pekko.util.OptionVal
-import org.slf4j.event.Level
-
/**
* INTERNAL API
*/
diff --git a/actor-typed/src/main/scala/org/apache/pekko/actor/typed/internal/TimerSchedulerImpl.scala b/actor-typed/src/main/scala/org/apache/pekko/actor/typed/internal/TimerSchedulerImpl.scala
index 8672770e2e..424b0917c9 100644
--- a/actor-typed/src/main/scala/org/apache/pekko/actor/typed/internal/TimerSchedulerImpl.scala
+++ b/actor-typed/src/main/scala/org/apache/pekko/actor/typed/internal/TimerSchedulerImpl.scala
@@ -20,13 +20,14 @@ import scala.concurrent.ExecutionContext
import scala.concurrent.duration.FiniteDuration
import org.apache.pekko
+
+import org.slf4j.Logger
+
import pekko.actor.{ Cancellable, NotInfluenceReceiveTimeout }
import pekko.actor.typed.scaladsl.{ ActorContext, LoggerOps }
import pekko.annotation.InternalApi
import pekko.util.OptionVal
-import org.slf4j.Logger
-
/**
* INTERNAL API
*/
diff --git a/actor-typed/src/main/scala/org/apache/pekko/actor/typed/internal/WithMdcBehaviorInterceptor.scala b/actor-typed/src/main/scala/org/apache/pekko/actor/typed/internal/WithMdcBehaviorInterceptor.scala
index 251debe7b6..c61cb39cf0 100644
--- a/actor-typed/src/main/scala/org/apache/pekko/actor/typed/internal/WithMdcBehaviorInterceptor.scala
+++ b/actor-typed/src/main/scala/org/apache/pekko/actor/typed/internal/WithMdcBehaviorInterceptor.scala
@@ -16,11 +16,12 @@ package org.apache.pekko.actor.typed.internal
import scala.reflect.ClassTag
import org.apache.pekko
-import pekko.actor.typed.{ Behavior, BehaviorInterceptor, Signal, TypedActorContext }
-import pekko.annotation.InternalApi
import org.slf4j.MDC
+import pekko.actor.typed.{ Behavior, BehaviorInterceptor, Signal, TypedActorContext }
+import pekko.annotation.InternalApi
+
/**
* INTERNAL API
*/
diff --git a/actor-typed/src/main/scala/org/apache/pekko/actor/typed/internal/adapter/ActorAdapter.scala b/actor-typed/src/main/scala/org/apache/pekko/actor/typed/internal/adapter/ActorAdapter.scala
index 7bee9f44f1..320105c1aa 100644
--- a/actor-typed/src/main/scala/org/apache/pekko/actor/typed/internal/adapter/ActorAdapter.scala
+++ b/actor-typed/src/main/scala/org/apache/pekko/actor/typed/internal/adapter/ActorAdapter.scala
@@ -23,6 +23,7 @@ import scala.util.control.Exception.Catcher
import scala.util.control.NonFatal
import org.apache.pekko
+
import pekko.{ actor => classic }
import pekko.actor.ActorInitializationException
import pekko.actor.ActorRefWithCell
diff --git a/actor-typed/src/main/scala/org/apache/pekko/actor/typed/internal/adapter/ActorContextAdapter.scala b/actor-typed/src/main/scala/org/apache/pekko/actor/typed/internal/adapter/ActorContextAdapter.scala
index 45b256b107..94cfd06479 100644
--- a/actor-typed/src/main/scala/org/apache/pekko/actor/typed/internal/adapter/ActorContextAdapter.scala
+++ b/actor-typed/src/main/scala/org/apache/pekko/actor/typed/internal/adapter/ActorContextAdapter.scala
@@ -19,6 +19,7 @@ import scala.concurrent.ExecutionContextExecutor
import scala.concurrent.duration._
import org.apache.pekko
+
import pekko.{ actor => classic }
import pekko.annotation.InternalApi
import pekko.util.OptionVal
diff --git a/actor-typed/src/main/scala/org/apache/pekko/actor/typed/internal/adapter/ActorRefAdapter.scala b/actor-typed/src/main/scala/org/apache/pekko/actor/typed/internal/adapter/ActorRefAdapter.scala
index 05e76a921d..15b37cdbe5 100644
--- a/actor-typed/src/main/scala/org/apache/pekko/actor/typed/internal/adapter/ActorRefAdapter.scala
+++ b/actor-typed/src/main/scala/org/apache/pekko/actor/typed/internal/adapter/ActorRefAdapter.scala
@@ -16,6 +16,7 @@ package internal
package adapter
import org.apache.pekko
+
import pekko.{ actor => classic }
import pekko.actor.ActorRefProvider
import pekko.actor.InvalidMessageException
diff --git a/actor-typed/src/main/scala/org/apache/pekko/actor/typed/internal/adapter/ActorRefFactoryAdapter.scala b/actor-typed/src/main/scala/org/apache/pekko/actor/typed/internal/adapter/ActorRefFactoryAdapter.scala
index 4611fd9243..8bdbcb9b0f 100644
--- a/actor-typed/src/main/scala/org/apache/pekko/actor/typed/internal/adapter/ActorRefFactoryAdapter.scala
+++ b/actor-typed/src/main/scala/org/apache/pekko/actor/typed/internal/adapter/ActorRefFactoryAdapter.scala
@@ -14,6 +14,7 @@
package org.apache.pekko.actor.typed.internal.adapter
import org.apache.pekko
+
import pekko.ConfigurationException
import pekko.actor.typed._
import pekko.actor.typed.internal.CachedProps
diff --git a/actor-typed/src/main/scala/org/apache/pekko/actor/typed/internal/adapter/ActorSystemAdapter.scala b/actor-typed/src/main/scala/org/apache/pekko/actor/typed/internal/adapter/ActorSystemAdapter.scala
index 8a599493eb..5e41badbbf 100644
--- a/actor-typed/src/main/scala/org/apache/pekko/actor/typed/internal/adapter/ActorSystemAdapter.scala
+++ b/actor-typed/src/main/scala/org/apache/pekko/actor/typed/internal/adapter/ActorSystemAdapter.scala
@@ -19,6 +19,9 @@ import scala.concurrent.ExecutionContextExecutor
import scala.jdk.FutureConverters._
import org.apache.pekko
+
+import org.slf4j.{ Logger, LoggerFactory }
+
import pekko.{ actor => classic }
import pekko.Done
import pekko.actor
@@ -43,8 +46,6 @@ import pekko.actor.typed.scaladsl.Behaviors
import pekko.annotation.InternalApi
import pekko.util.OptionVal
-import org.slf4j.{ Logger, LoggerFactory }
-
/**
* INTERNAL API. Lightweight wrapper for presenting a classic ActorSystem to a Behavior (via the context).
* Therefore it does not have a lot of vals, only the whenTerminated Future is cached after
diff --git a/actor-typed/src/main/scala/org/apache/pekko/actor/typed/internal/adapter/AdapterExtension.scala b/actor-typed/src/main/scala/org/apache/pekko/actor/typed/internal/adapter/AdapterExtension.scala
index 26df65de48..1bf55dc4ab 100644
--- a/actor-typed/src/main/scala/org/apache/pekko/actor/typed/internal/adapter/AdapterExtension.scala
+++ b/actor-typed/src/main/scala/org/apache/pekko/actor/typed/internal/adapter/AdapterExtension.scala
@@ -14,6 +14,7 @@
package org.apache.pekko.actor.typed.internal.adapter
import org.apache.pekko
+
import pekko.actor.ExtendedActorSystem
import pekko.annotation.InternalApi
diff --git a/actor-typed/src/main/scala/org/apache/pekko/actor/typed/internal/adapter/EventStreamAdapter.scala b/actor-typed/src/main/scala/org/apache/pekko/actor/typed/internal/adapter/EventStreamAdapter.scala
index 69812b8311..9031a36069 100644
--- a/actor-typed/src/main/scala/org/apache/pekko/actor/typed/internal/adapter/EventStreamAdapter.scala
+++ b/actor-typed/src/main/scala/org/apache/pekko/actor/typed/internal/adapter/EventStreamAdapter.scala
@@ -14,6 +14,7 @@
package org.apache.pekko.actor.typed.internal.adapter
import org.apache.pekko
+
import pekko.actor.typed.Behavior
import pekko.actor.typed.eventstream.EventStream
import pekko.actor.typed.scaladsl.Behaviors
diff --git a/actor-typed/src/main/scala/org/apache/pekko/actor/typed/internal/adapter/GuardianStartupBehavior.scala b/actor-typed/src/main/scala/org/apache/pekko/actor/typed/internal/adapter/GuardianStartupBehavior.scala
index d719a37232..7c8d668df8 100644
--- a/actor-typed/src/main/scala/org/apache/pekko/actor/typed/internal/adapter/GuardianStartupBehavior.scala
+++ b/actor-typed/src/main/scala/org/apache/pekko/actor/typed/internal/adapter/GuardianStartupBehavior.scala
@@ -14,6 +14,7 @@
package org.apache.pekko.actor.typed.internal.adapter
import org.apache.pekko
+
import pekko.actor.typed.Behavior
import pekko.actor.typed.BehaviorInterceptor
import pekko.actor.typed.Signal
diff --git a/actor-typed/src/main/scala/org/apache/pekko/actor/typed/internal/adapter/PropsAdapter.scala b/actor-typed/src/main/scala/org/apache/pekko/actor/typed/internal/adapter/PropsAdapter.scala
index 8847ebb0da..a9c157eedc 100644
--- a/actor-typed/src/main/scala/org/apache/pekko/actor/typed/internal/adapter/PropsAdapter.scala
+++ b/actor-typed/src/main/scala/org/apache/pekko/actor/typed/internal/adapter/PropsAdapter.scala
@@ -14,6 +14,7 @@
package org.apache.pekko.actor.typed.internal.adapter
import org.apache.pekko
+
import pekko.actor.Deploy
import pekko.actor.LocalScope
import pekko.actor.TypedCreatorFunctionConsumer
diff --git a/actor-typed/src/main/scala/org/apache/pekko/actor/typed/internal/adapter/SchedulerAdapter.scala b/actor-typed/src/main/scala/org/apache/pekko/actor/typed/internal/adapter/SchedulerAdapter.scala
index 109c7fe01e..57d966bb4e 100644
--- a/actor-typed/src/main/scala/org/apache/pekko/actor/typed/internal/adapter/SchedulerAdapter.scala
+++ b/actor-typed/src/main/scala/org/apache/pekko/actor/typed/internal/adapter/SchedulerAdapter.scala
@@ -19,6 +19,7 @@ import scala.concurrent.ExecutionContext
import scala.concurrent.duration.FiniteDuration
import org.apache.pekko
+
import pekko.actor.Cancellable
import pekko.actor.typed.Scheduler
import pekko.annotation.InternalApi
diff --git a/actor-typed/src/main/scala/org/apache/pekko/actor/typed/internal/jfr/JFRActorFlightRecorder.scala b/actor-typed/src/main/scala/org/apache/pekko/actor/typed/internal/jfr/JFRActorFlightRecorder.scala
index 1b56744a73..8959c52dc8 100644
--- a/actor-typed/src/main/scala/org/apache/pekko/actor/typed/internal/jfr/JFRActorFlightRecorder.scala
+++ b/actor-typed/src/main/scala/org/apache/pekko/actor/typed/internal/jfr/JFRActorFlightRecorder.scala
@@ -14,6 +14,7 @@
package org.apache.pekko.actor.typed.internal.jfr
import org.apache.pekko
+
import pekko.actor.ActorPath
import pekko.actor.typed.internal.ActorFlightRecorder
import pekko.actor.typed.internal.DeliveryFlightRecorder
diff --git a/actor-typed/src/main/scala/org/apache/pekko/actor/typed/internal/pubsub/TopicImpl.scala b/actor-typed/src/main/scala/org/apache/pekko/actor/typed/internal/pubsub/TopicImpl.scala
index 0189696b6a..7f15ad180e 100644
--- a/actor-typed/src/main/scala/org/apache/pekko/actor/typed/internal/pubsub/TopicImpl.scala
+++ b/actor-typed/src/main/scala/org/apache/pekko/actor/typed/internal/pubsub/TopicImpl.scala
@@ -16,6 +16,7 @@ package org.apache.pekko.actor.typed.internal.pubsub
import scala.reflect.ClassTag
import org.apache.pekko
+
import pekko.actor.Dropped
import pekko.actor.InvalidMessageException
import pekko.actor.typed.ActorRef
diff --git a/actor-typed/src/main/scala/org/apache/pekko/actor/typed/internal/receptionist/LocalReceptionist.scala b/actor-typed/src/main/scala/org/apache/pekko/actor/typed/internal/receptionist/LocalReceptionist.scala
index 38269c7e42..e930cfe5ce 100644
--- a/actor-typed/src/main/scala/org/apache/pekko/actor/typed/internal/receptionist/LocalReceptionist.scala
+++ b/actor-typed/src/main/scala/org/apache/pekko/actor/typed/internal/receptionist/LocalReceptionist.scala
@@ -14,6 +14,7 @@
package org.apache.pekko.actor.typed.internal.receptionist
import org.apache.pekko
+
import pekko.actor.typed.ActorRef
import pekko.actor.typed.Behavior
import pekko.actor.typed.receptionist.Receptionist._
diff --git a/actor-typed/src/main/scala/org/apache/pekko/actor/typed/internal/receptionist/ReceptionistImpl.scala b/actor-typed/src/main/scala/org/apache/pekko/actor/typed/internal/receptionist/ReceptionistImpl.scala
index 762e660fee..7e0423cb61 100644
--- a/actor-typed/src/main/scala/org/apache/pekko/actor/typed/internal/receptionist/ReceptionistImpl.scala
+++ b/actor-typed/src/main/scala/org/apache/pekko/actor/typed/internal/receptionist/ReceptionistImpl.scala
@@ -14,6 +14,7 @@
package org.apache.pekko.actor.typed.internal.receptionist
import org.apache.pekko
+
import pekko.actor.typed.ActorRef
import pekko.actor.typed.ActorSystem
import pekko.actor.typed.Dispatchers
diff --git a/actor-typed/src/main/scala/org/apache/pekko/actor/typed/internal/receptionist/ReceptionistMessages.scala b/actor-typed/src/main/scala/org/apache/pekko/actor/typed/internal/receptionist/ReceptionistMessages.scala
index 8e212d6ef8..525fee3eb6 100644
--- a/actor-typed/src/main/scala/org/apache/pekko/actor/typed/internal/receptionist/ReceptionistMessages.scala
+++ b/actor-typed/src/main/scala/org/apache/pekko/actor/typed/internal/receptionist/ReceptionistMessages.scala
@@ -16,6 +16,7 @@ package org.apache.pekko.actor.typed.internal.receptionist
import scala.jdk.CollectionConverters._
import org.apache.pekko
+
import pekko.actor.typed.ActorRef
import pekko.actor.typed.receptionist.{ Receptionist, ServiceKey }
import pekko.actor.typed.receptionist.Receptionist.Command
diff --git a/actor-typed/src/main/scala/org/apache/pekko/actor/typed/internal/receptionist/ServiceKey.scala b/actor-typed/src/main/scala/org/apache/pekko/actor/typed/internal/receptionist/ServiceKey.scala
index 8ea6577bde..c06bc9f294 100644
--- a/actor-typed/src/main/scala/org/apache/pekko/actor/typed/internal/receptionist/ServiceKey.scala
+++ b/actor-typed/src/main/scala/org/apache/pekko/actor/typed/internal/receptionist/ServiceKey.scala
@@ -14,6 +14,7 @@
package org.apache.pekko.actor.typed.internal.receptionist
import org.apache.pekko
+
import pekko.actor.typed.receptionist.ServiceKey
import pekko.annotation.InternalApi
diff --git a/actor-typed/src/main/scala/org/apache/pekko/actor/typed/internal/receptionist/ServiceKeySerializer.scala b/actor-typed/src/main/scala/org/apache/pekko/actor/typed/internal/receptionist/ServiceKeySerializer.scala
index 9316e45b54..71a46f842f 100644
--- a/actor-typed/src/main/scala/org/apache/pekko/actor/typed/internal/receptionist/ServiceKeySerializer.scala
+++ b/actor-typed/src/main/scala/org/apache/pekko/actor/typed/internal/receptionist/ServiceKeySerializer.scala
@@ -16,6 +16,7 @@ package org.apache.pekko.actor.typed.internal.receptionist
import java.nio.charset.StandardCharsets
import org.apache.pekko
+
import pekko.actor.typed.receptionist.ServiceKey
import pekko.annotation.InternalApi
import pekko.serialization.{ BaseSerializer, SerializerWithStringManifest }
diff --git a/actor-typed/src/main/scala/org/apache/pekko/actor/typed/internal/routing/GroupRouterImpl.scala b/actor-typed/src/main/scala/org/apache/pekko/actor/typed/internal/routing/GroupRouterImpl.scala
index 4d006cf2e3..603cf16e4d 100644
--- a/actor-typed/src/main/scala/org/apache/pekko/actor/typed/internal/routing/GroupRouterImpl.scala
+++ b/actor-typed/src/main/scala/org/apache/pekko/actor/typed/internal/routing/GroupRouterImpl.scala
@@ -16,6 +16,7 @@ package org.apache.pekko.actor.typed.internal.routing
import java.util.function
import org.apache.pekko
+
import pekko.actor.Dropped
import pekko.actor.typed._
import pekko.actor.typed.eventstream.EventStream
diff --git a/actor-typed/src/main/scala/org/apache/pekko/actor/typed/internal/routing/PoolRouterImpl.scala b/actor-typed/src/main/scala/org/apache/pekko/actor/typed/internal/routing/PoolRouterImpl.scala
index bd043aca0a..ba4118c4a3 100644
--- a/actor-typed/src/main/scala/org/apache/pekko/actor/typed/internal/routing/PoolRouterImpl.scala
+++ b/actor-typed/src/main/scala/org/apache/pekko/actor/typed/internal/routing/PoolRouterImpl.scala
@@ -17,6 +17,7 @@ import java.util.function
import java.util.function.Predicate
import org.apache.pekko
+
import pekko.actor.typed._
import pekko.actor.typed.javadsl.PoolRouter
import pekko.actor.typed.scaladsl.{ AbstractBehavior, ActorContext, Behaviors }
diff --git a/actor-typed/src/main/scala/org/apache/pekko/actor/typed/internal/routing/RoutingLogic.scala b/actor-typed/src/main/scala/org/apache/pekko/actor/typed/internal/routing/RoutingLogic.scala
index e06b1e598e..ece614824a 100644
--- a/actor-typed/src/main/scala/org/apache/pekko/actor/typed/internal/routing/RoutingLogic.scala
+++ b/actor-typed/src/main/scala/org/apache/pekko/actor/typed/internal/routing/RoutingLogic.scala
@@ -16,6 +16,7 @@ package org.apache.pekko.actor.typed.internal.routing
import java.util.concurrent.ThreadLocalRandom
import org.apache.pekko
+
import pekko.actor.Address
import pekko.actor.typed.ActorRef
import pekko.annotation.InternalApi
diff --git a/actor-typed/src/main/scala/org/apache/pekko/actor/typed/javadsl/AbstractBehavior.scala b/actor-typed/src/main/scala/org/apache/pekko/actor/typed/javadsl/AbstractBehavior.scala
index 0b8a204156..4f8167ab29 100644
--- a/actor-typed/src/main/scala/org/apache/pekko/actor/typed/javadsl/AbstractBehavior.scala
+++ b/actor-typed/src/main/scala/org/apache/pekko/actor/typed/javadsl/AbstractBehavior.scala
@@ -14,6 +14,7 @@
package org.apache.pekko.actor.typed.javadsl
import org.apache.pekko
+
import pekko.actor.typed.{ Behavior, ExtensibleBehavior, Signal, TypedActorContext }
import pekko.util.OptionVal
diff --git a/actor-typed/src/main/scala/org/apache/pekko/actor/typed/javadsl/AbstractMatchingBehavior.scala b/actor-typed/src/main/scala/org/apache/pekko/actor/typed/javadsl/AbstractMatchingBehavior.scala
index c0e0762f53..ef7b384c0f 100644
--- a/actor-typed/src/main/scala/org/apache/pekko/actor/typed/javadsl/AbstractMatchingBehavior.scala
+++ b/actor-typed/src/main/scala/org/apache/pekko/actor/typed/javadsl/AbstractMatchingBehavior.scala
@@ -14,6 +14,7 @@
package org.apache.pekko.actor.typed.javadsl
import org.apache.pekko
+
import pekko.actor.typed.{ Behavior, ExtensibleBehavior, MessageAdaptionFailure, Signal, TypedActorContext }
/**
diff --git a/actor-typed/src/main/scala/org/apache/pekko/actor/typed/javadsl/ActorContext.scala b/actor-typed/src/main/scala/org/apache/pekko/actor/typed/javadsl/ActorContext.scala
index 4c5d3519c3..6bcbf10b21 100644
--- a/actor-typed/src/main/scala/org/apache/pekko/actor/typed/javadsl/ActorContext.scala
+++ b/actor-typed/src/main/scala/org/apache/pekko/actor/typed/javadsl/ActorContext.scala
@@ -20,13 +20,14 @@ import java.util.concurrent.CompletionStage
import scala.concurrent.ExecutionContextExecutor
import org.apache.pekko
+
+import org.slf4j.Logger
+
import pekko.actor.ClassicActorContextProvider
import pekko.actor.typed._
import pekko.annotation.DoNotInherit
import pekko.pattern.StatusReply
-import org.slf4j.Logger
-
/**
* An Actor is given by the combination of a [[Behavior]] and a context in
* which this behavior is executed. As per the Actor Model an Actor can perform
diff --git a/actor-typed/src/main/scala/org/apache/pekko/actor/typed/javadsl/Adapter.scala b/actor-typed/src/main/scala/org/apache/pekko/actor/typed/javadsl/Adapter.scala
index 4aa942d4b7..98c090cdb7 100644
--- a/actor-typed/src/main/scala/org/apache/pekko/actor/typed/javadsl/Adapter.scala
+++ b/actor-typed/src/main/scala/org/apache/pekko/actor/typed/javadsl/Adapter.scala
@@ -14,6 +14,7 @@
package org.apache.pekko.actor.typed.javadsl
import org.apache.pekko
+
import pekko.actor
import pekko.actor.typed.ActorRef
import pekko.actor.typed.ActorSystem
diff --git a/actor-typed/src/main/scala/org/apache/pekko/actor/typed/javadsl/AskPattern.scala b/actor-typed/src/main/scala/org/apache/pekko/actor/typed/javadsl/AskPattern.scala
index 58b47af6b3..6833f2c38e 100644
--- a/actor-typed/src/main/scala/org/apache/pekko/actor/typed/javadsl/AskPattern.scala
+++ b/actor-typed/src/main/scala/org/apache/pekko/actor/typed/javadsl/AskPattern.scala
@@ -21,6 +21,7 @@ import scala.jdk.DurationConverters._
import scala.jdk.FutureConverters._
import org.apache.pekko
+
import pekko.actor.typed.Scheduler
import pekko.actor.typed.scaladsl.AskPattern._
import pekko.japi.function.{ Function => JFunction }
diff --git a/actor-typed/src/main/scala/org/apache/pekko/actor/typed/javadsl/BehaviorBuilder.scala b/actor-typed/src/main/scala/org/apache/pekko/actor/typed/javadsl/BehaviorBuilder.scala
index a8e4a5dd56..962df65080 100644
--- a/actor-typed/src/main/scala/org/apache/pekko/actor/typed/javadsl/BehaviorBuilder.scala
+++ b/actor-typed/src/main/scala/org/apache/pekko/actor/typed/javadsl/BehaviorBuilder.scala
@@ -15,9 +15,9 @@ package org.apache.pekko.actor.typed.javadsl
import scala.annotation.tailrec
-import BehaviorBuilder._
-
import org.apache.pekko
+
+import BehaviorBuilder._
import pekko.actor.typed.Behavior
import pekko.actor.typed.ExtensibleBehavior
import pekko.actor.typed.Signal
diff --git a/actor-typed/src/main/scala/org/apache/pekko/actor/typed/javadsl/Behaviors.scala b/actor-typed/src/main/scala/org/apache/pekko/actor/typed/javadsl/Behaviors.scala
index 41e8a8b678..3196351a7c 100644
--- a/actor-typed/src/main/scala/org/apache/pekko/actor/typed/javadsl/Behaviors.scala
+++ b/actor-typed/src/main/scala/org/apache/pekko/actor/typed/javadsl/Behaviors.scala
@@ -21,6 +21,7 @@ import scala.jdk.CollectionConverters._
import scala.reflect.ClassTag
import org.apache.pekko
+
import pekko.actor.typed._
import pekko.actor.typed.internal.{ BehaviorImpl, StashBufferImpl, TimerSchedulerImpl, WithMdcBehaviorInterceptor }
import pekko.japi.function.{ Effect, Function2 => JapiFunction2 }
diff --git a/actor-typed/src/main/scala/org/apache/pekko/actor/typed/javadsl/Receive.scala b/actor-typed/src/main/scala/org/apache/pekko/actor/typed/javadsl/Receive.scala
index f09bde29c9..118b5bc6d1 100644
--- a/actor-typed/src/main/scala/org/apache/pekko/actor/typed/javadsl/Receive.scala
+++ b/actor-typed/src/main/scala/org/apache/pekko/actor/typed/javadsl/Receive.scala
@@ -14,6 +14,7 @@
package org.apache.pekko.actor.typed.javadsl
import org.apache.pekko
+
import pekko.actor.typed.Behavior
import pekko.actor.typed.ExtensibleBehavior
import pekko.actor.typed.Signal
diff --git a/actor-typed/src/main/scala/org/apache/pekko/actor/typed/javadsl/ReceiveBuilder.scala b/actor-typed/src/main/scala/org/apache/pekko/actor/typed/javadsl/ReceiveBuilder.scala
index fa706b65fb..c01fb6eb23 100644
--- a/actor-typed/src/main/scala/org/apache/pekko/actor/typed/javadsl/ReceiveBuilder.scala
+++ b/actor-typed/src/main/scala/org/apache/pekko/actor/typed/javadsl/ReceiveBuilder.scala
@@ -16,6 +16,7 @@ package org.apache.pekko.actor.typed.javadsl
import scala.annotation.tailrec
import org.apache.pekko
+
import pekko.actor.typed.{ Behavior, MessageAdaptionFailure, Signal }
import pekko.annotation.InternalApi
import pekko.japi.function.{ Creator, Function => JFunction, Predicate => JPredicate }
diff --git a/actor-typed/src/main/scala/org/apache/pekko/actor/typed/javadsl/Routers.scala b/actor-typed/src/main/scala/org/apache/pekko/actor/typed/javadsl/Routers.scala
index 0bdbf7e3f0..b4af40d28d 100644
--- a/actor-typed/src/main/scala/org/apache/pekko/actor/typed/javadsl/Routers.scala
+++ b/actor-typed/src/main/scala/org/apache/pekko/actor/typed/javadsl/Routers.scala
@@ -16,6 +16,7 @@ package org.apache.pekko.actor.typed.javadsl
import java.util.function.Predicate
import org.apache.pekko
+
import pekko.actor.typed.{ Behavior, Props }
import pekko.actor.typed.internal.BehaviorImpl.DeferredBehavior
import pekko.actor.typed.internal.routing.{ GroupRouterBuilder, PoolRouterBuilder }
diff --git a/actor-typed/src/main/scala/org/apache/pekko/actor/typed/javadsl/StashBuffer.scala b/actor-typed/src/main/scala/org/apache/pekko/actor/typed/javadsl/StashBuffer.scala
index 1ddf7f4b81..4173b7a3c9 100644
--- a/actor-typed/src/main/scala/org/apache/pekko/actor/typed/javadsl/StashBuffer.scala
+++ b/actor-typed/src/main/scala/org/apache/pekko/actor/typed/javadsl/StashBuffer.scala
@@ -16,7 +16,8 @@ package org.apache.pekko.actor.typed.javadsl
import java.util.function.{ Function => JFunction, Predicate }
import org.apache.pekko
-import pekko.actor.typed.{ scaladsl, Behavior }
+
+import pekko.actor.typed.{ Behavior, scaladsl }
import pekko.annotation.DoNotInherit
import pekko.japi.function.Procedure
diff --git a/actor-typed/src/main/scala/org/apache/pekko/actor/typed/pubsub/Topic.scala b/actor-typed/src/main/scala/org/apache/pekko/actor/typed/pubsub/Topic.scala
index 10cd1ddc07..166dd6a477 100644
--- a/actor-typed/src/main/scala/org/apache/pekko/actor/typed/pubsub/Topic.scala
+++ b/actor-typed/src/main/scala/org/apache/pekko/actor/typed/pubsub/Topic.scala
@@ -16,6 +16,7 @@ package org.apache.pekko.actor.typed.pubsub
import scala.reflect.ClassTag
import org.apache.pekko
+
import pekko.actor.typed.ActorRef
import pekko.actor.typed.Behavior
import pekko.actor.typed.internal.pubsub.TopicImpl
diff --git a/actor-typed/src/main/scala/org/apache/pekko/actor/typed/receptionist/Receptionist.scala b/actor-typed/src/main/scala/org/apache/pekko/actor/typed/receptionist/Receptionist.scala
index 89fa1469d2..98ccf4fb40 100644
--- a/actor-typed/src/main/scala/org/apache/pekko/actor/typed/receptionist/Receptionist.scala
+++ b/actor-typed/src/main/scala/org/apache/pekko/actor/typed/receptionist/Receptionist.scala
@@ -17,6 +17,7 @@ import scala.jdk.CollectionConverters._
import scala.reflect.ClassTag
import org.apache.pekko
+
import pekko.actor.typed.{ ActorRef, ActorSystem, Extension, ExtensionId, ExtensionSetup }
import pekko.actor.typed.internal.receptionist._
import pekko.annotation.DoNotInherit
diff --git a/actor-typed/src/main/scala/org/apache/pekko/actor/typed/scaladsl/AbstractBehavior.scala b/actor-typed/src/main/scala/org/apache/pekko/actor/typed/scaladsl/AbstractBehavior.scala
index 490c04078d..ef61ff3e48 100644
--- a/actor-typed/src/main/scala/org/apache/pekko/actor/typed/scaladsl/AbstractBehavior.scala
+++ b/actor-typed/src/main/scala/org/apache/pekko/actor/typed/scaladsl/AbstractBehavior.scala
@@ -14,6 +14,7 @@
package org.apache.pekko.actor.typed.scaladsl
import org.apache.pekko
+
import pekko.actor.typed.{ Behavior, ExtensibleBehavior, Signal, TypedActorContext }
import pekko.actor.typed.MessageAdaptionFailure
diff --git a/actor-typed/src/main/scala/org/apache/pekko/actor/typed/scaladsl/ActorContext.scala b/actor-typed/src/main/scala/org/apache/pekko/actor/typed/scaladsl/ActorContext.scala
index e7565d03e7..5811581eb2 100644
--- a/actor-typed/src/main/scala/org/apache/pekko/actor/typed/scaladsl/ActorContext.scala
+++ b/actor-typed/src/main/scala/org/apache/pekko/actor/typed/scaladsl/ActorContext.scala
@@ -13,12 +13,15 @@
package org.apache.pekko.actor.typed.scaladsl
-import scala.concurrent.{ ExecutionContextExecutor, Future }
import scala.concurrent.duration.FiniteDuration
+import scala.concurrent.{ ExecutionContextExecutor, Future }
import scala.reflect.ClassTag
import scala.util.Try
import org.apache.pekko
+
+import org.slf4j.Logger
+
import pekko.actor.ClassicActorContextProvider
import pekko.actor.typed._
import pekko.annotation.DoNotInherit
@@ -26,8 +29,6 @@ import pekko.annotation.InternalApi
import pekko.pattern.StatusReply
import pekko.util.Timeout
-import org.slf4j.Logger
-
/**
* An Actor is given by the combination of a [[Behavior]] and a context in
* which this behavior is executed. As per the Actor Model an Actor can perform
diff --git a/actor-typed/src/main/scala/org/apache/pekko/actor/typed/scaladsl/AskPattern.scala b/actor-typed/src/main/scala/org/apache/pekko/actor/typed/scaladsl/AskPattern.scala
index 1fff9cc5b9..fef3c94d43 100644
--- a/actor-typed/src/main/scala/org/apache/pekko/actor/typed/scaladsl/AskPattern.scala
+++ b/actor-typed/src/main/scala/org/apache/pekko/actor/typed/scaladsl/AskPattern.scala
@@ -19,6 +19,7 @@ import scala.annotation.nowarn
import scala.concurrent.Future
import org.apache.pekko
+
import pekko.actor.typed.ActorRef
import pekko.actor.typed.ActorSystem
import pekko.actor.typed.RecipientRef
diff --git a/actor-typed/src/main/scala/org/apache/pekko/actor/typed/scaladsl/Behaviors.scala b/actor-typed/src/main/scala/org/apache/pekko/actor/typed/scaladsl/Behaviors.scala
index bfeb470389..3f30081edf 100644
--- a/actor-typed/src/main/scala/org/apache/pekko/actor/typed/scaladsl/Behaviors.scala
+++ b/actor-typed/src/main/scala/org/apache/pekko/actor/typed/scaladsl/Behaviors.scala
@@ -17,6 +17,7 @@ package scaladsl
import scala.reflect.ClassTag
import org.apache.pekko
+
import pekko.actor.typed.SuperviseBehavior
import pekko.actor.typed.internal._
import pekko.annotation.{ DoNotInherit, InternalApi }
diff --git a/actor-typed/src/main/scala/org/apache/pekko/actor/typed/scaladsl/Routers.scala b/actor-typed/src/main/scala/org/apache/pekko/actor/typed/scaladsl/Routers.scala
index abbe5d0046..0d9ff90b91 100644
--- a/actor-typed/src/main/scala/org/apache/pekko/actor/typed/scaladsl/Routers.scala
+++ b/actor-typed/src/main/scala/org/apache/pekko/actor/typed/scaladsl/Routers.scala
@@ -14,6 +14,7 @@
package org.apache.pekko.actor.typed.scaladsl
import org.apache.pekko
+
import pekko.actor.typed.{ Behavior, Props }
import pekko.actor.typed.internal.routing.{ GroupRouterBuilder, PoolRouterBuilder }
import pekko.actor.typed.receptionist.ServiceKey
diff --git a/actor-typed/src/main/scala/org/apache/pekko/actor/typed/scaladsl/StashBuffer.scala b/actor-typed/src/main/scala/org/apache/pekko/actor/typed/scaladsl/StashBuffer.scala
index acc28f52d3..a94ab3d3e6 100644
--- a/actor-typed/src/main/scala/org/apache/pekko/actor/typed/scaladsl/StashBuffer.scala
+++ b/actor-typed/src/main/scala/org/apache/pekko/actor/typed/scaladsl/StashBuffer.scala
@@ -14,6 +14,7 @@
package org.apache.pekko.actor.typed.scaladsl
import org.apache.pekko
+
import pekko.actor.typed.Behavior
import pekko.actor.typed.internal.StashBufferImpl
import pekko.annotation.{ DoNotInherit, InternalApi }
diff --git a/actor-typed/src/main/scala/org/apache/pekko/actor/typed/scaladsl/adapter/PropsAdapter.scala b/actor-typed/src/main/scala/org/apache/pekko/actor/typed/scaladsl/adapter/PropsAdapter.scala
index 5df5aad46a..be73c693d0 100644
--- a/actor-typed/src/main/scala/org/apache/pekko/actor/typed/scaladsl/adapter/PropsAdapter.scala
+++ b/actor-typed/src/main/scala/org/apache/pekko/actor/typed/scaladsl/adapter/PropsAdapter.scala
@@ -14,6 +14,7 @@
package org.apache.pekko.actor.typed.scaladsl.adapter
import org.apache.pekko
+
import pekko.actor.typed.Behavior
import pekko.actor.typed.Props
import pekko.actor.typed.SupervisorStrategy
diff --git a/actor-typed/src/main/scala/org/apache/pekko/actor/typed/scaladsl/adapter/package.scala b/actor-typed/src/main/scala/org/apache/pekko/actor/typed/scaladsl/adapter/package.scala
index 99b1039c54..b0a561c3ad 100644
--- a/actor-typed/src/main/scala/org/apache/pekko/actor/typed/scaladsl/adapter/package.scala
+++ b/actor-typed/src/main/scala/org/apache/pekko/actor/typed/scaladsl/adapter/package.scala
@@ -15,6 +15,7 @@ package org.apache.pekko.actor.typed
package scaladsl
import org.apache.pekko
+
import pekko.actor.ExtendedActorSystem
import pekko.actor.typed.internal.adapter.{ PropsAdapter => _, _ }
import pekko.annotation.InternalApi
diff --git a/actor/src/main/scala/org/apache/pekko/actor/AbstractActor.scala b/actor/src/main/scala/org/apache/pekko/actor/AbstractActor.scala
index 7bb3ce71a0..6c09a97689 100644
--- a/actor/src/main/scala/org/apache/pekko/actor/AbstractActor.scala
+++ b/actor/src/main/scala/org/apache/pekko/actor/AbstractActor.scala
@@ -20,6 +20,7 @@ import scala.concurrent.duration.{ Duration, FiniteDuration }
import scala.runtime.BoxedUnit
import org.apache.pekko
+
import pekko.annotation.DoNotInherit
import pekko.dispatch.{
DequeBasedMessageQueueSemantics,
diff --git a/actor/src/main/scala/org/apache/pekko/actor/AbstractFSM.scala b/actor/src/main/scala/org/apache/pekko/actor/AbstractFSM.scala
index fd26155ced..7a2fd67bcf 100644
--- a/actor/src/main/scala/org/apache/pekko/actor/AbstractFSM.scala
+++ b/actor/src/main/scala/org/apache/pekko/actor/AbstractFSM.scala
@@ -17,6 +17,7 @@ import scala.concurrent.duration.FiniteDuration
import scala.jdk.DurationConverters._
import org.apache.pekko
+
import pekko.japi.function.{ Effect, Function2, Predicate, Predicate2, Procedure, Procedure2, Procedure3 }
/**
diff --git a/actor/src/main/scala/org/apache/pekko/actor/AbstractProps.scala b/actor/src/main/scala/org/apache/pekko/actor/AbstractProps.scala
index bff3f4f22f..e837002184 100644
--- a/actor/src/main/scala/org/apache/pekko/actor/AbstractProps.scala
+++ b/actor/src/main/scala/org/apache/pekko/actor/AbstractProps.scala
@@ -20,6 +20,7 @@ import scala.annotation.tailrec
import scala.annotation.varargs
import org.apache.pekko
+
import pekko.japi.function.Creator
/**
diff --git a/actor/src/main/scala/org/apache/pekko/actor/Actor.scala b/actor/src/main/scala/org/apache/pekko/actor/Actor.scala
index 404c7e40e0..567b35a169 100644
--- a/actor/src/main/scala/org/apache/pekko/actor/Actor.scala
+++ b/actor/src/main/scala/org/apache/pekko/actor/Actor.scala
@@ -21,6 +21,7 @@ import scala.beans.BeanProperty
import scala.util.control.NoStackTrace
import org.apache.pekko
+
import pekko.PekkoException
import pekko.annotation.InternalApi
import pekko.event.LoggingAdapter
diff --git a/actor/src/main/scala/org/apache/pekko/actor/ActorCell.scala b/actor/src/main/scala/org/apache/pekko/actor/ActorCell.scala
index 7d36e05889..d2131361da 100644
--- a/actor/src/main/scala/org/apache/pekko/actor/ActorCell.scala
+++ b/actor/src/main/scala/org/apache/pekko/actor/ActorCell.scala
@@ -16,14 +16,15 @@ package org.apache.pekko.actor
import java.io.{ NotSerializableException, ObjectOutputStream }
import java.util.concurrent.ThreadLocalRandom
-import scala.annotation.{ switch, tailrec }
import scala.annotation.nowarn
+import scala.annotation.{ switch, tailrec }
import scala.collection.immutable
import scala.concurrent.ExecutionContextExecutor
import scala.concurrent.duration.Duration
import scala.util.control.NonFatal
import org.apache.pekko
+
import pekko.actor.dungeon.ChildrenContainer
import pekko.annotation.{ InternalApi, InternalStableApi }
import pekko.dispatch.{ Envelope, MessageDispatcher }
diff --git a/actor/src/main/scala/org/apache/pekko/actor/ActorLogMarker.scala b/actor/src/main/scala/org/apache/pekko/actor/ActorLogMarker.scala
index 22f13abeb5..ee2e2d0694 100644
--- a/actor/src/main/scala/org/apache/pekko/actor/ActorLogMarker.scala
+++ b/actor/src/main/scala/org/apache/pekko/actor/ActorLogMarker.scala
@@ -14,6 +14,7 @@
package org.apache.pekko.actor
import org.apache.pekko
+
import pekko.annotation.ApiMayChange
import pekko.event.LogMarker
diff --git a/actor/src/main/scala/org/apache/pekko/actor/ActorRef.scala b/actor/src/main/scala/org/apache/pekko/actor/ActorRef.scala
index 9f34739009..0ac55cd8e1 100644
--- a/actor/src/main/scala/org/apache/pekko/actor/ActorRef.scala
+++ b/actor/src/main/scala/org/apache/pekko/actor/ActorRef.scala
@@ -20,6 +20,7 @@ import scala.collection.immutable
import scala.util.control.NonFatal
import org.apache.pekko
+
import pekko.annotation.DoNotInherit
import pekko.annotation.InternalApi
import pekko.dispatch._
diff --git a/actor/src/main/scala/org/apache/pekko/actor/ActorRefProvider.scala b/actor/src/main/scala/org/apache/pekko/actor/ActorRefProvider.scala
index 8655e38bf8..8d8eee6d29 100644
--- a/actor/src/main/scala/org/apache/pekko/actor/ActorRefProvider.scala
+++ b/actor/src/main/scala/org/apache/pekko/actor/ActorRefProvider.scala
@@ -20,6 +20,7 @@ import scala.concurrent.{ ExecutionContextExecutor, Future, Promise }
import scala.util.control.NonFatal
import org.apache.pekko
+
import pekko.ConfigurationException
import pekko.annotation.DoNotInherit
import pekko.annotation.InternalApi
diff --git a/actor/src/main/scala/org/apache/pekko/actor/ActorSelection.scala b/actor/src/main/scala/org/apache/pekko/actor/ActorSelection.scala
index 7facfe2e65..fa09afea13 100644
--- a/actor/src/main/scala/org/apache/pekko/actor/ActorSelection.scala
+++ b/actor/src/main/scala/org/apache/pekko/actor/ActorSelection.scala
@@ -27,6 +27,7 @@ import scala.language.implicitConversions
import scala.util.Success
import org.apache.pekko
+
import pekko.pattern.ask
import pekko.routing.MurmurHash
import pekko.util.{ Helpers, Timeout }
diff --git a/actor/src/main/scala/org/apache/pekko/actor/ActorSystem.scala b/actor/src/main/scala/org/apache/pekko/actor/ActorSystem.scala
index 9c5accd751..ef01b767c7 100644
--- a/actor/src/main/scala/org/apache/pekko/actor/ActorSystem.scala
+++ b/actor/src/main/scala/org/apache/pekko/actor/ActorSystem.scala
@@ -20,17 +20,20 @@ import java.util.concurrent.atomic.AtomicReference
import scala.annotation.tailrec
import scala.collection.immutable
-import scala.concurrent.{ Await, ExecutionContext, ExecutionContextExecutor, Future, Promise }
import scala.concurrent.blocking
import scala.concurrent.duration.Duration
+import scala.concurrent.{ Await, ExecutionContext, ExecutionContextExecutor, Future, Promise }
import scala.jdk.CollectionConverters._
import scala.jdk.DurationConverters._
import scala.jdk.FutureConverters._
import scala.jdk.OptionConverters._
-import scala.util.{ Failure, Success, Try }
import scala.util.control.{ ControlThrowable, NonFatal }
+import scala.util.{ Failure, Success, Try }
import org.apache.pekko
+
+import com.typesafe.config.{ Config, ConfigFactory }
+
import pekko.ConfigurationException
import pekko.actor.dungeon.ChildrenContainer
import pekko.actor.setup.{ ActorSystemSetup, Setup }
@@ -44,8 +47,6 @@ import pekko.serialization.SerializationExtension
import pekko.util._
import pekko.util.Helpers.toRootLowerCase
-import com.typesafe.config.{ Config, ConfigFactory }
-
object BootstrapSetup {
/**
diff --git a/actor/src/main/scala/org/apache/pekko/actor/Address.scala b/actor/src/main/scala/org/apache/pekko/actor/Address.scala
index 96af95ef0c..ad34389813 100644
--- a/actor/src/main/scala/org/apache/pekko/actor/Address.scala
+++ b/actor/src/main/scala/org/apache/pekko/actor/Address.scala
@@ -23,6 +23,7 @@ import scala.collection.immutable
import scala.jdk.OptionConverters._
import org.apache.pekko
+
import pekko.annotation.InternalApi
/**
diff --git a/actor/src/main/scala/org/apache/pekko/actor/ClassicActorSystemProvider.scala b/actor/src/main/scala/org/apache/pekko/actor/ClassicActorSystemProvider.scala
index 550399b145..3c1a55f252 100644
--- a/actor/src/main/scala/org/apache/pekko/actor/ClassicActorSystemProvider.scala
+++ b/actor/src/main/scala/org/apache/pekko/actor/ClassicActorSystemProvider.scala
@@ -14,6 +14,7 @@
package org.apache.pekko.actor
import org.apache.pekko
+
import pekko.annotation.DoNotInherit
import pekko.annotation.InternalApi
diff --git a/actor/src/main/scala/org/apache/pekko/actor/CoordinatedShutdown.scala b/actor/src/main/scala/org/apache/pekko/actor/CoordinatedShutdown.scala
index e11b514d35..fd1fcdcf55 100644
--- a/actor/src/main/scala/org/apache/pekko/actor/CoordinatedShutdown.scala
+++ b/actor/src/main/scala/org/apache/pekko/actor/CoordinatedShutdown.scala
@@ -14,30 +14,31 @@
package org.apache.pekko.actor
import java.util.Optional
-import java.util.concurrent._
import java.util.concurrent.TimeUnit.MILLISECONDS
+import java.util.concurrent._
import java.util.concurrent.atomic.AtomicReference
import java.util.function.Supplier
import scala.annotation.tailrec
-import scala.concurrent.{ Await, ExecutionContext, Future, Promise }
-import scala.concurrent.duration._
import scala.concurrent.duration.FiniteDuration
+import scala.concurrent.duration._
+import scala.concurrent.{ Await, ExecutionContext, Future, Promise }
import scala.jdk.FutureConverters._
import scala.jdk.OptionConverters._
import scala.util.Try
import scala.util.control.NonFatal
import org.apache.pekko
+
+import com.typesafe.config.Config
+import com.typesafe.config.ConfigFactory
+
import pekko.Done
import pekko.annotation.InternalApi
import pekko.event.Logging
import pekko.pattern.after
import pekko.util.OptionVal
-import com.typesafe.config.Config
-import com.typesafe.config.ConfigFactory
-
object CoordinatedShutdown extends ExtensionId[CoordinatedShutdown] with ExtensionIdProvider {
/**
diff --git a/actor/src/main/scala/org/apache/pekko/actor/Deployer.scala b/actor/src/main/scala/org/apache/pekko/actor/Deployer.scala
index deb8b89133..33dad6169b 100644
--- a/actor/src/main/scala/org/apache/pekko/actor/Deployer.scala
+++ b/actor/src/main/scala/org/apache/pekko/actor/Deployer.scala
@@ -19,12 +19,13 @@ import scala.annotation.nowarn
import scala.annotation.tailrec
import org.apache.pekko
+
+import com.typesafe.config._
+
import pekko.annotation.InternalApi
import pekko.routing._
import pekko.util.WildcardIndex
-import com.typesafe.config._
-
object Deploy {
final val NoDispatcherGiven = ""
final val NoMailboxGiven = ""
diff --git a/actor/src/main/scala/org/apache/pekko/actor/DynamicAccess.scala b/actor/src/main/scala/org/apache/pekko/actor/DynamicAccess.scala
index dd89062f80..caea889951 100644
--- a/actor/src/main/scala/org/apache/pekko/actor/DynamicAccess.scala
+++ b/actor/src/main/scala/org/apache/pekko/actor/DynamicAccess.scala
@@ -18,6 +18,7 @@ import scala.reflect.ClassTag
import scala.util.Try
import org.apache.pekko
+
import pekko.annotation.DoNotInherit
/**
diff --git a/actor/src/main/scala/org/apache/pekko/actor/FSM.scala b/actor/src/main/scala/org/apache/pekko/actor/FSM.scala
index 8f3fe318b6..8f5523c62e 100644
--- a/actor/src/main/scala/org/apache/pekko/actor/FSM.scala
+++ b/actor/src/main/scala/org/apache/pekko/actor/FSM.scala
@@ -16,13 +16,13 @@ package org.apache.pekko.actor
import scala.annotation.nowarn
import scala.collection.mutable
import scala.concurrent.ExecutionContextExecutor
-import scala.concurrent.duration._
import scala.concurrent.duration.Duration
import scala.concurrent.duration.FiniteDuration
-
-import language.implicitConversions
+import scala.concurrent.duration._
import org.apache.pekko
+
+import language.implicitConversions
import pekko.annotation.InternalApi
import pekko.routing.{ Deafen, Listen, Listeners }
diff --git a/actor/src/main/scala/org/apache/pekko/actor/FaultHandling.scala b/actor/src/main/scala/org/apache/pekko/actor/FaultHandling.scala
index 73b97fb7f6..020d7494d6 100644
--- a/actor/src/main/scala/org/apache/pekko/actor/FaultHandling.scala
+++ b/actor/src/main/scala/org/apache/pekko/actor/FaultHandling.scala
@@ -13,8 +13,8 @@
package org.apache.pekko.actor
-import java.lang.{ Iterable => JIterable }
import java.lang.reflect.InvocationTargetException
+import java.lang.{ Iterable => JIterable }
import java.util.concurrent.TimeUnit
import scala.collection.immutable
@@ -25,6 +25,7 @@ import scala.language.implicitConversions
import scala.util.control.NonFatal
import org.apache.pekko
+
import pekko.annotation.InternalApi
import pekko.event.Logging
import pekko.event.Logging.{ Error, LogEvent, LogLevel }
diff --git a/actor/src/main/scala/org/apache/pekko/actor/IndirectActorProducer.scala b/actor/src/main/scala/org/apache/pekko/actor/IndirectActorProducer.scala
index 0c011c293b..15d16b0bb4 100644
--- a/actor/src/main/scala/org/apache/pekko/actor/IndirectActorProducer.scala
+++ b/actor/src/main/scala/org/apache/pekko/actor/IndirectActorProducer.scala
@@ -17,6 +17,7 @@ import scala.annotation.nowarn
import scala.collection.immutable
import org.apache.pekko
+
import pekko.japi.function.Creator
import pekko.util.Reflect
diff --git a/actor/src/main/scala/org/apache/pekko/actor/LightArrayRevolverScheduler.scala b/actor/src/main/scala/org/apache/pekko/actor/LightArrayRevolverScheduler.scala
index 2d4e409501..9a97ef5a28 100644
--- a/actor/src/main/scala/org/apache/pekko/actor/LightArrayRevolverScheduler.scala
+++ b/actor/src/main/scala/org/apache/pekko/actor/LightArrayRevolverScheduler.scala
@@ -20,18 +20,19 @@ import java.util.concurrent.atomic.{ AtomicLong, AtomicReference }
import scala.annotation.tailrec
import scala.collection.immutable
-import scala.concurrent.{ Await, ExecutionContext, Future, Promise }
import scala.concurrent.duration._
+import scala.concurrent.{ Await, ExecutionContext, Future, Promise }
import scala.util.control.NonFatal
import org.apache.pekko
+
+import com.typesafe.config.Config
+
import pekko.actor.Scheduler.AtomicCancellable
import pekko.dispatch.AbstractNodeQueue
import pekko.event.LoggingAdapter
import pekko.util.Helpers
-import com.typesafe.config.Config
-
/**
* This scheduler implementation is based on a revolving wheel of buckets,
* like Netty’s HashedWheelTimer, which it advances at a fixed tick rate and
diff --git a/actor/src/main/scala/org/apache/pekko/actor/Props.scala b/actor/src/main/scala/org/apache/pekko/actor/Props.scala
index 2d8c4abf46..cbe5064921 100644
--- a/actor/src/main/scala/org/apache/pekko/actor/Props.scala
+++ b/actor/src/main/scala/org/apache/pekko/actor/Props.scala
@@ -18,6 +18,7 @@ import scala.collection.immutable
import scala.reflect.ClassTag
import org.apache.pekko
+
import pekko.actor.Deploy.{ NoDispatcherGiven, NoMailboxGiven }
import pekko.dispatch._
import pekko.routing._
diff --git a/actor/src/main/scala/org/apache/pekko/actor/ReflectiveDynamicAccess.scala b/actor/src/main/scala/org/apache/pekko/actor/ReflectiveDynamicAccess.scala
index 14d1aeb211..d8f753d3f6 100644
--- a/actor/src/main/scala/org/apache/pekko/actor/ReflectiveDynamicAccess.scala
+++ b/actor/src/main/scala/org/apache/pekko/actor/ReflectiveDynamicAccess.scala
@@ -22,6 +22,7 @@ import scala.util.Failure
import scala.util.Try
import org.apache.pekko
+
import pekko.annotation.DoNotInherit
/**
diff --git a/actor/src/main/scala/org/apache/pekko/actor/RepointableActorRef.scala b/actor/src/main/scala/org/apache/pekko/actor/RepointableActorRef.scala
index 5767188b8f..fad369d18b 100644
--- a/actor/src/main/scala/org/apache/pekko/actor/RepointableActorRef.scala
+++ b/actor/src/main/scala/org/apache/pekko/actor/RepointableActorRef.scala
@@ -13,8 +13,8 @@
package org.apache.pekko.actor
-import java.util.{ LinkedList => JLinkedList }
import java.util.concurrent.locks.ReentrantLock
+import java.util.{ LinkedList => JLinkedList }
import scala.annotation.nowarn
import scala.annotation.tailrec
@@ -22,6 +22,7 @@ import scala.collection.immutable
import scala.util.control.NonFatal
import org.apache.pekko
+
import pekko.actor.dungeon.ChildrenContainer
import pekko.dispatch._
import pekko.dispatch.sysmsg._
diff --git a/actor/src/main/scala/org/apache/pekko/actor/Scheduler.scala b/actor/src/main/scala/org/apache/pekko/actor/Scheduler.scala
index c6b36af79d..065b6c3769 100644
--- a/actor/src/main/scala/org/apache/pekko/actor/Scheduler.scala
+++ b/actor/src/main/scala/org/apache/pekko/actor/Scheduler.scala
@@ -21,6 +21,7 @@ import scala.concurrent.duration._
import scala.util.control.NoStackTrace
import org.apache.pekko
+
import pekko.actor.Scheduler.AtomicCancellable
import pekko.annotation.InternalApi
diff --git a/actor/src/main/scala/org/apache/pekko/actor/Stash.scala b/actor/src/main/scala/org/apache/pekko/actor/Stash.scala
index 104962a103..4e681718d0 100644
--- a/actor/src/main/scala/org/apache/pekko/actor/Stash.scala
+++ b/actor/src/main/scala/org/apache/pekko/actor/Stash.scala
@@ -17,6 +17,7 @@ import scala.collection.immutable
import scala.util.control.NoStackTrace
import org.apache.pekko
+
import pekko.PekkoException
import pekko.annotation.InternalStableApi
import pekko.dispatch.{
diff --git a/actor/src/main/scala/org/apache/pekko/actor/Timers.scala b/actor/src/main/scala/org/apache/pekko/actor/Timers.scala
index c75574be4d..b650b42710 100644
--- a/actor/src/main/scala/org/apache/pekko/actor/Timers.scala
+++ b/actor/src/main/scala/org/apache/pekko/actor/Timers.scala
@@ -17,6 +17,7 @@ import scala.concurrent.duration.FiniteDuration
import scala.jdk.DurationConverters._
import org.apache.pekko
+
import pekko.annotation.DoNotInherit
import pekko.dispatch.Envelope
import pekko.util.OptionVal
diff --git a/actor/src/main/scala/org/apache/pekko/actor/dungeon/Children.scala b/actor/src/main/scala/org/apache/pekko/actor/dungeon/Children.scala
index d6845ecf4e..2fb85eae5f 100644
--- a/actor/src/main/scala/org/apache/pekko/actor/dungeon/Children.scala
+++ b/actor/src/main/scala/org/apache/pekko/actor/dungeon/Children.scala
@@ -21,6 +21,7 @@ import scala.collection.immutable
import scala.util.control.NonFatal
import org.apache.pekko
+
import pekko.actor._
import pekko.annotation.InternalStableApi
import pekko.serialization.{ Serialization, SerializationExtension, Serializers }
diff --git a/actor/src/main/scala/org/apache/pekko/actor/dungeon/ChildrenContainer.scala b/actor/src/main/scala/org/apache/pekko/actor/dungeon/ChildrenContainer.scala
index bbba764ed9..911029a4ae 100644
--- a/actor/src/main/scala/org/apache/pekko/actor/dungeon/ChildrenContainer.scala
+++ b/actor/src/main/scala/org/apache/pekko/actor/dungeon/ChildrenContainer.scala
@@ -16,6 +16,7 @@ package org.apache.pekko.actor.dungeon
import scala.collection.immutable
import org.apache.pekko
+
import pekko.actor.{ ActorRef, ChildNameReserved, ChildRestartStats, ChildStats, InvalidActorNameException }
import pekko.util.Collections.{ EmptyImmutableSeq, PartialImmutableValuesIterable }
diff --git a/actor/src/main/scala/org/apache/pekko/actor/dungeon/DeathWatch.scala b/actor/src/main/scala/org/apache/pekko/actor/dungeon/DeathWatch.scala
index b7353d688a..a5acb11e3d 100644
--- a/actor/src/main/scala/org/apache/pekko/actor/dungeon/DeathWatch.scala
+++ b/actor/src/main/scala/org/apache/pekko/actor/dungeon/DeathWatch.scala
@@ -16,6 +16,7 @@ package org.apache.pekko.actor.dungeon
import scala.annotation.nowarn
import org.apache.pekko
+
import pekko.actor.{ Actor, ActorCell, ActorRef, ActorRefScope, Address, InternalActorRef, Terminated }
import pekko.dispatch.sysmsg.{ DeathWatchNotification, Unwatch, Watch }
import pekko.event.AddressTerminatedTopic
diff --git a/actor/src/main/scala/org/apache/pekko/actor/dungeon/Dispatch.scala b/actor/src/main/scala/org/apache/pekko/actor/dungeon/Dispatch.scala
index 03ab027db6..6ed4959cc2 100644
--- a/actor/src/main/scala/org/apache/pekko/actor/dungeon/Dispatch.scala
+++ b/actor/src/main/scala/org/apache/pekko/actor/dungeon/Dispatch.scala
@@ -15,10 +15,11 @@ package org.apache.pekko.actor.dungeon
import scala.annotation.nowarn
import scala.annotation.tailrec
-import scala.util.control.{ NoStackTrace, NonFatal }
import scala.util.control.Exception.Catcher
+import scala.util.control.{ NoStackTrace, NonFatal }
import org.apache.pekko
+
import pekko.PekkoException
import pekko.actor._
import pekko.annotation.InternalApi
diff --git a/actor/src/main/scala/org/apache/pekko/actor/dungeon/FaultHandling.scala b/actor/src/main/scala/org/apache/pekko/actor/dungeon/FaultHandling.scala
index 928c02bca6..3c13188206 100644
--- a/actor/src/main/scala/org/apache/pekko/actor/dungeon/FaultHandling.scala
+++ b/actor/src/main/scala/org/apache/pekko/actor/dungeon/FaultHandling.scala
@@ -18,6 +18,7 @@ import scala.util.control.Exception._
import scala.util.control.NonFatal
import org.apache.pekko
+
import pekko.actor.ActorCell
import pekko.actor.ActorInterruptedException
import pekko.actor.ActorRef
diff --git a/actor/src/main/scala/org/apache/pekko/actor/dungeon/ReceiveTimeout.scala b/actor/src/main/scala/org/apache/pekko/actor/dungeon/ReceiveTimeout.scala
index a8f4a67e65..ee7398189c 100644
--- a/actor/src/main/scala/org/apache/pekko/actor/dungeon/ReceiveTimeout.scala
+++ b/actor/src/main/scala/org/apache/pekko/actor/dungeon/ReceiveTimeout.scala
@@ -17,6 +17,7 @@ import scala.concurrent.duration.Duration
import scala.concurrent.duration.FiniteDuration
import org.apache.pekko
+
import pekko.actor.ActorCell
import pekko.actor.Cancellable
import pekko.actor.NotInfluenceReceiveTimeout
diff --git a/actor/src/main/scala/org/apache/pekko/actor/dungeon/TimerSchedulerImpl.scala b/actor/src/main/scala/org/apache/pekko/actor/dungeon/TimerSchedulerImpl.scala
index e1ea980f3c..4d4816669f 100644
--- a/actor/src/main/scala/org/apache/pekko/actor/dungeon/TimerSchedulerImpl.scala
+++ b/actor/src/main/scala/org/apache/pekko/actor/dungeon/TimerSchedulerImpl.scala
@@ -16,6 +16,7 @@ package org.apache.pekko.actor
import scala.concurrent.duration.FiniteDuration
import org.apache.pekko
+
import pekko.annotation.InternalApi
import pekko.event.Logging
import pekko.util.OptionVal
diff --git a/actor/src/main/scala/org/apache/pekko/actor/setup/ActorSystemSetup.scala b/actor/src/main/scala/org/apache/pekko/actor/setup/ActorSystemSetup.scala
index cfc541d84f..e13a5bfdd5 100644
--- a/actor/src/main/scala/org/apache/pekko/actor/setup/ActorSystemSetup.scala
+++ b/actor/src/main/scala/org/apache/pekko/actor/setup/ActorSystemSetup.scala
@@ -20,6 +20,7 @@ import scala.jdk.OptionConverters._
import scala.reflect.ClassTag
import org.apache.pekko
+
import pekko.annotation.InternalApi
/**
diff --git a/actor/src/main/scala/org/apache/pekko/dispatch/AbstractDispatcher.scala b/actor/src/main/scala/org/apache/pekko/dispatch/AbstractDispatcher.scala
index 08a4b16767..c48942927d 100644
--- a/actor/src/main/scala/org/apache/pekko/dispatch/AbstractDispatcher.scala
+++ b/actor/src/main/scala/org/apache/pekko/dispatch/AbstractDispatcher.scala
@@ -13,25 +13,26 @@
package org.apache.pekko.dispatch
-import java.{ util => ju }
import java.util.concurrent._
+import java.{ util => ju }
import scala.annotation.{ nowarn, tailrec }
-import scala.concurrent.{ ExecutionContext, ExecutionContextExecutor }
import scala.concurrent.duration.{ Duration, FiniteDuration }
+import scala.concurrent.{ ExecutionContext, ExecutionContextExecutor }
import scala.util.control.NonFatal
import org.apache.pekko
+
+import com.typesafe.config.Config
+
import pekko.actor._
import pekko.annotation.{ InternalApi, InternalStableApi }
import pekko.dispatch.affinity.AffinityPoolConfigurator
import pekko.dispatch.sysmsg._
import pekko.event.EventStream
-import pekko.event.Logging.{ emptyMDC, Debug, Error, LogEventException, Warning }
+import pekko.event.Logging.{ Debug, Error, LogEventException, Warning, emptyMDC }
import pekko.util.Index
-import com.typesafe.config.Config
-
final case class Envelope private (message: Any, sender: ActorRef) {
@noinline // not inlined to permit downstream bytecode instrumentation to attach context information to the Envelope
diff --git a/actor/src/main/scala/org/apache/pekko/dispatch/BalancingDispatcher.scala b/actor/src/main/scala/org/apache/pekko/dispatch/BalancingDispatcher.scala
index 79afca38ac..85b98d3c11 100644
--- a/actor/src/main/scala/org/apache/pekko/dispatch/BalancingDispatcher.scala
+++ b/actor/src/main/scala/org/apache/pekko/dispatch/BalancingDispatcher.scala
@@ -13,14 +13,15 @@
package org.apache.pekko.dispatch
-import java.util.{ Comparator, Iterator }
import java.util.concurrent.ConcurrentSkipListSet
+import java.util.{ Comparator, Iterator }
import scala.annotation.tailrec
import scala.concurrent.duration.Duration
import scala.concurrent.duration.FiniteDuration
import org.apache.pekko
+
import pekko.actor.ActorCell
import pekko.actor.ActorSystemImpl
import pekko.dispatch.sysmsg._
diff --git a/actor/src/main/scala/org/apache/pekko/dispatch/BatchingExecutor.scala b/actor/src/main/scala/org/apache/pekko/dispatch/BatchingExecutor.scala
index 93d278a00a..775c7f70a8 100644
--- a/actor/src/main/scala/org/apache/pekko/dispatch/BatchingExecutor.scala
+++ b/actor/src/main/scala/org/apache/pekko/dispatch/BatchingExecutor.scala
@@ -19,6 +19,7 @@ import scala.annotation.tailrec
import scala.concurrent._
import org.apache.pekko
+
import pekko.annotation.InternalApi
/**
diff --git a/actor/src/main/scala/org/apache/pekko/dispatch/CompletionStages.scala b/actor/src/main/scala/org/apache/pekko/dispatch/CompletionStages.scala
index 808f83016f..8ed28d19ba 100644
--- a/actor/src/main/scala/org/apache/pekko/dispatch/CompletionStages.scala
+++ b/actor/src/main/scala/org/apache/pekko/dispatch/CompletionStages.scala
@@ -18,8 +18,8 @@
package org.apache.pekko.dispatch
import java.util.Optional
-import java.util.concurrent.{ CompletableFuture, CompletionStage, Executor }
import java.util.concurrent.atomic.AtomicReference
+import java.util.concurrent.{ CompletableFuture, CompletionStage, Executor }
import java.util.function.{ BiConsumer, BiFunction }
import scala.annotation.nowarn
diff --git a/actor/src/main/scala/org/apache/pekko/dispatch/Dispatcher.scala b/actor/src/main/scala/org/apache/pekko/dispatch/Dispatcher.scala
index 951cd75d21..910fb695a3 100644
--- a/actor/src/main/scala/org/apache/pekko/dispatch/Dispatcher.scala
+++ b/actor/src/main/scala/org/apache/pekko/dispatch/Dispatcher.scala
@@ -13,14 +13,15 @@
package org.apache.pekko.dispatch
-import java.util.concurrent.{ ExecutorService, RejectedExecutionException }
import java.util.concurrent.atomic.AtomicReferenceFieldUpdater
+import java.util.concurrent.{ ExecutorService, RejectedExecutionException }
import scala.annotation.nowarn
import scala.concurrent.duration.Duration
import scala.concurrent.duration.FiniteDuration
import org.apache.pekko
+
import pekko.actor.ActorCell
import pekko.dispatch.sysmsg.SystemMessage
import pekko.event.Logging
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..7d4b4af6cc 100644
--- a/actor/src/main/scala/org/apache/pekko/dispatch/Dispatchers.scala
+++ b/actor/src/main/scala/org/apache/pekko/dispatch/Dispatchers.scala
@@ -19,6 +19,9 @@ import scala.annotation.{ nowarn, tailrec }
import scala.concurrent.ExecutionContext
import org.apache.pekko
+
+import com.typesafe.config.{ Config, ConfigFactory, ConfigValueType }
+
import pekko.ConfigurationException
import pekko.actor.{ ActorSystem, DynamicAccess, Scheduler }
import pekko.annotation.{ DoNotInherit, InternalApi }
@@ -26,8 +29,6 @@ import pekko.event.{ EventStream, LoggingAdapter }
import pekko.event.Logging.Warning
import pekko.util.Helpers.ConfigOps
-import com.typesafe.config.{ Config, ConfigFactory, ConfigValueType }
-
/**
* DispatcherPrerequisites represents useful contextual pieces when constructing a MessageDispatcher
*/
diff --git a/actor/src/main/scala/org/apache/pekko/dispatch/Future.scala b/actor/src/main/scala/org/apache/pekko/dispatch/Future.scala
index 3cdab634e3..6ec6a3eb19 100644
--- a/actor/src/main/scala/org/apache/pekko/dispatch/Future.scala
+++ b/actor/src/main/scala/org/apache/pekko/dispatch/Future.scala
@@ -13,13 +13,14 @@
package org.apache.pekko.dispatch
-import java.util.concurrent.{ Callable, Executor, ExecutorService }
import java.util.concurrent.CompletableFuture
import java.util.concurrent.CompletionStage
+import java.util.concurrent.{ Callable, Executor, ExecutorService }
import scala.concurrent.{ ExecutionContext, ExecutionContextExecutor, ExecutionContextExecutorService, Future, Promise }
import org.apache.pekko
+
import pekko.japi.function.Procedure
/**
diff --git a/actor/src/main/scala/org/apache/pekko/dispatch/Mailbox.scala b/actor/src/main/scala/org/apache/pekko/dispatch/Mailbox.scala
index 03ebf96a50..f14bbc8b32 100644
--- a/actor/src/main/scala/org/apache/pekko/dispatch/Mailbox.scala
+++ b/actor/src/main/scala/org/apache/pekko/dispatch/Mailbox.scala
@@ -13,16 +13,19 @@
package org.apache.pekko.dispatch
-import java.util.{ Comparator, Deque, PriorityQueue, Queue }
import java.util.concurrent._
import java.util.concurrent.atomic.AtomicInteger
import java.util.concurrent.locks.ReentrantLock
+import java.util.{ Comparator, Deque, PriorityQueue, Queue }
import scala.annotation.tailrec
import scala.concurrent.duration.{ Duration, FiniteDuration }
import scala.util.control.NonFatal
import org.apache.pekko
+
+import com.typesafe.config.Config
+
import pekko.actor.{ ActorCell, ActorRef, ActorSystem, DeadLetter, InternalActorRef }
import pekko.annotation.InternalStableApi
import pekko.dispatch.sysmsg._
@@ -30,8 +33,6 @@ import pekko.event.Logging.Error
import pekko.util.{ BoundedBlockingQueue, StablePriorityBlockingQueue, StablePriorityQueue }
import pekko.util.Helpers.ConfigOps
-import com.typesafe.config.Config
-
/**
* INTERNAL API
*/
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..4e77f74f45 100644
--- a/actor/src/main/scala/org/apache/pekko/dispatch/Mailboxes.scala
+++ b/actor/src/main/scala/org/apache/pekko/dispatch/Mailboxes.scala
@@ -22,6 +22,9 @@ import scala.concurrent.duration.Duration
import scala.util.control.NonFatal
import org.apache.pekko
+
+import com.typesafe.config.{ Config, ConfigFactory }
+
import pekko.ConfigurationException
import pekko.actor.{ Actor, ActorRef, ActorSystem, DeadLetter, Deploy, DynamicAccess, Props }
import pekko.annotation.InternalStableApi
@@ -35,8 +38,6 @@ import pekko.event.EventStream
import pekko.event.Logging.Warning
import pekko.util.Reflect
-import com.typesafe.config.{ Config, ConfigFactory }
-
object Mailboxes {
final val DefaultMailboxId = "pekko.actor.default-mailbox"
final val NoMailboxRequirement = ""
diff --git a/actor/src/main/scala/org/apache/pekko/dispatch/PinnedDispatcher.scala b/actor/src/main/scala/org/apache/pekko/dispatch/PinnedDispatcher.scala
index 2e619f8a7e..30c91233bd 100644
--- a/actor/src/main/scala/org/apache/pekko/dispatch/PinnedDispatcher.scala
+++ b/actor/src/main/scala/org/apache/pekko/dispatch/PinnedDispatcher.scala
@@ -17,6 +17,7 @@ import scala.concurrent.duration.Duration
import scala.concurrent.duration.FiniteDuration
import org.apache.pekko
+
import pekko.actor.ActorCell
/**
diff --git a/actor/src/main/scala/org/apache/pekko/dispatch/ThreadPoolBuilder.scala b/actor/src/main/scala/org/apache/pekko/dispatch/ThreadPoolBuilder.scala
index 20e69a1f23..e8e8289212 100644
--- a/actor/src/main/scala/org/apache/pekko/dispatch/ThreadPoolBuilder.scala
+++ b/actor/src/main/scala/org/apache/pekko/dispatch/ThreadPoolBuilder.scala
@@ -14,6 +14,7 @@
package org.apache.pekko.dispatch
import java.util.Collection
+import java.util.concurrent.atomic.{ AtomicLong, AtomicReference }
import java.util.concurrent.{
ArrayBlockingQueue,
BlockingQueue,
@@ -30,12 +31,12 @@ import java.util.concurrent.{
ThreadPoolExecutor,
TimeUnit
}
-import java.util.concurrent.atomic.{ AtomicLong, AtomicReference }
-import scala.concurrent.{ BlockContext, CanAwait }
import scala.concurrent.duration.Duration
+import scala.concurrent.{ BlockContext, CanAwait }
import org.apache.pekko
+
import pekko.annotation.InternalApi
import pekko.dispatch.VirtualThreadSupport.newVirtualThreadFactory
diff --git a/actor/src/main/scala/org/apache/pekko/dispatch/VirtualThreadSupport.scala b/actor/src/main/scala/org/apache/pekko/dispatch/VirtualThreadSupport.scala
index f095313462..bb2278a9e9 100644
--- a/actor/src/main/scala/org/apache/pekko/dispatch/VirtualThreadSupport.scala
+++ b/actor/src/main/scala/org/apache/pekko/dispatch/VirtualThreadSupport.scala
@@ -23,6 +23,7 @@ import java.util.concurrent.{ Executor, ExecutorService, ForkJoinPool, ForkJoinW
import scala.util.control.NonFatal
import org.apache.pekko
+
import pekko.annotation.InternalApi
import pekko.util.JavaVersion
diff --git a/actor/src/main/scala/org/apache/pekko/dispatch/VirtualizedExecutorService.scala b/actor/src/main/scala/org/apache/pekko/dispatch/VirtualizedExecutorService.scala
index 160224cb04..5dd26697cb 100644
--- a/actor/src/main/scala/org/apache/pekko/dispatch/VirtualizedExecutorService.scala
+++ b/actor/src/main/scala/org/apache/pekko/dispatch/VirtualizedExecutorService.scala
@@ -18,8 +18,8 @@
package org.apache.pekko.dispatch
import java.util
-import java.util.concurrent.{ Callable, Executor, ExecutorService, Future, ThreadFactory, TimeUnit }
import java.util.concurrent.atomic.{ AtomicBoolean, AtomicInteger }
+import java.util.concurrent.{ Callable, Executor, ExecutorService, Future, ThreadFactory, TimeUnit }
import org.apache.pekko.annotation.InternalApi
diff --git a/actor/src/main/scala/org/apache/pekko/dispatch/affinity/AffinityPool.scala b/actor/src/main/scala/org/apache/pekko/dispatch/affinity/AffinityPool.scala
index 4262c2ae61..672cdd9bae 100644
--- a/actor/src/main/scala/org/apache/pekko/dispatch/affinity/AffinityPool.scala
+++ b/actor/src/main/scala/org/apache/pekko/dispatch/affinity/AffinityPool.scala
@@ -15,8 +15,8 @@ package org.apache.pekko.dispatch.affinity
import java.lang.Integer.reverseBytes
import java.util.Collections
-import java.util.concurrent._
import java.util.concurrent.TimeUnit.MICROSECONDS
+import java.util.concurrent._
import java.util.concurrent.atomic.AtomicReference
import java.util.concurrent.locks.{ LockSupport, ReentrantLock }
@@ -24,14 +24,15 @@ import scala.annotation.{ switch, tailrec }
import scala.collection.{ immutable, mutable }
import org.apache.pekko
+
+import com.typesafe.config.Config
+
import pekko.annotation.{ ApiMayChange, InternalApi }
import pekko.dispatch._
import pekko.event.Logging
import pekko.util.Helpers.Requiring
import pekko.util.ImmutableIntMap
-import com.typesafe.config.Config
-
@InternalApi
@ApiMayChange
private[affinity] object AffinityPool {
diff --git a/actor/src/main/scala/org/apache/pekko/dispatch/internal/ScalaBatchable.scala b/actor/src/main/scala/org/apache/pekko/dispatch/internal/ScalaBatchable.scala
index 7345b5f0c8..d4bf87df94 100644
--- a/actor/src/main/scala/org/apache/pekko/dispatch/internal/ScalaBatchable.scala
+++ b/actor/src/main/scala/org/apache/pekko/dispatch/internal/ScalaBatchable.scala
@@ -14,6 +14,7 @@
package org.apache.pekko.dispatch.internal
import org.apache.pekko
+
import pekko.annotation.InternalApi
/**
diff --git a/actor/src/main/scala/org/apache/pekko/dispatch/sysmsg/SystemMessage.scala b/actor/src/main/scala/org/apache/pekko/dispatch/sysmsg/SystemMessage.scala
index 803f81c685..5477c646cb 100644
--- a/actor/src/main/scala/org/apache/pekko/dispatch/sysmsg/SystemMessage.scala
+++ b/actor/src/main/scala/org/apache/pekko/dispatch/sysmsg/SystemMessage.scala
@@ -16,6 +16,7 @@ package org.apache.pekko.dispatch.sysmsg
import scala.annotation.tailrec
import org.apache.pekko
+
import pekko.actor.{ ActorInitializationException, ActorRef, InternalActorRef, PossiblyHarmful }
import pekko.actor.DeadLetterSuppression
import pekko.annotation.InternalStableApi
diff --git a/actor/src/main/scala/org/apache/pekko/event/ActorClassificationUnsubscriber.scala b/actor/src/main/scala/org/apache/pekko/event/ActorClassificationUnsubscriber.scala
index 6ecf922088..a2c0862387 100644
--- a/actor/src/main/scala/org/apache/pekko/event/ActorClassificationUnsubscriber.scala
+++ b/actor/src/main/scala/org/apache/pekko/event/ActorClassificationUnsubscriber.scala
@@ -18,6 +18,7 @@ import java.util.concurrent.atomic.AtomicInteger
import scala.annotation.nowarn
import org.apache.pekko
+
import pekko.actor._
import pekko.event.Logging.simpleName
diff --git a/actor/src/main/scala/org/apache/pekko/event/AddressTerminatedTopic.scala b/actor/src/main/scala/org/apache/pekko/event/AddressTerminatedTopic.scala
index 0691cebde0..ed2ef7aca7 100644
--- a/actor/src/main/scala/org/apache/pekko/event/AddressTerminatedTopic.scala
+++ b/actor/src/main/scala/org/apache/pekko/event/AddressTerminatedTopic.scala
@@ -18,6 +18,7 @@ import java.util.concurrent.atomic.AtomicReference
import scala.annotation.tailrec
import org.apache.pekko
+
import pekko.actor.ActorRef
import pekko.actor.ActorSystem
import pekko.actor.AddressTerminated
diff --git a/actor/src/main/scala/org/apache/pekko/event/DeadLetterListener.scala b/actor/src/main/scala/org/apache/pekko/event/DeadLetterListener.scala
index c3ee6dd2d8..385aef32c2 100644
--- a/actor/src/main/scala/org/apache/pekko/event/DeadLetterListener.scala
+++ b/actor/src/main/scala/org/apache/pekko/event/DeadLetterListener.scala
@@ -17,6 +17,7 @@ import scala.concurrent.duration.Deadline
import scala.concurrent.duration.FiniteDuration
import org.apache.pekko
+
import pekko.actor.Actor
import pekko.actor.ActorLogMarker
import pekko.actor.ActorRef
diff --git a/actor/src/main/scala/org/apache/pekko/event/EventBus.scala b/actor/src/main/scala/org/apache/pekko/event/EventBus.scala
index 4e68fe1b81..4562f3e260 100644
--- a/actor/src/main/scala/org/apache/pekko/event/EventBus.scala
+++ b/actor/src/main/scala/org/apache/pekko/event/EventBus.scala
@@ -20,6 +20,7 @@ import java.util.concurrent.atomic.AtomicReference
import scala.collection.immutable
import org.apache.pekko
+
import pekko.actor.{ ActorRef, ActorSystem }
import pekko.util.{ Subclassification, SubclassifiedIndex }
import pekko.util.Index
diff --git a/actor/src/main/scala/org/apache/pekko/event/EventStream.scala b/actor/src/main/scala/org/apache/pekko/event/EventStream.scala
index 8e777f1870..ec1b23a16e 100644
--- a/actor/src/main/scala/org/apache/pekko/event/EventStream.scala
+++ b/actor/src/main/scala/org/apache/pekko/event/EventStream.scala
@@ -18,6 +18,7 @@ import java.util.concurrent.atomic.AtomicReference
import scala.annotation.tailrec
import org.apache.pekko
+
import pekko.actor.{ ActorRef, ActorSystem }
import pekko.event.Logging.simpleName
import pekko.util.Subclassification
diff --git a/actor/src/main/scala/org/apache/pekko/event/EventStreamUnsubscriber.scala b/actor/src/main/scala/org/apache/pekko/event/EventStreamUnsubscriber.scala
index bf647e05c2..ee34dd4ae2 100644
--- a/actor/src/main/scala/org/apache/pekko/event/EventStreamUnsubscriber.scala
+++ b/actor/src/main/scala/org/apache/pekko/event/EventStreamUnsubscriber.scala
@@ -16,6 +16,7 @@ package org.apache.pekko.event
import java.util.concurrent.atomic.AtomicInteger
import org.apache.pekko
+
import pekko.actor._
import pekko.dispatch.Dispatchers
import pekko.event.Logging.simpleName
diff --git a/actor/src/main/scala/org/apache/pekko/event/LoggerMailbox.scala b/actor/src/main/scala/org/apache/pekko/event/LoggerMailbox.scala
index 6981a8c838..08a25ae1c7 100644
--- a/actor/src/main/scala/org/apache/pekko/event/LoggerMailbox.scala
+++ b/actor/src/main/scala/org/apache/pekko/event/LoggerMailbox.scala
@@ -16,6 +16,9 @@ package org.apache.pekko.event
import scala.annotation.nowarn
import org.apache.pekko
+
+import com.typesafe.config.Config
+
import pekko.actor.ActorRef
import pekko.actor.ActorSystem
import pekko.dispatch.MailboxType
@@ -24,8 +27,6 @@ import pekko.dispatch.ProducesMessageQueue
import pekko.dispatch.UnboundedMailbox
import pekko.event.Logging.LogEvent
-import com.typesafe.config.Config
-
trait LoggerMessageQueueSemantics
/**
diff --git a/actor/src/main/scala/org/apache/pekko/event/Logging.scala b/actor/src/main/scala/org/apache/pekko/event/Logging.scala
index 3877e89f1e..ce8d6a43da 100644
--- a/actor/src/main/scala/org/apache/pekko/event/Logging.scala
+++ b/actor/src/main/scala/org/apache/pekko/event/Logging.scala
@@ -25,6 +25,7 @@ import scala.language.existentials
import scala.util.control.{ NoStackTrace, NonFatal }
import org.apache.pekko
+
import pekko.{ ConfigurationException, PekkoException }
import pekko.actor._
import pekko.actor.ActorSystem.Settings
diff --git a/actor/src/main/scala/org/apache/pekko/event/LoggingReceive.scala b/actor/src/main/scala/org/apache/pekko/event/LoggingReceive.scala
index 95a8f87119..5bd3651bf4 100644
--- a/actor/src/main/scala/org/apache/pekko/event/LoggingReceive.scala
+++ b/actor/src/main/scala/org/apache/pekko/event/LoggingReceive.scala
@@ -15,9 +15,9 @@ package org.apache.pekko.event
import scala.runtime.BoxedUnit
-import language.existentials
-
import org.apache.pekko
+
+import language.existentials
import pekko.actor.AbstractActor
import pekko.actor.Actor.Receive
import pekko.actor.ActorCell
diff --git a/actor/src/main/scala/org/apache/pekko/event/japi/EventBusJavaAPI.scala b/actor/src/main/scala/org/apache/pekko/event/japi/EventBusJavaAPI.scala
index a21d88592b..4fbcb8d400 100644
--- a/actor/src/main/scala/org/apache/pekko/event/japi/EventBusJavaAPI.scala
+++ b/actor/src/main/scala/org/apache/pekko/event/japi/EventBusJavaAPI.scala
@@ -14,6 +14,7 @@
package org.apache.pekko.event.japi
import org.apache.pekko
+
import pekko.actor.{ ActorRef, ActorSystem }
import pekko.util.Subclassification
diff --git a/actor/src/main/scala/org/apache/pekko/io/Dns.scala b/actor/src/main/scala/org/apache/pekko/io/Dns.scala
index 9421705247..7e9a1d63bd 100644
--- a/actor/src/main/scala/org/apache/pekko/io/Dns.scala
+++ b/actor/src/main/scala/org/apache/pekko/io/Dns.scala
@@ -20,14 +20,15 @@ import java.util.function.{ Function => JFunction }
import scala.annotation.nowarn
import org.apache.pekko
+
+import com.typesafe.config.Config
+
import pekko.actor._
import pekko.annotation.DoNotInherit
import pekko.annotation.InternalApi
import pekko.event.Logging
import pekko.io.dns.DnsProtocol
-import com.typesafe.config.Config
-
/**
* Not for user extension.
*
diff --git a/actor/src/main/scala/org/apache/pekko/io/DnsProvider.scala b/actor/src/main/scala/org/apache/pekko/io/DnsProvider.scala
index 5fe606224f..43e0107143 100644
--- a/actor/src/main/scala/org/apache/pekko/io/DnsProvider.scala
+++ b/actor/src/main/scala/org/apache/pekko/io/DnsProvider.scala
@@ -14,6 +14,7 @@
package org.apache.pekko.io
import org.apache.pekko
+
import pekko.actor.Actor
import pekko.annotation.InternalApi
diff --git a/actor/src/main/scala/org/apache/pekko/io/IO.scala b/actor/src/main/scala/org/apache/pekko/io/IO.scala
index 9a937eefe2..9e7e4665ec 100644
--- a/actor/src/main/scala/org/apache/pekko/io/IO.scala
+++ b/actor/src/main/scala/org/apache/pekko/io/IO.scala
@@ -14,6 +14,7 @@
package org.apache.pekko.io
import org.apache.pekko
+
import pekko.actor._
/**
diff --git a/actor/src/main/scala/org/apache/pekko/io/InetAddressDnsResolver.scala b/actor/src/main/scala/org/apache/pekko/io/InetAddressDnsResolver.scala
index f6102e2832..0d3a520da2 100644
--- a/actor/src/main/scala/org/apache/pekko/io/InetAddressDnsResolver.scala
+++ b/actor/src/main/scala/org/apache/pekko/io/InetAddressDnsResolver.scala
@@ -13,9 +13,9 @@
package org.apache.pekko.io
-import java.net.{ InetAddress, UnknownHostException }
import java.net.Inet4Address
import java.net.Inet6Address
+import java.net.{ InetAddress, UnknownHostException }
import java.security.Security
import java.util.concurrent.TimeUnit
@@ -24,6 +24,9 @@ import scala.concurrent.duration._
import scala.util.{ Failure, Success, Try }
import org.apache.pekko
+
+import com.typesafe.config.Config
+
import pekko.actor.{ Actor, ActorLogging }
import pekko.actor.Status
import pekko.annotation.InternalApi
@@ -36,8 +39,6 @@ import pekko.io.dns.DnsProtocol.Srv
import pekko.io.dns.ResourceRecord
import pekko.util.Helpers.Requiring
-import com.typesafe.config.Config
-
/**
* INTERNAL API
*
diff --git a/actor/src/main/scala/org/apache/pekko/io/SelectionHandler.scala b/actor/src/main/scala/org/apache/pekko/io/SelectionHandler.scala
index c6e2f869cf..f825ee1256 100644
--- a/actor/src/main/scala/org/apache/pekko/io/SelectionHandler.scala
+++ b/actor/src/main/scala/org/apache/pekko/io/SelectionHandler.scala
@@ -13,12 +13,12 @@
package org.apache.pekko.io
-import java.nio.channels.{ CancelledKeyException, SelectableChannel, SelectionKey }
import java.nio.channels.ClosedChannelException
import java.nio.channels.SelectionKey._
import java.nio.channels.spi.SelectorProvider
-import java.util.{ Iterator => JIterator }
+import java.nio.channels.{ CancelledKeyException, SelectableChannel, SelectionKey }
import java.util.concurrent.atomic.AtomicBoolean
+import java.util.{ Iterator => JIterator }
import scala.annotation.tailrec
import scala.concurrent.ExecutionContext
@@ -26,6 +26,9 @@ import scala.util.Try
import scala.util.control.NonFatal
import org.apache.pekko
+
+import com.typesafe.config.Config
+
import pekko.actor._
import pekko.dispatch.{ RequiresMessageQueue, UnboundedMessageQueueSemantics }
import pekko.event.Logging
@@ -34,8 +37,6 @@ import pekko.routing.RandomPool
import pekko.util.Helpers.Requiring
import pekko.util.SerializedSuspendableExecutionContext
-import com.typesafe.config.Config
-
abstract class SelectionHandlerSettings(config: Config) {
import config._
diff --git a/actor/src/main/scala/org/apache/pekko/io/SimpleDnsCache.scala b/actor/src/main/scala/org/apache/pekko/io/SimpleDnsCache.scala
index 27e735ff2f..12f03a645f 100644
--- a/actor/src/main/scala/org/apache/pekko/io/SimpleDnsCache.scala
+++ b/actor/src/main/scala/org/apache/pekko/io/SimpleDnsCache.scala
@@ -19,6 +19,7 @@ import scala.annotation.tailrec
import scala.collection.immutable
import org.apache.pekko
+
import pekko.actor.NoSerializationVerificationNeeded
import pekko.annotation.InternalApi
import pekko.io.dns.CachePolicy.CachePolicy
diff --git a/actor/src/main/scala/org/apache/pekko/io/SimpleDnsManager.scala b/actor/src/main/scala/org/apache/pekko/io/SimpleDnsManager.scala
index 62a2481846..8ffd1d5ac5 100644
--- a/actor/src/main/scala/org/apache/pekko/io/SimpleDnsManager.scala
+++ b/actor/src/main/scala/org/apache/pekko/io/SimpleDnsManager.scala
@@ -18,6 +18,7 @@ import java.util.concurrent.TimeUnit
import scala.concurrent.duration.Duration
import org.apache.pekko
+
import pekko.actor.{ Actor, ActorLogging, Deploy, Props }
import pekko.dispatch.{ RequiresMessageQueue, UnboundedMessageQueueSemantics }
import pekko.routing.FromConfig
diff --git a/actor/src/main/scala/org/apache/pekko/io/Tcp.scala b/actor/src/main/scala/org/apache/pekko/io/Tcp.scala
index 97641f90ce..7177e89c3d 100644
--- a/actor/src/main/scala/org/apache/pekko/io/Tcp.scala
+++ b/actor/src/main/scala/org/apache/pekko/io/Tcp.scala
@@ -25,14 +25,15 @@ import scala.jdk.CollectionConverters._
import scala.jdk.DurationConverters._
import org.apache.pekko
+
+import com.typesafe.config.Config
+
import pekko.actor._
import pekko.annotation.InternalApi
import pekko.io.Inet._
import pekko.util.{ ByteString, Helpers }
import pekko.util.Helpers.Requiring
-import com.typesafe.config.Config
-
/**
* TCP Extension for Akka’s IO layer.
*
diff --git a/actor/src/main/scala/org/apache/pekko/io/TcpConnection.scala b/actor/src/main/scala/org/apache/pekko/io/TcpConnection.scala
index b866f99ed0..ad100d7791 100644
--- a/actor/src/main/scala/org/apache/pekko/io/TcpConnection.scala
+++ b/actor/src/main/scala/org/apache/pekko/io/TcpConnection.scala
@@ -16,8 +16,8 @@ package org.apache.pekko.io
import java.io.IOException
import java.net.{ InetSocketAddress, SocketException }
import java.nio.ByteBuffer
-import java.nio.channels.{ FileChannel, SocketChannel }
import java.nio.channels.SelectionKey._
+import java.nio.channels.{ FileChannel, SocketChannel }
import java.nio.file.Path
import scala.annotation.nowarn
@@ -27,6 +27,7 @@ import scala.concurrent.duration._
import scala.util.control.{ NoStackTrace, NonFatal }
import org.apache.pekko
+
import pekko.actor._
import pekko.dispatch.{ RequiresMessageQueue, UnboundedMessageQueueSemantics }
import pekko.io.Inet.SocketOption
diff --git a/actor/src/main/scala/org/apache/pekko/io/TcpIncomingConnection.scala b/actor/src/main/scala/org/apache/pekko/io/TcpIncomingConnection.scala
index 5adb59024a..26f8e29613 100644
--- a/actor/src/main/scala/org/apache/pekko/io/TcpIncomingConnection.scala
+++ b/actor/src/main/scala/org/apache/pekko/io/TcpIncomingConnection.scala
@@ -19,6 +19,7 @@ import scala.annotation.nowarn
import scala.collection.immutable
import org.apache.pekko
+
import pekko.actor.ActorRef
import pekko.io.Inet.SocketOption
diff --git a/actor/src/main/scala/org/apache/pekko/io/TcpListener.scala b/actor/src/main/scala/org/apache/pekko/io/TcpListener.scala
index db4f5238d9..a8246a887f 100644
--- a/actor/src/main/scala/org/apache/pekko/io/TcpListener.scala
+++ b/actor/src/main/scala/org/apache/pekko/io/TcpListener.scala
@@ -20,6 +20,7 @@ import scala.annotation.tailrec
import scala.util.control.NonFatal
import org.apache.pekko
+
import pekko.actor._
import pekko.dispatch.{ RequiresMessageQueue, UnboundedMessageQueueSemantics }
import pekko.io.SelectionHandler._
diff --git a/actor/src/main/scala/org/apache/pekko/io/TcpManager.scala b/actor/src/main/scala/org/apache/pekko/io/TcpManager.scala
index af3bde377b..b2e0ef3eed 100644
--- a/actor/src/main/scala/org/apache/pekko/io/TcpManager.scala
+++ b/actor/src/main/scala/org/apache/pekko/io/TcpManager.scala
@@ -13,9 +13,9 @@
package org.apache.pekko.io
-import Tcp._
-
import org.apache.pekko
+
+import Tcp._
import pekko.actor.{ ActorLogging, Props }
/**
diff --git a/actor/src/main/scala/org/apache/pekko/io/TcpOutgoingConnection.scala b/actor/src/main/scala/org/apache/pekko/io/TcpOutgoingConnection.scala
index 34c678ce20..a0a1e9d3b5 100644
--- a/actor/src/main/scala/org/apache/pekko/io/TcpOutgoingConnection.scala
+++ b/actor/src/main/scala/org/apache/pekko/io/TcpOutgoingConnection.scala
@@ -20,6 +20,7 @@ import scala.concurrent.duration._
import scala.util.control.{ NoStackTrace, NonFatal }
import org.apache.pekko
+
import pekko.actor.{ ActorRef, ReceiveTimeout, Timers }
import pekko.actor.Status.Failure
import pekko.annotation.InternalApi
diff --git a/actor/src/main/scala/org/apache/pekko/io/Udp.scala b/actor/src/main/scala/org/apache/pekko/io/Udp.scala
index 995f463f4f..c978e7915d 100644
--- a/actor/src/main/scala/org/apache/pekko/io/Udp.scala
+++ b/actor/src/main/scala/org/apache/pekko/io/Udp.scala
@@ -20,13 +20,14 @@ import scala.annotation.nowarn
import scala.collection.immutable
import org.apache.pekko
+
+import com.typesafe.config.Config
+
import pekko.actor._
import pekko.io.Inet.{ SoJavaFactories, SocketOption }
import pekko.util.ByteString
import pekko.util.Helpers.Requiring
-import com.typesafe.config.Config
-
/**
* UDP Extension for Akka’s IO layer.
*
diff --git a/actor/src/main/scala/org/apache/pekko/io/UdpConnected.scala b/actor/src/main/scala/org/apache/pekko/io/UdpConnected.scala
index cb670dbc38..aa7ecb43ec 100644
--- a/actor/src/main/scala/org/apache/pekko/io/UdpConnected.scala
+++ b/actor/src/main/scala/org/apache/pekko/io/UdpConnected.scala
@@ -20,6 +20,7 @@ import scala.annotation.nowarn
import scala.collection.immutable
import org.apache.pekko
+
import pekko.actor._
import pekko.io.Inet.SocketOption
import pekko.io.Udp.UdpSettings
diff --git a/actor/src/main/scala/org/apache/pekko/io/UdpConnectedManager.scala b/actor/src/main/scala/org/apache/pekko/io/UdpConnectedManager.scala
index c0f486ce5e..41dfba1731 100644
--- a/actor/src/main/scala/org/apache/pekko/io/UdpConnectedManager.scala
+++ b/actor/src/main/scala/org/apache/pekko/io/UdpConnectedManager.scala
@@ -14,6 +14,7 @@
package org.apache.pekko.io
import org.apache.pekko
+
import pekko.actor.Props
import pekko.io.UdpConnected.Connect
diff --git a/actor/src/main/scala/org/apache/pekko/io/UdpConnection.scala b/actor/src/main/scala/org/apache/pekko/io/UdpConnection.scala
index 0f984f7366..b55819dd52 100644
--- a/actor/src/main/scala/org/apache/pekko/io/UdpConnection.scala
+++ b/actor/src/main/scala/org/apache/pekko/io/UdpConnection.scala
@@ -22,6 +22,7 @@ import scala.annotation.{ nowarn, tailrec }
import scala.util.control.NonFatal
import org.apache.pekko
+
import pekko.actor.{ Actor, ActorLogging, ActorRef }
import pekko.actor.Status.Failure
import pekko.dispatch.{ RequiresMessageQueue, UnboundedMessageQueueSemantics }
diff --git a/actor/src/main/scala/org/apache/pekko/io/UdpListener.scala b/actor/src/main/scala/org/apache/pekko/io/UdpListener.scala
index e59180059a..19a9dc0ee9 100644
--- a/actor/src/main/scala/org/apache/pekko/io/UdpListener.scala
+++ b/actor/src/main/scala/org/apache/pekko/io/UdpListener.scala
@@ -21,6 +21,7 @@ import scala.annotation.tailrec
import scala.util.control.NonFatal
import org.apache.pekko
+
import pekko.actor.{ Actor, ActorLogging, ActorRef }
import pekko.dispatch.{ RequiresMessageQueue, UnboundedMessageQueueSemantics }
import pekko.io.Inet.DatagramChannelCreator
diff --git a/actor/src/main/scala/org/apache/pekko/io/UdpManager.scala b/actor/src/main/scala/org/apache/pekko/io/UdpManager.scala
index cf8a57f188..1646908f98 100644
--- a/actor/src/main/scala/org/apache/pekko/io/UdpManager.scala
+++ b/actor/src/main/scala/org/apache/pekko/io/UdpManager.scala
@@ -14,6 +14,7 @@
package org.apache.pekko.io
import org.apache.pekko
+
import pekko.actor.Props
import pekko.io.Udp._
diff --git a/actor/src/main/scala/org/apache/pekko/io/UdpSender.scala b/actor/src/main/scala/org/apache/pekko/io/UdpSender.scala
index a0bc4f598a..c7e1d85df3 100644
--- a/actor/src/main/scala/org/apache/pekko/io/UdpSender.scala
+++ b/actor/src/main/scala/org/apache/pekko/io/UdpSender.scala
@@ -19,6 +19,7 @@ import scala.annotation.nowarn
import scala.util.control.NonFatal
import org.apache.pekko
+
import pekko.actor._
import pekko.dispatch.{ RequiresMessageQueue, UnboundedMessageQueueSemantics }
import pekko.io.Inet.DatagramChannelCreator
diff --git a/actor/src/main/scala/org/apache/pekko/io/WithUdpSend.scala b/actor/src/main/scala/org/apache/pekko/io/WithUdpSend.scala
index cf262fdc29..7154c9c154 100644
--- a/actor/src/main/scala/org/apache/pekko/io/WithUdpSend.scala
+++ b/actor/src/main/scala/org/apache/pekko/io/WithUdpSend.scala
@@ -19,6 +19,7 @@ import java.nio.channels.{ DatagramChannel, SelectionKey }
import scala.util.control.NonFatal
import org.apache.pekko
+
import pekko.actor.{ Actor, ActorLogging, ActorRef }
import pekko.io.SelectionHandler._
import pekko.io.Udp.{ CommandFailed, Send }
diff --git a/actor/src/main/scala/org/apache/pekko/io/dns/CachePolicy.scala b/actor/src/main/scala/org/apache/pekko/io/dns/CachePolicy.scala
index 803192fe2d..fcd9137462 100644
--- a/actor/src/main/scala/org/apache/pekko/io/dns/CachePolicy.scala
+++ b/actor/src/main/scala/org/apache/pekko/io/dns/CachePolicy.scala
@@ -17,6 +17,7 @@ import scala.concurrent.duration.{ Duration, FiniteDuration, _ }
import scala.jdk.DurationConverters._
import org.apache.pekko
+
import pekko.annotation.InternalApi
object CachePolicy {
diff --git a/actor/src/main/scala/org/apache/pekko/io/dns/DnsProtocol.scala b/actor/src/main/scala/org/apache/pekko/io/dns/DnsProtocol.scala
index 665665ebbb..fbac32b9fa 100644
--- a/actor/src/main/scala/org/apache/pekko/io/dns/DnsProtocol.scala
+++ b/actor/src/main/scala/org/apache/pekko/io/dns/DnsProtocol.scala
@@ -23,6 +23,7 @@ import scala.collection.{ immutable => im }
import scala.jdk.CollectionConverters._
import org.apache.pekko
+
import pekko.actor.NoSerializationVerificationNeeded
import pekko.io.IpVersionSelector
import pekko.routing.ConsistentHashingRouter.ConsistentHashable
diff --git a/actor/src/main/scala/org/apache/pekko/io/dns/DnsResourceRecords.scala b/actor/src/main/scala/org/apache/pekko/io/dns/DnsResourceRecords.scala
index a02d6f3ead..d5ca472d55 100644
--- a/actor/src/main/scala/org/apache/pekko/io/dns/DnsResourceRecords.scala
+++ b/actor/src/main/scala/org/apache/pekko/io/dns/DnsResourceRecords.scala
@@ -19,9 +19,9 @@ import scala.annotation.nowarn
import scala.annotation.switch
import scala.concurrent.duration._
-import CachePolicy._
-
import org.apache.pekko
+
+import CachePolicy._
import pekko.actor.NoSerializationVerificationNeeded
import pekko.annotation.DoNotInherit
import pekko.annotation.InternalApi
diff --git a/actor/src/main/scala/org/apache/pekko/io/dns/DnsSettings.scala b/actor/src/main/scala/org/apache/pekko/io/dns/DnsSettings.scala
index fde89e6c81..477b11c59b 100644
--- a/actor/src/main/scala/org/apache/pekko/io/dns/DnsSettings.scala
+++ b/actor/src/main/scala/org/apache/pekko/io/dns/DnsSettings.scala
@@ -41,6 +41,9 @@ import scala.jdk.DurationConverters._
import scala.util.{ Failure, Success, Try }
import org.apache.pekko
+
+import com.typesafe.config.{ Config, ConfigValueType }
+
import pekko.actor.ExtendedActorSystem
import pekko.annotation.InternalApi
import pekko.event.Logging
@@ -50,8 +53,6 @@ import pekko.io.dns.internal.{ ResolvConf, ResolvConfParser }
import pekko.util.Helpers
import pekko.util.Helpers.Requiring
-import com.typesafe.config.{ Config, ConfigValueType }
-
/** INTERNAL API */
@InternalApi
private[dns] final class DnsSettings(system: ExtendedActorSystem, c: Config) {
diff --git a/actor/src/main/scala/org/apache/pekko/io/dns/internal/AsyncDnsManager.scala b/actor/src/main/scala/org/apache/pekko/io/dns/internal/AsyncDnsManager.scala
index 28e904b508..d41029108d 100644
--- a/actor/src/main/scala/org/apache/pekko/io/dns/internal/AsyncDnsManager.scala
+++ b/actor/src/main/scala/org/apache/pekko/io/dns/internal/AsyncDnsManager.scala
@@ -20,6 +20,9 @@ import scala.concurrent.ExecutionContextExecutor
import scala.concurrent.duration.Duration
import org.apache.pekko
+
+import com.typesafe.config.Config
+
import pekko.actor.{ Actor, ActorLogging, ActorRefFactory, Deploy, ExtendedActorSystem, Props, Timers }
import pekko.annotation.InternalApi
import pekko.dispatch.{ RequiresMessageQueue, UnboundedMessageQueueSemantics }
@@ -30,8 +33,6 @@ import pekko.io.dns.internal.AsyncDnsManager.CacheCleanup
import pekko.routing.FromConfig
import pekko.util.Timeout
-import com.typesafe.config.Config
-
/**
* INTERNAL API
*/
diff --git a/actor/src/main/scala/org/apache/pekko/io/dns/internal/AsyncDnsProvider.scala b/actor/src/main/scala/org/apache/pekko/io/dns/internal/AsyncDnsProvider.scala
index 74615eb145..0748027f94 100644
--- a/actor/src/main/scala/org/apache/pekko/io/dns/internal/AsyncDnsProvider.scala
+++ b/actor/src/main/scala/org/apache/pekko/io/dns/internal/AsyncDnsProvider.scala
@@ -16,6 +16,7 @@ package org.apache.pekko.io.dns.internal
import scala.annotation.nowarn
import org.apache.pekko
+
import pekko.annotation.InternalApi
import pekko.io._
diff --git a/actor/src/main/scala/org/apache/pekko/io/dns/internal/AsyncDnsResolver.scala b/actor/src/main/scala/org/apache/pekko/io/dns/internal/AsyncDnsResolver.scala
index 89b2059bf5..80ad8be498 100644
--- a/actor/src/main/scala/org/apache/pekko/io/dns/internal/AsyncDnsResolver.scala
+++ b/actor/src/main/scala/org/apache/pekko/io/dns/internal/AsyncDnsResolver.scala
@@ -17,12 +17,13 @@ import java.net.{ Inet4Address, Inet6Address, InetAddress, InetSocketAddress }
import scala.annotation.tailrec
import scala.collection.immutable
-import scala.concurrent.{ ExecutionContextExecutor, Future, Promise }
import scala.concurrent.ExecutionContext.parasitic
-import scala.util.{ Failure, Success, Try }
+import scala.concurrent.{ ExecutionContextExecutor, Future, Promise }
import scala.util.control.NonFatal
+import scala.util.{ Failure, Success, Try }
import org.apache.pekko
+
import pekko.actor.{ Actor, ActorLogging, ActorRef, ActorRefFactory, NoSerializationVerificationNeeded, Props, Status }
import pekko.annotation.InternalApi
import pekko.io.SimpleDnsCache
diff --git a/actor/src/main/scala/org/apache/pekko/io/dns/internal/DnsClient.scala b/actor/src/main/scala/org/apache/pekko/io/dns/internal/DnsClient.scala
index 72b6619c53..8746828002 100644
--- a/actor/src/main/scala/org/apache/pekko/io/dns/internal/DnsClient.scala
+++ b/actor/src/main/scala/org/apache/pekko/io/dns/internal/DnsClient.scala
@@ -21,6 +21,7 @@ import scala.concurrent.duration._
import scala.util.Try
import org.apache.pekko
+
import pekko.actor.{ Actor, ActorLogging, ActorRef, NoSerializationVerificationNeeded, Props, Stash }
import pekko.actor.Status.Failure
import pekko.annotation.InternalApi
diff --git a/actor/src/main/scala/org/apache/pekko/io/dns/internal/DnsMessage.scala b/actor/src/main/scala/org/apache/pekko/io/dns/internal/DnsMessage.scala
index a94f0d621c..328ce486b8 100644
--- a/actor/src/main/scala/org/apache/pekko/io/dns/internal/DnsMessage.scala
+++ b/actor/src/main/scala/org/apache/pekko/io/dns/internal/DnsMessage.scala
@@ -19,6 +19,7 @@ import scala.collection.immutable.Seq
import scala.util.{ Failure, Success, Try }
import org.apache.pekko
+
import pekko.annotation.InternalApi
import pekko.io.dns.ResourceRecord
import pekko.util.{ ByteString, ByteStringBuilder }
diff --git a/actor/src/main/scala/org/apache/pekko/io/dns/internal/DomainName.scala b/actor/src/main/scala/org/apache/pekko/io/dns/internal/DomainName.scala
index e0e92d7c0e..b794b446e3 100644
--- a/actor/src/main/scala/org/apache/pekko/io/dns/internal/DomainName.scala
+++ b/actor/src/main/scala/org/apache/pekko/io/dns/internal/DomainName.scala
@@ -14,6 +14,7 @@
package org.apache.pekko.io.dns.internal
import org.apache.pekko
+
import pekko.annotation.InternalApi
import pekko.util.{ ByteIterator, ByteString, ByteStringBuilder }
diff --git a/actor/src/main/scala/org/apache/pekko/io/dns/internal/Question.scala b/actor/src/main/scala/org/apache/pekko/io/dns/internal/Question.scala
index 87a4cc66bf..1cd6e5519f 100644
--- a/actor/src/main/scala/org/apache/pekko/io/dns/internal/Question.scala
+++ b/actor/src/main/scala/org/apache/pekko/io/dns/internal/Question.scala
@@ -14,6 +14,7 @@
package org.apache.pekko.io.dns.internal
import org.apache.pekko
+
import pekko.annotation.InternalApi
import pekko.io.dns.{ RecordClass, RecordType }
import pekko.util.{ ByteIterator, ByteString, ByteStringBuilder }
diff --git a/actor/src/main/scala/org/apache/pekko/io/dns/internal/RecordClassSerializer.scala b/actor/src/main/scala/org/apache/pekko/io/dns/internal/RecordClassSerializer.scala
index 54c07f4e82..79d4a7c074 100644
--- a/actor/src/main/scala/org/apache/pekko/io/dns/internal/RecordClassSerializer.scala
+++ b/actor/src/main/scala/org/apache/pekko/io/dns/internal/RecordClassSerializer.scala
@@ -14,6 +14,7 @@
package org.apache.pekko.io.dns.internal
import org.apache.pekko
+
import pekko.annotation.InternalApi
import pekko.io.dns.RecordClass
import pekko.util.{ ByteIterator, ByteStringBuilder }
diff --git a/actor/src/main/scala/org/apache/pekko/io/dns/internal/RecordTypeSerializer.scala b/actor/src/main/scala/org/apache/pekko/io/dns/internal/RecordTypeSerializer.scala
index 5ece7fa85b..4672c74fd6 100644
--- a/actor/src/main/scala/org/apache/pekko/io/dns/internal/RecordTypeSerializer.scala
+++ b/actor/src/main/scala/org/apache/pekko/io/dns/internal/RecordTypeSerializer.scala
@@ -14,6 +14,7 @@
package org.apache.pekko.io.dns.internal
import org.apache.pekko
+
import pekko.io.dns.RecordType
import pekko.util.{ ByteIterator, ByteStringBuilder, OptionVal }
diff --git a/actor/src/main/scala/org/apache/pekko/io/dns/internal/TcpDnsClient.scala b/actor/src/main/scala/org/apache/pekko/io/dns/internal/TcpDnsClient.scala
index a85f36d073..c57803fef3 100644
--- a/actor/src/main/scala/org/apache/pekko/io/dns/internal/TcpDnsClient.scala
+++ b/actor/src/main/scala/org/apache/pekko/io/dns/internal/TcpDnsClient.scala
@@ -16,6 +16,7 @@ package org.apache.pekko.io.dns.internal
import java.net.InetSocketAddress
import org.apache.pekko
+
import pekko.PekkoException
import pekko.actor.{ Actor, ActorLogging, ActorRef, Stash, Terminated }
import pekko.annotation.InternalApi
diff --git a/actor/src/main/scala/org/apache/pekko/io/dns/internal/package.scala b/actor/src/main/scala/org/apache/pekko/io/dns/internal/package.scala
index e5986a2a2b..c6ec2c8735 100644
--- a/actor/src/main/scala/org/apache/pekko/io/dns/internal/package.scala
+++ b/actor/src/main/scala/org/apache/pekko/io/dns/internal/package.scala
@@ -16,6 +16,7 @@ package org.apache.pekko.io.dns
import java.nio.ByteOrder
import org.apache.pekko
+
import pekko.annotation.InternalApi
import pekko.io.dns.CachePolicy.{ CachePolicy, Forever, Never, Ttl }
diff --git a/actor/src/main/scala/org/apache/pekko/japi/JavaAPI.scala b/actor/src/main/scala/org/apache/pekko/japi/JavaAPI.scala
index d89ac697b4..a533ec7518 100644
--- a/actor/src/main/scala/org/apache/pekko/japi/JavaAPI.scala
+++ b/actor/src/main/scala/org/apache/pekko/japi/JavaAPI.scala
@@ -19,6 +19,7 @@ import scala.runtime.AbstractPartialFunction
import scala.util.control.NoStackTrace
import org.apache.pekko
+
import pekko.util.Collections.EmptyImmutableSeq
/**
diff --git a/actor/src/main/scala/org/apache/pekko/japi/pf/CaseStatements.scala b/actor/src/main/scala/org/apache/pekko/japi/pf/CaseStatements.scala
index f7f4b06b16..1d90129fa8 100644
--- a/actor/src/main/scala/org/apache/pekko/japi/pf/CaseStatements.scala
+++ b/actor/src/main/scala/org/apache/pekko/japi/pf/CaseStatements.scala
@@ -14,6 +14,7 @@
package org.apache.pekko.japi.pf
import org.apache.pekko
+
import pekko.japi.function.{ Function, Predicate, Procedure }
private[pf] object CaseStatement {
diff --git a/actor/src/main/scala/org/apache/pekko/pattern/AskSupport.scala b/actor/src/main/scala/org/apache/pekko/pattern/AskSupport.scala
index b3d8333505..4c97ef4fbc 100644
--- a/actor/src/main/scala/org/apache/pekko/pattern/AskSupport.scala
+++ b/actor/src/main/scala/org/apache/pekko/pattern/AskSupport.scala
@@ -19,13 +19,14 @@ import java.util.concurrent.TimeoutException
import scala.annotation.{ nowarn, tailrec }
import scala.collection.immutable
-import scala.concurrent.{ Future, Promise }
import scala.concurrent.ExecutionContext
+import scala.concurrent.{ Future, Promise }
import scala.language.implicitConversions
-import scala.util.{ Failure, Success }
import scala.util.control.NoStackTrace
+import scala.util.{ Failure, Success }
import org.apache.pekko
+
import pekko.actor._
import pekko.annotation.{ InternalApi, InternalStableApi }
import pekko.dispatch.sysmsg._
diff --git a/actor/src/main/scala/org/apache/pekko/pattern/BackoffOptions.scala b/actor/src/main/scala/org/apache/pekko/pattern/BackoffOptions.scala
index 9638b82553..1ece35be72 100644
--- a/actor/src/main/scala/org/apache/pekko/pattern/BackoffOptions.scala
+++ b/actor/src/main/scala/org/apache/pekko/pattern/BackoffOptions.scala
@@ -17,6 +17,7 @@ import scala.concurrent.duration.{ Duration, FiniteDuration }
import scala.jdk.DurationConverters._
import org.apache.pekko
+
import pekko.actor.{ ActorRef, OneForOneStrategy, Props, SupervisorStrategy }
import pekko.annotation.{ DoNotInherit, InternalApi }
import pekko.pattern.internal.{ BackoffOnRestartSupervisor, BackoffOnStopSupervisor }
diff --git a/actor/src/main/scala/org/apache/pekko/pattern/BackoffSupervisor.scala b/actor/src/main/scala/org/apache/pekko/pattern/BackoffSupervisor.scala
index 4214ba65ca..9bf01d9a0b 100644
--- a/actor/src/main/scala/org/apache/pekko/pattern/BackoffSupervisor.scala
+++ b/actor/src/main/scala/org/apache/pekko/pattern/BackoffSupervisor.scala
@@ -16,6 +16,7 @@ package org.apache.pekko.pattern
import java.util.Optional
import org.apache.pekko
+
import pekko.actor.{ ActorRef, DeadLetterSuppression, Props }
import pekko.annotation.InternalApi
diff --git a/actor/src/main/scala/org/apache/pekko/pattern/CircuitBreaker.scala b/actor/src/main/scala/org/apache/pekko/pattern/CircuitBreaker.scala
index 2a7b8b7b52..f8996017b9 100644
--- a/actor/src/main/scala/org/apache/pekko/pattern/CircuitBreaker.scala
+++ b/actor/src/main/scala/org/apache/pekko/pattern/CircuitBreaker.scala
@@ -14,23 +14,24 @@
package org.apache.pekko.pattern
import java.util.Optional
-import java.util.concurrent.{ Callable, CompletionException, CompletionStage, CopyOnWriteArrayList, ThreadLocalRandom }
import java.util.concurrent.atomic.{ AtomicBoolean, AtomicInteger, AtomicLong }
+import java.util.concurrent.{ Callable, CompletionException, CompletionStage, CopyOnWriteArrayList, ThreadLocalRandom }
import java.util.function.BiFunction
import java.util.function.Consumer
import scala.annotation.nowarn
-import scala.concurrent.{ Await, ExecutionContext, Future, Promise }
import scala.concurrent.ExecutionContext.parasitic
import scala.concurrent.TimeoutException
import scala.concurrent.duration._
+import scala.concurrent.{ Await, ExecutionContext, Future, Promise }
import scala.jdk.DurationConverters._
import scala.jdk.FutureConverters._
-import scala.util.{ Failure, Success, Try }
import scala.util.control.NoStackTrace
import scala.util.control.NonFatal
+import scala.util.{ Failure, Success, Try }
import org.apache.pekko
+
import pekko.PekkoException
import pekko.actor.{ ExtendedActorSystem, Scheduler }
import pekko.annotation.InternalApi
diff --git a/actor/src/main/scala/org/apache/pekko/pattern/CircuitBreakersRegistry.scala b/actor/src/main/scala/org/apache/pekko/pattern/CircuitBreakersRegistry.scala
index 2298537643..6e6f59e6b5 100644
--- a/actor/src/main/scala/org/apache/pekko/pattern/CircuitBreakersRegistry.scala
+++ b/actor/src/main/scala/org/apache/pekko/pattern/CircuitBreakersRegistry.scala
@@ -19,6 +19,7 @@ import scala.concurrent.duration.{ DurationLong, MILLISECONDS }
import scala.jdk.CollectionConverters._
import org.apache.pekko
+
import pekko.actor.{
ActorSystem,
ClassicActorSystemProvider,
diff --git a/actor/src/main/scala/org/apache/pekko/pattern/FutureTimeoutSupport.scala b/actor/src/main/scala/org/apache/pekko/pattern/FutureTimeoutSupport.scala
index 3e696758f9..b1706f6ad0 100644
--- a/actor/src/main/scala/org/apache/pekko/pattern/FutureTimeoutSupport.scala
+++ b/actor/src/main/scala/org/apache/pekko/pattern/FutureTimeoutSupport.scala
@@ -15,11 +15,12 @@ package org.apache.pekko.pattern
import java.util.concurrent.{ CompletableFuture, CompletionStage, TimeoutException }
-import scala.concurrent.{ ExecutionContext, Future, Promise }
import scala.concurrent.duration.FiniteDuration
+import scala.concurrent.{ ExecutionContext, Future, Promise }
import scala.util.control.NonFatal
import org.apache.pekko
+
import pekko.actor._
trait FutureTimeoutSupport {
diff --git a/actor/src/main/scala/org/apache/pekko/pattern/GracefulStopSupport.scala b/actor/src/main/scala/org/apache/pekko/pattern/GracefulStopSupport.scala
index 04204448df..b809531958 100644
--- a/actor/src/main/scala/org/apache/pekko/pattern/GracefulStopSupport.scala
+++ b/actor/src/main/scala/org/apache/pekko/pattern/GracefulStopSupport.scala
@@ -18,6 +18,7 @@ import scala.concurrent.Future
import scala.concurrent.duration.FiniteDuration
import org.apache.pekko
+
import pekko.actor._
import pekko.dispatch.sysmsg.{ Unwatch, Watch }
import pekko.util.Timeout
diff --git a/actor/src/main/scala/org/apache/pekko/pattern/HandleBackoff.scala b/actor/src/main/scala/org/apache/pekko/pattern/HandleBackoff.scala
index 60755e6e69..b44ddada97 100644
--- a/actor/src/main/scala/org/apache/pekko/pattern/HandleBackoff.scala
+++ b/actor/src/main/scala/org/apache/pekko/pattern/HandleBackoff.scala
@@ -14,6 +14,7 @@
package org.apache.pekko.pattern
import org.apache.pekko
+
import pekko.actor.{ Actor, ActorRef, Props }
import pekko.annotation.InternalApi
diff --git a/actor/src/main/scala/org/apache/pekko/pattern/Patterns.scala b/actor/src/main/scala/org/apache/pekko/pattern/Patterns.scala
index 54cbd22916..4d6c05aa5a 100644
--- a/actor/src/main/scala/org/apache/pekko/pattern/Patterns.scala
+++ b/actor/src/main/scala/org/apache/pekko/pattern/Patterns.scala
@@ -23,6 +23,7 @@ import scala.jdk.DurationConverters._
import scala.jdk.FutureConverters._
import org.apache.pekko
+
import pekko.actor.{ ActorSelection, ClassicActorSystemProvider, Scheduler }
/**
diff --git a/actor/src/main/scala/org/apache/pekko/pattern/PipeToSupport.scala b/actor/src/main/scala/org/apache/pekko/pattern/PipeToSupport.scala
index a254b8fba1..877478c52c 100644
--- a/actor/src/main/scala/org/apache/pekko/pattern/PipeToSupport.scala
+++ b/actor/src/main/scala/org/apache/pekko/pattern/PipeToSupport.scala
@@ -19,9 +19,9 @@ import scala.annotation.nowarn
import scala.concurrent.{ ExecutionContext, Future }
import scala.util.{ Failure, Success }
-import language.implicitConversions
-
import org.apache.pekko
+
+import language.implicitConversions
import pekko.actor.{ Actor, ActorRef, Status }
import pekko.actor.ActorSelection
diff --git a/actor/src/main/scala/org/apache/pekko/pattern/PromiseRef.scala b/actor/src/main/scala/org/apache/pekko/pattern/PromiseRef.scala
index db2b22238f..6f1501fc37 100644
--- a/actor/src/main/scala/org/apache/pekko/pattern/PromiseRef.scala
+++ b/actor/src/main/scala/org/apache/pekko/pattern/PromiseRef.scala
@@ -16,6 +16,7 @@ package org.apache.pekko.pattern
import scala.concurrent.{ Future, Promise }
import org.apache.pekko
+
import pekko.actor._
import pekko.util.Timeout
diff --git a/actor/src/main/scala/org/apache/pekko/pattern/RetrySupport.scala b/actor/src/main/scala/org/apache/pekko/pattern/RetrySupport.scala
index 16f842238e..82cf3dfc47 100644
--- a/actor/src/main/scala/org/apache/pekko/pattern/RetrySupport.scala
+++ b/actor/src/main/scala/org/apache/pekko/pattern/RetrySupport.scala
@@ -15,12 +15,13 @@ package org.apache.pekko.pattern
import java.util.concurrent.ThreadLocalRandom
-import scala.concurrent.{ ExecutionContext, Future }
import scala.concurrent.duration.{ Duration, FiniteDuration }
-import scala.util.{ Failure, Success, Try }
+import scala.concurrent.{ ExecutionContext, Future }
import scala.util.control.NonFatal
+import scala.util.{ Failure, Success, Try }
import org.apache.pekko
+
import pekko.actor.Scheduler
import pekko.util.ConstantFun
diff --git a/actor/src/main/scala/org/apache/pekko/pattern/StatusReply.scala b/actor/src/main/scala/org/apache/pekko/pattern/StatusReply.scala
index fbba788aaa..d319d2efaf 100644
--- a/actor/src/main/scala/org/apache/pekko/pattern/StatusReply.scala
+++ b/actor/src/main/scala/org/apache/pekko/pattern/StatusReply.scala
@@ -15,12 +15,13 @@ package org.apache.pekko.pattern
import scala.concurrent.ExecutionContext
import scala.concurrent.Future
-import scala.util.{ Failure => ScalaFailure }
-import scala.util.{ Success => ScalaSuccess }
import scala.util.Try
import scala.util.control.{ NoStackTrace, NonFatal }
+import scala.util.{ Failure => ScalaFailure }
+import scala.util.{ Success => ScalaSuccess }
import org.apache.pekko
+
import pekko.Done
import pekko.actor.InvalidMessageException
import pekko.annotation.InternalApi
diff --git a/actor/src/main/scala/org/apache/pekko/pattern/internal/BackoffOnRestartSupervisor.scala b/actor/src/main/scala/org/apache/pekko/pattern/internal/BackoffOnRestartSupervisor.scala
index 3c9b8ffe76..11cc469d6a 100644
--- a/actor/src/main/scala/org/apache/pekko/pattern/internal/BackoffOnRestartSupervisor.scala
+++ b/actor/src/main/scala/org/apache/pekko/pattern/internal/BackoffOnRestartSupervisor.scala
@@ -16,6 +16,7 @@ package org.apache.pekko.pattern.internal
import scala.concurrent.duration._
import org.apache.pekko
+
import pekko.actor.{ OneForOneStrategy, _ }
import pekko.actor.SupervisorStrategy._
import pekko.annotation.InternalApi
diff --git a/actor/src/main/scala/org/apache/pekko/pattern/internal/BackoffOnStopSupervisor.scala b/actor/src/main/scala/org/apache/pekko/pattern/internal/BackoffOnStopSupervisor.scala
index 20f6ff6585..a1d707a7bd 100644
--- a/actor/src/main/scala/org/apache/pekko/pattern/internal/BackoffOnStopSupervisor.scala
+++ b/actor/src/main/scala/org/apache/pekko/pattern/internal/BackoffOnStopSupervisor.scala
@@ -16,6 +16,7 @@ package org.apache.pekko.pattern.internal
import scala.concurrent.duration.FiniteDuration
import org.apache.pekko
+
import pekko.actor.{ Actor, ActorLogging, OneForOneStrategy, Props, SupervisorStrategy, Terminated }
import pekko.actor.SupervisorStrategy.{ Directive, Escalate }
import pekko.annotation.InternalApi
diff --git a/actor/src/main/scala/org/apache/pekko/pattern/internal/CircuitBreakerTelemetry.scala b/actor/src/main/scala/org/apache/pekko/pattern/internal/CircuitBreakerTelemetry.scala
index e801fb2027..2f7dfcf542 100644
--- a/actor/src/main/scala/org/apache/pekko/pattern/internal/CircuitBreakerTelemetry.scala
+++ b/actor/src/main/scala/org/apache/pekko/pattern/internal/CircuitBreakerTelemetry.scala
@@ -18,6 +18,7 @@ import java.util.{ List => JList }
import scala.jdk.CollectionConverters._
import org.apache.pekko
+
import pekko.actor.ExtendedActorSystem
import pekko.annotation.{ InternalApi, InternalStableApi }
diff --git a/actor/src/main/scala/org/apache/pekko/routing/Balancing.scala b/actor/src/main/scala/org/apache/pekko/routing/Balancing.scala
index 309001dd4b..4e60ea0961 100644
--- a/actor/src/main/scala/org/apache/pekko/routing/Balancing.scala
+++ b/actor/src/main/scala/org/apache/pekko/routing/Balancing.scala
@@ -17,6 +17,10 @@ import scala.annotation.nowarn
import scala.collection.immutable
import org.apache.pekko
+
+import com.typesafe.config.Config
+import com.typesafe.config.ConfigFactory
+
import pekko.actor.ActorContext
import pekko.actor.ActorSystem
import pekko.actor.Props
@@ -24,9 +28,6 @@ import pekko.actor.SupervisorStrategy
import pekko.dispatch.BalancingDispatcherConfigurator
import pekko.dispatch.Dispatchers
-import com.typesafe.config.Config
-import com.typesafe.config.ConfigFactory
-
/**
* INTERNAL API
*/
diff --git a/actor/src/main/scala/org/apache/pekko/routing/Broadcast.scala b/actor/src/main/scala/org/apache/pekko/routing/Broadcast.scala
index 191e070e50..80c547a176 100644
--- a/actor/src/main/scala/org/apache/pekko/routing/Broadcast.scala
+++ b/actor/src/main/scala/org/apache/pekko/routing/Broadcast.scala
@@ -17,13 +17,14 @@ import scala.annotation.nowarn
import scala.collection.immutable
import org.apache.pekko
+
+import com.typesafe.config.Config
+
import pekko.actor.ActorSystem
import pekko.actor.SupervisorStrategy
import pekko.dispatch.Dispatchers
import pekko.japi.Util.immutableSeq
-import com.typesafe.config.Config
-
object BroadcastRoutingLogic {
def apply(): BroadcastRoutingLogic = new BroadcastRoutingLogic
}
diff --git a/actor/src/main/scala/org/apache/pekko/routing/ConsistentHashing.scala b/actor/src/main/scala/org/apache/pekko/routing/ConsistentHashing.scala
index f4d50b527f..939e8dccae 100644
--- a/actor/src/main/scala/org/apache/pekko/routing/ConsistentHashing.scala
+++ b/actor/src/main/scala/org/apache/pekko/routing/ConsistentHashing.scala
@@ -19,6 +19,9 @@ import scala.collection.immutable
import scala.util.control.NonFatal
import org.apache.pekko
+
+import com.typesafe.config.Config
+
import pekko.actor.ActorPath
import pekko.actor.ActorSystem
import pekko.actor.Address
@@ -31,8 +34,6 @@ import pekko.event.Logging
import pekko.japi.Util.immutableSeq
import pekko.serialization.SerializationExtension
-import com.typesafe.config.Config
-
object ConsistentHashingRouter {
/**
diff --git a/actor/src/main/scala/org/apache/pekko/routing/OptimalSizeExploringResizer.scala b/actor/src/main/scala/org/apache/pekko/routing/OptimalSizeExploringResizer.scala
index de1e5bf192..118abeb258 100644
--- a/actor/src/main/scala/org/apache/pekko/routing/OptimalSizeExploringResizer.scala
+++ b/actor/src/main/scala/org/apache/pekko/routing/OptimalSizeExploringResizer.scala
@@ -20,14 +20,14 @@ import scala.collection.immutable
import scala.concurrent.duration._
import scala.jdk.DurationConverters._
-import OptimalSizeExploringResizer._
-
import org.apache.pekko
-import pekko.actor._
-import pekko.annotation.InternalApi
import com.typesafe.config.Config
+import OptimalSizeExploringResizer._
+import pekko.actor._
+import pekko.annotation.InternalApi
+
trait OptimalSizeExploringResizer extends Resizer {
/**
diff --git a/actor/src/main/scala/org/apache/pekko/routing/Random.scala b/actor/src/main/scala/org/apache/pekko/routing/Random.scala
index 451e74888c..50cc41e08d 100644
--- a/actor/src/main/scala/org/apache/pekko/routing/Random.scala
+++ b/actor/src/main/scala/org/apache/pekko/routing/Random.scala
@@ -19,13 +19,14 @@ import scala.annotation.nowarn
import scala.collection.immutable
import org.apache.pekko
+
+import com.typesafe.config.Config
+
import pekko.actor.ActorSystem
import pekko.actor.SupervisorStrategy
import pekko.dispatch.Dispatchers
import pekko.japi.Util.immutableSeq
-import com.typesafe.config.Config
-
object RandomRoutingLogic {
def apply(): RandomRoutingLogic = new RandomRoutingLogic
}
diff --git a/actor/src/main/scala/org/apache/pekko/routing/Resizer.scala b/actor/src/main/scala/org/apache/pekko/routing/Resizer.scala
index 0addb8c6d8..2cdd3a1d31 100644
--- a/actor/src/main/scala/org/apache/pekko/routing/Resizer.scala
+++ b/actor/src/main/scala/org/apache/pekko/routing/Resizer.scala
@@ -19,6 +19,9 @@ import java.util.concurrent.atomic.AtomicLong
import scala.collection.immutable
import org.apache.pekko
+
+import com.typesafe.config.Config
+
import pekko.PekkoException
import pekko.actor.Actor
import pekko.actor.ActorCell
@@ -31,8 +34,6 @@ import pekko.actor.SupervisorStrategy
import pekko.dispatch.Envelope
import pekko.dispatch.MessageDispatcher
-import com.typesafe.config.Config
-
/**
* [[Pool]] routers with dynamically resizable number of routees are implemented by providing a Resizer
* implementation in the [[pekko.routing.Pool]] configuration.
diff --git a/actor/src/main/scala/org/apache/pekko/routing/RoundRobin.scala b/actor/src/main/scala/org/apache/pekko/routing/RoundRobin.scala
index 7d06eefe08..9908fdc2fe 100644
--- a/actor/src/main/scala/org/apache/pekko/routing/RoundRobin.scala
+++ b/actor/src/main/scala/org/apache/pekko/routing/RoundRobin.scala
@@ -19,13 +19,14 @@ import scala.annotation.nowarn
import scala.collection.immutable
import org.apache.pekko
+
+import com.typesafe.config.Config
+
import pekko.actor.ActorSystem
import pekko.actor.SupervisorStrategy
import pekko.dispatch.Dispatchers
import pekko.japi.Util.immutableSeq
-import com.typesafe.config.Config
-
object RoundRobinRoutingLogic {
def apply(): RoundRobinRoutingLogic = new RoundRobinRoutingLogic
}
diff --git a/actor/src/main/scala/org/apache/pekko/routing/RoutedActorCell.scala b/actor/src/main/scala/org/apache/pekko/routing/RoutedActorCell.scala
index 5150037ef5..db902fbfd6 100644
--- a/actor/src/main/scala/org/apache/pekko/routing/RoutedActorCell.scala
+++ b/actor/src/main/scala/org/apache/pekko/routing/RoutedActorCell.scala
@@ -17,6 +17,7 @@ import scala.collection.immutable
import scala.concurrent.duration._
import org.apache.pekko
+
import pekko.actor.Actor
import pekko.actor.ActorCell
import pekko.actor.ActorInitializationException
diff --git a/actor/src/main/scala/org/apache/pekko/routing/RoutedActorRef.scala b/actor/src/main/scala/org/apache/pekko/routing/RoutedActorRef.scala
index 9a95bd2b59..6486e38b0f 100644
--- a/actor/src/main/scala/org/apache/pekko/routing/RoutedActorRef.scala
+++ b/actor/src/main/scala/org/apache/pekko/routing/RoutedActorRef.scala
@@ -16,6 +16,7 @@ package org.apache.pekko.routing
import scala.annotation.nowarn
import org.apache.pekko
+
import pekko.ConfigurationException
import pekko.actor.ActorPath
import pekko.actor.ActorSystemImpl
diff --git a/actor/src/main/scala/org/apache/pekko/routing/Router.scala b/actor/src/main/scala/org/apache/pekko/routing/Router.scala
index 32516e45da..e2949757a7 100644
--- a/actor/src/main/scala/org/apache/pekko/routing/Router.scala
+++ b/actor/src/main/scala/org/apache/pekko/routing/Router.scala
@@ -16,6 +16,7 @@ package org.apache.pekko.routing
import scala.collection.immutable
import org.apache.pekko
+
import pekko.actor.ActorRef
import pekko.actor.ActorSelection
import pekko.actor.InternalActorRef
diff --git a/actor/src/main/scala/org/apache/pekko/routing/RouterConfig.scala b/actor/src/main/scala/org/apache/pekko/routing/RouterConfig.scala
index db84b801e2..3c00b4b944 100644
--- a/actor/src/main/scala/org/apache/pekko/routing/RouterConfig.scala
+++ b/actor/src/main/scala/org/apache/pekko/routing/RouterConfig.scala
@@ -17,6 +17,7 @@ import scala.annotation.nowarn
import scala.collection.immutable
import org.apache.pekko
+
import pekko.ConfigurationException
import pekko.actor.ActorContext
import pekko.actor.ActorPath
diff --git a/actor/src/main/scala/org/apache/pekko/routing/ScatterGatherFirstCompleted.scala b/actor/src/main/scala/org/apache/pekko/routing/ScatterGatherFirstCompleted.scala
index a82323e474..e2548fbca9 100644
--- a/actor/src/main/scala/org/apache/pekko/routing/ScatterGatherFirstCompleted.scala
+++ b/actor/src/main/scala/org/apache/pekko/routing/ScatterGatherFirstCompleted.scala
@@ -23,6 +23,9 @@ import scala.concurrent.duration.FiniteDuration
import scala.jdk.DurationConverters._
import org.apache.pekko
+
+import com.typesafe.config.Config
+
import pekko.actor.ActorRef
import pekko.actor.ActorSystem
import pekko.actor.SupervisorStrategy
@@ -33,8 +36,6 @@ import pekko.pattern.pipe
import pekko.util.Helpers.ConfigOps
import pekko.util.Timeout
-import com.typesafe.config.Config
-
/**
* Broadcasts the message to all routees, and replies with the first response.
*
diff --git a/actor/src/main/scala/org/apache/pekko/routing/SmallestMailbox.scala b/actor/src/main/scala/org/apache/pekko/routing/SmallestMailbox.scala
index 6485704d79..2bbbd540c0 100644
--- a/actor/src/main/scala/org/apache/pekko/routing/SmallestMailbox.scala
+++ b/actor/src/main/scala/org/apache/pekko/routing/SmallestMailbox.scala
@@ -20,14 +20,15 @@ import scala.annotation.tailrec
import scala.collection.immutable
import org.apache.pekko
+
+import com.typesafe.config.Config
+
import pekko.actor.ActorCell
import pekko.actor.ActorRefWithCell
import pekko.actor.ActorSystem
import pekko.actor.SupervisorStrategy
import pekko.dispatch.Dispatchers
-import com.typesafe.config.Config
-
object SmallestMailboxRoutingLogic {
def apply(): SmallestMailboxRoutingLogic = new SmallestMailboxRoutingLogic
}
diff --git a/actor/src/main/scala/org/apache/pekko/routing/TailChopping.scala b/actor/src/main/scala/org/apache/pekko/routing/TailChopping.scala
index 7c6fbe38d7..41bbd59a02 100644
--- a/actor/src/main/scala/org/apache/pekko/routing/TailChopping.scala
+++ b/actor/src/main/scala/org/apache/pekko/routing/TailChopping.scala
@@ -16,21 +16,22 @@ package org.apache.pekko.routing
import java.util.concurrent.atomic.AtomicInteger
import scala.collection.immutable
-import scala.concurrent.{ ExecutionContext, Promise }
import scala.concurrent.duration._
+import scala.concurrent.{ ExecutionContext, Promise }
import scala.jdk.DurationConverters._
import scala.util.Random
import org.apache.pekko
+
+import com.typesafe.config.Config
+
import pekko.actor._
import pekko.dispatch.Dispatchers
import pekko.japi.Util.immutableSeq
-import pekko.pattern.{ ask, pipe, AskTimeoutException }
+import pekko.pattern.{ AskTimeoutException, ask, pipe }
import pekko.util.Helpers.ConfigOps
import pekko.util.Timeout
-import com.typesafe.config.Config
-
/**
* As each message is sent to the router, the routees are randomly ordered. The message is sent to the
* first routee. If no response is received before the `interval` has passed, the same message is sent
diff --git a/actor/src/main/scala/org/apache/pekko/serialization/AsyncSerializer.scala b/actor/src/main/scala/org/apache/pekko/serialization/AsyncSerializer.scala
index b0051a612b..cee1937c30 100644
--- a/actor/src/main/scala/org/apache/pekko/serialization/AsyncSerializer.scala
+++ b/actor/src/main/scala/org/apache/pekko/serialization/AsyncSerializer.scala
@@ -15,10 +15,11 @@ package org.apache.pekko.serialization
import java.util.concurrent.CompletionStage
-import scala.concurrent.{ Await, Future }
import scala.concurrent.duration.Duration
+import scala.concurrent.{ Await, Future }
import org.apache.pekko
+
import pekko.actor.ExtendedActorSystem
import pekko.event.Logging
diff --git a/actor/src/main/scala/org/apache/pekko/serialization/PrimitiveSerializers.scala b/actor/src/main/scala/org/apache/pekko/serialization/PrimitiveSerializers.scala
index 224046002e..ac316d1077 100644
--- a/actor/src/main/scala/org/apache/pekko/serialization/PrimitiveSerializers.scala
+++ b/actor/src/main/scala/org/apache/pekko/serialization/PrimitiveSerializers.scala
@@ -13,10 +13,11 @@
package org.apache.pekko.serialization
-import java.nio.{ BufferOverflowException, ByteBuffer }
import java.nio.charset.StandardCharsets
+import java.nio.{ BufferOverflowException, ByteBuffer }
import org.apache.pekko
+
import pekko.actor.ExtendedActorSystem
import pekko.annotation.InternalApi
import pekko.util.ByteString
diff --git a/actor/src/main/scala/org/apache/pekko/serialization/Serialization.scala b/actor/src/main/scala/org/apache/pekko/serialization/Serialization.scala
index 9515ec1b23..2f8257bfaa 100644
--- a/actor/src/main/scala/org/apache/pekko/serialization/Serialization.scala
+++ b/actor/src/main/scala/org/apache/pekko/serialization/Serialization.scala
@@ -22,17 +22,18 @@ import java.util.concurrent.atomic.AtomicReference
import scala.annotation.tailrec
import scala.collection.immutable
import scala.collection.mutable.ArrayBuffer
-import scala.util.{ DynamicVariable, Failure, Try }
import scala.util.Success
import scala.util.control.NonFatal
+import scala.util.{ DynamicVariable, Failure, Try }
import org.apache.pekko
+
+import com.typesafe.config.Config
+
import pekko.actor._
import pekko.annotation.InternalApi
import pekko.event.{ LogMarker, Logging, LoggingAdapter }
-import com.typesafe.config.Config
-
object Serialization {
private final val PekkoPackagePrefix = "org.apache.pekko."
diff --git a/actor/src/main/scala/org/apache/pekko/serialization/SerializationExtension.scala b/actor/src/main/scala/org/apache/pekko/serialization/SerializationExtension.scala
index 28eec511da..32e54994c3 100644
--- a/actor/src/main/scala/org/apache/pekko/serialization/SerializationExtension.scala
+++ b/actor/src/main/scala/org/apache/pekko/serialization/SerializationExtension.scala
@@ -14,6 +14,7 @@
package org.apache.pekko.serialization
import org.apache.pekko
+
import pekko.actor.{ ActorSystem, ExtendedActorSystem, ExtensionId, ExtensionIdProvider }
import pekko.actor.ClassicActorSystemProvider
diff --git a/actor/src/main/scala/org/apache/pekko/serialization/SerializationSetup.scala b/actor/src/main/scala/org/apache/pekko/serialization/SerializationSetup.scala
index 0e32bd811f..b603531950 100644
--- a/actor/src/main/scala/org/apache/pekko/serialization/SerializationSetup.scala
+++ b/actor/src/main/scala/org/apache/pekko/serialization/SerializationSetup.scala
@@ -17,6 +17,7 @@ import scala.collection.immutable
import scala.jdk.CollectionConverters._
import org.apache.pekko
+
import pekko.actor.ExtendedActorSystem
import pekko.actor.setup.Setup
diff --git a/actor/src/main/scala/org/apache/pekko/serialization/Serializer.scala b/actor/src/main/scala/org/apache/pekko/serialization/Serializer.scala
index 39275ef6a7..5e96168a15 100644
--- a/actor/src/main/scala/org/apache/pekko/serialization/Serializer.scala
+++ b/actor/src/main/scala/org/apache/pekko/serialization/Serializer.scala
@@ -23,6 +23,7 @@ import scala.util.DynamicVariable
import scala.util.control.NoStackTrace
import org.apache.pekko
+
import pekko.actor.ExtendedActorSystem
import pekko.annotation.InternalApi
import pekko.event.LogMarker
diff --git a/actor/src/main/scala/org/apache/pekko/util/BoundedBlockingQueue.scala b/actor/src/main/scala/org/apache/pekko/util/BoundedBlockingQueue.scala
index a51e2cbb62..cd22d4e8a5 100644
--- a/actor/src/main/scala/org/apache/pekko/util/BoundedBlockingQueue.scala
+++ b/actor/src/main/scala/org/apache/pekko/util/BoundedBlockingQueue.scala
@@ -13,9 +13,9 @@
package org.apache.pekko.util
-import java.util.{ AbstractQueue, Collection, Iterator, Queue }
-import java.util.concurrent.{ BlockingQueue, TimeUnit }
import java.util.concurrent.locks.{ Condition, ReentrantLock }
+import java.util.concurrent.{ BlockingQueue, TimeUnit }
+import java.util.{ AbstractQueue, Collection, Iterator, Queue }
import annotation.tailrec
diff --git a/actor/src/main/scala/org/apache/pekko/util/ByteString.scala b/actor/src/main/scala/org/apache/pekko/util/ByteString.scala
index e835387dd8..83734da1bb 100644
--- a/actor/src/main/scala/org/apache/pekko/util/ByteString.scala
+++ b/actor/src/main/scala/org/apache/pekko/util/ByteString.scala
@@ -15,14 +15,14 @@ package org.apache.pekko.util
import java.io.{ InputStream, ObjectInputStream, ObjectOutputStream, SequenceInputStream }
import java.lang.{ Iterable => JIterable }
-import java.nio.{ ByteBuffer, ByteOrder }
import java.nio.charset.{ Charset, StandardCharsets }
+import java.nio.{ ByteBuffer, ByteOrder }
import java.util.Base64
import scala.annotation.{ nowarn, tailrec, varargs }
-import scala.collection.{ immutable, mutable }
import scala.collection.immutable.{ IndexedSeq, IndexedSeqOps, StrictOptimizedSeqOps, VectorBuilder }
import scala.collection.mutable.{ Builder, WrappedArray }
+import scala.collection.{ immutable, mutable }
import scala.jdk.CollectionConverters._
... 27052 lines suppressed ...
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@pekko.apache.org
For additional commands, e-mail: commits-help@pekko.apache.org