You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pekko.apache.org by en...@apache.org on 2025/06/24 08:27:19 UTC

(pekko) branch main updated: chore: bump scalafmt to 3.9.7 (#1916)

This is an automated email from the ASF dual-hosted git repository.

engelen pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/pekko.git


The following commit(s) were added to refs/heads/main by this push:
     new 9577b01b10 chore: bump scalafmt to 3.9.7 (#1916)
9577b01b10 is described below

commit 9577b01b1005bd39eff05dfa2aa7212905605e7d
Author: He-Pin(kerr) <he...@gmail.com>
AuthorDate: Tue Jun 24 16:27:14 2025 +0800

    chore: bump scalafmt to 3.9.7 (#1916)
---
 .scalafmt.conf                                     |  2 +-
 .../typed/internal/BehaviorTestKitImpl.scala       |  2 +-
 .../testkit/typed/internal/CapturingAppender.scala |  2 +-
 .../actor/testkit/typed/internal/LogbackUtil.scala |  2 +-
 .../typed/internal/StubbedActorContext.scala       |  2 +-
 .../testkit/typed/internal/TestAppender.scala      |  2 +-
 .../testkit/typed/internal/TestProbeImpl.scala     |  4 +-
 .../actor/testkit/typed/javadsl/ManualTime.scala   |  2 +-
 .../actor/testkit/typed/scaladsl/ManualTime.scala  |  2 +-
 .../typed/scaladsl/BehaviorTestKitSpec.scala       |  6 +--
 .../org/apache/pekko/actor/ActorRefSpec.scala      |  6 +--
 .../org/apache/pekko/actor/DeathWatchSpec.scala    |  4 +-
 .../org/apache/pekko/actor/DynamicAccessSpec.scala |  2 +-
 .../scala/org/apache/pekko/actor/HotSwapSpec.scala |  2 +-
 .../apache/pekko/actor/ReceiveTimeoutSpec.scala    |  2 +-
 .../pekko/actor/SupervisorHierarchySpec.scala      |  8 ++--
 .../org/apache/pekko/actor/SupervisorSpec.scala    |  2 +-
 .../pekko/actor/dispatch/ActorModelSpec.scala      |  2 +-
 .../apache/pekko/dispatch/MailboxConfigSpec.scala  |  6 +--
 .../pekko/pattern/BackoffSupervisorSpec.scala      |  2 +-
 .../org/apache/pekko/routing/BroadcastSpec.scala   |  2 +-
 .../apache/pekko/routing/RouteeCreationSpec.scala  |  5 +-
 .../routing/ScatterGatherFirstCompletedSpec.scala  |  2 +-
 .../apache/pekko/routing/TailChoppingSpec.scala    |  2 +-
 .../pekko/actor/typed/ActorContextSpec.scala       |  2 +-
 .../org/apache/pekko/actor/typed/OrElseSpec.scala  |  2 +-
 .../apache/pekko/actor/typed/SupervisionSpec.scala |  4 +-
 .../actor/typed/delivery/TestProducerWithAsk.scala |  2 +-
 .../actor/typed/scaladsl/ActorLoggingSpec.scala    |  4 +-
 .../pekko/actor/typed/scaladsl/StashSpec.scala     |  2 +-
 .../actor/typed/scaladsl/adapter/AdapterSpec.scala |  4 +-
 .../org/apache/pekko/actor/typed/Behavior.scala    |  4 +-
 .../actor/typed/delivery/ProducerController.scala  |  2 +-
 .../delivery/internal/ConsumerControllerImpl.scala |  2 +-
 .../delivery/internal/ProducerControllerImpl.scala |  6 +--
 .../WorkPullingProducerControllerImpl.scala        |  4 +-
 .../actor/typed/internal/ActorContextImpl.scala    |  4 +-
 .../actor/typed/internal/ExtensionsImpl.scala      |  4 +-
 .../pekko/actor/typed/internal/LoggerClass.scala   |  2 +-
 .../typed/internal/MiscMessageSerializer.scala     |  6 +--
 .../internal/adapter/ActorContextAdapter.scala     |  2 +-
 .../typed/internal/adapter/ActorRefAdapter.scala   |  6 +--
 .../typed/internal/adapter/SchedulerAdapter.scala  |  2 +-
 .../receptionist/ServiceKeySerializer.scala        |  4 +-
 .../actor/typed/javadsl/AbstractBehavior.scala     |  2 +-
 .../pekko/actor/typed/scaladsl/AskPattern.scala    |  2 +-
 .../org/apache/pekko/util/ByteString.scala         |  4 +-
 .../org/apache/pekko/util/ByteString.scala         |  4 +-
 .../scala-3/org/apache/pekko/util/ByteString.scala |  4 +-
 .../org/apache/pekko/actor/AbstractProps.scala     |  2 +-
 .../scala/org/apache/pekko/actor/ActorCell.scala   |  2 +-
 .../scala/org/apache/pekko/actor/ActorPath.scala   |  2 +-
 .../scala/org/apache/pekko/actor/ActorRef.scala    | 12 ++---
 .../org/apache/pekko/actor/ActorRefProvider.scala  | 10 ++--
 .../scala/org/apache/pekko/actor/ActorSystem.scala |  2 +-
 .../apache/pekko/actor/CoordinatedShutdown.scala   |  4 +-
 .../scala/org/apache/pekko/actor/Deployer.scala    |  2 +-
 .../main/scala/org/apache/pekko/actor/FSM.scala    |  4 +-
 .../org/apache/pekko/actor/FaultHandling.scala     |  2 +-
 .../pekko/actor/LightArrayRevolverScheduler.scala  | 10 ++--
 .../pekko/actor/ReflectiveDynamicAccess.scala      |  2 +-
 .../apache/pekko/actor/RepointableActorRef.scala   |  4 +-
 .../scala/org/apache/pekko/actor/Scheduler.scala   |  4 +-
 .../main/scala/org/apache/pekko/actor/Stash.scala  |  2 +-
 .../scala/org/apache/pekko/actor/TypedActor.scala  | 12 ++---
 .../org/apache/pekko/actor/dungeon/Children.scala  |  4 +-
 .../pekko/actor/dungeon/ChildrenContainer.scala    |  2 +-
 .../apache/pekko/actor/dungeon/DeathWatch.scala    |  2 +-
 .../org/apache/pekko/actor/dungeon/Dispatch.scala  |  2 +-
 .../apache/pekko/dispatch/AbstractDispatcher.scala |  6 +--
 .../org/apache/pekko/dispatch/CachingConfig.scala  |  2 +-
 .../org/apache/pekko/dispatch/Dispatchers.scala    |  4 +-
 .../dispatch/ForkJoinExecutorConfigurator.scala    |  4 +-
 .../scala/org/apache/pekko/dispatch/Mailbox.scala  |  2 +-
 .../org/apache/pekko/dispatch/Mailboxes.scala      |  8 ++--
 .../pekko/dispatch/affinity/AffinityPool.scala     |  2 +-
 .../scala/org/apache/pekko/event/EventBus.scala    |  2 +-
 .../scala/org/apache/pekko/event/Logging.scala     |  4 +-
 .../org/apache/pekko/event/jul/JavaLogger.scala    |  2 +-
 .../apache/pekko/io/InetAddressDnsResolver.scala   |  6 +--
 .../scala/org/apache/pekko/io/TcpConnection.scala  | 10 ++--
 .../scala/org/apache/pekko/io/UdpListener.scala    |  2 +-
 .../org/apache/pekko/io/dns/DnsSettings.scala      |  8 ++--
 .../main/scala/org/apache/pekko/japi/JavaAPI.scala |  2 +-
 .../org/apache/pekko/pattern/AskSupport.scala      |  2 +-
 .../pekko/pattern/FutureTimeoutSupport.scala       |  2 +-
 .../org/apache/pekko/pattern/StatusReply.scala     |  2 +-
 .../pattern/internal/BackoffOnStopSupervisor.scala |  2 +-
 .../apache/pekko/routing/ConsistentHashing.scala   |  4 +-
 .../scala/org/apache/pekko/routing/Listeners.scala |  4 +-
 .../scala/org/apache/pekko/routing/Resizer.scala   |  4 +-
 .../org/apache/pekko/routing/RoutedActorCell.scala |  4 +-
 .../apache/pekko/serialization/Serialization.scala |  6 +--
 .../apache/pekko/serialization/Serializer.scala    |  4 +-
 .../apache/pekko/util/BoundedBlockingQueue.scala   |  6 +--
 .../scala/org/apache/pekko/util/HashCode.scala     |  2 +-
 .../org/apache/pekko/util/TypedMultiMap.scala      |  2 +-
 .../org/apache/pekko/util/WildcardIndex.scala      |  6 +--
 .../actor/AffinityPoolComparativeBenchmark.scala   |  2 +-
 .../AffinityPoolRequestResponseBenchmark.scala     |  2 +-
 .../cluster/metrics/ClusterMetricsCollector.scala  |  2 +-
 .../cluster/metrics/ClusterMetricsRouting.scala    |  4 +-
 .../metrics/protobuf/MessageSerializer.scala       | 18 ++++----
 .../pekko/cluster/metrics/sample/StatsWorker.scala |  2 +-
 .../apache/pekko/cluster/metrics/EWMASpec.scala    |  2 +-
 .../cluster/metrics/MetricsCollectorSpec.scala     |  2 +-
 .../internal/ShardingProducerControllerImpl.scala  |  2 +-
 .../internal/ReplicatedShardingExtensionImpl.scala |  2 +-
 .../typed/internal/ShardingSerializer.scala        |  2 +-
 .../AccountExampleWithEventHandlersInState.scala   |  8 ++--
 .../pekko/cluster/sharding/ClusterSharding.scala   |  2 +-
 .../cluster/sharding/ClusterShardingSettings.scala |  4 +-
 .../RemoveInternalClusterShardingData.scala        |  2 +-
 .../org/apache/pekko/cluster/sharding/Shard.scala  | 28 +++++------
 .../pekko/cluster/sharding/ShardCoordinator.scala  |  6 +--
 .../pekko/cluster/sharding/ShardRegion.scala       |  2 +-
 .../ExternalShardAllocationClientImpl.scala        |  4 +-
 .../AbstractLeastShardAllocationStrategy.scala     |  2 +-
 .../EventSourcedRememberEntitiesShardStore.scala   |  2 +-
 .../ClusterShardingMessageSerializer.scala         |  4 +-
 ...ClusterShardingGracefulShutdownOldestSpec.scala |  2 +-
 .../cluster/sharding/ClusterShardingSpec.scala     |  2 +-
 .../sharding/MultiNodeClusterShardingSpec.scala    |  2 +-
 .../sharding/RememberEntitiesFailureSpec.scala     | 32 ++++++-------
 .../passivation/simulator/SimulatorSettings.scala  |  6 +--
 .../pekko/cluster/client/ClusterClient.scala       | 14 +++---
 .../protobuf/ClusterClientMessageSerializer.scala  |  6 +--
 .../cluster/pubsub/DistributedPubSubMediator.scala |  6 +--
 .../DistributedPubSubMessageSerializer.scala       |  8 ++--
 .../singleton/ClusterSingletonManager.scala        |  8 ++--
 .../cluster/singleton/ClusterSingletonProxy.scala  |  4 +-
 .../ClusterSingletonMessageSerializer.scala        |  6 +--
 .../singleton/ClusterSingletonManagerSpec.scala    |  2 +-
 .../ddata/typed/internal/ReplicatorBehavior.scala  |  2 +-
 .../pekko/cluster/typed/ClusterSingleton.scala     |  2 +-
 .../typed/internal/AdaptedClusterImpl.scala        |  2 +-
 .../internal/PekkoClusterTypedSerializer.scala     |  6 +--
 .../delivery/ReliableDeliverySerializer.scala      |  6 +--
 .../receptionist/ClusterReceptionist.scala         |  2 +-
 .../pekko/cluster/typed/PingSerializer.scala       |  2 +-
 .../pekko/cluster/typed/ActorSystemSpec.scala      |  2 +-
 .../org/apache/pekko/cluster/ClusterDaemon.scala   | 26 +++++------
 .../org/apache/pekko/cluster/ClusterReadView.scala |  4 +-
 .../org/apache/pekko/cluster/MembershipState.scala |  2 +-
 .../org/apache/pekko/cluster/Reachability.scala    |  4 +-
 .../org/apache/pekko/cluster/SeedNodeProcess.scala |  2 +-
 .../protobuf/ClusterMessageSerializer.scala        |  6 +--
 .../cluster/routing/ClusterRouterConfig.scala      |  8 ++--
 .../pekko/cluster/sbr/SplitBrainResolver.scala     |  4 +-
 .../cluster/sbr/SplitBrainResolverSettings.scala   |  2 +-
 .../cluster/MembershipChangeListenerUpSpec.scala   |  4 +-
 .../org/apache/pekko/cluster/StreamRefSpec.scala   |  2 +-
 .../org/apache/pekko/cluster/StressSpec.scala      |  4 +-
 .../cluster/SurviveNetworkInstabilitySpec.scala    |  2 +-
 .../lease/scaladsl/LeaseProvider.scala             |  2 +-
 .../cluster/ddata/DeltaPropagationSelector.scala   |  2 +-
 .../apache/pekko/cluster/ddata/DurableStore.scala  |  2 +-
 .../org/apache/pekko/cluster/ddata/ORSet.scala     |  8 ++--
 .../apache/pekko/cluster/ddata/PruningState.scala  |  6 +--
 .../apache/pekko/cluster/ddata/Replicator.scala    |  8 ++--
 .../ddata/protobuf/ReplicatedDataSerializer.scala  | 10 ++--
 .../protobuf/ReplicatorMessageSerializer.scala     | 10 ++--
 .../ddata/protobuf/SerializationSupport.scala      |  2 +-
 .../pekko/cluster/ddata/ReplicatorDeltaSpec.scala  |  2 +-
 .../cluster/ddata/ReplicatorMapDeltaSpec.scala     |  2 +-
 .../apache/pekko/cluster/ddata/LotsOfDataBot.scala |  2 +-
 docs/src/test/scala/docs/actor/ActorDocSpec.scala  |  6 +--
 .../scala/docs/actor/FaultHandlingDocSample.scala  |  2 +-
 .../scala/docs/actor/FaultHandlingDocSpec.scala    |  2 +-
 .../scala/docs/cluster/TransformationBackend.scala |  2 +-
 .../src/test/scala/docs/future/FutureDocSpec.scala |  2 +-
 docs/src/test/scala/docs/io/EchoServer.scala       |  2 +-
 .../docs/persistence/PersistenceDocSpec.scala      |  2 +-
 .../query/PersistenceQueryDocSpec.scala            |  2 +-
 .../docs/persistence/testkit/TestKitExamples.scala |  4 +-
 .../pekko/remote/testconductor/Conductor.scala     |  8 ++--
 .../pekko/remote/testconductor/DataTypes.scala     |  2 +-
 .../apache/pekko/remote/testconductor/Player.scala |  4 +-
 .../pekko/remote/testkit/MultiNodeSpec.scala       |  4 +-
 .../apache/pekko/persistence/query/Offset.scala    |  2 +-
 .../query/internal/QuerySerializer.scala           | 10 ++--
 .../leveldb/scaladsl/LeveldbReadJournal.scala      |  4 +-
 .../persistence/query/typed/EventEnvelope.scala    |  4 +-
 .../leveldb/PersistencePluginProxySpec.scala       |  2 +-
 .../persistence/serialization/SerializerSpec.scala |  6 +--
 .../internal/EventSourcedBehaviorTestKitImpl.scala |  2 +-
 .../scaladsl/PersistenceTestKitReadJournal.scala   |  4 +-
 .../PersistenceTestKitDurableStateStore.scala      |  4 +-
 .../EventSourcedBehaviorRetentionSpec.scala        |  2 +-
 .../typed/scaladsl/EventSourcedBehaviorSpec.scala  |  2 +-
 .../pekko/persistence/typed/crdt/ORSet.scala       |  6 +--
 .../typed/internal/EventSourcedSettings.scala      |  4 +-
 .../typed/internal/ReplayingEvents.scala           |  2 +-
 .../typed/internal/ReplayingSnapshot.scala         |  2 +-
 .../pekko/persistence/typed/internal/Running.scala |  2 +-
 .../persistence/typed/javadsl/CommandHandler.scala |  4 +-
 .../typed/javadsl/CommandHandlerWithReply.scala    |  4 +-
 .../persistence/typed/javadsl/EventHandler.scala   |  4 +-
 .../typed/scaladsl/EventSourcedBehavior.scala      |  2 +-
 .../ReplicatedEventSourcingSerializer.scala        |  4 +-
 .../state/internal/DurableStateSettings.scala      |  4 +-
 .../typed/state/internal/Recovering.scala          |  6 +--
 .../typed/state/javadsl/CommandHandler.scala       |  4 +-
 .../state/javadsl/CommandHandlerWithReply.scala    |  4 +-
 .../state/scaladsl/DurableStateBehavior.scala      |  2 +-
 .../pekko/persistence/typed/BlogPostEntity.scala   |  8 ++--
 .../typed/BlogPostEntityDurableState.scala         |  8 ++--
 .../typed/ClusterSingletonPersistenceSpec.scala    |  2 +-
 .../scaladsl/PersistentActorCompileOnlyTest.scala  |  4 +-
 .../apache/pekko/persistence/Eventsourced.scala    |  2 +-
 .../pekko/persistence/fsm/PersistentFSM.scala      |  4 +-
 .../pekko/persistence/fsm/PersistentFSMBase.scala  |  2 +-
 .../persistence/journal/AsyncWriteJournal.scala    |  2 +-
 .../persistence/journal/AsyncWriteProxy.scala      |  2 +-
 .../journal/PersistencePluginProxy.scala           | 10 ++--
 .../pekko/persistence/journal/ReplayFilter.scala   |  2 +-
 .../journal/leveldb/LeveldbJournal.scala           |  2 +-
 .../serialization/MessageSerializer.scala          |  8 ++--
 .../serialization/SnapshotSerializer.scala         |  4 +-
 .../snapshot/local/LocalSnapshotStore.scala        |  2 +-
 .../persistence/AtLeastOnceDeliveryCrashSpec.scala |  4 +-
 .../pekko/persistence/OptimizedRecoverySpec.scala  |  2 +-
 .../pekko/persistence/PersistentActorSpec.scala    |  6 +--
 .../persistence/PersistentActorStashingSpec.scala  |  2 +-
 .../SnapshotRecoveryWithEmptyJournalSpec.scala     |  2 +-
 .../apache/pekko/persistence/SnapshotSpec.scala    |  4 +-
 .../pekko/persistence/fsm/PersistentFSMSpec.scala  |  2 +-
 .../persistence/journal/SteppingInmemJournal.scala |  2 +-
 .../apache/pekko/pki/pem/DERPrivateKeyLoader.scala |  4 +-
 .../scala/org/apache/pekko/remote/Endpoint.scala   | 18 ++++----
 .../pekko/remote/RemoteActorRefProvider.scala      |  6 +--
 .../org/apache/pekko/remote/RemoteDaemon.scala     |  4 +-
 .../org/apache/pekko/remote/RemoteDeployer.scala   |  2 +-
 .../org/apache/pekko/remote/RemoteSettings.scala   |  6 +--
 .../scala/org/apache/pekko/remote/Remoting.scala   |  8 ++--
 .../pekko/remote/artery/ArterySettings.scala       |  6 +--
 .../pekko/remote/artery/ArteryTransport.scala      |  8 ++--
 .../apache/pekko/remote/artery/Association.scala   |  8 ++--
 .../org/apache/pekko/remote/artery/Codecs.scala    |  4 +-
 .../org/apache/pekko/remote/artery/Handshake.scala |  2 +-
 .../org/apache/pekko/remote/artery/TestStage.scala |  4 +-
 .../pekko/remote/artery/aeron/AeronSource.scala    |  2 +-
 .../artery/aeron/ArteryAeronUdpTransport.scala     |  2 +-
 .../pekko/remote/artery/aeron/TaskRunner.scala     |  2 +-
 .../artery/compress/InboundCompressions.scala      |  2 +-
 .../remote/artery/tcp/ArteryTcpTransport.scala     |  2 +-
 .../pekko/remote/artery/tcp/ssl/X509Readers.scala  |  2 +-
 .../serialization/ActorRefResolveCache.scala       |  2 +-
 .../serialization/ArteryMessageSerializer.scala    | 54 +++++++++++-----------
 .../serialization/MiscMessageSerializer.scala      |  2 +-
 .../remote/serialization/ProtobufSerializer.scala  |  4 +-
 .../transport/AbstractTransportAdapter.scala       |  2 +-
 .../FailureInjectorTransportAdapter.scala          |  6 +--
 .../pekko/remote/transport/PekkoPduCodec.scala     |  2 +-
 .../remote/transport/PekkoProtocolTransport.scala  |  6 +--
 .../transport/ThrottlerTransportAdapter.scala      |  2 +-
 .../remote/transport/netty/NettyTransport.scala    |  6 +--
 .../apache/pekko/remote/artery/TestContext.scala   |  2 +-
 .../apache/pekko/remote/classic/RemotingSpec.scala |  2 +-
 .../transport/PekkoProtocolStressTest.scala        |  2 +-
 .../serialization/jackson/JacksonSerializer.scala  | 12 ++---
 .../jackson/JacksonSerializerSpec.scala            |  2 +-
 .../pekko/stream/testkit/StreamTestKit.scala       |  4 +-
 .../pekko/stream/impl/SubInletOutletSpec.scala     |  2 +-
 .../stream/impl/fusing/KeepGoingStageSpec.scala    |  2 +-
 .../apache/pekko/stream/io/DeprecatedTlsSpec.scala |  4 +-
 .../scala/org/apache/pekko/stream/io/TlsSpec.scala |  4 +-
 .../io/compression/CompressionTestingTools.scala   |  2 +-
 .../scaladsl/ActorRefBackpressureSourceSpec.scala  |  4 +-
 .../stream/scaladsl/FlowFlatMapPrefixSpec.scala    |  2 +-
 .../pekko/stream/scaladsl/FlowMapAsyncSpec.scala   |  4 +-
 .../org/apache/pekko/stream/scaladsl/HubSpec.scala |  2 +-
 .../pekko/stream/scaladsl/StageActorRefSpec.scala  |  2 +-
 .../apache/pekko/stream/ActorMaterializer.scala    |  4 +-
 .../scala/org/apache/pekko/stream/Attributes.scala |  8 ++--
 .../apache/pekko/stream/MapAsyncPartitioned.scala  |  4 +-
 .../apache/pekko/stream/impl/ActorPublisher.scala  |  2 +-
 .../impl/ActorRefBackpressureSinkStage.scala       |  2 +-
 .../pekko/stream/impl/BoundedSourceQueue.scala     |  2 +-
 .../pekko/stream/impl/JsonObjectParser.scala       |  2 +-
 .../pekko/stream/impl/RetryFlowCoordinator.scala   |  2 +-
 .../apache/pekko/stream/impl/StreamLayout.scala    |  2 +-
 .../pekko/stream/impl/TraversalBuilder.scala       | 24 +++++-----
 .../org/apache/pekko/stream/impl/Unfold.scala      |  2 +-
 .../stream/impl/fusing/ActorGraphInterpreter.scala |  6 +--
 .../pekko/stream/impl/fusing/CollectFirst.scala    |  2 +-
 .../pekko/stream/impl/fusing/FlatMapPrefix.scala   |  4 +-
 .../pekko/stream/impl/fusing/FlattenConcat.scala   |  6 +--
 .../pekko/stream/impl/fusing/IterableSource.scala  |  4 +-
 .../stream/impl/fusing/LazyFutureSource.scala      |  2 +-
 .../pekko/stream/impl/fusing/MapConcat.scala       |  2 +-
 .../org/apache/pekko/stream/impl/fusing/Ops.scala  | 48 +++++++++----------
 .../pekko/stream/impl/fusing/StreamOfStreams.scala |  8 ++--
 .../org/apache/pekko/stream/impl/io/TLSActor.scala |  4 +-
 .../apache/pekko/stream/impl/io/TcpStages.scala    |  6 +--
 .../apache/pekko/stream/scaladsl/BidiFlow.scala    |  2 +-
 .../org/apache/pekko/stream/scaladsl/Flow.scala    | 12 ++---
 .../org/apache/pekko/stream/scaladsl/Hub.scala     | 18 ++++----
 .../org/apache/pekko/stream/scaladsl/Sink.scala    |  2 +-
 .../org/apache/pekko/stream/scaladsl/Source.scala  |  4 +-
 .../org/apache/pekko/stream/stage/GraphStage.scala |  6 +--
 .../org/apache/pekko/testkit/TestActorRef.scala    |  4 +-
 .../apache/pekko/testkit/TestEventListener.scala   |  6 +--
 .../scala/org/apache/pekko/testkit/TestKit.scala   |  2 +-
 .../org/apache/pekko/testkit/javadsl/TestKit.scala |  2 +-
 .../org/apache/pekko/testkit/CoronerSpec.scala     |  2 +-
 .../apache/pekko/testkit/TestActorRefSpec.scala    |  6 +--
 .../apache/pekko/testkit/metrics/MetricsKit.scala  |  2 +-
 308 files changed, 689 insertions(+), 688 deletions(-)

diff --git a/.scalafmt.conf b/.scalafmt.conf
index e25ad0b528..c4cf1ef617 100644
--- a/.scalafmt.conf
+++ b/.scalafmt.conf
@@ -1,4 +1,4 @@
-version                                  = 3.9.3
+version                                  = 3.9.7
 runner.dialect                           = scala213
 project.git                              = true
 style                                    = defaultWithAlign
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 79e7f40292..c2ce9f96fa 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
@@ -102,7 +102,7 @@ private[pekko] final class BehaviorTestKitImpl[T](
   def expectEffectClass[E <: Effect](effectClass: Class[E]): E = {
     context.effectQueue.poll() match {
       case null if effectClass.isAssignableFrom(NoEffects.getClass) => effectClass.cast(NoEffects)
-      case null =>
+      case null                                                     =>
         throw new AssertionError(s"expected: effect type ${effectClass.getName} but no effects were recorded")
       case effect if effectClass.isAssignableFrom(effect.getClass) => effect.asInstanceOf[E]
       case other                                                   => throw new AssertionError(s"expected: effect class ${effectClass.getName} but found $other")
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 9fc2d5e7f0..23130b6083 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
@@ -34,7 +34,7 @@ import pekko.annotation.InternalApi
         throw new IllegalStateException(
           s"$CapturingAppenderName not defined for [${loggerNameOrRoot(loggerName)}] in logback-test.xml")
       case appender: CapturingAppender => appender
-      case other =>
+      case other                       =>
         throw new IllegalStateException(s"Unexpected $CapturingAppender: $other")
     }
   }
diff --git a/actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/internal/LogbackUtil.scala b/actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/internal/LogbackUtil.scala
index 1673224e14..4e7cd82f31 100644
--- a/actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/internal/LogbackUtil.scala
+++ b/actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/internal/LogbackUtil.scala
@@ -52,7 +52,7 @@ import scala.annotation.tailrec
       case ch.qos.logback.classic.Level.INFO_INT  => Level.INFO
       case ch.qos.logback.classic.Level.WARN_INT  => Level.WARN
       case ch.qos.logback.classic.Level.ERROR_INT => Level.ERROR
-      case _ =>
+      case _                                      =>
         throw new IllegalArgumentException("Level " + level.levelStr + ", " + level.levelInt + " is unknown.")
     }
   }
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 51314acafc..cc2bce6020 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
@@ -119,7 +119,7 @@ private[pekko] final class FunctionRef[-T](override val path: ActorPath, send: (
     checkCurrentActorThread()
     _children.get(name) match {
       case Some(_) => throw classic.InvalidActorNameException(s"actor name $name is already taken")
-      case None =>
+      case None    =>
         val btk = new BehaviorTestKitImpl[U](system, (path / name).withUid(rnd().nextInt()), behavior)
         _children += name -> btk
         btk.context.self
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 ddfe5f3445..45c193041c 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
@@ -63,7 +63,7 @@ import java.util.Collections
     val logger = getLogbackLogger(loggerName)
     logger.getAppender(TestAppenderName) match {
       case testAppender: TestAppender => testAppender
-      case null =>
+      case null                       =>
         throw new IllegalStateException(s"No $TestAppenderName was setup for logger [${logger.getName}]")
       case other =>
         throw new IllegalStateException(
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 e39be95ba2..18e5ad198e 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
@@ -313,8 +313,8 @@ private[pekko] final class TestProbeImpl[M](name: String, system: ActorSystem[_]
                   ex)
             }
           outcome match {
-            case FishingOutcome.Complete    => (message :: seen).reverse
-            case FishingOutcome.Fail(error) => assertFail(s"$error, hint: $hint")
+            case FishingOutcome.Complete                  => (message :: seen).reverse
+            case FishingOutcome.Fail(error)               => assertFail(s"$error, hint: $hint")
             case continue: FishingOutcome.ContinueOutcome =>
               val newTimeout = timeout - (System.nanoTime() - start).nanos
               continue match {
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 477265858e..99d526c869 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
@@ -46,7 +46,7 @@ object ManualTime {
       case adapter: SchedulerAdapter =>
         adapter.classicScheduler match {
           case sc: pekko.testkit.ExplicitlyTriggeredScheduler => new ManualTime(sc)
-          case _ =>
+          case _                                              =>
             throw new IllegalArgumentException(
               "ActorSystem not configured with explicitly triggered scheduler, " +
               "make sure to include org.apache.pekko.actor.testkit.typed.scaladsl.ManualTime.config() when setting up the test")
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 426a579d90..2499cb683e 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
@@ -46,7 +46,7 @@ object ManualTime {
       case adapter: SchedulerAdapter =>
         adapter.classicScheduler match {
           case sc: pekko.testkit.ExplicitlyTriggeredScheduler => new ManualTime(sc)
-          case _ =>
+          case _                                              =>
             throw new IllegalArgumentException(
               "ActorSystem not configured with explicitly triggered scheduler, " +
               "make sure to include org.apache.pekko.actor.testkit.typed.scaladsl.ManualTime.config() when setting up the test")
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 9b531e75bc..f41be488a8 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
@@ -133,11 +133,11 @@ object BehaviorTestKitSpec {
               Behaviors.same
             case ScheduleCommand(key, delay, mode, cmd) =>
               mode match {
-                case Effect.TimerScheduled.SingleMode     => timers.startSingleTimer(key, cmd, delay)
-                case Effect.TimerScheduled.FixedDelayMode => timers.startTimerWithFixedDelay(key, cmd, delay, delay)
+                case Effect.TimerScheduled.SingleMode                        => timers.startSingleTimer(key, cmd, delay)
+                case Effect.TimerScheduled.FixedDelayMode                    => timers.startTimerWithFixedDelay(key, cmd, delay, delay)
                 case m: Effect.TimerScheduled.FixedDelayModeWithInitialDelay =>
                   timers.startTimerWithFixedDelay(key, cmd, m.initialDelay, delay)
-                case Effect.TimerScheduled.FixedRateMode => timers.startTimerAtFixedRate(key, cmd, delay, delay)
+                case Effect.TimerScheduled.FixedRateMode                    => timers.startTimerAtFixedRate(key, cmd, delay, delay)
                 case m: Effect.TimerScheduled.FixedRateModeWithInitialDelay =>
                   timers.startTimerAtFixedRate(key, cmd, m.initialDelay, delay)
               }
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 171de70270..23f864c9d6 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
@@ -66,9 +66,9 @@ object ActorRefSpec {
   class SenderActor(replyActor: ActorRef, latch: TestLatch) extends Actor {
 
     def receive = {
-      case "complex"  => replyActor ! "complexRequest"
-      case "complex2" => replyActor ! "complexRequest2"
-      case "simple"   => replyActor ! "simpleRequest"
+      case "complex"      => replyActor ! "complexRequest"
+      case "complex2"     => replyActor ! "complexRequest2"
+      case "simple"       => replyActor ! "simpleRequest"
       case "complexReply" => {
         latch.countDown()
       }
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 20f45fd36c..835f277f3e 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
@@ -61,8 +61,8 @@ object DeathWatchSpec {
 
   class WUWatcher extends Actor {
     def receive = {
-      case W(ref) => context.watch(ref)
-      case U(ref) => context.unwatch(ref)
+      case W(ref)                                => context.watch(ref)
+      case U(ref)                                => context.unwatch(ref)
       case Latches(t1: TestLatch, t2: TestLatch) =>
         t1.countDown()
         Await.ready(t2, 3.seconds)
diff --git a/actor-tests/src/test/scala/org/apache/pekko/actor/DynamicAccessSpec.scala b/actor-tests/src/test/scala/org/apache/pekko/actor/DynamicAccessSpec.scala
index 4b84be70c7..2f1bf94099 100644
--- a/actor-tests/src/test/scala/org/apache/pekko/actor/DynamicAccessSpec.scala
+++ b/actor-tests/src/test/scala/org/apache/pekko/actor/DynamicAccessSpec.scala
@@ -78,7 +78,7 @@ class DynamicAccessSpec extends AnyWordSpec with Matchers with BeforeAndAfterAll
       // recoverWith doesn't work with scala 2.13.0-M5
       // https://github.com/scala/bug/issues/11242
       dynamicAccess.createInstanceFor[TestSuperclass](fqcn, Nil) match {
-        case s: Success[TestSuperclass] => s
+        case s: Success[TestSuperclass]        => s
         case Failure(_: NoSuchMethodException) =>
           dynamicAccess
             .createInstanceFor[TestSuperclass](fqcn, immutable.Seq((classOf[String], "string ctor argument")))
diff --git a/actor-tests/src/test/scala/org/apache/pekko/actor/HotSwapSpec.scala b/actor-tests/src/test/scala/org/apache/pekko/actor/HotSwapSpec.scala
index 40e7e21d1e..76beaaf187 100644
--- a/actor-tests/src/test/scala/org/apache/pekko/actor/HotSwapSpec.scala
+++ b/actor-tests/src/test/scala/org/apache/pekko/actor/HotSwapSpec.scala
@@ -111,7 +111,7 @@ class HotSwapSpec extends PekkoSpec with ImplicitSender {
       val a = system.actorOf(Props(new Actor {
         def receive = {
           case "state" => sender() ! "0"
-          case "swap" =>
+          case "swap"  =>
             context.become {
               case "state"   => sender() ! "1"
               case "swapped" => sender() ! "swapped"
diff --git a/actor-tests/src/test/scala/org/apache/pekko/actor/ReceiveTimeoutSpec.scala b/actor-tests/src/test/scala/org/apache/pekko/actor/ReceiveTimeoutSpec.scala
index 236edc19c9..0a0b0ee0eb 100644
--- a/actor-tests/src/test/scala/org/apache/pekko/actor/ReceiveTimeoutSpec.scala
+++ b/actor-tests/src/test/scala/org/apache/pekko/actor/ReceiveTimeoutSpec.scala
@@ -120,7 +120,7 @@ class ReceiveTimeoutSpec extends PekkoSpec() {
         context.setReceiveTimeout(500.milliseconds)
 
         def receive = {
-          case Tick => ()
+          case Tick           => ()
           case ReceiveTimeout =>
             count.incrementAndGet
             timeoutLatch.open()
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 bf8bfa7970..edbee05493 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
@@ -325,7 +325,7 @@ object SupervisorHierarchySpec {
             // an indication of duplicate Terminate messages
             log :+= Event(s"${sender()} terminated while pongOfDeath", identityHashCode(Hierarchy.this))
           }
-        case Abort => abort("terminating")
+        case Abort       => abort("terminating")
         case PingOfDeath =>
           if (size > 1) {
             pongsToGo = context.children.size
@@ -528,7 +528,7 @@ object SupervisorHierarchySpec {
         stay()
       case this.Event(Work, x) if x > 0 =>
         nextJob.next() match {
-          case Ping(ref) => ref ! "ping"
+          case Ping(ref)      => ref ! "ping"
           case Fail(ref, dir) =>
             val f = Failure(
               dir,
@@ -547,7 +547,7 @@ object SupervisorHierarchySpec {
         if (idleChildren.nonEmpty) self ! Work
         else context.system.scheduler.scheduleOnce(workSchedule, self, Work)(context.dispatcher)
         stay().using(x - 1)
-      case this.Event(Work, _) => if (pingChildren.isEmpty) goto(LastPing) else goto(Finishing)
+      case this.Event(Work, _)       => if (pingChildren.isEmpty) goto(LastPing) else goto(Finishing)
       case this.Event(Died(path), _) =>
         bury(path)
         stay()
@@ -605,7 +605,7 @@ object SupervisorHierarchySpec {
     }
 
     when(Stopping, stateTimeout = 5.seconds.dilated) {
-      case this.Event(PongOfDeath, _) => stay()
+      case this.Event(PongOfDeath, _)                     => stay()
       case this.Event(Terminated(r), _) if r == hierarchy =>
         @nowarn
         val undead = children.filterNot(_.isTerminated)
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 cfbf1950d1..9df4e76f15 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
@@ -430,7 +430,7 @@ class SupervisorSpec
         }
 
         def receive = {
-          case Ping => sender() ! PongMessage
+          case Ping     => sender() ! PongMessage
           case DieReply =>
             val e = new RuntimeException("Expected")
             sender() ! Status.Failure(e)
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 16bafdcf9f..102e01448f 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
@@ -99,7 +99,7 @@ object ActorModelSpec {
       case Increment(count)  => { ack(); count.incrementAndGet(); busy.switchOff(()) }
       case CountDownNStop(l) => { ack(); l.countDown(); context.stop(self); busy.switchOff(()) }
       case Restart           => { ack(); busy.switchOff(()); throw new Exception("Restart requested") }
-      case Interrupt => {
+      case Interrupt         => {
         ack(); sender() ! Status.Failure(new ActorInterruptedException(new InterruptedException("Ping!")));
         busy.switchOff(()); throw new InterruptedException("Ping!")
       }
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 a7c6d664fc..d9e26a4d86 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
@@ -205,7 +205,7 @@ class PriorityMailboxSpec extends MailboxSpec {
   val comparator = PriorityGenerator(_.##)
   lazy val name = "The priority mailbox implementation"
   def factory = {
-    case UnboundedMailbox() => new UnboundedPriorityMailbox(comparator).create(None, None)
+    case UnboundedMailbox()                    => new UnboundedPriorityMailbox(comparator).create(None, None)
     case BoundedMailbox(capacity, pushTimeOut) =>
       new BoundedPriorityMailbox(comparator, capacity, pushTimeOut).create(None, None)
     case _ => throw new RuntimeException() // compiler exhaustiveness check pleaser
@@ -216,7 +216,7 @@ class StablePriorityMailboxSpec extends MailboxSpec {
   val comparator = PriorityGenerator(_.##)
   lazy val name = "The stable priority mailbox implementation"
   def factory = {
-    case UnboundedMailbox() => new UnboundedStablePriorityMailbox(comparator).create(None, None)
+    case UnboundedMailbox()                    => new UnboundedStablePriorityMailbox(comparator).create(None, None)
     case BoundedMailbox(capacity, pushTimeOut) =>
       new BoundedStablePriorityMailbox(comparator, capacity, pushTimeOut).create(None, None)
     case _ => throw new RuntimeException() // compiler exhaustiveness check pleaser
@@ -226,7 +226,7 @@ class StablePriorityMailboxSpec extends MailboxSpec {
 class ControlAwareMailboxSpec extends MailboxSpec {
   lazy val name = "The control aware mailbox implementation"
   def factory = {
-    case UnboundedMailbox() => new UnboundedControlAwareMailbox().create(None, None)
+    case UnboundedMailbox()                    => new UnboundedControlAwareMailbox().create(None, None)
     case BoundedMailbox(capacity, pushTimeOut) =>
       new BoundedControlAwareMailbox(capacity, pushTimeOut).create(None, None)
     case _ => throw new RuntimeException() // compiler exhaustiveness check pleaser
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 96df572af5..e702800126 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
@@ -47,7 +47,7 @@ object BackoffSupervisorSpec {
   class ManualChild(probe: ActorRef) extends Actor {
     def receive: Receive = {
       case "boom" => throw new TestException
-      case msg =>
+      case msg    =>
         probe ! msg
         context.parent ! BackoffSupervisor.Reset
     }
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 8ed8ac9291..ee835ff0f5 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
@@ -68,7 +68,7 @@ class BroadcastSpec extends PekkoSpec with DefaultTimeout with ImplicitSender {
       val counter1 = new AtomicInteger
       val actor1 = system.actorOf(Props(new Actor {
         def receive = {
-          case "end" => doneLatch.countDown()
+          case "end"    => doneLatch.countDown()
           case msg: Int =>
             counter1.addAndGet(msg)
             sender() ! "ack"
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 3d531f2498..04bc6fc206 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
@@ -34,8 +34,9 @@ class RouteeCreationSpec extends PekkoSpec {
       })))
       for (i <- 1 to N) {
         expectMsgType[ActorIdentity] match {
-          case ActorIdentity(_, Some(_)) => // fine
-          case x                         => fail(s"routee $i was not found $x")
+          case ActorIdentity(_,
+                Some(_)) => // fine
+          case x => fail(s"routee $i was not found $x")
         }
       }
     }
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 c6210b03e9..a9d56b11ee 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
@@ -41,7 +41,7 @@ object ScatterGatherFirstCompletedSpec {
           case Stop(None)                   => context.stop(self)
           case Stop(Some(_id)) if _id == id => context.stop(self)
           case _id: Int if _id == id        =>
-          case _ => {
+          case _                            => {
             Thread.sleep(100 * id)
             sender() ! id
           }
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 c9d996a6b0..840daddaa3 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
@@ -33,7 +33,7 @@ object TailChoppingSpec {
         def receive = {
           case "stop"  => context.stop(self)
           case "times" => sender() ! times
-          case _ =>
+          case _       =>
             times += 1
             Thread.sleep(sleepTime.toMillis)
             sender() ! "ack"
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 ab06a9c479..8f53e10267 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
@@ -509,7 +509,7 @@ abstract class ActorContextSpec extends ScalaTestWithActorTestKit with AnyWordSp
                     }
                     .receiveSignal {
                       case (_, Terminated(_)) => Behaviors.unhandled
-                      case (_, signal) =>
+                      case (_, signal)        =>
                         probe.ref ! ReceivedSignal(signal)
                         Behaviors.same
                     }
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 91b803ec73..3727268d9f 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
@@ -70,7 +70,7 @@ object OrElseSpec {
       // this could be provided as a general purpose utility
       @tailrec def handle(command: Ping, handlers: List[Ping => Behavior[Ping]]): Behavior[Ping] = {
         handlers match {
-          case Nil => Behaviors.unhandled
+          case Nil          => Behaviors.unhandled
           case head :: tail =>
             val next = head(command)
             if (Behavior.isUnhandled(next)) handle(command, tail)
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 2da89af9ee..9950127d5c 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
@@ -1270,7 +1270,7 @@ class SupervisionSpec extends ScalaTestWithActorTestKit("""
     "replace supervision when new returned behavior catches same exception" in {
       val probe = TestProbe[AnyRef]("probeMcProbeFace")
       val behv = supervise[String](Behaviors.receiveMessage {
-        case "boom" => throw TestException("boom indeed")
+        case "boom"   => throw TestException("boom indeed")
         case "switch" =>
           supervise[String](
             supervise[String](supervise[String](supervise[String](supervise[String](Behaviors.receiveMessage {
@@ -1320,7 +1320,7 @@ class SupervisionSpec extends ScalaTestWithActorTestKit("""
       }
 
       val behv = supervise[String](Behaviors.receiveMessage {
-        case "boom" => throw TestException("boom indeed")
+        case "boom"   => throw TestException("boom indeed")
         case "switch" =>
           supervise[String](setup(_ =>
             supervise[String](
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 79855cdc51..0510b66b36 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
@@ -56,7 +56,7 @@ object TestProducerWithAsk {
     Behaviors.receivePartial {
       case (_, Tick)                => Behaviors.same
       case (_, RequestNext(sendTo)) => active(n + 1, replyProbe, sendTo)
-      case (_, Confirmed(seqNr)) =>
+      case (_, Confirmed(seqNr))    =>
         replyProbe ! seqNr
         Behaviors.same
       case (ctx, AskTimeout) =>
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 7924d56f0a..769855a14c 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
@@ -151,7 +151,7 @@ class ActorLoggingSpec extends ScalaTestWithActorTestKit("""
     "contain the object class name where the first log was called" in {
       val eventFilter = LoggingTestKit.custom {
         case event if event.loggerName == WhereTheBehaviorIsDefined.getClass.getName => true
-        case other =>
+        case other                                                                   =>
           println(other.loggerName)
           false
       }
@@ -162,7 +162,7 @@ class ActorLoggingSpec extends ScalaTestWithActorTestKit("""
     "contain the abstract behavior class name where the first log was called" in {
       val eventFilter = LoggingTestKit.custom {
         case event if event.loggerName == classOf[BehaviorWhereTheLoggerIsUsed].getName => true
-        case other =>
+        case other                                                                      =>
           println(other.loggerName)
           false
       }
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 c339c5851c..cfe803dd03 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
@@ -647,7 +647,7 @@ class UnstashingSpec extends ScalaTestWithActorTestKit with AnyWordSpecLike with
         def unstashing(n: Int): Behavior[String] =
           Behaviors.receiveMessagePartial {
             case "unhandled" => Behaviors.unhandled
-            case "handled" =>
+            case "handled"   =>
               probe.ref ! s"handled $n"
               unstashing(n + 1)
           }
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 5526af02a5..0118fd2aac 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
@@ -143,8 +143,8 @@ object AdapterSpec {
     }
 
     def receive = {
-      case "send" => ref ! Ping(self) // implicit conversion
-      case "pong" => probe ! "ok"
+      case "send"  => ref ! Ping(self) // implicit conversion
+      case "pong"  => probe ! "ok"
       case "spawn" =>
         val child = context.spawnAnonymous(typed2)
         child ! Ping(self)
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 b789995700..c9661cd6fa 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
@@ -185,7 +185,7 @@ object Behavior {
     (behavior._tag: @switch) match {
       case BehaviorTags.SameBehavior      => current
       case BehaviorTags.UnhandledBehavior => current
-      case BehaviorTags.DeferredBehavior =>
+      case BehaviorTags.DeferredBehavior  =>
         val deferred = behavior.asInstanceOf[DeferredBehavior[T]]
         canonicalize(deferred(ctx), deferred, ctx)
       case _ => behavior
@@ -219,7 +219,7 @@ object Behavior {
     @tailrec
     def loop(b: Behavior[T]): Boolean =
       b match {
-        case _ if p(b) => true
+        case _ if p(b)                                          => true
         case wrappingBehavior: InterceptorImpl[T, T] @unchecked =>
           loop(wrappingBehavior.nestedBehavior)
         case d: DeferredBehavior[T] =>
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 252f06fa07..65e525d0a1 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
@@ -167,7 +167,7 @@ object ProducerController {
     def apply(config: Config): Settings = {
       val chunkLargeMessagesBytes = toRootLowerCase(config.getString("chunk-large-messages")) match {
         case "off" => 0
-        case _ =>
+        case _     =>
           config.getBytes("chunk-large-messages").requiring(_ <= Int.MaxValue, "Too large chunk-large-messages.").toInt
       }
       new Settings(
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 0467cb1aab..613b403173 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
@@ -658,7 +658,7 @@ private class ConsumerControllerImpl[A] private (
     if (retryTimer.interval() != retryTimer.minBackoff)
       context.log.debug("Schedule next retry in [{} ms]", retryTimer.interval().toMillis)
     s.registering match {
-      case None => nextBehavior()
+      case None      => nextBehavior()
       case Some(reg) =>
         reg ! ProducerController.RegisterConsumer(context.self)
         Behaviors.same
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 aab18c1e1a..0639e4cc02 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
@@ -274,13 +274,13 @@ object ProducerControllerImpl {
       case RegisterConsumer(c: ActorRef[ConsumerController.Command[A]] @unchecked) =>
         (producer, initialState) match {
           case (Some(p), Some(s)) => thenBecomeActive(p, c, s)
-          case (_, _) =>
+          case (_, _)             =>
             waitingForInitialization(context, producer, Some(c), durableQueue, settings, initialState)(thenBecomeActive)
         }
       case start: Start[A] @unchecked =>
         (consumerController, initialState) match {
           case (Some(c), Some(s)) => thenBecomeActive(start.producer, c, s)
-          case (_, _) =>
+          case (_, _)             =>
             waitingForInitialization(
               context,
               Some(start.producer),
@@ -292,7 +292,7 @@ object ProducerControllerImpl {
       case load: LoadStateReply[A] @unchecked =>
         (producer, consumerController) match {
           case (Some(p), Some(c)) => thenBecomeActive(p, c, load.state)
-          case (_, _) =>
+          case (_, _)             =>
             waitingForInitialization(context, producer, consumerController, durableQueue, settings, Some(load.state))(
               thenBecomeActive)
         }
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 9b2c05034b..aa890a91ac 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
@@ -328,7 +328,7 @@ private class WorkPullingProducerControllerImpl[A: ClassTag](
         } else {
           selectWorker() match {
             case Some(w) => Right(w)
-            case None =>
+            case None    =>
               checkStashFull(stashBuffer)
               context.log.debug("Stashing message, seqNr [{}]", totalSeqNr)
               stashBuffer.stash(Msg(msg, wasStashed = true, replyTo))
@@ -507,7 +507,7 @@ private class WorkPullingProducerControllerImpl[A: ClassTag](
         if (traceEnabled)
           context.log.trace("Received Ack seqNr [{}] from worker [{}].", confirmedSeqNr, outState.confirmationQualifier)
         confirmed.foreach {
-          case Unconfirmed(_, _, _, None) => // no reply
+          case Unconfirmed(_, _, _, None)          => // no reply
           case Unconfirmed(_, _, _, Some(replyTo)) =>
             replyTo ! Done
         }
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 6d6864246a..f16c1e7f47 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
@@ -114,7 +114,7 @@ import scala.util.Success
   // context-shared timer needed to allow for nested timer usage
   def timer: TimerSchedulerCrossDslSupport[T] = _timer match {
     case OptionVal.Some(timer) => timer
-    case _ =>
+    case _                     =>
       checkCurrentActorThread()
       val timer = mkTimer()
       _timer = OptionVal.Some(timer)
@@ -161,7 +161,7 @@ import scala.util.Success
     // lazy init of logging setup
     _logging match {
       case OptionVal.Some(l) => l
-      case _ =>
+      case _                 =>
         val logClass = LoggerClass.detectLoggerClassFromStack(classOf[Behavior[_]])
         val logger = LoggerFactory.getLogger(logClass.getName)
         val l = LoggingContext(logger, classicActorContext.props.deploy.tags, this)
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 0c0d5d5cdf..5df8cf615a 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
@@ -55,7 +55,7 @@ private[pekko] trait ExtensionsImpl extends Extensions { self: ActorSystem[_] wi
 
       idTry match {
         case Success(id: ExtensionId[_]) => registerExtension(id)
-        case Success(_) =>
+        case Success(_)                  =>
           if (!throwOnLoadFail) log.error("[{}] is not an 'ExtensionId', skipping...", extensionIdFQCN)
           else throw new RuntimeException(s"[$extensionIdFQCN] is not an 'ExtensionId'")
         case Failure(problem) =>
@@ -100,7 +100,7 @@ private[pekko] trait ExtensionsImpl extends Extensions { self: ActorSystem[_] wi
             }
             .getOrElse(ext.createExtension(self))
           instance match {
-            case null => throw new IllegalStateException(s"Extension instance created as 'null' for extension [$ext]")
+            case null    => throw new IllegalStateException(s"Extension instance created as 'null' for extension [$ext]")
             case nonNull =>
               val instance = nonNull.asInstanceOf[T]
               // Replace our in process signal with the initialized extension
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 6f045b86af..b73d46b43f 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
@@ -40,7 +40,7 @@ private[pekko] object LoggerClass {
     try {
       def skip(name: String): Boolean = {
         def loop(skipList: List[String]): Boolean = skipList match {
-          case Nil => false
+          case Nil          => false
           case head :: tail =>
             if (name.startsWith(head)) true
             else loop(tail)
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 839ccde367..45b9f1be22 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
@@ -35,19 +35,19 @@ import pekko.serialization.{ BaseSerializer, SerializerWithStringManifest }
 
   def manifest(o: AnyRef): String = o match {
     case _: ActorRef[_] => ActorRefManifest
-    case _ =>
+    case _              =>
       throw new IllegalArgumentException(s"Can't serialize object of type ${o.getClass} in [${getClass.getName}]")
   }
 
   def toBinary(o: AnyRef): Array[Byte] = o match {
     case ref: ActorRef[_] => resolver.toSerializationFormat(ref).getBytes(StandardCharsets.UTF_8)
-    case _ =>
+    case _                =>
       throw new IllegalArgumentException(s"Cannot serialize object of type [${o.getClass.getName}]")
   }
 
   def fromBinary(bytes: Array[Byte], manifest: String): ActorRef[Any] = manifest match {
     case ActorRefManifest => resolver.resolveActorRef(new String(bytes, StandardCharsets.UTF_8))
-    case _ =>
+    case _                =>
       throw new NotSerializableException(
         s"Unimplemented deserialization of message with manifest [$manifest] in [${getClass.getName}]")
   }
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 551be08826..bb438c7bb3 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
@@ -28,7 +28,7 @@ private[pekko] object ActorContextAdapter {
   private def toClassicImp[U](context: TypedActorContext[_]): classic.ActorContext =
     context match {
       case adapter: ActorContextAdapter[_] => adapter.classicContext
-      case _ =>
+      case _                               =>
         throw new UnsupportedOperationException(
           "Only adapted classic ActorContext permissible " +
           s"($context of class ${context.getClass.getName})")
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 2d01edec09..5b8986c8ad 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
@@ -61,7 +61,7 @@ private[pekko] object ActorRefAdapter {
     ref match {
       case adapter: ActorRefAdapter[_]    => adapter.classicRef
       case adapter: ActorSystemAdapter[_] => adapter.system.guardian
-      case _ =>
+      case _                              =>
         throw new UnsupportedOperationException(
           "Only adapted classic ActorRefs permissible " +
           s"($ref of class ${ref.getClass.getName})")
@@ -69,8 +69,8 @@ private[pekko] object ActorRefAdapter {
 
   def sendSystemMessage(classicRef: pekko.actor.InternalActorRef, signal: internal.SystemMessage): Unit =
     signal match {
-      case internal.Create()    => throw new IllegalStateException("WAT? No, seriously.")
-      case internal.Terminate() => classicRef.stop()
+      case internal.Create()                => throw new IllegalStateException("WAT? No, seriously.")
+      case internal.Terminate()             => classicRef.stop()
       case internal.Watch(watchee, watcher) =>
         classicRef.sendSystemMessage(sysmsg.Watch(toClassic(watchee), toClassic(watcher)))
       case internal.Unwatch(watchee, watcher) =>
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 1ccd2dc907..109c7fe01e 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
@@ -30,7 +30,7 @@ import pekko.annotation.InternalApi
   def toClassic(scheduler: Scheduler): pekko.actor.Scheduler =
     scheduler match {
       case s: SchedulerAdapter => s.classicScheduler
-      case _ =>
+      case _                   =>
         throw new UnsupportedOperationException(
           "unknown Scheduler type " +
           s"($scheduler of class ${scheduler.getClass.getName})")
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 c4cc527ef0..282f2a5c26 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
@@ -29,13 +29,13 @@ final class ServiceKeySerializer(val system: pekko.actor.ExtendedActorSystem)
     with BaseSerializer {
   def manifest(o: AnyRef): String = o match {
     case key: DefaultServiceKey[_] => key.typeName
-    case _ =>
+    case _                         =>
       throw new IllegalArgumentException(s"Can't serialize object of type ${o.getClass} in [${getClass.getName}]")
   }
 
   def toBinary(o: AnyRef): Array[Byte] = o match {
     case serviceKey: DefaultServiceKey[_] => serviceKey.id.getBytes(StandardCharsets.UTF_8)
-    case _ =>
+    case _                                =>
       throw new IllegalArgumentException(s"Cannot serialize object of type [${o.getClass.getName}]")
   }
 
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 5ddfa89491..0b8a204156 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
@@ -52,7 +52,7 @@ abstract class AbstractBehavior[T](context: ActorContext[T]) extends ExtensibleB
   private var _receive: OptionVal[Receive[T]] = OptionVal.None
   private def receive: Receive[T] = _receive match {
     case OptionVal.Some(r) => r
-    case _ =>
+    case _                 =>
       val receive = createReceive
       _receive = OptionVal.Some(receive)
       receive
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 66892700cb..709d7a730f 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
@@ -119,7 +119,7 @@ object AskPattern {
       // because it might be needed when we move to a 'native' typed runtime, see #24219
       ref match {
         case a: InternalRecipientRef[Req] => askClassic[Req, Res](a, timeout, replyTo)
-        case a =>
+        case a                            =>
           throw new IllegalStateException(
             "Only expect references to be RecipientRef, ActorRefAdapter or ActorSystemAdapter until " +
             "native system is implemented: " + a.getClass)
diff --git a/actor/src/main/scala-2.12/org/apache/pekko/util/ByteString.scala b/actor/src/main/scala-2.12/org/apache/pekko/util/ByteString.scala
index 4686525531..9855a19fe3 100644
--- a/actor/src/main/scala-2.12/org/apache/pekko/util/ByteString.scala
+++ b/actor/src/main/scala-2.12/org/apache/pekko/util/ByteString.scala
@@ -425,7 +425,7 @@ object ByteString {
       else
         that match {
           case b: ByteString1C => ByteStrings(this, b.toByteString1)
-          case b: ByteString1 =>
+          case b: ByteString1  =>
             if ((bytes eq b.bytes) && (startIndex + length == b.startIndex))
               new ByteString1(bytes, startIndex, length + b.length)
             else ByteStrings(this, b)
@@ -1211,7 +1211,7 @@ final class ByteStringBuilder extends Builder[Byte, ByteString] {
   }
   override def ++=(xs: TraversableOnce[Byte]): this.type = {
     xs match {
-      case bs: ByteString => ++=(bs)
+      case bs: ByteString          => ++=(bs)
       case xs: WrappedArray.ofByte =>
         if (xs.nonEmpty) putByteArrayUnsafe(xs.array.clone)
       case seq: collection.IndexedSeq[Byte] if shouldResizeTempFor(seq.length) =>
diff --git a/actor/src/main/scala-2.13/org/apache/pekko/util/ByteString.scala b/actor/src/main/scala-2.13/org/apache/pekko/util/ByteString.scala
index 826d1b8120..10886bf26e 100644
--- a/actor/src/main/scala-2.13/org/apache/pekko/util/ByteString.scala
+++ b/actor/src/main/scala-2.13/org/apache/pekko/util/ByteString.scala
@@ -426,7 +426,7 @@ object ByteString {
       else
         that match {
           case b: ByteString1C => ByteStrings(this, b.toByteString1)
-          case b: ByteString1 =>
+          case b: ByteString1  =>
             if ((bytes eq b.bytes) && (startIndex + length == b.startIndex))
               new ByteString1(bytes, startIndex, length + b.length)
             else ByteStrings(this, b)
@@ -1259,7 +1259,7 @@ final class ByteStringBuilder extends Builder[Byte, ByteString] {
 
   override def addAll(xs: IterableOnce[Byte]): this.type = {
     xs match {
-      case bs: ByteString => addAll(bs)
+      case bs: ByteString          => addAll(bs)
       case xs: WrappedArray.ofByte =>
         if (xs.nonEmpty) putByteArrayUnsafe(xs.array.clone)
       case seq: collection.IndexedSeq[Byte] if shouldResizeTempFor(seq.length) =>
diff --git a/actor/src/main/scala-3/org/apache/pekko/util/ByteString.scala b/actor/src/main/scala-3/org/apache/pekko/util/ByteString.scala
index 7aba8dc515..8aa06c5eec 100644
--- a/actor/src/main/scala-3/org/apache/pekko/util/ByteString.scala
+++ b/actor/src/main/scala-3/org/apache/pekko/util/ByteString.scala
@@ -427,7 +427,7 @@ object ByteString {
       else
         that match {
           case b: ByteString1C => ByteStrings(this, b.toByteString1)
-          case b: ByteString1 =>
+          case b: ByteString1  =>
             if ((bytes eq b.bytes) && (startIndex + length == b.startIndex))
               new ByteString1(bytes, startIndex, length + b.length)
             else ByteStrings(this, b)
@@ -1262,7 +1262,7 @@ final class ByteStringBuilder extends Builder[Byte, ByteString] {
 
   override def addAll(xs: IterableOnce[Byte]): this.type = {
     xs match {
-      case bs: ByteString => addAll(bs)
+      case bs: ByteString          => addAll(bs)
       case xs: WrappedArray.ofByte =>
         if (xs.nonEmpty) putByteArrayUnsafe(xs.array.clone)
       case seq: collection.IndexedSeq[Byte] if shouldResizeTempFor(seq.length) =>
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 b8f9a4d77c..628851f5d6 100644
--- a/actor/src/main/scala/org/apache/pekko/actor/AbstractProps.scala
+++ b/actor/src/main/scala/org/apache/pekko/actor/AbstractProps.scala
@@ -67,7 +67,7 @@ private[pekko] trait AbstractProps {
     val actorClass = Reflect.findMarker(cc, coc) match {
       case t: ParameterizedType =>
         t.getActualTypeArguments.head match {
-          case c: Class[_] => c // since T <: Actor
+          case c: Class[_]        => c // since T <: Actor
           case v: TypeVariable[_] =>
             v.getBounds.collectFirst { case c: Class[_] if ac.isAssignableFrom(c) && c != ac => c }.getOrElse(ac)
           case x => throw new IllegalArgumentException(s"unsupported type found in Creator argument [$x]")
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 26131a979c..f5d5b326b8 100644
--- a/actor/src/main/scala/org/apache/pekko/actor/ActorCell.scala
+++ b/actor/src/main/scala/org/apache/pekko/actor/ActorCell.scala
@@ -576,7 +576,7 @@ private[pekko] class ActorCell(
       case PoisonPill                 => self.stop()
       case sel: ActorSelectionMessage => receiveSelection(sel)
       case Identify(messageId)        => sender() ! ActorIdentity(messageId, Some(self))
-      case unexpected =>
+      case unexpected                 =>
         throw new RuntimeException(s"Unexpected message for autoreceive: $unexpected") // for exhaustiveness check, will not happen
     }
   }
diff --git a/actor/src/main/scala/org/apache/pekko/actor/ActorPath.scala b/actor/src/main/scala/org/apache/pekko/actor/ActorPath.scala
index fd2c65c65c..f2509559c5 100644
--- a/actor/src/main/scala/org/apache/pekko/actor/ActorPath.scala
+++ b/actor/src/main/scala/org/apache/pekko/actor/ActorPath.scala
@@ -137,7 +137,7 @@ object ActorPath {
       def validate(pos: Int): Int =
         if (pos < len)
           s.charAt(pos) match {
-            case c if isValidChar(c) => validate(pos + 1)
+            case c if isValidChar(c)                                                                  => validate(pos + 1)
             case '%' if pos + 2 < len && isHexChar(s.charAt(pos + 1)) && isHexChar(s.charAt(pos + 2)) =>
               validate(pos + 3)
             case _ => pos
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 df2f8720d7..312fb08765 100644
--- a/actor/src/main/scala/org/apache/pekko/actor/ActorRef.scala
+++ b/actor/src/main/scala/org/apache/pekko/actor/ActorRef.scala
@@ -682,7 +682,7 @@ private[pekko] class EmptyLocalActorRef(
   }
 
   override def !(message: Any)(implicit sender: ActorRef = Actor.noSender): Unit = message match {
-    case null => throw InvalidMessageException("Message is null")
+    case null          => throw InvalidMessageException("Message is null")
     case d: DeadLetter =>
       specialHandle(d.message, d.sender) // do NOT form endless loops, since deadLetters will resend!
     case _ if !specialHandle(message, sender) =>
@@ -696,7 +696,7 @@ private[pekko] class EmptyLocalActorRef(
         w.watcher.sendSystemMessage(
           DeathWatchNotification(w.watchee, existenceConfirmed = false, addressTerminated = false))
       true
-    case _: Unwatch => true // Just ignore
+    case _: Unwatch          => true // Just ignore
     case Identify(messageId) =>
       sender ! ActorIdentity(messageId, None)
       true
@@ -707,7 +707,7 @@ private[pekko] class EmptyLocalActorRef(
         case None =>
           sel.msg match {
             case m: DeadLetterSuppression => publishSupressedDeadLetter(m, sender)
-            case _ =>
+            case _                        =>
               eventStream.publish(
                 DeadLetter(sel.msg, if (sender eq Actor.noSender) provider.deadLetters else sender, this))
           }
@@ -737,7 +737,7 @@ private[pekko] class DeadLetterActorRef(_provider: ActorRefProvider, _path: Acto
     case null                => throw InvalidMessageException("Message is null")
     case Identify(messageId) => sender ! ActorIdentity(messageId, None)
     case d: DeadLetter       => if (!specialHandle(d.message, d.sender)) eventStream.publish(d)
-    case _ =>
+    case _                   =>
       if (!specialHandle(message, sender))
         eventStream.publish(DeadLetter(message, if (sender eq Actor.noSender) provider.deadLetters else sender, this))
   }
@@ -902,8 +902,8 @@ private[pekko] class VirtualPathContainer(
 
   override def sendSystemMessage(message: SystemMessage): Unit = {
     message match {
-      case w: Watch   => addWatcher(w.watchee, w.watcher)
-      case u: Unwatch => remWatcher(u.watchee, u.watcher)
+      case w: Watch                               => addWatcher(w.watchee, w.watcher)
+      case u: Unwatch                             => remWatcher(u.watchee, u.watcher)
       case DeathWatchNotification(actorRef, _, _) =>
         this.!(Terminated(actorRef)(existenceConfirmed = true, addressTerminated = false))(actorRef)
       case _ => // ignore all other messages
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 79c0e7c811..d9ce1b7a4e 100644
--- a/actor/src/main/scala/org/apache/pekko/actor/ActorRefProvider.scala
+++ b/actor/src/main/scala/org/apache/pekko/actor/ActorRefProvider.scala
@@ -347,7 +347,7 @@ private[pekko] object LocalActorRefProvider {
         // a registered, and watched termination hook terminated before
         // termination process of guardian has started
         terminationHooks -= a
-      case StopChild(child) => context.stop(child)
+      case StopChild(child)                                                  => context.stop(child)
       case RegisterTerminationHook if sender() != context.system.deadLetters =>
         terminationHooks += sender()
         context.watch(sender())
@@ -561,7 +561,7 @@ private[pekko] class LocalActorRefProvider private[pekko] (
     // make user provided guardians not run on internal dispatcher
     val dispatcher =
       system.guardianProps match {
-        case None => internalDispatcher
+        case None        => internalDispatcher
         case Some(props) =>
           val dispatcherId =
             if (props.deploy.dispatcher == Deploy.DispatcherSameAsParent) Dispatchers.DefaultDispatcherId
@@ -621,7 +621,7 @@ private[pekko] class LocalActorRefProvider private[pekko] (
 
   def resolveActorRef(path: String): ActorRef = path match {
     case ActorPathExtractor(address, elems) if address == rootPath.address => resolveActorRef(rootGuardian, elems)
-    case _ =>
+    case _                                                                 =>
       logDeser.debug("Resolve (deserialization) of unknown (invalid) path [{}], using deadLetters.", path)
       deadLetters
   }
@@ -766,7 +766,7 @@ private[pekko] class LocalActorRefProvider private[pekko] (
     Serialization.Information(getDefaultAddress, system)
     serializationInformationCache match {
       case OptionVal.Some(info) => info
-      case _ =>
+      case _                    =>
         if (system eq null)
           throw new IllegalStateException("Too early access of serializationInformation")
         else {
@@ -783,7 +783,7 @@ private[pekko] class LocalActorRefProvider private[pekko] (
   override private[pekko] def addressString: String = {
     _addressString match {
       case OptionVal.Some(addr) => addr
-      case _ =>
+      case _                    =>
         val addr = getDefaultAddress.toString
         _addressString = OptionVal.Some(addr)
         addr
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 c879ff116e..d0505e309e 100644
--- a/actor/src/main/scala/org/apache/pekko/actor/ActorSystem.scala
+++ b/actor/src/main/scala/org/apache/pekko/actor/ActorSystem.scala
@@ -1160,7 +1160,7 @@ private[pekko] class ActorSystemImpl(
       }
       findExtension(ext) // Registration in process, await completion and retry
     case t: Throwable => throw t // Initialization failed, throw same again
-    case other =>
+    case other        =>
       other.asInstanceOf[T] // could be a T or null, in which case we return the null as T
   }
 
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 4b7baf9dac..b2d09e5cf5 100644
--- a/actor/src/main/scala/org/apache/pekko/actor/CoordinatedShutdown.scala
+++ b/actor/src/main/scala/org/apache/pekko/actor/CoordinatedShutdown.scala
@@ -726,7 +726,7 @@ final class CoordinatedShutdown private[pekko] (
       log.info("Running CoordinatedShutdown with reason [{}]", reason)
       def loop(remainingPhases: List[String]): Future[Done] = {
         remainingPhases match {
-          case Nil => Future.successful(Done)
+          case Nil                                                  => Future.successful(Done)
           case phaseName :: remaining if !phases(phaseName).enabled =>
             tasks.get(phaseName).foreach { phaseDef =>
               log.info(s"Phase [{}] disabled through configuration, skipping [{}] tasks.", phaseName, phaseDef.size)
@@ -810,7 +810,7 @@ final class CoordinatedShutdown private[pekko] (
   def timeout(phase: String): FiniteDuration =
     phases.get(phase) match {
       case Some(p) => p.timeout
-      case None =>
+      case None    =>
         throw new IllegalArgumentException(s"Unknown phase [$phase]. All phases must be defined in configuration")
     }
 
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 77953cc3d9..c4e5c03a55 100644
--- a/actor/src/main/scala/org/apache/pekko/actor/Deployer.scala
+++ b/actor/src/main/scala/org/apache/pekko/actor/Deployer.scala
@@ -307,7 +307,7 @@ private[pekko] class Deployer(val settings: ActorSystem.Settings, val dynamicAcc
         .createInstanceFor[RouterConfig](fqn, args1)
         .recover {
           case e @ (_: IllegalArgumentException | _: ConfigException) => throw e
-          case e: NoSuchMethodException =>
+          case e: NoSuchMethodException                               =>
             dynamicAccess
               .createInstanceFor[RouterConfig](fqn, args2)
               .recover {
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 7ee801a247..856629aed7 100644
--- a/actor/src/main/scala/org/apache/pekko/actor/FSM.scala
+++ b/actor/src/main/scala/org/apache/pekko/actor/FSM.scala
@@ -869,7 +869,7 @@ trait FSM[S, D] extends Actor with Listeners with ActorLogging {
   private[pekko] def applyState(nextState: State): Unit = {
     nextState.stopReason match {
       case None => makeTransition(nextState)
-      case _ =>
+      case _    =>
         nextState.replies.reverse.foreach { r =>
           sender() ! r
         }
@@ -901,7 +901,7 @@ trait FSM[S, D] extends Actor with Listeners with ActorLogging {
       currentState.timeout match {
         case SomeMaxFiniteDuration                    => // effectively disable stateTimeout
         case Some(d: FiniteDuration) if d.length >= 0 => timeoutFuture = scheduleTimeout(d)
-        case _ =>
+        case _                                        =>
           val timeout = stateTimeouts(currentState.stateName)
           if (timeout.isDefined) timeoutFuture = scheduleTimeout(timeout.get)
       }
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 4039cc340c..8bbe402b85 100644
--- a/actor/src/main/scala/org/apache/pekko/actor/FaultHandling.scala
+++ b/actor/src/main/scala/org/apache/pekko/actor/FaultHandling.scala
@@ -412,7 +412,7 @@ abstract class SupervisorStrategy {
       }
       decision match {
         case Escalate => // don't log here
-        case d =>
+        case d        =>
           if (d.logLevel == Logging.ErrorLevel)
             publish(context, Error(cause, child.path.toString, getClass, logMessage))
           else
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 0e46fa02ef..2f05d48680 100644
--- a/actor/src/main/scala/org/apache/pekko/actor/LightArrayRevolverScheduler.scala
+++ b/actor/src/main/scala/org/apache/pekko/actor/LightArrayRevolverScheduler.scala
@@ -268,7 +268,7 @@ class LightArrayRevolverScheduler(config: Config, log: LoggingAdapter, threadFac
       case null => ()
       case node =>
         node.value.ticks match {
-          case 0 => node.value.executeTask()
+          case 0     => node.value.executeTask()
           case ticks =>
             val futureTick = ((
               time - start + // calculate the nanos since timer start
@@ -344,7 +344,7 @@ class LightArrayRevolverScheduler(config: Config, log: LoggingAdapter, threadFac
       }
       stopped.get match {
         case null => nextTick()
-        case p =>
+        case p    =>
           assert(stopped.compareAndSet(p, Promise.successful(Nil)), "Stop signal violated in LARS")
           p.success(clearAll())
       }
@@ -376,13 +376,13 @@ object LightArrayRevolverScheduler {
     private final def extractTask(replaceWith: Runnable): Runnable =
       task match {
         case t @ (ExecutedTask | CancelledTask) => t
-        case x => if (unsafe.compareAndSwapObject(this, taskOffset, x, replaceWith): @nowarn("cat=deprecation")) x
+        case x                                  => if (unsafe.compareAndSwapObject(this, taskOffset, x, replaceWith): @nowarn("cat=deprecation")) x
           else extractTask(replaceWith)
       }
 
     private[pekko] final def executeTask(): Boolean = extractTask(ExecutedTask) match {
       case ExecutedTask | CancelledTask => false
-      case other =>
+      case other                        =>
         try {
           executionContext.execute(other)
           true
@@ -397,7 +397,7 @@ object LightArrayRevolverScheduler {
 
     override def cancel(): Boolean = extractTask(CancelledTask) match {
       case ExecutedTask | CancelledTask => false
-      case task: SchedulerTask =>
+      case task: SchedulerTask          =>
         notifyCancellation(task)
         true
       case _ => true
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 75a7fa9d52..1bd02406a3 100644
--- a/actor/src/main/scala/org/apache/pekko/actor/ReflectiveDynamicAccess.scala
+++ b/actor/src/main/scala/org/apache/pekko/actor/ReflectiveDynamicAccess.scala
@@ -79,7 +79,7 @@ class ReflectiveDynamicAccess(val classLoader: ClassLoader) extends DynamicAcces
           case null                  => throw new NullPointerException
           case x if !t.isInstance(x) => throw new ClassCastException(fqcn + " is not a subtype of " + t)
           case x: T                  => x
-          case unexpected =>
+          case unexpected            =>
             throw new IllegalArgumentException(s"Unexpected module field: $unexpected") // will not happen, for exhaustiveness check
         }
       }.recover { case i: InvocationTargetException if i.getTargetException ne null => throw i.getTargetException }
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 e012fa78ab..1093ec5379 100644
--- a/actor/src/main/scala/org/apache/pekko/actor/RepointableActorRef.scala
+++ b/actor/src/main/scala/org/apache/pekko/actor/RepointableActorRef.scala
@@ -169,8 +169,8 @@ private[pekko] class RepointableActorRef(
   def getChild(name: Iterator[String]): InternalActorRef =
     if (name.hasNext) {
       name.next() match {
-        case ".." => getParent.getChild(name)
-        case ""   => getChild(name)
+        case ".."  => getParent.getChild(name)
+        case ""    => getChild(name)
         case other =>
           val (childName, uid) = ActorCell.splitNameAndUid(other)
           lookup.getChildByName(childName) match {
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 1d9313d26c..fc2cd09149 100644
--- a/actor/src/main/scala/org/apache/pekko/actor/Scheduler.scala
+++ b/actor/src/main/scala/org/apache/pekko/actor/Scheduler.scala
@@ -585,7 +585,7 @@ object Scheduler {
     @tailrec final protected def swap(c: Cancellable): Unit = {
       get match {
         case null => if (c != null) c.cancel()
-        case old =>
+        case old  =>
           if (!compareAndSet(old, c))
             swap(c)
       }
@@ -595,7 +595,7 @@ object Scheduler {
       @tailrec def tailrecCancel(): Boolean = {
         get match {
           case null => false
-          case c =>
+          case c    =>
             if (c.cancel()) compareAndSet(c, null)
             else compareAndSet(c, null) || tailrecCancel()
         }
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 a56f9bfc49..823253f0ab 100644
--- a/actor/src/main/scala/org/apache/pekko/actor/Stash.scala
+++ b/actor/src/main/scala/org/apache/pekko/actor/Stash.scala
@@ -160,7 +160,7 @@ private[pekko] trait StashSupport {
   private[pekko] val mailbox: DequeBasedMessageQueueSemantics = {
     actorCell.mailbox.messageQueue match {
       case queue: DequeBasedMessageQueueSemantics => queue
-      case other =>
+      case other                                  =>
         throw ActorInitializationException(
           self,
           s"DequeBasedMailbox required, got: ${other.getClass.getName}\n" +
diff --git a/actor/src/main/scala/org/apache/pekko/actor/TypedActor.scala b/actor/src/main/scala/org/apache/pekko/actor/TypedActor.scala
index 9274ebc626..d1fab3efb5 100644
--- a/actor/src/main/scala/org/apache/pekko/actor/TypedActor.scala
+++ b/actor/src/main/scala/org/apache/pekko/actor/TypedActor.scala
@@ -167,7 +167,7 @@ object TypedActor extends ExtensionId[TypedActorExtension] with ExtensionIdProvi
       } catch { case i: InvocationTargetException => throw i.getTargetException }
 
     @throws(classOf[ObjectStreamException]) private def writeReplace(): AnyRef = parameters match {
-      case null => SerializedMethodCall(method.getDeclaringClass, method.getName, method.getParameterTypes, null)
+      case null                 => SerializedMethodCall(method.getDeclaringClass, method.getName, method.getParameterTypes, null)
       case ps if ps.length == 0 =>
         SerializedMethodCall(method.getDeclaringClass, method.getName, method.getParameterTypes, Array())
       case ps =>
@@ -209,7 +209,7 @@ object TypedActor extends ExtensionId[TypedActorExtension] with ExtensionIdProvi
         serializedParameters match {
           case null               => null
           case a if a.length == 0 => Array[AnyRef]()
-          case a =>
+          case a                  =>
             val deserializedParameters: Array[AnyRef] = new Array[AnyRef](a.length) // Mutable for the sake of sanity
             for (i <- 0 until a.length) {
               val (sId, manifest, bytes) = a(i)
@@ -318,7 +318,7 @@ object TypedActor extends ExtensionId[TypedActorExtension] with ExtensionIdProvi
     override def preRestart(reason: Throwable, message: Option[Any]): Unit = withContext {
       me match {
         case l: PreRestart => l.preRestart(reason, message)
-        case _ =>
+        case _             =>
           self.context.children
             .foreach(self.context.stop) // Can't be super.preRestart(reason, message) since that would invoke postStop which would set the actorVar to DL and proxyVar to null
       }
@@ -465,11 +465,11 @@ object TypedActor extends ExtensionId[TypedActorExtension] with ExtensionIdProvi
     @throws(classOf[Throwable])
     def invoke(proxy: AnyRef, method: Method, args: Array[AnyRef]): AnyRef = method.getName match {
       case "toString" => actor.toString
-      case "equals" =>
+      case "equals"   =>
         (args.length == 1 && (proxy eq args(0)) || actor == extension.getActorRefFor(args(0)))
           .asInstanceOf[AnyRef] // Force boxing of the boolean
       case "hashCode" => actor.hashCode.asInstanceOf[AnyRef]
-      case _ =>
+      case _          =>
         implicit val dispatcher = extension.system.dispatcher
         import pekko.pattern.ask
         MethodCall(method, args) match {
@@ -761,7 +761,7 @@ class TypedActorExtension(val system: ExtendedActorSystem) extends TypedActorFac
   private[pekko] def invocationHandlerFor(typedActor: AnyRef): TypedActorInvocationHandler =
     if ((typedActor ne null) && classOf[Proxy].isAssignableFrom(typedActor.getClass) && Proxy.isProxyClass(
         typedActor.getClass)) typedActor match {
-      case null => null
+      case null  => null
       case other =>
         Proxy.getInvocationHandler(other) match {
           case null                                 => null
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 d7d1f5f362..68b0135184 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
@@ -172,7 +172,7 @@ private[pekko] trait Children { this: ActorCell =>
     val cc = childrenRefs
     cc.getByName(ref.path.name) match {
       case old @ Some(_: ChildRestartStats) => old.asInstanceOf[Option[ChildRestartStats]]
-      case Some(ChildNameReserved) =>
+      case Some(ChildNameReserved)          =>
         val crs = ChildRestartStats(ref)
         val name = ref.path.name
         if (swapChildrenRefs(cc, cc.add(name, crs))) Some(crs) else initChild(ref)
@@ -270,7 +270,7 @@ private[pekko] trait Children { this: ActorCell =>
     name match {
       case null => throw InvalidActorNameException("actor name must not be null")
       case ""   => throw InvalidActorNameException("actor name must not be empty")
-      case _ =>
+      case _    =>
         ActorPath.validatePathElement(name)
         name
     }
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 e950d49878..c433d4170d 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
@@ -204,7 +204,7 @@ private[pekko] object ChildrenContainer {
 
     override def reserve(name: String): ChildrenContainer = reason match {
       case Termination => throw new IllegalStateException("cannot reserve actor name '" + name + "': terminating")
-      case _ =>
+      case _           =>
         if (c contains name)
           throw InvalidActorNameException(s"actor name [$name] is not unique!")
         else copy(c = c.updated(name, ChildNameReserved))
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 4c67e848b9..b00b1f98ba 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
@@ -101,7 +101,7 @@ private[pekko] trait DeathWatch { this: ActorCell =>
       existenceConfirmed: Boolean,
       addressTerminated: Boolean): Unit = {
     watching.get(actor) match {
-      case None => // We're apparently no longer watching this actor.
+      case None                  => // We're apparently no longer watching this actor.
       case Some(optionalMessage) =>
         maintainAddressTerminatedSubscription(actor) {
           watching -= actor
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 1abc8311e6..495b4a782d 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
@@ -187,7 +187,7 @@ private[pekko] trait Dispatch { this: ActorCell =>
 
     unwrappedMessage match {
       case _: NoSerializationVerificationNeeded => envelope
-      case msg =>
+      case msg                                  =>
         if (system.settings.NoSerializationVerificationNeededClassPrefix.exists(msg.getClass.getName.startsWith))
           envelope
         else {
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 147bedc874..dfacb8908b 100644
--- a/actor/src/main/scala/org/apache/pekko/dispatch/AbstractDispatcher.scala
+++ b/actor/src/main/scala/org/apache/pekko/dispatch/AbstractDispatcher.scala
@@ -198,7 +198,7 @@ abstract class MessageDispatcher(val configurator: MessageDispatcherConfigurator
         if (updateShutdownSchedule(SCHEDULED, RESCHEDULED)) ()
         else ifSensibleToDoSoThenScheduleShutdown()
       case RESCHEDULED =>
-      case unexpected =>
+      case unexpected  =>
         throw new IllegalArgumentException(s"Unexpected actor class marker: $unexpected") // will not happen, for exhaustiveness check
     }
   }
@@ -259,7 +259,7 @@ abstract class MessageDispatcher(val configurator: MessageDispatcherConfigurator
           if (updateShutdownSchedule(RESCHEDULED, SCHEDULED)) scheduleShutdownAction()
           else run()
         case UNSCHEDULED =>
-        case unexpected =>
+        case unexpected  =>
           throw new IllegalArgumentException(s"Unexpected actor class marker: $unexpected") // will not happen, for exhaustiveness check
       }
     }
@@ -482,7 +482,7 @@ class ThreadPoolExecutorConfigurator(config: Config, prerequisites: DispatcherPr
               .map {
                 case "array"       => ThreadPoolConfig.arrayBlockingQueue(size, false) // TODO config fairness?
                 case "" | "linked" => ThreadPoolConfig.linkedBlockingQueue(size)
-                case x =>
+                case x             =>
                   throw new IllegalArgumentException("[%s] is not a valid task-queue-type [array|linked]!".format(x))
               }
               .map { qf => (q: ThreadPoolConfigBuilder) =>
diff --git a/actor/src/main/scala/org/apache/pekko/dispatch/CachingConfig.scala b/actor/src/main/scala/org/apache/pekko/dispatch/CachingConfig.scala
index 4f798882bf..7dccac1771 100644
--- a/actor/src/main/scala/org/apache/pekko/dispatch/CachingConfig.scala
+++ b/actor/src/main/scala/org/apache/pekko/dispatch/CachingConfig.scala
@@ -63,7 +63,7 @@ private[pekko] class CachingConfig(_config: Config) extends Config {
       val ne = Try { config.hasPath(path) } match {
         case Failure(_)     => invalidPathEntry
         case Success(false) => nonExistingPathEntry
-        case _ =>
+        case _              =>
           Try { config.getValue(path) } match {
             case Failure(_) =>
               emptyPathEntry
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 06d7c2f510..00597f62f2 100644
--- a/actor/src/main/scala/org/apache/pekko/dispatch/Dispatchers.scala
+++ b/actor/src/main/scala/org/apache/pekko/dispatch/Dispatchers.scala
@@ -272,7 +272,7 @@ class Dispatchers @InternalApi private[pekko] (
           "During a migration period you can still use BalancingDispatcher by specifying the full class name: " +
           classOf[BalancingDispatcherConfigurator].getName)
       case "PinnedDispatcher" => new PinnedDispatcherConfigurator(cfg, prerequisites)
-      case fqn =>
+      case fqn                =>
         val args = List(classOf[Config] -> cfg, classOf[DispatcherPrerequisites] -> prerequisites)
         prerequisites.dynamicAccess
           .createInstanceFor[MessageDispatcherConfigurator](fqn, args)
@@ -383,7 +383,7 @@ class PinnedDispatcherConfigurator(config: Config, prerequisites: DispatcherPrer
 
   private val threadPoolConfig: ThreadPoolConfig = configureExecutor() match {
     case e: ThreadPoolExecutorConfigurator => e.threadPoolConfig
-    case _ =>
+    case _                                 =>
       prerequisites.eventStream.publish(
         Warning(
           "PinnedDispatcherConfigurator",
diff --git a/actor/src/main/scala/org/apache/pekko/dispatch/ForkJoinExecutorConfigurator.scala b/actor/src/main/scala/org/apache/pekko/dispatch/ForkJoinExecutorConfigurator.scala
index 69c714d007..e56b67bc4b 100644
--- a/actor/src/main/scala/org/apache/pekko/dispatch/ForkJoinExecutorConfigurator.scala
+++ b/actor/src/main/scala/org/apache/pekko/dispatch/ForkJoinExecutorConfigurator.scala
@@ -81,7 +81,7 @@ class ForkJoinExecutorConfigurator(config: Config, prerequisites: DispatcherPrer
 
   def validate(t: ThreadFactory): ForkJoinPool.ForkJoinWorkerThreadFactory = t match {
     case correct: ForkJoinPool.ForkJoinWorkerThreadFactory => correct
-    case _ =>
+    case _                                                 =>
       throw new IllegalStateException(
         "The prerequisites for the ForkJoinExecutorConfigurator is a ForkJoinPool.ForkJoinWorkerThreadFactory!")
   }
@@ -188,7 +188,7 @@ class ForkJoinExecutorConfigurator(config: Config, prerequisites: DispatcherPrer
     val asyncMode = config.getString("task-peeking-mode") match {
       case "FIFO" => true
       case "LIFO" => false
-      case _ =>
+      case _      =>
         throw new IllegalArgumentException(
           "Cannot instantiate ForkJoinExecutorServiceFactory. " +
           """"task-peeking-mode" in "fork-join-executor" section could only set to "FIFO" or "LIFO".""")
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 61ed379edb..f8df5240a5 100644
--- a/actor/src/main/scala/org/apache/pekko/dispatch/Mailbox.scala
+++ b/actor/src/main/scala/org/apache/pekko/dispatch/Mailbox.scala
@@ -316,7 +316,7 @@ private[pekko] abstract class Mailbox(val messageQueue: MessageQueue)
       try dlm.systemEnqueue(actor.self, msg)
       catch {
         case e: InterruptedException => interruption = e
-        case NonFatal(e) =>
+        case NonFatal(e)             =>
           actor.system.eventStream.publish(
             Error(
               e,
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 428cba3c18..66fd12eb5e 100644
--- a/actor/src/main/scala/org/apache/pekko/dispatch/Mailboxes.scala
+++ b/actor/src/main/scala/org/apache/pekko/dispatch/Mailboxes.scala
@@ -119,7 +119,7 @@ private[pekko] class Mailboxes(
       case t: ParameterizedType =>
         t.getActualTypeArguments.head match {
           case c: Class[_] => c
-          case x =>
+          case x           =>
             throw new IllegalArgumentException(s"no wildcard type allowed in RequireMessageQueue argument (was [$x])")
         }
       case unexpected =>
@@ -143,7 +143,7 @@ private[pekko] class Mailboxes(
         case t: ParameterizedType =>
           t.getActualTypeArguments.head match {
             case c: Class[_] => c
-            case x =>
+            case x           =>
               throw new IllegalArgumentException(
                 s"no wildcard type allowed in ProducesMessageQueue argument (was [$x])")
           }
@@ -239,7 +239,7 @@ private[pekko] class Mailboxes(
             val conf = config(id)
 
             val mailboxType = conf.getString("mailbox-type") match {
-              case "" => throw new ConfigurationException(s"The setting mailbox-type, defined in [$id] is empty")
+              case ""   => throw new ConfigurationException(s"The setting mailbox-type, defined in [$id] is empty")
               case fqcn =>
                 val args = List(classOf[ActorSystem.Settings] -> settings, classOf[Config] -> conf)
                 dynamicAccess
@@ -313,7 +313,7 @@ private[pekko] class Mailboxes(
       val key = dispatcher + "-" + mailbox
       cache.get(key) match {
         case Some(value) => value
-        case None =>
+        case None        =>
           val value = stashCapacityFromConfig(dispatcher, mailbox)
           updateCache(cache, key, value)
           value
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 256a168673..a1be4c479f 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
@@ -275,7 +275,7 @@ private[pekko] class AffinityPool(
       @tailrec def runLoop(): Unit =
         if (!Thread.interrupted()) {
           (poolState: @switch) match {
-            case Uninitialized => ()
+            case Uninitialized          => ()
             case Initializing | Running =>
               executeNext()
               runLoop()
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 ae11e7235d..4e68fe1b81 100644
--- a/actor/src/main/scala/org/apache/pekko/event/EventBus.scala
+++ b/actor/src/main/scala/org/apache/pekko/event/EventBus.scala
@@ -373,7 +373,7 @@ trait ManagedActorClassification { this: ActorEventBus with ActorClassifier =>
     val current = mappings.get
 
     current.backing.get(monitored) match {
-      case None => false
+      case None           => false
       case Some(monitors) =>
         val removed = current.remove(monitored, monitor)
         val removedMonitors = removed.get(monitored)
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 cdf49f7b92..c554a47929 100644
--- a/actor/src/main/scala/org/apache/pekko/event/Logging.scala
+++ b/actor/src/main/scala/org/apache/pekko/event/Logging.scala
@@ -1002,7 +1002,7 @@ object Logging {
       case e: Warning => warning(e)
       case e: Info    => info(e)
       case e: Debug   => debug(e)
-      case e =>
+      case e          =>
         warning(Warning(simpleName(this), this.getClass, "received unexpected event of class " + e.getClass + ": " + e))
     }
 
@@ -1154,7 +1154,7 @@ object Logging {
   def stackTraceFor(e: Throwable): String = e match {
     case null | Error.NoCause => ""
     case _: NoStackTrace      => s" (${e.getClass.getName}: ${e.getMessage})"
-    case other =>
+    case other                =>
       val sw = new java.io.StringWriter
       val pw = new java.io.PrintWriter(sw)
       pw.append('\n')
diff --git a/actor/src/main/scala/org/apache/pekko/event/jul/JavaLogger.scala b/actor/src/main/scala/org/apache/pekko/event/jul/JavaLogger.scala
index 372f734dd5..a89a26c234 100644
--- a/actor/src/main/scala/org/apache/pekko/event/jul/JavaLogger.scala
+++ b/actor/src/main/scala/org/apache/pekko/event/jul/JavaLogger.scala
@@ -38,7 +38,7 @@ class JavaLogger extends Actor with RequiresMessageQueue[LoggerMessageQueueSeman
     case event: Warning                => log(mapLevel(event.level), null, event)
     case event: Info                   => log(mapLevel(event.level), null, event)
     case event: Debug                  => log(mapLevel(event.level), null, event)
-    case InitializeLogger(_) =>
+    case InitializeLogger(_)           =>
       Logger(this.getClass.getName)
         .warning(s"${getClass.getName} has been deprecated since Akka 2.6.0. Use SLF4J instead.")
       sender() ! LoggerInitialized
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 1dda655cfe..645d50337d 100644
--- a/actor/src/main/scala/org/apache/pekko/io/InetAddressDnsResolver.scala
+++ b/actor/src/main/scala/org/apache/pekko/io/InetAddressDnsResolver.scala
@@ -99,7 +99,7 @@ class InetAddressDnsResolver(cache: SimpleDnsCache, config: Config) extends Acto
       case "default" => if (positive) defaultCachePolicy else defaultNegativeCachePolicy
       case "forever" => Forever
       case "never"   => Never
-      case _ => {
+      case _         => {
         val finiteTtl = config
           .getDuration(path, TimeUnit.SECONDS)
           .requiring(_ > 0, s"pekko.io.dns.$path must be 'default', 'forever', 'never' or positive duration")
@@ -131,7 +131,7 @@ class InetAddressDnsResolver(cache: SimpleDnsCache, config: Config) extends Acto
     case r @ DnsProtocol.Resolve(name, ip @ Ip(ipv4, ipv6)) =>
       val answer = cache.cached(r) match {
         case Some(a) => a
-        case None =>
+        case None    =>
           log.debug("Request for [{}] was not yet cached", name)
           try {
             val addresses: Array[InetAddress] = InetAddress.getAllByName(name)
@@ -153,7 +153,7 @@ class InetAddressDnsResolver(cache: SimpleDnsCache, config: Config) extends Acto
       // no where in pekko now sends this message, but supported until Dns.Resolve/Resolved have been removed
       val answer: Dns.Resolved = cache.cached(name) match {
         case Some(a) => a
-        case None =>
+        case None    =>
           try {
             val addresses = InetAddress.getAllByName(name)
             // respond with the old protocol as the request was the new protocol
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 6380b39147..3359eced6c 100644
--- a/actor/src/main/scala/org/apache/pekko/io/TcpConnection.scala
+++ b/actor/src/main/scala/org/apache/pekko/io/TcpConnection.scala
@@ -289,14 +289,14 @@ private[io] abstract class TcpConnection(val tcp: TcpExt, val channel: SocketCha
 
               AllRead
             case -1 => EndOfStream
-            case _ =>
+            case _  =>
               throw new IllegalStateException("Unexpected value returned from read: " + readBytes)
           }
         } else MoreDataWaiting
 
       val buffer = bufferPool.acquire()
       try innerRead(buffer, ReceivedMessageSizeLimit) match {
-          case AllRead => // nothing to do
+          case AllRead         => // nothing to do
           case MoreDataWaiting =>
             if (!pullMode) self ! ChannelReadable
           case EndOfStream if channel.socket.isOutputShutdown =>
@@ -438,14 +438,14 @@ private[io] abstract class TcpConnection(val tcp: TcpExt, val channel: SocketCha
   def PendingWrite(commander: ActorRef, write: WriteCommand): PendingWrite = {
     @tailrec def create(head: WriteCommand, tail: WriteCommand): PendingWrite =
       head match {
-        case Write.empty                       => if (tail eq Write.empty) EmptyPendingWrite else create(tail, Write.empty)
-        case Write(data, ack) if data.nonEmpty => PendingBufferWrite(commander, data, ack, tail)
+        case Write.empty                         => if (tail eq Write.empty) EmptyPendingWrite else create(tail, Write.empty)
+        case Write(data, ack) if data.nonEmpty   => PendingBufferWrite(commander, data, ack, tail)
         case WriteFile(path, offset, count, ack) =>
           PendingWriteFile(commander, Paths.get(path), offset, count, ack, tail)
         case WritePath(path, offset, count, ack) =>
           PendingWriteFile(commander, path, offset, count, ack, tail)
         case CompoundWrite(h, t) => create(h, t)
-        case x @ Write(_, ack) => // empty write with either an ACK or a non-standard NoACK
+        case x @ Write(_, ack)   => // empty write with either an ACK or a non-standard NoACK
           if (x.wantsAck) commander ! ack
           create(tail, Write.empty)
       }
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 d91c2c2aa9..688d646003 100644
--- a/actor/src/main/scala/org/apache/pekko/io/UdpListener.scala
+++ b/actor/src/main/scala/org/apache/pekko/io/UdpListener.scala
@@ -109,7 +109,7 @@ private[io] class UdpListener(val udp: UdpExt, channelRegistry: ChannelRegistry,
           buffer.flip()
           handler ! Received(ByteString(buffer), sender)
           if (readsLeft > 0) innerReceive(readsLeft - 1, buffer)
-        case null => // null means no data was available
+        case null       => // null means no data was available
         case unexpected =>
           throw new RuntimeException(s"Unexpected address in buffer: $unexpected") // will not happen, for exhaustiveness check
       }
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 7a542a5140..8b01aef905 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
@@ -89,7 +89,7 @@ private[dns] final class DnsSettings(system: ExtendedActorSystem, c: Config) {
       case "thread-local-random"                               => Policy.ThreadLocalRandom
       case "secure-random"                                     => Policy.SecureRandom
       case s if s.isEmpty | s == "enhanced-double-hash-random" => Policy.EnhancedDoubleHashRandom
-      case _ =>
+      case _                                                   =>
         throw new IllegalArgumentException(
           "Invalid value for id-generator-policy, id-generator-policy must be 'thread-local-random', 'secure-random' or" +
           s"`enhanced-double-hash-random`")
@@ -100,7 +100,7 @@ private[dns] final class DnsSettings(system: ExtendedActorSystem, c: Config) {
     c.getString(path) match {
       case "forever" => Forever
       case "never"   => Never
-      case _ =>
+      case _         =>
         val finiteTtl = c
           .getDuration(path)
           .requiring(!_.isNegative, s"pekko.io.dns.$path must be 'default', 'forever', 'never' or positive duration")
@@ -115,7 +115,7 @@ private[dns] final class DnsSettings(system: ExtendedActorSystem, c: Config) {
     } else if (etcResolvConf.exists()) {
       val parsed = ResolvConfParser.parseFile(etcResolvConf)
       parsed match {
-        case Success(value) => Some(value)
+        case Success(value)     => Some(value)
         case Failure(exception) =>
           val log = Logging(system, classOf[DnsSettings])
           if (log.isWarningEnabled) {
@@ -144,7 +144,7 @@ private[dns] final class DnsSettings(system: ExtendedActorSystem, c: Config) {
       case ConfigValueType.STRING =>
         c.getString("ndots") match {
           case "default" => resolvConf.map(_.ndots).getOrElse(1)
-          case _ =>
+          case _         =>
             throw new IllegalArgumentException("Invalid value for ndots. Must be the string 'default' or an integer.")
         }
       case ConfigValueType.NUMBER =>
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 8b76855170..30d505c730 100644
--- a/actor/src/main/scala/org/apache/pekko/japi/JavaAPI.scala
+++ b/actor/src/main/scala/org/apache/pekko/japi/JavaAPI.scala
@@ -269,7 +269,7 @@ object Util {
   def immutableSeq[T](iterable: java.lang.Iterable[T]): immutable.Seq[T] =
     iterable match {
       case imm: immutable.Seq[_] => imm.asInstanceOf[immutable.Seq[T]]
-      case other =>
+      case other                 =>
         val i = other.iterator()
         if (i.hasNext) {
           val builder = new immutable.VectorBuilder[T]
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 c110e3d67a..4cbe494124 100644
--- a/actor/src/main/scala/org/apache/pekko/pattern/AskSupport.scala
+++ b/actor/src/main/scala/org/apache/pekko/pattern/AskSupport.scala
@@ -631,7 +631,7 @@ private[pekko] final class PromiseActorRef(
   override def sendSystemMessage(message: SystemMessage): Unit = message match {
     case _: Terminate                      => stop()
     case DeathWatchNotification(a, ec, at) => this.!(Terminated(a)(existenceConfirmed = ec, addressTerminated = at))
-    case Watch(watchee, watcher) =>
+    case Watch(watchee, watcher)           =>
       if (watchee == this && watcher != this) {
         if (!addWatcher(watcher))
           // ➡➡➡ NEVER SEND THE SAME SYSTEM MESSAGE OBJECT TO TWO ACTORS ⬅⬅⬅
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 c37d8b4fd1..67b40a1187 100644
--- a/actor/src/main/scala/org/apache/pekko/pattern/FutureTimeoutSupport.scala
+++ b/actor/src/main/scala/org/apache/pekko/pattern/FutureTimeoutSupport.scala
@@ -101,7 +101,7 @@ trait FutureTimeoutSupport {
       }
     future.value match {
       case Some(_) => future
-      case None => // not completed yet
+      case None    => // not completed yet
         val p = Promise[T]()
         val timeout = using.scheduleOnce(duration) {
           p.tryFailure(new TimeoutException(s"Timeout of $duration expired"))
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 e31bd108f3..f4511eba27 100644
--- a/actor/src/main/scala/org/apache/pekko/pattern/StatusReply.scala
+++ b/actor/src/main/scala/org/apache/pekko/pattern/StatusReply.scala
@@ -176,7 +176,7 @@ object StatusReply {
         s match {
           case StatusReply.Success(v) => ScalaSuccess(v.asInstanceOf[T])
           case StatusReply.Error(ex)  => ScalaFailure[T](ex)
-          case unexpected =>
+          case unexpected             =>
             ScalaFailure(new IllegalArgumentException(s"Unexpected status reply success value: $unexpected"))
         }
       case fail @ ScalaFailure(_) => fail.asInstanceOf[Try[T]]
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 5d5763b84e..12aa4fc535 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
@@ -107,7 +107,7 @@ import pekko.pattern.{
     case None =>
       finalStopMessage match {
         case Some(fsm) if fsm(msg) => context.stop(self)
-        case _ =>
+        case _                     =>
           handlingWhileStopped match {
             case ForwardDeathLetters => context.system.deadLetters.forward(msg)
             case ForwardTo(h)        => h.forward(msg)
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 4079957814..d128acdcb8 100644
--- a/actor/src/main/scala/org/apache/pekko/routing/ConsistentHashing.scala
+++ b/actor/src/main/scala/org/apache/pekko/routing/ConsistentHashing.scala
@@ -232,7 +232,7 @@ final case class ConsistentHashingRoutingLogic(
               case bytes: Array[Byte] => currentConsistenHash.nodeFor(bytes).routee
               case str: String        => currentConsistenHash.nodeFor(str).routee
               case x: AnyRef          => currentConsistenHash.nodeFor(SerializationExtension(system).serialize(x).get).routee
-              case unexpected =>
+              case unexpected         =>
                 throw new IllegalArgumentException(s"Unexpected hashdata: $unexpected") // will not happen, for exhaustiveness check
             }
         } catch {
@@ -244,7 +244,7 @@ final case class ConsistentHashingRoutingLogic(
       message match {
         case _ if hashMapping.isDefinedAt(message) => target(hashMapping(message))
         case hashable: ConsistentHashable          => target(hashable.consistentHashKey)
-        case _ =>
+        case _                                     =>
           log.warning(
             "Message [{}] must be handled by hashMapping, or implement [{}] or be wrapped in [{}]",
             message.getClass.getName,
diff --git a/actor/src/main/scala/org/apache/pekko/routing/Listeners.scala b/actor/src/main/scala/org/apache/pekko/routing/Listeners.scala
index 4f46995323..e4d0e06ed6 100644
--- a/actor/src/main/scala/org/apache/pekko/routing/Listeners.scala
+++ b/actor/src/main/scala/org/apache/pekko/routing/Listeners.scala
@@ -42,8 +42,8 @@ trait Listeners { self: Actor =>
    * {{{ def receive = listenerManagement orElse … }}}
    */
   protected def listenerManagement: Actor.Receive = {
-    case Listen(l) => listeners.add(l)
-    case Deafen(l) => listeners.remove(l)
+    case Listen(l)        => listeners.add(l)
+    case Deafen(l)        => listeners.remove(l)
     case WithListeners(f) =>
       val i = listeners.iterator
       while (i.hasNext) f(i.next)
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 9b1acf0682..d055b59a4d 100644
--- a/actor/src/main/scala/org/apache/pekko/routing/Resizer.scala
+++ b/actor/src/main/scala/org/apache/pekko/routing/Resizer.scala
@@ -73,7 +73,7 @@ object Resizer {
       case (true, false)  => Some(DefaultResizer(defaultResizerConfig))
       case (false, true)  => Some(OptimalSizeExploringResizer(metricsBasedResizerConfig))
       case (false, false) => None
-      case (true, true) =>
+      case (true, true)   =>
         throw new ResizerInitializationException(s"cannot enable both resizer and optimal-size-exploring-resizer", null)
     }
   }
@@ -336,7 +336,7 @@ private[pekko] class ResizablePoolActor(supervisorStrategy: SupervisorStrategy)
 
   val resizerCell = context match {
     case x: ResizablePoolCell => x
-    case _ =>
+    case _                    =>
       throw ActorInitializationException(
         "Resizable router actor can only be used when resizer is defined, not in " + context.getClass)
   }
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 49d0f29d4e..cc8e6ae6ba 100644
--- a/actor/src/main/scala/org/apache/pekko/routing/RoutedActorCell.scala
+++ b/actor/src/main/scala/org/apache/pekko/routing/RoutedActorCell.scala
@@ -159,7 +159,7 @@ private[pekko] class RoutedActorCell(
 private[pekko] class RouterActor extends Actor {
   val cell = context match {
     case x: RoutedActorCell => x
-    case _ =>
+    case _                  =>
       throw ActorInitializationException("Router actor can only be used in RoutedActorRef, not in " + context.getClass)
   }
 
@@ -198,7 +198,7 @@ private[pekko] class RouterPoolActor(override val supervisorStrategy: Supervisor
 
   val pool = cell.routerConfig match {
     case x: Pool => x
-    case other =>
+    case other   =>
       throw ActorInitializationException("RouterPoolActor can only be used with Pool, not " + other.getClass)
   }
 
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 e1c4550372..30609b7e79 100644
--- a/actor/src/main/scala/org/apache/pekko/serialization/Serialization.scala
+++ b/actor/src/main/scala/org/apache/pekko/serialization/Serialization.scala
@@ -77,7 +77,7 @@ object Serialization {
     Serialization.currentTransportInformation.value match {
       case null =>
         originalSystem match {
-          case null => path.toSerializationFormat
+          case null   => path.toSerializationFormat
           case system =>
             try path.toSerializationFormatWithAddress(system.provider.getDefaultAddress)
             catch { case NonFatal(_) => path.toSerializationFormat }
@@ -228,14 +228,14 @@ class Serialization(val system: ExtendedActorSystem) extends Extension {
     withTransportInformation { () =>
       serializer match {
         case s2: SerializerWithStringManifest => s2.fromBinary(bytes, manifest)
-        case s1 =>
+        case s1                               =>
           if (manifest == "")
             s1.fromBinary(bytes, None)
           else {
             val cache = manifestCache.get
             cache.get(manifest) match {
               case Some(cachedClassManifest) => s1.fromBinary(bytes, cachedClassManifest)
-              case None =>
+              case None                      =>
                 system.dynamicAccess.getClassFor[AnyRef](manifest) match {
                   case Success(classManifest) =>
                     val classManifestOption: Option[Class[_]] = Some(classManifest)
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 de8fc3943f..95627fb831 100644
--- a/actor/src/main/scala/org/apache/pekko/serialization/Serializer.scala
+++ b/actor/src/main/scala/org/apache/pekko/serialization/Serializer.scala
@@ -439,7 +439,7 @@ class ByteArraySerializer(val system: ExtendedActorSystem) extends BaseSerialize
   def toBinary(o: AnyRef): Array[Byte] = o match {
     case null           => null
     case o: Array[Byte] => o
-    case other =>
+    case other          =>
       throw new IllegalArgumentException(
         s"${getClass.getName} only serializes byte arrays, not [${other.getClass.getName}]")
   }
@@ -451,7 +451,7 @@ class ByteArraySerializer(val system: ExtendedActorSystem) extends BaseSerialize
     o match {
       case null               =>
       case bytes: Array[Byte] => buf.put(bytes)
-      case other =>
+      case other              =>
         throw new IllegalArgumentException(
           s"${getClass.getName} only serializes byte arrays, not [${other.getClass.getName}]")
     }
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 dc16c346e6..e6ffeae3fb 100644
--- a/actor/src/main/scala/org/apache/pekko/util/BoundedBlockingQueue.scala
+++ b/actor/src/main/scala/org/apache/pekko/util/BoundedBlockingQueue.scala
@@ -29,7 +29,7 @@ class BoundedBlockingQueue[E <: AnyRef](val maxCapacity: Int, private val backin
     with BlockingQueue[E] {
 
   backing match {
-    case null => throw new IllegalArgumentException("Backing Queue may not be null")
+    case null                => throw new IllegalArgumentException("Backing Queue may not be null")
     case b: BlockingQueue[_] =>
       require(maxCapacity > 0)
       require(b.size() == 0)
@@ -119,7 +119,7 @@ class BoundedBlockingQueue[E <: AnyRef](val maxCapacity: Int, private val backin
         backing.poll() match {
           case null if remainingNanos <= 0 => null.asInstanceOf[E]
           case null                        => pollElement(notEmpty.awaitNanos(remainingNanos))
-          case e => {
+          case e                           => {
             notFull.signal()
             e
           }
@@ -134,7 +134,7 @@ class BoundedBlockingQueue[E <: AnyRef](val maxCapacity: Int, private val backin
     try {
       backing.poll() match {
         case null => null.asInstanceOf[E]
-        case e =>
+        case e    =>
           notFull.signal()
           e
       }
diff --git a/actor/src/main/scala/org/apache/pekko/util/HashCode.scala b/actor/src/main/scala/org/apache/pekko/util/HashCode.scala
index 213fc799c1..fa52f1ff0f 100644
--- a/actor/src/main/scala/org/apache/pekko/util/HashCode.scala
+++ b/actor/src/main/scala/org/apache/pekko/util/HashCode.scala
@@ -43,7 +43,7 @@ object HashCode {
     case value: Float   => hash(seed, value)
     case value: Double  => hash(seed, value)
     case value: Byte    => hash(seed, value)
-    case value: AnyRef =>
+    case value: AnyRef  =>
       var result = seed
       if (value eq null) result = hash(result, 0)
       else if (!isArray(value)) result = hash(result, value.hashCode())
diff --git a/actor/src/main/scala/org/apache/pekko/util/TypedMultiMap.scala b/actor/src/main/scala/org/apache/pekko/util/TypedMultiMap.scala
index c22e603ab2..1677426028 100644
--- a/actor/src/main/scala/org/apache/pekko/util/TypedMultiMap.scala
+++ b/actor/src/main/scala/org/apache/pekko/util/TypedMultiMap.scala
@@ -86,7 +86,7 @@ class TypedMultiMap[T <: AnyRef, K[_ <: T]] private (private val map: Map[T, Set
    */
   def removed(key: T)(value: K[key.type]): TypedMultiMap[T, K] = {
     map.get(key) match {
-      case None => this
+      case None      => this
       case Some(set) =>
         if (set(value)) {
           val newset = set - value
diff --git a/actor/src/main/scala/org/apache/pekko/util/WildcardIndex.scala b/actor/src/main/scala/org/apache/pekko/util/WildcardIndex.scala
index 344220344f..d147275f00 100644
--- a/actor/src/main/scala/org/apache/pekko/util/WildcardIndex.scala
+++ b/actor/src/main/scala/org/apache/pekko/util/WildcardIndex.scala
@@ -80,10 +80,10 @@ private[pekko] final case class WildcardTree[T](
       val nextElement = elems.next()
       children.get(nextElement) match {
         case Some(branch) => branch.findWithSingleWildcard(elems)
-        case None =>
+        case None         =>
           children.get("*") match {
             case Some(branch) => branch.findWithSingleWildcard(elems)
-            case None =>
+            case None         =>
               val maybeWildcardSuffixMatchingBranch = wildcardSuffixChildren.collectFirst {
                 case (key, branch) if nextElement.startsWith(key) => branch
               }
@@ -103,7 +103,7 @@ private[pekko] final case class WildcardTree[T](
       val newAlt = children.getOrElse("**", alt)
       children.get(elems.next()) match {
         case Some(branch) => branch.findWithTerminalDoubleWildcard(elems, newAlt)
-        case None =>
+        case None         =>
           children.get("*") match {
             case Some(branch) => branch.findWithTerminalDoubleWildcard(elems, newAlt)
             case None         => newAlt
diff --git a/bench-jmh/src/main/scala/org/apache/pekko/actor/AffinityPoolComparativeBenchmark.scala b/bench-jmh/src/main/scala/org/apache/pekko/actor/AffinityPoolComparativeBenchmark.scala
index 55e637c9de..b69f7ac504 100644
--- a/bench-jmh/src/main/scala/org/apache/pekko/actor/AffinityPoolComparativeBenchmark.scala
+++ b/bench-jmh/src/main/scala/org/apache/pekko/actor/AffinityPoolComparativeBenchmark.scala
@@ -51,7 +51,7 @@ class AffinityPoolComparativeBenchmark {
     requireRightNumberOfCores(cores)
 
     val mailboxConf = mailbox match {
-      case "default" => ""
+      case "default"                            => ""
       case "SingleConsumerOnlyUnboundedMailbox" =>
         s"""default-mailbox.mailbox-type = "${classOf[pekko.dispatch.SingleConsumerOnlyUnboundedMailbox].getName}""""
     }
diff --git a/bench-jmh/src/main/scala/org/apache/pekko/actor/AffinityPoolRequestResponseBenchmark.scala b/bench-jmh/src/main/scala/org/apache/pekko/actor/AffinityPoolRequestResponseBenchmark.scala
index b99444c41a..d5c51a3e6c 100644
--- a/bench-jmh/src/main/scala/org/apache/pekko/actor/AffinityPoolRequestResponseBenchmark.scala
+++ b/bench-jmh/src/main/scala/org/apache/pekko/actor/AffinityPoolRequestResponseBenchmark.scala
@@ -55,7 +55,7 @@ class AffinityPoolRequestResponseBenchmark {
     requireRightNumberOfCores(cores)
 
     val mailboxConf = mailbox match {
-      case "default" => ""
+      case "default"                            => ""
       case "SingleConsumerOnlyUnboundedMailbox" =>
         s"""default-mailbox.mailbox-type = "${classOf[pekko.dispatch.SingleConsumerOnlyUnboundedMailbox].getName}""""
     }
diff --git a/cluster-metrics/src/main/scala/org/apache/pekko/cluster/metrics/ClusterMetricsCollector.scala b/cluster-metrics/src/main/scala/org/apache/pekko/cluster/metrics/ClusterMetricsCollector.scala
index 8f85fa884e..57f5bcc6a0 100644
--- a/cluster-metrics/src/main/scala/org/apache/pekko/cluster/metrics/ClusterMetricsCollector.scala
+++ b/cluster-metrics/src/main/scala/org/apache/pekko/cluster/metrics/ClusterMetricsCollector.scala
@@ -205,7 +205,7 @@ private[metrics] class ClusterMetricsCollector extends Actor with ActorLogging {
     case MemberRemoved(m, _)        => removeMember(m)
     case MemberExited(m)            => removeMember(m)
     case UnreachableMember(m)       => removeMember(m)
-    case ReachableMember(m) =>
+    case ReachableMember(m)         =>
       if (m.status == MemberStatus.Up || m.status == MemberStatus.WeaklyUp)
         addMember(m)
     case _: MemberEvent => // not interested in other types of MemberEvent
diff --git a/cluster-metrics/src/main/scala/org/apache/pekko/cluster/metrics/ClusterMetricsRouting.scala b/cluster-metrics/src/main/scala/org/apache/pekko/cluster/metrics/ClusterMetricsRouting.scala
index d40b9871db..2d6712cae4 100644
--- a/cluster-metrics/src/main/scala/org/apache/pekko/cluster/metrics/ClusterMetricsRouting.scala
+++ b/cluster-metrics/src/main/scala/org/apache/pekko/cluster/metrics/ClusterMetricsRouting.scala
@@ -192,7 +192,7 @@ final case class AdaptiveLoadBalancingPool(
     if (this.supervisorStrategy ne Pool.defaultSupervisorStrategy) this
     else
       other match {
-        case _: FromConfig | _: NoRouter => this // NoRouter is the default, hence “neutral”
+        case _: FromConfig | _: NoRouter            => this // NoRouter is the default, hence “neutral”
         case otherRouter: AdaptiveLoadBalancingPool =>
           if (otherRouter.supervisorStrategy eq Pool.defaultSupervisorStrategy) this
           else this.withSupervisorStrategy(otherRouter.supervisorStrategy)
@@ -411,7 +411,7 @@ object MetricsSelector {
       case "heap" => HeapMetricsSelector
       case "cpu"  => CpuMetricsSelector
       case "load" => SystemLoadAverageMetricsSelector
-      case fqn =>
+      case fqn    =>
         val args = List(classOf[Config] -> config)
         dynamicAccess
           .createInstanceFor[MetricsSelector](fqn, args)
diff --git a/cluster-metrics/src/main/scala/org/apache/pekko/cluster/metrics/protobuf/MessageSerializer.scala b/cluster-metrics/src/main/scala/org/apache/pekko/cluster/metrics/protobuf/MessageSerializer.scala
index 57109a90bf..0ce1047548 100644
--- a/cluster-metrics/src/main/scala/org/apache/pekko/cluster/metrics/protobuf/MessageSerializer.scala
+++ b/cluster-metrics/src/main/scala/org/apache/pekko/cluster/metrics/protobuf/MessageSerializer.scala
@@ -54,7 +54,7 @@ class MessageSerializer(val system: ExtendedActorSystem) extends SerializerWithS
     case CpuMetricsSelector               => CpuMetricsSelectorManifest
     case HeapMetricsSelector              => HeapMetricsSelectorManifest
     case SystemLoadAverageMetricsSelector => SystemLoadAverageMetricsSelectorManifest
-    case _ =>
+    case _                                =>
       throw new IllegalArgumentException(s"Can't serialize object of type ${obj.getClass} in [${getClass.getName}]")
   }
 
@@ -65,7 +65,7 @@ class MessageSerializer(val system: ExtendedActorSystem) extends SerializerWithS
     case CpuMetricsSelector               => Array.emptyByteArray
     case HeapMetricsSelector              => Array.emptyByteArray
     case SystemLoadAverageMetricsSelector => Array.emptyByteArray
-    case _ =>
+    case _                                =>
       throw new IllegalArgumentException(s"Can't serialize object of type ${obj.getClass} in [${getClass.getName}]")
   }
 
@@ -84,7 +84,7 @@ class MessageSerializer(val system: ExtendedActorSystem) extends SerializerWithS
 
     @tailrec def readChunk(): Unit = in.read(buffer) match {
       case -1 => ()
-      case n =>
+      case n  =>
         out.write(buffer, 0, n)
         readChunk()
     }
@@ -101,7 +101,7 @@ class MessageSerializer(val system: ExtendedActorSystem) extends SerializerWithS
     case CpuMetricsSelectorManifest               => CpuMetricsSelector
     case HeapMetricsSelectorManifest              => HeapMetricsSelector
     case SystemLoadAverageMetricsSelectorManifest => SystemLoadAverageMetricsSelector
-    case _ =>
+    case _                                        =>
       throw new NotSerializableException(
         s"Unimplemented deserialization of message with manifest [$manifest] in [${getClass.getName}")
   }
@@ -203,7 +203,7 @@ class MessageSerializer(val system: ExtendedActorSystem) extends SerializerWithS
         case n: jl.Long    => Number.newBuilder().setType(NumberType.Long).setValue64(n)
         case n: jl.Float   => Number.newBuilder().setType(NumberType.Float).setValue32(jl.Float.floatToIntBits(n))
         case n: jl.Integer => Number.newBuilder().setType(NumberType.Integer).setValue32(n)
-        case _ =>
+        case _             =>
           val bos = new ByteArrayOutputStream
           val out = new ObjectOutputStream(bos)
           out.writeObject(number)
@@ -257,10 +257,10 @@ class MessageSerializer(val system: ExtendedActorSystem) extends SerializerWithS
     def numberFromProto(number: cm.NodeMetrics.Number): Number = {
       import cm.NodeMetrics.NumberType
       number.getType.getNumber match {
-        case NumberType.Double_VALUE  => jl.Double.longBitsToDouble(number.getValue64)
-        case NumberType.Long_VALUE    => number.getValue64
-        case NumberType.Float_VALUE   => jl.Float.intBitsToFloat(number.getValue32)
-        case NumberType.Integer_VALUE => number.getValue32
+        case NumberType.Double_VALUE     => jl.Double.longBitsToDouble(number.getValue64)
+        case NumberType.Long_VALUE       => number.getValue64
+        case NumberType.Float_VALUE      => jl.Float.intBitsToFloat(number.getValue32)
+        case NumberType.Integer_VALUE    => number.getValue32
         case NumberType.Serialized_VALUE =>
           val in = new NumberInputStream(
             system.dynamicAccess.classLoader,
diff --git a/cluster-metrics/src/multi-jvm/scala/org/apache/pekko/cluster/metrics/sample/StatsWorker.scala b/cluster-metrics/src/multi-jvm/scala/org/apache/pekko/cluster/metrics/sample/StatsWorker.scala
index 79f47b9878..38923f1511 100644
--- a/cluster-metrics/src/multi-jvm/scala/org/apache/pekko/cluster/metrics/sample/StatsWorker.scala
+++ b/cluster-metrics/src/multi-jvm/scala/org/apache/pekko/cluster/metrics/sample/StatsWorker.scala
@@ -22,7 +22,7 @@ class StatsWorker extends Actor {
     case word: String =>
       val length = cache.get(word) match {
         case Some(x) => x
-        case None =>
+        case None    =>
           val x = word.length
           cache += (word -> x)
           x
diff --git a/cluster-metrics/src/test/scala/org/apache/pekko/cluster/metrics/EWMASpec.scala b/cluster-metrics/src/test/scala/org/apache/pekko/cluster/metrics/EWMASpec.scala
index c0480172e1..3513f577fa 100644
--- a/cluster-metrics/src/test/scala/org/apache/pekko/cluster/metrics/EWMASpec.scala
+++ b/cluster-metrics/src/test/scala/org/apache/pekko/cluster/metrics/EWMASpec.scala
@@ -95,7 +95,7 @@ class EWMASpec extends PekkoSpec(MetricsConfig.defaultEnabled) with MetricsColle
         usedMemory = usedMemory ++ Array.fill(1024)(ThreadLocalRandom.current.nextInt(127).toByte)
         val changes = collector.sample().metrics.flatMap { latest =>
           streamingDataSet.get(latest.name) match {
-            case None => Some(latest)
+            case None           => Some(latest)
             case Some(previous) =>
               if (latest.isSmooth && latest.value != previous.value) {
                 val updated = previous :+ latest
diff --git a/cluster-metrics/src/test/scala/org/apache/pekko/cluster/metrics/MetricsCollectorSpec.scala b/cluster-metrics/src/test/scala/org/apache/pekko/cluster/metrics/MetricsCollectorSpec.scala
index 2ebc4cd054..42b512085c 100644
--- a/cluster-metrics/src/test/scala/org/apache/pekko/cluster/metrics/MetricsCollectorSpec.scala
+++ b/cluster-metrics/src/test/scala/org/apache/pekko/cluster/metrics/MetricsCollectorSpec.scala
@@ -75,7 +75,7 @@ class MetricsCollectorSpec
         case (Processors, b)          => b.intValue should be >= 0
         case (HeapMemoryUsed, b)      => b.longValue should be >= 0L
         case (HeapMemoryCommitted, b) => b.longValue should be > 0L
-        case (HeapMemoryMax, b) =>
+        case (HeapMemoryMax, b)       =>
           b.longValue should be > 0L
           used.get.longValue should be <= b.longValue
           committed.get.longValue should be <= b.longValue
diff --git a/cluster-sharding-typed/src/main/scala/org/apache/pekko/cluster/sharding/typed/delivery/internal/ShardingProducerControllerImpl.scala b/cluster-sharding-typed/src/main/scala/org/apache/pekko/cluster/sharding/typed/delivery/internal/ShardingProducerControllerImpl.scala
index d30b1df016..26dae3a91a 100644
--- a/cluster-sharding-typed/src/main/scala/org/apache/pekko/cluster/sharding/typed/delivery/internal/ShardingProducerControllerImpl.scala
+++ b/cluster-sharding-typed/src/main/scala/org/apache/pekko/cluster/sharding/typed/delivery/internal/ShardingProducerControllerImpl.scala
@@ -372,7 +372,7 @@ private class ShardingProducerControllerImpl[A: ClassTag](
 
       if (confirmed.nonEmpty) {
         confirmed.foreach {
-          case Unconfirmed(_, _, None) => // no reply
+          case Unconfirmed(_, _, None)          => // no reply
           case Unconfirmed(_, _, Some(replyTo)) =>
             replyTo ! Done
         }
diff --git a/cluster-sharding-typed/src/main/scala/org/apache/pekko/cluster/sharding/typed/internal/ReplicatedShardingExtensionImpl.scala b/cluster-sharding-typed/src/main/scala/org/apache/pekko/cluster/sharding/typed/internal/ReplicatedShardingExtensionImpl.scala
index 8a64289d24..45ebce4fc6 100644
--- a/cluster-sharding-typed/src/main/scala/org/apache/pekko/cluster/sharding/typed/internal/ReplicatedShardingExtensionImpl.scala
+++ b/cluster-sharding-typed/src/main/scala/org/apache/pekko/cluster/sharding/typed/internal/ReplicatedShardingExtensionImpl.scala
@@ -100,7 +100,7 @@ private[pekko] final class ReplicatedShardingImpl[M](
     replicaTypeKeys.map {
       case (replicaId, (typeKey, dc, typeName)) =>
         replicaId -> (dc match {
-          case None => sharding.entityRefFor(typeKey, ReplicationId(typeName, entityId, replicaId).persistenceId.id)
+          case None     => sharding.entityRefFor(typeKey, ReplicationId(typeName, entityId, replicaId).persistenceId.id)
           case Some(dc) =>
             sharding.entityRefFor(typeKey, ReplicationId(typeName, entityId, replicaId).persistenceId.id, dc)
         })
diff --git a/cluster-sharding-typed/src/main/scala/org/apache/pekko/cluster/sharding/typed/internal/ShardingSerializer.scala b/cluster-sharding-typed/src/main/scala/org/apache/pekko/cluster/sharding/typed/internal/ShardingSerializer.scala
index a9bcbdf6c4..3d064b94d2 100644
--- a/cluster-sharding-typed/src/main/scala/org/apache/pekko/cluster/sharding/typed/internal/ShardingSerializer.scala
+++ b/cluster-sharding-typed/src/main/scala/org/apache/pekko/cluster/sharding/typed/internal/ShardingSerializer.scala
@@ -40,7 +40,7 @@ import java.nio.ByteBuffer
 
   override def manifest(o: AnyRef): String = o match {
     case _: ShardingEnvelope[_] => ShardingEnvelopeManifest
-    case _ =>
+    case _                      =>
       throw new IllegalArgumentException(s"Can't serialize object of type ${o.getClass} in [${getClass.getName}]")
   }
 
diff --git a/cluster-sharding-typed/src/test/scala/docs/org/apache/pekko/cluster/sharding/typed/AccountExampleWithEventHandlersInState.scala b/cluster-sharding-typed/src/test/scala/docs/org/apache/pekko/cluster/sharding/typed/AccountExampleWithEventHandlersInState.scala
index 2fc6caa9c8..032ed7e74e 100644
--- a/cluster-sharding-typed/src/test/scala/docs/org/apache/pekko/cluster/sharding/typed/AccountExampleWithEventHandlersInState.scala
+++ b/cluster-sharding-typed/src/test/scala/docs/org/apache/pekko/cluster/sharding/typed/AccountExampleWithEventHandlersInState.scala
@@ -117,10 +117,10 @@ object AccountExampleWithEventHandlersInState {
 
           case acc @ OpenedAccount(_) =>
             cmd match {
-              case c: Deposit      => deposit(c)
-              case c: Withdraw     => withdraw(acc, c)
-              case c: GetBalance   => getBalance(acc, c)
-              case c: CloseAccount => closeAccount(acc, c)
+              case c: Deposit       => deposit(c)
+              case c: Withdraw      => withdraw(acc, c)
+              case c: GetBalance    => getBalance(acc, c)
+              case c: CloseAccount  => closeAccount(acc, c)
               case c: CreateAccount =>
                 Effect.reply(c.replyTo)(StatusReply.Error(s"Account $accountNumber is already created"))
             }
diff --git a/cluster-sharding/src/main/scala/org/apache/pekko/cluster/sharding/ClusterSharding.scala b/cluster-sharding/src/main/scala/org/apache/pekko/cluster/sharding/ClusterSharding.scala
index 9278839da3..3a3a73b231 100755
--- a/cluster-sharding/src/main/scala/org/apache/pekko/cluster/sharding/ClusterSharding.scala
+++ b/cluster-sharding/src/main/scala/org/apache/pekko/cluster/sharding/ClusterSharding.scala
@@ -742,7 +742,7 @@ private[pekko] class ClusterShardingGuardian extends Actor {
       // one Replicator per role
       replicatorByRole.get(settings.role) match {
         case Some(ref) => ref
-        case None =>
+        case None      =>
           val name = settings.role match {
             case Some(r) => URLEncoder.encode(r, ByteString.UTF_8) + "Replicator"
             case None    => "replicator"
diff --git a/cluster-sharding/src/main/scala/org/apache/pekko/cluster/sharding/ClusterShardingSettings.scala b/cluster-sharding/src/main/scala/org/apache/pekko/cluster/sharding/ClusterShardingSettings.scala
index db9e21d9da..2fc309cc75 100644
--- a/cluster-sharding/src/main/scala/org/apache/pekko/cluster/sharding/ClusterShardingSettings.scala
+++ b/cluster-sharding/src/main/scala/org/apache/pekko/cluster/sharding/ClusterShardingSettings.scala
@@ -579,7 +579,7 @@ object ClusterShardingSettings {
     def apply(config: Config): PassivationStrategySettings = {
       toRootLowerCase(config.getString("strategy")) match {
         case "off" | "none" => PassivationStrategySettings.disabled
-        case strategyName =>
+        case strategyName   =>
           val strategyDefaults = config.getConfig("strategy-defaults")
           val strategyConfig = config.getConfig(strategyName).withFallback(strategyDefaults)
           val idleEntitySettings = IdleSettings.optional(strategyConfig.getConfig("idle-entity"))
@@ -873,7 +873,7 @@ object ClusterShardingSettings {
               idle) =>
           val describeWindow = windowStrategy match {
             case NoPassivationStrategy => "no admission window"
-            case _ =>
+            case _                     =>
               s"admission window (${describe(windowStrategy)})" +
               (windowOptimizer match {
                 case CompositePassivationStrategy.NoAdmissionOptimizer =>
diff --git a/cluster-sharding/src/main/scala/org/apache/pekko/cluster/sharding/RemoveInternalClusterShardingData.scala b/cluster-sharding/src/main/scala/org/apache/pekko/cluster/sharding/RemoveInternalClusterShardingData.scala
index 2e9ee36953..9f52a161f7 100644
--- a/cluster-sharding/src/main/scala/org/apache/pekko/cluster/sharding/RemoveInternalClusterShardingData.scala
+++ b/cluster-sharding/src/main/scala/org/apache/pekko/cluster/sharding/RemoveInternalClusterShardingData.scala
@@ -153,7 +153,7 @@ object RemoveInternalClusterShardingData {
 
     override def receiveRecover: Receive = {
       case _: ShardCoordinator.Internal.DomainEvent =>
-      case SnapshotOffer(_, _) =>
+      case SnapshotOffer(_, _)                      =>
         hasSnapshots = true
 
       case RecoveryCompleted =>
diff --git a/cluster-sharding/src/main/scala/org/apache/pekko/cluster/sharding/Shard.scala b/cluster-sharding/src/main/scala/org/apache/pekko/cluster/sharding/Shard.scala
index 5ed37f9c85..2fbebcc72c 100644
--- a/cluster-sharding/src/main/scala/org/apache/pekko/cluster/sharding/Shard.scala
+++ b/cluster-sharding/src/main/scala/org/apache/pekko/cluster/sharding/Shard.scala
@@ -222,7 +222,7 @@ private[pekko] object Shard {
    */
   final case class RememberingStart(ackTo: Set[ActorRef]) extends EntityState {
     override def transition(newState: EntityState, entities: Entities): EntityState = newState match {
-      case active: Active => active
+      case active: Active      => active
       case r: RememberingStart =>
         if (ackTo.isEmpty) {
           if (r.ackTo.isEmpty) RememberingStart.empty
@@ -692,13 +692,13 @@ private[pekko] class Shard(
       log.error("{}: Remember entity store did not respond, restarting shard", typeName)
       throw new RuntimeException(
         s"Async write timed out after ${settings.tuningParameters.updatingStateTimeout.pretty}")
-    case ShardRegion.StartEntity(entityId) => startEntity(entityId, Some(sender()))
-    case me: MemberEvent                   => receiveMemberEvent(me)
-    case Terminated(ref)                   => receiveTerminated(ref)
-    case EntityTerminated(ref)             => entityTerminated(ref)
-    case _: CoordinatorMessage             => stash()
-    case cmd: RememberEntityCommand        => receiveRememberEntityCommand(cmd)
-    case l: LeaseLost                      => receiveLeaseLost(l)
+    case ShardRegion.StartEntity(entityId)  => startEntity(entityId, Some(sender()))
+    case me: MemberEvent                    => receiveMemberEvent(me)
+    case Terminated(ref)                    => receiveTerminated(ref)
+    case EntityTerminated(ref)              => entityTerminated(ref)
+    case _: CoordinatorMessage              => stash()
+    case cmd: RememberEntityCommand         => receiveRememberEntityCommand(cmd)
+    case l: LeaseLost                       => receiveLeaseLost(l)
     case ShardRegion.Passivate(stopMessage) =>
       if (verboseDebug)
         log.debug(
@@ -706,10 +706,10 @@ private[pekko] class Shard(
           typeName,
           entities.entityId(sender()).getOrElse(s"Unknown actor ${sender()}"))
       passivate(sender(), stopMessage)
-    case msg: ShardQuery                 => receiveShardQuery(msg)
-    case PassivateIntervalTick           => stash()
-    case msg: RememberEntityStoreCrashed => rememberEntityStoreCrashed(msg)
-    case msg: ShardsUpdated              => shardsUpdated(msg)
+    case msg: ShardQuery                         => receiveShardQuery(msg)
+    case PassivateIntervalTick                   => stash()
+    case msg: RememberEntityStoreCrashed         => rememberEntityStoreCrashed(msg)
+    case msg: ShardsUpdated                      => shardsUpdated(msg)
     case msg if extractEntityId.isDefinedAt(msg) =>
       deliverMessage(msg, sender())
     case msg =>
@@ -868,7 +868,7 @@ private[pekko] class Shard(
 
   private def handOff(replyTo: ActorRef): Unit = handOffStopper match {
     case Some(_) => log.warning("{}: HandOff shard [{}] received during existing handOff", typeName, shardId)
-    case None =>
+    case None    =>
       log.debug("{}: HandOff shard [{}]", typeName, shardId)
 
       // does conversion so only do once
@@ -1124,7 +1124,7 @@ private[pekko] class Shard(
   def getOrCreateEntity(id: EntityId): ActorRef = {
     entities.entity(id) match {
       case OptionVal.Some(child) => child
-      case _ =>
+      case _                     =>
         val name = URLEncoder.encode(id, "utf-8")
         val a = context.actorOf(entityProps(id), name)
         context.watchWith(a, EntityTerminated(a))
diff --git a/cluster-sharding/src/main/scala/org/apache/pekko/cluster/sharding/ShardCoordinator.scala b/cluster-sharding/src/main/scala/org/apache/pekko/cluster/sharding/ShardCoordinator.scala
index f687553dd1..75ad99be19 100644
--- a/cluster-sharding/src/main/scala/org/apache/pekko/cluster/sharding/ShardCoordinator.scala
+++ b/cluster-sharding/src/main/scala/org/apache/pekko/cluster/sharding/ShardCoordinator.scala
@@ -624,8 +624,8 @@ object ShardCoordinator {
     }
 
     def stoppingShard: Receive = {
-      case ShardStopped(`shard`) => done(ok = true)
-      case ReceiveTimeout        => done(ok = false)
+      case ShardStopped(`shard`)                                    => done(ok = true)
+      case ReceiveTimeout                                           => done(ok = false)
       case RebalanceWorker.ShardRegionTerminated(`shardRegionFrom`) =>
         log.debug(
           "{}: ShardRegion [{}] terminated while waiting for ShardStopped for shard [{}].",
@@ -1203,7 +1203,7 @@ abstract class ShardCoordinator(
     } else {
       state.shards.get(shard) match {
         case Some(ref) => getShardHomeSender ! ShardHome(shard, ref)
-        case None =>
+        case None      =>
           if (state.regions.contains(region) && !gracefulShutdownInProgress(region) && !regionTerminationInProgress
               .contains(region)) {
             update(ShardHomeAllocated(shard, region)) { evt =>
diff --git a/cluster-sharding/src/main/scala/org/apache/pekko/cluster/sharding/ShardRegion.scala b/cluster-sharding/src/main/scala/org/apache/pekko/cluster/sharding/ShardRegion.scala
index 20e9a8f3a1..5af701afa2 100644
--- a/cluster-sharding/src/main/scala/org/apache/pekko/cluster/sharding/ShardRegion.scala
+++ b/cluster-sharding/src/main/scala/org/apache/pekko/cluster/sharding/ShardRegion.scala
@@ -764,7 +764,7 @@ private[pekko] class ShardRegion(
     case msg: StartEntity                        => deliverStartEntity(msg, sender())
     case msg: SetActiveEntityLimit               => deliverToAllShards(msg, sender())
     case msg if extractEntityId.isDefinedAt(msg) => deliverMessage(msg, sender())
-    case unknownMsg =>
+    case unknownMsg                              =>
       log.warning("{}: Message does not have an extractor defined in shard so it was ignored: {}", typeName, unknownMsg)
   }
 
diff --git a/cluster-sharding/src/main/scala/org/apache/pekko/cluster/sharding/external/internal/ExternalShardAllocationClientImpl.scala b/cluster-sharding/src/main/scala/org/apache/pekko/cluster/sharding/external/internal/ExternalShardAllocationClientImpl.scala
index ef42bcf8e8..8b9dd5291c 100644
--- a/cluster-sharding/src/main/scala/org/apache/pekko/cluster/sharding/external/internal/ExternalShardAllocationClientImpl.scala
+++ b/cluster-sharding/src/main/scala/org/apache/pekko/cluster/sharding/external/internal/ExternalShardAllocationClientImpl.scala
@@ -78,7 +78,7 @@ final private[external] class ExternalShardAllocationClientImpl(system: ActorSys
       existing.put(self, shard, location.toString)
     }).flatMap {
       case UpdateSuccess(_, _) => Future.successful(Done)
-      case UpdateTimeout =>
+      case UpdateTimeout       =>
         Future.failed(new ClientTimeoutException(s"Unable to update shard location after ${timeout.duration.pretty}"))
       case _ => throw new IllegalArgumentException() // compiler exhaustiveness check pleaser
     }
@@ -114,7 +114,7 @@ final private[external] class ExternalShardAllocationClientImpl(system: ActorSys
       }
     }).flatMap {
       case UpdateSuccess(_, _) => Future.successful(Done)
-      case UpdateTimeout =>
+      case UpdateTimeout       =>
         Future.failed(new ClientTimeoutException(s"Unable to update shard location after ${timeout.duration.pretty}"))
       case _ => throw new IllegalArgumentException() // compiler exhaustiveness check pleaser
     }
diff --git a/cluster-sharding/src/main/scala/org/apache/pekko/cluster/sharding/internal/AbstractLeastShardAllocationStrategy.scala b/cluster-sharding/src/main/scala/org/apache/pekko/cluster/sharding/internal/AbstractLeastShardAllocationStrategy.scala
index 4f1f2cd70c..29a1ece365 100644
--- a/cluster-sharding/src/main/scala/org/apache/pekko/cluster/sharding/internal/AbstractLeastShardAllocationStrategy.scala
+++ b/cluster-sharding/src/main/scala/org/apache/pekko/cluster/sharding/internal/AbstractLeastShardAllocationStrategy.scala
@@ -105,7 +105,7 @@ private[pekko] abstract class AbstractLeastShardAllocationStrategy extends Actor
     // Avoid rebalance when rolling update is in progress
     // (This will ignore versions on members with no shard regions, because of sharding role or not yet completed joining)
     regionEntries.headOption match {
-      case None => false // empty list of regions, probably not a good time to rebalance...
+      case None              => false // empty list of regions, probably not a good time to rebalance...
       case Some(firstRegion) =>
         def allNodesSameVersion = {
           regionEntries.forall(_.member.appVersion == firstRegion.member.appVersion)
diff --git a/cluster-sharding/src/main/scala/org/apache/pekko/cluster/sharding/internal/EventSourcedRememberEntitiesShardStore.scala b/cluster-sharding/src/main/scala/org/apache/pekko/cluster/sharding/internal/EventSourcedRememberEntitiesShardStore.scala
index 1395fd66bf..3bbd8e4189 100644
--- a/cluster-sharding/src/main/scala/org/apache/pekko/cluster/sharding/internal/EventSourcedRememberEntitiesShardStore.scala
+++ b/cluster-sharding/src/main/scala/org/apache/pekko/cluster/sharding/internal/EventSourcedRememberEntitiesShardStore.scala
@@ -95,7 +95,7 @@ private[pekko] final class EventSourcedRememberEntitiesShardStore(
     case EntitiesStarted(ids)              => state = state.copy(state.entities.union(ids))
     case EntitiesStopped(ids)              => state = state.copy(state.entities.diff(ids))
     case SnapshotOffer(_, snapshot: State) => state = snapshot
-    case RecoveryCompleted =>
+    case RecoveryCompleted                 =>
       log.debug("Recovery completed for shard [{}] with [{}] entities", shardId, state.entities.size)
   }
 
diff --git a/cluster-sharding/src/main/scala/org/apache/pekko/cluster/sharding/protobuf/ClusterShardingMessageSerializer.scala b/cluster-sharding/src/main/scala/org/apache/pekko/cluster/sharding/protobuf/ClusterShardingMessageSerializer.scala
index 3781d1d71b..0aef90d30d 100644
--- a/cluster-sharding/src/main/scala/org/apache/pekko/cluster/sharding/protobuf/ClusterShardingMessageSerializer.scala
+++ b/cluster-sharding/src/main/scala/org/apache/pekko/cluster/sharding/protobuf/ClusterShardingMessageSerializer.scala
@@ -326,7 +326,7 @@ private[pekko] class ClusterShardingMessageSerializer(val system: ExtendedActorS
   override def fromBinary(bytes: Array[Byte], manifest: String): AnyRef =
     fromBinaryMap.get(manifest) match {
       case Some(f) => f(bytes)
-      case None =>
+      case None    =>
         throw new NotSerializableException(
           s"Unimplemented deserialization of message with manifest [$manifest] in [${getClass.getName}]")
     }
@@ -631,7 +631,7 @@ private[pekko] class ClusterShardingMessageSerializer(val system: ExtendedActorS
 
     @tailrec def readChunk(): Unit = in.read(buffer) match {
       case -1 => ()
-      case n =>
+      case n  =>
         out.write(buffer, 0, n)
         readChunk()
     }
diff --git a/cluster-sharding/src/multi-jvm/scala/org/apache/pekko/cluster/sharding/ClusterShardingGracefulShutdownOldestSpec.scala b/cluster-sharding/src/multi-jvm/scala/org/apache/pekko/cluster/sharding/ClusterShardingGracefulShutdownOldestSpec.scala
index 7b755bd2e9..c1bf753a37 100644
--- a/cluster-sharding/src/multi-jvm/scala/org/apache/pekko/cluster/sharding/ClusterShardingGracefulShutdownOldestSpec.scala
+++ b/cluster-sharding/src/multi-jvm/scala/org/apache/pekko/cluster/sharding/ClusterShardingGracefulShutdownOldestSpec.scala
@@ -42,7 +42,7 @@ object ClusterShardingGracefulShutdownOldestSpec {
     import SlowStopShardedEntity._
 
     def receive: Receive = {
-      case id: Int => sender() ! id
+      case id: Int                    => sender() ! id
       case SlowStopShardedEntity.Stop =>
         timers.startSingleTimer(ActualStop, ActualStop, 50.millis)
       case SlowStopShardedEntity.ActualStop =>
diff --git a/cluster-sharding/src/multi-jvm/scala/org/apache/pekko/cluster/sharding/ClusterShardingSpec.scala b/cluster-sharding/src/multi-jvm/scala/org/apache/pekko/cluster/sharding/ClusterShardingSpec.scala
index d9556e924e..a8731aa384 100644
--- a/cluster-sharding/src/multi-jvm/scala/org/apache/pekko/cluster/sharding/ClusterShardingSpec.scala
+++ b/cluster-sharding/src/multi-jvm/scala/org/apache/pekko/cluster/sharding/ClusterShardingSpec.scala
@@ -381,7 +381,7 @@ abstract class ClusterShardingSpec(multiNodeConfig: ClusterShardingSpecConfig)
       if (!rememberEntities) None
       else
         settings.rememberEntitiesStore match {
-          case ClusterShardingSettings.RememberEntitiesStoreDData => Some(ddataRememberEntitiesProvider(typeName))
+          case ClusterShardingSettings.RememberEntitiesStoreDData        => Some(ddataRememberEntitiesProvider(typeName))
           case ClusterShardingSettings.RememberEntitiesStoreEventsourced =>
             Some(eventSourcedRememberEntitiesProvider(typeName, settings))
           case _ => fail()
diff --git a/cluster-sharding/src/multi-jvm/scala/org/apache/pekko/cluster/sharding/MultiNodeClusterShardingSpec.scala b/cluster-sharding/src/multi-jvm/scala/org/apache/pekko/cluster/sharding/MultiNodeClusterShardingSpec.scala
index 11ab681f95..43d25fe402 100644
--- a/cluster-sharding/src/multi-jvm/scala/org/apache/pekko/cluster/sharding/MultiNodeClusterShardingSpec.scala
+++ b/cluster-sharding/src/multi-jvm/scala/org/apache/pekko/cluster/sharding/MultiNodeClusterShardingSpec.scala
@@ -65,7 +65,7 @@ object MultiNodeClusterShardingSpec {
 
   class ShardedEntity extends Actor {
     def receive: Receive = {
-      case id: Int => sender() ! id
+      case id: Int            => sender() ! id
       case ShardedEntity.Stop =>
         context.stop(self)
     }
diff --git a/cluster-sharding/src/test/scala/org/apache/pekko/cluster/sharding/RememberEntitiesFailureSpec.scala b/cluster-sharding/src/test/scala/org/apache/pekko/cluster/sharding/RememberEntitiesFailureSpec.scala
index 27c0029c91..f4a07fc5b4 100644
--- a/cluster-sharding/src/test/scala/org/apache/pekko/cluster/sharding/RememberEntitiesFailureSpec.scala
+++ b/cluster-sharding/src/test/scala/org/apache/pekko/cluster/sharding/RememberEntitiesFailureSpec.scala
@@ -119,20 +119,20 @@ object RememberEntitiesFailureSpec {
     override def receive: Receive = {
       case RememberEntitiesShardStore.GetEntities =>
         failShardGetEntities.get(shardId) match {
-          case None             => sender() ! RememberEntitiesShardStore.RememberedEntities(Set.empty)
-          case Some(NoResponse) => log.debug("Sending no response for GetEntities")
-          case Some(CrashStore) => throw TestException("store crash on GetEntities")
-          case Some(StopStore)  => context.stop(self)
+          case None                 => sender() ! RememberEntitiesShardStore.RememberedEntities(Set.empty)
+          case Some(NoResponse)     => log.debug("Sending no response for GetEntities")
+          case Some(CrashStore)     => throw TestException("store crash on GetEntities")
+          case Some(StopStore)      => context.stop(self)
           case Some(Delay(howLong)) =>
             log.debug("Delaying initial entities listing with {}", howLong)
             timers.startSingleTimer("get-entities-delay", Delayed(sender(), Set.empty), howLong)
         }
       case RememberEntitiesShardStore.Update(started, stopped) =>
         failUpdate match {
-          case None             => sender() ! RememberEntitiesShardStore.UpdateDone(started, stopped)
-          case Some(NoResponse) => log.debug("Sending no response for AddEntity")
-          case Some(CrashStore) => throw TestException("store crash on AddEntity")
-          case Some(StopStore)  => context.stop(self)
+          case None                 => sender() ! RememberEntitiesShardStore.UpdateDone(started, stopped)
+          case Some(NoResponse)     => log.debug("Sending no response for AddEntity")
+          case Some(CrashStore)     => throw TestException("store crash on AddEntity")
+          case Some(StopStore)      => context.stop(self)
           case Some(Delay(howLong)) =>
             log.debug("Delaying response for AddEntity with {}", howLong)
             timers.startSingleTimer("add-entity-delay", Delayed(sender(), Set.empty), howLong)
@@ -165,20 +165,20 @@ object RememberEntitiesFailureSpec {
     override def receive: Receive = {
       case RememberEntitiesCoordinatorStore.GetShards =>
         failCoordinatorGetShards match {
-          case None             => sender() ! RememberEntitiesCoordinatorStore.RememberedShards(Set.empty)
-          case Some(NoResponse) =>
-          case Some(CrashStore) => throw TestException("store crash on load")
-          case Some(StopStore)  => context.stop(self)
+          case None                 => sender() ! RememberEntitiesCoordinatorStore.RememberedShards(Set.empty)
+          case Some(NoResponse)     =>
+          case Some(CrashStore)     => throw TestException("store crash on load")
+          case Some(StopStore)      => context.stop(self)
           case Some(Delay(howLong)) =>
             log.debug("Delaying initial shard listing with {}", howLong)
             timers.startSingleTimer("list-shards-delay", Delayed(sender(), Set.empty), howLong)
         }
       case RememberEntitiesCoordinatorStore.AddShard(shardId) =>
         failAddShard.get(shardId) match {
-          case None             => sender() ! RememberEntitiesCoordinatorStore.UpdateDone(shardId)
-          case Some(NoResponse) =>
-          case Some(CrashStore) => throw TestException("store crash on add")
-          case Some(StopStore)  => context.stop(self)
+          case None                 => sender() ! RememberEntitiesCoordinatorStore.UpdateDone(shardId)
+          case Some(NoResponse)     =>
+          case Some(CrashStore)     => throw TestException("store crash on add")
+          case Some(StopStore)      => context.stop(self)
           case Some(Delay(howLong)) =>
             log.debug("Delaying adding shard with {}", howLong)
             timers.startSingleTimer("add-shard-delay", Delayed(sender(), Set.empty), howLong)
diff --git a/cluster-sharding/src/test/scala/org/apache/pekko/cluster/sharding/passivation/simulator/SimulatorSettings.scala b/cluster-sharding/src/test/scala/org/apache/pekko/cluster/sharding/passivation/simulator/SimulatorSettings.scala
index 611f90f755..56a5212122 100644
--- a/cluster-sharding/src/test/scala/org/apache/pekko/cluster/sharding/passivation/simulator/SimulatorSettings.scala
+++ b/cluster-sharding/src/test/scala/org/apache/pekko/cluster/sharding/passivation/simulator/SimulatorSettings.scala
@@ -94,19 +94,19 @@ object SimulatorSettings {
     private def settings(strategyConfig: Config, fallbackConfig: Config): StrategySettings = {
       val config = strategyConfig.withFallback(fallbackConfig)
       lowerCase(config.getString("strategy")) match {
-        case "optimal" => Optimal(config.getInt("optimal.per-region-limit"))
+        case "optimal"             => Optimal(config.getInt("optimal.per-region-limit"))
         case "least-recently-used" =>
           val limit = config.getInt("least-recently-used.per-region-limit")
           val segmented = lowerCase(config.getString("least-recently-used.segmented.levels")) match {
             case "off" | "none" => Nil
-            case _ =>
+            case _              =>
               val levels = config.getInt("least-recently-used.segmented.levels")
               val proportions =
                 config.getDoubleList("least-recently-used.segmented.proportions").asScala.map(_.toDouble).toList
               if (proportions.isEmpty) List.fill(levels)(1.0 / levels) else proportions
           }
           LeastRecentlyUsed(limit, segmented)
-        case "most-recently-used" => MostRecentlyUsed(config.getInt("most-recently-used.per-region-limit"))
+        case "most-recently-used"    => MostRecentlyUsed(config.getInt("most-recently-used.per-region-limit"))
         case "least-frequently-used" =>
           LeastFrequentlyUsed(
             config.getInt("least-frequently-used.per-region-limit"),
diff --git a/cluster-tools/src/main/scala/org/apache/pekko/cluster/client/ClusterClient.scala b/cluster-tools/src/main/scala/org/apache/pekko/cluster/client/ClusterClient.scala
index 825890d64a..54881a9fa2 100644
--- a/cluster-tools/src/main/scala/org/apache/pekko/cluster/client/ClusterClient.scala
+++ b/cluster-tools/src/main/scala/org/apache/pekko/cluster/client/ClusterClient.scala
@@ -447,9 +447,9 @@ final class ClusterClient(settings: ClusterClientSettings) extends Actor with Ac
         failureDetector.heartbeat()
         self ! HeartbeatTick // will register us as active client of the selected receptionist
       case ActorIdentity(_, None) => // ok, use another instead
-      case HeartbeatTick =>
+      case HeartbeatTick          =>
         failureDetector.heartbeat()
-      case RefreshContactsTick => sendGetContacts()
+      case RefreshContactsTick            => sendGetContacts()
       case Send(path, msg, localAffinity) =>
         buffer(DistributedPubSubMediator.Send(path, msg, localAffinity))
       case SendToAll(path, msg) =>
@@ -489,7 +489,7 @@ final class ClusterClient(settings: ClusterClientSettings) extends Actor with Ac
         contacts = contactPaths.map(context.actorSelection)
       }
       publishContactPoints()
-    case _: ActorIdentity => // ok, from previous establish, already handled
+    case _: ActorIdentity     => // ok, from previous establish, already handled
     case ReceptionistShutdown =>
       if (receptionist == sender()) {
         log.info("Receptionist [{}] is shutting down, reestablishing connection", receptionist)
@@ -912,7 +912,7 @@ object ClusterReceptionist {
       }
 
       def receive = {
-        case Ping => // keep alive from client
+        case Ping           => // keep alive from client
         case ReceiveTimeout =>
           log.debug("ClientResponseTunnel for client [{}] stopped due to inactivity", client.path)
           context.stop(self)
@@ -968,7 +968,7 @@ final class ClusterReceptionist(pubSubMediator: ActorRef, settings: ClusterRecep
     def hashFor(node: Address): Int = node match {
       // cluster node identifier is the host and port of the address; protocol and system is assumed to be the same
       case Address(_, _, Some(host), Some(port)) => MurmurHash.stringHash(s"$host:$port")
-      case _ =>
+      case _                                     =>
         throw new IllegalStateException(s"Unexpected address without host/port: [$node]")
     }
     implicit val ringOrdering: Ordering[Address] = Ordering.fromLessThan[Address] { (a, b) =>
@@ -1012,7 +1012,7 @@ final class ClusterReceptionist(pubSubMediator: ActorRef, settings: ClusterRecep
     val encName = URLEncoder.encode(client.path.toSerializationFormat, "utf-8")
     context.child(encName) match {
       case Some(tunnel) => tunnel
-      case None =>
+      case None         =>
         context.actorOf(Props(classOf[ClientResponseTunnel], client, responseTunnelReceiveTimeout), encName)
     }
   }
@@ -1075,7 +1075,7 @@ final class ClusterReceptionist(pubSubMediator: ActorRef, settings: ClusterRecep
         consistentHash = ConsistentHash(nodes, virtualNodesFactor)
       }
 
-    case _: MemberEvent => // not of interest
+    case _: MemberEvent          => // not of interest
     case SubscribeClusterClients =>
       val subscriber = sender()
       subscriber ! ClusterClients(clientInteractions.keySet.to(HashSet))
diff --git a/cluster-tools/src/main/scala/org/apache/pekko/cluster/client/protobuf/ClusterClientMessageSerializer.scala b/cluster-tools/src/main/scala/org/apache/pekko/cluster/client/protobuf/ClusterClientMessageSerializer.scala
index dc9f245d6c..fed3a7124b 100644
--- a/cluster-tools/src/main/scala/org/apache/pekko/cluster/client/protobuf/ClusterClientMessageSerializer.scala
+++ b/cluster-tools/src/main/scala/org/apache/pekko/cluster/client/protobuf/ClusterClientMessageSerializer.scala
@@ -63,7 +63,7 @@ private[pekko] class ClusterClientMessageSerializer(val system: ExtendedActorSys
     case Heartbeat            => HeartbeatManifest
     case HeartbeatRsp         => HeartbeatRspManifest
     case ReceptionistShutdown => ReceptionistShutdownManifest
-    case _ =>
+    case _                    =>
       throw new IllegalArgumentException(s"Can't serialize object of type ${obj.getClass} in [${getClass.getName}]")
   }
 
@@ -73,14 +73,14 @@ private[pekko] class ClusterClientMessageSerializer(val system: ExtendedActorSys
     case Heartbeat            => emptyByteArray
     case HeartbeatRsp         => emptyByteArray
     case ReceptionistShutdown => emptyByteArray
-    case _ =>
+    case _                    =>
       throw new IllegalArgumentException(s"Can't serialize object of type ${obj.getClass} in [${getClass.getName}]")
   }
 
   override def fromBinary(bytes: Array[Byte], manifest: String): AnyRef =
     fromBinaryMap.get(manifest) match {
       case Some(f) => f(bytes)
-      case None =>
+      case None    =>
         throw new NotSerializableException(
           s"Unimplemented deserialization of message with manifest [$manifest] in [${getClass.getName}]")
     }
diff --git a/cluster-tools/src/main/scala/org/apache/pekko/cluster/pubsub/DistributedPubSubMediator.scala b/cluster-tools/src/main/scala/org/apache/pekko/cluster/pubsub/DistributedPubSubMediator.scala
index e3dd635f20..fd7263992e 100644
--- a/cluster-tools/src/main/scala/org/apache/pekko/cluster/pubsub/DistributedPubSubMediator.scala
+++ b/cluster-tools/src/main/scala/org/apache/pekko/cluster/pubsub/DistributedPubSubMediator.scala
@@ -58,8 +58,8 @@ object DistributedPubSubSettings {
     new DistributedPubSubSettings(
       role = roleOption(config.getString("role")),
       routingLogic = config.getString("routing-logic") match {
-        case "random"      => RandomRoutingLogic()
-        case "round-robin" => RoundRobinRoutingLogic()
+        case "random"             => RandomRoutingLogic()
+        case "round-robin"        => RoundRobinRoutingLogic()
         case "consistent-hashing" =>
           throw new IllegalArgumentException(
             s"'consistent-hashing' routing logic can't be used by the pub-sub mediator")
@@ -784,7 +784,7 @@ class DistributedPubSubMediator(settings: DistributedPubSubSettings)
       }
 
     case _: MemberEvent => // not of interest
-    case Count =>
+    case Count          =>
       val count = registry.map {
         case (_, bucket) =>
           bucket.content.count {
diff --git a/cluster-tools/src/main/scala/org/apache/pekko/cluster/pubsub/protobuf/DistributedPubSubMessageSerializer.scala b/cluster-tools/src/main/scala/org/apache/pekko/cluster/pubsub/protobuf/DistributedPubSubMessageSerializer.scala
index 4416877555..23c1c9dcac 100644
--- a/cluster-tools/src/main/scala/org/apache/pekko/cluster/pubsub/protobuf/DistributedPubSubMessageSerializer.scala
+++ b/cluster-tools/src/main/scala/org/apache/pekko/cluster/pubsub/protobuf/DistributedPubSubMessageSerializer.scala
@@ -65,7 +65,7 @@ private[pekko] class DistributedPubSubMessageSerializer(val system: ExtendedActo
     case _: SendToAll           => SendToAllManifest
     case _: Publish             => PublishManifest
     case _: SendToOneSubscriber => SendToOneSubscriberManifest
-    case _ =>
+    case _                      =>
       throw new IllegalArgumentException(s"Can't serialize object of type ${obj.getClass} in [${getClass.getName}]")
   }
 
@@ -76,14 +76,14 @@ private[pekko] class DistributedPubSubMessageSerializer(val system: ExtendedActo
     case m: SendToAll           => sendToAllToProto(m).toByteArray
     case m: Publish             => publishToProto(m).toByteArray
     case m: SendToOneSubscriber => sendToOneSubscriberToProto(m).toByteArray
-    case _ =>
+    case _                      =>
       throw new IllegalArgumentException(s"Can't serialize object of type ${obj.getClass} in [${getClass.getName}]")
   }
 
   override def fromBinary(bytes: Array[Byte], manifest: String): AnyRef =
     fromBinaryMap.get(manifest) match {
       case Some(f) => f(bytes)
-      case None =>
+      case None    =>
         throw new NotSerializableException(
           s"Unimplemented deserialization of message with manifest [$manifest] in [${getClass.getName}]")
     }
@@ -103,7 +103,7 @@ private[pekko] class DistributedPubSubMessageSerializer(val system: ExtendedActo
 
     @tailrec def readChunk(): Unit = in.read(buffer) match {
       case -1 => ()
-      case n =>
+      case n  =>
         out.write(buffer, 0, n)
         readChunk()
     }
diff --git a/cluster-tools/src/main/scala/org/apache/pekko/cluster/singleton/ClusterSingletonManager.scala b/cluster-tools/src/main/scala/org/apache/pekko/cluster/singleton/ClusterSingletonManager.scala
index c46e8e135c..62e86945ca 100644
--- a/cluster-tools/src/main/scala/org/apache/pekko/cluster/singleton/ClusterSingletonManager.scala
+++ b/cluster-tools/src/main/scala/org/apache/pekko/cluster/singleton/ClusterSingletonManager.scala
@@ -68,7 +68,7 @@ object ClusterSingletonManagerSettings {
    */
   def apply(config: Config): ClusterSingletonManagerSettings = {
     val lease = config.getString("use-lease") match {
-      case s if s.isEmpty => None
+      case s if s.isEmpty  => None
       case leaseConfigPath =>
         Some(new LeaseUsageSettings(leaseConfigPath, config.getDuration("lease-retry-interval").asScala))
     }
@@ -380,9 +380,9 @@ object ClusterSingletonManager {
       }
 
       def receive = {
-        case state: CurrentClusterState => handleInitial(state)
-        case MemberUp(m)                => add(m)
-        case MemberRemoved(m, _)        => remove(m)
+        case state: CurrentClusterState                                      => handleInitial(state)
+        case MemberUp(m)                                                     => add(m)
+        case MemberRemoved(m, _)                                             => remove(m)
         case MemberExited(m) if m.uniqueAddress != cluster.selfUniqueAddress =>
           remove(m)
         case SelfExiting =>
diff --git a/cluster-tools/src/main/scala/org/apache/pekko/cluster/singleton/ClusterSingletonProxy.scala b/cluster-tools/src/main/scala/org/apache/pekko/cluster/singleton/ClusterSingletonProxy.scala
index b4f09e22a4..97db57c9bb 100644
--- a/cluster-tools/src/main/scala/org/apache/pekko/cluster/singleton/ClusterSingletonProxy.scala
+++ b/cluster-tools/src/main/scala/org/apache/pekko/cluster/singleton/ClusterSingletonProxy.scala
@@ -276,7 +276,7 @@ final class ClusterSingletonProxy(singletonManagerPath: String, settings: Cluste
     case state: CurrentClusterState => handleInitial(state)
     case MemberUp(m)                => add(m)
     case MemberExited(m)            => remove(m)
-    case MemberRemoved(m, _) =>
+    case MemberRemoved(m, _)        =>
       if (m.uniqueAddress == cluster.selfUniqueAddress)
         context.stop(self)
       else
@@ -290,7 +290,7 @@ final class ClusterSingletonProxy(singletonManagerPath: String, settings: Cluste
       context.watch(s)
       cancelTimer()
       sendBuffered()
-    case _: ActorIdentity => // do nothing
+    case _: ActorIdentity                             => // do nothing
     case ClusterSingletonProxy.TryToIdentifySingleton =>
       identifyTimer match {
         case Some(_) =>
diff --git a/cluster-tools/src/main/scala/org/apache/pekko/cluster/singleton/protobuf/ClusterSingletonMessageSerializer.scala b/cluster-tools/src/main/scala/org/apache/pekko/cluster/singleton/protobuf/ClusterSingletonMessageSerializer.scala
index e2bd4fcb24..7a1be9ee0b 100644
--- a/cluster-tools/src/main/scala/org/apache/pekko/cluster/singleton/protobuf/ClusterSingletonMessageSerializer.scala
+++ b/cluster-tools/src/main/scala/org/apache/pekko/cluster/singleton/protobuf/ClusterSingletonMessageSerializer.scala
@@ -59,7 +59,7 @@ private[pekko] class ClusterSingletonMessageSerializer(val system: ExtendedActor
     case HandOverInProgress => HandOverInProgressManifest
     case HandOverDone       => HandOverDoneManifest
     case TakeOverFromMe     => TakeOverFromMeManifest
-    case _ =>
+    case _                  =>
       throw new IllegalArgumentException(s"Can't serialize object of type ${obj.getClass} in [${getClass.getName}]")
   }
 
@@ -68,14 +68,14 @@ private[pekko] class ClusterSingletonMessageSerializer(val system: ExtendedActor
     case HandOverInProgress => emptyByteArray
     case HandOverDone       => emptyByteArray
     case TakeOverFromMe     => emptyByteArray
-    case _ =>
+    case _                  =>
       throw new IllegalArgumentException(s"Can't serialize object of type ${obj.getClass} in [${getClass.getName}]")
   }
 
   override def fromBinary(bytes: Array[Byte], manifest: String): AnyRef =
     fromBinaryMap.get(manifest) match {
       case Some(f) => f(bytes)
-      case None =>
+      case None    =>
         throw new NotSerializableException(
           s"Unimplemented deserialization of message with manifest [$manifest] in [${getClass.getName}]")
     }
diff --git a/cluster-tools/src/multi-jvm/scala/org/apache/pekko/cluster/singleton/ClusterSingletonManagerSpec.scala b/cluster-tools/src/multi-jvm/scala/org/apache/pekko/cluster/singleton/ClusterSingletonManagerSpec.scala
index 01583b2a7b..08bc389b2f 100644
--- a/cluster-tools/src/multi-jvm/scala/org/apache/pekko/cluster/singleton/ClusterSingletonManagerSpec.scala
+++ b/cluster-tools/src/multi-jvm/scala/org/apache/pekko/cluster/singleton/ClusterSingletonManagerSpec.scala
@@ -413,7 +413,7 @@ class ClusterSingletonManagerSpec
       runOn(leaveRole) {
         system.actorSelection("/user/consumer").tell(Identify("singleton"), identifyProbe.ref)
         identifyProbe.expectMsgPF() {
-          case ActorIdentity("singleton", None) => // already terminated
+          case ActorIdentity("singleton", None)            => // already terminated
           case ActorIdentity("singleton", Some(singleton)) =>
             watch(singleton)
             expectTerminated(singleton)
diff --git a/cluster-typed/src/main/scala/org/apache/pekko/cluster/ddata/typed/internal/ReplicatorBehavior.scala b/cluster-typed/src/main/scala/org/apache/pekko/cluster/ddata/typed/internal/ReplicatorBehavior.scala
index 8f4bdfe895..b8e25201d3 100644
--- a/cluster-typed/src/main/scala/org/apache/pekko/cluster/ddata/typed/internal/ReplicatorBehavior.scala
+++ b/cluster-typed/src/main/scala/org/apache/pekko/cluster/ddata/typed/internal/ReplicatorBehavior.scala
@@ -186,7 +186,7 @@ import pekko.util.Timeout
                   (classicReplicator ? dd.Replicator.Delete(cmd.key, cmd.consistency.toClassic))
                     .mapTo[dd.Replicator.DeleteResponse[d]]
                     .map {
-                      case rsp: dd.Replicator.DeleteSuccess[d] => JReplicator.DeleteSuccess(rsp.key)
+                      case rsp: dd.Replicator.DeleteSuccess[d]            => JReplicator.DeleteSuccess(rsp.key)
                       case rsp: dd.Replicator.ReplicationDeleteFailure[d] =>
                         JReplicator.DeleteFailure(rsp.key)
                       case rsp: dd.Replicator.DataDeleted[d]  => JReplicator.DataDeleted(rsp.key)
diff --git a/cluster-typed/src/main/scala/org/apache/pekko/cluster/typed/ClusterSingleton.scala b/cluster-typed/src/main/scala/org/apache/pekko/cluster/typed/ClusterSingleton.scala
index 92e2cbbcfe..8e3c0dcab8 100644
--- a/cluster-typed/src/main/scala/org/apache/pekko/cluster/typed/ClusterSingleton.scala
+++ b/cluster-typed/src/main/scala/org/apache/pekko/cluster/typed/ClusterSingleton.scala
@@ -246,7 +246,7 @@ object ClusterSingletonManagerSettings {
    */
   def apply(config: Config): ClusterSingletonManagerSettings = {
     val lease = config.getString("use-lease") match {
-      case s if s.isEmpty => None
+      case s if s.isEmpty  => None
       case leaseConfigPath =>
         Some(new LeaseUsageSettings(leaseConfigPath, config.getDuration("lease-retry-interval").asScala))
     }
diff --git a/cluster-typed/src/main/scala/org/apache/pekko/cluster/typed/internal/AdaptedClusterImpl.scala b/cluster-typed/src/main/scala/org/apache/pekko/cluster/typed/internal/AdaptedClusterImpl.scala
index 9ed646b668..a506921438 100644
--- a/cluster-typed/src/main/scala/org/apache/pekko/cluster/typed/internal/AdaptedClusterImpl.scala
+++ b/cluster-typed/src/main/scala/org/apache/pekko/cluster/typed/internal/AdaptedClusterImpl.scala
@@ -71,7 +71,7 @@ private[pekko] object AdapterClusterImpl {
         .receiveMessage[AnyRef] {
           case Subscribe(subscriber: ActorRef[SelfUp] @unchecked, clazz) if clazz == classOf[SelfUp] =>
             seenState match {
-              case Up => subscriber ! SelfUp(adaptedCluster.state)
+              case Up       => subscriber ! SelfUp(adaptedCluster.state)
               case BeforeUp =>
                 ctx.watch(subscriber)
                 upSubscribers = subscriber :: upSubscribers
diff --git a/cluster-typed/src/main/scala/org/apache/pekko/cluster/typed/internal/PekkoClusterTypedSerializer.scala b/cluster-typed/src/main/scala/org/apache/pekko/cluster/typed/internal/PekkoClusterTypedSerializer.scala
index f813179af7..7fb850fa18 100644
--- a/cluster-typed/src/main/scala/org/apache/pekko/cluster/typed/internal/PekkoClusterTypedSerializer.scala
+++ b/cluster-typed/src/main/scala/org/apache/pekko/cluster/typed/internal/PekkoClusterTypedSerializer.scala
@@ -44,21 +44,21 @@ private[pekko] final class PekkoClusterTypedSerializer(override val system: Exte
   override def manifest(o: AnyRef): String = o match {
     case _: Entry                         => ReceptionistEntryManifest
     case _: TopicImpl.MessagePublished[_] => PubSubPublishManifest
-    case _ =>
+    case _                                =>
       throw new IllegalArgumentException(s"Can't serialize object of type ${o.getClass} in [${getClass.getName}]")
   }
 
   override def toBinary(o: AnyRef): Array[Byte] = o match {
     case e: Entry                         => receptionistEntryToBinary(e)
     case m: TopicImpl.MessagePublished[_] => pubSubPublishToBinary(m)
-    case _ =>
+    case _                                =>
       throw new IllegalArgumentException(s"Cannot serialize object of type [${o.getClass.getName}]")
   }
 
   override def fromBinary(bytes: Array[Byte], manifest: String): AnyRef = manifest match {
     case ReceptionistEntryManifest => receptionistEntryFromBinary(bytes)
     case PubSubPublishManifest     => pubSubMessageFromBinary(bytes)
-    case _ =>
+    case _                         =>
       throw new NotSerializableException(
         s"Unimplemented deserialization of message with manifest [$manifest] in [${getClass.getName}]")
   }
diff --git a/cluster-typed/src/main/scala/org/apache/pekko/cluster/typed/internal/delivery/ReliableDeliverySerializer.scala b/cluster-typed/src/main/scala/org/apache/pekko/cluster/typed/internal/delivery/ReliableDeliverySerializer.scala
index a1b8b5fe90..02eee4050a 100644
--- a/cluster-typed/src/main/scala/org/apache/pekko/cluster/typed/internal/delivery/ReliableDeliverySerializer.scala
+++ b/cluster-typed/src/main/scala/org/apache/pekko/cluster/typed/internal/delivery/ReliableDeliverySerializer.scala
@@ -67,7 +67,7 @@ import pekko.remote.ByteStringUtils
     case _: DurableProducerQueue.Confirmed         => DurableQueueConfirmedManifest
     case _: DurableProducerQueue.State[_]          => DurableQueueStateManifest
     case _: DurableProducerQueue.Cleanup           => DurableQueueCleanupManifest
-    case _ =>
+    case _                                         =>
       throw new IllegalArgumentException(s"Can't serialize object of type ${o.getClass} in [${getClass.getName}]")
   }
 
@@ -81,7 +81,7 @@ import pekko.remote.ByteStringUtils
     case m: DurableProducerQueue.Confirmed         => durableQueueConfirmedToBinary(m)
     case m: DurableProducerQueue.State[_]          => durableQueueStateToBinary(m)
     case m: DurableProducerQueue.Cleanup           => durableQueueCleanupToBinary(m)
-    case _ =>
+    case _                                         =>
       throw new IllegalArgumentException(s"Cannot serialize object of type [${o.getClass.getName}]")
   }
 
@@ -205,7 +205,7 @@ import pekko.remote.ByteStringUtils
     case DurableQueueConfirmedManifest   => durableQueueConfirmedFromBinary(bytes)
     case DurableQueueStateManifest       => durableQueueStateFromBinary(bytes)
     case DurableQueueCleanupManifest     => durableQueueCleanupFromBinary(bytes)
-    case _ =>
+    case _                               =>
       throw new NotSerializableException(
         s"Unimplemented deserialization of message with manifest [$manifest] in [${getClass.getName}]")
   }
diff --git a/cluster-typed/src/main/scala/org/apache/pekko/cluster/typed/internal/receptionist/ClusterReceptionist.scala b/cluster-typed/src/main/scala/org/apache/pekko/cluster/typed/internal/receptionist/ClusterReceptionist.scala
index 5eed8a4be7..102f3abd00 100644
--- a/cluster-typed/src/main/scala/org/apache/pekko/cluster/typed/internal/receptionist/ClusterReceptionist.scala
+++ b/cluster-typed/src/main/scala/org/apache/pekko/cluster/typed/internal/receptionist/ClusterReceptionist.scala
@@ -239,7 +239,7 @@ private[typed] object ClusterReceptionist extends ReceptionistBehaviorProvider {
             case UnreachableMember(member) => NodeUnreachable(member.uniqueAddress)
             case ReachableMember(member)   => NodeReachable(member.uniqueAddress)
             case ClusterShuttingDown       => NodeRemoved(setup.cluster.selfUniqueAddress)
-            case other =>
+            case other                     =>
               throw new IllegalStateException(s"Unexpected ClusterDomainEvent $other. Please report bug.")
           }
         setup.cluster.subscribe(
diff --git a/cluster-typed/src/test/scala/docs/org/apache/pekko/cluster/typed/PingSerializer.scala b/cluster-typed/src/test/scala/docs/org/apache/pekko/cluster/typed/PingSerializer.scala
index 3eb6975a5d..3c4cdff2b5 100644
--- a/cluster-typed/src/test/scala/docs/org/apache/pekko/cluster/typed/PingSerializer.scala
+++ b/cluster-typed/src/test/scala/docs/org/apache/pekko/cluster/typed/PingSerializer.scala
@@ -34,7 +34,7 @@ class PingSerializer(system: ExtendedActorSystem) extends SerializerWithStringMa
   override def manifest(msg: AnyRef) = msg match {
     case _: PingService.Ping => PingManifest
     case PingService.Pong    => PongManifest
-    case _ =>
+    case _                   =>
       throw new IllegalArgumentException(s"Can't serialize object of type ${msg.getClass} in [${getClass.getName}]")
   }
 
diff --git a/cluster-typed/src/test/scala/org/apache/pekko/cluster/typed/ActorSystemSpec.scala b/cluster-typed/src/test/scala/org/apache/pekko/cluster/typed/ActorSystemSpec.scala
index e37f2b4fb0..bd97dd7bdf 100644
--- a/cluster-typed/src/test/scala/org/apache/pekko/cluster/typed/ActorSystemSpec.scala
+++ b/cluster-typed/src/test/scala/org/apache/pekko/cluster/typed/ActorSystemSpec.scala
@@ -56,7 +56,7 @@ object ActorSystemSpec {
 
     def toBinary(o: AnyRef): Array[Byte] = o match {
       case TestMessage(ref) => actorRefResolver.toSerializationFormat(ref).getBytes(StandardCharsets.UTF_8)
-      case _ =>
+      case _                =>
         throw new IllegalArgumentException(s"Can't serialize object of type ${o.getClass} in [${getClass.getName}]")
     }
 
diff --git a/cluster/src/main/scala/org/apache/pekko/cluster/ClusterDaemon.scala b/cluster/src/main/scala/org/apache/pekko/cluster/ClusterDaemon.scala
index df5a9b71ce..4f04cb1f90 100644
--- a/cluster/src/main/scala/org/apache/pekko/cluster/ClusterDaemon.scala
+++ b/cluster/src/main/scala/org/apache/pekko/cluster/ClusterDaemon.scala
@@ -429,7 +429,7 @@ private[cluster] class ClusterCoreDaemon(publisher: ActorRef, joinConfigCompatCh
   // start periodic publish of current stats
   val publishStatsTask: Option[Cancellable] = PublishStatsInterval match {
     case Duration.Zero | _: Duration.Infinite => None
-    case d: FiniteDuration =>
+    case d: FiniteDuration                    =>
       Some(scheduler.scheduleWithFixedDelay(PeriodicTasksInitialDelay.max(d), d, self, PublishStatsTick))
   }
 
@@ -513,7 +513,7 @@ private[cluster] class ClusterCoreDaemon(publisher: ActorRef, joinConfigCompatCh
         becomeUninitialized()
         joinSeedNodes(newSeedNodes)
       case msg: SubscriptionMessage => publisher.forward(msg)
-      case _: Tick =>
+      case _: Tick                  =>
         if (joinSeedNodesDeadline.exists(_.isOverdue()))
           joinSeedNodesWasUnsuccessful()
         else if (deadline.exists(_.isOverdue())) {
@@ -566,13 +566,13 @@ private[cluster] class ClusterCoreDaemon(publisher: ActorRef, joinConfigCompatCh
   @nowarn("msg=Classic remoting is deprecated, use Artery")
   def initialized: Actor.Receive =
     ({
-      case msg: GossipEnvelope => receiveGossip(msg)
-      case msg: GossipStatus   => receiveGossipStatus(msg)
-      case GossipTick          => gossipTick()
-      case GossipSpeedupTick   => gossipSpeedupTick()
-      case ReapUnreachableTick => reapUnreachableMembers()
-      case LeaderActionsTick   => leaderActions()
-      case PublishStatsTick    => publishInternalStats()
+      case msg: GossipEnvelope         => receiveGossip(msg)
+      case msg: GossipStatus           => receiveGossipStatus(msg)
+      case GossipTick                  => gossipTick()
+      case GossipSpeedupTick           => gossipSpeedupTick()
+      case ReapUnreachableTick         => reapUnreachableMembers()
+      case LeaderActionsTick           => leaderActions()
+      case PublishStatsTick            => publishInternalStats()
       case InitJoin(joiningNodeConfig) =>
         logInfo("Received InitJoin message from [{}] to [{}]", sender(), selfAddress)
         initJoin(joiningNodeConfig)
@@ -584,7 +584,7 @@ private[cluster] class ClusterCoreDaemon(publisher: ActorRef, joinConfigCompatCh
       case msg: SubscriptionMessage              => publisher.forward(msg)
       case QuarantinedEvent(ua)                  => quarantined(UniqueAddress(ua))
       case ClassicQuarantinedEvent(address, uid) => quarantined(UniqueAddress(address, uid))
-      case ClusterUserAction.JoinTo(address) =>
+      case ClusterUserAction.JoinTo(address)     =>
         logInfo("Trying to join [{}] when already part of a cluster, ignoring", address)
       case JoinSeedNodes(nodes) =>
         logInfo("Trying to join seed nodes [{}] when already part of a cluster, ignoring", nodes.mkString(", "))
@@ -1025,7 +1025,7 @@ private[cluster] class ClusterCoreDaemon(publisher: ActorRef, joinConfigCompatCh
           gossipTo(m.uniqueAddress)
         }
       case Some(_) => // already down
-      case None =>
+      case None    =>
         logInfo("Ignoring down of unknown node [{}]", address)
     }
 
@@ -1063,7 +1063,7 @@ private[cluster] class ClusterCoreDaemon(publisher: ActorRef, joinConfigCompatCh
         gossipTo(from, sender())
       } else {
         status.version.compareTo(latestGossip.version) match {
-          case VectorClock.Same => // same version
+          case VectorClock.Same  => // same version
           case VectorClock.After =>
             gossipStatusTo(from, sender()) // remote is newer
           case _ =>
@@ -1678,7 +1678,7 @@ private[cluster] class OnMemberStatusChangedListener(callback: Runnable, status:
   private val to = status match {
     case Up      => classOf[MemberUp]
     case Removed => classOf[MemberRemoved]
-    case other =>
+    case other   =>
       throw new IllegalArgumentException(s"Expected Up or Removed in OnMemberStatusChangedListener, got [$other]")
   }
 
diff --git a/cluster/src/main/scala/org/apache/pekko/cluster/ClusterReadView.scala b/cluster/src/main/scala/org/apache/pekko/cluster/ClusterReadView.scala
index 7c79750b82..0d265faeee 100644
--- a/cluster/src/main/scala/org/apache/pekko/cluster/ClusterReadView.scala
+++ b/cluster/src/main/scala/org/apache/pekko/cluster/ClusterReadView.scala
@@ -132,7 +132,7 @@ import pekko.dispatch.UnboundedMessageQueueSemantics
                       oldClusterState.copy(roleLeaderMap = oldClusterState.roleLeaderMap + (role -> leader))))
                 case stats: CurrentInternalStats =>
                   _state.set(oldState.copy(latestStats = stats))
-                case ClusterShuttingDown =>
+                case ClusterShuttingDown    =>
                 case r: ReachableDataCenter =>
                   _state.set(
                     oldState.copy(clusterState =
@@ -232,7 +232,7 @@ import pekko.dispatch.UnboundedMessageQueueSemantics
     if (cluster.settings.LogInfoVerbose) {
       event match {
         case _: SeenChanged | _: CurrentInternalStats => // ignore
-        case _: UnreachableMember =>
+        case _: UnreachableMember                     =>
           val s = state
           logInfo("event {}, {} unreachable members [{}]", event, s.unreachable.size, s.unreachable.mkString(", "))
         case _: ReachableMember =>
diff --git a/cluster/src/main/scala/org/apache/pekko/cluster/MembershipState.scala b/cluster/src/main/scala/org/apache/pekko/cluster/MembershipState.scala
index ccedacf762..72624215c4 100644
--- a/cluster/src/main/scala/org/apache/pekko/cluster/MembershipState.scala
+++ b/cluster/src/main/scala/org/apache/pekko/cluster/MembershipState.scala
@@ -268,7 +268,7 @@ import pekko.util.ccompat._
       @tailrec
       def selectOtherDcNode(randomizedDcs: List[DataCenter]): Option[UniqueAddress] =
         randomizedDcs match {
-          case Nil => None // couldn't find a single cross-dc-node to talk to
+          case Nil        => None // couldn't find a single cross-dc-node to talk to
           case dc :: tail =>
             state.ageSortedTopOldestMembersPerDc(dc).collectFirst {
               case m if state.validNodeForGossip(m.uniqueAddress) => m.uniqueAddress
diff --git a/cluster/src/main/scala/org/apache/pekko/cluster/Reachability.scala b/cluster/src/main/scala/org/apache/pekko/cluster/Reachability.scala
index 4be7bc88f8..cee5e4bff9 100644
--- a/cluster/src/main/scala/org/apache/pekko/cluster/Reachability.scala
+++ b/cluster/src/main/scala/org/apache/pekko/cluster/Reachability.scala
@@ -225,7 +225,7 @@ private[cluster] class Reachability private (
 
   def status(observer: UniqueAddress, subject: UniqueAddress): ReachabilityStatus =
     observerRows(observer) match {
-      case None => Reachable
+      case None               => Reachable
       case Some(observerRows) =>
         observerRows.get(subject) match {
           case None         => Reachable
@@ -274,7 +274,7 @@ private[cluster] class Reachability private (
    */
   def allUnreachableFrom(observer: UniqueAddress): Set[UniqueAddress] =
     observerRows(observer) match {
-      case None => Set.empty
+      case None               => Set.empty
       case Some(observerRows) =>
         observerRows.iterator
           .collect {
diff --git a/cluster/src/main/scala/org/apache/pekko/cluster/SeedNodeProcess.scala b/cluster/src/main/scala/org/apache/pekko/cluster/SeedNodeProcess.scala
index d2627da586..a41bf90c98 100644
--- a/cluster/src/main/scala/org/apache/pekko/cluster/SeedNodeProcess.scala
+++ b/cluster/src/main/scala/org/apache/pekko/cluster/SeedNodeProcess.scala
@@ -314,7 +314,7 @@ private[cluster] final class JoinSeedNodeProcess(
       receiveInitJoinAckIncompatibleConfig(joinTo = address, origin = sender(), behavior = Some(done))
 
     case InitJoinNack(_) => // that seed was uninitialized
-    case ReceiveTimeout =>
+    case ReceiveTimeout  =>
       if (attempt >= 2)
         logWarning(
           ClusterLogMarker.joinFailed,
diff --git a/cluster/src/main/scala/org/apache/pekko/cluster/protobuf/ClusterMessageSerializer.scala b/cluster/src/main/scala/org/apache/pekko/cluster/protobuf/ClusterMessageSerializer.scala
index 3199896ae7..8bc70504fd 100644
--- a/cluster/src/main/scala/org/apache/pekko/cluster/protobuf/ClusterMessageSerializer.scala
+++ b/cluster/src/main/scala/org/apache/pekko/cluster/protobuf/ClusterMessageSerializer.scala
@@ -103,7 +103,7 @@ final class ClusterMessageSerializer(val system: ExtendedActorSystem)
     case _: GossipEnvelope                      => GossipEnvelopeManifest
     case _: ClusterRouterPool                   => ClusterRouterPoolManifest
     case ClusterUserAction.PrepareForShutdown   => PrepareForShutdownManifest
-    case _ =>
+    case _                                      =>
       throw new IllegalArgumentException(s"Can't serialize object of type ${o.getClass} in [${getClass.getName}]")
   }
 
@@ -121,7 +121,7 @@ final class ClusterMessageSerializer(val system: ExtendedActorSystem)
     case InternalClusterAction.InitJoinNack(address)             => addressToProtoByteArray(address)
     case InternalClusterAction.ExitingConfirmed(node)            => uniqueAddressToProtoByteArray(node)
     case rp: ClusterRouterPool                                   => clusterRouterPoolToProtoByteArray(rp)
-    case _ =>
+    case _                                                       =>
       throw new IllegalArgumentException(s"Can't serialize object of type ${obj.getClass} in [${getClass.getName}]")
   }
 
@@ -171,7 +171,7 @@ final class ClusterMessageSerializer(val system: ExtendedActorSystem)
 
     @tailrec def readChunk(): Unit = in.read(buffer) match {
       case -1 => ()
-      case n =>
+      case n  =>
         out.write(buffer, 0, n)
         readChunk()
     }
diff --git a/cluster/src/main/scala/org/apache/pekko/cluster/routing/ClusterRouterConfig.scala b/cluster/src/main/scala/org/apache/pekko/cluster/routing/ClusterRouterConfig.scala
index 31287c1cb9..38fb002907 100644
--- a/cluster/src/main/scala/org/apache/pekko/cluster/routing/ClusterRouterConfig.scala
+++ b/cluster/src/main/scala/org/apache/pekko/cluster/routing/ClusterRouterConfig.scala
@@ -167,7 +167,7 @@ final class ClusterRouterGroupSettings(
 
   routeesPaths.foreach {
     case RelativeActorPath(_) => // good
-    case p =>
+    case p                    =>
       throw new IllegalArgumentException(s"routeesPaths [$p] is not a valid actor path without address information")
   }
 
@@ -481,7 +481,7 @@ private[pekko] class ClusterRouterPoolActor(
   override def addRoutees(): Unit = {
     @tailrec
     def doAddRoutees(): Unit = selectDeploymentTarget match {
-      case None => // done
+      case None         => // done
       case Some(target) =>
         val routeeProps = cell.routeeProps
         val deploy =
@@ -528,7 +528,7 @@ private[pekko] class ClusterRouterGroupActor(val settings: ClusterRouterGroupSet
 
   val group = cell.routerConfig match {
     case x: Group => x
-    case other =>
+    case other    =>
       throw ActorInitializationException("ClusterRouterGroupActor can only be used with group, not " + other.getClass)
   }
 
@@ -546,7 +546,7 @@ private[pekko] class ClusterRouterGroupActor(val settings: ClusterRouterGroupSet
   override def addRoutees(): Unit = {
     @tailrec
     def doAddRoutees(): Unit = selectDeploymentTarget match {
-      case None => // done
+      case None                  => // done
       case Some((address, path)) =>
         val routee = group.routeeFor(address.toString + path, context)
         usedRouteePaths = usedRouteePaths.updated(address, usedRouteePaths.getOrElse(address, Set.empty) + path)
diff --git a/cluster/src/main/scala/org/apache/pekko/cluster/sbr/SplitBrainResolver.scala b/cluster/src/main/scala/org/apache/pekko/cluster/sbr/SplitBrainResolver.scala
index 1386b812fa..7c5f039583 100644
--- a/cluster/src/main/scala/org/apache/pekko/cluster/sbr/SplitBrainResolver.scala
+++ b/cluster/src/main/scala/org/apache/pekko/cluster/sbr/SplitBrainResolver.scala
@@ -174,7 +174,7 @@ import pekko.remote.artery.ThisActorSystemQuarantinedEvent
 
   private def releaseLeaseAfter: FiniteDuration = strategy match {
     case lm: LeaseMajority => lm.releaseAfter
-    case other =>
+    case other             =>
       throw new IllegalStateException(s"Unexpected use of releaseLeaseAfter for strategy [${other.getClass.getName}]")
   }
 
@@ -421,7 +421,7 @@ import pekko.remote.artery.ThisActorSystemQuarantinedEvent
 
     case ReleaseLeaseResult(_) => // superseded by new acquire release request
     case Tick                  => // ignore ticks while waiting
-    case _ =>
+    case _                     =>
       stash()
   }
 
diff --git a/cluster/src/main/scala/org/apache/pekko/cluster/sbr/SplitBrainResolverSettings.scala b/cluster/src/main/scala/org/apache/pekko/cluster/sbr/SplitBrainResolverSettings.scala
index e9e22ba9ce..0cea354ffd 100644
--- a/cluster/src/main/scala/org/apache/pekko/cluster/sbr/SplitBrainResolverSettings.scala
+++ b/cluster/src/main/scala/org/apache/pekko/cluster/sbr/SplitBrainResolverSettings.scala
@@ -57,7 +57,7 @@ import pekko.util.Helpers.Requiring
   val DowningStrategy: String =
     cc.getString("active-strategy").toLowerCase(Locale.ROOT) match {
       case strategyName if allStrategyNames(strategyName) => strategyName
-      case unknown =>
+      case unknown                                        =>
         throw new ConfigurationException(
           s"Unknown downing strategy [$unknown]. Select one of [${allStrategyNames.mkString(",")}]")
     }
diff --git a/cluster/src/multi-jvm/scala/org/apache/pekko/cluster/MembershipChangeListenerUpSpec.scala b/cluster/src/multi-jvm/scala/org/apache/pekko/cluster/MembershipChangeListenerUpSpec.scala
index 8e130784ee..49d55cd6f0 100644
--- a/cluster/src/multi-jvm/scala/org/apache/pekko/cluster/MembershipChangeListenerUpSpec.scala
+++ b/cluster/src/multi-jvm/scala/org/apache/pekko/cluster/MembershipChangeListenerUpSpec.scala
@@ -51,7 +51,7 @@ abstract class MembershipChangeListenerUpSpec extends MultiNodeClusterSpec(Membe
             var members = Set.empty[Member]
             def receive = {
               case state: CurrentClusterState => members = state.members
-              case MemberUp(m) =>
+              case MemberUp(m)                =>
                 members = members - m + m
                 if (members.map(_.address) == expectedAddresses)
                   latch.countDown()
@@ -79,7 +79,7 @@ abstract class MembershipChangeListenerUpSpec extends MultiNodeClusterSpec(Membe
           var members = Set.empty[Member]
           def receive = {
             case state: CurrentClusterState => members = state.members
-            case MemberUp(m) =>
+            case MemberUp(m)                =>
               members = members - m + m
               if (members.map(_.address) == expectedAddresses)
                 latch.countDown()
diff --git a/cluster/src/multi-jvm/scala/org/apache/pekko/cluster/StreamRefSpec.scala b/cluster/src/multi-jvm/scala/org/apache/pekko/cluster/StreamRefSpec.scala
index 9a4fb9abbf..f5271a4c4c 100644
--- a/cluster/src/multi-jvm/scala/org/apache/pekko/cluster/StreamRefSpec.scala
+++ b/cluster/src/multi-jvm/scala/org/apache/pekko/cluster/StreamRefSpec.scala
@@ -129,7 +129,7 @@ object StreamRefSpec extends MultiNodeConfig {
             .run()
 
         done.onComplete {
-          case Success(_) => streamLifecycleProbe ! s"completed-$nodeId"
+          case Success(_)  => streamLifecycleProbe ! s"completed-$nodeId"
           case Failure(ex) =>
             log.info("Sink stream completed with failure: {}", ex)
             streamLifecycleProbe ! s"failed-$nodeId"
diff --git a/cluster/src/multi-jvm/scala/org/apache/pekko/cluster/StressSpec.scala b/cluster/src/multi-jvm/scala/org/apache/pekko/cluster/StressSpec.scala
index a6316ed4e8..0e9ad19534 100644
--- a/cluster/src/multi-jvm/scala/org/apache/pekko/cluster/StressSpec.scala
+++ b/cluster/src/multi-jvm/scala/org/apache/pekko/cluster/StressSpec.scala
@@ -215,7 +215,7 @@ private[cluster] object StressMultiJvmSpec extends MultiNodeConfig {
     def receive = {
       case PhiResult(from, phiValues) => phiValuesObservedByNode += from -> phiValues
       case StatsResult(from, stats)   => clusterStatsObservedByNode += from -> stats
-      case ReportTick =>
+      case ReportTick                 =>
         if (infolog)
           log.info(s"[$title] in progress\n\n$formatPhi\n\n$formatStats")
       case r: ClusterResult =>
@@ -346,7 +346,7 @@ private[cluster] object StressMultiJvmSpec extends MultiNodeConfig {
         reportTo.foreach { _ ! PhiResult(cluster.selfAddress, phiSet) }
       case state: CurrentClusterState => nodes = state.members.map(_.address)
       case memberEvent: MemberEvent   => nodes += memberEvent.member.address
-      case ReportTo(ref) =>
+      case ReportTo(ref)              =>
         reportTo.foreach(context.unwatch)
         reportTo = ref
         reportTo.foreach(context.watch)
diff --git a/cluster/src/multi-jvm/scala/org/apache/pekko/cluster/SurviveNetworkInstabilitySpec.scala b/cluster/src/multi-jvm/scala/org/apache/pekko/cluster/SurviveNetworkInstabilitySpec.scala
index 724c35c2a1..62f170e235 100644
--- a/cluster/src/multi-jvm/scala/org/apache/pekko/cluster/SurviveNetworkInstabilitySpec.scala
+++ b/cluster/src/multi-jvm/scala/org/apache/pekko/cluster/SurviveNetworkInstabilitySpec.scala
@@ -329,7 +329,7 @@ abstract class SurviveNetworkInstabilitySpec
         // not be downed, see issue #25632
         Thread.sleep(2000)
         val secondUniqueAddress = cluster.state.members.find(_.address == address(second)) match {
-          case None => fail("Unexpected removal of quarantined node")
+          case None    => fail("Unexpected removal of quarantined node")
           case Some(m) =>
             m.status should ===(MemberStatus.Up) // not Down
             m.uniqueAddress
diff --git a/coordination/src/main/scala/org/apache/pekko/coordination/lease/scaladsl/LeaseProvider.scala b/coordination/src/main/scala/org/apache/pekko/coordination/lease/scaladsl/LeaseProvider.scala
index 3e2ef3eb13..22c9e20484 100644
--- a/coordination/src/main/scala/org/apache/pekko/coordination/lease/scaladsl/LeaseProvider.scala
+++ b/coordination/src/main/scala/org/apache/pekko/coordination/lease/scaladsl/LeaseProvider.scala
@@ -85,7 +85,7 @@ final class LeaseProvider(system: ExtendedActorSystem) extends Extension {
 
           lease match {
             case Success(value) => value
-            case Failure(e) =>
+            case Failure(e)     =>
               log.error(
                 e,
                 "Invalid lease configuration for leaseName [{}], configPath [{}] lease-class [{}]. " +
diff --git a/distributed-data/src/main/scala/org/apache/pekko/cluster/ddata/DeltaPropagationSelector.scala b/distributed-data/src/main/scala/org/apache/pekko/cluster/ddata/DeltaPropagationSelector.scala
index c6f6c68fe6..9cc96c9ab6 100644
--- a/distributed-data/src/main/scala/org/apache/pekko/cluster/ddata/DeltaPropagationSelector.scala
+++ b/distributed-data/src/main/scala/org/apache/pekko/cluster/ddata/DeltaPropagationSelector.scala
@@ -172,7 +172,7 @@ private[pekko] trait DeltaPropagationSelector {
 
   private def findSmallestVersionPropagatedToAllNodes(key: KeyId, all: Vector[UniqueAddress]): Long = {
     deltaSentToNode.get(key) match {
-      case None => 0L
+      case None                        => 0L
       case Some(deltaSentToNodeForKey) =>
         if (deltaSentToNodeForKey.isEmpty) 0L
         else if (all.exists(node => !deltaSentToNodeForKey.contains(node))) 0L
diff --git a/distributed-data/src/main/scala/org/apache/pekko/cluster/ddata/DurableStore.scala b/distributed-data/src/main/scala/org/apache/pekko/cluster/ddata/DurableStore.scala
index 17489eb7de..efced43cdf 100644
--- a/distributed-data/src/main/scala/org/apache/pekko/cluster/ddata/DurableStore.scala
+++ b/distributed-data/src/main/scala/org/apache/pekko/cluster/ddata/DurableStore.scala
@@ -147,7 +147,7 @@ final class LmdbDurableStore(config: Config) extends Actor with ActorLogging {
 
   private def lmdb(): Lmdb = _lmdb match {
     case OptionVal.Some(l) => l
-    case _ =>
+    case _                 =>
       val t0 = System.nanoTime()
       log.info("Using durable data in LMDB directory [{}]", dir.getCanonicalPath)
       val env = {
diff --git a/distributed-data/src/main/scala/org/apache/pekko/cluster/ddata/ORSet.scala b/distributed-data/src/main/scala/org/apache/pekko/cluster/ddata/ORSet.scala
index 1fc533144a..25ec5dfb15 100644
--- a/distributed-data/src/main/scala/org/apache/pekko/cluster/ddata/ORSet.scala
+++ b/distributed-data/src/main/scala/org/apache/pekko/cluster/ddata/ORSet.scala
@@ -158,7 +158,7 @@ object ORSet {
         remaining: List[(UniqueAddress, Long)],
         acc: List[(UniqueAddress, Long)]): List[(UniqueAddress, Long)] =
       remaining match {
-        case Nil => acc
+        case Nil                      => acc
         case (d @ (node, v1)) :: rest =>
           val v2 = vvector.versionAt(node)
           if (v2 >= v1)
@@ -482,15 +482,15 @@ final class ORSet[A] private[pekko] (
 
   override def mergeDelta(thatDelta: ORSet.DeltaOp): ORSet[A] = {
     thatDelta match {
-      case d: ORSet.AddDeltaOp[_]    => dryMerge(d.asInstanceOf[ORSet.AddDeltaOp[A]].underlying, addDeltaOp = true)
-      case d: ORSet.RemoveDeltaOp[_] => mergeRemoveDelta(d.asInstanceOf[ORSet.RemoveDeltaOp[A]])
+      case d: ORSet.AddDeltaOp[_]       => dryMerge(d.asInstanceOf[ORSet.AddDeltaOp[A]].underlying, addDeltaOp = true)
+      case d: ORSet.RemoveDeltaOp[_]    => mergeRemoveDelta(d.asInstanceOf[ORSet.RemoveDeltaOp[A]])
       case d: ORSet.FullStateDeltaOp[_] =>
         dryMerge(d.asInstanceOf[ORSet.FullStateDeltaOp[A]].underlying, addDeltaOp = false)
       case ORSet.DeltaGroup(ops) =>
         ops.foldLeft(this) {
           case (acc, op: ORSet.AddDeltaOp[_]) =>
             acc.dryMerge(op.asInstanceOf[ORSet.AddDeltaOp[A]].underlying, addDeltaOp = true)
-          case (acc, op: ORSet.RemoveDeltaOp[_]) => acc.mergeRemoveDelta(op.asInstanceOf[ORSet.RemoveDeltaOp[A]])
+          case (acc, op: ORSet.RemoveDeltaOp[_])    => acc.mergeRemoveDelta(op.asInstanceOf[ORSet.RemoveDeltaOp[A]])
           case (acc, op: ORSet.FullStateDeltaOp[_]) =>
             acc.dryMerge(op.asInstanceOf[ORSet.FullStateDeltaOp[A]].underlying, addDeltaOp = false)
           case (_, _: ORSet.DeltaGroup[_]) =>
diff --git a/distributed-data/src/main/scala/org/apache/pekko/cluster/ddata/PruningState.scala b/distributed-data/src/main/scala/org/apache/pekko/cluster/ddata/PruningState.scala
index 40a849164a..f029624f85 100644
--- a/distributed-data/src/main/scala/org/apache/pekko/cluster/ddata/PruningState.scala
+++ b/distributed-data/src/main/scala/org/apache/pekko/cluster/ddata/PruningState.scala
@@ -46,9 +46,9 @@ import pekko.util.unused
 
   def merge(that: PruningState): PruningState =
     (this, that) match {
-      case (p1: PruningPerformed, p2: PruningPerformed) => if (p1.obsoleteTime >= p2.obsoleteTime) this else that
-      case (_: PruningPerformed, _)                     => this
-      case (_, _: PruningPerformed)                     => that
+      case (p1: PruningPerformed, p2: PruningPerformed)                                       => if (p1.obsoleteTime >= p2.obsoleteTime) this else that
+      case (_: PruningPerformed, _)                                                           => this
+      case (_, _: PruningPerformed)                                                           => that
       case (PruningInitialized(thisOwner, thisSeen), PruningInitialized(thatOwner, thatSeen)) =>
         if (thisOwner == thatOwner)
           PruningInitialized(thisOwner, thisSeen.union(thatSeen))
diff --git a/distributed-data/src/main/scala/org/apache/pekko/cluster/ddata/Replicator.scala b/distributed-data/src/main/scala/org/apache/pekko/cluster/ddata/Replicator.scala
index 8b64e33ec6..0a78b959cb 100644
--- a/distributed-data/src/main/scala/org/apache/pekko/cluster/ddata/Replicator.scala
+++ b/distributed-data/src/main/scala/org/apache/pekko/cluster/ddata/Replicator.scala
@@ -1414,7 +1414,7 @@ final class Replicator(settings: ReplicatorSettings) extends Actor with ActorLog
   val durableStore: ActorRef =
     if (hasDurableKeys) {
       val props = settings.durableStoreProps match {
-        case Right(p) => p
+        case Right(p)     => p
         case Left((s, c)) =>
           val clazz = context.system.asInstanceOf[ExtendedActorSystem].dynamicAccess.getClassFor[Actor](s).get
           Props(clazz, c).withDispatcher(c.getString("use-dispatcher"))
@@ -1622,7 +1622,7 @@ final class Replicator(settings: ReplicatorSettings) extends Actor with ActorLog
         // ignore gossip and replication when loading durable data
         log.debug("ignoring message [{}] when loading durable data", m.getClass.getName)
       case msg: ClusterDomainEvent => normalReceive.applyOrElse(msg, unhandled)
-      case msg =>
+      case msg                     =>
         stash :+= (msg -> replyTo)
     }
   }
@@ -1796,7 +1796,7 @@ final class Replicator(settings: ReplicatorSettings) extends Actor with ActorLog
             replyTo ! UpdateSuccess(key, req)
         } else {
           val (writeEnvelope, writeDelta) = delta match {
-            case Some(NoDeltaPlaceholder) => (newEnvelope, None)
+            case Some(NoDeltaPlaceholder)                => (newEnvelope, None)
             case Some(d: RequiresCausalDeliveryOfDeltas) =>
               val v = deltaPropagationSelector.currentVersion(key.id)
               (newEnvelope, Some(Delta(newEnvelope.copy(data = d), v, v)))
@@ -1871,7 +1871,7 @@ final class Replicator(settings: ReplicatorSettings) extends Actor with ActorLog
     getData(key) match {
       case someEnvelope @ Some(envelope) if envelope eq writeEnvelope => someEnvelope
       case Some(DataEnvelope(DeletedData, _, _))                      => Some(DeletedEnvelope) // already deleted
-      case Some(envelope @ DataEnvelope(existingData @ _, _, _)) =>
+      case Some(envelope @ DataEnvelope(existingData @ _, _, _))      =>
         try {
           // DataEnvelope will mergeDelta when needed
           val merged = envelope.merge(writeEnvelope).addSeen(selfAddress)
diff --git a/distributed-data/src/main/scala/org/apache/pekko/cluster/ddata/protobuf/ReplicatedDataSerializer.scala b/distributed-data/src/main/scala/org/apache/pekko/cluster/ddata/protobuf/ReplicatedDataSerializer.scala
index ecf9a2eeca..fd53bc2b74 100644
--- a/distributed-data/src/main/scala/org/apache/pekko/cluster/ddata/protobuf/ReplicatedDataSerializer.scala
+++ b/distributed-data/src/main/scala/org/apache/pekko/cluster/ddata/protobuf/ReplicatedDataSerializer.scala
@@ -66,7 +66,7 @@ private object ReplicatedDataSerializer {
       case (_: Long, _)                         => -1
       case (_, _: Long)                         => 1
       case (k1: OtherMessage, k2: OtherMessage) => OtherMessageComparator.compare(k1, k2)
-      case (k1, k2) =>
+      case (k1, k2)                             =>
         throw new IllegalStateException(
           s"Invalid keys (${k1.getClass}, ${k2.getClass}): must be of type String, Int, Long or OtherMessage")
     }
@@ -400,14 +400,14 @@ class ReplicatedDataSerializer(val system: ExtendedActorSystem)
     case m: ORSet.DeltaGroup[_]          => orsetDeltaGroupToProto(m).toByteArray
     case m: ORMap.DeltaGroup[_, _]       => ormapDeltaGroupToProto(m).toByteArray
     case m: ORSet.FullStateDeltaOp[_]    => orsetToProto(m.underlying).toByteArray
-    case _ =>
+    case _                               =>
       throw new IllegalArgumentException(s"Can't serialize object of type ${obj.getClass} in [${getClass.getName}]")
   }
 
   override def fromBinary(bytes: Array[Byte], manifest: String): AnyRef =
     fromBinaryMap.get(manifest) match {
       case Some(f) => f(bytes)
-      case None =>
+      case None    =>
         throw new NotSerializableException(
           s"Unimplemented deserialization of message with manifest [$manifest] in [${getClass.getName}]")
     }
@@ -481,7 +481,7 @@ class ReplicatedDataSerializer(val system: ExtendedActorSystem)
       case i: Int        => intElements.add(i)
       case l: Long       => longElements.add(l)
       case ref: ActorRef => actorRefElements.add(ref)
-      case other =>
+      case other         =>
         val enclosedMsg = otherMessageToProto(other)
         otherElements.add(enclosedMsg)
         // need the mapping back to the `other` when adding dots
@@ -678,7 +678,7 @@ class ReplicatedDataSerializer(val system: ExtendedActorSystem)
       case (key: String, value) => protoEntries.add(eh.setStringKey(createBuilder(), key, valueConverter(value)))
       case (key: Int, value)    => protoEntries.add(eh.setIntKey(createBuilder(), key, valueConverter(value)))
       case (key: Long, value)   => protoEntries.add(eh.setLongKey(createBuilder(), key, valueConverter(value)))
-      case (key, value) =>
+      case (key, value)         =>
         protoEntries.add(eh.setOtherKey(createBuilder(), otherMessageToProto(key), valueConverter(value)))
     }
     protoEntries
diff --git a/distributed-data/src/main/scala/org/apache/pekko/cluster/ddata/protobuf/ReplicatorMessageSerializer.scala b/distributed-data/src/main/scala/org/apache/pekko/cluster/ddata/protobuf/ReplicatorMessageSerializer.scala
index f5538d21c1..528b23fe7c 100644
--- a/distributed-data/src/main/scala/org/apache/pekko/cluster/ddata/protobuf/ReplicatorMessageSerializer.scala
+++ b/distributed-data/src/main/scala/org/apache/pekko/cluster/ddata/protobuf/ReplicatorMessageSerializer.scala
@@ -235,7 +235,7 @@ class ReplicatorMessageSerializer(val system: ExtendedActorSystem)
     case _: Gossip              => GossipManifest
     case WriteNack              => WriteNackManifest
     case DeltaNack              => DeltaNackManifest
-    case _ =>
+    case _                      =>
       throw new IllegalArgumentException(s"Can't serialize object of type ${obj.getClass} in [${getClass.getName}]")
   }
 
@@ -258,14 +258,14 @@ class ReplicatorMessageSerializer(val system: ExtendedActorSystem)
     case m: Gossip              => compress(gossipToProto(m))
     case WriteNack              => dm.Empty.getDefaultInstance.toByteArray
     case DeltaNack              => dm.Empty.getDefaultInstance.toByteArray
-    case _ =>
+    case _                      =>
       throw new IllegalArgumentException(s"Can't serialize object of type ${obj.getClass} in [${getClass.getName}]")
   }
 
   override def fromBinary(bytes: Array[Byte], manifest: String): AnyRef =
     fromBinaryMap.get(manifest) match {
       case Some(f) => f(bytes)
-      case None =>
+      case None    =>
         throw new NotSerializableException(
           s"Unimplemented deserialization of message with manifest [$manifest] in [${getClass.getName}]")
     }
@@ -360,8 +360,8 @@ class ReplicatorMessageSerializer(val system: ExtendedActorSystem)
     val b = dm.Get.newBuilder().setKey(otherMessageToProto(get.key)).setTimeout(timoutInMillis.toInt)
 
     get.consistency match {
-      case ReadLocal      => b.setConsistency(1)
-      case ReadFrom(n, _) => b.setConsistency(n)
+      case ReadLocal               => b.setConsistency(1)
+      case ReadFrom(n, _)          => b.setConsistency(n)
       case ReadMajority(_, minCap) =>
         b.setConsistency(0)
         if (minCap != 0)
diff --git a/distributed-data/src/main/scala/org/apache/pekko/cluster/ddata/protobuf/SerializationSupport.scala b/distributed-data/src/main/scala/org/apache/pekko/cluster/ddata/protobuf/SerializationSupport.scala
index 4eb4f3570f..358d03f0b2 100644
--- a/distributed-data/src/main/scala/org/apache/pekko/cluster/ddata/protobuf/SerializationSupport.scala
+++ b/distributed-data/src/main/scala/org/apache/pekko/cluster/ddata/protobuf/SerializationSupport.scala
@@ -82,7 +82,7 @@ trait SerializationSupport {
 
     @tailrec def readChunk(): Unit = in.read(buffer) match {
       case -1 => ()
-      case n =>
+      case n  =>
         out.write(buffer, 0, n)
         readChunk()
     }
diff --git a/distributed-data/src/multi-jvm/scala/org/apache/pekko/cluster/ddata/ReplicatorDeltaSpec.scala b/distributed-data/src/multi-jvm/scala/org/apache/pekko/cluster/ddata/ReplicatorDeltaSpec.scala
index 41f60b961f..6d076cbfd2 100644
--- a/distributed-data/src/multi-jvm/scala/org/apache/pekko/cluster/ddata/ReplicatorDeltaSpec.scala
+++ b/distributed-data/src/multi-jvm/scala/org/apache/pekko/cluster/ddata/ReplicatorDeltaSpec.scala
@@ -381,7 +381,7 @@ class ReplicatorDeltaSpec extends MultiNodeSpec(ReplicatorDeltaSpec) with STMult
         for (op <- operations) {
           log.debug("operation: {}", op)
           op match {
-            case Delay(d) => Thread.sleep(d)
+            case Delay(d)                  => Thread.sleep(d)
             case Incr(key, n, consistency) =>
               fullStateReplicator ! Update(key, PNCounter.empty, consistency)(_ :+ n)
               deltaReplicator ! Update(key, PNCounter.empty, consistency)(_ :+ n)
diff --git a/distributed-data/src/multi-jvm/scala/org/apache/pekko/cluster/ddata/ReplicatorMapDeltaSpec.scala b/distributed-data/src/multi-jvm/scala/org/apache/pekko/cluster/ddata/ReplicatorMapDeltaSpec.scala
index 7c9103ebaa..993a4f181e 100644
--- a/distributed-data/src/multi-jvm/scala/org/apache/pekko/cluster/ddata/ReplicatorMapDeltaSpec.scala
+++ b/distributed-data/src/multi-jvm/scala/org/apache/pekko/cluster/ddata/ReplicatorMapDeltaSpec.scala
@@ -353,7 +353,7 @@ class ReplicatorMapDeltaSpec extends MultiNodeSpec(ReplicatorMapDeltaSpec) with
         for (op <- operations) {
           log.debug("operation: {}", op)
           op match {
-            case Delay(d) => Thread.sleep(d)
+            case Delay(d)        => Thread.sleep(d)
             case Incr(key, n, _) =>
               fullStateReplicator ! Update(key._1, PNCounterMap.empty[String], WriteLocal)(_.incrementBy(key._2, n))
               deltaReplicator ! Update(key._1, PNCounterMap.empty[String], WriteLocal)(_.incrementBy(key._2, n))
diff --git a/distributed-data/src/test/scala/org/apache/pekko/cluster/ddata/LotsOfDataBot.scala b/distributed-data/src/test/scala/org/apache/pekko/cluster/ddata/LotsOfDataBot.scala
index 35af027f83..723e5ed914 100644
--- a/distributed-data/src/test/scala/org/apache/pekko/cluster/ddata/LotsOfDataBot.scala
+++ b/distributed-data/src/test/scala/org/apache/pekko/cluster/ddata/LotsOfDataBot.scala
@@ -122,7 +122,7 @@ class LotsOfDataBot extends Actor with ActorLogging {
         }
       }
 
-    case _: UpdateResponse[_] => // ignore
+    case _: UpdateResponse[_]      => // ignore
     case c @ Changed(ORSetKey(id)) =>
       val elements = c.dataValue match {
         case ORSet(e) => e
diff --git a/docs/src/test/scala/docs/actor/ActorDocSpec.scala b/docs/src/test/scala/docs/actor/ActorDocSpec.scala
index b31577bf57..42206a70ca 100644
--- a/docs/src/test/scala/docs/actor/ActorDocSpec.scala
+++ b/docs/src/test/scala/docs/actor/ActorDocSpec.scala
@@ -241,14 +241,14 @@ class Manager extends Actor {
   val worker = context.watch(context.actorOf(Props[Cruncher](), "worker"))
 
   def receive = {
-    case "job" => worker ! "crunch"
+    case "job"    => worker ! "crunch"
     case Shutdown =>
       worker ! PoisonPill
       context.become(shuttingDown)
   }
 
   def shuttingDown: Receive = {
-    case "job" => sender() ! "service unavailable, shutting down"
+    case "job"                => sender() ! "service unavailable, shutting down"
     case Terminated(`worker`) =>
       context.stop(self)
   }
@@ -481,7 +481,7 @@ class ActorDocSpec extends PekkoSpec("""
   "creating actor with IndirectActorProducer" in {
     class Echo(name: String) extends Actor {
       def receive = {
-        case n: Int => sender() ! name
+        case n: Int  => sender() ! name
         case message =>
           val target = testActor
           // #forward
diff --git a/docs/src/test/scala/docs/actor/FaultHandlingDocSample.scala b/docs/src/test/scala/docs/actor/FaultHandlingDocSample.scala
index 4a005e1817..e1da631b88 100644
--- a/docs/src/test/scala/docs/actor/FaultHandlingDocSample.scala
+++ b/docs/src/test/scala/docs/actor/FaultHandlingDocSample.scala
@@ -211,7 +211,7 @@ class CounterService extends Actor {
     // to the counter when it is initialized.
     counter match {
       case Some(c) => c.forward(msg)
-      case None =>
+      case None    =>
         if (backlog.size >= MaxBacklog)
           throw new ServiceUnavailable("CounterService not available, lack of initial value")
         backlog :+= (sender() -> msg)
diff --git a/docs/src/test/scala/docs/actor/FaultHandlingDocSpec.scala b/docs/src/test/scala/docs/actor/FaultHandlingDocSpec.scala
index aebbfcb112..c99ca6f005 100644
--- a/docs/src/test/scala/docs/actor/FaultHandlingDocSpec.scala
+++ b/docs/src/test/scala/docs/actor/FaultHandlingDocSpec.scala
@@ -87,7 +87,7 @@ object FaultHandlingDocSpec {
     override val supervisorStrategy =
       OneForOneStrategy(maxNrOfRetries = 10, withinTimeRange = 1.minute) {
         case _: ArithmeticException => Resume
-        case t =>
+        case t                      =>
           super.supervisorStrategy.decider.applyOrElse(t, (_: Any) => Escalate)
       }
     // #default-strategy-fallback
diff --git a/docs/src/test/scala/docs/cluster/TransformationBackend.scala b/docs/src/test/scala/docs/cluster/TransformationBackend.scala
index 04ec10fbc2..d86198da66 100644
--- a/docs/src/test/scala/docs/cluster/TransformationBackend.scala
+++ b/docs/src/test/scala/docs/cluster/TransformationBackend.scala
@@ -37,7 +37,7 @@ class TransformationBackend extends Actor {
   override def postStop(): Unit = cluster.unsubscribe(self)
 
   def receive = {
-    case TransformationJob(text) => sender() ! TransformationResult(text.toUpperCase)
+    case TransformationJob(text)    => sender() ! TransformationResult(text.toUpperCase)
     case state: CurrentClusterState =>
       state.members.filter(_.status == MemberStatus.Up).foreach(register)
     case MemberUp(m) => register(m)
diff --git a/docs/src/test/scala/docs/future/FutureDocSpec.scala b/docs/src/test/scala/docs/future/FutureDocSpec.scala
index 636bb793e1..274c0f8ba2 100644
--- a/docs/src/test/scala/docs/future/FutureDocSpec.scala
+++ b/docs/src/test/scala/docs/future/FutureDocSpec.scala
@@ -412,7 +412,7 @@ class FutureDocSpec extends PekkoSpec {
     val msg1 = -1
     // #try-recover
     val future = pekko.pattern.ask(actor, msg1).recoverWith {
-      case e: ArithmeticException => Future.successful(0)
+      case e: ArithmeticException        => Future.successful(0)
       case foo: IllegalArgumentException =>
         Future.failed[Int](new IllegalStateException("All br0ken!"))
     }
diff --git a/docs/src/test/scala/docs/io/EchoServer.scala b/docs/src/test/scala/docs/io/EchoServer.scala
index 0df4055723..f207c3f817 100644
--- a/docs/src/test/scala/docs/io/EchoServer.scala
+++ b/docs/src/test/scala/docs/io/EchoServer.scala
@@ -117,7 +117,7 @@ class EchoHandler(connection: ActorRef, remote: InetSocketAddress) extends Actor
       case WritingResumed         => writeFirst()
       case PeerClosed             => peerClosed = true
       case Ack(ack) if ack < nack => acknowledge(ack)
-      case Ack(ack) =>
+      case Ack(ack)               =>
         acknowledge(ack)
         if (storage.nonEmpty) {
           if (toAck > 0) {
diff --git a/docs/src/test/scala/docs/persistence/PersistenceDocSpec.scala b/docs/src/test/scala/docs/persistence/PersistenceDocSpec.scala
index 90f1f6b938..3da5ef9aa7 100644
--- a/docs/src/test/scala/docs/persistence/PersistenceDocSpec.scala
+++ b/docs/src/test/scala/docs/persistence/PersistenceDocSpec.scala
@@ -169,7 +169,7 @@ object PersistenceDocSpec {
       override def receiveCommand: Receive = {
         case SaveSnapshotSuccess(metadata)         => // ...
         case SaveSnapshotFailure(metadata, reason) => // ...
-        case cmd: String =>
+        case cmd: String                           =>
           persist(s"evt-$cmd") { e =>
             updateState(e)
             if (lastSequenceNr % snapShotInterval == 0 && lastSequenceNr != 0)
diff --git a/docs/src/test/scala/docs/persistence/query/PersistenceQueryDocSpec.scala b/docs/src/test/scala/docs/persistence/query/PersistenceQueryDocSpec.scala
index 66962a6ee5..3940165dcb 100644
--- a/docs/src/test/scala/docs/persistence/query/PersistenceQueryDocSpec.scala
+++ b/docs/src/test/scala/docs/persistence/query/PersistenceQueryDocSpec.scala
@@ -82,7 +82,7 @@ object PersistenceQueryDocSpec {
       case Sequence(offsetValue) =>
         Source.fromGraph(new MyEventsByTagSource(tag, offsetValue, refreshInterval))
       case NoOffset => eventsByTag(tag, Sequence(0L)) // recursive
-      case _ =>
+      case _        =>
         throw new IllegalArgumentException("MyJournal does not support " + offset.getClass.getName + " offsets")
     }
 
diff --git a/docs/src/test/scala/docs/persistence/testkit/TestKitExamples.scala b/docs/src/test/scala/docs/persistence/testkit/TestKitExamples.scala
index 7dde5a7ffd..96bfaa2f97 100644
--- a/docs/src/test/scala/docs/persistence/testkit/TestKitExamples.scala
+++ b/docs/src/test/scala/docs/persistence/testkit/TestKitExamples.scala
@@ -87,7 +87,7 @@ class SampleEventStoragePolicy extends EventStorage.JournalPolicies.PolicyType {
       // check the type of operation and react with success or with reject or with failure.
       // if you return ProcessingSuccess the operation will be performed, otherwise not.
       processingUnit match {
-        case ReadEvents(batch) if batch.nonEmpty => ProcessingSuccess
+        case ReadEvents(batch) if batch.nonEmpty  => ProcessingSuccess
         case WriteEvents(batch) if batch.size > 1 =>
           ProcessingSuccess
         case ReadSeqNum      => StorageFailure()
@@ -117,7 +117,7 @@ class SampleSnapshotStoragePolicy extends SnapshotStorage.SnapshotPolicies.Polic
           ProcessingSuccess
         case WriteSnapshot(meta, payload) if meta.sequenceNr > 10 =>
           ProcessingSuccess
-        case DeleteSnapshotsByCriteria(_) => StorageFailure()
+        case DeleteSnapshotsByCriteria(_)                       => StorageFailure()
         case DeleteSnapshotByMeta(meta) if meta.sequenceNr < 10 =>
           ProcessingSuccess
         case _ => StorageFailure()
diff --git a/multi-node-testkit/src/main/scala/org/apache/pekko/remote/testconductor/Conductor.scala b/multi-node-testkit/src/main/scala/org/apache/pekko/remote/testconductor/Conductor.scala
index 9520ec7ba0..92e7e2ea67 100644
--- a/multi-node-testkit/src/main/scala/org/apache/pekko/remote/testconductor/Conductor.scala
+++ b/multi-node-testkit/src/main/scala/org/apache/pekko/remote/testconductor/Conductor.scala
@@ -504,8 +504,8 @@ private[pekko] class Controller(private var initialParticipants: Int, controller
       barrier.forward(c)
     case op: ServerOp =>
       op match {
-        case _: EnterBarrier => barrier.forward(op)
-        case _: FailBarrier  => barrier.forward(op)
+        case _: EnterBarrier  => barrier.forward(op)
+        case _: FailBarrier   => barrier.forward(op)
         case GetAddress(node) =>
           if (nodes contains node) sender() ! ToClient(AddressReply(node, nodes(node).addr))
           else addrInterest += node -> ((addrInterest.get(node).getOrElse(Set())) + sender())
@@ -526,7 +526,7 @@ private[pekko] class Controller(private var initialParticipants: Int, controller
         case Remove(node) =>
           barrier ! BarrierCoordinator.RemoveClient(node)
       }
-    case GetNodes => sender() ! nodes.keys
+    case GetNodes    => sender() ! nodes.keys
     case GetSockAddr =>
       sender() ! connection.channelFuture.sync().channel().localAddress()
   }
@@ -654,7 +654,7 @@ private[pekko] class BarrierCoordinator
         handleBarrier(d.copy(arrived = together))
     case Event(RemoveClient(name), d @ Data(clients, _, arrived, _)) =>
       clients.find(_.name == name) match {
-        case None => stay()
+        case None         => stay()
         case Some(client) =>
           handleBarrier(d.copy(clients = clients - client, arrived = arrived.filterNot(_ == client.fsm)))
       }
diff --git a/multi-node-testkit/src/main/scala/org/apache/pekko/remote/testconductor/DataTypes.scala b/multi-node-testkit/src/main/scala/org/apache/pekko/remote/testconductor/DataTypes.scala
index 2184ed419b..65edfc1105 100644
--- a/multi-node-testkit/src/main/scala/org/apache/pekko/remote/testconductor/DataTypes.scala
+++ b/multi-node-testkit/src/main/scala/org/apache/pekko/remote/testconductor/DataTypes.scala
@@ -163,7 +163,7 @@ private[pekko] class MsgDecoder extends MessageToMessageDecoder[AnyRef] {
           case BarrierOp.Succeeded => BarrierResult(barrier.getName, true)
           case BarrierOp.Failed    => BarrierResult(barrier.getName, false)
           case BarrierOp.Fail      => FailBarrier(barrier.getName)
-          case BarrierOp.Enter =>
+          case BarrierOp.Enter     =>
             EnterBarrier(
               barrier.getName,
               if (barrier.hasTimeout) Option(Duration.fromNanos(barrier.getTimeout)) else None)
diff --git a/multi-node-testkit/src/main/scala/org/apache/pekko/remote/testconductor/Player.scala b/multi-node-testkit/src/main/scala/org/apache/pekko/remote/testconductor/Player.scala
index 570be3b53b..3c0a452a3b 100644
--- a/multi-node-testkit/src/main/scala/org/apache/pekko/remote/testconductor/Player.scala
+++ b/multi-node-testkit/src/main/scala/org/apache/pekko/remote/testconductor/Player.scala
@@ -279,7 +279,7 @@ private[pekko] class ClientFSM(name: RoleName, controllerAddr: InetSocketAddress
 
           cmdFuture.foreach {
             case true => self ! ToServer(Done)
-            case _ =>
+            case _    =>
               throw new RuntimeException("Throttle was requested from the TestConductor, but no transport " +
                 "adapters available that support throttling. Specify `testTransport(on = true)` in your MultiNodeConfig")
           }
@@ -359,7 +359,7 @@ private[pekko] class PlayerHandler(
 
   private def tryConnectToController(): Unit = {
     Try(reconnect()) match {
-      case Success(r) => connectionRef.set(r)
+      case Success(r)  => connectionRef.set(r)
       case Failure(ex) =>
         log.error("Error when trying to connect to remote addr:[{}] will retry, time left:[{}], cause:[{}].",
           server, nextAttempt.timeLeft, ex.getMessage)
diff --git a/multi-node-testkit/src/main/scala/org/apache/pekko/remote/testkit/MultiNodeSpec.scala b/multi-node-testkit/src/main/scala/org/apache/pekko/remote/testkit/MultiNodeSpec.scala
index 95f6a3f1df..3b46c29822 100644
--- a/multi-node-testkit/src/main/scala/org/apache/pekko/remote/testkit/MultiNodeSpec.scala
+++ b/multi-node-testkit/src/main/scala/org/apache/pekko/remote/testkit/MultiNodeSpec.scala
@@ -508,7 +508,7 @@ abstract class MultiNodeSpec(
         case (base, r @ Replacement(tag, _)) =>
           base.indexOf(tag) match {
             case -1 => base
-            case _ =>
+            case _  =>
               val replaceWith =
                 try r.addr
                 catch {
@@ -526,7 +526,7 @@ abstract class MultiNodeSpec(
       import pekko.util.ccompat.JavaConverters._
       ConfigFactory.parseString(deployString).root.asScala.foreach {
         case (key, value: ConfigObject) => deployer.parseConfig(key, value.toConfig).foreach(deployer.deploy)
-        case (key, x) =>
+        case (key, x)                   =>
           throw new IllegalArgumentException(s"key $key must map to deployment section, not simple value $x")
       }
     }
diff --git a/persistence-query/src/main/scala/org/apache/pekko/persistence/query/Offset.scala b/persistence-query/src/main/scala/org/apache/pekko/persistence/query/Offset.scala
index 716bcb8f68..0e03e15beb 100644
--- a/persistence-query/src/main/scala/org/apache/pekko/persistence/query/Offset.scala
+++ b/persistence-query/src/main/scala/org/apache/pekko/persistence/query/Offset.scala
@@ -76,7 +76,7 @@ object TimestampOffset {
       case t: TimestampOffset => t
       case NoOffset           => TimestampOffset.Zero
       case null               => throw new IllegalArgumentException("Offset must not be null")
-      case other =>
+      case other              =>
         throw new IllegalArgumentException(
           s"Supported offset types are TimestampOffset and NoOffset, " +
           s"received ${other.getClass.getName}")
diff --git a/persistence-query/src/main/scala/org/apache/pekko/persistence/query/internal/QuerySerializer.scala b/persistence-query/src/main/scala/org/apache/pekko/persistence/query/internal/QuerySerializer.scala
index a4f2dee867..51b0ec2ccb 100644
--- a/persistence-query/src/main/scala/org/apache/pekko/persistence/query/internal/QuerySerializer.scala
+++ b/persistence-query/src/main/scala/org/apache/pekko/persistence/query/internal/QuerySerializer.scala
@@ -62,7 +62,7 @@ import pekko.serialization.Serializers
   override def manifest(o: AnyRef): String = o match {
     case _: EventEnvelope[_] => EventEnvelopeManifest
     case offset: Offset      => toStorageRepresentation(offset)._2
-    case _ =>
+    case _                   =>
       throw new IllegalArgumentException(s"Can't serialize object of type ${o.getClass} in [${getClass.getName}]")
   }
 
@@ -130,14 +130,14 @@ import pekko.serialization.Serializers
       case SequenceOffsetManifest      => Offset.sequence(offsetStr.toLong)
       case TimeBasedUUIDOffsetManifest => Offset.timeBasedUUID(UUID.fromString(offsetStr))
       case NoOffsetManifest            => NoOffset
-      case _ =>
+      case _                           =>
         manifest.split(manifestSeparator) match {
           case Array(serializerIdStr, serializerManifest) =>
             val serializerId = serializerIdStr.toInt
             val bytes = Base64.getDecoder.decode(offsetStr)
             serialization.deserialize(bytes, serializerId, serializerManifest).get match {
               case offset: Offset => offset
-              case other =>
+              case other          =>
                 throw new NotSerializableException(
                   s"Unimplemented deserialization of offset with serializerId [$serializerId] and manifest [$manifest] " +
                   s"in [${getClass.getName}]. [${other.getClass.getName}] is not an Offset.")
@@ -160,7 +160,7 @@ import pekko.serialization.Serializers
       case seq: Sequence      => (seq.value.toString, SequenceOffsetManifest)
       case tbu: TimeBasedUUID => (tbu.value.toString, TimeBasedUUIDOffsetManifest)
       case NoOffset           => ("", NoOffsetManifest)
-      case _ =>
+      case _                  =>
         val obj = offset.asInstanceOf[AnyRef]
         val serializer = serialization.findSerializerFor(obj)
         val serializerId = serializer.identifier
@@ -191,7 +191,7 @@ import pekko.serialization.Serializers
             .grouped(2)
             .map {
               case pid :: seqNr :: Nil => pid -> seqNr.toLong
-              case _ =>
+              case _                   =>
                 throw new IllegalArgumentException(
                   s"Invalid representation of Map(pid -> seqNr) [${parts.toList.drop(1).mkString(",")}]")
             }
diff --git a/persistence-query/src/main/scala/org/apache/pekko/persistence/query/journal/leveldb/scaladsl/LeveldbReadJournal.scala b/persistence-query/src/main/scala/org/apache/pekko/persistence/query/journal/leveldb/scaladsl/LeveldbReadJournal.scala
index 07f97d0312..9d1651a4b4 100644
--- a/persistence-query/src/main/scala/org/apache/pekko/persistence/query/journal/leveldb/scaladsl/LeveldbReadJournal.scala
+++ b/persistence-query/src/main/scala/org/apache/pekko/persistence/query/journal/leveldb/scaladsl/LeveldbReadJournal.scala
@@ -247,7 +247,7 @@ class LeveldbReadJournal(system: ExtendedActorSystem, config: Config)
               .named("eventsByTag-" + URLEncoder.encode(tag, ByteString.UTF_8))
 
           case NoOffset => eventsByTag(tag, Sequence(0L)) // recursive
-          case _ =>
+          case _        =>
             throw new IllegalArgumentException(
               "LevelDB does not support " + Logging.simpleName(offset.getClass) + " offsets")
         }
@@ -269,7 +269,7 @@ class LeveldbReadJournal(system: ExtendedActorSystem, config: Config)
                 new EventsByTagStage(tag, seq.value, maxBufSize, Long.MaxValue, writeJournalPluginId, None, mat))
               .named("currentEventsByTag-" + URLEncoder.encode(tag, ByteString.UTF_8))
           case NoOffset => currentEventsByTag(tag, Sequence(0L))
-          case _ =>
+          case _        =>
             throw new IllegalArgumentException(
               "LevelDB does not support " + Logging.simpleName(offset.getClass) + " offsets")
         }
diff --git a/persistence-query/src/main/scala/org/apache/pekko/persistence/query/typed/EventEnvelope.scala b/persistence-query/src/main/scala/org/apache/pekko/persistence/query/typed/EventEnvelope.scala
index 8403622f3e..d7556ac30f 100644
--- a/persistence-query/src/main/scala/org/apache/pekko/persistence/query/typed/EventEnvelope.scala
+++ b/persistence-query/src/main/scala/org/apache/pekko/persistence/query/typed/EventEnvelope.scala
@@ -73,7 +73,7 @@ final class EventEnvelope[Event](
   def event: Event =
     eventOption match {
       case Some(evt) => evt
-      case None =>
+      case None      =>
         throw new IllegalStateException(
           "Event was not loaded. Use eventOption and load the event on demand with LoadEventQuery.")
     }
@@ -84,7 +84,7 @@ final class EventEnvelope[Event](
   def getEvent(): Event =
     eventOption match {
       case Some(evt) => evt
-      case None =>
+      case None      =>
         throw new IllegalStateException(
           "Event was not loaded. Use getOptionalEvent and load the event on demand with LoadEventQuery.")
     }
diff --git a/persistence-shared/src/test/scala/org/apache/pekko/persistence/journal/leveldb/PersistencePluginProxySpec.scala b/persistence-shared/src/test/scala/org/apache/pekko/persistence/journal/leveldb/PersistencePluginProxySpec.scala
index cad03ab167..c3fc0651e6 100644
--- a/persistence-shared/src/test/scala/org/apache/pekko/persistence/journal/leveldb/PersistencePluginProxySpec.scala
+++ b/persistence-shared/src/test/scala/org/apache/pekko/persistence/journal/leveldb/PersistencePluginProxySpec.scala
@@ -83,7 +83,7 @@ object PersistencePluginProxySpec {
   class ExamplePersistentActor(probe: ActorRef, name: String) extends NamedPersistentActor(name) {
     override def receiveRecover = {
       case RecoveryCompleted => // ignore
-      case payload =>
+      case payload           =>
         probe ! payload
     }
     override def receiveCommand = {
diff --git a/persistence-shared/src/test/scala/org/apache/pekko/persistence/serialization/SerializerSpec.scala b/persistence-shared/src/test/scala/org/apache/pekko/persistence/serialization/SerializerSpec.scala
index 3e245b787d..bbadb24f9d 100644
--- a/persistence-shared/src/test/scala/org/apache/pekko/persistence/serialization/SerializerSpec.scala
+++ b/persistence-shared/src/test/scala/org/apache/pekko/persistence/serialization/SerializerSpec.scala
@@ -320,7 +320,7 @@ object MessageSerializerRemotingSpec {
   class RemoteActor extends Actor {
     def receive = {
       case p @ PersistentRepr(MyPayload(data), _) => p.sender ! s"p$data"
-      case a: AtomicWrite =>
+      case a: AtomicWrite                         =>
         a.payload.foreach {
           case p @ PersistentRepr(MyPayload(data), _) => p.sender ! s"p$data"
           case x                                      => throw new RuntimeException(s"Unexpected payload: $x")
@@ -478,7 +478,7 @@ class OldPayloadSerializer extends SerializerWithStringManifest {
   def manifest(o: AnyRef): String = o.getClass.getName
 
   def toBinary(o: AnyRef): Array[Byte] = o match {
-    case MyPayload(data) => s".$data".getBytes(UTF_8)
+    case MyPayload(data)                                    => s".$data".getBytes(UTF_8)
     case old if old.getClass.getName == OldPayloadClassName =>
       o.toString.getBytes(UTF_8)
     case x => throw new NotSerializableException(s"Unexpected object: $x")
@@ -488,7 +488,7 @@ class OldPayloadSerializer extends SerializerWithStringManifest {
     case OldPayloadClassName =>
       MyPayload(new String(bytes, UTF_8))
     case MyPayloadClassName => MyPayload(s"${new String(bytes, UTF_8)}.")
-    case other =>
+    case other              =>
       throw new Exception(s"unexpected manifest [$other]")
   }
 }
diff --git a/persistence-testkit/src/main/scala/org/apache/pekko/persistence/testkit/internal/EventSourcedBehaviorTestKitImpl.scala b/persistence-testkit/src/main/scala/org/apache/pekko/persistence/testkit/internal/EventSourcedBehaviorTestKitImpl.scala
index 93d10ff3f9..fb95f40636 100644
--- a/persistence-testkit/src/main/scala/org/apache/pekko/persistence/testkit/internal/EventSourcedBehaviorTestKitImpl.scala
+++ b/persistence-testkit/src/main/scala/org/apache/pekko/persistence/testkit/internal/EventSourcedBehaviorTestKitImpl.scala
@@ -71,7 +71,7 @@ import pekko.stream.scaladsl.Sink
     // cast with nice error message
     private def ofType[A: ClassTag](obj: Any, errorParam: String): A = {
       obj match {
-        case a: A => a
+        case a: A  => a
         case other =>
           val expectedClass = implicitly[ClassTag[A]].runtimeClass
           throw new AssertionError(
diff --git a/persistence-testkit/src/main/scala/org/apache/pekko/persistence/testkit/query/scaladsl/PersistenceTestKitReadJournal.scala b/persistence-testkit/src/main/scala/org/apache/pekko/persistence/testkit/query/scaladsl/PersistenceTestKitReadJournal.scala
index b004e84477..92fb8f083e 100644
--- a/persistence-testkit/src/main/scala/org/apache/pekko/persistence/testkit/query/scaladsl/PersistenceTestKitReadJournal.scala
+++ b/persistence-testkit/src/main/scala/org/apache/pekko/persistence/testkit/query/scaladsl/PersistenceTestKitReadJournal.scala
@@ -99,7 +99,7 @@ final class PersistenceTestKitReadJournal(system: ExtendedActorSystem, @unused c
   override def currentEventsByTag(tag: String, offset: Offset = NoOffset): Source[EventEnvelope, NotUsed] = {
     offset match {
       case NoOffset =>
-      case _ =>
+      case _        =>
         throw new UnsupportedOperationException("Offsets not supported for persistence test kit currentEventsByTag yet")
     }
     Source(storage.tryReadByTag(tag)).map { pr =>
@@ -120,7 +120,7 @@ final class PersistenceTestKitReadJournal(system: ExtendedActorSystem, @unused c
       offset: Offset): Source[typed.EventEnvelope[Event], NotUsed] = {
     offset match {
       case NoOffset =>
-      case _ =>
+      case _        =>
         throw new UnsupportedOperationException("Offsets not supported for persistence test kit currentEventsByTag yet")
     }
     val prs = storage.tryRead(entityType,
diff --git a/persistence-testkit/src/main/scala/org/apache/pekko/persistence/testkit/state/scaladsl/PersistenceTestKitDurableStateStore.scala b/persistence-testkit/src/main/scala/org/apache/pekko/persistence/testkit/state/scaladsl/PersistenceTestKitDurableStateStore.scala
index 9af65831d5..2e72027a4f 100644
--- a/persistence-testkit/src/main/scala/org/apache/pekko/persistence/testkit/state/scaladsl/PersistenceTestKitDurableStateStore.scala
+++ b/persistence-testkit/src/main/scala/org/apache/pekko/persistence/testkit/state/scaladsl/PersistenceTestKitDurableStateStore.scala
@@ -99,7 +99,7 @@ class PersistenceTestKitDurableStateStore[A](val system: ExtendedActorSystem)
     val fromOffset = offset match {
       case NoOffset             => EarliestOffset
       case Sequence(fromOffset) => fromOffset
-      case offset =>
+      case offset               =>
         throw new UnsupportedOperationException(s"$offset not supported in PersistenceTestKitDurableStateStore.")
     }
     def byTagFromOffset(rec: Record[A]) = rec.tag == tag && rec.globalOffset > fromOffset
@@ -156,7 +156,7 @@ class PersistenceTestKitDurableStateStore[A](val system: ExtendedActorSystem)
       val fromOffset = offset match {
         case NoOffset             => EarliestOffset
         case Sequence(fromOffset) => fromOffset
-        case offset =>
+        case offset               =>
           throw new UnsupportedOperationException(s"$offset not supported in PersistenceTestKitDurableStateStore.")
       }
       def bySliceFromOffset(rec: Record[A]) = {
diff --git a/persistence-typed-tests/src/test/scala/org/apache/pekko/persistence/typed/scaladsl/EventSourcedBehaviorRetentionSpec.scala b/persistence-typed-tests/src/test/scala/org/apache/pekko/persistence/typed/scaladsl/EventSourcedBehaviorRetentionSpec.scala
index b094c716a5..db4d88f47c 100644
--- a/persistence-typed-tests/src/test/scala/org/apache/pekko/persistence/typed/scaladsl/EventSourcedBehaviorRetentionSpec.scala
+++ b/persistence-typed-tests/src/test/scala/org/apache/pekko/persistence/typed/scaladsl/EventSourcedBehaviorRetentionSpec.scala
@@ -88,7 +88,7 @@ object EventSourcedBehaviorRetentionSpec extends Matchers {
             probe.foreach(_ ! ((state, evt)))
             State(state.value + delta, state.history :+ state.value)
         }).receiveSignal {
-      case (_, RecoveryCompleted) => ()
+      case (_, RecoveryCompleted)     => ()
       case (_, sc: SnapshotCompleted) =>
         snapshotSignalProbe.foreach(_ ! WrappedSignal(sc))
       case (_, sf: SnapshotFailed) =>
diff --git a/persistence-typed-tests/src/test/scala/org/apache/pekko/persistence/typed/scaladsl/EventSourcedBehaviorSpec.scala b/persistence-typed-tests/src/test/scala/org/apache/pekko/persistence/typed/scaladsl/EventSourcedBehaviorSpec.scala
index 24ede2b59d..a03fb97284 100644
--- a/persistence-typed-tests/src/test/scala/org/apache/pekko/persistence/typed/scaladsl/EventSourcedBehaviorSpec.scala
+++ b/persistence-typed-tests/src/test/scala/org/apache/pekko/persistence/typed/scaladsl/EventSourcedBehaviorSpec.scala
@@ -278,7 +278,7 @@ object EventSourcedBehaviorSpec {
             probe ! ((state, evt))
             State(state.value + delta, state.history :+ state.value)
         }).receiveSignal {
-      case (_, RecoveryCompleted) => ()
+      case (_, RecoveryCompleted)           => ()
       case (_, SnapshotCompleted(metadata)) =>
         snapshotProbe ! Success(metadata)
       case (_, SnapshotFailed(_, failure)) =>
diff --git a/persistence-typed/src/main/scala/org/apache/pekko/persistence/typed/crdt/ORSet.scala b/persistence-typed/src/main/scala/org/apache/pekko/persistence/typed/crdt/ORSet.scala
index 9fbf094161..8640508621 100644
--- a/persistence-typed/src/main/scala/org/apache/pekko/persistence/typed/crdt/ORSet.scala
+++ b/persistence-typed/src/main/scala/org/apache/pekko/persistence/typed/crdt/ORSet.scala
@@ -125,7 +125,7 @@ object ORSet {
 
     @tailrec def dropDots(remaining: List[(String, Long)], acc: List[(String, Long)]): List[(String, Long)] =
       remaining match {
-        case Nil => acc
+        case Nil                      => acc
         case (d @ (node, v1)) :: rest =>
           val v2 = vvector.versionAt(node)
           if (v2 >= v1)
@@ -448,12 +448,12 @@ final class ORSet[A] private[pekko] (
       case d: ORSet.AddDeltaOp[A @unchecked]       => merge(d.underlying, addDeltaOp = true)
       case d: ORSet.RemoveDeltaOp[A @unchecked]    => mergeRemoveDelta(d)
       case d: ORSet.FullStateDeltaOp[A @unchecked] => merge(d.underlying, addDeltaOp = false)
-      case ORSet.DeltaGroup(ops) =>
+      case ORSet.DeltaGroup(ops)                   =>
         ops.foldLeft(this) {
           case (acc, op: ORSet.AddDeltaOp[A @unchecked])       => acc.merge(op.underlying, addDeltaOp = true)
           case (acc, op: ORSet.RemoveDeltaOp[A @unchecked])    => acc.mergeRemoveDelta(op)
           case (acc, op: ORSet.FullStateDeltaOp[A @unchecked]) => acc.merge(op.underlying, addDeltaOp = false)
-          case (_, _: ORSet.DeltaGroup[A @unchecked]) =>
+          case (_, _: ORSet.DeltaGroup[A @unchecked])          =>
             throw new IllegalArgumentException("ORSet.DeltaGroup should not be nested")
         }
     }
diff --git a/persistence-typed/src/main/scala/org/apache/pekko/persistence/typed/internal/EventSourcedSettings.scala b/persistence-typed/src/main/scala/org/apache/pekko/persistence/typed/internal/EventSourcedSettings.scala
index 23421997a7..8992743640 100644
--- a/persistence-typed/src/main/scala/org/apache/pekko/persistence/typed/internal/EventSourcedSettings.scala
+++ b/persistence-typed/src/main/scala/org/apache/pekko/persistence/typed/internal/EventSourcedSettings.scala
@@ -50,8 +50,8 @@ import pekko.annotation.InternalApi
     val typedConfig = config.getConfig("pekko.persistence.typed")
 
     val stashOverflowStrategy = typedConfig.getString("stash-overflow-strategy").toLowerCase match {
-      case "drop" => StashOverflowStrategy.Drop
-      case "fail" => StashOverflowStrategy.Fail
+      case "drop"  => StashOverflowStrategy.Drop
+      case "fail"  => StashOverflowStrategy.Fail
       case unknown =>
         throw new IllegalArgumentException(s"Unknown value for stash-overflow-strategy: [$unknown]")
     }
diff --git a/persistence-typed/src/main/scala/org/apache/pekko/persistence/typed/internal/ReplayingEvents.scala b/persistence-typed/src/main/scala/org/apache/pekko/persistence/typed/internal/ReplayingEvents.scala
index 6e12eb3d37..4e3a3c3a50 100644
--- a/persistence-typed/src/main/scala/org/apache/pekko/persistence/typed/internal/ReplayingEvents.scala
+++ b/persistence-typed/src/main/scala/org/apache/pekko/persistence/typed/internal/ReplayingEvents.scala
@@ -143,7 +143,7 @@ private[pekko] final class ReplayingEvents[C, E, S](
                   case Some(replication) =>
                     val meta = repr.metadata match {
                       case Some(m) => m.asInstanceOf[ReplicatedEventMetadata]
-                      case None =>
+                      case None    =>
                         throw new IllegalStateException(
                           s"Replicated Event Sourcing enabled but existing event has no metadata. Migration isn't supported yet.")
 
diff --git a/persistence-typed/src/main/scala/org/apache/pekko/persistence/typed/internal/ReplayingSnapshot.scala b/persistence-typed/src/main/scala/org/apache/pekko/persistence/typed/internal/ReplayingSnapshot.scala
index ff2f74a361..cf94e9f480 100644
--- a/persistence-typed/src/main/scala/org/apache/pekko/persistence/typed/internal/ReplayingSnapshot.scala
+++ b/persistence-typed/src/main/scala/org/apache/pekko/persistence/typed/internal/ReplayingSnapshot.scala
@@ -73,7 +73,7 @@ private[pekko] class ReplayingSnapshot[C, E, S](override val setup: BehaviorSetu
           case RecoveryTickEvent(snapshot)                => onRecoveryTick(snapshot)
           case evt: ReplicatedEventEnvelope[E @unchecked] => onReplicatedEvent(evt)
           case pe: PublishedEventImpl                     => onPublishedEvent(pe)
-          case cmd: IncomingCommand[C @unchecked] =>
+          case cmd: IncomingCommand[C @unchecked]         =>
             if (receivedPoisonPill) {
               if (setup.settings.logOnStashing)
                 setup.internalLogger.debug("Discarding message [{}], because actor is to be stopped.", cmd)
diff --git a/persistence-typed/src/main/scala/org/apache/pekko/persistence/typed/internal/Running.scala b/persistence-typed/src/main/scala/org/apache/pekko/persistence/typed/internal/Running.scala
index f3846b930e..f4bf501209 100644
--- a/persistence-typed/src/main/scala/org/apache/pekko/persistence/typed/internal/Running.scala
+++ b/persistence-typed/src/main/scala/org/apache/pekko/persistence/typed/internal/Running.scala
@@ -153,7 +153,7 @@ private[pekko] object Running {
                   .filter(event =>
                     event.eventMetadata match {
                       case Some(replicatedMeta: ReplicatedEventMetadata) => replicatedMeta.originReplica == replicaId
-                      case _ =>
+                      case _                                             =>
                         throw new IllegalArgumentException(
                           s"Replication stream from replica $replicaId for ${setup.persistenceId} contains event " +
                           s"(sequence nr ${event.sequenceNr}) without replication metadata. " +
diff --git a/persistence-typed/src/main/scala/org/apache/pekko/persistence/typed/javadsl/CommandHandler.scala b/persistence-typed/src/main/scala/org/apache/pekko/persistence/typed/javadsl/CommandHandler.scala
index 0395615e4c..22e25897ac 100644
--- a/persistence-typed/src/main/scala/org/apache/pekko/persistence/typed/javadsl/CommandHandler.scala
+++ b/persistence-typed/src/main/scala/org/apache/pekko/persistence/typed/javadsl/CommandHandler.scala
@@ -150,7 +150,7 @@ final class CommandHandlerBuilder[Command, Event, State]() {
 
     val combined =
       builders.reverse match {
-        case head :: Nil => head
+        case head :: Nil  => head
         case head :: tail =>
           tail.foldLeft(head) { (acc, builder) =>
             acc.orElse(builder)
@@ -407,7 +407,7 @@ final class CommandHandlerBuilderByState[Command, Event, S <: State, State] @Int
 
         effect match {
           case OptionVal.Some(e) => e.asInstanceOf[EffectImpl[Event, State]]
-          case _ =>
+          case _                 =>
             throw new MatchError(s"No match found for command of type [${command.getClass.getName}]")
         }
       }
diff --git a/persistence-typed/src/main/scala/org/apache/pekko/persistence/typed/javadsl/CommandHandlerWithReply.scala b/persistence-typed/src/main/scala/org/apache/pekko/persistence/typed/javadsl/CommandHandlerWithReply.scala
index 14fc4b540a..0c24bcae36 100644
--- a/persistence-typed/src/main/scala/org/apache/pekko/persistence/typed/javadsl/CommandHandlerWithReply.scala
+++ b/persistence-typed/src/main/scala/org/apache/pekko/persistence/typed/javadsl/CommandHandlerWithReply.scala
@@ -160,7 +160,7 @@ final class CommandHandlerWithReplyBuilder[Command, Event, State]() {
 
     val combined =
       builders.reverse match {
-        case head :: Nil => head
+        case head :: Nil  => head
         case head :: tail =>
           tail.foldLeft(head) { (acc, builder) =>
             acc.orElse(builder)
@@ -419,7 +419,7 @@ final class CommandHandlerWithReplyBuilderByState[Command, Event, S <: State, St
 
         effect match {
           case OptionVal.Some(e) => e.asInstanceOf[EffectImpl[Event, State]]
-          case _ =>
+          case _                 =>
             throw new MatchError(s"No match found for command of type [${command.getClass.getName}]")
         }
       }
diff --git a/persistence-typed/src/main/scala/org/apache/pekko/persistence/typed/javadsl/EventHandler.scala b/persistence-typed/src/main/scala/org/apache/pekko/persistence/typed/javadsl/EventHandler.scala
index d561dd9986..973682fd48 100644
--- a/persistence-typed/src/main/scala/org/apache/pekko/persistence/typed/javadsl/EventHandler.scala
+++ b/persistence-typed/src/main/scala/org/apache/pekko/persistence/typed/javadsl/EventHandler.scala
@@ -151,7 +151,7 @@ final class EventHandlerBuilder[State, Event]() {
 
     val combined =
       builders.reverse match {
-        case head :: Nil => head
+        case head :: Nil  => head
         case head :: tail =>
           tail.foldLeft(head) { (acc, builder) =>
             acc.orElse(builder)
@@ -338,7 +338,7 @@ final class EventHandlerBuilderByState[S <: State, State, Event](
 
         result match {
           case OptionVal.Some(s) => s
-          case _ =>
+          case _                 =>
             val stateClass = if (state == null) "null" else state.getClass.getName
             throw new MatchError(
               s"No match found for event [${event.getClass}] and state [$stateClass]. Has this event been stored using an EventAdapter?")
diff --git a/persistence-typed/src/main/scala/org/apache/pekko/persistence/typed/scaladsl/EventSourcedBehavior.scala b/persistence-typed/src/main/scala/org/apache/pekko/persistence/typed/scaladsl/EventSourcedBehavior.scala
index 57ab08d893..f3ecdf945e 100644
--- a/persistence-typed/src/main/scala/org/apache/pekko/persistence/typed/scaladsl/EventSourcedBehavior.scala
+++ b/persistence-typed/src/main/scala/org/apache/pekko/persistence/typed/scaladsl/EventSourcedBehavior.scala
@@ -123,7 +123,7 @@ object EventSourcedBehavior {
 
     extractConcreteBehavior(context.currentBehavior) match {
       case w: Running.WithSeqNrAccessible => w.currentSequenceNumber
-      case s =>
+      case s                              =>
         throw new IllegalStateException(s"Cannot extract the lastSequenceNumber in state ${s.getClass.getName}")
     }
   }
diff --git a/persistence-typed/src/main/scala/org/apache/pekko/persistence/typed/serialization/ReplicatedEventSourcingSerializer.scala b/persistence-typed/src/main/scala/org/apache/pekko/persistence/typed/serialization/ReplicatedEventSourcingSerializer.scala
index 66fc3a55db..4b94d3b36a 100644
--- a/persistence-typed/src/main/scala/org/apache/pekko/persistence/typed/serialization/ReplicatedEventSourcingSerializer.scala
+++ b/persistence-typed/src/main/scala/org/apache/pekko/persistence/typed/serialization/ReplicatedEventSourcingSerializer.scala
@@ -107,7 +107,7 @@ import scala.collection.immutable.TreeMap
     case _: ReplicatedSnapshotMetadata => ReplicatedSnapshotMetadataManifest
 
     case _: PublishedEventImpl => PublishedEventManifest
-    case _ =>
+    case _                     =>
       throw new IllegalArgumentException(s"Can't serialize object of type ${o.getClass} in [${getClass.getName}]")
   }
 
@@ -231,7 +231,7 @@ import scala.collection.immutable.TreeMap
       case s: String => stringElements.add(s)
       case i: Int    => intElements.add(i)
       case l: Long   => longElements.add(l)
-      case other =>
+      case other     =>
         val enclosedMsg = wrappedSupport.payloadBuilder(other).build()
         otherElements.add(enclosedMsg)
         // need the mapping back to the `other` when adding dots
diff --git a/persistence-typed/src/main/scala/org/apache/pekko/persistence/typed/state/internal/DurableStateSettings.scala b/persistence-typed/src/main/scala/org/apache/pekko/persistence/typed/state/internal/DurableStateSettings.scala
index aea1c4b71d..adaf59e0a6 100644
--- a/persistence-typed/src/main/scala/org/apache/pekko/persistence/typed/state/internal/DurableStateSettings.scala
+++ b/persistence-typed/src/main/scala/org/apache/pekko/persistence/typed/state/internal/DurableStateSettings.scala
@@ -37,8 +37,8 @@ import pekko.persistence.Persistence
     val typedConfig = config.getConfig("pekko.persistence.typed")
 
     val stashOverflowStrategy = typedConfig.getString("stash-overflow-strategy").toLowerCase match {
-      case "drop" => StashOverflowStrategy.Drop
-      case "fail" => StashOverflowStrategy.Fail
+      case "drop"  => StashOverflowStrategy.Drop
+      case "fail"  => StashOverflowStrategy.Fail
       case unknown =>
         throw new IllegalArgumentException(s"Unknown value for stash-overflow-strategy: [$unknown]")
     }
diff --git a/persistence-typed/src/main/scala/org/apache/pekko/persistence/typed/state/internal/Recovering.scala b/persistence-typed/src/main/scala/org/apache/pekko/persistence/typed/state/internal/Recovering.scala
index 115d7bd4ac..88926675cb 100644
--- a/persistence-typed/src/main/scala/org/apache/pekko/persistence/typed/state/internal/Recovering.scala
+++ b/persistence-typed/src/main/scala/org/apache/pekko/persistence/typed/state/internal/Recovering.scala
@@ -84,9 +84,9 @@ private[pekko] class Recovering[C, S](
 
   override def onMessage(msg: InternalProtocol): Behavior[InternalProtocol] = {
     msg match {
-      case success: GetSuccess[S @unchecked] => onGetSuccess(success.result)
-      case GetFailure(exc)                   => onGetFailure(exc)
-      case RecoveryTimeout                   => onRecoveryTimeout()
+      case success: GetSuccess[S @unchecked]  => onGetSuccess(success.result)
+      case GetFailure(exc)                    => onGetFailure(exc)
+      case RecoveryTimeout                    => onRecoveryTimeout()
       case cmd: IncomingCommand[C @unchecked] =>
         if (recoveryState.receivedPoisonPill) {
           if (setup.settings.logOnStashing)
diff --git a/persistence-typed/src/main/scala/org/apache/pekko/persistence/typed/state/javadsl/CommandHandler.scala b/persistence-typed/src/main/scala/org/apache/pekko/persistence/typed/state/javadsl/CommandHandler.scala
index f906f09a77..c4449d6215 100644
--- a/persistence-typed/src/main/scala/org/apache/pekko/persistence/typed/state/javadsl/CommandHandler.scala
+++ b/persistence-typed/src/main/scala/org/apache/pekko/persistence/typed/state/javadsl/CommandHandler.scala
@@ -153,7 +153,7 @@ final class CommandHandlerBuilder[Command, State]() {
 
     val combined =
       builders.reverse match {
-        case head :: Nil => head
+        case head :: Nil  => head
         case head :: tail =>
           tail.foldLeft(head) { (acc, builder) =>
             acc.orElse(builder)
@@ -408,7 +408,7 @@ final class CommandHandlerBuilderByState[Command, S <: State, State] @InternalAp
 
         effect match {
           case OptionVal.Some(e) => e.asInstanceOf[EffectImpl[State]]
-          case _ =>
+          case _                 =>
             throw new MatchError(s"No match found for command of type [${command.getClass.getName}]")
         }
       }
diff --git a/persistence-typed/src/main/scala/org/apache/pekko/persistence/typed/state/javadsl/CommandHandlerWithReply.scala b/persistence-typed/src/main/scala/org/apache/pekko/persistence/typed/state/javadsl/CommandHandlerWithReply.scala
index 9b885f96c6..657a82f5a7 100644
--- a/persistence-typed/src/main/scala/org/apache/pekko/persistence/typed/state/javadsl/CommandHandlerWithReply.scala
+++ b/persistence-typed/src/main/scala/org/apache/pekko/persistence/typed/state/javadsl/CommandHandlerWithReply.scala
@@ -161,7 +161,7 @@ final class CommandHandlerWithReplyBuilder[Command, State]() {
 
     val combined =
       builders.reverse match {
-        case head :: Nil => head
+        case head :: Nil  => head
         case head :: tail =>
           tail.foldLeft(head) { (acc, builder) =>
             acc.orElse(builder)
@@ -419,7 +419,7 @@ final class CommandHandlerWithReplyBuilderByState[Command, S <: State, State] @I
 
         effect match {
           case OptionVal.Some(e) => e.asInstanceOf[EffectImpl[State]]
-          case _ =>
+          case _                 =>
             throw new MatchError(s"No match found for command of type [${command.getClass.getName}]")
         }
       }
diff --git a/persistence-typed/src/main/scala/org/apache/pekko/persistence/typed/state/scaladsl/DurableStateBehavior.scala b/persistence-typed/src/main/scala/org/apache/pekko/persistence/typed/state/scaladsl/DurableStateBehavior.scala
index eb88f9bfd3..998c0dbcdf 100644
--- a/persistence-typed/src/main/scala/org/apache/pekko/persistence/typed/state/scaladsl/DurableStateBehavior.scala
+++ b/persistence-typed/src/main/scala/org/apache/pekko/persistence/typed/state/scaladsl/DurableStateBehavior.scala
@@ -110,7 +110,7 @@ object DurableStateBehavior {
 
     extractConcreteBehavior(context.currentBehavior) match {
       case w: Running.WithRevisionAccessible => w.currentRevision
-      case s =>
+      case s                                 =>
         throw new IllegalStateException(s"Cannot extract the lastSequenceNumber in state ${s.getClass.getName}")
     }
   }
diff --git a/persistence-typed/src/test/scala/docs/org/apache/pekko/persistence/typed/BlogPostEntity.scala b/persistence-typed/src/test/scala/docs/org/apache/pekko/persistence/typed/BlogPostEntity.scala
index a2a086ab68..adb2ac5b73 100644
--- a/persistence-typed/src/test/scala/docs/org/apache/pekko/persistence/typed/BlogPostEntity.scala
+++ b/persistence-typed/src/test/scala/docs/org/apache/pekko/persistence/typed/BlogPostEntity.scala
@@ -87,16 +87,16 @@ object BlogPostEntity {
 
       case draftState: DraftState =>
         command match {
-          case cmd: ChangeBody  => changeBody(draftState, cmd)
-          case Publish(replyTo) => publish(draftState, replyTo)
-          case GetPost(replyTo) => getPost(draftState, replyTo)
+          case cmd: ChangeBody     => changeBody(draftState, cmd)
+          case Publish(replyTo)    => publish(draftState, replyTo)
+          case GetPost(replyTo)    => getPost(draftState, replyTo)
           case AddPost(_, replyTo) =>
             Effect.unhandled.thenRun(_ => replyTo ! StatusReply.Error("Cannot add post while in draft state"))
         }
 
       case publishedState: PublishedState =>
         command match {
-          case GetPost(replyTo) => getPost(publishedState, replyTo)
+          case GetPost(replyTo)    => getPost(publishedState, replyTo)
           case AddPost(_, replyTo) =>
             Effect.unhandled.thenRun(_ => replyTo ! StatusReply.Error("Cannot add post, already published"))
           case _ => Effect.unhandled
diff --git a/persistence-typed/src/test/scala/docs/org/apache/pekko/persistence/typed/BlogPostEntityDurableState.scala b/persistence-typed/src/test/scala/docs/org/apache/pekko/persistence/typed/BlogPostEntityDurableState.scala
index 00a94414a5..46dbefcd1d 100644
--- a/persistence-typed/src/test/scala/docs/org/apache/pekko/persistence/typed/BlogPostEntityDurableState.scala
+++ b/persistence-typed/src/test/scala/docs/org/apache/pekko/persistence/typed/BlogPostEntityDurableState.scala
@@ -79,16 +79,16 @@ object BlogPostEntityDurableState {
 
       case draftState: DraftState =>
         command match {
-          case cmd: ChangeBody  => changeBody(draftState, cmd)
-          case Publish(replyTo) => publish(draftState, replyTo)
-          case GetPost(replyTo) => getPost(draftState, replyTo)
+          case cmd: ChangeBody     => changeBody(draftState, cmd)
+          case Publish(replyTo)    => publish(draftState, replyTo)
+          case GetPost(replyTo)    => getPost(draftState, replyTo)
           case AddPost(_, replyTo) =>
             Effect.unhandled[State].thenRun(_ => replyTo ! StatusReply.Error("Cannot add post while in draft state"))
         }
 
       case publishedState: PublishedState =>
         command match {
-          case GetPost(replyTo) => getPost(publishedState, replyTo)
+          case GetPost(replyTo)    => getPost(publishedState, replyTo)
           case AddPost(_, replyTo) =>
             Effect.unhandled[State].thenRun(_ => replyTo ! StatusReply.Error("Cannot add post, already published"))
           case _ => Effect.unhandled
diff --git a/persistence-typed/src/test/scala/org/apache/pekko/persistence/typed/ClusterSingletonPersistenceSpec.scala b/persistence-typed/src/test/scala/org/apache/pekko/persistence/typed/ClusterSingletonPersistenceSpec.scala
index 26aba14c42..fde922f085 100644
--- a/persistence-typed/src/test/scala/org/apache/pekko/persistence/typed/ClusterSingletonPersistenceSpec.scala
+++ b/persistence-typed/src/test/scala/org/apache/pekko/persistence/typed/ClusterSingletonPersistenceSpec.scala
@@ -53,7 +53,7 @@ object ClusterSingletonPersistenceSpec {
       emptyState = "",
       commandHandler = (state, cmd) =>
         cmd match {
-          case Add(s) => Effect.persist(s)
+          case Add(s)       => Effect.persist(s)
           case Get(replyTo) =>
             replyTo ! state
             Effect.none
diff --git a/persistence-typed/src/test/scala/org/apache/pekko/persistence/typed/scaladsl/PersistentActorCompileOnlyTest.scala b/persistence-typed/src/test/scala/org/apache/pekko/persistence/typed/scaladsl/PersistentActorCompileOnlyTest.scala
index c82341ddfd..909a09de51 100644
--- a/persistence-typed/src/test/scala/org/apache/pekko/persistence/typed/scaladsl/PersistentActorCompileOnlyTest.scala
+++ b/persistence-typed/src/test/scala/org/apache/pekko/persistence/typed/scaladsl/PersistentActorCompileOnlyTest.scala
@@ -182,7 +182,7 @@ object PersistentActorCompileOnlyTest {
       eventHandler = (state, evt) =>
         evt match {
           case TaskRegistered(task) => State(task :: state.tasksInFlight)
-          case TaskRemoved(task) =>
+          case TaskRemoved(task)    =>
             State(state.tasksInFlight.filter(_ != task))
         }).snapshotWhen { (state, e, seqNr) =>
       state.tasksInFlight.isEmpty
@@ -220,7 +220,7 @@ object PersistentActorCompileOnlyTest {
         eventHandler = (state, evt) =>
           evt match {
             case TaskRegistered(task) => State(task :: state.tasksInFlight)
-            case TaskRemoved(task) =>
+            case TaskRemoved(task)    =>
               State(state.tasksInFlight.filter(_ != task))
           }))
 
diff --git a/persistence/src/main/scala/org/apache/pekko/persistence/Eventsourced.scala b/persistence/src/main/scala/org/apache/pekko/persistence/Eventsourced.scala
index 8ce0562bcd..bd7b862c19 100644
--- a/persistence/src/main/scala/org/apache/pekko/persistence/Eventsourced.scala
+++ b/persistence/src/main/scala/org/apache/pekko/persistence/Eventsourced.scala
@@ -310,7 +310,7 @@ private[persistence] trait Eventsourced
 
   override def unhandled(message: Any): Unit = {
     message match {
-      case RecoveryCompleted => // mute
+      case RecoveryCompleted         => // mute
       case SaveSnapshotFailure(m, e) =>
         log.warning(
           "Failed to saveSnapshot given metadata [{}] due to: [{}: {}]",
diff --git a/persistence/src/main/scala/org/apache/pekko/persistence/fsm/PersistentFSM.scala b/persistence/src/main/scala/org/apache/pekko/persistence/fsm/PersistentFSM.scala
index 2ea3a3081d..7dd2d3c25f 100644
--- a/persistence/src/main/scala/org/apache/pekko/persistence/fsm/PersistentFSM.scala
+++ b/persistence/src/main/scala/org/apache/pekko/persistence/fsm/PersistentFSM.scala
@@ -135,8 +135,8 @@ trait PersistentFSM[S <: FSMState, D, E] extends PersistentActor with Persistent
    */
   @nowarn("msg=deprecated")
   override def receiveRecover: Receive = {
-    case domainEventTag(event)                      => startWith(stateName, applyEvent(event, stateData))
-    case StateChangeEvent(stateIdentifier, timeout) => startWith(statesMap(stateIdentifier), stateData, timeout)
+    case domainEventTag(event)                                                                 => startWith(stateName, applyEvent(event, stateData))
+    case StateChangeEvent(stateIdentifier, timeout)                                            => startWith(statesMap(stateIdentifier), stateData, timeout)
     case SnapshotOffer(_, PersistentFSMSnapshot(stateIdentifier, data: D @unchecked, timeout)) =>
       startWith(statesMap(stateIdentifier), data, timeout)
     case RecoveryCompleted =>
diff --git a/persistence/src/main/scala/org/apache/pekko/persistence/fsm/PersistentFSMBase.scala b/persistence/src/main/scala/org/apache/pekko/persistence/fsm/PersistentFSMBase.scala
index dd280a6ade..df78b1e50c 100644
--- a/persistence/src/main/scala/org/apache/pekko/persistence/fsm/PersistentFSMBase.scala
+++ b/persistence/src/main/scala/org/apache/pekko/persistence/fsm/PersistentFSMBase.scala
@@ -550,7 +550,7 @@ trait PersistentFSMBase[S, D, E] extends Actor with Listeners with ActorLogging
   private[pekko] def applyState(nextState: State): Unit = {
     nextState.stopReason match {
       case None => makeTransition(nextState)
-      case _ =>
+      case _    =>
         nextState.replies.reverse.foreach { r =>
           sender() ! r
         }
diff --git a/persistence/src/main/scala/org/apache/pekko/persistence/journal/AsyncWriteJournal.scala b/persistence/src/main/scala/org/apache/pekko/persistence/journal/AsyncWriteJournal.scala
index df9496a97d..9bede9e068 100644
--- a/persistence/src/main/scala/org/apache/pekko/persistence/journal/AsyncWriteJournal.scala
+++ b/persistence/src/main/scala/org/apache/pekko/persistence/journal/AsyncWriteJournal.scala
@@ -51,7 +51,7 @@ trait AsyncWriteJournal extends Actor with WriteJournalBase with AsyncRecovery {
       case "repair-by-discard-old" => ReplayFilter.RepairByDiscardOld
       case "fail"                  => ReplayFilter.Fail
       case "warn"                  => ReplayFilter.Warn
-      case other =>
+      case other                   =>
         throw new IllegalArgumentException(
           s"invalid replay-filter.mode [$other], supported values [off, repair-by-discard-old, fail, warn]")
     }
diff --git a/persistence/src/main/scala/org/apache/pekko/persistence/journal/AsyncWriteProxy.scala b/persistence/src/main/scala/org/apache/pekko/persistence/journal/AsyncWriteProxy.scala
index f8170c7ddc..7e4b175340 100644
--- a/persistence/src/main/scala/org/apache/pekko/persistence/journal/AsyncWriteProxy.scala
+++ b/persistence/src/main/scala/org/apache/pekko/persistence/journal/AsyncWriteProxy.scala
@@ -150,7 +150,7 @@ private class ReplayMediator(
 
   def receive = {
     case p: PersistentRepr => replayCallback(p)
-    case _: ReplaySuccess =>
+    case _: ReplaySuccess  =>
       replayCompletionPromise.success(())
       context.stop(self)
     case ReplayFailure(cause) =>
diff --git a/persistence/src/main/scala/org/apache/pekko/persistence/journal/PersistencePluginProxy.scala b/persistence/src/main/scala/org/apache/pekko/persistence/journal/PersistencePluginProxy.scala
index f6e0bce843..3878ed869c 100644
--- a/persistence/src/main/scala/org/apache/pekko/persistence/journal/PersistencePluginProxy.scala
+++ b/persistence/src/main/scala/org/apache/pekko/persistence/journal/PersistencePluginProxy.scala
@@ -91,7 +91,7 @@ final class PersistencePluginProxy(config: Config) extends Actor with Stash with
   private val pluginType: PluginType = pluginId match {
     case "pekko.persistence.journal.proxy"        => Journal
     case "pekko.persistence.snapshot-store.proxy" => SnapshotStore
-    case other =>
+    case other                                    =>
       throw new IllegalArgumentException("Unknown plugin type: " + other)
   }
 
@@ -152,7 +152,7 @@ final class PersistencePluginProxy(config: Config) extends Actor with Stash with
       context.become(initTimedOut)
       unstashAll() // will trigger appropriate failures
     case Terminated(_) =>
-    case _ =>
+    case _             =>
       stash()
   }
 
@@ -178,7 +178,7 @@ final class PersistencePluginProxy(config: Config) extends Actor with Stash with
         context.become(active(target, address == selfAddress))
       case _: ActorIdentity => // will retry after ReceiveTimeout
       case Terminated(_)    =>
-      case ReceiveTimeout =>
+      case ReceiveTimeout   =>
         sendIdentify(address)
     }: Receive).orElse(init)
 
@@ -191,7 +191,7 @@ final class PersistencePluginProxy(config: Config) extends Actor with Stash with
       context.become(initTimedOut)
     case Terminated(_) =>
     case InitTimeout   =>
-    case msg =>
+    case msg           =>
       targetJournal.forward(msg)
   }
 
@@ -232,7 +232,7 @@ final class PersistencePluginProxy(config: Config) extends Actor with Stash with
       becomeIdentifying(address)
 
     case Terminated(_) =>
-    case _ =>
+    case _             =>
       val e = timeoutException()
       log.error(e, "Failed PersistencePluginProxy request: {}", e.getMessage)
   }
diff --git a/persistence/src/main/scala/org/apache/pekko/persistence/journal/ReplayFilter.scala b/persistence/src/main/scala/org/apache/pekko/persistence/journal/ReplayFilter.scala
index 2ed0ac960e..02943b7fa6 100644
--- a/persistence/src/main/scala/org/apache/pekko/persistence/journal/ReplayFilter.scala
+++ b/persistence/src/main/scala/org/apache/pekko/persistence/journal/ReplayFilter.scala
@@ -183,7 +183,7 @@ private[pekko] class ReplayFilter(
     buffer.clear()
     persistentActor.tell(ReplayMessagesFailure(cause), Actor.noSender)
     context.become {
-      case _: ReplayedMessage => // discard
+      case _: ReplayedMessage                            => // discard
       case _: RecoverySuccess | _: ReplayMessagesFailure =>
         context.stop(self)
     }
diff --git a/persistence/src/main/scala/org/apache/pekko/persistence/journal/leveldb/LeveldbJournal.scala b/persistence/src/main/scala/org/apache/pekko/persistence/journal/leveldb/LeveldbJournal.scala
index 1e7cb66947..2021f11120 100644
--- a/persistence/src/main/scala/org/apache/pekko/persistence/journal/leveldb/LeveldbJournal.scala
+++ b/persistence/src/main/scala/org/apache/pekko/persistence/journal/leveldb/LeveldbJournal.scala
@@ -148,7 +148,7 @@ private[persistence] class SharedLeveldbJournal extends AsyncWriteProxy {
       // forward subscriptions, they are used by query-side
       store match {
         case Some(s) => s.forward(cmd)
-        case None =>
+        case None    =>
           log.error(
             "Failed {} request. " +
             "Store not initialized. Use `SharedLeveldbJournal.setStore(sharedStore, system)`",
diff --git a/persistence/src/main/scala/org/apache/pekko/persistence/serialization/MessageSerializer.scala b/persistence/src/main/scala/org/apache/pekko/persistence/serialization/MessageSerializer.scala
index 7aaeaefdb9..b092057f0f 100644
--- a/persistence/src/main/scala/org/apache/pekko/persistence/serialization/MessageSerializer.scala
+++ b/persistence/src/main/scala/org/apache/pekko/persistence/serialization/MessageSerializer.scala
@@ -72,12 +72,12 @@ class MessageSerializer(val system: ExtendedActorSystem) extends BaseSerializer
    * message's payload to a matching `org.apache.pekko.serialization.Serializer`.
    */
   def fromBinary(bytes: Array[Byte], manifest: Option[Class[_]]): Message = manifest match {
-    case None => persistent(mf.PersistentMessage.parseFrom(bytes))
+    case None    => persistent(mf.PersistentMessage.parseFrom(bytes))
     case Some(c) =>
       c match {
-        case PersistentImplClass => persistent(mf.PersistentMessage.parseFrom(bytes))
-        case PersistentReprClass => persistent(mf.PersistentMessage.parseFrom(bytes))
-        case AtomicWriteClass    => atomicWrite(mf.AtomicWrite.parseFrom(bytes))
+        case PersistentImplClass              => persistent(mf.PersistentMessage.parseFrom(bytes))
+        case PersistentReprClass              => persistent(mf.PersistentMessage.parseFrom(bytes))
+        case AtomicWriteClass                 => atomicWrite(mf.AtomicWrite.parseFrom(bytes))
         case AtLeastOnceDeliverySnapshotClass =>
           atLeastOnceDeliverySnapshot(mf.AtLeastOnceDeliverySnapshot.parseFrom(bytes))
         case PersistentStateChangeEventClass => stateChange(mf.PersistentStateChangeEvent.parseFrom(bytes))
diff --git a/persistence/src/main/scala/org/apache/pekko/persistence/serialization/SnapshotSerializer.scala b/persistence/src/main/scala/org/apache/pekko/persistence/serialization/SnapshotSerializer.scala
index 15691025f2..531fb07e63 100644
--- a/persistence/src/main/scala/org/apache/pekko/persistence/serialization/SnapshotSerializer.scala
+++ b/persistence/src/main/scala/org/apache/pekko/persistence/serialization/SnapshotSerializer.scala
@@ -111,7 +111,7 @@ class SnapshotSerializer(val system: ExtendedActorSystem) extends BaseSerializer
   private def migrateManifestIfNecessary(manifest: String): String = {
     migrationStrategy match {
       case NoMigration => manifest
-      case Pekko =>
+      case Pekko       =>
         if (manifest.startsWith("akka")) {
           manifest.replaceFirst("akka", "org.apache.pekko")
         } else {
@@ -130,7 +130,7 @@ class SnapshotSerializer(val system: ExtendedActorSystem) extends BaseSerializer
   private def migrateManifestToPekkoIfNecessary(manifest: String): String = {
     migrationStrategy match {
       case NoMigration => manifest
-      case _ =>
+      case _           =>
         if (manifest.startsWith("akka")) {
           manifest.replaceFirst("akka", "org.apache.pekko")
         } else {
diff --git a/persistence/src/main/scala/org/apache/pekko/persistence/snapshot/local/LocalSnapshotStore.scala b/persistence/src/main/scala/org/apache/pekko/persistence/snapshot/local/LocalSnapshotStore.scala
index b8e1d7a52f..c9e30103ba 100644
--- a/persistence/src/main/scala/org/apache/pekko/persistence/snapshot/local/LocalSnapshotStore.scala
+++ b/persistence/src/main/scala/org/apache/pekko/persistence/snapshot/local/LocalSnapshotStore.scala
@@ -113,7 +113,7 @@ private[persistence] class LocalSnapshotStore(config: Config) extends SnapshotSt
   @scala.annotation.tailrec
   private def load(metadata: immutable.Seq[SnapshotMetadata]): Try[Option[SelectedSnapshot]] =
     metadata.lastOption match {
-      case None => Success(None) // no snapshots stored
+      case None     => Success(None) // no snapshots stored
       case Some(md) =>
         Try(withInputStream(md)(deserialize)) match {
           case Success(s) =>
diff --git a/persistence/src/test/scala/org/apache/pekko/persistence/AtLeastOnceDeliveryCrashSpec.scala b/persistence/src/test/scala/org/apache/pekko/persistence/AtLeastOnceDeliveryCrashSpec.scala
index 7dbd9fd1c3..58bdabbb98 100644
--- a/persistence/src/test/scala/org/apache/pekko/persistence/AtLeastOnceDeliveryCrashSpec.scala
+++ b/persistence/src/test/scala/org/apache/pekko/persistence/AtLeastOnceDeliveryCrashSpec.scala
@@ -49,7 +49,7 @@ object AtLeastOnceDeliveryCrashSpec {
     override def persistenceId = self.path.name
 
     override def receiveRecover: Receive = {
-      case Message => send()
+      case Message      => send()
       case CrashMessage =>
         log.debug("Crash it")
         throw new IllegalStateException("Intentionally crashed") with NoStackTrace
@@ -57,7 +57,7 @@ object AtLeastOnceDeliveryCrashSpec {
     }
 
     override def receiveCommand: Receive = {
-      case Message => persist(Message)(_ => send())
+      case Message      => persist(Message)(_ => send())
       case CrashMessage =>
         persist(CrashMessage) { _ =>
           testProbe ! ConfirmCrashMessage
diff --git a/persistence/src/test/scala/org/apache/pekko/persistence/OptimizedRecoverySpec.scala b/persistence/src/test/scala/org/apache/pekko/persistence/OptimizedRecoverySpec.scala
index b4a3a742fc..b0a14d9022 100644
--- a/persistence/src/test/scala/org/apache/pekko/persistence/OptimizedRecoverySpec.scala
+++ b/persistence/src/test/scala/org/apache/pekko/persistence/OptimizedRecoverySpec.scala
@@ -43,7 +43,7 @@ object OptimizedRecoverySpec {
       case TakeSnapshot           => saveSnapshot(state)
       case s: SaveSnapshotSuccess => probe ! s
       case GetState               => probe ! state
-      case Save(s) =>
+      case Save(s)                =>
         persist(Saved(s, lastSequenceNr + 1)) { evt =>
           state += evt.s
           probe ! evt
diff --git a/persistence/src/test/scala/org/apache/pekko/persistence/PersistentActorSpec.scala b/persistence/src/test/scala/org/apache/pekko/persistence/PersistentActorSpec.scala
index 9a473dcf08..00ee94c336 100644
--- a/persistence/src/test/scala/org/apache/pekko/persistence/PersistentActorSpec.scala
+++ b/persistence/src/test/scala/org/apache/pekko/persistence/PersistentActorSpec.scala
@@ -49,8 +49,8 @@ object PersistentActorSpec {
     }
 
     val commonBehavior: Receive = {
-      case "boom"   => throw new TestException("boom")
-      case GetState => sender() ! events.reverse
+      case "boom"               => throw new TestException("boom")
+      case GetState             => sender() ! events.reverse
       case Delete(toSequenceNr) =>
         persist(Some(sender())) { s =>
           askedForDelete = s
@@ -931,7 +931,7 @@ object PersistentActorSpec {
     override def receiveRecover = {
       case Evt("invalid") =>
         persist(Evt("invalid-recovery"))(updateState)
-      case e: Evt => updateState(e)
+      case e: Evt            => updateState(e)
       case RecoveryCompleted =>
         persistAsync(Evt("rc-1"))(updateState)
         persist(Evt("rc-2"))(updateState)
diff --git a/persistence/src/test/scala/org/apache/pekko/persistence/PersistentActorStashingSpec.scala b/persistence/src/test/scala/org/apache/pekko/persistence/PersistentActorStashingSpec.scala
index a7b18503a4..a6be948f2b 100644
--- a/persistence/src/test/scala/org/apache/pekko/persistence/PersistentActorStashingSpec.scala
+++ b/persistence/src/test/scala/org/apache/pekko/persistence/PersistentActorStashingSpec.scala
@@ -145,7 +145,7 @@ object PersistentActorStashingSpec {
     var stashed = false
 
     val receiveCommand: Receive = commonBehavior.orElse(unstashBehavior).orElse {
-      case Cmd("a") => persistAsync(Evt("a"))(updateState)
+      case Cmd("a")             => persistAsync(Evt("a"))(updateState)
       case Cmd("b") if !stashed =>
         stash(); stashed = true
       case Cmd("b") => persistAsync(Evt("b"))(updateState)
diff --git a/persistence/src/test/scala/org/apache/pekko/persistence/SnapshotRecoveryWithEmptyJournalSpec.scala b/persistence/src/test/scala/org/apache/pekko/persistence/SnapshotRecoveryWithEmptyJournalSpec.scala
index c9c41ebec3..e45ffb2f04 100644
--- a/persistence/src/test/scala/org/apache/pekko/persistence/SnapshotRecoveryWithEmptyJournalSpec.scala
+++ b/persistence/src/test/scala/org/apache/pekko/persistence/SnapshotRecoveryWithEmptyJournalSpec.scala
@@ -59,7 +59,7 @@ object SnapshotRecoveryWithEmptyJournalSpec {
     }
 
     override def receiveCommand: PartialFunction[Any, Unit] = {
-      case "done" => probe ! "done"
+      case "done"          => probe ! "done"
       case payload: String =>
         persist(payload) { _ =>
           probe ! s"$payload-$lastSequenceNr"
diff --git a/persistence/src/test/scala/org/apache/pekko/persistence/SnapshotSpec.scala b/persistence/src/test/scala/org/apache/pekko/persistence/SnapshotSpec.scala
index a9bfefaf5e..c065eb141d 100644
--- a/persistence/src/test/scala/org/apache/pekko/persistence/SnapshotSpec.scala
+++ b/persistence/src/test/scala/org/apache/pekko/persistence/SnapshotSpec.scala
@@ -50,7 +50,7 @@ object SnapshotSpec {
     }
 
     override def receiveCommand = {
-      case "done" => probe ! "done"
+      case "done"          => probe ! "done"
       case payload: String =>
         persist(payload) { _ =>
           probe ! s"$payload-$lastSequenceNr"
@@ -70,7 +70,7 @@ object SnapshotSpec {
     }
 
     override def receiveCommand = {
-      case "done" => probe ! "done"
+      case "done"          => probe ! "done"
       case payload: String =>
         persist(payload) { _ =>
           probe ! s"$payload-$lastSequenceNr"
diff --git a/persistence/src/test/scala/org/apache/pekko/persistence/fsm/PersistentFSMSpec.scala b/persistence/src/test/scala/org/apache/pekko/persistence/fsm/PersistentFSMSpec.scala
index 3cca19dfc6..0ee3f0cba7 100644
--- a/persistence/src/test/scala/org/apache/pekko/persistence/fsm/PersistentFSMSpec.scala
+++ b/persistence/src/test/scala/org/apache/pekko/persistence/fsm/PersistentFSMSpec.scala
@@ -541,7 +541,7 @@ object PersistentFSMSpec {
     }
 
     when(Paid) {
-      case Event(Leave, _) => stop()
+      case Event(Leave, _)             => stop()
       case Event(GetCurrentCart, data) =>
         stay().replying(data)
     }
diff --git a/persistence/src/test/scala/org/apache/pekko/persistence/journal/SteppingInmemJournal.scala b/persistence/src/test/scala/org/apache/pekko/persistence/journal/SteppingInmemJournal.scala
index 8a1f7a0c9b..75d6fd1ddd 100644
--- a/persistence/src/test/scala/org/apache/pekko/persistence/journal/SteppingInmemJournal.scala
+++ b/persistence/src/test/scala/org/apache/pekko/persistence/journal/SteppingInmemJournal.scala
@@ -84,7 +84,7 @@ final class SteppingInmemJournal extends InmemJournal {
 
   override def receivePluginInternal = super.receivePluginInternal.orElse {
     case Token if queuedOps.isEmpty => queuedTokenRecipients = queuedTokenRecipients :+ sender()
-    case Token =>
+    case Token                      =>
       val op = queuedOps.head
       queuedOps = queuedOps.tail
       val tokenConsumer = sender()
diff --git a/pki/src/main/scala/org/apache/pekko/pki/pem/DERPrivateKeyLoader.scala b/pki/src/main/scala/org/apache/pekko/pki/pem/DERPrivateKeyLoader.scala
index c909919947..50d5a3db72 100644
--- a/pki/src/main/scala/org/apache/pekko/pki/pem/DERPrivateKeyLoader.scala
+++ b/pki/src/main/scala/org/apache/pekko/pki/pem/DERPrivateKeyLoader.scala
@@ -118,7 +118,7 @@ object DERPrivateKeyLoader {
   private def getInteger(sequence: ASN1Sequence, index: Int, name: String): BigInteger = {
     sequence.get(index) match {
       case integer: ASN1Integer => integer.getValue
-      case other =>
+      case other                =>
         throw new IllegalArgumentException(s"Expected integer tag for $name at index $index, but got: ${other.getTag}")
     }
   }
@@ -126,7 +126,7 @@ object DERPrivateKeyLoader {
   private def getSequence(sequence: ASN1Sequence, index: Int, name: String): ASN1Sequence = {
     sequence.get(index) match {
       case seq: ASN1Sequence => seq
-      case other =>
+      case other             =>
         throw new IllegalArgumentException(s"Expected sequence tag for $name at index $index, but got: ${other.getTag}")
     }
   }
diff --git a/remote/src/main/scala/org/apache/pekko/remote/Endpoint.scala b/remote/src/main/scala/org/apache/pekko/remote/Endpoint.scala
index 81f3c06d44..9da404cdad 100644
--- a/remote/src/main/scala/org/apache/pekko/remote/Endpoint.scala
+++ b/remote/src/main/scala/org/apache/pekko/remote/Endpoint.scala
@@ -278,7 +278,7 @@ private[remote] class ReliableDeliverySupervisor(
 
   override val supervisorStrategy = OneForOneStrategy(loggingEnabled = false) {
     case _: AssociationProblem => Escalate
-    case NonFatal(e) =>
+    case NonFatal(e)           =>
       val causedBy = if (e.getCause == null) "" else s"Caused by: [${e.getCause.getMessage}]"
       log.warning(
         "Association with remote system [{}] has failed, address is now gated for [{}] ms. Reason: [{}] {}",
@@ -360,7 +360,7 @@ private[remote] class ReliableDeliverySupervisor(
       resendAll()
       writer ! FlushAndStop
       context.become(flushWait)
-    case IsIdle => // Do not reply, we will Terminate soon, or send a GotUid
+    case IsIdle  => // Do not reply, we will Terminate soon, or send a GotUid
     case s: Send =>
       handleSend(s)
     case ack: Ack =>
@@ -432,17 +432,17 @@ private[remote] class ReliableDeliverySupervisor(
         // Resending will be triggered by the incoming GotUid message after the connection finished
         goToActive()
       } else goToIdle()
-    case AttemptSysMsgRedelivery             => // Ignore
-    case s @ Send(_: SystemMessage, _, _, _) => tryBuffer(s.copy(seqOpt = Some(nextSeq())))
-    case s: Send                             => context.system.deadLetters ! s
-    case EndpointWriter.FlushAndStop         => context.stop(self)
+    case AttemptSysMsgRedelivery                => // Ignore
+    case s @ Send(_: SystemMessage, _, _, _)    => tryBuffer(s.copy(seqOpt = Some(nextSeq())))
+    case s: Send                                => context.system.deadLetters ! s
+    case EndpointWriter.FlushAndStop            => context.stop(self)
     case EndpointWriter.StopReading(w, replyTo) =>
       replyTo ! EndpointWriter.StoppedReading(w)
       sender() ! EndpointWriter.StoppedReading(w)
   }
 
   def idle: Receive = {
-    case IsIdle => sender() ! Idle
+    case IsIdle  => sender() ! Idle
     case s: Send =>
       writer = createWriter()
       // Resending will be triggered by the incoming GotUid message after the connection finished
@@ -462,7 +462,7 @@ private[remote] class ReliableDeliverySupervisor(
         new TimeoutException(
           "Remote system has been silent for too long. " +
           s"(more than ${settings.QuarantineSilentSystemTimeout.toCoarsest})"))
-    case EndpointWriter.FlushAndStop => context.stop(self)
+    case EndpointWriter.FlushAndStop            => context.stop(self)
     case EndpointWriter.StopReading(w, replyTo) =>
       replyTo ! EndpointWriter.StoppedReading(w)
     case Ungate => // ok, not gated
@@ -1107,7 +1107,7 @@ private[remote] class EndpointReader(
 
   override def preStart(): Unit = {
     receiveBuffers.get(Link(localAddress, remoteAddress)) match {
-      case null =>
+      case null                       =>
       case ResendState(`uid`, buffer) =>
         ackedReceiveBuffer = buffer
         deliverAndAck()
diff --git a/remote/src/main/scala/org/apache/pekko/remote/RemoteActorRefProvider.scala b/remote/src/main/scala/org/apache/pekko/remote/RemoteActorRefProvider.scala
index ea877ecd9f..58fb687cff 100644
--- a/remote/src/main/scala/org/apache/pekko/remote/RemoteActorRefProvider.scala
+++ b/remote/src/main/scala/org/apache/pekko/remote/RemoteActorRefProvider.scala
@@ -611,7 +611,7 @@ private[pekko] class RemoteActorRefProvider(
 
   def getExternalAddressFor(addr: Address): Option[Address] = {
     addr match {
-      case _ if hasAddress(addr) => Some(local.rootPath.address)
+      case _ if hasAddress(addr)           => Some(local.rootPath.address)
       case Address(_, _, Some(_), Some(_)) =>
         try Some(transport.localAddressForRemote(addr))
         catch { case NonFatal(_) => None }
@@ -626,7 +626,7 @@ private[pekko] class RemoteActorRefProvider(
   @InternalApi override private[pekko] def serializationInformation: Serialization.Information =
     serializationInformationCache match {
       case OptionVal.Some(info) => info
-      case _ =>
+      case _                    =>
         if ((transport eq null) || (transport.defaultAddress eq null))
           local.serializationInformation // address not know yet, access before complete init and binding
         else {
@@ -710,7 +710,7 @@ private[pekko] class RemoteActorRef private[pekko] (
     s.headOption match {
       case None       => this
       case Some("..") => getParent.getChild(name)
-      case _ => new RemoteActorRef(remote, localAddressToUse, path / s, Nobody, props = None, deploy = None,
+      case _          => new RemoteActorRef(remote, localAddressToUse, path / s, Nobody, props = None, deploy = None,
           acceptProtocolNames = acceptProtocolNames)
     }
   }
diff --git a/remote/src/main/scala/org/apache/pekko/remote/RemoteDaemon.scala b/remote/src/main/scala/org/apache/pekko/remote/RemoteDaemon.scala
index 524c687892..59b2b578a4 100644
--- a/remote/src/main/scala/org/apache/pekko/remote/RemoteDaemon.scala
+++ b/remote/src/main/scala/org/apache/pekko/remote/RemoteDaemon.scala
@@ -103,7 +103,7 @@ private[pekko] class RemoteSystemDaemon(
 
   @tailrec private def removeChildParentNeedsUnwatch(parent: ActorRef, child: ActorRef): Boolean = {
     parent2children.get(parent) match {
-      case null => false // no-op
+      case null     => false // no-op
       case children =>
         val next = children - child
         if (next.isEmpty) {
@@ -155,7 +155,7 @@ private[pekko] class RemoteSystemDaemon(
     case DeathWatchNotification(parent: ActorRef with ActorRefScope, _, _) if !parent.isLocal =>
       terminating.locked {
         parent2children.remove(parent) match {
-          case null =>
+          case null     =>
           case children =>
             for (c <- children) {
               system.stop(c)
diff --git a/remote/src/main/scala/org/apache/pekko/remote/RemoteDeployer.scala b/remote/src/main/scala/org/apache/pekko/remote/RemoteDeployer.scala
index e6729c2caf..688c65fbe9 100644
--- a/remote/src/main/scala/org/apache/pekko/remote/RemoteDeployer.scala
+++ b/remote/src/main/scala/org/apache/pekko/remote/RemoteDeployer.scala
@@ -40,7 +40,7 @@ private[pekko] class RemoteDeployer(_settings: ActorSystem.Settings, _pm: Dynami
         deploy.config.getString("remote") match {
           case AddressFromURIString(r) => Some(deploy.copy(scope = RemoteScope(r)))
           case str if !str.isEmpty     => throw new ConfigurationException(s"unparseable remote node name [$str]")
-          case _ =>
+          case _                       =>
             val nodes = deploy.config.getStringList("target.nodes").asScala.map(AddressFromURIString(_))
             if (nodes.isEmpty || deploy.routerConfig == NoRouter) d
             else
diff --git a/remote/src/main/scala/org/apache/pekko/remote/RemoteSettings.scala b/remote/src/main/scala/org/apache/pekko/remote/RemoteSettings.scala
index 95b03247ff..1d4e3e6c29 100644
--- a/remote/src/main/scala/org/apache/pekko/remote/RemoteSettings.scala
+++ b/remote/src/main/scala/org/apache/pekko/remote/RemoteSettings.scala
@@ -67,11 +67,11 @@ final class RemoteSettings(val config: Config) {
   @deprecated("Classic remoting is deprecated, use Artery", "Akka 2.6.0")
   val RemoteLifecycleEventsLogLevel: LogLevel = toRootLowerCase(
     getString("pekko.remote.classic.log-remote-lifecycle-events")) match {
-    case "on" => Logging.DebugLevel
+    case "on"  => Logging.DebugLevel
     case other =>
       Logging.levelFor(other) match {
         case Some(level) => level
-        case None =>
+        case None        =>
           throw new ConfigurationException("Logging level must be one of (on, off, debug, info, warning, error)")
       }
   }
@@ -154,7 +154,7 @@ final class RemoteSettings(val config: Config) {
     val key = "pekko.remote.classic.quarantine-after-silence"
     config.getString(key).toLowerCase match {
       case "off" | "false" => Duration.Zero
-      case _ =>
+      case _               =>
         config.getMillisDuration(key).requiring(_ > Duration.Zero, "quarantine-after-silence must be > 0")
     }
   }
diff --git a/remote/src/main/scala/org/apache/pekko/remote/Remoting.scala b/remote/src/main/scala/org/apache/pekko/remote/Remoting.scala
index b58d440064..475c0132c8 100644
--- a/remote/src/main/scala/org/apache/pekko/remote/Remoting.scala
+++ b/remote/src/main/scala/org/apache/pekko/remote/Remoting.scala
@@ -447,7 +447,7 @@ private[remote] object EndpointManager {
       // timeOfRelease is only used for garbage collection. If an address is still probed, we should report the
       // known fact that it is quarantined.
       case Some(Quarantined(`uid`, _)) => true
-      case _ =>
+      case _                           =>
         addressToRefuseUid.get(address).exists { case (refuseUid, _) => refuseUid == uid }
     }
 
@@ -467,11 +467,11 @@ private[remote] object EndpointManager {
         val address = writableToAddress(endpoint)
         addressToWritable.get(address) match {
           case Some(Quarantined(_, _)) => // don't overwrite Quarantined with Gated
-          case Some(Pass(_, _)) =>
+          case Some(Pass(_, _))        =>
             addressToWritable += address -> Gated(timeOfRelease)
             writableToAddress -= endpoint
           case Some(Gated(_)) => // already gated
-          case None =>
+          case None           =>
             addressToWritable += address -> Gated(timeOfRelease)
             writableToAddress -= endpoint
         }
@@ -718,7 +718,7 @@ private[remote] class EndpointManager(conf: Config, log: LoggingAdapter)
 
       // Stop inbound read-only associations
       (endpoints.readOnlyEndpointFor(address), uidToQuarantineOption) match {
-        case (Some((endpoint, _)), None) => context.stop(endpoint)
+        case (Some((endpoint, _)), None)                                                        => context.stop(endpoint)
         case (Some((endpoint, currentUid)), Some(quarantineUid)) if currentUid == quarantineUid =>
           context.stop(endpoint)
         case _ => // nothing to stop
diff --git a/remote/src/main/scala/org/apache/pekko/remote/artery/ArterySettings.scala b/remote/src/main/scala/org/apache/pekko/remote/artery/ArterySettings.scala
index 8b257b27e4..012483f3c9 100644
--- a/remote/src/main/scala/org/apache/pekko/remote/artery/ArterySettings.scala
+++ b/remote/src/main/scala/org/apache/pekko/remote/artery/ArterySettings.scala
@@ -92,7 +92,7 @@ private[pekko] final class ArterySettings private (config: Config) {
     case AeronUpd.configName => AeronUpd
     case Tcp.configName      => Tcp
     case TlsTcp.configName   => TlsTcp
-    case other =>
+    case other               =>
       throw new IllegalArgumentException(
         s"Unknown transport [$other], possible values: " +
         s""""${AeronUpd.configName}", "${Tcp.configName}", or "${TlsTcp.configName}"""")
@@ -178,7 +178,7 @@ private[pekko] final class ArterySettings private (config: Config) {
     val DeathWatchNotificationFlushTimeout: FiniteDuration = {
       toRootLowerCase(config.getString("death-watch-notification-flush-timeout")) match {
         case "off" => Duration.Zero
-        case _ =>
+        case _     =>
           config
             .getMillisDuration("death-watch-notification-flush-timeout")
             .requiring(
@@ -309,7 +309,7 @@ private[pekko] object ArterySettings {
   def getHostname(key: String, config: Config): String = config.getString(key) match {
     case "<getHostAddress>" => InetAddress.getLocalHost.getHostAddress
     case "<getHostName>"    => InetAddress.getLocalHost.getHostName
-    case other =>
+    case other              =>
       if (other.startsWith("[") && other.endsWith("]")) other
       else if (AsyncDnsResolver.isIpv6Address(other)) {
         "[" + other + "]"
diff --git a/remote/src/main/scala/org/apache/pekko/remote/artery/ArteryTransport.scala b/remote/src/main/scala/org/apache/pekko/remote/artery/ArteryTransport.scala
index 76e618b758..ae7b3a091e 100644
--- a/remote/src/main/scala/org/apache/pekko/remote/artery/ArteryTransport.scala
+++ b/remote/src/main/scala/org/apache/pekko/remote/artery/ArteryTransport.scala
@@ -181,7 +181,7 @@ private[remote] final class AssociationState private (
     val current = _uniqueRemoteAddress.get
     current.uniqueRemoteAddress match {
       case Some(peer) => callback(peer)
-      case None =>
+      case None       =>
         val newValue = UniqueRemoteAddressValue(None, callback :: current.listeners)
         if (!_uniqueRemoteAddress.compareAndSet(current, newValue))
           addUniqueRemoteAddressListener(callback) // cas failed, retry
@@ -528,7 +528,7 @@ private[remote] abstract class ArteryTransport(_system: ExtendedActorSystem, _pr
                 case ack: ActorRefCompressionAdvertisementAck =>
                   inboundCompressionAccess match {
                     case OptionVal.Some(access) => access.confirmActorRefCompressionAdvertisementAck(ack)
-                    case _ =>
+                    case _                      =>
                       log.debug(
                         s"Received {} version: [{}] however no inbound compression access was present. " +
                         s"ACK will not take effect, however it will be redelivered and likely to apply then.",
@@ -559,7 +559,7 @@ private[remote] abstract class ArteryTransport(_system: ExtendedActorSystem, _pr
                 case ack: ClassManifestCompressionAdvertisementAck =>
                   inboundCompressionAccess match {
                     case OptionVal.Some(access) => access.confirmClassManifestCompressionAdvertisementAck(ack)
-                    case _ =>
+                    case _                      =>
                       log.debug(
                         s"Received {} version: [{}] however no inbound compression access was present. " +
                         s"ACK will not take effect, however it will be redelivered and likely to apply then.",
@@ -602,7 +602,7 @@ private[remote] abstract class ArteryTransport(_system: ExtendedActorSystem, _pr
         // don't restart after shutdown, but log some details so we notice
         log.warning(s"{} failed after shutdown. {}: {}", streamName, cause.getClass.getName, cause.getMessage)
       case _: AbruptTerminationException => // ActorSystem shutdown
-      case cause =>
+      case cause                         =>
         if (restartCounter.restart()) {
           log.warning("{} failed. Restarting it. {}: {}", streamName, cause.getClass.getName, cause.getMessage)
           flightRecorder.transportRestartInbound(localAddress, streamName)
diff --git a/remote/src/main/scala/org/apache/pekko/remote/artery/Association.scala b/remote/src/main/scala/org/apache/pekko/remote/artery/Association.scala
index 76ba57050b..7da5370d0c 100644
--- a/remote/src/main/scala/org/apache/pekko/remote/artery/Association.scala
+++ b/remote/src/main/scala/org/apache/pekko/remote/artery/Association.scala
@@ -237,7 +237,7 @@ private[remote] class Association(
   def outboundControlIngress: OutboundControlIngress = {
     _outboundControlIngress match {
       case OptionVal.Some(o) => o
-      case _ =>
+      case _                 =>
         controlQueue match {
           case w: LazyQueueWrapper => w.runMaterialize()
           case _                   =>
@@ -247,7 +247,7 @@ private[remote] class Association(
         materializing.await(10, TimeUnit.SECONDS)
         _outboundControlIngress match {
           case OptionVal.Some(o) => o
-          case _ =>
+          case _                 =>
             if (transport.isShutdown || isRemovedAfterQuarantined()) throw ShuttingDown
             else throw new IllegalStateException(s"outboundControlIngress for [$remoteAddress] not initialized yet")
         }
@@ -681,7 +681,7 @@ private[remote] class Association(
             associationState.uniqueRemoteAddressState() match {
               case AssociationState.UidQuarantined => // quarantined as expected
               case AssociationState.UidKnown       => // must be new uid, keep as is
-              case AssociationState.UidUnknown =>
+              case AssociationState.UidUnknown     =>
                 val newLastUsedDurationNanos = System.nanoTime() - associationState.lastUsedTimestamp.get
                 // quarantine ignored due to unknown UID, have to stop this task anyway
                 if (newLastUsedDurationNanos >= QuarantineIdleOutboundAfter.toNanos)
@@ -1144,7 +1144,7 @@ private[remote] class AssociationRegistry(createAssociation: Address => Associat
     val currentMap = associationsByAddress.get
     currentMap.get(remoteAddress) match {
       case Some(existing) => existing
-      case None =>
+      case None           =>
         val newAssociation = createAssociation(remoteAddress)
         val newMap = currentMap.updated(remoteAddress, newAssociation)
         if (associationsByAddress.compareAndSet(currentMap, newMap)) {
diff --git a/remote/src/main/scala/org/apache/pekko/remote/artery/Codecs.scala b/remote/src/main/scala/org/apache/pekko/remote/artery/Codecs.scala
index 86ea9e5675..8cbdf12e40 100644
--- a/remote/src/main/scala/org/apache/pekko/remote/artery/Codecs.scala
+++ b/remote/src/main/scala/org/apache/pekko/remote/artery/Codecs.scala
@@ -94,7 +94,7 @@ private[remote] class Encoder(
       private var _serialization: OptionVal[Serialization] = OptionVal.None
       private def serialization: Serialization = _serialization match {
         case OptionVal.Some(s) => s
-        case _ =>
+        case _                 =>
           val s = SerializationExtension(system)
           _serialization = OptionVal.Some(s)
           s
@@ -660,7 +660,7 @@ private[remote] class Deserializer(
       private var _serialization: OptionVal[Serialization] = OptionVal.None
       private def serialization: Serialization = _serialization match {
         case OptionVal.Some(s) => s
-        case _ =>
+        case _                 =>
           val s = SerializationExtension(system)
           _serialization = OptionVal.Some(s)
           s
diff --git a/remote/src/main/scala/org/apache/pekko/remote/artery/Handshake.scala b/remote/src/main/scala/org/apache/pekko/remote/artery/Handshake.scala
index 9efb6196f8..bb372849aa 100644
--- a/remote/src/main/scala/org/apache/pekko/remote/artery/Handshake.scala
+++ b/remote/src/main/scala/org/apache/pekko/remote/artery/Handshake.scala
@@ -273,7 +273,7 @@ private[remote] class InboundHandshake(inboundContext: InboundContext, inControl
               val env = grab(in)
               env.message match {
                 case HandshakeReq(from, to) => onHandshakeReq(from, to)
-                case _ =>
+                case _                      =>
                   onMessage(env)
               }
             }
diff --git a/remote/src/main/scala/org/apache/pekko/remote/artery/TestStage.scala b/remote/src/main/scala/org/apache/pekko/remote/artery/TestStage.scala
index bef0deddef..a8829637d2 100644
--- a/remote/src/main/scala/org/apache/pekko/remote/artery/TestStage.scala
+++ b/remote/src/main/scala/org/apache/pekko/remote/artery/TestStage.scala
@@ -55,7 +55,7 @@ private[remote] class SharedTestState {
     direction match {
       case Direction.Send    => addBlackhole(a, b)
       case Direction.Receive => addBlackhole(b, a)
-      case Direction.Both =>
+      case Direction.Both    =>
         addBlackhole(a, b)
         addBlackhole(b, a)
     }
@@ -94,7 +94,7 @@ private[remote] class SharedTestState {
     direction match {
       case Direction.Send    => removeBlackhole(a, b)
       case Direction.Receive => removeBlackhole(b, a)
-      case Direction.Both =>
+      case Direction.Both    =>
         removeBlackhole(a, b)
         removeBlackhole(b, a)
     }
diff --git a/remote/src/main/scala/org/apache/pekko/remote/artery/aeron/AeronSource.scala b/remote/src/main/scala/org/apache/pekko/remote/artery/aeron/AeronSource.scala
index 137b9a298e..a48d5aaf8c 100644
--- a/remote/src/main/scala/org/apache/pekko/remote/artery/aeron/AeronSource.scala
+++ b/remote/src/main/scala/org/apache/pekko/remote/artery/aeron/AeronSource.scala
@@ -199,7 +199,7 @@ private[remote] class AeronSource(
         if (!delegatingToTaskRunner) {
           def loop(remaining: List[Int]): Unit = {
             remaining match {
-              case Nil =>
+              case Nil               =>
               case sessionId :: tail =>
                 messageHandler.fragmentsHandler.freeSessionBuffer(sessionId)
                 loop(tail)
diff --git a/remote/src/main/scala/org/apache/pekko/remote/artery/aeron/ArteryAeronUdpTransport.scala b/remote/src/main/scala/org/apache/pekko/remote/artery/aeron/ArteryAeronUdpTransport.scala
index b209e50ce5..4ebd910c40 100644
--- a/remote/src/main/scala/org/apache/pekko/remote/artery/aeron/ArteryAeronUdpTransport.scala
+++ b/remote/src/main/scala/org/apache/pekko/remote/artery/aeron/ArteryAeronUdpTransport.scala
@@ -216,7 +216,7 @@ private[remote] class ArteryAeronUdpTransport(_system: ExtendedActorSystem, _pro
           case e: ConductorServiceTimeoutException => handleFatalError(e)
           case e: DriverTimeoutException           => handleFatalError(e)
           case _: AeronTerminated                  => // already handled, via handleFatalError
-          case _ =>
+          case _                                   =>
             log.error(cause, s"Aeron error, $cause")
         }
       }
diff --git a/remote/src/main/scala/org/apache/pekko/remote/artery/aeron/TaskRunner.scala b/remote/src/main/scala/org/apache/pekko/remote/artery/aeron/TaskRunner.scala
index 902b0e7deb..60a96a2f82 100644
--- a/remote/src/main/scala/org/apache/pekko/remote/artery/aeron/TaskRunner.scala
+++ b/remote/src/main/scala/org/apache/pekko/remote/artery/aeron/TaskRunner.scala
@@ -200,7 +200,7 @@ private[pekko] class TaskRunner(system: ExtendedActorSystem, val idleCpuLevel: I
       case null         => // no command
       case Add(task)    => tasks.add(task)
       case Remove(task) => tasks.remove(task)
-      case Shutdown =>
+      case Shutdown     =>
         running = false
         tasks.removeAll() // gc friendly
         while (cmdQueue.poll() != null) () // gc friendly
diff --git a/remote/src/main/scala/org/apache/pekko/remote/artery/compress/InboundCompressions.scala b/remote/src/main/scala/org/apache/pekko/remote/artery/compress/InboundCompressions.scala
index 350047a79e..aae50967c7 100644
--- a/remote/src/main/scala/org/apache/pekko/remote/artery/compress/InboundCompressions.scala
+++ b/remote/src/main/scala/org/apache/pekko/remote/artery/compress/InboundCompressions.scala
@@ -294,7 +294,7 @@ private[remote] object InboundCompression {
       } else {
         @tailrec def find(tables: List[DecompressionTable[T]]): OptionVal[DecompressionTable[T]] = {
           tables match {
-            case Nil => OptionVal.None
+            case Nil       => OptionVal.None
             case t :: tail =>
               if (t.version == version) OptionVal.Some(t)
               else find(tail)
diff --git a/remote/src/main/scala/org/apache/pekko/remote/artery/tcp/ArteryTcpTransport.scala b/remote/src/main/scala/org/apache/pekko/remote/artery/tcp/ArteryTcpTransport.scala
index 21a99e1ba1..aadfb60472 100644
--- a/remote/src/main/scala/org/apache/pekko/remote/artery/tcp/ArteryTcpTransport.scala
+++ b/remote/src/main/scala/org/apache/pekko/remote/artery/tcp/ArteryTcpTransport.scala
@@ -195,7 +195,7 @@ private[remote] class ArteryTcpTransport(
             }))
             .mapError {
               case ArteryTransport.ShutdownSignal => ArteryTransport.ShutdownSignal
-              case e =>
+              case e                              =>
                 logDisconnected()
                 e
             }
diff --git a/remote/src/main/scala/org/apache/pekko/remote/artery/tcp/ssl/X509Readers.scala b/remote/src/main/scala/org/apache/pekko/remote/artery/tcp/ssl/X509Readers.scala
index 9a38fecddf..6cfa958383 100644
--- a/remote/src/main/scala/org/apache/pekko/remote/artery/tcp/ssl/X509Readers.scala
+++ b/remote/src/main/scala/org/apache/pekko/remote/artery/tcp/ssl/X509Readers.scala
@@ -42,7 +42,7 @@ private[pekko] object X509Readers {
       case list if list.size() == 2 && list.get(0) == 2 =>
         list.get(1) match {
           case dnsName: String => dnsName
-          case other =>
+          case other           =>
             throw new IllegalArgumentException(
               s"Error reading Subject Alternative Name, expected dns name to be a String, but instead got a ${other.getClass}")
         }
diff --git a/remote/src/main/scala/org/apache/pekko/remote/serialization/ActorRefResolveCache.scala b/remote/src/main/scala/org/apache/pekko/remote/serialization/ActorRefResolveCache.scala
index 880c479101..b4d61541a4 100644
--- a/remote/src/main/scala/org/apache/pekko/remote/serialization/ActorRefResolveCache.scala
+++ b/remote/src/main/scala/org/apache/pekko/remote/serialization/ActorRefResolveCache.scala
@@ -54,7 +54,7 @@ private[pekko] class ActorRefResolveThreadLocalCache(val system: ExtendedActorSy
 
   private val provider = system.provider match {
     case r: RemoteActorRefProvider => r
-    case _ =>
+    case _                         =>
       throw new IllegalArgumentException(
         "ActorRefResolveThreadLocalCache can only be used with RemoteActorRefProvider, " +
         s"not with ${system.provider.getClass}")
diff --git a/remote/src/main/scala/org/apache/pekko/remote/serialization/ArteryMessageSerializer.scala b/remote/src/main/scala/org/apache/pekko/remote/serialization/ArteryMessageSerializer.scala
index fc19989d0d..5fe8b53bd1 100644
--- a/remote/src/main/scala/org/apache/pekko/remote/serialization/ArteryMessageSerializer.scala
+++ b/remote/src/main/scala/org/apache/pekko/remote/serialization/ArteryMessageSerializer.scala
@@ -61,21 +61,21 @@ private[pekko] final class ArteryMessageSerializer(val system: ExtendedActorSyst
   private lazy val serialization = SerializationExtension(system)
 
   override def manifest(o: AnyRef): String = o match { // most frequent ones first
-    case _: SystemMessageDelivery.SystemMessageEnvelope               => SystemMessageEnvelopeManifest
-    case _: SystemMessageDelivery.Ack                                 => SystemMessageDeliveryAckManifest
-    case _: HandshakeReq                                              => HandshakeReqManifest
-    case _: HandshakeRsp                                              => HandshakeRspManifest
-    case _: RemoteWatcher.ArteryHeartbeat.type                        => ArteryHeartbeatManifest
-    case _: RemoteWatcher.ArteryHeartbeatRsp                          => ArteryHeartbeatRspManifest
-    case _: SystemMessageDelivery.Nack                                => SystemMessageDeliveryNackManifest
-    case _: Quarantined                                               => QuarantinedManifest
-    case Flush                                                        => FlushManifest
-    case _: FlushAck                                                  => FlushAckManifest
-    case _: ActorSystemTerminating                                    => ActorSystemTerminatingManifest
-    case _: ActorSystemTerminatingAck                                 => ActorSystemTerminatingAckManifest
-    case _: CompressionProtocol.ActorRefCompressionAdvertisement      => ActorRefCompressionAdvertisementManifest
-    case _: CompressionProtocol.ActorRefCompressionAdvertisementAck   => ActorRefCompressionAdvertisementAckManifest
-    case _: CompressionProtocol.ClassManifestCompressionAdvertisement => ClassManifestCompressionAdvertisementManifest
+    case _: SystemMessageDelivery.SystemMessageEnvelope                  => SystemMessageEnvelopeManifest
+    case _: SystemMessageDelivery.Ack                                    => SystemMessageDeliveryAckManifest
+    case _: HandshakeReq                                                 => HandshakeReqManifest
+    case _: HandshakeRsp                                                 => HandshakeRspManifest
+    case _: RemoteWatcher.ArteryHeartbeat.type                           => ArteryHeartbeatManifest
+    case _: RemoteWatcher.ArteryHeartbeatRsp                             => ArteryHeartbeatRspManifest
+    case _: SystemMessageDelivery.Nack                                   => SystemMessageDeliveryNackManifest
+    case _: Quarantined                                                  => QuarantinedManifest
+    case Flush                                                           => FlushManifest
+    case _: FlushAck                                                     => FlushAckManifest
+    case _: ActorSystemTerminating                                       => ActorSystemTerminatingManifest
+    case _: ActorSystemTerminatingAck                                    => ActorSystemTerminatingAckManifest
+    case _: CompressionProtocol.ActorRefCompressionAdvertisement         => ActorRefCompressionAdvertisementManifest
+    case _: CompressionProtocol.ActorRefCompressionAdvertisementAck      => ActorRefCompressionAdvertisementAckManifest
+    case _: CompressionProtocol.ClassManifestCompressionAdvertisement    => ClassManifestCompressionAdvertisementManifest
     case _: CompressionProtocol.ClassManifestCompressionAdvertisementAck =>
       ClassManifestCompressionAdvertisementAckManifest
     case _ =>
@@ -96,9 +96,9 @@ private[pekko] final class ArteryMessageSerializer(val system: ExtendedActorSyst
     case ActorSystemTerminating(from)                     => serializeWithAddress(from).toByteArray
     case ActorSystemTerminatingAck(from)                  => serializeWithAddress(from).toByteArray
     case adv: ActorRefCompressionAdvertisement            => serializeActorRefCompressionAdvertisement(adv).toByteArray
-    case ActorRefCompressionAdvertisementAck(from, id) =>
+    case ActorRefCompressionAdvertisementAck(from, id)    =>
       serializeCompressionTableAdvertisementAck(from, id).toByteArray
-    case adv: ClassManifestCompressionAdvertisement => serializeCompressionAdvertisement(adv)(identity).toByteArray
+    case adv: ClassManifestCompressionAdvertisement         => serializeCompressionAdvertisement(adv)(identity).toByteArray
     case ClassManifestCompressionAdvertisementAck(from, id) =>
       serializeCompressionTableAdvertisementAck(from, id).toByteArray
     case _ =>
@@ -107,19 +107,19 @@ private[pekko] final class ArteryMessageSerializer(val system: ExtendedActorSyst
 
   override def fromBinary(bytes: Array[Byte], manifest: String): AnyRef =
     manifest match { // most frequent ones first (could be made a HashMap in the future)
-      case SystemMessageEnvelopeManifest => deserializeSystemMessageEnvelope(bytes)
+      case SystemMessageEnvelopeManifest    => deserializeSystemMessageEnvelope(bytes)
       case SystemMessageDeliveryAckManifest =>
         deserializeSystemMessageDeliveryAck(bytes, SystemMessageDelivery.Ack.apply)
-      case HandshakeReqManifest => deserializeHandshakeReq(bytes, HandshakeReq.apply)
-      case HandshakeRspManifest => deserializeWithFromAddress(bytes, HandshakeRsp.apply)
+      case HandshakeReqManifest              => deserializeHandshakeReq(bytes, HandshakeReq.apply)
+      case HandshakeRspManifest              => deserializeWithFromAddress(bytes, HandshakeRsp.apply)
       case SystemMessageDeliveryNackManifest =>
         deserializeSystemMessageDeliveryAck(bytes, SystemMessageDelivery.Nack.apply)
-      case QuarantinedManifest                      => deserializeQuarantined(ArteryControlFormats.Quarantined.parseFrom(bytes))
-      case FlushManifest                            => Flush
-      case FlushAckManifest                         => deserializeFlushAck(bytes)
-      case ActorSystemTerminatingManifest           => deserializeWithFromAddress(bytes, ActorSystemTerminating.apply)
-      case ActorSystemTerminatingAckManifest        => deserializeWithFromAddress(bytes, ActorSystemTerminatingAck.apply)
-      case ActorRefCompressionAdvertisementManifest => deserializeActorRefCompressionAdvertisement(bytes)
+      case QuarantinedManifest                         => deserializeQuarantined(ArteryControlFormats.Quarantined.parseFrom(bytes))
+      case FlushManifest                               => Flush
+      case FlushAckManifest                            => deserializeFlushAck(bytes)
+      case ActorSystemTerminatingManifest              => deserializeWithFromAddress(bytes, ActorSystemTerminating.apply)
+      case ActorSystemTerminatingAckManifest           => deserializeWithFromAddress(bytes, ActorSystemTerminatingAck.apply)
+      case ActorRefCompressionAdvertisementManifest    => deserializeActorRefCompressionAdvertisement(bytes)
       case ActorRefCompressionAdvertisementAckManifest =>
         deserializeCompressionTableAdvertisementAck(bytes, ActorRefCompressionAdvertisementAck.apply)
       case ClassManifestCompressionAdvertisementManifest =>
@@ -128,7 +128,7 @@ private[pekko] final class ArteryMessageSerializer(val system: ExtendedActorSyst
         deserializeCompressionTableAdvertisementAck(bytes, ClassManifestCompressionAdvertisementAck.apply)
       case ArteryHeartbeatManifest    => RemoteWatcher.ArteryHeartbeat
       case ArteryHeartbeatRspManifest => deserializeArteryHeartbeatRsp(bytes, ArteryHeartbeatRsp.apply)
-      case _ =>
+      case _                          =>
         throw new NotSerializableException(
           s"Manifest '$manifest' not defined for ArteryControlMessageSerializer (serializer id $identifier)")
     }
diff --git a/remote/src/main/scala/org/apache/pekko/remote/serialization/MiscMessageSerializer.scala b/remote/src/main/scala/org/apache/pekko/remote/serialization/MiscMessageSerializer.scala
index 897f6e05ba..70c6c92591 100644
--- a/remote/src/main/scala/org/apache/pekko/remote/serialization/MiscMessageSerializer.scala
+++ b/remote/src/main/scala/org/apache/pekko/remote/serialization/MiscMessageSerializer.scala
@@ -425,7 +425,7 @@ class MiscMessageSerializer(val system: ExtendedActorSystem) extends SerializerW
   override def fromBinary(bytes: Array[Byte], manifest: String): AnyRef =
     fromBinaryMap.get(manifest) match {
       case Some(deserializer) => deserializer(bytes)
-      case None =>
+      case None               =>
         throw new NotSerializableException(
           s"Unimplemented deserialization of message with manifest [$manifest] in [${getClass.getName}]")
     }
diff --git a/remote/src/main/scala/org/apache/pekko/remote/serialization/ProtobufSerializer.scala b/remote/src/main/scala/org/apache/pekko/remote/serialization/ProtobufSerializer.scala
index d52f00d331..321fe9082c 100644
--- a/remote/src/main/scala/org/apache/pekko/remote/serialization/ProtobufSerializer.scala
+++ b/remote/src/main/scala/org/apache/pekko/remote/serialization/ProtobufSerializer.scala
@@ -79,7 +79,7 @@ class ProtobufSerializer(val system: ExtendedActorSystem) extends BaseSerializer
           val parsingMethodBinding = parsingMethodBindingRef.get()
           parsingMethodBinding.get(clazz) match {
             case Some(cachedParsingMethod) => cachedParsingMethod
-            case None =>
+            case None                      =>
               checkAllowedClass(clazz)
               val unCachedParsingMethod =
                 if (method eq null) clazz.getDeclaredMethod("parseFrom", ProtobufSerializer.ARRAY_OF_BYTE_ARRAY: _*)
@@ -106,7 +106,7 @@ class ProtobufSerializer(val system: ExtendedActorSystem) extends BaseSerializer
       val toByteArrayMethodBinding = toByteArrayMethodBindingRef.get()
       toByteArrayMethodBinding.get(clazz) match {
         case Some(cachedtoByteArrayMethod) => cachedtoByteArrayMethod
-        case None =>
+        case None                          =>
           val unCachedtoByteArrayMethod =
             if (method eq null) clazz.getMethod("toByteArray")
             else method
diff --git a/remote/src/main/scala/org/apache/pekko/remote/transport/AbstractTransportAdapter.scala b/remote/src/main/scala/org/apache/pekko/remote/transport/AbstractTransportAdapter.scala
index 75e4c2c74a..ba0d60d571 100644
--- a/remote/src/main/scala/org/apache/pekko/remote/transport/AbstractTransportAdapter.scala
+++ b/remote/src/main/scala/org/apache/pekko/remote/transport/AbstractTransportAdapter.scala
@@ -52,7 +52,7 @@ class TransportAdapters(system: ExtendedActorSystem) extends Extension {
 
   def getAdapterProvider(name: String): TransportAdapterProvider = adaptersTable.get(name) match {
     case Some(provider) => provider
-    case None =>
+    case None           =>
       throw new IllegalArgumentException(s"There is no registered transport adapter provider with name: [$name]")
   }
 }
diff --git a/remote/src/main/scala/org/apache/pekko/remote/transport/FailureInjectorTransportAdapter.scala b/remote/src/main/scala/org/apache/pekko/remote/transport/FailureInjectorTransportAdapter.scala
index cd3f730b7b..cb7a2ab8bd 100644
--- a/remote/src/main/scala/org/apache/pekko/remote/transport/FailureInjectorTransportAdapter.scala
+++ b/remote/src/main/scala/org/apache/pekko/remote/transport/FailureInjectorTransportAdapter.scala
@@ -128,7 +128,7 @@ private[remote] class FailureInjectorTransportAdapter(
 
   def notify(ev: AssociationEvent): Unit = ev match {
     case InboundAssociation(handle) if shouldDropInbound(handle.remoteAddress, ev, "notify") => // Ignore
-    case _ =>
+    case _                                                                                   =>
       upstreamListener match {
         case Some(listener) => listener.notify(interceptInboundAssociation(ev))
         case None           =>
@@ -142,7 +142,7 @@ private[remote] class FailureInjectorTransportAdapter(
 
   def shouldDropInbound(remoteAddress: Address, instance: Any, debugMessage: String): Boolean =
     chaosMode(remoteAddress) match {
-      case PassThru => false
+      case PassThru              => false
       case Drop(_, inboundDropP) =>
         if (rng.nextDouble() <= inboundDropP) {
           if (shouldDebugLog)
@@ -153,7 +153,7 @@ private[remote] class FailureInjectorTransportAdapter(
 
   def shouldDropOutbound(remoteAddress: Address, instance: Any, debugMessage: String): Boolean =
     chaosMode(remoteAddress) match {
-      case PassThru => false
+      case PassThru               => false
       case Drop(outboundDropP, _) =>
         if (rng.nextDouble() <= outboundDropP) {
           if (shouldDebugLog)
diff --git a/remote/src/main/scala/org/apache/pekko/remote/transport/PekkoPduCodec.scala b/remote/src/main/scala/org/apache/pekko/remote/transport/PekkoPduCodec.scala
index d203c6bbb0..c8420d6479 100644
--- a/remote/src/main/scala/org/apache/pekko/remote/transport/PekkoPduCodec.scala
+++ b/remote/src/main/scala/org/apache/pekko/remote/transport/PekkoPduCodec.scala
@@ -255,7 +255,7 @@ private[remote] object PekkoPduProtobufCodec extends PekkoPduCodec {
       case CommandType.DISASSOCIATE_SHUTTING_DOWN => Disassociate(AssociationHandle.Shutdown)
       case CommandType.DISASSOCIATE_QUARANTINED   => Disassociate(AssociationHandle.Quarantined)
       case CommandType.HEARTBEAT                  => Heartbeat
-      case x =>
+      case x                                      =>
         throw new PduCodecException(s"Decoding of control PDU failed, invalid format, unexpected: [$x]", null)
     }
   }
diff --git a/remote/src/main/scala/org/apache/pekko/remote/transport/PekkoProtocolTransport.scala b/remote/src/main/scala/org/apache/pekko/remote/transport/PekkoProtocolTransport.scala
index 7568d0b286..9982ce186b 100644
--- a/remote/src/main/scala/org/apache/pekko/remote/transport/PekkoProtocolTransport.scala
+++ b/remote/src/main/scala/org/apache/pekko/remote/transport/PekkoProtocolTransport.scala
@@ -583,7 +583,7 @@ private[remote] class ProtocolStateActor(
       val handle = stateData match {
         case ListenerReady(_, wrappedHandle)            => wrappedHandle
         case AssociatedWaitHandler(_, wrappedHandle, _) => wrappedHandle
-        case msg =>
+        case msg                                        =>
           throw new PekkoProtocolException(
             s"unhandled message in state Open(DisassociateUnderlying) with type [${safeClassName(msg)}]")
       }
@@ -692,8 +692,8 @@ private[remote] class ProtocolStateActor(
   }
 
   override protected def logTermination(reason: FSM.Reason): Unit = reason match {
-    case FSM.Failure(_: DisassociateInfo) => // no logging
-    case FSM.Failure(ForbiddenUidReason)  => // no logging
+    case FSM.Failure(_: DisassociateInfo)         => // no logging
+    case FSM.Failure(ForbiddenUidReason)          => // no logging
     case FSM.Failure(TimeoutReason(errorMessage)) =>
       log.info(errorMessage)
     case _ => super.logTermination(reason)
diff --git a/remote/src/main/scala/org/apache/pekko/remote/transport/ThrottlerTransportAdapter.scala b/remote/src/main/scala/org/apache/pekko/remote/transport/ThrottlerTransportAdapter.scala
index e22822e490..b054eeb950 100644
--- a/remote/src/main/scala/org/apache/pekko/remote/transport/ThrottlerTransportAdapter.scala
+++ b/remote/src/main/scala/org/apache/pekko/remote/transport/ThrottlerTransportAdapter.scala
@@ -637,7 +637,7 @@ private[transport] final case class ThrottlerHandle(_wrappedHandle: AssociationH
     }
 
     outboundThrottleMode.get match {
-      case Blackhole => true
+      case Blackhole  => true
       case bucket @ _ =>
         val success = tryConsume(outboundThrottleMode.get())
         if (success) wrappedHandle.write(payload) else false
diff --git a/remote/src/main/scala/org/apache/pekko/remote/transport/netty/NettyTransport.scala b/remote/src/main/scala/org/apache/pekko/remote/transport/netty/NettyTransport.scala
index 4548c7ff89..b39235e892 100644
--- a/remote/src/main/scala/org/apache/pekko/remote/transport/netty/NettyTransport.scala
+++ b/remote/src/main/scala/org/apache/pekko/remote/transport/netty/NettyTransport.scala
@@ -336,7 +336,7 @@ private[transport] object NettyTransport {
     case "unpooled-heap" => new UnpooledByteBufAllocator(false)
     case "adaptive"      => new AdaptiveByteBufAllocator()
     case "adaptive-heap" => new AdaptiveByteBufAllocator(false)
-    case other => throw new IllegalArgumentException(
+    case other           => throw new IllegalArgumentException(
         "Unknown 'bytebuf-allocator-type' [" + other + "]," +
         " supported values are 'pooled', 'unpooled', 'unpooled-heap', 'adaptive', 'adaptive-heap'.")
   }
@@ -540,7 +540,7 @@ class NettyTransport(val settings: NettyTransportSettings, val system: ExtendedA
             addressFromSocketAddress(newServerChannel.localAddress(), schemeIdentifier, system.name, None,
               None) match {
               case Some(address) => boundTo = address
-              case None =>
+              case None          =>
                 throw new NettyTransportException(
                   s"Unknown local address type [${newServerChannel.localAddress().getClass.getName}]")
             }
@@ -587,7 +587,7 @@ class NettyTransport(val settings: NettyTransportSettings, val system: ExtendedA
         handle <- readyChannel.pipeline().get(classOf[ClientHandler]).statusFuture
       } yield handle).recover {
         case _: CancellationException => throw new NettyTransportExceptionNoStack("Connection was cancelled")
-        case NonFatal(t) =>
+        case NonFatal(t)              =>
           val msg =
             if (t.getCause == null)
               t.getMessage
diff --git a/remote/src/test/scala/org/apache/pekko/remote/artery/TestContext.scala b/remote/src/test/scala/org/apache/pekko/remote/artery/TestContext.scala
index 4093116deb..bbbb2b8c17 100644
--- a/remote/src/test/scala/org/apache/pekko/remote/artery/TestContext.scala
+++ b/remote/src/test/scala/org/apache/pekko/remote/artery/TestContext.scala
@@ -96,7 +96,7 @@ private[remote] class TestOutboundContext(
     _associationState.completeUniqueRemoteAddress(peer)
     _associationState.uniqueRemoteAddress() match {
       case Some(`peer`) => // our value
-      case _ =>
+      case _            =>
         _associationState = _associationState.newIncarnation(peer)
     }
     Future.successful(Done)
diff --git a/remote/src/test/scala/org/apache/pekko/remote/classic/RemotingSpec.scala b/remote/src/test/scala/org/apache/pekko/remote/classic/RemotingSpec.scala
index e5ede514be..a85b28f0a9 100644
--- a/remote/src/test/scala/org/apache/pekko/remote/classic/RemotingSpec.scala
+++ b/remote/src/test/scala/org/apache/pekko/remote/classic/RemotingSpec.scala
@@ -586,7 +586,7 @@ class RemotingSpec extends PekkoSpec(RemotingSpec.cfg) with ImplicitSender with
         awaitCond(registry.transportsReady(rawLocalAddress))
         awaitCond {
           registry.transportFor(rawLocalAddress) match {
-            case None => false
+            case None                     => false
             case Some((testTransport, _)) =>
               testTransport.associateBehavior.pushError(new InvalidAssociationException("Test connection error"))
               true
diff --git a/remote/src/test/scala/org/apache/pekko/remote/classic/transport/PekkoProtocolStressTest.scala b/remote/src/test/scala/org/apache/pekko/remote/classic/transport/PekkoProtocolStressTest.scala
index bdf28f473c..9e0bf6bcea 100644
--- a/remote/src/test/scala/org/apache/pekko/remote/classic/transport/PekkoProtocolStressTest.scala
+++ b/remote/src/test/scala/org/apache/pekko/remote/classic/transport/PekkoProtocolStressTest.scala
@@ -67,7 +67,7 @@ object PekkoProtocolStressTest {
     var losses = 0
 
     def receive = {
-      case "start" => self ! "sendNext"
+      case "start"    => self ! "sendNext"
       case "sendNext" =>
         if (nextSeq < limit) {
           remote ! nextSeq
diff --git a/serialization-jackson/src/main/scala/org/apache/pekko/serialization/jackson/JacksonSerializer.scala b/serialization-jackson/src/main/scala/org/apache/pekko/serialization/jackson/JacksonSerializer.scala
index a400ba0de6..c7761f1660 100644
--- a/serialization-jackson/src/main/scala/org/apache/pekko/serialization/jackson/JacksonSerializer.scala
+++ b/serialization-jackson/src/main/scala/org/apache/pekko/serialization/jackson/JacksonSerializer.scala
@@ -193,7 +193,7 @@ import pekko.util.OptionVal
   private final val BufferSize = 1024 * 4
   private val compressionAlgorithm: Compression.Algoritm = {
     toRootLowerCase(conf.getString("compression.algorithm")) match {
-      case "off" => Compression.Off
+      case "off"  => Compression.Off
       case "gzip" =>
         val compressLargerThan = conf.getBytes("compression.compress-larger-than")
         Compression.GZip(compressLargerThan)
@@ -222,7 +222,7 @@ import pekko.util.OptionVal
   private val typeInManifest: Boolean = conf.getBoolean("type-in-manifest")
   // Calculated eagerly so as to fail fast
   private val configuredDeserializationType: Option[Class[_ <: AnyRef]] = conf.getString("deserialization-type") match {
-    case "" => None
+    case ""        => None
     case className =>
       system.dynamicAccess.getClassFor[AnyRef](className) match {
         case Success(c) => Some(c)
@@ -347,7 +347,7 @@ import pekko.util.OptionVal
     if (isCaseObject(className)) {
       val result = system.dynamicAccess.getObjectFor[AnyRef](className) match {
         case Success(obj) => obj
-        case Failure(_) =>
+        case Failure(_)   =>
           throw new NotSerializableException(
             s"Cannot find manifest case object [$className] for serializer [${getClass.getName}].")
       }
@@ -516,14 +516,14 @@ import pekko.util.OptionVal
     compressionAlgorithm match {
       case Compression.Off                                            => bytes
       case Compression.GZip(largerThan) if bytes.length <= largerThan => bytes
-      case Compression.GZip(_) =>
+      case Compression.GZip(_)                                        =>
         val bos = new ByteArrayOutputStream(BufferSize)
         val zip = new GZIPOutputStream(bos)
         try zip.write(bytes)
         finally zip.close()
         bos.toByteArray
       case Compression.LZ4(largerThan) if bytes.length <= largerThan => bytes
-      case Compression.LZ4(_) => {
+      case Compression.LZ4(_)                                        => {
         val meta = LZ4Meta(bytes)
         val compressed = lz4Compressor.compress(bytes)
         meta.prependTo(compressed)
@@ -539,7 +539,7 @@ import pekko.util.OptionVal
 
       @tailrec def readChunk(): Unit = in.read(buffer) match {
         case -1 => ()
-        case n =>
+        case n  =>
           out.write(buffer, 0, n)
           readChunk()
       }
diff --git a/serialization-jackson/src/test/scala/org/apache/pekko/serialization/jackson/JacksonSerializerSpec.scala b/serialization-jackson/src/test/scala/org/apache/pekko/serialization/jackson/JacksonSerializerSpec.scala
index 990bd28845..60fab76c93 100644
--- a/serialization-jackson/src/test/scala/org/apache/pekko/serialization/jackson/JacksonSerializerSpec.scala
+++ b/serialization-jackson/src/test/scala/org/apache/pekko/serialization/jackson/JacksonSerializerSpec.scala
@@ -821,7 +821,7 @@ abstract class JacksonSerializerSpec(serializerName: String)
   def serializerFor(obj: AnyRef, sys: ActorSystem = system): JacksonSerializer =
     serialization(sys).findSerializerFor(obj) match {
       case serializer: JacksonSerializer => serializer
-      case s =>
+      case s                             =>
         throw new IllegalStateException(s"Wrong serializer ${s.getClass} for ${obj.getClass}")
     }
 
diff --git a/stream-testkit/src/main/scala/org/apache/pekko/stream/testkit/StreamTestKit.scala b/stream-testkit/src/main/scala/org/apache/pekko/stream/testkit/StreamTestKit.scala
index 9486e0d11a..f33fd2b63d 100644
--- a/stream-testkit/src/main/scala/org/apache/pekko/stream/testkit/StreamTestKit.scala
+++ b/stream-testkit/src/main/scala/org/apache/pekko/stream/testkit/StreamTestKit.scala
@@ -382,7 +382,7 @@ object TestPublisher {
     }
 
     def expectCancellationWithCause[E <: Throwable: ClassTag](): E = subscription.expectCancellation() match {
-      case e: E => e
+      case e: E  => e
       case cause =>
         throw new AssertionError(
           s"Expected cancellation cause to be of type ${scala.reflect.classTag[E]} but was ${cause.getClass}: $cause")
@@ -604,7 +604,7 @@ object TestSubscriber {
       @annotation.tailrec
       def expectOneOf(all: immutable.Seq[I]): Unit = all match {
         case Nil =>
-        case _ =>
+        case _   =>
           val next = expectNext()
           assert(all.contains(next), s"expected one of $all, but received $next")
           expectOneOf(all.diff(Seq(next)))
diff --git a/stream-tests/src/test/scala/org/apache/pekko/stream/impl/SubInletOutletSpec.scala b/stream-tests/src/test/scala/org/apache/pekko/stream/impl/SubInletOutletSpec.scala
index 2afa00c555..6b2e440341 100644
--- a/stream-tests/src/test/scala/org/apache/pekko/stream/impl/SubInletOutletSpec.scala
+++ b/stream-tests/src/test/scala/org/apache/pekko/stream/impl/SubInletOutletSpec.scala
@@ -79,7 +79,7 @@ class SubInletOutletSpec extends StreamSpec {
                 case "completeStage" => completeStage()
                 case "cancelStage"   => cancelStage(NoMoreElementsNeeded)
                 case "failStage"     => failStage(TE("boom"))
-                case "closeAll" =>
+                case "closeAll"      =>
                   cancel(in)
                   complete(out)
                 case _ => // ignore
diff --git a/stream-tests/src/test/scala/org/apache/pekko/stream/impl/fusing/KeepGoingStageSpec.scala b/stream-tests/src/test/scala/org/apache/pekko/stream/impl/fusing/KeepGoingStageSpec.scala
index ff1f45d187..de33e57318 100644
--- a/stream-tests/src/test/scala/org/apache/pekko/stream/impl/fusing/KeepGoingStageSpec.scala
+++ b/stream-tests/src/test/scala/org/apache/pekko/stream/impl/fusing/KeepGoingStageSpec.scala
@@ -74,7 +74,7 @@ class KeepGoingStageSpec extends StreamSpec {
         private def onCommand(cmd: PingCmd): Unit = cmd match {
           case Register(probe) => listener = Some(probe)
           case Ping            => listener.foreach(_ ! Pong)
-          case CompleteStage =>
+          case CompleteStage   =>
             completeStage()
             listener.foreach(_ ! EndOfEventHandler)
           case FailStage =>
diff --git a/stream-tests/src/test/scala/org/apache/pekko/stream/io/DeprecatedTlsSpec.scala b/stream-tests/src/test/scala/org/apache/pekko/stream/io/DeprecatedTlsSpec.scala
index ef56dfffcc..a108b30457 100644
--- a/stream-tests/src/test/scala/org/apache/pekko/stream/io/DeprecatedTlsSpec.scala
+++ b/stream-tests/src/test/scala/org/apache/pekko/stream/io/DeprecatedTlsSpec.scala
@@ -205,7 +205,7 @@ class DeprecatedTlsSpec extends StreamSpec(DeprecatedTlsSpec.configOverrides) wi
           }
 
           {
-            case SessionTruncated => SendBytes(ByteString("TRUNCATED"))
+            case SessionTruncated                      => SendBytes(ByteString("TRUNCATED"))
             case SessionBytes(s, b) if session == null =>
               setSession(s)
               SendBytes(b)
@@ -337,7 +337,7 @@ class DeprecatedTlsSpec extends StreamSpec(DeprecatedTlsSpec.configOverrides) wi
       }
 
       {
-        case SessionTruncated => SendBytes(ByteString("TRUNCATED"))
+        case SessionTruncated                   => SendBytes(ByteString("TRUNCATED"))
         case SessionBytes(s, b) if s != session =>
           setSession(s)
           SendBytes(ByteString(s.getCipherSuite) ++ b)
diff --git a/stream-tests/src/test/scala/org/apache/pekko/stream/io/TlsSpec.scala b/stream-tests/src/test/scala/org/apache/pekko/stream/io/TlsSpec.scala
index 19de2f0a66..6c99b74bd9 100644
--- a/stream-tests/src/test/scala/org/apache/pekko/stream/io/TlsSpec.scala
+++ b/stream-tests/src/test/scala/org/apache/pekko/stream/io/TlsSpec.scala
@@ -239,7 +239,7 @@ class TlsSpec extends StreamSpec(TlsSpec.configOverrides) with WithLogCapturing
             }
 
             {
-              case SessionTruncated => SendBytes(ByteString("TRUNCATED"))
+              case SessionTruncated                      => SendBytes(ByteString("TRUNCATED"))
               case SessionBytes(s, b) if session == null =>
                 setSession(s)
                 SendBytes(b)
@@ -370,7 +370,7 @@ class TlsSpec extends StreamSpec(TlsSpec.configOverrides) with WithLogCapturing
         }
 
         {
-          case SessionTruncated => SendBytes(ByteString("TRUNCATED"))
+          case SessionTruncated                   => SendBytes(ByteString("TRUNCATED"))
           case SessionBytes(s, b) if s != session =>
             setSession(s)
             SendBytes(ByteString(s.getCipherSuite) ++ b)
diff --git a/stream-tests/src/test/scala/org/apache/pekko/stream/io/compression/CompressionTestingTools.scala b/stream-tests/src/test/scala/org/apache/pekko/stream/io/compression/CompressionTestingTools.scala
index be865d4f83..250f2f9379 100644
--- a/stream-tests/src/test/scala/org/apache/pekko/stream/io/compression/CompressionTestingTools.scala
+++ b/stream-tests/src/test/scala/org/apache/pekko/stream/io/compression/CompressionTestingTools.scala
@@ -33,7 +33,7 @@ object CompressionTestingTools {
     def awaitResult(atMost: Duration): T = {
       Await.ready(future, atMost)
       future.value.get match {
-        case Success(t) => t
+        case Success(t)  => t
         case Failure(ex) =>
           throw new RuntimeException(
             "Trying to await result of failed Future, see the cause for the original problem.",
diff --git a/stream-tests/src/test/scala/org/apache/pekko/stream/scaladsl/ActorRefBackpressureSourceSpec.scala b/stream-tests/src/test/scala/org/apache/pekko/stream/scaladsl/ActorRefBackpressureSourceSpec.scala
index 897a1f52a9..dfc1c004ac 100644
--- a/stream-tests/src/test/scala/org/apache/pekko/stream/scaladsl/ActorRefBackpressureSourceSpec.scala
+++ b/stream-tests/src/test/scala/org/apache/pekko/stream/scaladsl/ActorRefBackpressureSourceSpec.scala
@@ -74,8 +74,8 @@ class ActorRefBackpressureSourceSpec extends StreamSpec {
           s.expectComplete()
         else
           s.expectNextOrError() match {
-            case Right(`n`) => verifyNext(n + 1)
-            case Right(x)   => fail(s"expected $n, got $x")
+            case Right(`n`)                     => verifyNext(n + 1)
+            case Right(x)                       => fail(s"expected $n, got $x")
             case Left(e: IllegalStateException) =>
               e.getMessage shouldBe "Received new element before ack was signaled back"
             case Left(e) =>
diff --git a/stream-tests/src/test/scala/org/apache/pekko/stream/scaladsl/FlowFlatMapPrefixSpec.scala b/stream-tests/src/test/scala/org/apache/pekko/stream/scaladsl/FlowFlatMapPrefixSpec.scala
index e4aad06d15..99973d65d9 100644
--- a/stream-tests/src/test/scala/org/apache/pekko/stream/scaladsl/FlowFlatMapPrefixSpec.scala
+++ b/stream-tests/src/test/scala/org/apache/pekko/stream/scaladsl/FlowFlatMapPrefixSpec.scala
@@ -476,7 +476,7 @@ class FlowFlatMapPrefixSpec extends StreamSpec("pekko.loglevel = debug") {
         mat.shutdown()
 
         prefixF.failed.futureValue match {
-          case _: AbruptTerminationException =>
+          case _: AbruptTerminationException  =>
           case ex: NeverMaterializedException =>
             ex.getCause should not be null
             ex.getCause should be(a[AbruptTerminationException])
diff --git a/stream-tests/src/test/scala/org/apache/pekko/stream/scaladsl/FlowMapAsyncSpec.scala b/stream-tests/src/test/scala/org/apache/pekko/stream/scaladsl/FlowMapAsyncSpec.scala
index 9edee111d5..6ff1385e62 100644
--- a/stream-tests/src/test/scala/org/apache/pekko/stream/scaladsl/FlowMapAsyncSpec.scala
+++ b/stream-tests/src/test/scala/org/apache/pekko/stream/scaladsl/FlowMapAsyncSpec.scala
@@ -192,10 +192,10 @@ class FlowMapAsyncSpec extends StreamSpec {
       pf.success("f")
 
       probe.expectNextOrError() match {
-        case Left(ex) => ex.getMessage should ===("Boom at C") // fine, error can over-take elements
+        case Left(ex)   => ex.getMessage should ===("Boom at C") // fine, error can over-take elements
         case Right("A") =>
           probe.expectNextOrError() match {
-            case Left(ex) => ex.getMessage should ===("Boom at C") // fine, error can over-take elements
+            case Left(ex)   => ex.getMessage should ===("Boom at C") // fine, error can over-take elements
             case Right("B") =>
               probe.expectNextOrError() match {
                 case Left(ex)       => ex.getMessage should ===("Boom at C") // fine, error can over-take elements
diff --git a/stream-tests/src/test/scala/org/apache/pekko/stream/scaladsl/HubSpec.scala b/stream-tests/src/test/scala/org/apache/pekko/stream/scaladsl/HubSpec.scala
index e1a8ef77f3..c1eeaf3630 100644
--- a/stream-tests/src/test/scala/org/apache/pekko/stream/scaladsl/HubSpec.scala
+++ b/stream-tests/src/test/scala/org/apache/pekko/stream/scaladsl/HubSpec.scala
@@ -647,7 +647,7 @@ class HubSpec extends StreamSpec {
           (info, elem) => {
             sessions.get(elem) match {
               case Some(id) if info.consumerIds.exists(_ == id) => id
-              case _ =>
+              case _                                            =>
                 n += 1
                 val id = info.consumerIdByIdx((n % info.size).toInt)
                 sessions = sessions.updated(elem, id)
diff --git a/stream-tests/src/test/scala/org/apache/pekko/stream/scaladsl/StageActorRefSpec.scala b/stream-tests/src/test/scala/org/apache/pekko/stream/scaladsl/StageActorRefSpec.scala
index 4f35a4ec3e..372e98f3ea 100644
--- a/stream-tests/src/test/scala/org/apache/pekko/stream/scaladsl/StageActorRefSpec.scala
+++ b/stream-tests/src/test/scala/org/apache/pekko/stream/scaladsl/StageActorRefSpec.scala
@@ -219,7 +219,7 @@ object StageActorRefSpec {
             case (_, Add(n))                     => sum += n
             case (_, PullNow)                    => pull(in)
             case (sender, CallInitStageActorRef) => sender ! getStageActor(behavior).ref
-            case (_, BecomeStringEcho) =>
+            case (_, BecomeStringEcho)           =>
               getStageActor {
                 case (theSender, msg) => theSender ! msg.toString
               }
diff --git a/stream/src/main/scala/org/apache/pekko/stream/ActorMaterializer.scala b/stream/src/main/scala/org/apache/pekko/stream/ActorMaterializer.scala
index 02f6ff4751..21012b26aa 100644
--- a/stream/src/main/scala/org/apache/pekko/stream/ActorMaterializer.scala
+++ b/stream/src/main/scala/org/apache/pekko/stream/ActorMaterializer.scala
@@ -188,7 +188,7 @@ object ActorMaterializer {
       case s: ExtendedActorSystem => s
       case c: ActorContext        => c.system
       case null                   => throw new IllegalArgumentException("ActorRefFactory context must be defined")
-      case _ =>
+      case _                      =>
         throw new IllegalArgumentException(
           s"ActorRefFactory context must be an ActorSystem or ActorContext, got [${context.getClass.getName}]")
     }
@@ -209,7 +209,7 @@ private[pekko] object ActorMaterializerHelper {
   private[pekko] def downcast(materializer: Materializer): ActorMaterializer =
     materializer match {
       case m: ActorMaterializer => m
-      case _ =>
+      case _                    =>
         throw new IllegalArgumentException(
           s"required [${classOf[ActorMaterializer].getName}] " +
           s"but got [${materializer.getClass.getName}]")
diff --git a/stream/src/main/scala/org/apache/pekko/stream/Attributes.scala b/stream/src/main/scala/org/apache/pekko/stream/Attributes.scala
index a547de5ab8..483e913f7d 100644
--- a/stream/src/main/scala/org/apache/pekko/stream/Attributes.scala
+++ b/stream/src/main/scala/org/apache/pekko/stream/Attributes.scala
@@ -134,7 +134,7 @@ final case class Attributes(attributeList: List[Attributes.Attribute] = Nil) {
   def getMandatoryAttribute[T <: MandatoryAttribute](c: Class[T]): T = {
     @tailrec
     def find(list: List[Attribute]): OptionVal[Attribute] = list match {
-      case Nil => OptionVal.None
+      case Nil          => OptionVal.None
       case head :: tail =>
         if (c.isInstance(head)) OptionVal.Some(head)
         else find(tail)
@@ -325,9 +325,9 @@ object Attributes {
     lazy val locationName: String =
       try {
         val locationName = LineNumbers(lambda) match {
-          case LineNumbers.NoSourceInfo           => "unknown"
-          case LineNumbers.UnknownSourceFormat(_) => "unknown"
-          case LineNumbers.SourceFile(filename)   => filename
+          case LineNumbers.NoSourceInfo                       => "unknown"
+          case LineNumbers.UnknownSourceFormat(_)             => "unknown"
+          case LineNumbers.SourceFile(filename)               => filename
           case LineNumbers.SourceFileLines(filename, from, _) =>
             s"$filename:$from"
         }
diff --git a/stream/src/main/scala/org/apache/pekko/stream/MapAsyncPartitioned.scala b/stream/src/main/scala/org/apache/pekko/stream/MapAsyncPartitioned.scala
index 6bdbccbf8f..84b07a1c03 100644
--- a/stream/src/main/scala/org/apache/pekko/stream/MapAsyncPartitioned.scala
+++ b/stream/src/main/scala/org/apache/pekko/stream/MapAsyncPartitioned.scala
@@ -43,7 +43,7 @@ private[stream] object MapAsyncPartitioned {
     def supervisionDirectiveFor(decider: Supervision.Decider, ex: Throwable): Supervision.Directive = {
       cachedSupervisionDirective match {
         case OptionVal.Some(d) => d
-        case _ =>
+        case _                 =>
           val d = decider(ex)
           cachedSupervisionDirective = OptionVal.Some(d)
           d
@@ -109,7 +109,7 @@ private[stream] final class MapAsyncPartitioned[In, Out, Partition](
 
       private val futureCB = getAsyncCallback[Holder[In, Out]](holder =>
         holder.out match {
-          case Success(_) => pushNextIfPossible()
+          case Success(_)  => pushNextIfPossible()
           case Failure(ex) =>
             holder.supervisionDirectiveFor(decider, ex) match {
               // fail fast as if supervision says so
diff --git a/stream/src/main/scala/org/apache/pekko/stream/impl/ActorPublisher.scala b/stream/src/main/scala/org/apache/pekko/stream/impl/ActorPublisher.scala
index 22cac866ab..504ce57b39 100644
--- a/stream/src/main/scala/org/apache/pekko/stream/impl/ActorPublisher.scala
+++ b/stream/src/main/scala/org/apache/pekko/stream/impl/ActorPublisher.scala
@@ -97,7 +97,7 @@ import org.reactivestreams.Subscription
   private def reportSubscribeFailure(subscriber: Subscriber[_ >: T]): Unit =
     try shutdownReason match {
         case Some(_: SpecViolation) => // ok, not allowed to call onError
-        case Some(e) =>
+        case Some(e)                =>
           tryOnSubscribe(subscriber, CancelledSubscription)
           tryOnError(subscriber, e)
         case None =>
diff --git a/stream/src/main/scala/org/apache/pekko/stream/impl/ActorRefBackpressureSinkStage.scala b/stream/src/main/scala/org/apache/pekko/stream/impl/ActorRefBackpressureSinkStage.scala
index 47f3676638..1c1d1f0292 100644
--- a/stream/src/main/scala/org/apache/pekko/stream/impl/ActorRefBackpressureSinkStage.scala
+++ b/stream/src/main/scala/org/apache/pekko/stream/impl/ActorRefBackpressureSinkStage.scala
@@ -52,7 +52,7 @@ import pekko.stream.stage._
 
       private def receive(evt: (ActorRef, Any)): Unit = {
         evt._2 match {
-          case Terminated(`ref`) => completeStage()
+          case Terminated(`ref`)                                           => completeStage()
           case ackMsg if ackMessage.isEmpty || ackMessage.contains(ackMsg) =>
             if (buffer.isEmpty) {
               acknowledgementReceived = true
diff --git a/stream/src/main/scala/org/apache/pekko/stream/impl/BoundedSourceQueue.scala b/stream/src/main/scala/org/apache/pekko/stream/impl/BoundedSourceQueue.scala
index 5fd37481ea..00e27b54d9 100644
--- a/stream/src/main/scala/org/apache/pekko/stream/impl/BoundedSourceQueue.scala
+++ b/stream/src/main/scala/org/apache/pekko/stream/impl/BoundedSourceQueue.scala
@@ -154,7 +154,7 @@ import pekko.stream.stage.{ GraphStageLogic, GraphStageWithMaterializedValue, Ou
     def setDone(done: Done): Boolean =
       state.get() match {
         case _: Done => false
-        case x =>
+        case x       =>
           if (!state.compareAndSet(x, done)) setDone(done)
           else true
       }
diff --git a/stream/src/main/scala/org/apache/pekko/stream/impl/JsonObjectParser.scala b/stream/src/main/scala/org/apache/pekko/stream/impl/JsonObjectParser.scala
index e5b9c35b95..6f00d61caa 100644
--- a/stream/src/main/scala/org/apache/pekko/stream/impl/JsonObjectParser.scala
+++ b/stream/src/main/scala/org/apache/pekko/stream/impl/JsonObjectParser.scala
@@ -99,7 +99,7 @@ import pekko.util.ByteString
       else
         (pos: @switch) match {
           case -1 | 0 => None
-          case _ =>
+          case _      =>
             if (start == pos) None
             else {
               val res = ByteString.fromArrayUnsafe(buffer, start, pos - start)
diff --git a/stream/src/main/scala/org/apache/pekko/stream/impl/RetryFlowCoordinator.scala b/stream/src/main/scala/org/apache/pekko/stream/impl/RetryFlowCoordinator.scala
index da30ece161..10ba6ee18e 100644
--- a/stream/src/main/scala/org/apache/pekko/stream/impl/RetryFlowCoordinator.scala
+++ b/stream/src/main/scala/org/apache/pekko/stream/impl/RetryFlowCoordinator.scala
@@ -109,7 +109,7 @@ import pekko.util.OptionVal
           val result = grab(internalIn)
           elementInProgress match {
             case OptionVal.Some(_) if retryNo == maxRetries => pushExternal(result)
-            case OptionVal.Some(in) =>
+            case OptionVal.Some(in)                         =>
               decideRetry(in, result) match {
                 case None          => pushExternal(result)
                 case Some(element) => planRetry(element)
diff --git a/stream/src/main/scala/org/apache/pekko/stream/impl/StreamLayout.scala b/stream/src/main/scala/org/apache/pekko/stream/impl/StreamLayout.scala
index d1b3506f76..63174dd35b 100644
--- a/stream/src/main/scala/org/apache/pekko/stream/impl/StreamLayout.scala
+++ b/stream/src/main/scala/org/apache/pekko/stream/impl/StreamLayout.scala
@@ -523,7 +523,7 @@ import org.reactivestreams.Subscription
       case null | _: Publisher[_] =>
         mode match {
           case CancelTermination => subscribe(new CancellingSubscriber[T])
-          case WarnTermination =>
+          case WarnTermination   =>
             am.logger.warning("Subscription timeout for {}", this)
           case NoopTermination => // never happens
         }
diff --git a/stream/src/main/scala/org/apache/pekko/stream/impl/TraversalBuilder.scala b/stream/src/main/scala/org/apache/pekko/stream/impl/TraversalBuilder.scala
index 24410e0f6d..a568d2be84 100644
--- a/stream/src/main/scala/org/apache/pekko/stream/impl/TraversalBuilder.scala
+++ b/stream/src/main/scala/org/apache/pekko/stream/impl/TraversalBuilder.scala
@@ -296,15 +296,15 @@ import pekko.util.unused
       var nextStep: Traversal = EmptyTraversal
 
       current match {
-        case PushNotUsed          => prindent("push NotUsed")
-        case Pop                  => prindent("pop mat")
-        case _: Transform         => prindent("transform mat")
-        case Compose(_, false)    => prindent("compose mat")
-        case Compose(_, true)     => prindent("compose reversed mat")
-        case PushAttributes(attr) => prindent("push attr " + attr)
-        case PopAttributes        => prindent("pop attr")
-        case EnterIsland(tag)     => prindent("enter island " + tag)
-        case ExitIsland           => prindent("exit island")
+        case PushNotUsed                        => prindent("push NotUsed")
+        case Pop                                => prindent("pop mat")
+        case _: Transform                       => prindent("transform mat")
+        case Compose(_, false)                  => prindent("compose mat")
+        case Compose(_, true)                   => prindent("compose reversed mat")
+        case PushAttributes(attr)               => prindent("push attr " + attr)
+        case PopAttributes                      => prindent("pop attr")
+        case EnterIsland(tag)                   => prindent("enter island " + tag)
+        case ExitIsland                         => prindent("exit island")
         case MaterializeAtomic(mod, outToSlots) =>
           prindent("materialize " + mod + " " + outToSlots.mkString("[", ", ", "]"))
         case Concat(first, next) =>
@@ -356,7 +356,7 @@ import pekko.util.unused
   def getSingleSource[A >: Null](graph: Graph[SourceShape[A], _]): OptionVal[SingleSource[A]] = {
     graph match {
       case single: SingleSource[A] @unchecked => OptionVal.Some(single)
-      case _ =>
+      case _                                  =>
         graph.traversalBuilder match {
           case l: LinearTraversalBuilder =>
             l.pendingBuilder match {
@@ -396,7 +396,7 @@ import pekko.util.unused
     }
     graph match {
       case _ if isValuePresentedSource(graph) => OptionVal.Some(graph)
-      case _ =>
+      case _                                  =>
         graph.traversalBuilder match {
           case l: LinearTraversalBuilder =>
             l.pendingBuilder match {
@@ -1406,7 +1406,7 @@ import pekko.util.unused
   override def makeIsland(islandTag: IslandTag): TraversalBuilder = {
     this.islandTag match {
       case OptionVal.None => copy(islandTag = OptionVal(islandTag))
-      case _ =>
+      case _              =>
         this // Wrapping with an island, then immediately re-wrapping makes the second island empty, so can be omitted
     }
   }
diff --git a/stream/src/main/scala/org/apache/pekko/stream/impl/Unfold.scala b/stream/src/main/scala/org/apache/pekko/stream/impl/Unfold.scala
index b62c8c3ab1..c82325b303 100644
--- a/stream/src/main/scala/org/apache/pekko/stream/impl/Unfold.scala
+++ b/stream/src/main/scala/org/apache/pekko/stream/impl/Unfold.scala
@@ -110,7 +110,7 @@ private[pekko] final class UnfoldJava[S, E](s: S, f: function.Function[S, Option
         val future = f(state)
         future.value match {
           case Some(value) => handle(value)
-          case None =>
+          case None        =>
             future.onComplete(asyncHandler)(pekko.dispatch.ExecutionContexts.parasitic)
         }
       }
diff --git a/stream/src/main/scala/org/apache/pekko/stream/impl/fusing/ActorGraphInterpreter.scala b/stream/src/main/scala/org/apache/pekko/stream/impl/fusing/ActorGraphInterpreter.scala
index 588448ca61..3bac23547d 100644
--- a/stream/src/main/scala/org/apache/pekko/stream/impl/fusing/ActorGraphInterpreter.scala
+++ b/stream/src/main/scala/org/apache/pekko/stream/impl/fusing/ActorGraphInterpreter.scala
@@ -368,7 +368,7 @@ import org.reactivestreams.Subscription
     private def reportSubscribeFailure(subscriber: Subscriber[Any]): Unit =
       try shutdownReason match {
           case OptionVal.Some(_: SpecViolation) => // ok, not allowed to call onError
-          case OptionVal.Some(e) =>
+          case OptionVal.Some(e)                =>
             tryOnSubscribe(subscriber, CancelledSubscription)
             tryOnError(subscriber, e)
           case _ =>
@@ -771,7 +771,7 @@ import org.reactivestreams.Subscription
    */
   @tailrec private def finishShellRegistration(): Unit =
     newShells match {
-      case Nil => if (activeInterpreters.isEmpty) context.stop(self)
+      case Nil           => if (activeInterpreters.isEmpty) context.stop(self)
       case shell :: tail =>
         newShells = tail
         if (shell.isInitialized) {
@@ -796,7 +796,7 @@ import org.reactivestreams.Subscription
       shortCircuitBuffer.pollFirst() match {
         case b: BoundaryEvent => processEvent(b)
         case Resume           => finishShellRegistration()
-        case unexpected =>
+        case unexpected       =>
           throw new IllegalStateException(s"Unexpected element in short circuit buffer: '${unexpected.getClass}'")
       }
       shortCircuitBatch()
diff --git a/stream/src/main/scala/org/apache/pekko/stream/impl/fusing/CollectFirst.scala b/stream/src/main/scala/org/apache/pekko/stream/impl/fusing/CollectFirst.scala
index 0f58a65bc4..115791c246 100644
--- a/stream/src/main/scala/org/apache/pekko/stream/impl/fusing/CollectFirst.scala
+++ b/stream/src/main/scala/org/apache/pekko/stream/impl/fusing/CollectFirst.scala
@@ -53,7 +53,7 @@ private[pekko] final class CollectFirst[In, Out](pf: PartialFunction[In, Out]) e
           //   If you interest, you can check the associated PR for this change and the
           //   current implementation of `scala.collection.IterableOnceOps.collectFirst`.
           pf.applyOrElse(grab(in), NotApplied) match {
-            case _: NotApplied.type => pull(in)
+            case _: NotApplied.type   => pull(in)
             case elem: Out @unchecked =>
               push(out, elem)
               completeStage()
diff --git a/stream/src/main/scala/org/apache/pekko/stream/impl/fusing/FlatMapPrefix.scala b/stream/src/main/scala/org/apache/pekko/stream/impl/fusing/FlatMapPrefix.scala
index 1191e44eaf..4cce4491e1 100644
--- a/stream/src/main/scala/org/apache/pekko/stream/impl/fusing/FlatMapPrefix.scala
+++ b/stream/src/main/scala/org/apache/pekko/stream/impl/fusing/FlatMapPrefix.scala
@@ -66,7 +66,7 @@ import pekko.util.OptionVal
       override def onPush(): Unit = {
         subSource match {
           case OptionVal.Some(s) => s.push(grab(in))
-          case _ =>
+          case _                 =>
             builder += grab(in)
             left -= 1
             if (left == 0) {
@@ -114,7 +114,7 @@ import pekko.util.OptionVal
       override def onDownstreamFinish(cause: Throwable): Unit =
         subSink match {
           case OptionVal.Some(s) => s.cancel(cause)
-          case _ =>
+          case _                 =>
             if (propagateToNestedMaterialization) {
               downstreamCause = OptionVal.Some(cause)
               if (left == 0) {
diff --git a/stream/src/main/scala/org/apache/pekko/stream/impl/fusing/FlattenConcat.scala b/stream/src/main/scala/org/apache/pekko/stream/impl/fusing/FlattenConcat.scala
index 922f7d0b86..dfaae6d434 100644
--- a/stream/src/main/scala/org/apache/pekko/stream/impl/fusing/FlattenConcat.scala
+++ b/stream/src/main/scala/org/apache/pekko/stream/impl/fusing/FlattenConcat.scala
@@ -152,7 +152,7 @@ private[pekko] final class FlattenConcat[T, M](parallelism: Int)
             push(out, src.elem)
             removeSource()
           case src: InflightSource[T] @unchecked => pushOut(src)
-          case null => // queue is empty
+          case null                              => // queue is empty
             if (!hasBeenPulled(in)) {
               tryPull(in)
             } else if (isClosed(in)) {
@@ -279,14 +279,14 @@ private[pekko] final class FlattenConcat[T, M](parallelism: Int)
         TraversalBuilder.getValuePresentedSource(source) match {
           case OptionVal.Some(graph) =>
             graph match {
-              case single: SingleSource[T] @unchecked => addSource(single)
+              case single: SingleSource[T] @unchecked       => addSource(single)
               case futureSource: FutureSource[T] @unchecked =>
                 val future = futureSource.future
                 future.value match {
                   case Some(elem) => addCompletedFutureElem(elem)
                   case None       => addPendingFutureElem(future)
                 }
-              case iterable: IterableSource[T] @unchecked => addSourceElements(iterable.elements.iterator)
+              case iterable: IterableSource[T] @unchecked        => addSourceElements(iterable.elements.iterator)
               case javaStream: JavaStreamSource[T, _] @unchecked =>
                 import pekko.util.ccompat.JavaConverters._
                 addSourceElements(javaStream.open().iterator.asScala)
diff --git a/stream/src/main/scala/org/apache/pekko/stream/impl/fusing/IterableSource.scala b/stream/src/main/scala/org/apache/pekko/stream/impl/fusing/IterableSource.scala
index 801803e742..cfcd1c035f 100644
--- a/stream/src/main/scala/org/apache/pekko/stream/impl/fusing/IterableSource.scala
+++ b/stream/src/main/scala/org/apache/pekko/stream/impl/fusing/IterableSource.scala
@@ -51,8 +51,8 @@ private[pekko] final class IterableSource[T](val elements: immutable.Iterable[T]
         } catch {
           case NonFatal(ex) =>
             decider(ex) match {
-              case Supervision.Stop   => failStage(ex)
-              case Supervision.Resume => tryPushNextOrComplete()
+              case Supervision.Stop    => failStage(ex)
+              case Supervision.Resume  => tryPushNextOrComplete()
               case Supervision.Restart =>
                 currentIterator = elements.iterator
                 tryPushNextOrComplete()
diff --git a/stream/src/main/scala/org/apache/pekko/stream/impl/fusing/LazyFutureSource.scala b/stream/src/main/scala/org/apache/pekko/stream/impl/fusing/LazyFutureSource.scala
index 4e7f8df07e..23f48ec892 100644
--- a/stream/src/main/scala/org/apache/pekko/stream/impl/fusing/LazyFutureSource.scala
+++ b/stream/src/main/scala/org/apache/pekko/stream/impl/fusing/LazyFutureSource.scala
@@ -48,7 +48,7 @@ private[pekko] final class LazyFutureSource[T](f: () => Future[T]) extends Graph
         ReactiveStreamsCompliance.requireNonNullElement(future)
         future.value match {
           case Some(result) => handle(result)
-          case None =>
+          case None         =>
             val cb = getAsyncCallback[Try[T]](handle).invoke _
             future.onComplete(cb)(ExecutionContexts.parasitic)
         }
diff --git a/stream/src/main/scala/org/apache/pekko/stream/impl/fusing/MapConcat.scala b/stream/src/main/scala/org/apache/pekko/stream/impl/fusing/MapConcat.scala
index d77f02dee4..539168d103 100644
--- a/stream/src/main/scala/org/apache/pekko/stream/impl/fusing/MapConcat.scala
+++ b/stream/src/main/scala/org/apache/pekko/stream/impl/fusing/MapConcat.scala
@@ -73,7 +73,7 @@ private[pekko] final class MapConcat[In, Out](f: In => IterableOnce[Out])
         case NonFatal(ex) =>
           decider(ex) match {
             case Supervision.Stop => failStage(ex)
-            case _ =>
+            case _                =>
               if (isClosed(in)) completeStage()
               else if (!hasBeenPulled(in)) pull(in)
           }
diff --git a/stream/src/main/scala/org/apache/pekko/stream/impl/fusing/Ops.scala b/stream/src/main/scala/org/apache/pekko/stream/impl/fusing/Ops.scala
index d6cb9572b3..2245aa0236 100644
--- a/stream/src/main/scala/org/apache/pekko/stream/impl/fusing/Ops.scala
+++ b/stream/src/main/scala/org/apache/pekko/stream/impl/fusing/Ops.scala
@@ -299,7 +299,7 @@ private[stream] object Collect {
       @nowarn("msg=Any")
       override def onUpstreamFailure(ex: Throwable): Unit =
         try pf.applyOrElse(ex, NotApplied) match {
-            case _: NotApplied.type => failStage(ex)
+            case _: NotApplied.type   => failStage(ex)
             case result: T @unchecked => {
               if (isAvailable(out)) {
                 push(out, result)
@@ -452,8 +452,8 @@ private[stream] object Collect {
         } catch {
           case NonFatal(ex) =>
             decider(ex) match {
-              case Resume => if (!hasBeenPulled(in)) pull(in)
-              case Stop   => failStage(ex)
+              case Resume  => if (!hasBeenPulled(in)) pull(in)
+              case Stop    => failStage(ex)
               case Restart =>
                 aggregator = zero
                 push(out, aggregator)
@@ -528,8 +528,8 @@ private[stream] object Collect {
 
       private def doSupervision(t: Throwable): Unit = {
         decider(t) match {
-          case Supervision.Stop   => failStage(t)
-          case Supervision.Resume => safePull()
+          case Supervision.Stop    => failStage(t)
+          case Supervision.Resume  => safePull()
           case Supervision.Restart =>
             onRestart()
             safePull()
@@ -693,7 +693,7 @@ private[stream] object Collect {
 
         case other =>
           val ex = other match {
-            case Failure(t) => t
+            case Failure(t)    => t
             case Success(null) =>
               ReactiveStreamsCompliance.elementMustNotBeNullException
             case Success(_) =>
@@ -720,7 +720,7 @@ private[stream] object Collect {
           case NonFatal(ex) =>
             decider(ex) match {
               case Supervision.Stop => failStage(ex)
-              case supervision => {
+              case supervision      => {
                 supervision match {
                   case Supervision.Restart => onRestart(ex)
                   case _                   => () // just ignore on Resume
@@ -869,8 +869,8 @@ private[stream] object Collect {
           if (left >= 0) push(out, elem) else failStage(new StreamLimitReachedException(n))
         } catch {
           case NonFatal(ex) => decider(ex) match {
-              case Supervision.Stop   => failStage(ex)
-              case Supervision.Resume => if (!hasBeenPulled(in)) pull(in)
+              case Supervision.Stop    => failStage(ex)
+              case Supervision.Resume  => if (!hasBeenPulled(in)) pull(in)
               case Supervision.Restart =>
                 left = n
                 if (!hasBeenPulled(in)) pull(in)
@@ -1100,7 +1100,7 @@ private[stream] object Collect {
               decider(ex) match {
                 case Supervision.Stop    => failStage(ex)
                 case Supervision.Restart => restartState()
-                case Supervision.Resume =>
+                case Supervision.Resume  =>
                   pending = null.asInstanceOf[In]
               }
           }
@@ -1123,7 +1123,7 @@ private[stream] object Collect {
           } catch {
             case NonFatal(ex) =>
               decider(ex) match {
-                case Supervision.Stop => failStage(ex)
+                case Supervision.Stop    => failStage(ex)
                 case Supervision.Restart =>
                   restartState()
                 case Supervision.Resume =>
@@ -1138,7 +1138,7 @@ private[stream] object Collect {
           } catch {
             case NonFatal(ex) =>
               decider(ex) match {
-                case Supervision.Stop => failStage(ex)
+                case Supervision.Stop    => failStage(ex)
                 case Supervision.Restart =>
                   restartState()
                 case Supervision.Resume =>
@@ -1168,8 +1168,8 @@ private[stream] object Collect {
             } catch {
               case NonFatal(ex) =>
                 decider(ex) match {
-                  case Supervision.Stop   => failStage(ex)
-                  case Supervision.Resume =>
+                  case Supervision.Stop    => failStage(ex)
+                  case Supervision.Resume  =>
                   case Supervision.Restart =>
                     restartState()
                     if (!hasBeenPulled(in)) pull(in)
@@ -1267,7 +1267,7 @@ private[stream] object Collect {
     def supervisionDirectiveFor(decider: Supervision.Decider, ex: Throwable): Supervision.Directive = {
       cachedSupervisionDirective match {
         case OptionVal.Some(d) => d
-        case _ =>
+        case _                 =>
           val d = decider(ex)
           cachedSupervisionDirective = OptionVal.Some(d)
           d
@@ -1311,7 +1311,7 @@ private[stream] object Collect {
 
       private val futureCB = getAsyncCallback[Holder[Out]](holder =>
         holder.elem match {
-          case Success(_) => pushNextIfPossible()
+          case Success(_)  => pushNextIfPossible()
           case Failure(ex) =>
             holder.supervisionDirectiveFor(decider, ex) match {
               // fail fast as if supervision says so
@@ -1523,7 +1523,7 @@ private[stream] object Collect {
         logLevels = inheritedAttributes.get[LogLevels](DefaultLogLevels)
         log = logAdapter match {
           case Some(l) => l
-          case _ =>
+          case _       =>
             Logging(materializer.system, materializer)(fromMaterializer)
         }
       }
@@ -1550,7 +1550,7 @@ private[stream] object Collect {
         if (isEnabled(logLevels.onFailure))
           logLevels.onFailure match {
             case Logging.ErrorLevel => log.error(cause, "[{}] Upstream failed.", name)
-            case level =>
+            case level              =>
               log.log(
                 level,
                 "[{}] Upstream failed, cause: {}: {}",
@@ -1643,7 +1643,7 @@ private[stream] object Collect {
         logLevels = inheritedAttributes.get[LogLevels](DefaultLogLevels)
         log = logAdapter match {
           case Some(l) => l
-          case _ =>
+          case _       =>
             Logging.withMarker(materializer.system, materializer)(fromMaterializer)
         }
       }
@@ -1670,7 +1670,7 @@ private[stream] object Collect {
         if (isEnabled(logLevels.onFailure))
           logLevels.onFailure match {
             case Logging.ErrorLevel => log.error(cause, "[{}] Upstream failed.", name)
-            case level =>
+            case level              =>
               log.log(
                 level,
                 "[{}] Upstream failed, cause: {}: {}",
@@ -2135,7 +2135,7 @@ private[pekko] object TakeWithin {
         } catch {
           case NonFatal(ex) =>
             decider(ex) match {
-              case Supervision.Stop => failStage(ex)
+              case Supervision.Stop    => failStage(ex)
               case Supervision.Restart =>
                 aggregator = empty
                 setInitialInHandler()
@@ -2187,7 +2187,7 @@ private[pekko] object TakeWithin {
         import Collect.NotApplied
         if (maximumRetries < 0 || attempt < maximumRetries) {
           pf.applyOrElse(ex, NotApplied) match {
-            case _: NotApplied.type => failStage(ex)
+            case _: NotApplied.type                                                                               => failStage(ex)
             case source: Graph[SourceShape[T] @unchecked, M @unchecked] if TraversalBuilder.isEmptySource(source) =>
               completeStage()
             case source: Graph[SourceShape[T] @unchecked, M @unchecked] =>
@@ -2198,7 +2198,7 @@ private[pekko] object TakeWithin {
                     case futureSource: FutureSource[T @unchecked] => futureSource.future.value match {
                         case Some(Success(elem)) => emit(out, elem, () => completeStage())
                         case Some(Failure(ex))   => failStage(ex)
-                        case None =>
+                        case None                =>
                           switchTo(source)
                           attempt += 1
                       }
@@ -2403,7 +2403,7 @@ private[pekko] final class StatefulMapConcat[In, Out](val factory: StatefulMapCo
     private def handleException: Catcher[Unit] = {
       case NonFatal(ex) =>
         decider(ex) match {
-          case Supervision.Stop => failStage(ex)
+          case Supervision.Stop   => failStage(ex)
           case Supervision.Resume =>
             if (isClosed(in)) emitMaybeLastElementsAndComplete()
             else if (!hasBeenPulled(in)) pull(in)
diff --git a/stream/src/main/scala/org/apache/pekko/stream/impl/fusing/StreamOfStreams.scala b/stream/src/main/scala/org/apache/pekko/stream/impl/fusing/StreamOfStreams.scala
index 2195328ba5..e801bd485f 100644
--- a/stream/src/main/scala/org/apache/pekko/stream/impl/fusing/StreamOfStreams.scala
+++ b/stream/src/main/scala/org/apache/pekko/stream/impl/fusing/StreamOfStreams.scala
@@ -716,7 +716,7 @@ import pekko.util.ccompat.JavaConverters._
   private def dispatchCommand(newState: CommandScheduledBeforeMaterialization): Unit =
     status.get match {
       case /* Materialized */ callback: AsyncCallback[Command @unchecked] => callback.invoke(newState.command)
-      case Uninitialized =>
+      case Uninitialized                                                  =>
         if (!status.compareAndSet(Uninitialized, newState))
           dispatchCommand(newState) // changed to materialized in the meantime
 
@@ -805,7 +805,7 @@ import pekko.util.ccompat.JavaConverters._
 
   def completeSubstream(): Unit = status.get match {
     case f: AsyncCallback[Any] @unchecked => f.invoke(ActorSubscriberMessage.OnComplete)
-    case null =>
+    case null                             =>
       if (!status.compareAndSet(null, ActorSubscriberMessage.OnComplete))
         status.get.asInstanceOf[AsyncCallback[Any]].invoke(ActorSubscriberMessage.OnComplete)
     case OnError(_)                        => // already failed out, keep the exception as that happened first
@@ -815,7 +815,7 @@ import pekko.util.ccompat.JavaConverters._
 
   def failSubstream(ex: Throwable): Unit = status.get match {
     case f: AsyncCallback[Any] @unchecked => f.invoke(ActorSubscriberMessage.OnError(ex))
-    case null =>
+    case null                             =>
       val failure = ActorSubscriberMessage.OnError(ex)
       if (!status.compareAndSet(null, failure))
         status.get.asInstanceOf[AsyncCallback[Any]].invoke(failure)
@@ -845,7 +845,7 @@ import pekko.util.ccompat.JavaConverters._
         case null                               => if (!status.compareAndSet(null, cb)) setCB(cb)
         case ActorSubscriberMessage.OnComplete  => completeStage()
         case ActorSubscriberMessage.OnError(ex) => failStage(ex)
-        case _: AsyncCallback[_] =>
+        case _: AsyncCallback[_]                =>
           failStage(materializationException.getOrElse(createMaterializedTwiceException()))
         case _ => throw new RuntimeException() // won't happen, compiler exhaustiveness check pleaser
       }
diff --git a/stream/src/main/scala/org/apache/pekko/stream/impl/io/TLSActor.scala b/stream/src/main/scala/org/apache/pekko/stream/impl/io/TLSActor.scala
index 96139733b5..5b3dc7b9a1 100644
--- a/stream/src/main/scala/org/apache/pekko/stream/impl/io/TLSActor.scala
+++ b/stream/src/main/scala/org/apache/pekko/stream/impl/io/TLSActor.scala
@@ -109,8 +109,8 @@ import pekko.util.ByteString
       if (buffer.isEmpty) {
         buffer = inputBunch.dequeue(idx) match {
           // this class handles both UserIn and TransportIn
-          case bs: ByteString => bs
-          case SendBytes(bs)  => bs
+          case bs: ByteString         => bs
+          case SendBytes(bs)          => bs
           case n: NegotiateNewSession =>
             setNewSessionParameters(n)
             ByteString.empty
diff --git a/stream/src/main/scala/org/apache/pekko/stream/impl/io/TcpStages.scala b/stream/src/main/scala/org/apache/pekko/stream/impl/io/TcpStages.scala
index 2054d5392f..084536beeb 100644
--- a/stream/src/main/scala/org/apache/pekko/stream/impl/io/TcpStages.scala
+++ b/stream/src/main/scala/org/apache/pekko/stream/impl/io/TcpStages.scala
@@ -309,7 +309,7 @@ private[stream] object ConnectionSourceStage {
       val sender = evt._1
       val msg = evt._2
       msg match {
-        case Terminated(_) => fail(new StreamTcpException("The IO manager actor (TCP) has terminated. Stopping now."))
+        case Terminated(_)          => fail(new StreamTcpException("The IO manager actor (TCP) has terminated. Stopping now."))
         case f @ CommandFailed(cmd) =>
           fail(new StreamTcpException(s"Tcp command [$cmd] failed${f.causedByString}").initCause(f.cause.orNull))
         case c: Connected =>
@@ -380,7 +380,7 @@ private[stream] object ConnectionSourceStage {
           if (!isClosed(bytesIn) && !hasBeenPulled(bytesIn))
             pull(bytesIn)
 
-        case Terminated(_) => fail(new StreamTcpException("The connection actor has terminated. Stopping now."))
+        case Terminated(_)          => fail(new StreamTcpException("The connection actor has terminated. Stopping now."))
         case f @ CommandFailed(cmd) =>
           fail(new StreamTcpException(s"Tcp command [$cmd] failed${f.causedByString}").initCause(f.cause.orNull))
         case ErrorClosed(cause) => fail(new StreamTcpException(s"The connection closed with error: $cause"))
@@ -388,7 +388,7 @@ private[stream] object ConnectionSourceStage {
         case Closed             => completeStage()
         case ConfirmedClosed    => completeStage()
         case PeerClosed         => complete(bytesOut)
-        case other =>
+        case other              =>
           log.warning("Unexpected message to connected TcpStage: [{}]", other.getClass)
       }
     }
diff --git a/stream/src/main/scala/org/apache/pekko/stream/scaladsl/BidiFlow.scala b/stream/src/main/scala/org/apache/pekko/stream/scaladsl/BidiFlow.scala
index ece8f6c660..9b84b0af80 100644
--- a/stream/src/main/scala/org/apache/pekko/stream/scaladsl/BidiFlow.scala
+++ b/stream/src/main/scala/org/apache/pekko/stream/scaladsl/BidiFlow.scala
@@ -247,7 +247,7 @@ object BidiFlow {
     graph match {
       case bidi: BidiFlow[I1, O1, I2, O2, Mat]                    => bidi
       case bidi: javadsl.BidiFlow[I1, O1, I2, O2, Mat] @unchecked => bidi.asScala
-      case other =>
+      case other                                                  =>
         new BidiFlow(other.traversalBuilder, other.shape)
     }
 
diff --git a/stream/src/main/scala/org/apache/pekko/stream/scaladsl/Flow.scala b/stream/src/main/scala/org/apache/pekko/stream/scaladsl/Flow.scala
index 9d703b6d45..b1670f0e22 100755
--- a/stream/src/main/scala/org/apache/pekko/stream/scaladsl/Flow.scala
+++ b/stream/src/main/scala/org/apache/pekko/stream/scaladsl/Flow.scala
@@ -1482,7 +1482,7 @@ trait FlowOps[+Out, +Mat] {
       }
       .map {
         case e: S => e
-        case o =>
+        case o    =>
           throw new ClassCastException(
             s"'Flow.ask' failed: expected response of type [${tag.runtimeClass}], got [${o.getClass}]")
       }
@@ -3482,7 +3482,7 @@ trait FlowOps[+Out, +Mat] {
       segmentSize: Int,
       eagerClose: Boolean): Repr[U] = those match {
     case those if those.isEmpty => this.asInstanceOf[Repr[U]]
-    case _ =>
+    case _                      =>
       via(GraphDSL.create() { implicit b =>
         import GraphDSL.Implicits._
         val interleave = b.add(Interleave[U](those.size + 1, segmentSize, eagerClose))
@@ -3531,7 +3531,7 @@ trait FlowOps[+Out, +Mat] {
   def mergeAll[U >: Out](those: immutable.Seq[Graph[SourceShape[U], _]], eagerComplete: Boolean): Repr[U] =
     those match {
       case those if those.isEmpty => this.asInstanceOf[Repr[U]]
-      case _ =>
+      case _                      =>
         via(GraphDSL.create() { implicit b =>
           import GraphDSL.Implicits._
           val merge = b.add(Merge[U](those.size + 1, eagerComplete))
@@ -3735,7 +3735,7 @@ trait FlowOps[+Out, +Mat] {
   private def internalConcat[U >: Out, Mat2](that: Graph[SourceShape[U], Mat2], detached: Boolean): Repr[U] =
     that match {
       case source if TraversalBuilder.isEmptySource(source) => this.asInstanceOf[Repr[U]]
-      case other =>
+      case other                                            =>
         TraversalBuilder.getSingleSource(other) match {
           case OptionVal.Some(singleSource) =>
             via(new SingleConcat(singleSource.elem.asInstanceOf[U]))
@@ -3747,7 +3747,7 @@ trait FlowOps[+Out, +Mat] {
     those match {
       case those if those.isEmpty     => this.asInstanceOf[Repr[U]]
       case those if those.length == 1 => internalConcat(those.head, detached)
-      case _ =>
+      case _                          =>
         via(GraphDSL.create() { implicit b =>
           import GraphDSL.Implicits._
           val concat = b.add(Concat[U](those.length + 1, detached))
@@ -3919,7 +3919,7 @@ trait FlowOps[+Out, +Mat] {
    */
   def alsoToAll(those: Graph[SinkShape[Out], _]*): Repr[Out] = those match {
     case those if those.isEmpty => this.asInstanceOf[Repr[Out]]
-    case _ =>
+    case _                      =>
       via(GraphDSL.create() { implicit b =>
         import GraphDSL.Implicits._
         val bcast = b.add(Broadcast[Out](those.size + 1, eagerCancel = true))
diff --git a/stream/src/main/scala/org/apache/pekko/stream/scaladsl/Hub.scala b/stream/src/main/scala/org/apache/pekko/stream/scaladsl/Hub.scala
index a1043040ef..218c605c23 100644
--- a/stream/src/main/scala/org/apache/pekko/stream/scaladsl/Hub.scala
+++ b/stream/src/main/scala/org/apache/pekko/stream/scaladsl/Hub.scala
@@ -736,7 +736,7 @@ private[pekko] class BroadcastHub[T](startAfterNrOfConsumers: Int, bufferSize: I
       // Notify pending consumers and set tombstone
 
       @tailrec def tryClose(): Unit = state.get() match {
-        case Closed(_) => // Already closed, ignore
+        case Closed(_)  => // Already closed, ignore
         case open: Open =>
           if (state.compareAndSet(open, Closed(None))) {
             val completedMessage = HubCompleted(None)
@@ -814,8 +814,8 @@ private[pekko] class BroadcastHub[T](startAfterNrOfConsumers: Int, bufferSize: I
 
             @tailrec def register(): Unit = {
               logic.state.get() match {
-                case Closed(Some(ex)) => failStage(ex)
-                case Closed(None)     => completeStage()
+                case Closed(Some(ex))                                    => failStage(ex)
+                case Closed(None)                                        => completeStage()
                 case previousState @ Open(callbackFuture, registrations) =>
                   val newRegistrations = Consumer(id, callback) :: registrations
                   if (logic.state.compareAndSet(previousState, Open(callbackFuture, newRegistrations))) {
@@ -873,7 +873,7 @@ private[pekko] class BroadcastHub[T](startAfterNrOfConsumers: Int, bufferSize: I
           private def onCommand(cmd: ConsumerEvent): Unit = cmd match {
             case HubCompleted(Some(ex)) => failStage(ex)
             case HubCompleted(None)     => completeStage()
-            case Wakeup =>
+            case Wakeup                 =>
               if (isAvailable(out)) onPull()
             case Initialize(initialOffset) =>
               offsetInitialized = true
@@ -1258,7 +1258,7 @@ object PartitionHub {
 
     private def wakeup(id: Long): Unit = {
       needWakeup.get(id) match {
-        case None => // ignore
+        case None           => // ignore
         case Some(consumer) =>
           needWakeup -= id
           consumer.callback.invoke(Wakeup)
@@ -1347,7 +1347,7 @@ object PartitionHub {
       // Notify pending consumers and set tombstone
 
       @tailrec def tryClose(): Unit = state.get() match {
-        case Closed(_) => // Already closed, ignore
+        case Closed(_)  => // Already closed, ignore
         case open: Open =>
           if (state.compareAndSet(open, Closed(None))) {
             val completedMessage = HubCompleted(None)
@@ -1404,8 +1404,8 @@ object PartitionHub {
 
             @tailrec def register(): Unit = {
               logic.state.get() match {
-                case Closed(Some(ex)) => failStage(ex)
-                case Closed(None)     => completeStage()
+                case Closed(Some(ex))                                    => failStage(ex)
+                case Closed(None)                                        => completeStage()
                 case previousState @ Open(callbackFuture, registrations) =>
                   val newRegistrations = consumer :: registrations
                   if (logic.state.compareAndSet(previousState, Open(callbackFuture, newRegistrations))) {
@@ -1443,7 +1443,7 @@ object PartitionHub {
             cmd match {
               case HubCompleted(Some(ex)) => failStage(ex)
               case HubCompleted(None)     => completeStage()
-              case Wakeup =>
+              case Wakeup                 =>
                 if (isAvailable(out)) onPull()
               case Initialize =>
                 if (isAvailable(out) && (hubCallback ne null)) onPull()
diff --git a/stream/src/main/scala/org/apache/pekko/stream/scaladsl/Sink.scala b/stream/src/main/scala/org/apache/pekko/stream/scaladsl/Sink.scala
index 49a52e418d..af8ebd5ee0 100644
--- a/stream/src/main/scala/org/apache/pekko/stream/scaladsl/Sink.scala
+++ b/stream/src/main/scala/org/apache/pekko/stream/scaladsl/Sink.scala
@@ -379,7 +379,7 @@ object Sink {
     sinks match {
       case immutable.Seq()     => Sink.cancelled.mapMaterializedValue(_ => Nil)
       case immutable.Seq(sink) => sink.asInstanceOf[Sink[T, M]].mapMaterializedValue(_ :: Nil)
-      case _ =>
+      case _                   =>
         Sink.fromGraph(GraphDSL.create(sinks) { implicit b => shapes =>
           import GraphDSL.Implicits._
           val c = b.add(fanOutStrategy(sinks.size))
diff --git a/stream/src/main/scala/org/apache/pekko/stream/scaladsl/Source.scala b/stream/src/main/scala/org/apache/pekko/stream/scaladsl/Source.scala
index eb5d5283a6..33825f2ddf 100644
--- a/stream/src/main/scala/org/apache/pekko/stream/scaladsl/Source.scala
+++ b/stream/src/main/scala/org/apache/pekko/stream/scaladsl/Source.scala
@@ -857,7 +857,7 @@ object Source {
     sources match {
       case immutable.Seq()       => Source.empty.mapMaterializedValue(_ => Nil)
       case immutable.Seq(source) => source.asInstanceOf[Source[U, M]].mapMaterializedValue(_ :: Nil)
-      case _ =>
+      case _                     =>
         Source.fromGraph(GraphDSL.create(sources) { implicit b => shapes =>
           import GraphDSL.Implicits._
           val c = b.add(fanInStrategy(sources.size))
@@ -1083,7 +1083,7 @@ object Source {
     sourcesAndPriorities match {
       case immutable.Seq()            => Source.empty
       case immutable.Seq((source, _)) => source.mapMaterializedValue(_ => NotUsed)
-      case sourcesAndPriorities =>
+      case sourcesAndPriorities       =>
         val (sources, priorities) = sourcesAndPriorities.unzip
         combine(sources.head, sources(1), sources.drop(2): _*)(_ => MergePrioritized(priorities, eagerComplete))
     }
diff --git a/stream/src/main/scala/org/apache/pekko/stream/stage/GraphStage.scala b/stream/src/main/scala/org/apache/pekko/stream/stage/GraphStage.scala
index eb1fb6e001..c77b293077 100644
--- a/stream/src/main/scala/org/apache/pekko/stream/stage/GraphStage.scala
+++ b/stream/src/main/scala/org/apache/pekko/stream/stage/GraphStage.scala
@@ -217,7 +217,7 @@ object GraphStageLogic {
 
     private def cell = materializer.supervisor match {
       case ref: LocalActorRef => ref.underlying
-      case unknown =>
+      case unknown            =>
         throw new IllegalStateException(s"Stream supervisor must be a local actor, was [${unknown.getClass.getName}]")
     }
     private val functionRef: FunctionRef = {
@@ -716,8 +716,8 @@ abstract class GraphStageLogic private[stream] (val inCount: Int, val outCount:
     import Attributes.CancellationStrategy._
     import SubscriptionWithCancelException._
     strategy match {
-      case CompleteStage => internalCompleteStage(cause, OptionVal.None)
-      case FailStage     => internalCompleteStage(cause, OptionVal.Some(cause))
+      case CompleteStage    => internalCompleteStage(cause, OptionVal.None)
+      case FailStage        => internalCompleteStage(cause, OptionVal.Some(cause))
       case PropagateFailure =>
         cause match {
           case NoMoreElementsNeeded | StageWasCompleted => internalCompleteStage(cause, OptionVal.None)
diff --git a/testkit/src/main/scala/org/apache/pekko/testkit/TestActorRef.scala b/testkit/src/main/scala/org/apache/pekko/testkit/TestActorRef.scala
index 42d370dfc9..b12f13043f 100644
--- a/testkit/src/main/scala/org/apache/pekko/testkit/TestActorRef.scala
+++ b/testkit/src/main/scala/org/apache/pekko/testkit/TestActorRef.scala
@@ -34,14 +34,14 @@ import pekko.pattern.ask
 class TestActorRef[T <: Actor](_system: ActorSystem, _props: Props, _supervisor: ActorRef, name: String)
     extends LocalActorRef({
         val disregard = _supervisor match {
-          case l: LocalActorRef => l.underlying.reserveChild(name)
+          case l: LocalActorRef       => l.underlying.reserveChild(name)
           case r: RepointableActorRef =>
             r.underlying match {
               case _: UnstartedCell =>
                 throw new IllegalStateException(
                   "cannot attach a TestActor to an unstarted top-level actor, ensure that it is started by sending a message and observing the reply")
               case c: ActorCell => c.reserveChild(name)
-              case o =>
+              case o            =>
                 _system.log.error(
                   "trying to attach child {} to unknown type of supervisor cell {}, this is not going to end well",
                   name,
diff --git a/testkit/src/main/scala/org/apache/pekko/testkit/TestEventListener.scala b/testkit/src/main/scala/org/apache/pekko/testkit/TestEventListener.scala
index 0071d1cc6a..b19a79b0d6 100644
--- a/testkit/src/main/scala/org/apache/pekko/testkit/TestEventListener.scala
+++ b/testkit/src/main/scala/org/apache/pekko/testkit/TestEventListener.scala
@@ -564,9 +564,9 @@ class TestEventListener extends Logging.DefaultLogger {
       Seq(classOf[Mute], classOf[UnMute], classOf[DeadLetter], classOf[UnhandledMessage], classOf[Dropped])
         .foreach(bus.subscribe(context.self, _))
       sender() ! LoggerInitialized
-    case Mute(filters)   => filters.foreach(addFilter)
-    case UnMute(filters) => filters.foreach(removeFilter)
-    case event: LogEvent => if (!filter(event)) print(event)
+    case Mute(filters)             => filters.foreach(addFilter)
+    case UnMute(filters)           => filters.foreach(removeFilter)
+    case event: LogEvent           => if (!filter(event)) print(event)
     case DeadLetter(msg, snd, rcp) =>
       if (!msg.isInstanceOf[Terminate]) {
         val event = Warning(rcp.path.toString, rcp.getClass, msg)
diff --git a/testkit/src/main/scala/org/apache/pekko/testkit/TestKit.scala b/testkit/src/main/scala/org/apache/pekko/testkit/TestKit.scala
index 5c04c40a5a..56c0d26f62 100644
--- a/testkit/src/main/scala/org/apache/pekko/testkit/TestKit.scala
+++ b/testkit/src/main/scala/org/apache/pekko/testkit/TestKit.scala
@@ -129,7 +129,7 @@ class TestActor(queue: BlockingDeque[TestActor.Message]) extends Actor {
     case Watch(ref)          => context.watch(ref)
     case UnWatch(ref)        => context.unwatch(ref)
     case SetAutoPilot(pilot) => autopilot = pilot
-    case spawn: Spawn =>
+    case spawn: Spawn        =>
       val actor = spawn(context)
       for (s <- spawn.strategy) supervisorStrategy(actor) = s
       queue.offerLast(RealMessage(actor, self))
diff --git a/testkit/src/main/scala/org/apache/pekko/testkit/javadsl/TestKit.scala b/testkit/src/main/scala/org/apache/pekko/testkit/javadsl/TestKit.scala
index b295655bd3..aa352257d8 100644
--- a/testkit/src/main/scala/org/apache/pekko/testkit/javadsl/TestKit.scala
+++ b/testkit/src/main/scala/org/apache/pekko/testkit/javadsl/TestKit.scala
@@ -71,7 +71,7 @@ class TestKit(system: ActorSystem) {
   def duration(s: String): FiniteDuration = {
     Duration.apply(s) match {
       case fd: FiniteDuration => fd
-      case _ =>
+      case _                  =>
         throw new IllegalArgumentException("duration() is only for finite durations, use Duration.Inf() and friends")
     }
   }
diff --git a/testkit/src/test/scala/org/apache/pekko/testkit/CoronerSpec.scala b/testkit/src/test/scala/org/apache/pekko/testkit/CoronerSpec.scala
index 5e0d1111a8..38fe331460 100644
--- a/testkit/src/test/scala/org/apache/pekko/testkit/CoronerSpec.scala
+++ b/testkit/src/test/scala/org/apache/pekko/testkit/CoronerSpec.scala
@@ -88,7 +88,7 @@ class CoronerSpec extends AnyWordSpec with Matchers {
 
             def recursiveLock(locks: List[ReentrantLock]): Unit = {
               locks match {
-                case Nil => ()
+                case Nil          => ()
                 case lock :: rest => {
                   ready.release()
                   proceed.acquire()
diff --git a/testkit/src/test/scala/org/apache/pekko/testkit/TestActorRefSpec.scala b/testkit/src/test/scala/org/apache/pekko/testkit/TestActorRefSpec.scala
index d69615bb3e..bacbf571f7 100644
--- a/testkit/src/test/scala/org/apache/pekko/testkit/TestActorRefSpec.scala
+++ b/testkit/src/test/scala/org/apache/pekko/testkit/TestActorRefSpec.scala
@@ -80,9 +80,9 @@ object TestActorRefSpec {
   class SenderActor(replyActor: ActorRef) extends TActor {
 
     def receiveT = {
-      case "complex"  => replyActor ! "complexRequest"
-      case "complex2" => replyActor ! "complexRequest2"
-      case "simple"   => replyActor ! "simpleRequest"
+      case "complex"      => replyActor ! "complexRequest"
+      case "complex2"     => replyActor ! "complexRequest2"
+      case "simple"       => replyActor ! "simpleRequest"
       case "complexReply" => {
         counter -= 1
       }
diff --git a/testkit/src/test/scala/org/apache/pekko/testkit/metrics/MetricsKit.scala b/testkit/src/test/scala/org/apache/pekko/testkit/metrics/MetricsKit.scala
index 4fccefcf1b..25766d341f 100644
--- a/testkit/src/test/scala/org/apache/pekko/testkit/metrics/MetricsKit.scala
+++ b/testkit/src/test/scala/org/apache/pekko/testkit/metrics/MetricsKit.scala
@@ -164,7 +164,7 @@ private[pekko] trait MetricsKit extends MetricsKitOps {
     import pekko.util.ccompat.JavaConverters._
     registry.getMetrics.asScala.find(_._1 == key).map(_._2) match {
       case Some(existing: M) => existing
-      case Some(_) =>
+      case Some(_)           =>
         throw new IllegalArgumentException(
           "Key: [%s] is already for different kind of metric! Was [%s], expected [%s]"
             .format(key, metric.getClass.getSimpleName, tag.runtimeClass.getSimpleName))


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@pekko.apache.org
For additional commands, e-mail: commits-help@pekko.apache.org