You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pekko.apache.org by md...@apache.org on 2022/11/05 14:01:09 UTC
[incubator-pekko] branch main updated (a8ee7c4239 -> 15b163da74)
This is an automated email from the ASF dual-hosted git repository.
mdedetrich pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/incubator-pekko.git
from a8ee7c4239 remove mima checks (#13)
new b79cee657b Update scalafmt
new 0e876025e8 Add .gitattributes to enforce unix line endings
new 15b163da74 format source with scalafmt, #2
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.gitattributes | 5 +
.scalafmt.conf | 61 +++--
.../testkit/typed/internal/ActorSystemStub.scala | 2 +-
.../typed/internal/BehaviorTestKitImpl.scala | 10 +-
.../typed/internal/StubbedActorContext.scala | 13 +-
.../testkit/typed/internal/TestProbeImpl.scala | 5 +-
.../typed/javadsl/TestKitJunitResource.scala | 4 +-
.../testkit/typed/scaladsl/ActorTestKit.scala | 4 +-
.../actor/testkit/typed/scaladsl/package.scala | 1 -
.../testkit/typed/scaladsl/ActorTestKitSpec.scala | 6 +-
.../typed/scaladsl/BehaviorTestKitSpec.scala | 18 +-
.../testkit/typed/scaladsl/TestAppenderSpec.scala | 4 +-
.../testkit/typed/scaladsl/TestProbeSpec.scala | 4 +-
.../typed/scaladsl/AsyncTestingExampleSpec.scala | 34 +--
.../typed/scaladsl/ManualTimerExampleSpec.scala | 4 +-
.../typed/scaladsl/SyncTestingExampleSpec.scala | 32 +--
.../testkit/typed/scaladsl/TestConfigExample.scala | 12 +-
.../src/test/scala/akka/AkkaExceptionSpec.scala | 6 +-
.../test/scala/akka/actor/ActorLifeCycleSpec.scala | 8 +-
.../src/test/scala/akka/actor/ActorRefSpec.scala | 58 ++---
.../test/scala/akka/actor/ActorSelectionSpec.scala | 27 +-
.../test/scala/akka/actor/ActorSystemSpec.scala | 24 +-
.../test/scala/akka/actor/ActorTimeoutSpec.scala | 2 +-
.../test/scala/akka/actor/ConsistencySpec.scala | 6 +-
.../scala/akka/actor/CoordinatedShutdownSpec.scala | 20 +-
.../src/test/scala/akka/actor/DeathWatchSpec.scala | 6 +-
.../test/scala/akka/actor/DynamicAccessSpec.scala | 3 +-
.../src/test/scala/akka/actor/FSMActorSpec.scala | 2 +-
.../src/test/scala/akka/actor/HotSwapSpec.scala | 16 +-
.../akka/actor/LocalActorRefProviderSpec.scala | 18 +-
.../scala/akka/actor/ProviderSelectionSpec.scala | 2 +-
.../src/test/scala/akka/actor/SchedulerSpec.scala | 79 +++---
.../scala/akka/actor/SupervisorHierarchySpec.scala | 55 ++--
.../src/test/scala/akka/actor/SupervisorSpec.scala | 22 +-
.../src/test/scala/akka/actor/Ticket669Spec.scala | 2 +-
.../src/test/scala/akka/actor/TypedActorSpec.scala | 14 +-
.../src/test/scala/akka/actor/UidClashTest.scala | 2 +-
.../scala/akka/actor/dispatch/ActorModelSpec.scala | 8 +-
.../akka/actor/dispatch/DispatchersSpec.scala | 2 +-
.../src/test/scala/akka/config/ConfigSpec.scala | 8 +-
.../scala/akka/dispatch/ExecutionContextSpec.scala | 10 +-
.../scala/akka/dispatch/MailboxConfigSpec.scala | 20 +-
.../akka/dispatch/PriorityDispatcherSpec.scala | 10 +-
.../dispatch/StablePriorityDispatcherSpec.scala | 10 +-
.../src/test/scala/akka/event/EventBusSpec.scala | 4 +-
.../test/scala/akka/event/EventStreamSpec.scala | 12 +-
.../src/test/scala/akka/event/LoggerSpec.scala | 4 +-
.../test/scala/akka/event/LoggingReceiveSpec.scala | 7 +-
.../test/scala/akka/event/jul/JavaLoggerSpec.scala | 12 +-
.../src/test/scala/akka/io/TcpConnectionSpec.scala | 41 +--
.../scala/akka/io/TcpIntegrationSpecSupport.scala | 2 +-
.../io/dns/AsyncDnsResolverIntegrationSpec.scala | 4 +-
.../io/dns/internal/AsyncDnsResolverSpec.scala | 7 +-
.../src/test/scala/akka/pattern/AskSpec.scala | 48 ++--
.../pattern/BackoffOnRestartSupervisorSpec.scala | 6 +-
.../scala/akka/pattern/BackoffSupervisorSpec.scala | 2 +-
.../scala/akka/pattern/CircuitBreakerMTSpec.scala | 6 +-
.../scala/akka/pattern/CircuitBreakerSpec.scala | 6 +-
.../src/test/scala/akka/pattern/RetrySpec.scala | 13 +-
.../akka/pattern/extended/ExplicitAskSpec.scala | 8 +-
.../akka/routing/MetricsBasedResizerSpec.scala | 12 +-
.../src/test/scala/akka/routing/RandomSpec.scala | 44 ++--
.../src/test/scala/akka/routing/ResizerSpec.scala | 10 +-
.../test/scala/akka/routing/RoundRobinSpec.scala | 54 ++--
.../src/test/scala/akka/routing/RoutingSpec.scala | 8 +-
.../routing/ScatterGatherFirstCompletedSpec.scala | 6 +-
.../scala/akka/routing/SmallestMailboxSpec.scala | 8 +-
.../test/scala/akka/routing/TailChoppingSpec.scala | 22 +-
.../scala/akka/util/BoundedBlockingQueueSpec.scala | 6 +-
.../src/test/scala/akka/util/ByteStringSpec.scala | 36 +--
.../test/scala/akka/util/FrequencyListSpec.scala | 104 ++++----
.../src/test/scala/akka/util/IndexSpec.scala | 22 +-
.../test/scala/akka/actor/typed/BehaviorSpec.scala | 22 +-
.../test/scala/akka/actor/typed/DeferredSpec.scala | 9 +-
.../scala/akka/actor/typed/InterceptSpec.scala | 9 +-
.../akka/actor/typed/MailboxSelectorSpec.scala | 16 +-
.../test/scala/akka/actor/typed/WatchSpec.scala | 16 +-
.../akka/actor/typed/delivery/TestConsumer.scala | 3 +-
.../actor/typed/internal/ActorSystemSpec.scala | 27 +-
.../typed/javadsl/AdaptationFailureSpec.scala | 9 +-
.../actor/typed/scaladsl/ActorContextAskSpec.scala | 6 +-
.../actor/typed/scaladsl/ActorLoggingSpec.scala | 31 ++-
.../actor/typed/scaladsl/GracefulStopSpec.scala | 16 +-
.../actor/typed/scaladsl/MessageAdapterSpec.scala | 6 +-
.../akka/actor/typed/scaladsl/OnSignalSpec.scala | 4 +-
.../actor/typed/scaladsl/adapter/AdapterSpec.scala | 12 +-
.../scala/docs/akka/typed/AggregatorSpec.scala | 4 +-
.../scala/docs/akka/typed/DispatchersDocSpec.scala | 4 +-
.../test/scala/docs/akka/typed/FSMDocSpec.scala | 20 +-
.../docs/akka/typed/GracefulStopDocSpec.scala | 20 +-
.../docs/akka/typed/InteractionPatternsSpec.scala | 8 +-
.../src/test/scala/docs/akka/typed/IntroSpec.scala | 44 ++--
.../scala/docs/akka/typed/LoggingDocExamples.scala | 42 +--
.../test/scala/docs/akka/typed/OOIntroSpec.scala | 32 +--
.../test/scala/docs/akka/typed/RouterSpec.scala | 18 +-
.../docs/akka/typed/SpawnProtocolDocSpec.scala | 8 +-
.../docs/akka/typed/StyleGuideDocExamples.scala | 104 ++++----
.../coexistence/ClassicWatchingTypedSpec.scala | 16 +-
.../coexistence/TypedWatchingClassicSpec.scala | 12 +-
.../akka/typed/extensions/ExtensionDocSpec.scala | 4 +-
.../akka/typed/fromclassic/ClassicSample.scala | 6 +-
.../docs/akka/typed/fromclassic/TypedSample.scala | 8 +-
.../typed/supervision/SupervisionCompileOnly.scala | 36 +--
.../main/scala/akka/actor/typed/ActorSystem.scala | 2 +-
.../src/main/scala/akka/actor/typed/Behavior.scala | 1 -
.../main/scala/akka/actor/typed/Scheduler.scala | 3 -
.../delivery/internal/ProducerControllerImpl.scala | 6 +-
.../WorkPullingProducerControllerImpl.scala | 5 +-
.../akka/actor/typed/eventstream/EventStream.scala | 1 -
.../actor/typed/internal/ActorContextImpl.scala | 2 +-
.../akka/actor/typed/internal/ExtensionsImpl.scala | 12 +-
.../actor/typed/internal/InterceptorImpl.scala | 3 +-
.../actor/typed/internal/StashBufferImpl.scala | 15 +-
.../akka/actor/typed/internal/Supervision.scala | 29 ++-
.../akka/actor/typed/internal/SystemMessage.scala | 4 -
.../actor/typed/internal/TimerSchedulerImpl.scala | 2 +-
.../typed/internal/adapter/ActorAdapter.scala | 78 +++---
.../internal/receptionist/LocalReceptionist.scala | 13 +-
.../typed/internal/routing/RoutingLogic.scala | 4 +-
.../akka/actor/typed/javadsl/AskPattern.scala | 5 +-
.../scala/akka/actor/typed/javadsl/Behaviors.scala | 12 +-
.../scala/akka/actor/typed/javadsl/Receive.scala | 1 -
.../akka/actor/typed/javadsl/ReceiveBuilder.scala | 26 +-
.../akka/actor/typed/javadsl/StashBuffer.scala | 2 +-
.../actor/typed/scaladsl/AbstractBehavior.scala | 10 +-
.../akka/actor/typed/scaladsl/Behaviors.scala | 3 -
.../scala/akka/actor/typed/scaladsl/package.scala | 2 +-
.../main/scala-2.12/akka/util/ByteIterator.scala | 64 ++---
.../src/main/scala-2.12/akka/util/ByteString.scala | 4 +-
.../scala-2.12/akka/util/ccompat/package.scala | 6 +-
.../main/scala-2.13/akka/util/ByteIterator.scala | 64 ++---
.../src/main/scala-2.13/akka/util/ByteString.scala | 4 +-
.../src/main/scala-3/akka/util/ByteIterator.scala | 64 ++---
.../src/main/scala-3/akka/util/ByteString.scala | 4 +-
akka-actor/src/main/scala/akka/AkkaVersion.scala | 4 +-
.../src/main/scala/akka/actor/AbstractActor.scala | 5 -
.../src/main/scala/akka/actor/AbstractFSM.scala | 4 -
.../src/main/scala/akka/actor/AbstractProps.scala | 3 +-
akka-actor/src/main/scala/akka/actor/Actor.scala | 26 +-
.../src/main/scala/akka/actor/ActorCell.scala | 19 +-
.../src/main/scala/akka/actor/ActorPath.scala | 16 +-
.../src/main/scala/akka/actor/ActorRef.scala | 6 +-
.../main/scala/akka/actor/ActorRefProvider.scala | 2 +-
.../src/main/scala/akka/actor/ActorSelection.scala | 5 +-
.../src/main/scala/akka/actor/ActorSystem.scala | 100 +++----
akka-actor/src/main/scala/akka/actor/Address.scala | 3 +-
.../scala/akka/actor/CoordinatedShutdown.scala | 35 +--
.../src/main/scala/akka/actor/Deployer.scala | 2 +-
.../src/main/scala/akka/actor/Extension.scala | 2 -
.../src/main/scala/akka/actor/FaultHandling.scala | 16 +-
.../akka/actor/LightArrayRevolverScheduler.scala | 65 ++---
.../scala/akka/actor/ReflectiveDynamicAccess.scala | 4 +-
.../src/main/scala/akka/actor/Scheduler.scala | 72 +++---
akka-actor/src/main/scala/akka/actor/Stash.scala | 11 +-
.../src/main/scala/akka/actor/TypedActor.scala | 43 ++-
.../main/scala/akka/actor/dungeon/Children.scala | 27 +-
.../akka/actor/dungeon/ChildrenContainer.scala | 3 +-
.../main/scala/akka/actor/dungeon/DeathWatch.scala | 6 +-
.../main/scala/akka/actor/dungeon/Dispatch.scala | 14 +-
.../scala/akka/actor/dungeon/FaultHandling.scala | 121 +++++----
.../scala/akka/actor/dungeon/ReceiveTimeout.scala | 2 +-
.../scala/akka/dispatch/AbstractDispatcher.scala | 23 +-
.../scala/akka/dispatch/BalancingDispatcher.scala | 14 +-
.../scala/akka/dispatch/BatchingExecutor.scala | 2 +-
.../src/main/scala/akka/dispatch/Dispatcher.scala | 4 +-
.../src/main/scala/akka/dispatch/Future.scala | 2 +-
.../src/main/scala/akka/dispatch/Mailbox.scala | 45 ++--
.../src/main/scala/akka/dispatch/Mailboxes.scala | 2 +-
.../scala/akka/dispatch/PinnedDispatcher.scala | 4 +-
.../akka/dispatch/affinity/AffinityPool.scala | 3 +-
.../scala/akka/dispatch/sysmsg/SystemMessage.scala | 4 -
.../src/main/scala/akka/event/EventBus.scala | 13 +-
akka-actor/src/main/scala/akka/event/Logging.scala | 36 +--
.../src/main/scala/akka/event/LoggingReceive.scala | 2 +-
.../main/scala/akka/io/DirectByteBufferPool.scala | 7 +-
akka-actor/src/main/scala/akka/io/Dns.scala | 9 +-
.../src/main/scala/akka/io/DnsProvider.scala | 1 -
.../src/main/scala/akka/io/SelectionHandler.scala | 5 +-
akka-actor/src/main/scala/akka/io/Tcp.scala | 11 +-
.../src/main/scala/akka/io/TcpConnection.scala | 25 +-
akka-actor/src/main/scala/akka/io/TcpManager.scala | 5 +-
.../main/scala/akka/io/TcpOutgoingConnection.scala | 2 +-
akka-actor/src/main/scala/akka/io/UdpManager.scala | 5 +-
.../src/main/scala/akka/io/dns/DnsProtocol.scala | 4 +-
.../scala/akka/io/dns/DnsResourceRecords.scala | 2 +-
.../akka/io/dns/internal/AsyncDnsManager.scala | 7 +-
.../scala/akka/io/dns/internal/DnsMessage.scala | 2 +-
.../scala/akka/io/dns/internal/DomainName.scala | 4 +-
.../src/main/scala/akka/pattern/AskSupport.scala | 5 +-
.../src/main/scala/akka/pattern/Backoff.scala | 5 +-
.../scala/akka/pattern/BackoffSupervisor.scala | 2 +-
.../main/scala/akka/pattern/CircuitBreaker.scala | 9 +-
.../scala/akka/pattern/GracefulStopSupport.scala | 6 +-
.../src/main/scala/akka/routing/Balancing.scala | 2 +-
.../main/scala/akka/routing/ConsistentHash.scala | 11 +-
.../scala/akka/routing/ConsistentHashing.scala | 3 +-
.../src/main/scala/akka/routing/MurmurHash.scala | 20 +-
.../akka/routing/OptimalSizeExploringResizer.scala | 6 +-
.../src/main/scala/akka/routing/Resizer.scala | 31 +--
.../src/main/scala/akka/routing/RouterConfig.scala | 3 +-
.../main/scala/akka/routing/SmallestMailbox.scala | 6 +-
.../scala/akka/serialization/Serialization.scala | 55 ++--
.../main/scala/akka/serialization/Serializer.scala | 1 -
.../scala/akka/util/BoundedBlockingQueue.scala | 20 +-
.../src/main/scala/akka/util/Collections.scala | 2 +-
.../src/main/scala/akka/util/FrequencySketch.scala | 8 +-
akka-actor/src/main/scala/akka/util/HashCode.scala | 2 +-
akka-actor/src/main/scala/akka/util/Helpers.scala | 2 +-
akka-actor/src/main/scala/akka/util/Index.scala | 30 +--
.../src/main/scala/akka/util/LineNumbers.scala | 2 +-
.../src/main/scala/akka/util/ManifestInfo.scala | 6 +-
.../main/scala/akka/util/PrettyByteString.scala | 2 +-
.../src/main/scala/akka/util/PrettyDuration.scala | 2 +-
.../src/main/scala/akka/util/UUIDComparator.scala | 4 +-
.../src/main/scala/akka/actor/ActorBenchmark.scala | 2 +-
.../actor/AffinityPoolComparativeBenchmark.scala | 2 +-
.../AffinityPoolRequestResponseBenchmark.scala | 2 +-
.../main/scala/akka/actor/ScheduleBenchmark.scala | 7 +-
.../typed/delivery/ReliableDeliveryBenchmark.scala | 2 +-
.../cluster/ddata/VersionVectorBenchmark.scala | 10 +-
.../scala/akka/dispatch/NodeQueueBenchmark.scala | 10 +-
...tentActorWithAtLeastOnceDeliveryBenchmark.scala | 8 +-
.../SerializationFormatCacheBenchmark.scala | 15 +-
.../scala/akka/stream/EmptySourceBenchmark.scala | 2 +-
.../scala/akka/stream/InterpreterBenchmark.scala | 17 +-
.../akka/stream/MaterializationBenchmark.scala | 6 +-
.../cluster/metrics/ClusterMetricsCollector.scala | 3 +-
.../cluster/metrics/ClusterMetricsExtension.scala | 2 +-
.../cluster/metrics/ClusterMetricsRouting.scala | 10 +-
.../src/main/scala/akka/cluster/metrics/EWMA.scala | 1 -
.../main/scala/akka/cluster/metrics/Metric.scala | 3 +-
.../scala/akka/cluster/metrics/Provision.scala | 6 +-
.../metrics/protobuf/MessageSerializer.scala | 2 +-
.../metrics/ClusterMetricsExtensionSpec.scala | 10 +-
.../metrics/ClusterMetricsRoutingSpec.scala | 10 +-
.../cluster/metrics/sample/StatsSampleSpec.scala | 18 +-
.../akka/cluster/metrics/sample/StatsService.scala | 8 +-
.../metrics/ClusterMetricsExtensionSpec.scala | 4 +-
.../metrics/ClusterMetricsRoutingSpec.scala | 2 +-
.../test/scala/akka/cluster/metrics/EWMASpec.scala | 8 +-
.../cluster/metrics/MetricsCollectorSpec.scala | 4 +-
.../test/scala/akka/cluster/metrics/TestUtil.scala | 3 +-
.../akka/cluster/metrics/WeightedRouteesSpec.scala | 4 +-
.../sharding/typed/ReplicatedEntityProvider.scala | 46 ++--
.../typed/internal/ClusterShardingImpl.scala | 4 +-
.../cluster/sharding/typed/internal/Murmur2.scala | 21 +-
.../sharding/typed/javadsl/ClusterSharding.scala | 1 -
.../sharding/typed/scaladsl/ClusterSharding.scala | 1 -
.../ClusterShardingRememberEntitiesPerfSpec.scala | 16 +-
.../ClusterShardingPreparingForShutdownSpec.scala | 45 ++--
.../sharding/typed/ClusterShardingStatsSpec.scala | 2 +-
.../typed/MultiDcClusterShardingSpec.scala | 8 +-
.../sharding/typed/ReplicatedShardingSpec.scala | 11 +-
.../sharding/typed/ShardedDaemonProcessSpec.scala | 6 +-
.../typed/delivery/DeliveryThroughputSpec.scala | 10 +-
.../typed/scaladsl/ClusterShardingSpec.scala | 2 +-
.../typed/scaladsl/ClusterShardingStateSpec.scala | 4 +-
.../typed/scaladsl/ShardedDaemonProcessSpec.scala | 4 +-
.../sharding/typed/AccountExampleDocSpec.scala | 2 +-
...tExampleWithCommandHandlersInDurableState.scala | 20 +-
.../AccountExampleWithCommandHandlersInState.scala | 4 +-
.../AccountExampleWithEventHandlersInState.scala | 20 +-
.../AccountExampleWithOptionDurableState.scala | 4 +-
.../typed/AccountExampleWithOptionState.scala | 4 +-
...urableStateStoreQueryUsageCompileOnlySpec.scala | 4 +-
.../typed/HelloWorldPersistentEntityExample.scala | 8 +-
.../typed/ReplicatedShardingCompileOnlySpec.scala | 29 ++-
.../sharding/typed/ShardingCompileOnlySpec.scala | 44 ++--
.../docs/delivery/PointToPointDocExample.scala | 12 +-
.../scala/docs/delivery/ShardingDocExample.scala | 12 +-
.../docs/delivery/WorkPullingDocExample.scala | 36 +--
.../akka/cluster/sharding/ClusterSharding.scala | 26 +-
.../cluster/sharding/ClusterShardingSettings.scala | 34 +--
.../RemoveInternalClusterShardingData.scala | 2 +-
.../main/scala/akka/cluster/sharding/Shard.scala | 17 +-
.../akka/cluster/sharding/ShardCoordinator.scala | 19 +-
.../scala/akka/cluster/sharding/ShardRegion.scala | 6 +-
.../akka/cluster/sharding/ShardingQueries.scala | 3 +-
.../external/ExternalShardAllocationStrategy.scala | 45 ++--
.../ExternalShardAllocationClientImpl.scala | 2 +-
.../AbstractLeastShardAllocationStrategy.scala | 2 -
.../internal/DDataRememberEntitiesShardStore.scala | 15 +-
.../internal/EntityPassivationStrategy.scala | 8 +-
.../RandomizedBrainResolverIntegrationSpec.scala | 4 +-
.../sbr/SplitBrainResolverIntegrationSpec.scala | 11 +-
.../ClusterShardCoordinatorDowning2Spec.scala | 2 +-
.../ClusterShardCoordinatorDowningSpec.scala | 2 +-
.../sharding/ClusterShardingFailureSpec.scala | 6 +-
.../ClusterShardingIncorrectSetupSpec.scala | 3 +-
.../sharding/ClusterShardingLeavingSpec.scala | 2 +-
.../sharding/ClusterShardingQueriesSpec.scala | 40 +--
...rShardingRememberEntitiesNewExtractorSpec.scala | 3 +-
.../cluster/sharding/ClusterShardingSpec.scala | 127 ++++-----
.../sharding/ExternalShardAllocationSpec.scala | 18 +-
.../sharding/MultiDcClusterShardingSpec.scala | 20 +-
.../sharding/MultiNodeClusterShardingConfig.scala | 3 +-
.../sharding/MultiNodeClusterShardingSpec.scala | 3 +-
.../RollingUpdateShardAllocationSpec.scala | 18 +-
.../sharding/ClusterShardingLeaseSpec.scala | 6 +-
.../sharding/ConcurrentStartupShardingSpec.scala | 7 +-
.../sharding/CoordinatedShutdownShardingSpec.scala | 20 +-
.../cluster/sharding/EntityTerminationSpec.scala | 16 +-
...eastShardAllocationStrategyRandomizedSpec.scala | 3 +-
.../sharding/PersistentShardingMigrationSpec.scala | 6 +-
.../sharding/RememberEntitiesFailureSpec.scala | 24 +-
...ememberEntitiesShardIdExtractorChangeSpec.scala | 6 +-
.../akka/cluster/sharding/ShardWithLeaseSpec.scala | 2 +-
.../akka/cluster/sharding/StartEntitySpec.scala | 24 +-
.../internal/RememberEntitiesShardStoreSpec.scala | 10 +-
.../sharding/passivation/simulator/Simulator.scala | 13 +-
.../passivation/simulator/SimulatorStats.scala | 16 +-
.../scala/akka/cluster/client/ClusterClient.scala | 2 -
.../cluster/pubsub/DistributedPubSubMediator.scala | 7 +-
.../singleton/ClusterSingletonManager.scala | 12 +-
.../cluster/singleton/ClusterSingletonProxy.scala | 1 -
.../ClusterSingletonMessageSerializer.scala | 22 +-
.../akka/cluster/client/ClusterClientSpec.scala | 38 +--
.../pubsub/DistributedPubSubMediatorSpec.scala | 32 +--
.../ClusterSingletonManagerLeaseSpec.scala | 22 +-
.../ClusterSingletonManagerLeave2Spec.scala | 2 +-
.../ClusterSingletonManagerLeaveSpec.scala | 2 +-
...rSingletonManagerPreparingForShutdownSpec.scala | 16 +-
.../singleton/ClusterSingletonManagerSpec.scala | 28 +-
.../ddata/typed/internal/ReplicatorBehavior.scala | 4 +-
.../akka/cluster/typed/ClusterSingleton.scala | 4 +-
.../internal/AdaptedClusterSingletonImpl.scala | 2 +-
.../typed/internal/receptionist/Registry.scala | 3 -
.../scala/akka/cluster/typed/PubSubSpec.scala | 8 +-
.../ClusterReceptionistUnreachabilitySpec.scala | 46 ++--
.../typed/scaladsl/ReplicatorCompileOnlyTest.scala | 8 +-
.../scala/akka/cluster/typed/ActorSystemSpec.scala | 27 +-
.../cluster/typed/ClusterSingletonApiSpec.scala | 12 +-
.../scala/akka/cluster/typed/GroupRouterSpec.scala | 48 ++--
.../cluster/typed/RemoteDeployNotAllowedSpec.scala | 4 +-
.../akka/cluster/typed/RemoteMessageSpec.scala | 6 +-
.../receptionist/ClusterReceptionistSpec.scala | 40 +--
.../ddata/typed/scaladsl/ReplicatorDocSpec.scala | 8 +-
.../cluster/typed/BasicClusterExampleSpec.scala | 32 +--
.../cluster/typed/DistributedPubSubExample.scala | 24 +-
.../akka/cluster/typed/ReceptionistExample.scala | 20 +-
.../cluster/typed/SingletonCompileOnlySpec.scala | 20 +-
.../src/main/scala/akka/cluster/Cluster.scala | 4 +-
.../akka/cluster/ClusterActorRefProvider.scala | 2 +-
.../main/scala/akka/cluster/ClusterDaemon.scala | 39 +--
.../src/main/scala/akka/cluster/ClusterEvent.scala | 19 +-
.../main/scala/akka/cluster/ClusterHeartbeat.scala | 8 +-
.../src/main/scala/akka/cluster/ClusterJmx.scala | 4 +-
.../main/scala/akka/cluster/ClusterReadView.scala | 176 ++++++-------
.../akka/cluster/CoordinatedShutdownLeave.scala | 4 +-
.../akka/cluster/CrossDcClusterHeartbeat.scala | 29 ++-
.../cluster/JoinConfigCompatCheckCluster.scala | 4 +-
.../src/main/scala/akka/cluster/Member.scala | 2 +-
.../main/scala/akka/cluster/MembershipState.scala | 18 +-
.../src/main/scala/akka/cluster/Reachability.scala | 4 +-
.../main/scala/akka/cluster/SeedNodeProcess.scala | 1 -
.../protobuf/ClusterMessageSerializer.scala | 28 +-
.../akka/cluster/routing/ClusterRouterConfig.scala | 4 +-
.../scala/akka/cluster/sbr/DowningStrategy.scala | 20 +-
.../akka/cluster/sbr/SplitBrainResolver.scala | 2 +-
.../scala/akka/cluster/ClusterDeathWatchSpec.scala | 26 +-
.../scala/akka/cluster/ClusterShutdownSpec.scala | 35 +--
.../scala/akka/cluster/InitialHeartbeatSpec.scala | 12 +-
.../akka/cluster/InitialMembersOfNewDcSpec.scala | 8 +-
.../akka/cluster/LargeMessageClusterSpec.scala | 2 +-
.../scala/akka/cluster/LeaderElectionSpec.scala | 7 +-
.../scala/akka/cluster/LeaderLeavingSpec.scala | 25 +-
.../cluster/MembershipChangeListenerUpSpec.scala | 46 ++--
.../cluster/MultiDcHeartbeatTakingOverSpec.scala | 5 +-
.../scala/akka/cluster/MultiDcSplitBrainSpec.scala | 4 +-
.../akka/cluster/MultiDcSunnyWeatherSpec.scala | 2 +-
.../scala/akka/cluster/MultiNodeClusterSpec.scala | 8 +-
.../akka/cluster/NodeLeavingAndExitingSpec.scala | 20 +-
.../multi-jvm/scala/akka/cluster/NodeUpSpec.scala | 12 +-
.../akka/cluster/RestartFirstSeedNodeSpec.scala | 12 +-
.../scala/akka/cluster/RestartNode2Spec.scala | 12 +-
.../scala/akka/cluster/RestartNode3Spec.scala | 12 +-
.../scala/akka/cluster/RestartNodeSpec.scala | 12 +-
.../akka/cluster/SharedMediaDriverSupport.scala | 20 +-
.../scala/akka/cluster/StreamRefSpec.scala | 4 +-
.../multi-jvm/scala/akka/cluster/StressSpec.scala | 4 +-
.../scala/akka/cluster/SunnyWeatherSpec.scala | 14 +-
.../cluster/SurviveNetworkInstabilitySpec.scala | 4 +-
.../ClusterConsistentHashingRouterSpec.scala | 3 +-
.../akka/cluster/routing/UseRoleIgnoredSpec.scala | 4 +-
.../scala/akka/cluster/ClusterDeployerSpec.scala | 4 +-
.../cluster/ClusterHeartbeatSenderStateSpec.scala | 6 +-
.../src/test/scala/akka/cluster/ClusterSpec.scala | 12 +-
.../scala/akka/cluster/DowningProviderSpec.scala | 21 +-
.../src/test/scala/akka/cluster/GossipSpec.scala | 8 +-
.../scala/akka/cluster/HeartbeatNodeRingSpec.scala | 2 +-
.../scala/akka/cluster/MemberOrderingSpec.scala | 8 +-
.../routing/ClusterRouterSupervisorSpec.scala | 11 +-
.../akka/cluster/sbr/SplitBrainResolverSpec.scala | 15 +-
.../test/scala/akka/cluster/testkit/AutoDown.scala | 1 -
.../scala/akka/discovery/ServiceDiscovery.scala | 2 -
.../scala/doc/akka/discovery/CompileOnlySpec.scala | 12 +-
.../src/main/scala/akka/cluster/ddata/LWWMap.scala | 2 +-
.../src/main/scala/akka/cluster/ddata/ORMap.scala | 8 +-
.../main/scala/akka/cluster/ddata/ORMultiMap.scala | 8 +-
.../src/main/scala/akka/cluster/ddata/ORSet.scala | 3 +-
.../main/scala/akka/cluster/ddata/Replicator.scala | 18 +-
.../ddata/protobuf/ReplicatedDataSerializer.scala | 8 +-
.../protobuf/ReplicatorMessageSerializer.scala | 2 +-
.../ddata/protobuf/SerializationSupport.scala | 15 +-
.../scala/akka/cluster/ddata/DurableDataSpec.scala | 3 +-
.../akka/cluster/ddata/DurablePruningSpec.scala | 22 +-
.../cluster/ddata/JepsenInspiredInsertSpec.scala | 14 +-
.../scala/akka/cluster/ddata/PerformanceSpec.scala | 4 +-
.../scala/akka/cluster/ddata/ReplicatorSpec.scala | 6 +-
.../ddata/DeltaPropagationSelectorSpec.scala | 7 +-
.../scala/akka/cluster/ddata/LotsOfDataBot.scala | 1 -
.../test/scala/akka/cluster/ddata/ORMapSpec.scala | 12 +-
.../test/scala/akka/cluster/ddata/ORSetSpec.scala | 58 ++---
.../protobuf/ReplicatedDataSerializerSpec.scala | 4 +-
.../stream/operators/source/AsSubscriber.scala | 49 ++--
.../stream/operators/source/FromPublisher.scala | 32 +--
.../src/test/scala/docs/actor/ActorDocSpec.scala | 164 ++++++------
.../docs/actor/ByteBufferSerializerDocSpec.scala | 4 +-
.../src/test/scala/docs/actor/FSMDocSpec.scala | 88 +++----
.../scala/docs/actor/FaultHandlingDocSpec.scala | 56 ++--
.../scala/docs/actor/InitializationDocSpec.scala | 8 +-
.../test/scala/docs/actor/PropsEdgeCaseSpec.scala | 8 +-
.../test/scala/docs/actor/SchedulerDocSpec.scala | 28 +-
.../docs/actor/SharedMutableStateDocSpec.scala | 4 +-
.../src/test/scala/docs/actor/TimerDocSpec.scala | 4 +-
.../test/scala/docs/actor/UnnestedReceives.scala | 30 +--
.../docs/actor/io/dns/DnsCompileOnlyDocSpec.scala | 16 +-
.../scala/docs/actor/typed/BlockingActor.scala | 2 +-
.../actor/typed/BlockingDispatcherSample.scala | 4 +-
.../actor/typed/CoordinatedActorShutdownSpec.scala | 20 +-
.../scala/docs/actor/typed/DispatcherDocSpec.scala | 12 +-
.../actor/typed/SharedMutableStateDocSpec.scala | 4 +-
.../circuitbreaker/CircuitBreakerDocSpec.scala | 14 +-
.../test/scala/docs/cluster/ClusterDocSpec.scala | 14 +-
.../scala/docs/cluster/FactorialFrontend.scala | 12 +-
.../scala/docs/cluster/SimpleClusterListener.scala | 4 +-
.../docs/cluster/SimpleClusterListener2.scala | 16 +-
.../singleton/ClusterSingletonSupervision.scala | 4 +-
.../src/test/scala/docs/config/ConfigDocSpec.scala | 4 +-
.../scala/docs/coordination/LeaseDocSpec.scala | 12 +-
.../scala/docs/ddata/DistributedDataDocSpec.scala | 77 +++---
.../src/test/scala/docs/ddata/ShoppingCart.scala | 16 +-
.../ddata/protobuf/TwoPhaseSetSerializer.scala | 4 +-
.../scala/docs/dispatcher/DispatcherDocSpec.scala | 60 ++---
.../src/test/scala/docs/duration/Sample.scala | 8 +-
.../test/scala/docs/event/EventBusDocSpec.scala | 32 +--
.../src/test/scala/docs/event/LoggingDocSpec.scala | 48 ++--
.../scala/docs/extension/ExtensionDocSpec.scala | 24 +-
.../docs/extension/SettingsExtensionDocSpec.scala | 8 +-
akka-docs/src/test/scala/docs/faq/Faq.scala | 4 +-
.../src/test/scala/docs/future/FutureDocSpec.scala | 152 +++++------
akka-docs/src/test/scala/docs/io/EchoServer.scala | 50 ++--
akka-docs/src/test/scala/docs/io/IODocSpec.scala | 12 +-
.../src/test/scala/docs/io/ReadBackPressure.scala | 20 +-
.../src/test/scala/docs/io/ScalaUdpMulticast.scala | 6 +-
.../test/scala/docs/io/ScalaUdpMulticastSpec.scala | 9 +-
akka-docs/src/test/scala/docs/io/UdpDocSpec.scala | 36 +--
.../docs/pattern/BackoffSupervisorDocSpec.scala | 24 +-
.../docs/persistence/PersistenceDocSpec.scala | 98 +++----
.../docs/persistence/PersistenceMultiDocSpec.scala | 12 +-
.../persistence/PersistencePluginDocSpec.scala | 24 +-
.../PersistenceSchemaEvolutionDocSpec.scala | 20 +-
.../query/LeveldbPersistenceQueryDocSpec.scala | 20 +-
.../query/PersistenceQueryDocSpec.scala | 54 ++--
.../docs/persistence/testkit/Configuration.scala | 8 +-
.../persistence/testkit/PersistenceInitSpec.scala | 4 +-
.../docs/persistence/testkit/TestKitExamples.scala | 12 +-
.../docs/remoting/RemoteDeploymentDocSpec.scala | 16 +-
.../routing/ConsistentHashingRouterDocSpec.scala | 8 +-
.../scala/docs/routing/CustomRouterDocSpec.scala | 22 +-
.../test/scala/docs/routing/RouterDocSpec.scala | 178 ++++++-------
.../docs/serialization/SerializationDocSpec.scala | 36 +--
.../test/scala/docs/stream/BidiFlowDocSpec.scala | 68 ++---
.../scala/docs/stream/CompositionDocSpec.scala | 40 +--
.../src/test/scala/docs/stream/FlowDocSpec.scala | 44 ++--
.../test/scala/docs/stream/FlowErrorDocSpec.scala | 44 ++--
.../scala/docs/stream/FlowParallelismDocSpec.scala | 16 +-
.../scala/docs/stream/FlowStreamRefsDocSpec.scala | 20 +-
.../test/scala/docs/stream/GraphDSLDocSpec.scala | 40 +--
.../test/scala/docs/stream/GraphStageDocSpec.scala | 287 +++++++++++----------
.../docs/stream/GraphStageLoggingDocSpec.scala | 21 +-
.../src/test/scala/docs/stream/HubsDocSpec.scala | 36 +--
.../scala/docs/stream/IntegrationDocSpec.scala | 100 +++----
.../test/scala/docs/stream/MigrationsScala.scala | 16 +-
.../test/scala/docs/stream/QuickStartDocSpec.scala | 32 +--
.../docs/stream/RateTransformationDocSpec.scala | 24 +-
.../scala/docs/stream/ReactiveStreamsDocSpec.scala | 44 ++--
.../test/scala/docs/stream/RestartDocSpec.scala | 8 +-
.../test/scala/docs/stream/SinkRecipeDocSpec.scala | 6 +-
.../scala/docs/stream/StreamBuffersRateSpec.scala | 38 +--
.../docs/stream/StreamPartialGraphDSLDocSpec.scala | 24 +-
.../scala/docs/stream/StreamTestKitDocSpec.scala | 40 +--
.../test/scala/docs/stream/SubstreamDocSpec.scala | 36 +--
.../stream/TwitterStreamQuickstartDocSpec.scala | 84 +++---
.../docs/stream/cookbook/RecipeAdhocSource.scala | 36 +--
.../docs/stream/cookbook/RecipeByteStrings.scala | 46 ++--
.../docs/stream/cookbook/RecipeDecompress.scala | 8 +-
.../scala/docs/stream/cookbook/RecipeDigest.scala | 42 +--
.../stream/cookbook/RecipeDroppyBroadcast.scala | 4 +-
.../docs/stream/cookbook/RecipeFlattenSeq.scala | 4 +-
.../stream/cookbook/RecipeGlobalRateLimit.scala | 10 +-
.../scala/docs/stream/cookbook/RecipeHold.scala | 27 +-
.../docs/stream/cookbook/RecipeKeepAlive.scala | 4 +-
.../stream/cookbook/RecipeLoggingElements.scala | 18 +-
.../docs/stream/cookbook/RecipeManualTrigger.scala | 16 +-
.../docs/stream/cookbook/RecipeMissedTicks.scala | 8 +-
.../docs/stream/cookbook/RecipeMultiGroupBy.scala | 8 +-
.../docs/stream/cookbook/RecipeParseLines.scala | 4 +-
.../docs/stream/cookbook/RecipeReduceByKey.scala | 12 +-
.../scala/docs/stream/cookbook/RecipeSeq.scala | 8 +-
.../docs/stream/cookbook/RecipeSimpleDrop.scala | 4 +-
.../stream/cookbook/RecipeSourceFromFunction.scala | 4 +-
.../docs/stream/cookbook/RecipeSplitter.scala | 28 +-
.../docs/stream/cookbook/RecipeWorkerPool.scala | 4 +-
.../scala/docs/stream/io/StreamFileDocSpec.scala | 28 +-
.../scala/docs/stream/io/StreamTcpDocSpec.scala | 24 +-
.../stream/operators/BroadcastDocExample.scala | 12 +-
.../src/test/scala/docs/stream/operators/Map.scala | 4 +-
.../stream/operators/MergeSequenceDocExample.scala | 11 +-
.../stream/operators/PartitionDocExample.scala | 6 +-
.../docs/stream/operators/SourceOperators.scala | 18 +-
.../docs/stream/operators/WithContextSpec.scala | 4 +-
.../converters/StreamConvertersToJava.scala | 8 +-
.../operators/converters/ToFromJavaIOStreams.scala | 12 +-
.../docs/stream/operators/flow/StatefulMap.scala | 70 ++---
.../docs/stream/operators/sink/AsPublisher.scala | 6 +-
.../docs/stream/operators/sink/Cancelled.scala | 4 +-
.../docs/stream/operators/sink/Collection.scala | 6 +-
.../scala/docs/stream/operators/sink/Fold.scala | 6 +-
.../docs/stream/operators/sink/HeadOption.scala | 6 +-
.../scala/docs/stream/operators/sink/Ignore.scala | 4 +-
.../scala/docs/stream/operators/source/From.scala | 8 +-
.../docs/stream/operators/source/Restart.scala | 40 +--
.../stream/operators/sourceorflow/Collect.scala | 12 +-
.../operators/sourceorflow/CompletionTimeout.scala | 4 +-
.../stream/operators/sourceorflow/Conflate.scala | 8 +-
.../sourceorflow/ExtrapolateAndExpand.scala | 9 +-
.../docs/stream/operators/sourceorflow/Fold.scala | 8 +-
.../stream/operators/sourceorflow/FoldAsync.scala | 7 +-
.../stream/operators/sourceorflow/GroupBy.scala | 8 +-
.../stream/operators/sourceorflow/Grouped.scala | 4 +-
.../operators/sourceorflow/GroupedWeighted.scala | 4 +-
.../operators/sourceorflow/Intersperse.scala | 4 +-
.../docs/stream/operators/sourceorflow/Log.scala | 4 +-
.../operators/sourceorflow/LogWithMarker.scala | 4 +-
.../stream/operators/sourceorflow/MapAsyncs.scala | 5 +-
.../stream/operators/sourceorflow/MapConcat.scala | 4 +-
.../stream/operators/sourceorflow/MapError.scala | 4 +-
.../operators/sourceorflow/MergeLatest.scala | 4 +-
.../stream/operators/sourceorflow/Reduce.scala | 6 +-
.../docs/stream/operators/sourceorflow/Scan.scala | 4 +-
.../stream/operators/sourceorflow/ScanAsync.scala | 4 +-
.../stream/operators/sourceorflow/Sliding.scala | 12 +-
.../docs/stream/operators/sourceorflow/Split.scala | 8 +-
.../stream/operators/sourceorflow/Throttle.scala | 1 -
.../docs/stream/operators/sourceorflow/Watch.scala | 4 +-
.../operators/sourceorflow/WatchTermination.scala | 19 +-
.../test/scala/docs/testkit/ParentChildSpec.scala | 16 +-
.../test/scala/docs/testkit/PlainWordSpec.scala | 2 +-
.../test/scala/docs/testkit/TestkitDocSpec.scala | 100 +++----
.../tutorial_1/ActorHierarchyExperiments.scala | 8 +-
.../src/test/scala/typed/tutorial_3/Device.scala | 4 +-
.../scala/typed/tutorial_3/DeviceInProgress.scala | 16 +-
.../test/scala/typed/tutorial_3/DeviceSpec.scala | 8 +-
.../src/test/scala/typed/tutorial_4/Device.scala | 4 +-
.../test/scala/typed/tutorial_4/DeviceGroup.scala | 12 +-
.../scala/typed/tutorial_4/DeviceGroupSpec.scala | 12 +-
.../scala/typed/tutorial_4/DeviceManager.scala | 12 +-
.../test/scala/typed/tutorial_4/DeviceSpec.scala | 8 +-
.../src/test/scala/typed/tutorial_5/Device.scala | 8 +-
.../test/scala/typed/tutorial_5/DeviceGroup.scala | 10 +-
.../scala/typed/tutorial_5/DeviceGroupQuery.scala | 20 +-
.../typed/tutorial_5/DeviceGroupQuerySpec.scala | 20 +-
.../scala/typed/tutorial_5/DeviceGroupSpec.scala | 16 +-
.../scala/typed/tutorial_5/DeviceManager.scala | 8 +-
.../test/scala/typed/tutorial_5/DeviceSpec.scala | 8 +-
.../akka/remote/testconductor/Conductor.scala | 2 +-
.../akka/remote/testconductor/Extension.scala | 1 -
.../scala/akka/remote/testconductor/Player.scala | 4 +-
.../remote/testconductor/RemoteConnection.scala | 5 +-
.../scala/akka/remote/testkit/MultiNodeSpec.scala | 53 ++--
.../scala/akka/osgi/ActorSystemActivator.scala | 4 +-
.../main/scala/akka/osgi/DefaultOSGiLogger.scala | 2 +-
.../persistence/query/DurableStateChange.scala | 2 -
.../persistence/query/ReadJournalProvider.scala | 1 -
.../leveldb/javadsl/LeveldbReadJournal.scala | 1 -
.../leveldb/scaladsl/LeveldbReadJournal.scala | 2 +-
.../scala/akka/persistence/query/OffsetSpec.scala | 6 +-
.../query/internal/QuerySerializerSpec.scala | 4 +-
.../leveldb/PersistencePluginProxySpec.scala | 12 +-
.../journal/leveldb/SharedLeveldbJournalSpec.scala | 3 +-
.../scala/akka/persistence/CapabilityFlags.scala | 2 +-
.../akka/persistence/journal/JournalSpec.scala | 4 +-
.../persistence/snapshot/SnapshotStoreSpec.scala | 4 +-
.../akka/persistence/testkit/EventStorage.scala | 11 +-
.../persistence/testkit/ProcessingPolicy.scala | 29 ++-
.../akka/persistence/testkit/SnapshotStorage.scala | 7 +-
.../internal/EventSourcedBehaviorTestKitImpl.scala | 19 +-
.../testkit/internal/InMemStorageExtension.scala | 17 +-
.../testkit/internal/TestKitStorage.scala | 16 +-
.../internal/EventsByPersistenceIdStage.scala | 10 +-
.../scaladsl/PersistenceTestKitReadJournal.scala | 11 +-
.../persistence/testkit/scaladsl/TestOps.scala | 30 +--
.../PersistenceTestKitDurableStateStore.scala | 23 +-
.../testkit/javadsl/CommonSnapshotTests.scala | 2 +-
.../testkit/javadsl/CommonTestKitTests.scala | 8 +-
.../testkit/scaladsl/CommonSnapshotTests.scala | 2 +-
.../testkit/scaladsl/CommonTestKitTests.scala | 8 +-
.../testkit/scaladsl/ScalaDslUtils.scala | 13 +-
.../typed/EventSourcedBehaviorLoggingSpec.scala | 7 +-
.../typed/ReplicatedEventPublishingSpec.scala | 41 ++-
.../typed/ReplicatedEventSourcingTaggingSpec.scala | 44 ++--
.../typed/ReplicationIllegalAccessSpec.scala | 37 +--
.../scaladsl/EventSourcedBehaviorFailureSpec.scala | 37 +--
.../typed/scaladsl/EventSourcedBehaviorSpec.scala | 2 +-
.../scaladsl/EventSourcedBehaviorStashSpec.scala | 3 +-
.../scaladsl/EventSourcedBehaviorWatchSpec.scala | 36 +--
.../scaladsl/EventSourcedEventAdapterSpec.scala | 12 +-
.../scaladsl/EventSourcedSequenceNumberSpec.scala | 15 +-
.../scaladsl/EventSourcedStashOverflowSpec.scala | 6 +-
.../typed/scaladsl/LoggerSourceSpec.scala | 25 +-
.../typed/scaladsl/PerformanceSpec.scala | 4 +-
.../state/scaladsl/DurableStateRevisionSpec.scala | 63 +++--
.../typed/ReplicatedAuctionExampleSpec.scala | 41 ++-
.../typed/ReplicatedBlogExampleSpec.scala | 8 +-
.../ReplicatedEventSourcingCompileOnlySpec.scala | 12 +-
.../ReplicatedMovieWatchListExampleSpec.scala | 4 +-
.../typed/ReplicatedShoppingCartExampleSpec.scala | 4 +-
.../scala/akka/persistence/typed/crdt/ORSet.scala | 3 +-
.../persistence/typed/internal/BehaviorSetup.scala | 6 +-
.../typed/internal/ExternalInteractions.scala | 6 +-
.../typed/internal/ReplayingEvents.scala | 3 +-
.../akka/persistence/typed/internal/Running.scala | 46 ++--
.../persistence/typed/javadsl/CommandHandler.scala | 49 ++--
.../typed/javadsl/CommandHandlerWithReply.scala | 49 ++--
.../akka/persistence/typed/javadsl/Effect.scala | 8 +-
.../persistence/typed/javadsl/EventHandler.scala | 19 +-
.../javadsl/ReplicatedEventSourcedBehavior.scala | 2 +-
.../ReplicatedEventSourcingSerializer.scala | 6 +-
.../typed/state/javadsl/CommandHandler.scala | 47 ++--
.../state/javadsl/CommandHandlerWithReply.scala | 47 ++--
.../persistence/typed/state/javadsl/Effect.scala | 8 +-
.../delivery/EventSourcedProducerQueueSpec.scala | 4 +-
...DeliveryWithEventSourcedProducerQueueSpec.scala | 4 +-
...kPullingWithEventSourcedProducerQueueSpec.scala | 4 +-
.../scaladsl/PersistentActorCompileOnlyTest.scala | 100 ++++---
.../typed/BasicPersistentBehaviorCompileOnly.scala | 87 ++++---
.../akka/persistence/typed/BlogPostEntity.scala | 36 +--
.../typed/BlogPostEntityDurableState.scala | 28 +-
...DurableStatePersistentBehaviorCompileOnly.scala | 32 +--
.../typed/PersistentFsmToTypedMigrationSpec.scala | 28 +-
.../akka/persistence/typed/StashingExample.scala | 4 +-
.../main/scala-3/akka/persistence/TraitOrder.scala | 2 +-
.../main/scala/akka/persistence/Eventsourced.scala | 151 +++++------
.../main/scala/akka/persistence/Persistence.scala | 31 +--
.../main/scala/akka/persistence/Persistent.scala | 8 +-
.../scala/akka/persistence/fsm/PersistentFSM.scala | 11 +-
.../akka/persistence/fsm/PersistentFSMBase.scala | 4 -
.../akka/persistence/journal/AsyncRecovery.scala | 4 +-
.../persistence/journal/AsyncWriteJournal.scala | 5 +-
.../akka/persistence/journal/EventAdapter.scala | 8 +-
.../akka/persistence/journal/EventAdapters.scala | 12 +-
.../akka/persistence/journal/ReplayFilter.scala | 9 +-
.../persistence/journal/inmem/InmemJournal.scala | 6 +-
.../persistence/journal/japi/AsyncRecovery.scala | 7 +-
.../journal/leveldb/LeveldbCompaction.scala | 1 -
.../journal/leveldb/LeveldbRecovery.scala | 2 +-
.../persistence/journal/leveldb/LeveldbStore.scala | 37 +--
.../akka/persistence/snapshot/SnapshotStore.scala | 4 +-
.../akka/persistence/AtLeastOnceDeliverySpec.scala | 22 +-
.../scala/akka/persistence/EventAdapterSpec.scala | 3 +-
.../scala/akka/persistence/PerformanceSpec.scala | 2 +-
.../scala/akka/persistence/PersistenceSpec.scala | 21 +-
.../PersistentActorBoundedStashingSpec.scala | 28 +-
.../akka/persistence/PersistentActorSpec.scala | 2 +-
.../SnapshotFailureRobustnessSpec.scala | 2 +-
.../persistence/SnapshotSerializationSpec.scala | 2 +-
.../test/scala/akka/persistence/SnapshotSpec.scala | 10 +-
.../persistence/TimerPersistentActorSpec.scala | 7 +-
.../akka/persistence/fsm/PersistentFSMSpec.scala | 54 ++--
.../persistence/journal/chaos/ChaosJournal.scala | 22 +-
.../scala/akka/remote/RemoteFeaturesSpec.scala | 2 +-
.../akka/remote/RemoteQuarantinePiercingSpec.scala | 4 +-
.../scala/akka/remote/RemoteReDeploymentSpec.scala | 3 +-
.../scala/akka/remote/RemotingMultiNodeSpec.scala | 4 +-
.../scala/akka/remote/TransportFailSpec.scala | 10 +-
.../akka/remote/artery/MaxThroughputSpec.scala | 26 +-
.../artery/RemoteRestartedQuarantinedSpec.scala | 2 +-
...dStreamRestartWithCompressionInFlightSpec.scala | 6 +-
.../akka/remote/artery/TestRateReporter.scala | 37 +--
.../akka/remote/routing/RemoteRandomSpec.scala | 4 +-
.../akka/remote/routing/RemoteRoundRobinSpec.scala | 8 +-
.../remote/routing/RemoteScatterGatherSpec.scala | 4 +-
.../remote/testconductor/TestConductorSpec.scala | 8 +-
.../akka/remote/testconductor/BarrierSpec.scala | 16 +-
.../src/main/scala/akka/remote/AckedDelivery.scala | 4 +-
.../akka/remote/DeadlineFailureDetector.scala | 2 +-
.../remote/DefaultFailureDetectorRegistry.scala | 1 -
.../src/main/scala/akka/remote/Endpoint.scala | 10 +-
.../akka/remote/FailureDetectorRegistry.scala | 4 +-
.../scala/akka/remote/RemoteActorRefProvider.scala | 20 +-
.../src/main/scala/akka/remote/RemoteDaemon.scala | 121 ++++-----
.../src/main/scala/akka/remote/RemoteWatcher.scala | 4 +-
.../src/main/scala/akka/remote/Remoting.scala | 8 +-
.../scala/akka/remote/artery/ArteryTransport.scala | 27 +-
.../scala/akka/remote/artery/Association.scala | 13 +-
.../src/main/scala/akka/remote/artery/Codecs.scala | 73 +++---
.../main/scala/akka/remote/artery/Handshake.scala | 19 +-
.../akka/remote/artery/MessageDispatcher.scala | 2 +-
.../main/scala/akka/remote/artery/ObjectPool.scala | 2 +-
.../akka/remote/artery/RemoteInstrument.scala | 1 -
.../akka/remote/artery/SystemMessageDelivery.scala | 2 +-
.../scala/akka/remote/artery/aeron/AeronSink.scala | 2 +-
.../akka/remote/artery/aeron/AeronSource.scala | 3 +-
.../artery/aeron/ArteryAeronUdpTransport.scala | 18 +-
.../akka/remote/artery/aeron/TaskRunner.scala | 23 +-
.../remote/artery/compress/CompressionTable.scala | 2 +-
.../artery/compress/DecompressionTable.scala | 2 +-
.../artery/compress/InboundCompressions.scala | 2 +-
.../remote/artery/tcp/ArteryTcpTransport.scala | 30 ++-
.../scala/akka/remote/artery/tcp/TcpFraming.scala | 8 +-
.../serialization/MiscMessageSerializer.scala | 14 +-
.../remote/serialization/ProtobufSerializer.scala | 8 +-
.../transport/AbstractTransportAdapter.scala | 4 +-
.../scala/akka/remote/transport/AkkaPduCodec.scala | 2 +-
.../remote/transport/AkkaProtocolTransport.scala | 10 +-
.../FailureInjectorTransportAdapter.scala | 7 +-
.../akka/remote/transport/TestTransport.scala | 33 +--
.../transport/ThrottlerTransportAdapter.scala | 37 +--
.../scala/akka/remote/transport/Transport.scala | 1 -
.../remote/transport/netty/NettyTransport.scala | 5 +-
.../artery/jfr/JFRRemotingFlightRecorderSpec.scala | 2 +-
.../akka/remote/AccrualFailureDetectorSpec.scala | 59 ++---
.../src/test/scala/akka/remote/DaemonicSpec.scala | 8 +-
.../akka/remote/DeadlineFailureDetectorSpec.scala | 13 +-
.../akka/remote/FailureDetectorRegistrySpec.scala | 47 ++--
.../src/test/scala/akka/remote/LogSourceSpec.scala | 10 +-
.../scala/akka/remote/RemoteFeaturesSpec.scala | 3 +-
.../akka/remote/Ticket1978CommunicationSpec.scala | 8 +-
.../remote/artery/DuplicateHandshakeSpec.scala | 2 +-
.../akka/remote/artery/FlushOnShutdownSpec.scala | 30 +--
.../akka/remote/artery/RemoteDeathWatchSpec.scala | 14 +-
.../akka/remote/artery/RemoteDeploymentSpec.scala | 6 +-
.../RemoteInstrumentsSerializationSpec.scala | 3 +-
.../artery/RemoteMessageSerializationSpec.scala | 10 +-
.../remote/artery/RemoteSendConsistencySpec.scala | 8 +-
.../scala/akka/remote/artery/UntrustedSpec.scala | 12 +-
.../compress/CompressionIntegrationSpec.scala | 40 +--
.../artery/tcp/ssl/PemManagersProviderSpec.scala | 1 -
.../ssl/RotatingKeysSSLEngineProviderSpec.scala | 4 +-
.../remote/artery/tcp/ssl/TlsResourcesSpec.scala | 9 +-
.../remote/artery/tcp/ssl/X509ReadersSpec.scala | 1 -
.../scala/akka/remote/classic/ActorsLeakSpec.scala | 4 +-
.../akka/remote/classic/RemoteDeathWatchSpec.scala | 17 +-
.../akka/remote/classic/RemoteInitErrorSpec.scala | 2 +-
.../scala/akka/remote/classic/RemotingSpec.scala | 26 +-
.../scala/akka/remote/classic/UntrustedSpec.scala | 12 +-
.../classic/transport/AkkaProtocolSpec.scala | 2 +-
.../classic/transport/AkkaProtocolStressTest.scala | 8 +-
.../transport/SwitchableLoggedBehaviorSpec.scala | 6 +-
.../transport/ThrottlerTransportAdapterSpec.scala | 14 +-
.../transport/netty/NettyTransportSpec.scala | 2 +-
.../serialization/jackson/JacksonSerializer.scala | 6 +-
.../jackson/JacksonSerializerSpec.scala | 23 +-
.../jackson/CustomAdtSerializer.scala | 4 +-
.../jackson/SerializationDocSpec.scala | 8 +-
.../main/scala/akka/event/slf4j/Slf4jLogger.scala | 2 +-
.../akka/event/slf4j/Slf4jLoggingFilterSpec.scala | 2 +-
.../scala/akka/stream/testkit/StreamTestKit.scala | 10 +-
.../stream/testkit/scaladsl/StreamTestKit.scala | 9 +-
.../impl/fusing/GraphInterpreterSpecKit.scala | 116 +++++----
.../scala/akka/stream/testkit/ScriptedTest.scala | 4 +-
.../akka/stream/testkit/StreamTestKitSpec.scala | 18 +-
.../testkit/TestPublisherSubscriberSpec.scala | 4 +-
.../akka/stream/testkit/TwoStreamsSetup.scala | 2 +-
.../stream/tck/AkkaPublisherVerification.scala | 3 +-
.../akka/stream/tck/FanoutPublisherTest.scala | 3 +-
.../stream/scaladsl/FlowPublisherSinkSpec.scala | 6 +-
.../src/test/scala/akka/stream/FusingSpec.scala | 38 +--
.../scala/akka/stream/StreamAttributeDocSpec.scala | 4 +-
.../akka/stream/impl/GraphStageLogicSpec.scala | 96 ++++---
.../akka/stream/impl/SubInletOutletSpec.scala | 36 +--
.../test/scala/akka/stream/impl/TimeoutsSpec.scala | 7 +-
.../impl/fusing/ActorGraphInterpreterSpec.scala | 181 +++++++------
.../stream/impl/fusing/AsyncCallbackSpec.scala | 34 +--
.../impl/fusing/GraphInterpreterPortsSpec.scala | 3 +-
.../akka/stream/impl/fusing/InterpreterSpec.scala | 3 +-
.../stream/impl/fusing/KeepGoingStageSpec.scala | 11 +-
.../akka/stream/io/ByteStringParserSpec.scala | 10 +-
.../scala/akka/stream/io/DeprecatedTlsSpec.scala | 22 +-
.../test/scala/akka/stream/io/FileSinkSpec.scala | 12 +-
.../scala/akka/stream/io/InputStreamSinkSpec.scala | 6 +-
.../akka/stream/io/OutputStreamSourceSpec.scala | 15 +-
.../src/test/scala/akka/stream/io/TcpSpec.scala | 12 +-
.../src/test/scala/akka/stream/io/TlsSpec.scala | 26 +-
.../akka/stream/io/compression/CoderSpec.scala | 4 +-
.../scaladsl/AggregateWithBoundarySpec.scala | 33 +--
.../akka/stream/scaladsl/AttributesSpec.scala | 50 ++--
.../scala/akka/stream/scaladsl/BidiFlowSpec.scala | 4 +-
.../stream/scaladsl/CancellationStrategySpec.scala | 4 +-
.../akka/stream/scaladsl/CollectionSinkSpec.scala | 4 +-
.../scaladsl/CoupledTerminationFlowSpec.scala | 19 +-
.../stream/scaladsl/FlowConcatAllLazySpec.scala | 8 +-
.../akka/stream/scaladsl/FlowConcatSpec.scala | 14 +-
.../scala/akka/stream/scaladsl/FlowDelaySpec.scala | 10 +-
.../stream/scaladsl/FlowFlatMapPrefixSpec.scala | 34 +--
.../stream/scaladsl/FlowFlattenMergeSpec.scala | 13 +-
.../akka/stream/scaladsl/FlowFutureFlowSpec.scala | 6 +-
.../akka/stream/scaladsl/FlowGroupBySpec.scala | 27 +-
.../stream/scaladsl/FlowGroupedWeightedSpec.scala | 16 +-
.../akka/stream/scaladsl/FlowIdleInjectSpec.scala | 3 +-
.../stream/scaladsl/FlowInterleaveAllSpec.scala | 6 +-
.../akka/stream/scaladsl/FlowInterleaveSpec.scala | 6 +-
.../scala/akka/stream/scaladsl/FlowJoinSpec.scala | 26 +-
.../scala/akka/stream/scaladsl/FlowLimitSpec.scala | 8 +-
.../stream/scaladsl/FlowLimitWeightedSpec.scala | 4 +-
.../stream/scaladsl/FlowLogWithMarkerSpec.scala | 28 +-
.../akka/stream/scaladsl/FlowMapAsyncSpec.scala | 66 +++--
.../scaladsl/FlowMapAsyncUnorderedSpec.scala | 23 +-
.../scala/akka/stream/scaladsl/FlowMergeSpec.scala | 24 +-
.../akka/stream/scaladsl/FlowOrElseSpec.scala | 4 +-
.../akka/stream/scaladsl/FlowPrependSpec.scala | 8 +-
.../akka/stream/scaladsl/FlowRecoverWithSpec.scala | 16 +-
.../akka/stream/scaladsl/FlowSectionSpec.scala | 2 +-
.../test/scala/akka/stream/scaladsl/FlowSpec.scala | 2 +-
.../akka/stream/scaladsl/FlowSplitWhenSpec.scala | 8 +-
.../akka/stream/scaladsl/FlowStatefulMapSpec.scala | 86 +++---
.../akka/stream/scaladsl/FlowThrottleSpec.scala | 21 +-
.../stream/scaladsl/FlowWatchTerminationSpec.scala | 2 +-
.../stream/scaladsl/FlowWithContextLogSpec.scala | 2 +-
.../akka/stream/scaladsl/FlowWithContextSpec.scala | 4 +-
.../scala/akka/stream/scaladsl/FlowZipSpec.scala | 4 +-
.../stream/scaladsl/FlowZipWithIndexSpec.scala | 4 +-
.../akka/stream/scaladsl/FlowZipWithSpec.scala | 4 +-
.../scala/akka/stream/scaladsl/FramingSpec.scala | 2 +-
.../akka/stream/scaladsl/GraphBackedFlowSpec.scala | 10 +-
.../akka/stream/scaladsl/GraphBalanceSpec.scala | 48 ++--
.../akka/stream/scaladsl/GraphBroadcastSpec.scala | 72 +++---
.../akka/stream/scaladsl/GraphConcatSpec.scala | 8 +-
.../akka/stream/scaladsl/GraphDSLCompileSpec.scala | 106 ++++----
.../akka/stream/scaladsl/GraphMatValueSpec.scala | 30 +--
.../stream/scaladsl/GraphMergeLatestSpec.scala | 16 +-
.../stream/scaladsl/GraphMergePreferredSpec.scala | 14 +-
.../scaladsl/GraphMergePrioritizedSpec.scala | 6 +-
.../akka/stream/scaladsl/GraphMergeSpec.scala | 22 +-
.../stream/scaladsl/GraphOpsIntegrationSpec.scala | 36 +--
.../akka/stream/scaladsl/GraphPartialSpec.scala | 20 +-
.../akka/stream/scaladsl/GraphPartitionSpec.scala | 125 ++++-----
.../stream/scaladsl/GraphStageTimersSpec.scala | 48 ++--
.../akka/stream/scaladsl/GraphUnzipSpec.scala | 30 +--
.../akka/stream/scaladsl/GraphUnzipWithSpec.scala | 8 +-
.../akka/stream/scaladsl/GraphZipLatestSpec.scala | 4 +-
.../stream/scaladsl/GraphZipLatestWithSpec.scala | 60 ++---
.../scala/akka/stream/scaladsl/GraphZipNSpec.scala | 10 +-
.../scala/akka/stream/scaladsl/GraphZipSpec.scala | 12 +-
.../akka/stream/scaladsl/GraphZipWithNSpec.scala | 4 +-
.../akka/stream/scaladsl/GraphZipWithSpec.scala | 38 +--
.../scala/akka/stream/scaladsl/HeadSinkSpec.scala | 4 +-
.../test/scala/akka/stream/scaladsl/HubSpec.scala | 38 +--
.../scala/akka/stream/scaladsl/LastSinkSpec.scala | 8 +-
.../scala/akka/stream/scaladsl/LazyFlowSpec.scala | 2 +-
.../akka/stream/scaladsl/PublisherSinkSpec.scala | 4 +-
.../scala/akka/stream/scaladsl/QueueSinkSpec.scala | 4 +-
.../akka/stream/scaladsl/QueueSourceSpec.scala | 2 +-
.../scala/akka/stream/scaladsl/RetryFlowSpec.scala | 15 +-
.../akka/stream/scaladsl/ReverseArrowSpec.scala | 4 +-
.../scala/akka/stream/scaladsl/SeqSinkSpec.scala | 2 +-
.../test/scala/akka/stream/scaladsl/SinkSpec.scala | 14 +-
.../scala/akka/stream/scaladsl/SourceSpec.scala | 28 +-
.../akka/stream/scaladsl/StageActorRefSpec.scala | 3 +-
.../stream/scaladsl/StreamConvertersSpec.scala | 7 +-
.../akka/stream/scaladsl/TakeLastSinkSpec.scala | 4 +-
.../akka/stream/scaladsl/TickSourceSpec.scala | 4 +-
.../scaladsl/UnfoldResourceAsyncSourceSpec.scala | 32 ++-
.../stream/scaladsl/UnfoldResourceSourceSpec.scala | 30 ++-
.../stream/snapshot/MaterializerStateSpec.scala | 60 ++---
.../akka/stream/typed/ActorSourceSinkExample.scala | 11 +-
.../test/scala/docs/scaladsl/ActorFlowSpec.scala | 12 +-
.../akka/stream/impl/JavaFlowAndRsConverters.scala | 38 ++-
.../akka/stream/scaladsl/JavaFlowSupport.scala | 28 +-
.../main/scala/akka/stream/ActorMaterializer.scala | 11 +-
.../src/main/scala/akka/stream/Attributes.scala | 41 ++-
.../src/main/scala/akka/stream/FanInShape1N.scala | 6 +-
.../src/main/scala/akka/stream/KillSwitch.scala | 41 +--
.../main/scala/akka/stream/QueueOfferResult.scala | 2 +-
akka-stream/src/main/scala/akka/stream/Shape.scala | 6 +-
.../main/scala/akka/stream/UniformFanInShape.scala | 2 +-
.../scala/akka/stream/UniformFanOutShape.scala | 2 +-
.../scala/akka/stream/impl/ActorPublisher.scala | 17 +-
.../impl/ActorRefBackpressureSinkStage.scala | 2 +-
.../scala/akka/stream/impl/ActorRefSinkStage.scala | 4 +-
.../scala/akka/stream/impl/ActorRefSource.scala | 11 +-
.../scala/akka/stream/impl/JsonObjectParser.scala | 2 +-
.../main/scala/akka/stream/impl/LazySource.scala | 36 +--
.../impl/PhasedFusingActorMaterializer.scala | 2 +-
.../stream/impl/ReactiveStreamsCompliance.scala | 7 +-
.../akka/stream/impl/RetryFlowCoordinator.scala | 11 +-
.../src/main/scala/akka/stream/impl/Sinks.scala | 90 +++----
.../main/scala/akka/stream/impl/StreamLayout.scala | 8 +-
.../akka/stream/impl/SubscriberManagement.scala | 17 +-
.../src/main/scala/akka/stream/impl/Throttle.scala | 2 +-
.../src/main/scala/akka/stream/impl/Transfer.scala | 5 +-
.../stream/impl/fusing/ActorGraphInterpreter.scala | 43 +--
.../akka/stream/impl/fusing/FlatMapPrefix.scala | 43 +--
.../scala/akka/stream/impl/fusing/FutureFlow.scala | 25 +-
.../akka/stream/impl/fusing/GraphInterpreter.scala | 18 +-
.../akka/stream/impl/fusing/GraphStages.scala | 46 ++--
.../main/scala/akka/stream/impl/fusing/Ops.scala | 111 ++++----
.../akka/stream/impl/fusing/StreamOfStreams.scala | 18 +-
.../akka/stream/impl/io/ByteStringParser.scala | 4 +-
.../main/scala/akka/stream/impl/io/IOSources.scala | 17 +-
.../akka/stream/impl/io/InputStreamSinkStage.scala | 4 +-
.../main/scala/akka/stream/impl/io/TLSActor.scala | 4 +-
.../main/scala/akka/stream/impl/io/TcpStages.scala | 26 +-
.../impl/io/compression/GzipDecompressor.scala | 2 +-
.../src/main/scala/akka/stream/impl/package.scala | 1 -
.../main/scala/akka/stream/javadsl/BidiFlow.scala | 2 -
.../src/main/scala/akka/stream/javadsl/Flow.scala | 62 ++---
.../akka/stream/javadsl/FlowWithContext.scala | 19 +-
.../main/scala/akka/stream/javadsl/Framing.scala | 1 -
.../src/main/scala/akka/stream/javadsl/Graph.scala | 10 +-
.../scala/akka/stream/javadsl/MergeLatest.scala | 1 -
.../scala/akka/stream/javadsl/RestartSource.scala | 5 -
.../src/main/scala/akka/stream/javadsl/Sink.scala | 5 +-
.../main/scala/akka/stream/javadsl/Source.scala | 131 +++++-----
.../main/scala/akka/stream/javadsl/SubFlow.scala | 27 +-
.../main/scala/akka/stream/javadsl/SubSource.scala | 27 +-
.../main/scala/akka/stream/scaladsl/BidiFlow.scala | 2 -
.../scala/akka/stream/scaladsl/Compression.scala | 1 -
.../src/main/scala/akka/stream/scaladsl/Flow.scala | 13 +-
.../akka/stream/scaladsl/FlowWithContext.scala | 9 +-
.../akka/stream/scaladsl/FlowWithContextOps.scala | 1 -
.../main/scala/akka/stream/scaladsl/Framing.scala | 14 +-
.../main/scala/akka/stream/scaladsl/Graph.scala | 114 ++++----
.../src/main/scala/akka/stream/scaladsl/Hub.scala | 11 +-
.../scala/akka/stream/scaladsl/JsonFraming.scala | 7 +-
.../scala/akka/stream/scaladsl/MergeLatest.scala | 1 -
.../scala/akka/stream/scaladsl/RestartFlow.scala | 15 +-
.../scala/akka/stream/scaladsl/RestartSource.scala | 3 -
.../src/main/scala/akka/stream/scaladsl/Sink.scala | 6 +-
.../main/scala/akka/stream/scaladsl/Source.scala | 30 +--
.../akka/stream/scaladsl/SourceWithContext.scala | 2 +-
.../akka/stream/scaladsl/StreamConverters.scala | 51 ++--
.../src/main/scala/akka/stream/scaladsl/Tcp.scala | 9 +-
.../akka/stream/snapshot/MaterializerState.scala | 1 -
.../main/scala/akka/stream/stage/GraphStage.scala | 60 +++--
.../akka/testkit/CallingThreadDispatcher.scala | 28 +-
.../src/main/scala/akka/testkit/SocketUtil.scala | 17 +-
.../src/main/scala/akka/testkit/TestActorRef.scala | 110 ++++----
.../src/main/scala/akka/testkit/TestKit.scala | 15 +-
.../main/scala/akka/testkit/javadsl/TestKit.scala | 30 +--
.../src/test/scala/akka/testkit/AkkaSpecSpec.scala | 10 +-
.../src/test/scala/akka/testkit/CoronerSpec.scala | 37 +--
.../test/scala/akka/testkit/TestActorRefSpec.scala | 36 +--
.../test/scala/akka/testkit/TestFSMRefSpec.scala | 28 +-
.../test/scala/akka/testkit/TestProbeSpec.scala | 6 +-
.../testkit/metrics/FileDescriptorMetricSet.scala | 9 +-
.../scala/akka/testkit/metrics/MetricsKitOps.scala | 2 +-
build.sbt | 67 ++---
project/AkkaBuild.scala | 66 ++---
project/AkkaDisciplinePlugin.scala | 66 ++---
project/CopyrightHeader.scala | 19 +-
project/CopyrightHeaderForBoilerplate.scala | 2 +-
project/CopyrightHeaderForBuild.scala | 2 +-
project/CopyrightHeaderForProtobuf.scala | 2 +-
project/Dependencies.scala | 197 +++++++-------
project/Doc.scala | 65 +++--
project/JavaFormatter.scala | 2 +-
project/Jdk9.scala | 12 +-
project/JdkOptions.scala | 2 +-
project/Jvm.scala | 4 +-
project/MiMa.scala | 5 +-
project/OSGi.scala | 38 +--
project/Paradox.scala | 102 ++++----
project/Protobuf.scala | 18 +-
project/Publish.scala | 10 +-
project/SbtMultiJvm.scala | 31 +--
project/ScalafixSupport.scala | 4 +-
project/SigarLoader.scala | 6 +-
project/StreamOperatorsIndexGenerator.scala | 25 +-
project/TestExtras.scala | 2 +-
project/ValidatePullRequest.scala | 30 +--
project/plugins.sbt | 2 +-
983 files changed, 8840 insertions(+), 8614 deletions(-)
create mode 100644 .gitattributes
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@pekko.apache.org
For additional commands, e-mail: commits-help@pekko.apache.org
[incubator-pekko] 03/03: format source with scalafmt, #2
Posted by md...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
mdedetrich pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/incubator-pekko.git
commit 15b163da7456ac82339b8aa7b8ee5ab28e1770f9
Author: Auto Format <nobody>
AuthorDate: Thu Nov 3 09:46:22 2022 +0100
format source with scalafmt, #2
---
.../testkit/typed/internal/ActorSystemStub.scala | 2 +-
.../typed/internal/BehaviorTestKitImpl.scala | 10 +-
.../typed/internal/StubbedActorContext.scala | 13 +-
.../testkit/typed/internal/TestProbeImpl.scala | 5 +-
.../typed/javadsl/TestKitJunitResource.scala | 4 +-
.../testkit/typed/scaladsl/ActorTestKit.scala | 4 +-
.../actor/testkit/typed/scaladsl/package.scala | 1 -
.../testkit/typed/scaladsl/ActorTestKitSpec.scala | 6 +-
.../typed/scaladsl/BehaviorTestKitSpec.scala | 18 +-
.../testkit/typed/scaladsl/TestAppenderSpec.scala | 4 +-
.../testkit/typed/scaladsl/TestProbeSpec.scala | 4 +-
.../typed/scaladsl/AsyncTestingExampleSpec.scala | 34 +--
.../typed/scaladsl/ManualTimerExampleSpec.scala | 4 +-
.../typed/scaladsl/SyncTestingExampleSpec.scala | 32 +--
.../testkit/typed/scaladsl/TestConfigExample.scala | 12 +-
.../src/test/scala/akka/AkkaExceptionSpec.scala | 6 +-
.../test/scala/akka/actor/ActorLifeCycleSpec.scala | 8 +-
.../src/test/scala/akka/actor/ActorRefSpec.scala | 58 ++---
.../test/scala/akka/actor/ActorSelectionSpec.scala | 27 +-
.../test/scala/akka/actor/ActorSystemSpec.scala | 24 +-
.../test/scala/akka/actor/ActorTimeoutSpec.scala | 2 +-
.../test/scala/akka/actor/ConsistencySpec.scala | 6 +-
.../scala/akka/actor/CoordinatedShutdownSpec.scala | 20 +-
.../src/test/scala/akka/actor/DeathWatchSpec.scala | 6 +-
.../test/scala/akka/actor/DynamicAccessSpec.scala | 3 +-
.../src/test/scala/akka/actor/FSMActorSpec.scala | 2 +-
.../src/test/scala/akka/actor/HotSwapSpec.scala | 16 +-
.../akka/actor/LocalActorRefProviderSpec.scala | 18 +-
.../scala/akka/actor/ProviderSelectionSpec.scala | 2 +-
.../src/test/scala/akka/actor/SchedulerSpec.scala | 79 +++---
.../scala/akka/actor/SupervisorHierarchySpec.scala | 55 ++--
.../src/test/scala/akka/actor/SupervisorSpec.scala | 22 +-
.../src/test/scala/akka/actor/Ticket669Spec.scala | 2 +-
.../src/test/scala/akka/actor/TypedActorSpec.scala | 14 +-
.../src/test/scala/akka/actor/UidClashTest.scala | 2 +-
.../scala/akka/actor/dispatch/ActorModelSpec.scala | 8 +-
.../akka/actor/dispatch/DispatchersSpec.scala | 2 +-
.../src/test/scala/akka/config/ConfigSpec.scala | 8 +-
.../scala/akka/dispatch/ExecutionContextSpec.scala | 10 +-
.../scala/akka/dispatch/MailboxConfigSpec.scala | 20 +-
.../akka/dispatch/PriorityDispatcherSpec.scala | 10 +-
.../dispatch/StablePriorityDispatcherSpec.scala | 10 +-
.../src/test/scala/akka/event/EventBusSpec.scala | 4 +-
.../test/scala/akka/event/EventStreamSpec.scala | 12 +-
.../src/test/scala/akka/event/LoggerSpec.scala | 4 +-
.../test/scala/akka/event/LoggingReceiveSpec.scala | 7 +-
.../test/scala/akka/event/jul/JavaLoggerSpec.scala | 12 +-
.../src/test/scala/akka/io/TcpConnectionSpec.scala | 41 +--
.../scala/akka/io/TcpIntegrationSpecSupport.scala | 2 +-
.../io/dns/AsyncDnsResolverIntegrationSpec.scala | 4 +-
.../io/dns/internal/AsyncDnsResolverSpec.scala | 7 +-
.../src/test/scala/akka/pattern/AskSpec.scala | 48 ++--
.../pattern/BackoffOnRestartSupervisorSpec.scala | 6 +-
.../scala/akka/pattern/BackoffSupervisorSpec.scala | 2 +-
.../scala/akka/pattern/CircuitBreakerMTSpec.scala | 6 +-
.../scala/akka/pattern/CircuitBreakerSpec.scala | 6 +-
.../src/test/scala/akka/pattern/RetrySpec.scala | 13 +-
.../akka/pattern/extended/ExplicitAskSpec.scala | 8 +-
.../akka/routing/MetricsBasedResizerSpec.scala | 12 +-
.../src/test/scala/akka/routing/RandomSpec.scala | 44 ++--
.../src/test/scala/akka/routing/ResizerSpec.scala | 10 +-
.../test/scala/akka/routing/RoundRobinSpec.scala | 54 ++--
.../src/test/scala/akka/routing/RoutingSpec.scala | 8 +-
.../routing/ScatterGatherFirstCompletedSpec.scala | 6 +-
.../scala/akka/routing/SmallestMailboxSpec.scala | 8 +-
.../test/scala/akka/routing/TailChoppingSpec.scala | 22 +-
.../scala/akka/util/BoundedBlockingQueueSpec.scala | 6 +-
.../src/test/scala/akka/util/ByteStringSpec.scala | 36 +--
.../test/scala/akka/util/FrequencyListSpec.scala | 104 ++++----
.../src/test/scala/akka/util/IndexSpec.scala | 22 +-
.../test/scala/akka/actor/typed/BehaviorSpec.scala | 22 +-
.../test/scala/akka/actor/typed/DeferredSpec.scala | 9 +-
.../scala/akka/actor/typed/InterceptSpec.scala | 9 +-
.../akka/actor/typed/MailboxSelectorSpec.scala | 16 +-
.../test/scala/akka/actor/typed/WatchSpec.scala | 16 +-
.../akka/actor/typed/delivery/TestConsumer.scala | 3 +-
.../actor/typed/internal/ActorSystemSpec.scala | 27 +-
.../typed/javadsl/AdaptationFailureSpec.scala | 9 +-
.../actor/typed/scaladsl/ActorContextAskSpec.scala | 6 +-
.../actor/typed/scaladsl/ActorLoggingSpec.scala | 31 ++-
.../actor/typed/scaladsl/GracefulStopSpec.scala | 16 +-
.../actor/typed/scaladsl/MessageAdapterSpec.scala | 6 +-
.../akka/actor/typed/scaladsl/OnSignalSpec.scala | 4 +-
.../actor/typed/scaladsl/adapter/AdapterSpec.scala | 12 +-
.../scala/docs/akka/typed/AggregatorSpec.scala | 4 +-
.../scala/docs/akka/typed/DispatchersDocSpec.scala | 4 +-
.../test/scala/docs/akka/typed/FSMDocSpec.scala | 20 +-
.../docs/akka/typed/GracefulStopDocSpec.scala | 20 +-
.../docs/akka/typed/InteractionPatternsSpec.scala | 8 +-
.../src/test/scala/docs/akka/typed/IntroSpec.scala | 44 ++--
.../scala/docs/akka/typed/LoggingDocExamples.scala | 42 +--
.../test/scala/docs/akka/typed/OOIntroSpec.scala | 32 +--
.../test/scala/docs/akka/typed/RouterSpec.scala | 18 +-
.../docs/akka/typed/SpawnProtocolDocSpec.scala | 8 +-
.../docs/akka/typed/StyleGuideDocExamples.scala | 104 ++++----
.../coexistence/ClassicWatchingTypedSpec.scala | 16 +-
.../coexistence/TypedWatchingClassicSpec.scala | 12 +-
.../akka/typed/extensions/ExtensionDocSpec.scala | 4 +-
.../akka/typed/fromclassic/ClassicSample.scala | 6 +-
.../docs/akka/typed/fromclassic/TypedSample.scala | 8 +-
.../typed/supervision/SupervisionCompileOnly.scala | 36 +--
.../main/scala/akka/actor/typed/ActorSystem.scala | 2 +-
.../src/main/scala/akka/actor/typed/Behavior.scala | 1 -
.../main/scala/akka/actor/typed/Scheduler.scala | 3 -
.../delivery/internal/ProducerControllerImpl.scala | 6 +-
.../WorkPullingProducerControllerImpl.scala | 5 +-
.../akka/actor/typed/eventstream/EventStream.scala | 1 -
.../actor/typed/internal/ActorContextImpl.scala | 2 +-
.../akka/actor/typed/internal/ExtensionsImpl.scala | 12 +-
.../actor/typed/internal/InterceptorImpl.scala | 3 +-
.../actor/typed/internal/StashBufferImpl.scala | 15 +-
.../akka/actor/typed/internal/Supervision.scala | 29 ++-
.../akka/actor/typed/internal/SystemMessage.scala | 4 -
.../actor/typed/internal/TimerSchedulerImpl.scala | 2 +-
.../typed/internal/adapter/ActorAdapter.scala | 78 +++---
.../internal/receptionist/LocalReceptionist.scala | 13 +-
.../typed/internal/routing/RoutingLogic.scala | 4 +-
.../akka/actor/typed/javadsl/AskPattern.scala | 5 +-
.../scala/akka/actor/typed/javadsl/Behaviors.scala | 12 +-
.../scala/akka/actor/typed/javadsl/Receive.scala | 1 -
.../akka/actor/typed/javadsl/ReceiveBuilder.scala | 26 +-
.../akka/actor/typed/javadsl/StashBuffer.scala | 2 +-
.../actor/typed/scaladsl/AbstractBehavior.scala | 10 +-
.../akka/actor/typed/scaladsl/Behaviors.scala | 3 -
.../scala/akka/actor/typed/scaladsl/package.scala | 2 +-
.../main/scala-2.12/akka/util/ByteIterator.scala | 64 ++---
.../src/main/scala-2.12/akka/util/ByteString.scala | 4 +-
.../scala-2.12/akka/util/ccompat/package.scala | 6 +-
.../main/scala-2.13/akka/util/ByteIterator.scala | 64 ++---
.../src/main/scala-2.13/akka/util/ByteString.scala | 4 +-
.../src/main/scala-3/akka/util/ByteIterator.scala | 64 ++---
.../src/main/scala-3/akka/util/ByteString.scala | 4 +-
akka-actor/src/main/scala/akka/AkkaVersion.scala | 4 +-
.../src/main/scala/akka/actor/AbstractActor.scala | 5 -
.../src/main/scala/akka/actor/AbstractFSM.scala | 4 -
.../src/main/scala/akka/actor/AbstractProps.scala | 3 +-
akka-actor/src/main/scala/akka/actor/Actor.scala | 26 +-
.../src/main/scala/akka/actor/ActorCell.scala | 19 +-
.../src/main/scala/akka/actor/ActorPath.scala | 16 +-
.../src/main/scala/akka/actor/ActorRef.scala | 6 +-
.../main/scala/akka/actor/ActorRefProvider.scala | 2 +-
.../src/main/scala/akka/actor/ActorSelection.scala | 5 +-
.../src/main/scala/akka/actor/ActorSystem.scala | 100 +++----
akka-actor/src/main/scala/akka/actor/Address.scala | 3 +-
.../scala/akka/actor/CoordinatedShutdown.scala | 35 +--
.../src/main/scala/akka/actor/Deployer.scala | 2 +-
.../src/main/scala/akka/actor/Extension.scala | 2 -
.../src/main/scala/akka/actor/FaultHandling.scala | 16 +-
.../akka/actor/LightArrayRevolverScheduler.scala | 65 ++---
.../scala/akka/actor/ReflectiveDynamicAccess.scala | 4 +-
.../src/main/scala/akka/actor/Scheduler.scala | 72 +++---
akka-actor/src/main/scala/akka/actor/Stash.scala | 11 +-
.../src/main/scala/akka/actor/TypedActor.scala | 43 ++-
.../main/scala/akka/actor/dungeon/Children.scala | 27 +-
.../akka/actor/dungeon/ChildrenContainer.scala | 3 +-
.../main/scala/akka/actor/dungeon/DeathWatch.scala | 6 +-
.../main/scala/akka/actor/dungeon/Dispatch.scala | 14 +-
.../scala/akka/actor/dungeon/FaultHandling.scala | 121 +++++----
.../scala/akka/actor/dungeon/ReceiveTimeout.scala | 2 +-
.../scala/akka/dispatch/AbstractDispatcher.scala | 23 +-
.../scala/akka/dispatch/BalancingDispatcher.scala | 14 +-
.../scala/akka/dispatch/BatchingExecutor.scala | 2 +-
.../src/main/scala/akka/dispatch/Dispatcher.scala | 4 +-
.../src/main/scala/akka/dispatch/Future.scala | 2 +-
.../src/main/scala/akka/dispatch/Mailbox.scala | 45 ++--
.../src/main/scala/akka/dispatch/Mailboxes.scala | 2 +-
.../scala/akka/dispatch/PinnedDispatcher.scala | 4 +-
.../akka/dispatch/affinity/AffinityPool.scala | 3 +-
.../scala/akka/dispatch/sysmsg/SystemMessage.scala | 4 -
.../src/main/scala/akka/event/EventBus.scala | 13 +-
akka-actor/src/main/scala/akka/event/Logging.scala | 36 +--
.../src/main/scala/akka/event/LoggingReceive.scala | 2 +-
.../main/scala/akka/io/DirectByteBufferPool.scala | 7 +-
akka-actor/src/main/scala/akka/io/Dns.scala | 9 +-
.../src/main/scala/akka/io/DnsProvider.scala | 1 -
.../src/main/scala/akka/io/SelectionHandler.scala | 5 +-
akka-actor/src/main/scala/akka/io/Tcp.scala | 11 +-
.../src/main/scala/akka/io/TcpConnection.scala | 25 +-
akka-actor/src/main/scala/akka/io/TcpManager.scala | 5 +-
.../main/scala/akka/io/TcpOutgoingConnection.scala | 2 +-
akka-actor/src/main/scala/akka/io/UdpManager.scala | 5 +-
.../src/main/scala/akka/io/dns/DnsProtocol.scala | 4 +-
.../scala/akka/io/dns/DnsResourceRecords.scala | 2 +-
.../akka/io/dns/internal/AsyncDnsManager.scala | 7 +-
.../scala/akka/io/dns/internal/DnsMessage.scala | 2 +-
.../scala/akka/io/dns/internal/DomainName.scala | 4 +-
.../src/main/scala/akka/pattern/AskSupport.scala | 5 +-
.../src/main/scala/akka/pattern/Backoff.scala | 5 +-
.../scala/akka/pattern/BackoffSupervisor.scala | 2 +-
.../main/scala/akka/pattern/CircuitBreaker.scala | 9 +-
.../scala/akka/pattern/GracefulStopSupport.scala | 6 +-
.../src/main/scala/akka/routing/Balancing.scala | 2 +-
.../main/scala/akka/routing/ConsistentHash.scala | 11 +-
.../scala/akka/routing/ConsistentHashing.scala | 3 +-
.../src/main/scala/akka/routing/MurmurHash.scala | 20 +-
.../akka/routing/OptimalSizeExploringResizer.scala | 6 +-
.../src/main/scala/akka/routing/Resizer.scala | 31 +--
.../src/main/scala/akka/routing/RouterConfig.scala | 3 +-
.../main/scala/akka/routing/SmallestMailbox.scala | 6 +-
.../scala/akka/serialization/Serialization.scala | 55 ++--
.../main/scala/akka/serialization/Serializer.scala | 1 -
.../scala/akka/util/BoundedBlockingQueue.scala | 20 +-
.../src/main/scala/akka/util/Collections.scala | 2 +-
.../src/main/scala/akka/util/FrequencySketch.scala | 8 +-
akka-actor/src/main/scala/akka/util/HashCode.scala | 2 +-
akka-actor/src/main/scala/akka/util/Helpers.scala | 2 +-
akka-actor/src/main/scala/akka/util/Index.scala | 30 +--
.../src/main/scala/akka/util/LineNumbers.scala | 2 +-
.../src/main/scala/akka/util/ManifestInfo.scala | 6 +-
.../main/scala/akka/util/PrettyByteString.scala | 2 +-
.../src/main/scala/akka/util/PrettyDuration.scala | 2 +-
.../src/main/scala/akka/util/UUIDComparator.scala | 4 +-
.../src/main/scala/akka/actor/ActorBenchmark.scala | 2 +-
.../actor/AffinityPoolComparativeBenchmark.scala | 2 +-
.../AffinityPoolRequestResponseBenchmark.scala | 2 +-
.../main/scala/akka/actor/ScheduleBenchmark.scala | 7 +-
.../typed/delivery/ReliableDeliveryBenchmark.scala | 2 +-
.../cluster/ddata/VersionVectorBenchmark.scala | 10 +-
.../scala/akka/dispatch/NodeQueueBenchmark.scala | 10 +-
...tentActorWithAtLeastOnceDeliveryBenchmark.scala | 8 +-
.../SerializationFormatCacheBenchmark.scala | 15 +-
.../scala/akka/stream/EmptySourceBenchmark.scala | 2 +-
.../scala/akka/stream/InterpreterBenchmark.scala | 17 +-
.../akka/stream/MaterializationBenchmark.scala | 6 +-
.../cluster/metrics/ClusterMetricsCollector.scala | 3 +-
.../cluster/metrics/ClusterMetricsExtension.scala | 2 +-
.../cluster/metrics/ClusterMetricsRouting.scala | 10 +-
.../src/main/scala/akka/cluster/metrics/EWMA.scala | 1 -
.../main/scala/akka/cluster/metrics/Metric.scala | 3 +-
.../scala/akka/cluster/metrics/Provision.scala | 6 +-
.../metrics/protobuf/MessageSerializer.scala | 2 +-
.../metrics/ClusterMetricsExtensionSpec.scala | 10 +-
.../metrics/ClusterMetricsRoutingSpec.scala | 10 +-
.../cluster/metrics/sample/StatsSampleSpec.scala | 18 +-
.../akka/cluster/metrics/sample/StatsService.scala | 8 +-
.../metrics/ClusterMetricsExtensionSpec.scala | 4 +-
.../metrics/ClusterMetricsRoutingSpec.scala | 2 +-
.../test/scala/akka/cluster/metrics/EWMASpec.scala | 8 +-
.../cluster/metrics/MetricsCollectorSpec.scala | 4 +-
.../test/scala/akka/cluster/metrics/TestUtil.scala | 3 +-
.../akka/cluster/metrics/WeightedRouteesSpec.scala | 4 +-
.../sharding/typed/ReplicatedEntityProvider.scala | 46 ++--
.../typed/internal/ClusterShardingImpl.scala | 4 +-
.../cluster/sharding/typed/internal/Murmur2.scala | 21 +-
.../sharding/typed/javadsl/ClusterSharding.scala | 1 -
.../sharding/typed/scaladsl/ClusterSharding.scala | 1 -
.../ClusterShardingRememberEntitiesPerfSpec.scala | 16 +-
.../ClusterShardingPreparingForShutdownSpec.scala | 45 ++--
.../sharding/typed/ClusterShardingStatsSpec.scala | 2 +-
.../typed/MultiDcClusterShardingSpec.scala | 8 +-
.../sharding/typed/ReplicatedShardingSpec.scala | 11 +-
.../sharding/typed/ShardedDaemonProcessSpec.scala | 6 +-
.../typed/delivery/DeliveryThroughputSpec.scala | 10 +-
.../typed/scaladsl/ClusterShardingSpec.scala | 2 +-
.../typed/scaladsl/ClusterShardingStateSpec.scala | 4 +-
.../typed/scaladsl/ShardedDaemonProcessSpec.scala | 4 +-
.../sharding/typed/AccountExampleDocSpec.scala | 2 +-
...tExampleWithCommandHandlersInDurableState.scala | 20 +-
.../AccountExampleWithCommandHandlersInState.scala | 4 +-
.../AccountExampleWithEventHandlersInState.scala | 20 +-
.../AccountExampleWithOptionDurableState.scala | 4 +-
.../typed/AccountExampleWithOptionState.scala | 4 +-
...urableStateStoreQueryUsageCompileOnlySpec.scala | 4 +-
.../typed/HelloWorldPersistentEntityExample.scala | 8 +-
.../typed/ReplicatedShardingCompileOnlySpec.scala | 29 ++-
.../sharding/typed/ShardingCompileOnlySpec.scala | 44 ++--
.../docs/delivery/PointToPointDocExample.scala | 12 +-
.../scala/docs/delivery/ShardingDocExample.scala | 12 +-
.../docs/delivery/WorkPullingDocExample.scala | 36 +--
.../akka/cluster/sharding/ClusterSharding.scala | 26 +-
.../cluster/sharding/ClusterShardingSettings.scala | 34 +--
.../RemoveInternalClusterShardingData.scala | 2 +-
.../main/scala/akka/cluster/sharding/Shard.scala | 17 +-
.../akka/cluster/sharding/ShardCoordinator.scala | 19 +-
.../scala/akka/cluster/sharding/ShardRegion.scala | 6 +-
.../akka/cluster/sharding/ShardingQueries.scala | 3 +-
.../external/ExternalShardAllocationStrategy.scala | 45 ++--
.../ExternalShardAllocationClientImpl.scala | 2 +-
.../AbstractLeastShardAllocationStrategy.scala | 2 -
.../internal/DDataRememberEntitiesShardStore.scala | 15 +-
.../internal/EntityPassivationStrategy.scala | 8 +-
.../RandomizedBrainResolverIntegrationSpec.scala | 4 +-
.../sbr/SplitBrainResolverIntegrationSpec.scala | 11 +-
.../ClusterShardCoordinatorDowning2Spec.scala | 2 +-
.../ClusterShardCoordinatorDowningSpec.scala | 2 +-
.../sharding/ClusterShardingFailureSpec.scala | 6 +-
.../ClusterShardingIncorrectSetupSpec.scala | 3 +-
.../sharding/ClusterShardingLeavingSpec.scala | 2 +-
.../sharding/ClusterShardingQueriesSpec.scala | 40 +--
...rShardingRememberEntitiesNewExtractorSpec.scala | 3 +-
.../cluster/sharding/ClusterShardingSpec.scala | 127 ++++-----
.../sharding/ExternalShardAllocationSpec.scala | 18 +-
.../sharding/MultiDcClusterShardingSpec.scala | 20 +-
.../sharding/MultiNodeClusterShardingConfig.scala | 3 +-
.../sharding/MultiNodeClusterShardingSpec.scala | 3 +-
.../RollingUpdateShardAllocationSpec.scala | 18 +-
.../sharding/ClusterShardingLeaseSpec.scala | 6 +-
.../sharding/ConcurrentStartupShardingSpec.scala | 7 +-
.../sharding/CoordinatedShutdownShardingSpec.scala | 20 +-
.../cluster/sharding/EntityTerminationSpec.scala | 16 +-
...eastShardAllocationStrategyRandomizedSpec.scala | 3 +-
.../sharding/PersistentShardingMigrationSpec.scala | 6 +-
.../sharding/RememberEntitiesFailureSpec.scala | 24 +-
...ememberEntitiesShardIdExtractorChangeSpec.scala | 6 +-
.../akka/cluster/sharding/ShardWithLeaseSpec.scala | 2 +-
.../akka/cluster/sharding/StartEntitySpec.scala | 24 +-
.../internal/RememberEntitiesShardStoreSpec.scala | 10 +-
.../sharding/passivation/simulator/Simulator.scala | 13 +-
.../passivation/simulator/SimulatorStats.scala | 16 +-
.../scala/akka/cluster/client/ClusterClient.scala | 2 -
.../cluster/pubsub/DistributedPubSubMediator.scala | 7 +-
.../singleton/ClusterSingletonManager.scala | 12 +-
.../cluster/singleton/ClusterSingletonProxy.scala | 1 -
.../ClusterSingletonMessageSerializer.scala | 22 +-
.../akka/cluster/client/ClusterClientSpec.scala | 38 +--
.../pubsub/DistributedPubSubMediatorSpec.scala | 32 +--
.../ClusterSingletonManagerLeaseSpec.scala | 22 +-
.../ClusterSingletonManagerLeave2Spec.scala | 2 +-
.../ClusterSingletonManagerLeaveSpec.scala | 2 +-
...rSingletonManagerPreparingForShutdownSpec.scala | 16 +-
.../singleton/ClusterSingletonManagerSpec.scala | 28 +-
.../ddata/typed/internal/ReplicatorBehavior.scala | 4 +-
.../akka/cluster/typed/ClusterSingleton.scala | 4 +-
.../internal/AdaptedClusterSingletonImpl.scala | 2 +-
.../typed/internal/receptionist/Registry.scala | 3 -
.../scala/akka/cluster/typed/PubSubSpec.scala | 8 +-
.../ClusterReceptionistUnreachabilitySpec.scala | 46 ++--
.../typed/scaladsl/ReplicatorCompileOnlyTest.scala | 8 +-
.../scala/akka/cluster/typed/ActorSystemSpec.scala | 27 +-
.../cluster/typed/ClusterSingletonApiSpec.scala | 12 +-
.../scala/akka/cluster/typed/GroupRouterSpec.scala | 48 ++--
.../cluster/typed/RemoteDeployNotAllowedSpec.scala | 4 +-
.../akka/cluster/typed/RemoteMessageSpec.scala | 6 +-
.../receptionist/ClusterReceptionistSpec.scala | 40 +--
.../ddata/typed/scaladsl/ReplicatorDocSpec.scala | 8 +-
.../cluster/typed/BasicClusterExampleSpec.scala | 32 +--
.../cluster/typed/DistributedPubSubExample.scala | 24 +-
.../akka/cluster/typed/ReceptionistExample.scala | 20 +-
.../cluster/typed/SingletonCompileOnlySpec.scala | 20 +-
.../src/main/scala/akka/cluster/Cluster.scala | 4 +-
.../akka/cluster/ClusterActorRefProvider.scala | 2 +-
.../main/scala/akka/cluster/ClusterDaemon.scala | 39 +--
.../src/main/scala/akka/cluster/ClusterEvent.scala | 19 +-
.../main/scala/akka/cluster/ClusterHeartbeat.scala | 8 +-
.../src/main/scala/akka/cluster/ClusterJmx.scala | 4 +-
.../main/scala/akka/cluster/ClusterReadView.scala | 176 ++++++-------
.../akka/cluster/CoordinatedShutdownLeave.scala | 4 +-
.../akka/cluster/CrossDcClusterHeartbeat.scala | 29 ++-
.../cluster/JoinConfigCompatCheckCluster.scala | 4 +-
.../src/main/scala/akka/cluster/Member.scala | 2 +-
.../main/scala/akka/cluster/MembershipState.scala | 18 +-
.../src/main/scala/akka/cluster/Reachability.scala | 4 +-
.../main/scala/akka/cluster/SeedNodeProcess.scala | 1 -
.../protobuf/ClusterMessageSerializer.scala | 28 +-
.../akka/cluster/routing/ClusterRouterConfig.scala | 4 +-
.../scala/akka/cluster/sbr/DowningStrategy.scala | 20 +-
.../akka/cluster/sbr/SplitBrainResolver.scala | 2 +-
.../scala/akka/cluster/ClusterDeathWatchSpec.scala | 26 +-
.../scala/akka/cluster/ClusterShutdownSpec.scala | 35 +--
.../scala/akka/cluster/InitialHeartbeatSpec.scala | 12 +-
.../akka/cluster/InitialMembersOfNewDcSpec.scala | 8 +-
.../akka/cluster/LargeMessageClusterSpec.scala | 2 +-
.../scala/akka/cluster/LeaderElectionSpec.scala | 7 +-
.../scala/akka/cluster/LeaderLeavingSpec.scala | 25 +-
.../cluster/MembershipChangeListenerUpSpec.scala | 46 ++--
.../cluster/MultiDcHeartbeatTakingOverSpec.scala | 5 +-
.../scala/akka/cluster/MultiDcSplitBrainSpec.scala | 4 +-
.../akka/cluster/MultiDcSunnyWeatherSpec.scala | 2 +-
.../scala/akka/cluster/MultiNodeClusterSpec.scala | 8 +-
.../akka/cluster/NodeLeavingAndExitingSpec.scala | 20 +-
.../multi-jvm/scala/akka/cluster/NodeUpSpec.scala | 12 +-
.../akka/cluster/RestartFirstSeedNodeSpec.scala | 12 +-
.../scala/akka/cluster/RestartNode2Spec.scala | 12 +-
.../scala/akka/cluster/RestartNode3Spec.scala | 12 +-
.../scala/akka/cluster/RestartNodeSpec.scala | 12 +-
.../akka/cluster/SharedMediaDriverSupport.scala | 20 +-
.../scala/akka/cluster/StreamRefSpec.scala | 4 +-
.../multi-jvm/scala/akka/cluster/StressSpec.scala | 4 +-
.../scala/akka/cluster/SunnyWeatherSpec.scala | 14 +-
.../cluster/SurviveNetworkInstabilitySpec.scala | 4 +-
.../ClusterConsistentHashingRouterSpec.scala | 3 +-
.../akka/cluster/routing/UseRoleIgnoredSpec.scala | 4 +-
.../scala/akka/cluster/ClusterDeployerSpec.scala | 4 +-
.../cluster/ClusterHeartbeatSenderStateSpec.scala | 6 +-
.../src/test/scala/akka/cluster/ClusterSpec.scala | 12 +-
.../scala/akka/cluster/DowningProviderSpec.scala | 21 +-
.../src/test/scala/akka/cluster/GossipSpec.scala | 8 +-
.../scala/akka/cluster/HeartbeatNodeRingSpec.scala | 2 +-
.../scala/akka/cluster/MemberOrderingSpec.scala | 8 +-
.../routing/ClusterRouterSupervisorSpec.scala | 11 +-
.../akka/cluster/sbr/SplitBrainResolverSpec.scala | 15 +-
.../test/scala/akka/cluster/testkit/AutoDown.scala | 1 -
.../scala/akka/discovery/ServiceDiscovery.scala | 2 -
.../scala/doc/akka/discovery/CompileOnlySpec.scala | 12 +-
.../src/main/scala/akka/cluster/ddata/LWWMap.scala | 2 +-
.../src/main/scala/akka/cluster/ddata/ORMap.scala | 8 +-
.../main/scala/akka/cluster/ddata/ORMultiMap.scala | 8 +-
.../src/main/scala/akka/cluster/ddata/ORSet.scala | 3 +-
.../main/scala/akka/cluster/ddata/Replicator.scala | 18 +-
.../ddata/protobuf/ReplicatedDataSerializer.scala | 8 +-
.../protobuf/ReplicatorMessageSerializer.scala | 2 +-
.../ddata/protobuf/SerializationSupport.scala | 15 +-
.../scala/akka/cluster/ddata/DurableDataSpec.scala | 3 +-
.../akka/cluster/ddata/DurablePruningSpec.scala | 22 +-
.../cluster/ddata/JepsenInspiredInsertSpec.scala | 14 +-
.../scala/akka/cluster/ddata/PerformanceSpec.scala | 4 +-
.../scala/akka/cluster/ddata/ReplicatorSpec.scala | 6 +-
.../ddata/DeltaPropagationSelectorSpec.scala | 7 +-
.../scala/akka/cluster/ddata/LotsOfDataBot.scala | 1 -
.../test/scala/akka/cluster/ddata/ORMapSpec.scala | 12 +-
.../test/scala/akka/cluster/ddata/ORSetSpec.scala | 58 ++---
.../protobuf/ReplicatedDataSerializerSpec.scala | 4 +-
.../stream/operators/source/AsSubscriber.scala | 49 ++--
.../stream/operators/source/FromPublisher.scala | 32 +--
.../src/test/scala/docs/actor/ActorDocSpec.scala | 164 ++++++------
.../docs/actor/ByteBufferSerializerDocSpec.scala | 4 +-
.../src/test/scala/docs/actor/FSMDocSpec.scala | 88 +++----
.../scala/docs/actor/FaultHandlingDocSpec.scala | 56 ++--
.../scala/docs/actor/InitializationDocSpec.scala | 8 +-
.../test/scala/docs/actor/PropsEdgeCaseSpec.scala | 8 +-
.../test/scala/docs/actor/SchedulerDocSpec.scala | 28 +-
.../docs/actor/SharedMutableStateDocSpec.scala | 4 +-
.../src/test/scala/docs/actor/TimerDocSpec.scala | 4 +-
.../test/scala/docs/actor/UnnestedReceives.scala | 30 +--
.../docs/actor/io/dns/DnsCompileOnlyDocSpec.scala | 16 +-
.../scala/docs/actor/typed/BlockingActor.scala | 2 +-
.../actor/typed/BlockingDispatcherSample.scala | 4 +-
.../actor/typed/CoordinatedActorShutdownSpec.scala | 20 +-
.../scala/docs/actor/typed/DispatcherDocSpec.scala | 12 +-
.../actor/typed/SharedMutableStateDocSpec.scala | 4 +-
.../circuitbreaker/CircuitBreakerDocSpec.scala | 14 +-
.../test/scala/docs/cluster/ClusterDocSpec.scala | 14 +-
.../scala/docs/cluster/FactorialFrontend.scala | 12 +-
.../scala/docs/cluster/SimpleClusterListener.scala | 4 +-
.../docs/cluster/SimpleClusterListener2.scala | 16 +-
.../singleton/ClusterSingletonSupervision.scala | 4 +-
.../src/test/scala/docs/config/ConfigDocSpec.scala | 4 +-
.../scala/docs/coordination/LeaseDocSpec.scala | 12 +-
.../scala/docs/ddata/DistributedDataDocSpec.scala | 77 +++---
.../src/test/scala/docs/ddata/ShoppingCart.scala | 16 +-
.../ddata/protobuf/TwoPhaseSetSerializer.scala | 4 +-
.../scala/docs/dispatcher/DispatcherDocSpec.scala | 60 ++---
.../src/test/scala/docs/duration/Sample.scala | 8 +-
.../test/scala/docs/event/EventBusDocSpec.scala | 32 +--
.../src/test/scala/docs/event/LoggingDocSpec.scala | 48 ++--
.../scala/docs/extension/ExtensionDocSpec.scala | 24 +-
.../docs/extension/SettingsExtensionDocSpec.scala | 8 +-
akka-docs/src/test/scala/docs/faq/Faq.scala | 4 +-
.../src/test/scala/docs/future/FutureDocSpec.scala | 152 +++++------
akka-docs/src/test/scala/docs/io/EchoServer.scala | 50 ++--
akka-docs/src/test/scala/docs/io/IODocSpec.scala | 12 +-
.../src/test/scala/docs/io/ReadBackPressure.scala | 20 +-
.../src/test/scala/docs/io/ScalaUdpMulticast.scala | 6 +-
.../test/scala/docs/io/ScalaUdpMulticastSpec.scala | 9 +-
akka-docs/src/test/scala/docs/io/UdpDocSpec.scala | 36 +--
.../docs/pattern/BackoffSupervisorDocSpec.scala | 24 +-
.../docs/persistence/PersistenceDocSpec.scala | 98 +++----
.../docs/persistence/PersistenceMultiDocSpec.scala | 12 +-
.../persistence/PersistencePluginDocSpec.scala | 24 +-
.../PersistenceSchemaEvolutionDocSpec.scala | 20 +-
.../query/LeveldbPersistenceQueryDocSpec.scala | 20 +-
.../query/PersistenceQueryDocSpec.scala | 54 ++--
.../docs/persistence/testkit/Configuration.scala | 8 +-
.../persistence/testkit/PersistenceInitSpec.scala | 4 +-
.../docs/persistence/testkit/TestKitExamples.scala | 12 +-
.../docs/remoting/RemoteDeploymentDocSpec.scala | 16 +-
.../routing/ConsistentHashingRouterDocSpec.scala | 8 +-
.../scala/docs/routing/CustomRouterDocSpec.scala | 22 +-
.../test/scala/docs/routing/RouterDocSpec.scala | 178 ++++++-------
.../docs/serialization/SerializationDocSpec.scala | 36 +--
.../test/scala/docs/stream/BidiFlowDocSpec.scala | 68 ++---
.../scala/docs/stream/CompositionDocSpec.scala | 40 +--
.../src/test/scala/docs/stream/FlowDocSpec.scala | 44 ++--
.../test/scala/docs/stream/FlowErrorDocSpec.scala | 44 ++--
.../scala/docs/stream/FlowParallelismDocSpec.scala | 16 +-
.../scala/docs/stream/FlowStreamRefsDocSpec.scala | 20 +-
.../test/scala/docs/stream/GraphDSLDocSpec.scala | 40 +--
.../test/scala/docs/stream/GraphStageDocSpec.scala | 287 +++++++++++----------
.../docs/stream/GraphStageLoggingDocSpec.scala | 21 +-
.../src/test/scala/docs/stream/HubsDocSpec.scala | 36 +--
.../scala/docs/stream/IntegrationDocSpec.scala | 100 +++----
.../test/scala/docs/stream/MigrationsScala.scala | 16 +-
.../test/scala/docs/stream/QuickStartDocSpec.scala | 32 +--
.../docs/stream/RateTransformationDocSpec.scala | 24 +-
.../scala/docs/stream/ReactiveStreamsDocSpec.scala | 44 ++--
.../test/scala/docs/stream/RestartDocSpec.scala | 8 +-
.../test/scala/docs/stream/SinkRecipeDocSpec.scala | 6 +-
.../scala/docs/stream/StreamBuffersRateSpec.scala | 38 +--
.../docs/stream/StreamPartialGraphDSLDocSpec.scala | 24 +-
.../scala/docs/stream/StreamTestKitDocSpec.scala | 40 +--
.../test/scala/docs/stream/SubstreamDocSpec.scala | 36 +--
.../stream/TwitterStreamQuickstartDocSpec.scala | 84 +++---
.../docs/stream/cookbook/RecipeAdhocSource.scala | 36 +--
.../docs/stream/cookbook/RecipeByteStrings.scala | 46 ++--
.../docs/stream/cookbook/RecipeDecompress.scala | 8 +-
.../scala/docs/stream/cookbook/RecipeDigest.scala | 42 +--
.../stream/cookbook/RecipeDroppyBroadcast.scala | 4 +-
.../docs/stream/cookbook/RecipeFlattenSeq.scala | 4 +-
.../stream/cookbook/RecipeGlobalRateLimit.scala | 10 +-
.../scala/docs/stream/cookbook/RecipeHold.scala | 27 +-
.../docs/stream/cookbook/RecipeKeepAlive.scala | 4 +-
.../stream/cookbook/RecipeLoggingElements.scala | 18 +-
.../docs/stream/cookbook/RecipeManualTrigger.scala | 16 +-
.../docs/stream/cookbook/RecipeMissedTicks.scala | 8 +-
.../docs/stream/cookbook/RecipeMultiGroupBy.scala | 8 +-
.../docs/stream/cookbook/RecipeParseLines.scala | 4 +-
.../docs/stream/cookbook/RecipeReduceByKey.scala | 12 +-
.../scala/docs/stream/cookbook/RecipeSeq.scala | 8 +-
.../docs/stream/cookbook/RecipeSimpleDrop.scala | 4 +-
.../stream/cookbook/RecipeSourceFromFunction.scala | 4 +-
.../docs/stream/cookbook/RecipeSplitter.scala | 28 +-
.../docs/stream/cookbook/RecipeWorkerPool.scala | 4 +-
.../scala/docs/stream/io/StreamFileDocSpec.scala | 28 +-
.../scala/docs/stream/io/StreamTcpDocSpec.scala | 24 +-
.../stream/operators/BroadcastDocExample.scala | 12 +-
.../src/test/scala/docs/stream/operators/Map.scala | 4 +-
.../stream/operators/MergeSequenceDocExample.scala | 11 +-
.../stream/operators/PartitionDocExample.scala | 6 +-
.../docs/stream/operators/SourceOperators.scala | 18 +-
.../docs/stream/operators/WithContextSpec.scala | 4 +-
.../converters/StreamConvertersToJava.scala | 8 +-
.../operators/converters/ToFromJavaIOStreams.scala | 12 +-
.../docs/stream/operators/flow/StatefulMap.scala | 70 ++---
.../docs/stream/operators/sink/AsPublisher.scala | 6 +-
.../docs/stream/operators/sink/Cancelled.scala | 4 +-
.../docs/stream/operators/sink/Collection.scala | 6 +-
.../scala/docs/stream/operators/sink/Fold.scala | 6 +-
.../docs/stream/operators/sink/HeadOption.scala | 6 +-
.../scala/docs/stream/operators/sink/Ignore.scala | 4 +-
.../scala/docs/stream/operators/source/From.scala | 8 +-
.../docs/stream/operators/source/Restart.scala | 40 +--
.../stream/operators/sourceorflow/Collect.scala | 12 +-
.../operators/sourceorflow/CompletionTimeout.scala | 4 +-
.../stream/operators/sourceorflow/Conflate.scala | 8 +-
.../sourceorflow/ExtrapolateAndExpand.scala | 9 +-
.../docs/stream/operators/sourceorflow/Fold.scala | 8 +-
.../stream/operators/sourceorflow/FoldAsync.scala | 7 +-
.../stream/operators/sourceorflow/GroupBy.scala | 8 +-
.../stream/operators/sourceorflow/Grouped.scala | 4 +-
.../operators/sourceorflow/GroupedWeighted.scala | 4 +-
.../operators/sourceorflow/Intersperse.scala | 4 +-
.../docs/stream/operators/sourceorflow/Log.scala | 4 +-
.../operators/sourceorflow/LogWithMarker.scala | 4 +-
.../stream/operators/sourceorflow/MapAsyncs.scala | 5 +-
.../stream/operators/sourceorflow/MapConcat.scala | 4 +-
.../stream/operators/sourceorflow/MapError.scala | 4 +-
.../operators/sourceorflow/MergeLatest.scala | 4 +-
.../stream/operators/sourceorflow/Reduce.scala | 6 +-
.../docs/stream/operators/sourceorflow/Scan.scala | 4 +-
.../stream/operators/sourceorflow/ScanAsync.scala | 4 +-
.../stream/operators/sourceorflow/Sliding.scala | 12 +-
.../docs/stream/operators/sourceorflow/Split.scala | 8 +-
.../stream/operators/sourceorflow/Throttle.scala | 1 -
.../docs/stream/operators/sourceorflow/Watch.scala | 4 +-
.../operators/sourceorflow/WatchTermination.scala | 19 +-
.../test/scala/docs/testkit/ParentChildSpec.scala | 16 +-
.../test/scala/docs/testkit/PlainWordSpec.scala | 2 +-
.../test/scala/docs/testkit/TestkitDocSpec.scala | 100 +++----
.../tutorial_1/ActorHierarchyExperiments.scala | 8 +-
.../src/test/scala/typed/tutorial_3/Device.scala | 4 +-
.../scala/typed/tutorial_3/DeviceInProgress.scala | 16 +-
.../test/scala/typed/tutorial_3/DeviceSpec.scala | 8 +-
.../src/test/scala/typed/tutorial_4/Device.scala | 4 +-
.../test/scala/typed/tutorial_4/DeviceGroup.scala | 12 +-
.../scala/typed/tutorial_4/DeviceGroupSpec.scala | 12 +-
.../scala/typed/tutorial_4/DeviceManager.scala | 12 +-
.../test/scala/typed/tutorial_4/DeviceSpec.scala | 8 +-
.../src/test/scala/typed/tutorial_5/Device.scala | 8 +-
.../test/scala/typed/tutorial_5/DeviceGroup.scala | 10 +-
.../scala/typed/tutorial_5/DeviceGroupQuery.scala | 20 +-
.../typed/tutorial_5/DeviceGroupQuerySpec.scala | 20 +-
.../scala/typed/tutorial_5/DeviceGroupSpec.scala | 16 +-
.../scala/typed/tutorial_5/DeviceManager.scala | 8 +-
.../test/scala/typed/tutorial_5/DeviceSpec.scala | 8 +-
.../akka/remote/testconductor/Conductor.scala | 2 +-
.../akka/remote/testconductor/Extension.scala | 1 -
.../scala/akka/remote/testconductor/Player.scala | 4 +-
.../remote/testconductor/RemoteConnection.scala | 5 +-
.../scala/akka/remote/testkit/MultiNodeSpec.scala | 53 ++--
.../scala/akka/osgi/ActorSystemActivator.scala | 4 +-
.../main/scala/akka/osgi/DefaultOSGiLogger.scala | 2 +-
.../persistence/query/DurableStateChange.scala | 2 -
.../persistence/query/ReadJournalProvider.scala | 1 -
.../leveldb/javadsl/LeveldbReadJournal.scala | 1 -
.../leveldb/scaladsl/LeveldbReadJournal.scala | 2 +-
.../scala/akka/persistence/query/OffsetSpec.scala | 6 +-
.../query/internal/QuerySerializerSpec.scala | 4 +-
.../leveldb/PersistencePluginProxySpec.scala | 12 +-
.../journal/leveldb/SharedLeveldbJournalSpec.scala | 3 +-
.../scala/akka/persistence/CapabilityFlags.scala | 2 +-
.../akka/persistence/journal/JournalSpec.scala | 4 +-
.../persistence/snapshot/SnapshotStoreSpec.scala | 4 +-
.../akka/persistence/testkit/EventStorage.scala | 11 +-
.../persistence/testkit/ProcessingPolicy.scala | 29 ++-
.../akka/persistence/testkit/SnapshotStorage.scala | 7 +-
.../internal/EventSourcedBehaviorTestKitImpl.scala | 19 +-
.../testkit/internal/InMemStorageExtension.scala | 17 +-
.../testkit/internal/TestKitStorage.scala | 16 +-
.../internal/EventsByPersistenceIdStage.scala | 10 +-
.../scaladsl/PersistenceTestKitReadJournal.scala | 11 +-
.../persistence/testkit/scaladsl/TestOps.scala | 30 +--
.../PersistenceTestKitDurableStateStore.scala | 23 +-
.../testkit/javadsl/CommonSnapshotTests.scala | 2 +-
.../testkit/javadsl/CommonTestKitTests.scala | 8 +-
.../testkit/scaladsl/CommonSnapshotTests.scala | 2 +-
.../testkit/scaladsl/CommonTestKitTests.scala | 8 +-
.../testkit/scaladsl/ScalaDslUtils.scala | 13 +-
.../typed/EventSourcedBehaviorLoggingSpec.scala | 7 +-
.../typed/ReplicatedEventPublishingSpec.scala | 41 ++-
.../typed/ReplicatedEventSourcingTaggingSpec.scala | 44 ++--
.../typed/ReplicationIllegalAccessSpec.scala | 37 +--
.../scaladsl/EventSourcedBehaviorFailureSpec.scala | 37 +--
.../typed/scaladsl/EventSourcedBehaviorSpec.scala | 2 +-
.../scaladsl/EventSourcedBehaviorStashSpec.scala | 3 +-
.../scaladsl/EventSourcedBehaviorWatchSpec.scala | 36 +--
.../scaladsl/EventSourcedEventAdapterSpec.scala | 12 +-
.../scaladsl/EventSourcedSequenceNumberSpec.scala | 15 +-
.../scaladsl/EventSourcedStashOverflowSpec.scala | 6 +-
.../typed/scaladsl/LoggerSourceSpec.scala | 25 +-
.../typed/scaladsl/PerformanceSpec.scala | 4 +-
.../state/scaladsl/DurableStateRevisionSpec.scala | 63 +++--
.../typed/ReplicatedAuctionExampleSpec.scala | 41 ++-
.../typed/ReplicatedBlogExampleSpec.scala | 8 +-
.../ReplicatedEventSourcingCompileOnlySpec.scala | 12 +-
.../ReplicatedMovieWatchListExampleSpec.scala | 4 +-
.../typed/ReplicatedShoppingCartExampleSpec.scala | 4 +-
.../scala/akka/persistence/typed/crdt/ORSet.scala | 3 +-
.../persistence/typed/internal/BehaviorSetup.scala | 6 +-
.../typed/internal/ExternalInteractions.scala | 6 +-
.../typed/internal/ReplayingEvents.scala | 3 +-
.../akka/persistence/typed/internal/Running.scala | 46 ++--
.../persistence/typed/javadsl/CommandHandler.scala | 49 ++--
.../typed/javadsl/CommandHandlerWithReply.scala | 49 ++--
.../akka/persistence/typed/javadsl/Effect.scala | 8 +-
.../persistence/typed/javadsl/EventHandler.scala | 19 +-
.../javadsl/ReplicatedEventSourcedBehavior.scala | 2 +-
.../ReplicatedEventSourcingSerializer.scala | 6 +-
.../typed/state/javadsl/CommandHandler.scala | 47 ++--
.../state/javadsl/CommandHandlerWithReply.scala | 47 ++--
.../persistence/typed/state/javadsl/Effect.scala | 8 +-
.../delivery/EventSourcedProducerQueueSpec.scala | 4 +-
...DeliveryWithEventSourcedProducerQueueSpec.scala | 4 +-
...kPullingWithEventSourcedProducerQueueSpec.scala | 4 +-
.../scaladsl/PersistentActorCompileOnlyTest.scala | 100 ++++---
.../typed/BasicPersistentBehaviorCompileOnly.scala | 87 ++++---
.../akka/persistence/typed/BlogPostEntity.scala | 36 +--
.../typed/BlogPostEntityDurableState.scala | 28 +-
...DurableStatePersistentBehaviorCompileOnly.scala | 32 +--
.../typed/PersistentFsmToTypedMigrationSpec.scala | 28 +-
.../akka/persistence/typed/StashingExample.scala | 4 +-
.../main/scala-3/akka/persistence/TraitOrder.scala | 2 +-
.../main/scala/akka/persistence/Eventsourced.scala | 151 +++++------
.../main/scala/akka/persistence/Persistence.scala | 31 +--
.../main/scala/akka/persistence/Persistent.scala | 8 +-
.../scala/akka/persistence/fsm/PersistentFSM.scala | 11 +-
.../akka/persistence/fsm/PersistentFSMBase.scala | 4 -
.../akka/persistence/journal/AsyncRecovery.scala | 4 +-
.../persistence/journal/AsyncWriteJournal.scala | 5 +-
.../akka/persistence/journal/EventAdapter.scala | 8 +-
.../akka/persistence/journal/EventAdapters.scala | 12 +-
.../akka/persistence/journal/ReplayFilter.scala | 9 +-
.../persistence/journal/inmem/InmemJournal.scala | 6 +-
.../persistence/journal/japi/AsyncRecovery.scala | 7 +-
.../journal/leveldb/LeveldbCompaction.scala | 1 -
.../journal/leveldb/LeveldbRecovery.scala | 2 +-
.../persistence/journal/leveldb/LeveldbStore.scala | 37 +--
.../akka/persistence/snapshot/SnapshotStore.scala | 4 +-
.../akka/persistence/AtLeastOnceDeliverySpec.scala | 22 +-
.../scala/akka/persistence/EventAdapterSpec.scala | 3 +-
.../scala/akka/persistence/PerformanceSpec.scala | 2 +-
.../scala/akka/persistence/PersistenceSpec.scala | 21 +-
.../PersistentActorBoundedStashingSpec.scala | 28 +-
.../akka/persistence/PersistentActorSpec.scala | 2 +-
.../SnapshotFailureRobustnessSpec.scala | 2 +-
.../persistence/SnapshotSerializationSpec.scala | 2 +-
.../test/scala/akka/persistence/SnapshotSpec.scala | 10 +-
.../persistence/TimerPersistentActorSpec.scala | 7 +-
.../akka/persistence/fsm/PersistentFSMSpec.scala | 54 ++--
.../persistence/journal/chaos/ChaosJournal.scala | 22 +-
.../scala/akka/remote/RemoteFeaturesSpec.scala | 2 +-
.../akka/remote/RemoteQuarantinePiercingSpec.scala | 4 +-
.../scala/akka/remote/RemoteReDeploymentSpec.scala | 3 +-
.../scala/akka/remote/RemotingMultiNodeSpec.scala | 4 +-
.../scala/akka/remote/TransportFailSpec.scala | 10 +-
.../akka/remote/artery/MaxThroughputSpec.scala | 26 +-
.../artery/RemoteRestartedQuarantinedSpec.scala | 2 +-
...dStreamRestartWithCompressionInFlightSpec.scala | 6 +-
.../akka/remote/artery/TestRateReporter.scala | 37 +--
.../akka/remote/routing/RemoteRandomSpec.scala | 4 +-
.../akka/remote/routing/RemoteRoundRobinSpec.scala | 8 +-
.../remote/routing/RemoteScatterGatherSpec.scala | 4 +-
.../remote/testconductor/TestConductorSpec.scala | 8 +-
.../akka/remote/testconductor/BarrierSpec.scala | 16 +-
.../src/main/scala/akka/remote/AckedDelivery.scala | 4 +-
.../akka/remote/DeadlineFailureDetector.scala | 2 +-
.../remote/DefaultFailureDetectorRegistry.scala | 1 -
.../src/main/scala/akka/remote/Endpoint.scala | 10 +-
.../akka/remote/FailureDetectorRegistry.scala | 4 +-
.../scala/akka/remote/RemoteActorRefProvider.scala | 20 +-
.../src/main/scala/akka/remote/RemoteDaemon.scala | 121 ++++-----
.../src/main/scala/akka/remote/RemoteWatcher.scala | 4 +-
.../src/main/scala/akka/remote/Remoting.scala | 8 +-
.../scala/akka/remote/artery/ArteryTransport.scala | 27 +-
.../scala/akka/remote/artery/Association.scala | 13 +-
.../src/main/scala/akka/remote/artery/Codecs.scala | 73 +++---
.../main/scala/akka/remote/artery/Handshake.scala | 19 +-
.../akka/remote/artery/MessageDispatcher.scala | 2 +-
.../main/scala/akka/remote/artery/ObjectPool.scala | 2 +-
.../akka/remote/artery/RemoteInstrument.scala | 1 -
.../akka/remote/artery/SystemMessageDelivery.scala | 2 +-
.../scala/akka/remote/artery/aeron/AeronSink.scala | 2 +-
.../akka/remote/artery/aeron/AeronSource.scala | 3 +-
.../artery/aeron/ArteryAeronUdpTransport.scala | 18 +-
.../akka/remote/artery/aeron/TaskRunner.scala | 23 +-
.../remote/artery/compress/CompressionTable.scala | 2 +-
.../artery/compress/DecompressionTable.scala | 2 +-
.../artery/compress/InboundCompressions.scala | 2 +-
.../remote/artery/tcp/ArteryTcpTransport.scala | 30 ++-
.../scala/akka/remote/artery/tcp/TcpFraming.scala | 8 +-
.../serialization/MiscMessageSerializer.scala | 14 +-
.../remote/serialization/ProtobufSerializer.scala | 8 +-
.../transport/AbstractTransportAdapter.scala | 4 +-
.../scala/akka/remote/transport/AkkaPduCodec.scala | 2 +-
.../remote/transport/AkkaProtocolTransport.scala | 10 +-
.../FailureInjectorTransportAdapter.scala | 7 +-
.../akka/remote/transport/TestTransport.scala | 33 +--
.../transport/ThrottlerTransportAdapter.scala | 37 +--
.../scala/akka/remote/transport/Transport.scala | 1 -
.../remote/transport/netty/NettyTransport.scala | 5 +-
.../artery/jfr/JFRRemotingFlightRecorderSpec.scala | 2 +-
.../akka/remote/AccrualFailureDetectorSpec.scala | 59 ++---
.../src/test/scala/akka/remote/DaemonicSpec.scala | 8 +-
.../akka/remote/DeadlineFailureDetectorSpec.scala | 13 +-
.../akka/remote/FailureDetectorRegistrySpec.scala | 47 ++--
.../src/test/scala/akka/remote/LogSourceSpec.scala | 10 +-
.../scala/akka/remote/RemoteFeaturesSpec.scala | 3 +-
.../akka/remote/Ticket1978CommunicationSpec.scala | 8 +-
.../remote/artery/DuplicateHandshakeSpec.scala | 2 +-
.../akka/remote/artery/FlushOnShutdownSpec.scala | 30 +--
.../akka/remote/artery/RemoteDeathWatchSpec.scala | 14 +-
.../akka/remote/artery/RemoteDeploymentSpec.scala | 6 +-
.../RemoteInstrumentsSerializationSpec.scala | 3 +-
.../artery/RemoteMessageSerializationSpec.scala | 10 +-
.../remote/artery/RemoteSendConsistencySpec.scala | 8 +-
.../scala/akka/remote/artery/UntrustedSpec.scala | 12 +-
.../compress/CompressionIntegrationSpec.scala | 40 +--
.../artery/tcp/ssl/PemManagersProviderSpec.scala | 1 -
.../ssl/RotatingKeysSSLEngineProviderSpec.scala | 4 +-
.../remote/artery/tcp/ssl/TlsResourcesSpec.scala | 9 +-
.../remote/artery/tcp/ssl/X509ReadersSpec.scala | 1 -
.../scala/akka/remote/classic/ActorsLeakSpec.scala | 4 +-
.../akka/remote/classic/RemoteDeathWatchSpec.scala | 17 +-
.../akka/remote/classic/RemoteInitErrorSpec.scala | 2 +-
.../scala/akka/remote/classic/RemotingSpec.scala | 26 +-
.../scala/akka/remote/classic/UntrustedSpec.scala | 12 +-
.../classic/transport/AkkaProtocolSpec.scala | 2 +-
.../classic/transport/AkkaProtocolStressTest.scala | 8 +-
.../transport/SwitchableLoggedBehaviorSpec.scala | 6 +-
.../transport/ThrottlerTransportAdapterSpec.scala | 14 +-
.../transport/netty/NettyTransportSpec.scala | 2 +-
.../serialization/jackson/JacksonSerializer.scala | 6 +-
.../jackson/JacksonSerializerSpec.scala | 23 +-
.../jackson/CustomAdtSerializer.scala | 4 +-
.../jackson/SerializationDocSpec.scala | 8 +-
.../main/scala/akka/event/slf4j/Slf4jLogger.scala | 2 +-
.../akka/event/slf4j/Slf4jLoggingFilterSpec.scala | 2 +-
.../scala/akka/stream/testkit/StreamTestKit.scala | 10 +-
.../stream/testkit/scaladsl/StreamTestKit.scala | 9 +-
.../impl/fusing/GraphInterpreterSpecKit.scala | 116 +++++----
.../scala/akka/stream/testkit/ScriptedTest.scala | 4 +-
.../akka/stream/testkit/StreamTestKitSpec.scala | 18 +-
.../testkit/TestPublisherSubscriberSpec.scala | 4 +-
.../akka/stream/testkit/TwoStreamsSetup.scala | 2 +-
.../stream/tck/AkkaPublisherVerification.scala | 3 +-
.../akka/stream/tck/FanoutPublisherTest.scala | 3 +-
.../stream/scaladsl/FlowPublisherSinkSpec.scala | 6 +-
.../src/test/scala/akka/stream/FusingSpec.scala | 38 +--
.../scala/akka/stream/StreamAttributeDocSpec.scala | 4 +-
.../akka/stream/impl/GraphStageLogicSpec.scala | 96 ++++---
.../akka/stream/impl/SubInletOutletSpec.scala | 36 +--
.../test/scala/akka/stream/impl/TimeoutsSpec.scala | 7 +-
.../impl/fusing/ActorGraphInterpreterSpec.scala | 181 +++++++------
.../stream/impl/fusing/AsyncCallbackSpec.scala | 34 +--
.../impl/fusing/GraphInterpreterPortsSpec.scala | 3 +-
.../akka/stream/impl/fusing/InterpreterSpec.scala | 3 +-
.../stream/impl/fusing/KeepGoingStageSpec.scala | 11 +-
.../akka/stream/io/ByteStringParserSpec.scala | 10 +-
.../scala/akka/stream/io/DeprecatedTlsSpec.scala | 22 +-
.../test/scala/akka/stream/io/FileSinkSpec.scala | 12 +-
.../scala/akka/stream/io/InputStreamSinkSpec.scala | 6 +-
.../akka/stream/io/OutputStreamSourceSpec.scala | 15 +-
.../src/test/scala/akka/stream/io/TcpSpec.scala | 12 +-
.../src/test/scala/akka/stream/io/TlsSpec.scala | 26 +-
.../akka/stream/io/compression/CoderSpec.scala | 4 +-
.../scaladsl/AggregateWithBoundarySpec.scala | 33 +--
.../akka/stream/scaladsl/AttributesSpec.scala | 50 ++--
.../scala/akka/stream/scaladsl/BidiFlowSpec.scala | 4 +-
.../stream/scaladsl/CancellationStrategySpec.scala | 4 +-
.../akka/stream/scaladsl/CollectionSinkSpec.scala | 4 +-
.../scaladsl/CoupledTerminationFlowSpec.scala | 19 +-
.../stream/scaladsl/FlowConcatAllLazySpec.scala | 8 +-
.../akka/stream/scaladsl/FlowConcatSpec.scala | 14 +-
.../scala/akka/stream/scaladsl/FlowDelaySpec.scala | 10 +-
.../stream/scaladsl/FlowFlatMapPrefixSpec.scala | 34 +--
.../stream/scaladsl/FlowFlattenMergeSpec.scala | 13 +-
.../akka/stream/scaladsl/FlowFutureFlowSpec.scala | 6 +-
.../akka/stream/scaladsl/FlowGroupBySpec.scala | 27 +-
.../stream/scaladsl/FlowGroupedWeightedSpec.scala | 16 +-
.../akka/stream/scaladsl/FlowIdleInjectSpec.scala | 3 +-
.../stream/scaladsl/FlowInterleaveAllSpec.scala | 6 +-
.../akka/stream/scaladsl/FlowInterleaveSpec.scala | 6 +-
.../scala/akka/stream/scaladsl/FlowJoinSpec.scala | 26 +-
.../scala/akka/stream/scaladsl/FlowLimitSpec.scala | 8 +-
.../stream/scaladsl/FlowLimitWeightedSpec.scala | 4 +-
.../stream/scaladsl/FlowLogWithMarkerSpec.scala | 28 +-
.../akka/stream/scaladsl/FlowMapAsyncSpec.scala | 66 +++--
.../scaladsl/FlowMapAsyncUnorderedSpec.scala | 23 +-
.../scala/akka/stream/scaladsl/FlowMergeSpec.scala | 24 +-
.../akka/stream/scaladsl/FlowOrElseSpec.scala | 4 +-
.../akka/stream/scaladsl/FlowPrependSpec.scala | 8 +-
.../akka/stream/scaladsl/FlowRecoverWithSpec.scala | 16 +-
.../akka/stream/scaladsl/FlowSectionSpec.scala | 2 +-
.../test/scala/akka/stream/scaladsl/FlowSpec.scala | 2 +-
.../akka/stream/scaladsl/FlowSplitWhenSpec.scala | 8 +-
.../akka/stream/scaladsl/FlowStatefulMapSpec.scala | 86 +++---
.../akka/stream/scaladsl/FlowThrottleSpec.scala | 21 +-
.../stream/scaladsl/FlowWatchTerminationSpec.scala | 2 +-
.../stream/scaladsl/FlowWithContextLogSpec.scala | 2 +-
.../akka/stream/scaladsl/FlowWithContextSpec.scala | 4 +-
.../scala/akka/stream/scaladsl/FlowZipSpec.scala | 4 +-
.../stream/scaladsl/FlowZipWithIndexSpec.scala | 4 +-
.../akka/stream/scaladsl/FlowZipWithSpec.scala | 4 +-
.../scala/akka/stream/scaladsl/FramingSpec.scala | 2 +-
.../akka/stream/scaladsl/GraphBackedFlowSpec.scala | 10 +-
.../akka/stream/scaladsl/GraphBalanceSpec.scala | 48 ++--
.../akka/stream/scaladsl/GraphBroadcastSpec.scala | 72 +++---
.../akka/stream/scaladsl/GraphConcatSpec.scala | 8 +-
.../akka/stream/scaladsl/GraphDSLCompileSpec.scala | 106 ++++----
.../akka/stream/scaladsl/GraphMatValueSpec.scala | 30 +--
.../stream/scaladsl/GraphMergeLatestSpec.scala | 16 +-
.../stream/scaladsl/GraphMergePreferredSpec.scala | 14 +-
.../scaladsl/GraphMergePrioritizedSpec.scala | 6 +-
.../akka/stream/scaladsl/GraphMergeSpec.scala | 22 +-
.../stream/scaladsl/GraphOpsIntegrationSpec.scala | 36 +--
.../akka/stream/scaladsl/GraphPartialSpec.scala | 20 +-
.../akka/stream/scaladsl/GraphPartitionSpec.scala | 125 ++++-----
.../stream/scaladsl/GraphStageTimersSpec.scala | 48 ++--
.../akka/stream/scaladsl/GraphUnzipSpec.scala | 30 +--
.../akka/stream/scaladsl/GraphUnzipWithSpec.scala | 8 +-
.../akka/stream/scaladsl/GraphZipLatestSpec.scala | 4 +-
.../stream/scaladsl/GraphZipLatestWithSpec.scala | 60 ++---
.../scala/akka/stream/scaladsl/GraphZipNSpec.scala | 10 +-
.../scala/akka/stream/scaladsl/GraphZipSpec.scala | 12 +-
.../akka/stream/scaladsl/GraphZipWithNSpec.scala | 4 +-
.../akka/stream/scaladsl/GraphZipWithSpec.scala | 38 +--
.../scala/akka/stream/scaladsl/HeadSinkSpec.scala | 4 +-
.../test/scala/akka/stream/scaladsl/HubSpec.scala | 38 +--
.../scala/akka/stream/scaladsl/LastSinkSpec.scala | 8 +-
.../scala/akka/stream/scaladsl/LazyFlowSpec.scala | 2 +-
.../akka/stream/scaladsl/PublisherSinkSpec.scala | 4 +-
.../scala/akka/stream/scaladsl/QueueSinkSpec.scala | 4 +-
.../akka/stream/scaladsl/QueueSourceSpec.scala | 2 +-
.../scala/akka/stream/scaladsl/RetryFlowSpec.scala | 15 +-
.../akka/stream/scaladsl/ReverseArrowSpec.scala | 4 +-
.../scala/akka/stream/scaladsl/SeqSinkSpec.scala | 2 +-
.../test/scala/akka/stream/scaladsl/SinkSpec.scala | 14 +-
.../scala/akka/stream/scaladsl/SourceSpec.scala | 28 +-
.../akka/stream/scaladsl/StageActorRefSpec.scala | 3 +-
.../stream/scaladsl/StreamConvertersSpec.scala | 7 +-
.../akka/stream/scaladsl/TakeLastSinkSpec.scala | 4 +-
.../akka/stream/scaladsl/TickSourceSpec.scala | 4 +-
.../scaladsl/UnfoldResourceAsyncSourceSpec.scala | 32 ++-
.../stream/scaladsl/UnfoldResourceSourceSpec.scala | 30 ++-
.../stream/snapshot/MaterializerStateSpec.scala | 60 ++---
.../akka/stream/typed/ActorSourceSinkExample.scala | 11 +-
.../test/scala/docs/scaladsl/ActorFlowSpec.scala | 12 +-
.../akka/stream/impl/JavaFlowAndRsConverters.scala | 38 ++-
.../akka/stream/scaladsl/JavaFlowSupport.scala | 28 +-
.../main/scala/akka/stream/ActorMaterializer.scala | 11 +-
.../src/main/scala/akka/stream/Attributes.scala | 41 ++-
.../src/main/scala/akka/stream/FanInShape1N.scala | 6 +-
.../src/main/scala/akka/stream/KillSwitch.scala | 41 +--
.../main/scala/akka/stream/QueueOfferResult.scala | 2 +-
akka-stream/src/main/scala/akka/stream/Shape.scala | 6 +-
.../main/scala/akka/stream/UniformFanInShape.scala | 2 +-
.../scala/akka/stream/UniformFanOutShape.scala | 2 +-
.../scala/akka/stream/impl/ActorPublisher.scala | 17 +-
.../impl/ActorRefBackpressureSinkStage.scala | 2 +-
.../scala/akka/stream/impl/ActorRefSinkStage.scala | 4 +-
.../scala/akka/stream/impl/ActorRefSource.scala | 11 +-
.../scala/akka/stream/impl/JsonObjectParser.scala | 2 +-
.../main/scala/akka/stream/impl/LazySource.scala | 36 +--
.../impl/PhasedFusingActorMaterializer.scala | 2 +-
.../stream/impl/ReactiveStreamsCompliance.scala | 7 +-
.../akka/stream/impl/RetryFlowCoordinator.scala | 11 +-
.../src/main/scala/akka/stream/impl/Sinks.scala | 90 +++----
.../main/scala/akka/stream/impl/StreamLayout.scala | 8 +-
.../akka/stream/impl/SubscriberManagement.scala | 17 +-
.../src/main/scala/akka/stream/impl/Throttle.scala | 2 +-
.../src/main/scala/akka/stream/impl/Transfer.scala | 5 +-
.../stream/impl/fusing/ActorGraphInterpreter.scala | 43 +--
.../akka/stream/impl/fusing/FlatMapPrefix.scala | 43 +--
.../scala/akka/stream/impl/fusing/FutureFlow.scala | 25 +-
.../akka/stream/impl/fusing/GraphInterpreter.scala | 18 +-
.../akka/stream/impl/fusing/GraphStages.scala | 46 ++--
.../main/scala/akka/stream/impl/fusing/Ops.scala | 111 ++++----
.../akka/stream/impl/fusing/StreamOfStreams.scala | 18 +-
.../akka/stream/impl/io/ByteStringParser.scala | 4 +-
.../main/scala/akka/stream/impl/io/IOSources.scala | 17 +-
.../akka/stream/impl/io/InputStreamSinkStage.scala | 4 +-
.../main/scala/akka/stream/impl/io/TLSActor.scala | 4 +-
.../main/scala/akka/stream/impl/io/TcpStages.scala | 26 +-
.../impl/io/compression/GzipDecompressor.scala | 2 +-
.../src/main/scala/akka/stream/impl/package.scala | 1 -
.../main/scala/akka/stream/javadsl/BidiFlow.scala | 2 -
.../src/main/scala/akka/stream/javadsl/Flow.scala | 62 ++---
.../akka/stream/javadsl/FlowWithContext.scala | 19 +-
.../main/scala/akka/stream/javadsl/Framing.scala | 1 -
.../src/main/scala/akka/stream/javadsl/Graph.scala | 10 +-
.../scala/akka/stream/javadsl/MergeLatest.scala | 1 -
.../scala/akka/stream/javadsl/RestartSource.scala | 5 -
.../src/main/scala/akka/stream/javadsl/Sink.scala | 5 +-
.../main/scala/akka/stream/javadsl/Source.scala | 131 +++++-----
.../main/scala/akka/stream/javadsl/SubFlow.scala | 27 +-
.../main/scala/akka/stream/javadsl/SubSource.scala | 27 +-
.../main/scala/akka/stream/scaladsl/BidiFlow.scala | 2 -
.../scala/akka/stream/scaladsl/Compression.scala | 1 -
.../src/main/scala/akka/stream/scaladsl/Flow.scala | 13 +-
.../akka/stream/scaladsl/FlowWithContext.scala | 9 +-
.../akka/stream/scaladsl/FlowWithContextOps.scala | 1 -
.../main/scala/akka/stream/scaladsl/Framing.scala | 14 +-
.../main/scala/akka/stream/scaladsl/Graph.scala | 114 ++++----
.../src/main/scala/akka/stream/scaladsl/Hub.scala | 11 +-
.../scala/akka/stream/scaladsl/JsonFraming.scala | 7 +-
.../scala/akka/stream/scaladsl/MergeLatest.scala | 1 -
.../scala/akka/stream/scaladsl/RestartFlow.scala | 15 +-
.../scala/akka/stream/scaladsl/RestartSource.scala | 3 -
.../src/main/scala/akka/stream/scaladsl/Sink.scala | 6 +-
.../main/scala/akka/stream/scaladsl/Source.scala | 30 +--
.../akka/stream/scaladsl/SourceWithContext.scala | 2 +-
.../akka/stream/scaladsl/StreamConverters.scala | 51 ++--
.../src/main/scala/akka/stream/scaladsl/Tcp.scala | 9 +-
.../akka/stream/snapshot/MaterializerState.scala | 1 -
.../main/scala/akka/stream/stage/GraphStage.scala | 60 +++--
.../akka/testkit/CallingThreadDispatcher.scala | 28 +-
.../src/main/scala/akka/testkit/SocketUtil.scala | 17 +-
.../src/main/scala/akka/testkit/TestActorRef.scala | 110 ++++----
.../src/main/scala/akka/testkit/TestKit.scala | 15 +-
.../main/scala/akka/testkit/javadsl/TestKit.scala | 30 +--
.../src/test/scala/akka/testkit/AkkaSpecSpec.scala | 10 +-
.../src/test/scala/akka/testkit/CoronerSpec.scala | 37 +--
.../test/scala/akka/testkit/TestActorRefSpec.scala | 36 +--
.../test/scala/akka/testkit/TestFSMRefSpec.scala | 28 +-
.../test/scala/akka/testkit/TestProbeSpec.scala | 6 +-
.../testkit/metrics/FileDescriptorMetricSet.scala | 9 +-
.../scala/akka/testkit/metrics/MetricsKitOps.scala | 2 +-
build.sbt | 67 ++---
project/AkkaBuild.scala | 66 ++---
project/AkkaDisciplinePlugin.scala | 66 ++---
project/CopyrightHeader.scala | 19 +-
project/CopyrightHeaderForBoilerplate.scala | 2 +-
project/CopyrightHeaderForBuild.scala | 2 +-
project/CopyrightHeaderForProtobuf.scala | 2 +-
project/Dependencies.scala | 197 +++++++-------
project/Doc.scala | 65 +++--
project/JavaFormatter.scala | 2 +-
project/Jdk9.scala | 12 +-
project/JdkOptions.scala | 2 +-
project/Jvm.scala | 4 +-
project/MiMa.scala | 5 +-
project/OSGi.scala | 38 +--
project/Paradox.scala | 102 ++++----
project/Protobuf.scala | 18 +-
project/Publish.scala | 10 +-
project/SbtMultiJvm.scala | 31 +--
project/ScalafixSupport.scala | 4 +-
project/SigarLoader.scala | 6 +-
project/StreamOperatorsIndexGenerator.scala | 25 +-
project/TestExtras.scala | 2 +-
project/ValidatePullRequest.scala | 30 +--
980 files changed, 8792 insertions(+), 8594 deletions(-)
diff --git a/akka-actor-testkit-typed/src/main/scala/akka/actor/testkit/typed/internal/ActorSystemStub.scala b/akka-actor-testkit-typed/src/main/scala/akka/actor/testkit/typed/internal/ActorSystemStub.scala
index bc8162c9bf..cf285449f3 100644
--- a/akka-actor-testkit-typed/src/main/scala/akka/actor/testkit/typed/internal/ActorSystemStub.scala
+++ b/akka-actor-testkit-typed/src/main/scala/akka/actor/testkit/typed/internal/ActorSystemStub.scala
@@ -130,7 +130,7 @@ import akka.annotation.InternalApi
// this is backward compatible with the old behaviour, hence it uses the loader used to load the test-kit
// which is not necessarily the one used to load the tests...
// hence this might not include reference config related to the actually executing test
- //todo: might be better NOT to pass any class loader and let typesafeConfig rely on the contextClassLoader
+ // todo: might be better NOT to pass any class loader and let typesafeConfig rely on the contextClassLoader
// (which is usually the system class loader)
def defaultReference: Config = ConfigFactory.defaultReference(getClass.getClassLoader)
}
diff --git a/akka-actor-testkit-typed/src/main/scala/akka/actor/testkit/typed/internal/BehaviorTestKitImpl.scala b/akka-actor-testkit-typed/src/main/scala/akka/actor/testkit/typed/internal/BehaviorTestKitImpl.scala
index 082b10949b..1308d70fbf 100644
--- a/akka-actor-testkit-typed/src/main/scala/akka/actor/testkit/typed/internal/BehaviorTestKitImpl.scala
+++ b/akka-actor-testkit-typed/src/main/scala/akka/actor/testkit/typed/internal/BehaviorTestKitImpl.scala
@@ -137,11 +137,11 @@ private[akka] final class BehaviorTestKitImpl[T](
try {
context.setCurrentActorThread()
try {
- //we need this to handle message adapters related messages
+ // we need this to handle message adapters related messages
val intercepted = BehaviorTestKitImpl.Interceptor.inteceptBehaviour(current, context)
currentUncanonical = Behavior.interpretMessage(intercepted, context, message)
- //notice we pass current and not intercepted, this way Behaviors.same will be resolved to current which will be intercepted again on the next message
- //otherwise we would have risked intercepting an already intercepted behavior (or would have had to explicitly check if the current behavior is already intercepted by us)
+ // notice we pass current and not intercepted, this way Behaviors.same will be resolved to current which will be intercepted again on the next message
+ // otherwise we would have risked intercepting an already intercepted behavior (or would have had to explicitly check if the current behavior is already intercepted by us)
current = Behavior.canonicalize(currentUncanonical, current, context)
} finally {
context.clearCurrentActorThread()
@@ -201,8 +201,8 @@ private[akka] object BehaviorTestKitImpl {
def inteceptBehaviour[T](behavior: Behavior[T], ctx: TypedActorContext[T]): Behavior[T] =
Behavior
.start(Behaviors.intercept { () =>
- this.asInstanceOf[BehaviorInterceptor[Any, T]]
- }(behavior), ctx.asInstanceOf[TypedActorContext[Any]])
+ this.asInstanceOf[BehaviorInterceptor[Any, T]]
+ }(behavior), ctx.asInstanceOf[TypedActorContext[Any]])
.unsafeCast[T]
}
}
diff --git a/akka-actor-testkit-typed/src/main/scala/akka/actor/testkit/typed/internal/StubbedActorContext.scala b/akka-actor-testkit-typed/src/main/scala/akka/actor/testkit/typed/internal/StubbedActorContext.scala
index 9f8aaac38f..c92facae07 100644
--- a/akka-actor-testkit-typed/src/main/scala/akka/actor/testkit/typed/internal/StubbedActorContext.scala
+++ b/akka-actor-testkit-typed/src/main/scala/akka/actor/testkit/typed/internal/StubbedActorContext.scala
@@ -166,12 +166,13 @@ private[akka] final class FunctionRef[-T](override val path: ActorPath, send: (T
val i = new BehaviorTestKitImpl[U](system, p, BehaviorImpl.ignore)
_children += p.name -> i
- new FunctionRef[U](p, (message, _) => {
- val m = f(message);
- if (m != null) {
- selfInbox.ref ! m; i.selfInbox().ref ! message
- }
- })
+ new FunctionRef[U](p,
+ (message, _) => {
+ val m = f(message);
+ if (m != null) {
+ selfInbox.ref ! m; i.selfInbox().ref ! message
+ }
+ })
}
/**
diff --git a/akka-actor-testkit-typed/src/main/scala/akka/actor/testkit/typed/internal/TestProbeImpl.scala b/akka-actor-testkit-typed/src/main/scala/akka/actor/testkit/typed/internal/TestProbeImpl.scala
index ec599a9c51..941c4dfd0e 100644
--- a/akka-actor-testkit-typed/src/main/scala/akka/actor/testkit/typed/internal/TestProbeImpl.scala
+++ b/akka-actor-testkit-typed/src/main/scala/akka/actor/testkit/typed/internal/TestProbeImpl.scala
@@ -134,8 +134,9 @@ private[akka] final class TestProbeImpl[M](name: String, system: ActorSystem[_])
val prevEnd = end
end = start + maxDiff
- val ret = try f
- finally end = prevEnd
+ val ret =
+ try f
+ finally end = prevEnd
val diff = now - start
assert(min <= diff, s"block took ${diff.pretty}, should at least have been $min")
diff --git a/akka-actor-testkit-typed/src/main/scala/akka/actor/testkit/typed/javadsl/TestKitJunitResource.scala b/akka-actor-testkit-typed/src/main/scala/akka/actor/testkit/typed/javadsl/TestKitJunitResource.scala
index 09a7caf174..30ebaa4cef 100644
--- a/akka-actor-testkit-typed/src/main/scala/akka/actor/testkit/typed/javadsl/TestKitJunitResource.scala
+++ b/akka-actor-testkit-typed/src/main/scala/akka/actor/testkit/typed/javadsl/TestKitJunitResource.scala
@@ -38,8 +38,8 @@ import akka.util.Timeout
*
* @Test
* public void testBlah() throws Exception {
- * // spawn actors etc using the testKit
- * ActorRef<Message> ref = testKit.spawn(behavior);
+ * // spawn actors etc using the testKit
+ * ActorRef<Message> ref = testKit.spawn(behavior);
* }
* }
* }}}
diff --git a/akka-actor-testkit-typed/src/main/scala/akka/actor/testkit/typed/scaladsl/ActorTestKit.scala b/akka-actor-testkit-typed/src/main/scala/akka/actor/testkit/typed/scaladsl/ActorTestKit.scala
index db20baf120..7bdd2c6771 100644
--- a/akka-actor-testkit-typed/src/main/scala/akka/actor/testkit/typed/scaladsl/ActorTestKit.scala
+++ b/akka-actor-testkit-typed/src/main/scala/akka/actor/testkit/typed/scaladsl/ActorTestKit.scala
@@ -254,8 +254,8 @@ final class ActorTestKit private[akka] (
def stop[T](ref: ActorRef[T], max: FiniteDuration = timeout.duration): Unit =
try {
Await.result(internalTestKitGuardian.ask { (x: ActorRef[ActorTestKitGuardian.Ack.type]) =>
- ActorTestKitGuardian.StopActor(ref, x)
- }(Timeout(max), scheduler), max)
+ ActorTestKitGuardian.StopActor(ref, x)
+ }(Timeout(max), scheduler), max)
} catch {
case _: TimeoutException =>
assert(false, s"timeout ($max) during stop() waiting for actor [${ref.path}] to stop")
diff --git a/akka-actor-testkit-typed/src/main/scala/akka/actor/testkit/typed/scaladsl/package.scala b/akka-actor-testkit-typed/src/main/scala/akka/actor/testkit/typed/scaladsl/package.scala
index c67de6bedc..574914cf3e 100644
--- a/akka-actor-testkit-typed/src/main/scala/akka/actor/testkit/typed/scaladsl/package.scala
+++ b/akka-actor-testkit-typed/src/main/scala/akka/actor/testkit/typed/scaladsl/package.scala
@@ -21,7 +21,6 @@ package object scaladsl {
*
* Uses the scaling factor from the `TestTimeFactor` in the [[TestKitSettings]]
* (in implicit scope).
- *
*/
implicit class TestDuration(val duration: FiniteDuration) extends AnyVal {
def dilated(implicit settings: TestKitSettings): FiniteDuration = settings.dilated(duration)
diff --git a/akka-actor-testkit-typed/src/test/scala/akka/actor/testkit/typed/scaladsl/ActorTestKitSpec.scala b/akka-actor-testkit-typed/src/test/scala/akka/actor/testkit/typed/scaladsl/ActorTestKitSpec.scala
index ad70db5502..5248128e12 100644
--- a/akka-actor-testkit-typed/src/test/scala/akka/actor/testkit/typed/scaladsl/ActorTestKitSpec.scala
+++ b/akka-actor-testkit-typed/src/test/scala/akka/actor/testkit/typed/scaladsl/ActorTestKitSpec.scala
@@ -82,9 +82,9 @@ class ActorTestKitSpec extends ScalaTestWithActorTestKit with AnyWordSpecLike wi
"spawn a named actor" in {
val spawnedWithName = Promise[String]()
spawn(Behaviors.setup[AnyRef] { context =>
- spawnedWithName.trySuccess(context.self.path.name)
- Behaviors.empty
- }, "name")
+ spawnedWithName.trySuccess(context.self.path.name)
+ Behaviors.empty
+ }, "name")
spawnedWithName.future.futureValue should ===("name")
}
diff --git a/akka-actor-testkit-typed/src/test/scala/akka/actor/testkit/typed/scaladsl/BehaviorTestKitSpec.scala b/akka-actor-testkit-typed/src/test/scala/akka/actor/testkit/typed/scaladsl/BehaviorTestKitSpec.scala
index c18d454e38..ee4827ec08 100644
--- a/akka-actor-testkit-typed/src/test/scala/akka/actor/testkit/typed/scaladsl/BehaviorTestKitSpec.scala
+++ b/akka-actor-testkit-typed/src/test/scala/akka/actor/testkit/typed/scaladsl/BehaviorTestKitSpec.scala
@@ -88,8 +88,8 @@ object BehaviorTestKitSpec {
Behaviors.same
case SpawnAdapterWithName(name) =>
context.spawnMessageAdapter({ (r: Reproduce) =>
- SpawnAnonymous(r.times)
- }, name)
+ SpawnAnonymous(r.times)
+ }, name)
Behaviors.same
case SpawnAndWatchUnwatch(name) =>
val c = context.spawn(Child.initial, name)
@@ -420,11 +420,11 @@ class BehaviorTestKitSpec extends AnyWordSpec with Matchers with LogCapturing {
testkit.run(ScheduleCommand("abc", 42.seconds, Effect.TimerScheduled.SingleMode, SpawnChild))
testkit.expectEffectPF {
case Effect.TimerScheduled(
- "abc",
- SpawnChild,
- finiteDuration,
- Effect.TimerScheduled.SingleMode,
- false /*not overriding*/ ) =>
+ "abc",
+ SpawnChild,
+ finiteDuration,
+ Effect.TimerScheduled.SingleMode,
+ false /*not overriding*/ ) =>
finiteDuration should equal(42.seconds)
}
testkit.run(IsTimerActive("abc", t.ref))
@@ -456,7 +456,7 @@ class BehaviorTestKitSpec extends AnyWordSpec with Matchers with LogCapturing {
testkit.expectEffectPF {
case Effect.Spawned(_, "child", _) =>
}
- //no effect since the timer's mode was single, hence removed after fired
+ // no effect since the timer's mode was single, hence removed after fired
send()
testkit.selfInbox().hasMessages should be(false)
}
@@ -485,7 +485,7 @@ class BehaviorTestKitSpec extends AnyWordSpec with Matchers with LogCapturing {
testkit.expectEffect {
Effect.Stopped("child")
}
- //when scheduling with fixed rate the timer remains scheduled
+ // when scheduling with fixed rate the timer remains scheduled
send()
testkit.runOne()
testkit.expectEffectPF {
diff --git a/akka-actor-testkit-typed/src/test/scala/akka/actor/testkit/typed/scaladsl/TestAppenderSpec.scala b/akka-actor-testkit-typed/src/test/scala/akka/actor/testkit/typed/scaladsl/TestAppenderSpec.scala
index a9b1bb0789..ba496e0f9d 100644
--- a/akka-actor-testkit-typed/src/test/scala/akka/actor/testkit/typed/scaladsl/TestAppenderSpec.scala
+++ b/akka-actor-testkit-typed/src/test/scala/akka/actor/testkit/typed/scaladsl/TestAppenderSpec.scala
@@ -67,11 +67,11 @@ class TestAppenderSpec
"only filter events for given logger name" in {
val count = new AtomicInteger
LoggingTestKit
- .custom({
+ .custom {
case logEvent =>
count.incrementAndGet()
logEvent.message == "Hello from right logger" && logEvent.loggerName == classOf[AnotherLoggerClass].getName
- })
+ }
.withOccurrences(2)
.withLoggerName(classOf[AnotherLoggerClass].getName)
.expect {
diff --git a/akka-actor-testkit-typed/src/test/scala/akka/actor/testkit/typed/scaladsl/TestProbeSpec.scala b/akka-actor-testkit-typed/src/test/scala/akka/actor/testkit/typed/scaladsl/TestProbeSpec.scala
index 44444a741d..48b76e5635 100644
--- a/akka-actor-testkit-typed/src/test/scala/akka/actor/testkit/typed/scaladsl/TestProbeSpec.scala
+++ b/akka-actor-testkit-typed/src/test/scala/akka/actor/testkit/typed/scaladsl/TestProbeSpec.scala
@@ -22,9 +22,9 @@ class TestProbeSpec extends ScalaTestWithActorTestKit with AnyWordSpecLike with
probe.fishForMessage(shortDuration) {
case _ => FishingOutcomes.complete
}
- probe.awaitAssert({
+ probe.awaitAssert {
"result"
- })
+ }
probe.expectMessageType[String]
probe.expectMessage("whoa")
probe.expectNoMessage()
diff --git a/akka-actor-testkit-typed/src/test/scala/docs/akka/actor/testkit/typed/scaladsl/AsyncTestingExampleSpec.scala b/akka-actor-testkit-typed/src/test/scala/docs/akka/actor/testkit/typed/scaladsl/AsyncTestingExampleSpec.scala
index 7e61d0258e..2ff1dff96a 100644
--- a/akka-actor-testkit-typed/src/test/scala/docs/akka/actor/testkit/typed/scaladsl/AsyncTestingExampleSpec.scala
+++ b/akka-actor-testkit-typed/src/test/scala/docs/akka/actor/testkit/typed/scaladsl/AsyncTestingExampleSpec.scala
@@ -27,7 +27,7 @@ import scala.util.Success
import scala.util.Try
object AsyncTestingExampleSpec {
- //#under-test
+ // #under-test
object Echo {
case class Ping(message: String, response: ActorRef[Pong])
case class Pong(message: String)
@@ -38,9 +38,9 @@ object AsyncTestingExampleSpec {
Behaviors.same
}
}
- //#under-test
+ // #under-test
- //#under-test-2
+ // #under-test-2
case class Message(i: Int, replyTo: ActorRef[Try[Int]])
class Producer(publisher: ActorRef[Message])(implicit scheduler: Scheduler) {
@@ -54,7 +54,7 @@ object AsyncTestingExampleSpec {
}
}
- //#under-test-2
+ // #under-test-2
}
@@ -62,29 +62,29 @@ object AsyncTestingExampleSpec {
class AsyncTestingExampleSpec
extends AnyWordSpec
with BeforeAndAfterAll
- //#test-header
+ // #test-header
with LogCapturing
- //#test-header
+ // #test-header
with Matchers {
val testKit = ActorTestKit()
- //#test-header
+ // #test-header
import AsyncTestingExampleSpec._
"A testkit" must {
"support verifying a response" in {
- //#test-spawn
+ // #test-spawn
val pinger = testKit.spawn(Echo(), "ping")
val probe = testKit.createTestProbe[Echo.Pong]()
pinger ! Echo.Ping("hello", probe.ref)
probe.expectMessage(Echo.Pong("hello"))
- //#test-spawn
+ // #test-spawn
}
"support verifying a response - anonymous" in {
- //#test-spawn-anonymous
+ // #test-spawn-anonymous
val pinger = testKit.spawn(Echo())
- //#test-spawn-anonymous
+ // #test-spawn-anonymous
val probe = testKit.createTestProbe[Echo.Pong]()
pinger ! Echo.Ping("hello", probe.ref)
probe.expectMessage(Echo.Pong("hello"))
@@ -93,7 +93,7 @@ class AsyncTestingExampleSpec
"be able to stop actors under test" in {
// Will fail with 'name not unique' exception if the first actor is not fully stopped
val probe = testKit.createTestProbe[Echo.Pong]()
- //#test-stop-actors
+ // #test-stop-actors
val pinger1 = testKit.spawn(Echo(), "pinger")
pinger1 ! Echo.Ping("hello", probe.ref)
probe.expectMessage(Echo.Pong("hello"))
@@ -104,12 +104,12 @@ class AsyncTestingExampleSpec
pinger2 ! Echo.Ping("hello", probe.ref)
probe.expectMessage(Echo.Pong("hello"))
testKit.stop(pinger2, 10.seconds) // Custom timeout
- //#test-stop-actors
+ // #test-stop-actors
}
"support observing mocked behavior" in {
- //#test-observe-mocked-behavior
+ // #test-observe-mocked-behavior
import testKit._
// simulate the happy path
@@ -130,13 +130,13 @@ class AsyncTestingExampleSpec
val msg = probe.expectMessageType[Message]
msg.i shouldBe i
}
- //#test-observe-mocked-behavior
+ // #test-observe-mocked-behavior
}
}
- //#test-shutdown
+ // #test-shutdown
override def afterAll(): Unit = testKit.shutdownTestKit()
- //#test-shutdown
+ // #test-shutdown
//#test-header
}
//#test-header
diff --git a/akka-actor-testkit-typed/src/test/scala/docs/akka/actor/testkit/typed/scaladsl/ManualTimerExampleSpec.scala b/akka-actor-testkit-typed/src/test/scala/docs/akka/actor/testkit/typed/scaladsl/ManualTimerExampleSpec.scala
index 2e3504e99f..24f9819d24 100644
--- a/akka-actor-testkit-typed/src/test/scala/docs/akka/actor/testkit/typed/scaladsl/ManualTimerExampleSpec.scala
+++ b/akka-actor-testkit-typed/src/test/scala/docs/akka/actor/testkit/typed/scaladsl/ManualTimerExampleSpec.scala
@@ -43,7 +43,7 @@ class ManualTimerExampleSpec
manualTime.expectNoMessageFor(10.seconds, probe)
}
- //#manual-scheduling-simple
+ // #manual-scheduling-simple
"schedule repeated ticks" in {
case object Tick
@@ -113,7 +113,7 @@ class ManualTimerExampleSpec
probe.expectMessage(Tock(2))
}
- //#manual-scheduling-simple
+ // #manual-scheduling-simple
}
}
//#manual-scheduling-simple
diff --git a/akka-actor-testkit-typed/src/test/scala/docs/akka/actor/testkit/typed/scaladsl/SyncTestingExampleSpec.scala b/akka-actor-testkit-typed/src/test/scala/docs/akka/actor/testkit/typed/scaladsl/SyncTestingExampleSpec.scala
index 5d18f71373..b2977a12e1 100644
--- a/akka-actor-testkit-typed/src/test/scala/docs/akka/actor/testkit/typed/scaladsl/SyncTestingExampleSpec.scala
+++ b/akka-actor-testkit-typed/src/test/scala/docs/akka/actor/testkit/typed/scaladsl/SyncTestingExampleSpec.scala
@@ -19,13 +19,13 @@ import org.scalatest.matchers.should.Matchers
import org.scalatest.wordspec.AnyWordSpec
object SyncTestingExampleSpec {
- //#child
+ // #child
val childActor = Behaviors.receiveMessage[String] { _ =>
Behaviors.same[String]
}
- //#child
+ // #child
- //#under-test
+ // #under-test
object Hello {
sealed trait Command
case object CreateAnonymousChild extends Command
@@ -58,7 +58,7 @@ object SyncTestingExampleSpec {
who ! "hello"
Behaviors.same
}
- //#under-test
+ // #under-test
}
object ConfigAware {
@@ -89,57 +89,57 @@ class SyncTestingExampleSpec extends AnyWordSpec with Matchers {
"Typed actor synchronous testing" must {
"record spawning" in {
- //#test-child
+ // #test-child
val testKit = BehaviorTestKit(Hello())
testKit.run(Hello.CreateChild("child"))
testKit.expectEffect(Spawned(childActor, "child"))
- //#test-child
+ // #test-child
}
"record spawning anonymous" in {
- //#test-anonymous-child
+ // #test-anonymous-child
val testKit = BehaviorTestKit(Hello())
testKit.run(Hello.CreateAnonymousChild)
testKit.expectEffect(SpawnedAnonymous(childActor))
- //#test-anonymous-child
+ // #test-anonymous-child
}
"record message sends" in {
- //#test-message
+ // #test-message
val testKit = BehaviorTestKit(Hello())
val inbox = TestInbox[String]()
testKit.run(Hello.SayHello(inbox.ref))
inbox.expectMessage("hello")
- //#test-message
+ // #test-message
}
"send a message to a spawned child" in {
- //#test-child-message
+ // #test-child-message
val testKit = BehaviorTestKit(Hello())
testKit.run(Hello.SayHelloToChild("child"))
val childInbox = testKit.childInbox[String]("child")
childInbox.expectMessage("hello")
- //#test-child-message
+ // #test-child-message
}
"send a message to an anonymous spawned child" in {
- //#test-child-message-anonymous
+ // #test-child-message-anonymous
val testKit = BehaviorTestKit(Hello())
testKit.run(Hello.SayHelloToAnonymousChild)
val child = testKit.expectEffectType[SpawnedAnonymous[String]]
val childInbox = testKit.childInbox(child.ref)
childInbox.expectMessage("hello stranger")
- //#test-child-message-anonymous
+ // #test-child-message-anonymous
}
"log a message to the logger" in {
- //#test-check-logging
+ // #test-check-logging
val testKit = BehaviorTestKit(Hello())
val inbox = TestInbox[String]("Inboxer")
testKit.run(Hello.LogAndSayHello(inbox.ref))
testKit.logEntries() shouldBe Seq(CapturedLogEvent(Level.INFO, "Saying hello to Inboxer"))
- //#test-check-logging
+ // #test-check-logging
}
"has access to the provided config" in {
diff --git a/akka-actor-testkit-typed/src/test/scala/docs/akka/actor/testkit/typed/scaladsl/TestConfigExample.scala b/akka-actor-testkit-typed/src/test/scala/docs/akka/actor/testkit/typed/scaladsl/TestConfigExample.scala
index cc3ac65994..52ea76c096 100644
--- a/akka-actor-testkit-typed/src/test/scala/docs/akka/actor/testkit/typed/scaladsl/TestConfigExample.scala
+++ b/akka-actor-testkit-typed/src/test/scala/docs/akka/actor/testkit/typed/scaladsl/TestConfigExample.scala
@@ -8,24 +8,24 @@ object TestConfigExample {
def illustrateApplicationConfig(): Unit = {
- //#default-application-conf
+ // #default-application-conf
import com.typesafe.config.ConfigFactory
ConfigFactory.load()
- //#default-application-conf
+ // #default-application-conf
- //#parse-string
+ // #parse-string
ConfigFactory.parseString("""
akka.loglevel = DEBUG
akka.log-config-on-start = on
""")
- //#parse-string
+ // #parse-string
- //#fallback-application-conf
+ // #fallback-application-conf
ConfigFactory.parseString("""
akka.loglevel = DEBUG
akka.log-config-on-start = on
""").withFallback(ConfigFactory.load())
- //#fallback-application-conf
+ // #fallback-application-conf
}
}
diff --git a/akka-actor-tests/src/test/scala/akka/AkkaExceptionSpec.scala b/akka-actor-tests/src/test/scala/akka/AkkaExceptionSpec.scala
index e064629472..b934a52168 100644
--- a/akka-actor-tests/src/test/scala/akka/AkkaExceptionSpec.scala
+++ b/akka-actor-tests/src/test/scala/akka/AkkaExceptionSpec.scala
@@ -18,11 +18,11 @@ class AkkaExceptionSpec extends AnyWordSpec with Matchers {
"AkkaException" must {
"have a AkkaException(String msg) constructor to be serialization friendly" in {
- //if the call to this method completes, we know what there is at least a single constructor which has
- //the expected argument type.
+ // if the call to this method completes, we know what there is at least a single constructor which has
+ // the expected argument type.
verify(classOf[AkkaException])
- //lets also try it for the exception that triggered this bug to be discovered.
+ // lets also try it for the exception that triggered this bug to be discovered.
verify(classOf[ActorKilledException])
}
}
diff --git a/akka-actor-tests/src/test/scala/akka/actor/ActorLifeCycleSpec.scala b/akka-actor-tests/src/test/scala/akka/actor/ActorLifeCycleSpec.scala
index aa65bffa9c..90460eddd0 100644
--- a/akka-actor-tests/src/test/scala/akka/actor/ActorLifeCycleSpec.scala
+++ b/akka-actor-tests/src/test/scala/akka/actor/ActorLifeCycleSpec.scala
@@ -169,10 +169,10 @@ class ActorLifeCycleSpec extends AkkaSpec with BeforeAndAfterEach with ImplicitS
Thread.sleep(50)
"po"
}
- // Here, we implicitly close over the actor instance and access the context
- // when the flatMap thunk is run. Previously, the context was nulled when the actor
- // was terminated. This isn't done any more. Still, the pattern of `import context.dispatcher`
- // is discouraged as closing over `context` is unsafe in general.
+ // Here, we implicitly close over the actor instance and access the context
+ // when the flatMap thunk is run. Previously, the context was nulled when the actor
+ // was terminated. This isn't done any more. Still, the pattern of `import context.dispatcher`
+ // is discouraged as closing over `context` is unsafe in general.
.flatMap(x => Future { x + "ng" } /* implicitly: (this.context.dispatcher) */ )
.recover { case _: NullPointerException => "npe" }
.pipeTo(replyTo)
diff --git a/akka-actor-tests/src/test/scala/akka/actor/ActorRefSpec.scala b/akka-actor-tests/src/test/scala/akka/actor/ActorRefSpec.scala
index 85f096124f..b6289d8aa5 100644
--- a/akka-actor-tests/src/test/scala/akka/actor/ActorRefSpec.scala
+++ b/akka-actor-tests/src/test/scala/akka/actor/ActorRefSpec.scala
@@ -159,8 +159,8 @@ class ActorRefSpec extends AkkaSpec("""
EventFilter[ActorInitializationException](occurrences = 1).intercept {
intercept[akka.actor.ActorInitializationException] {
- wrap(
- result => actorOf(Props(promiseIntercept(new FailingOuterActor(actorOf(Props(new InnerActor))))(result))))
+ wrap(result =>
+ actorOf(Props(promiseIntercept(new FailingOuterActor(actorOf(Props(new InnerActor))))(result))))
}
contextStackMustBeEmpty()
@@ -168,8 +168,8 @@ class ActorRefSpec extends AkkaSpec("""
EventFilter[ActorInitializationException](occurrences = 1).intercept {
intercept[akka.actor.ActorInitializationException] {
- wrap(
- result => actorOf(Props(new OuterActor(actorOf(Props(promiseIntercept(new FailingInnerActor)(result)))))))
+ wrap(result =>
+ actorOf(Props(new OuterActor(actorOf(Props(promiseIntercept(new FailingInnerActor)(result)))))))
}
contextStackMustBeEmpty()
@@ -196,10 +196,9 @@ class ActorRefSpec extends AkkaSpec("""
EventFilter[ActorInitializationException](occurrences = 2).intercept {
intercept[akka.actor.ActorInitializationException] {
- wrap(
- result =>
- actorOf(Props(new FailingInheritingOuterActor(
- actorOf(Props(promiseIntercept(new FailingInheritingInnerActor)(result)))))))
+ wrap(result =>
+ actorOf(Props(new FailingInheritingOuterActor(
+ actorOf(Props(promiseIntercept(new FailingInheritingInnerActor)(result)))))))
}
contextStackMustBeEmpty()
@@ -247,22 +246,21 @@ class ActorRefSpec extends AkkaSpec("""
EventFilter[ActorInitializationException](occurrences = 1).intercept {
intercept[akka.actor.ActorInitializationException] {
- wrap(
- result =>
- actorOf(
- Props(new OuterActor(actorOf(Props(promiseIntercept({ new InnerActor; new InnerActor })(result)))))))
+ wrap(result =>
+ actorOf(
+ Props(new OuterActor(actorOf(Props(promiseIntercept { new InnerActor; new InnerActor }(result)))))))
}
contextStackMustBeEmpty()
}
EventFilter[ActorInitializationException](occurrences = 1).intercept {
- (intercept[java.lang.IllegalStateException] {
+ intercept[java.lang.IllegalStateException] {
wrap(result =>
- actorOf(Props(new OuterActor(actorOf(Props(promiseIntercept({
+ actorOf(Props(new OuterActor(actorOf(Props(promiseIntercept {
throw new IllegalStateException("Ur state be b0rked")
- })(result)))))))
- }).getMessage should ===("Ur state be b0rked")
+ }(result)))))))
+ }.getMessage should ===("Ur state be b0rked")
contextStackMustBeEmpty()
}
@@ -272,9 +270,9 @@ class ActorRefSpec extends AkkaSpec("""
EventFilter[ActorInitializationException](occurrences = 1, pattern = "/user/failingActor:").intercept {
intercept[java.lang.IllegalStateException] {
wrap(result =>
- system.actorOf(Props(promiseIntercept({
- throw new IllegalStateException
- })(result)), "failingActor"))
+ system.actorOf(Props(promiseIntercept {
+ throw new IllegalStateException
+ }(result)), "failingActor"))
}
}
}
@@ -325,9 +323,9 @@ class ActorRefSpec extends AkkaSpec("""
val in = new ObjectInputStream(new ByteArrayInputStream(baos.toByteArray))
- (intercept[java.lang.IllegalStateException] {
+ intercept[java.lang.IllegalStateException] {
in.readObject
- }).getMessage should ===(
+ }.getMessage should ===(
"Trying to deserialize a serialized ActorRef without an ActorSystem in scope." +
" Use 'akka.serialization.JavaSerializer.currentSystem.withValue(system) { ... }'")
}
@@ -422,8 +420,8 @@ class ActorRefSpec extends AkkaSpec("""
}
}))
- val ffive = (ref.ask(5)(timeout)).mapTo[String]
- val fnull = (ref.ask(0)(timeout)).mapTo[String]
+ val ffive = ref.ask(5)(timeout).mapTo[String]
+ val fnull = ref.ask(0)(timeout).mapTo[String]
ref ! PoisonPill
Await.result(ffive, timeout.duration) should ===("five")
@@ -459,15 +457,15 @@ class ActorRefSpec extends AkkaSpec("""
"be able to check for existence of children" in {
val parent = system.actorOf(Props(new Actor {
- val child = context.actorOf(Props(new Actor {
- def receive = { case _ => }
- }), "child")
+ val child = context.actorOf(Props(new Actor {
+ def receive = { case _ => }
+ }), "child")
- def receive = { case name: String => sender() ! context.child(name).isDefined }
- }), "parent")
+ def receive = { case name: String => sender() ! context.child(name).isDefined }
+ }), "parent")
- assert(Await.result((parent ? "child"), timeout.duration) === true)
- assert(Await.result((parent ? "whatnot"), timeout.duration) === false)
+ assert(Await.result(parent ? "child", timeout.duration) === true)
+ assert(Await.result(parent ? "whatnot", timeout.duration) === false)
}
}
}
diff --git a/akka-actor-tests/src/test/scala/akka/actor/ActorSelectionSpec.scala b/akka-actor-tests/src/test/scala/akka/actor/ActorSelectionSpec.scala
index ec1fcfe7cf..b4edb3b036 100644
--- a/akka-actor-tests/src/test/scala/akka/actor/ActorSelectionSpec.scala
+++ b/akka-actor-tests/src/test/scala/akka/actor/ActorSelectionSpec.scala
@@ -49,10 +49,11 @@ class ActorSelectionSpec extends AkkaSpec with DefaultTimeout {
val root = sysImpl.lookupRoot
def empty(path: String) =
- new EmptyLocalActorRef(sysImpl.provider, path match {
- case RelativeActorPath(elems) => sysImpl.lookupRoot.path / elems
- case _ => throw new RuntimeException()
- }, system.eventStream)
+ new EmptyLocalActorRef(sysImpl.provider,
+ path match {
+ case RelativeActorPath(elems) => sysImpl.lookupRoot.path / elems
+ case _ => throw new RuntimeException()
+ }, system.eventStream)
val idProbe = TestProbe()
@@ -128,7 +129,7 @@ class ActorSelectionSpec extends AkkaSpec with DefaultTimeout {
val a2 = system.actorOf(p, name)
a2.path should ===(a1.path)
a2.path.toString should ===(a1.path.toString)
- a2 should not be (a1)
+ a2 should not be a1
a2.toString should not be (a1.toString)
watch(a2)
@@ -253,12 +254,12 @@ class ActorSelectionSpec extends AkkaSpec with DefaultTimeout {
}
def check(looker: ActorRef): Unit = {
for ((l, r) <- Seq(
- SelectString("a/b/c") -> None,
- SelectString("akka://all-systems/Nobody") -> None,
- SelectPath(system / "hallo") -> None,
- SelectPath(looker.path.child("hallo")) -> None, // test Java API
- SelectPath(looker.path.descendant(Seq("a", "b").asJava)) -> None) // test Java API
- ) checkOne(looker, l, r)
+ SelectString("a/b/c") -> None,
+ SelectString("akka://all-systems/Nobody") -> None,
+ SelectPath(system / "hallo") -> None,
+ SelectPath(looker.path.child("hallo")) -> None, // test Java API
+ SelectPath(looker.path.descendant(Seq("a", "b").asJava)) -> None) // test Java API
+ ) checkOne(looker, l, r)
}
for (looker <- all) check(looker)
}
@@ -289,8 +290,8 @@ class ActorSelectionSpec extends AkkaSpec with DefaultTimeout {
implicit val sender = c1
ActorSelection(c21, "../../*") ! GetSender(testActor)
val actors = Set() ++ receiveWhile(messages = 2) {
- case `c1` => lastSender
- }
+ case `c1` => lastSender
+ }
actors should ===(Set(c1, c2))
expectNoMessage()
}
diff --git a/akka-actor-tests/src/test/scala/akka/actor/ActorSystemSpec.scala b/akka-actor-tests/src/test/scala/akka/actor/ActorSystemSpec.scala
index af79807bab..d152a9121f 100644
--- a/akka-actor-tests/src/test/scala/akka/actor/ActorSystemSpec.scala
+++ b/akka-actor-tests/src/test/scala/akka/actor/ActorSystemSpec.scala
@@ -32,10 +32,10 @@ object ActorSystemSpec {
case n: Int =>
master = sender()
terminaters = Set() ++ (for (_ <- 1 to n) yield {
- val man = context.watch(context.system.actorOf(Props[Terminater]()))
- man ! "run"
- man
- })
+ val man = context.watch(context.system.actorOf(Props[Terminater]()))
+ man ! "run"
+ man
+ })
case Terminated(child) if terminaters contains child =>
terminaters -= child
if (terminaters.isEmpty) {
@@ -123,14 +123,14 @@ class ActorSystemSpec extends AkkaSpec(ActorSystemSpec.config) with ImplicitSend
"reject invalid names" in {
for (n <- Seq(
- "-hallowelt",
- "_hallowelt",
- "hallo*welt",
- "hallo@welt",
- "hallo#welt",
- "hallo$welt",
- "hallo%welt",
- "hallo/welt")) intercept[IllegalArgumentException] {
+ "-hallowelt",
+ "_hallowelt",
+ "hallo*welt",
+ "hallo@welt",
+ "hallo#welt",
+ "hallo$welt",
+ "hallo%welt",
+ "hallo/welt")) intercept[IllegalArgumentException] {
ActorSystem(n)
}
}
diff --git a/akka-actor-tests/src/test/scala/akka/actor/ActorTimeoutSpec.scala b/akka-actor-tests/src/test/scala/akka/actor/ActorTimeoutSpec.scala
index 06dc9ebef5..630cd2e718 100644
--- a/akka-actor-tests/src/test/scala/akka/actor/ActorTimeoutSpec.scala
+++ b/akka-actor-tests/src/test/scala/akka/actor/ActorTimeoutSpec.scala
@@ -24,7 +24,7 @@ class ActorTimeoutSpec extends AkkaSpec {
"use implicitly supplied timeout" in {
implicit val timeout = Timeout(testTimeout)
val echo = system.actorOf(Props.empty)
- val f = (echo ? "hallo")
+ val f = echo ? "hallo"
intercept[AskTimeoutException] { Await.result(f, testTimeout + leeway) }
}
diff --git a/akka-actor-tests/src/test/scala/akka/actor/ConsistencySpec.scala b/akka-actor-tests/src/test/scala/akka/actor/ConsistencySpec.scala
index 9a35a0c353..e9956ec30e 100644
--- a/akka-actor-tests/src/test/scala/akka/actor/ConsistencySpec.scala
+++ b/akka-actor-tests/src/test/scala/akka/actor/ConsistencySpec.scala
@@ -28,11 +28,11 @@ object ConsistencySpec {
}
}
"""
- class CacheMisaligned(var value: Long, var padding1: Long, var padding2: Long, var padding3: Int) //Vars, no final fences
+ class CacheMisaligned(var value: Long, var padding1: Long, var padding2: Long, var padding3: Int) // Vars, no final fences
class ConsistencyCheckingActor extends Actor {
- var left = new CacheMisaligned(42, 0, 0, 0) //var
- var right = new CacheMisaligned(0, 0, 0, 0) //var
+ var left = new CacheMisaligned(42, 0, 0, 0) // var
+ var right = new CacheMisaligned(0, 0, 0, 0) // var
var lastStep = -1L
def receive = {
case step: Long =>
diff --git a/akka-actor-tests/src/test/scala/akka/actor/CoordinatedShutdownSpec.scala b/akka-actor-tests/src/test/scala/akka/actor/CoordinatedShutdownSpec.scala
index 74596010dc..6778f3ddaa 100644
--- a/akka-actor-tests/src/test/scala/akka/actor/CoordinatedShutdownSpec.scala
+++ b/akka-actor-tests/src/test/scala/akka/actor/CoordinatedShutdownSpec.scala
@@ -79,7 +79,8 @@ class CoordinatedShutdownSpec
// a, b can be in any order
result2.toSet should ===(Set("a", "b", "c"))
- checkTopologicalSort(Map("b" -> phase("a"), "c" -> phase("b"), "d" -> phase("b", "c"), "e" -> phase("d"))) should ===(
+ checkTopologicalSort(Map("b" -> phase("a"), "c" -> phase("b"), "d" -> phase("b", "c"),
+ "e" -> phase("d"))) should ===(
List("a", "b", "c", "d", "e"))
val result3 =
@@ -324,13 +325,14 @@ class CoordinatedShutdownSpec
val shouldBeCancelled = cancellables.zipWithIndex.collect {
case (c, i) if i % 2 == 0 => c
}
- val cancelFutures = for {
- _ <- cancellables
- c <- shouldBeCancelled
- } yield Future {
- c.cancel() shouldBe true
- Done
- }
+ val cancelFutures =
+ for {
+ _ <- cancellables
+ c <- shouldBeCancelled
+ } yield Future {
+ c.cancel() shouldBe true
+ Done
+ }
cancelFutures.foldLeft(Future.successful(Done)) {
case (acc, fut) =>
acc.flatMap(_ => fut)
@@ -785,7 +787,7 @@ class CoordinatedShutdownSpec
withSystemRunning(newSystem, cs)
TestKit.shutdownActorSystem(newSystem)
- shutdownHooks should have size (0)
+ shutdownHooks should have size 0
protected def myHooksCount: Int = synchronized(shutdownHooks.size)
}
diff --git a/akka-actor-tests/src/test/scala/akka/actor/DeathWatchSpec.scala b/akka-actor-tests/src/test/scala/akka/actor/DeathWatchSpec.scala
index b246cb32d1..02a74ddf9e 100644
--- a/akka-actor-tests/src/test/scala/akka/actor/DeathWatchSpec.scala
+++ b/akka-actor-tests/src/test/scala/akka/actor/DeathWatchSpec.scala
@@ -39,8 +39,8 @@ object DeathWatchSpec {
def receive = {
case "NKOTB" =>
val currentKid = context.watch(context.actorOf(Props(new Actor {
- def receive = { case "NKOTB" => context.stop(self) }
- }), "kid"))
+ def receive = { case "NKOTB" => context.stop(self) }
+ }), "kid"))
currentKid.forward("NKOTB")
context.become {
case Terminated(`currentKid`) =>
@@ -171,7 +171,7 @@ trait DeathWatchSpec { this: AkkaSpec with ImplicitSender with DefaultTimeout =>
monitor2 ! "ping"
- expectMsg("pong") //Needs to be here since watch and unwatch are asynchronous
+ expectMsg("pong") // Needs to be here since watch and unwatch are asynchronous
terminal ! PoisonPill
diff --git a/akka-actor-tests/src/test/scala/akka/actor/DynamicAccessSpec.scala b/akka-actor-tests/src/test/scala/akka/actor/DynamicAccessSpec.scala
index 335603fb84..68e6844c3d 100644
--- a/akka-actor-tests/src/test/scala/akka/actor/DynamicAccessSpec.scala
+++ b/akka-actor-tests/src/test/scala/akka/actor/DynamicAccessSpec.scala
@@ -47,7 +47,8 @@ class DynamicAccessSpec extends AnyWordSpec with Matchers with BeforeAndAfterAll
}
"try different constructors with recoverWith" in {
- instantiateWithDefaultOrStringCtor("akka.actor.TestClassWithStringConstructor").get.name shouldBe "string ctor argument"
+ instantiateWithDefaultOrStringCtor(
+ "akka.actor.TestClassWithStringConstructor").get.name shouldBe "string ctor argument"
instantiateWithDefaultOrStringCtor("akka.actor.TestClassWithDefaultConstructor").get.name shouldBe "default"
instantiateWithDefaultOrStringCtor("akka.actor.foo.NonExistingClass") match {
case Failure(t) =>
diff --git a/akka-actor-tests/src/test/scala/akka/actor/FSMActorSpec.scala b/akka-actor-tests/src/test/scala/akka/actor/FSMActorSpec.scala
index 61d32199e3..cd83c6073a 100644
--- a/akka-actor-tests/src/test/scala/akka/actor/FSMActorSpec.scala
+++ b/akka-actor-tests/src/test/scala/akka/actor/FSMActorSpec.scala
@@ -44,7 +44,7 @@ object FSMActorSpec {
soFar + digit match {
case incomplete if incomplete.length < code.length =>
stay().using(CodeState(incomplete, code))
- case codeTry if (codeTry == code) => {
+ case codeTry if codeTry == code => {
doUnlock()
goto(Open).using(CodeState("", code)).forMax(timeout)
}
diff --git a/akka-actor-tests/src/test/scala/akka/actor/HotSwapSpec.scala b/akka-actor-tests/src/test/scala/akka/actor/HotSwapSpec.scala
index c2fe7623c2..1e0166979c 100644
--- a/akka-actor-tests/src/test/scala/akka/actor/HotSwapSpec.scala
+++ b/akka-actor-tests/src/test/scala/akka/actor/HotSwapSpec.scala
@@ -17,7 +17,7 @@ class HotSwapSpec extends AkkaSpec with ImplicitSender {
"be able to become in its constructor" in {
val a = system.actorOf(Props(new Becomer {
context.become { case always => sender() ! always }
- def receive = { case _ => sender() ! "FAILURE" }
+ def receive = { case _ => sender() ! "FAILURE" }
}))
a ! "pigdog"
expectMsg("pigdog")
@@ -25,7 +25,7 @@ class HotSwapSpec extends AkkaSpec with ImplicitSender {
"be able to become multiple times in its constructor" in {
val a = system.actorOf(Props(new Becomer {
- for (i <- 1 to 4) context.become({ case always => sender() ! s"$i:$always" })
+ for (i <- 1 to 4) context.become { case always => sender() ! s"$i:$always" }
def receive = { case _ => sender() ! "FAILURE" }
}))
a ! "pigdog"
@@ -35,7 +35,7 @@ class HotSwapSpec extends AkkaSpec with ImplicitSender {
"be able to become with stacking in its constructor" in {
val a = system.actorOf(Props(new Becomer {
context.become({ case always => sender() ! "pigdog:" + always; context.unbecome() }, false)
- def receive = { case always => sender() ! "badass:" + always }
+ def receive = { case always => sender() ! "badass:" + always }
}))
a ! "pigdog"
expectMsg("pigdog:pigdog")
@@ -62,7 +62,7 @@ class HotSwapSpec extends AkkaSpec with ImplicitSender {
val a = system.actorOf(Props(new Actor {
def receive = {
case "init" => sender() ! "init"
- case "swap" => context.become({ case x: String => context.sender() ! x })
+ case "swap" => context.become { case x: String => context.sender() ! x }
}
}))
@@ -78,10 +78,10 @@ class HotSwapSpec extends AkkaSpec with ImplicitSender {
def receive = {
case "init" => sender() ! "init"
case "swap" =>
- context.become({
+ context.become {
case "swapped" => sender() ! "swapped"
case "revert" => context.unbecome()
- })
+ }
}
}))
@@ -103,11 +103,11 @@ class HotSwapSpec extends AkkaSpec with ImplicitSender {
def receive = {
case "state" => sender() ! "0"
case "swap" =>
- context.become({
+ context.become {
case "state" => sender() ! "1"
case "swapped" => sender() ! "swapped"
case "crash" => throw new Exception("Crash (expected)!")
- })
+ }
sender() ! "swapped"
}
}))
diff --git a/akka-actor-tests/src/test/scala/akka/actor/LocalActorRefProviderSpec.scala b/akka-actor-tests/src/test/scala/akka/actor/LocalActorRefProviderSpec.scala
index 5d75f5d525..ea052cae99 100644
--- a/akka-actor-tests/src/test/scala/akka/actor/LocalActorRefProviderSpec.scala
+++ b/akka-actor-tests/src/test/scala/akka/actor/LocalActorRefProviderSpec.scala
@@ -113,10 +113,10 @@ class LocalActorRefProviderSpec extends AkkaSpec(LocalActorRefProviderSpec.confi
// the fields are cleared after the Terminated message has been sent,
// so we need to check for a reasonable time after we receive it
awaitAssert({
- val childProps2 = child.asInstanceOf[LocalActorRef].underlying.props
- childProps2 should not be theSameInstanceAs(childProps1)
- (childProps2 should be).theSameInstanceAs(ActorCell.terminatedProps)
- }, 1 second)
+ val childProps2 = child.asInstanceOf[LocalActorRef].underlying.props
+ childProps2 should not be theSameInstanceAs(childProps1)
+ (childProps2 should be).theSameInstanceAs(ActorCell.terminatedProps)
+ }, 1 second)
}
}
@@ -135,11 +135,11 @@ class LocalActorRefProviderSpec extends AkkaSpec(LocalActorRefProviderSpec.confi
for (_ <- 1 to 4)
yield Future(system.actorOf(Props(new Actor { def receive = { case _ => } }), address))
val set: Set[Any] = Set() ++ actors.map(a =>
- Await.ready(a, timeout.duration).value match {
- case Some(Success(_: ActorRef)) => 1
- case Some(Failure(_: InvalidActorNameException)) => 2
- case x => x
- })
+ Await.ready(a, timeout.duration).value match {
+ case Some(Success(_: ActorRef)) => 1
+ case Some(Failure(_: InvalidActorNameException)) => 2
+ case x => x
+ })
set should ===(Set[Any](1, 2))
}
}
diff --git a/akka-actor-tests/src/test/scala/akka/actor/ProviderSelectionSpec.scala b/akka-actor-tests/src/test/scala/akka/actor/ProviderSelectionSpec.scala
index 2c6a4bdb74..c6925a27f8 100644
--- a/akka-actor-tests/src/test/scala/akka/actor/ProviderSelectionSpec.scala
+++ b/akka-actor-tests/src/test/scala/akka/actor/ProviderSelectionSpec.scala
@@ -50,7 +50,7 @@ class ProviderSelectionSpec extends AbstractSpec {
"create a Custom ProviderSelection and set custom provider fqcn in Settings" in {
val other = "other.ActorRefProvider"
- val ps = ProviderSelection.Custom(other) //checked by dynamicAccess
+ val ps = ProviderSelection.Custom(other) // checked by dynamicAccess
ps.fqcn shouldEqual "other.ActorRefProvider"
ps.hasCluster shouldBe false
settingsWith(other).ProviderClass shouldEqual ps.fqcn
diff --git a/akka-actor-tests/src/test/scala/akka/actor/SchedulerSpec.scala b/akka-actor-tests/src/test/scala/akka/actor/SchedulerSpec.scala
index e95ac596bc..09dbc51f03 100644
--- a/akka-actor-tests/src/test/scala/akka/actor/SchedulerSpec.scala
+++ b/akka-actor-tests/src/test/scala/akka/actor/SchedulerSpec.scala
@@ -240,11 +240,12 @@ trait SchedulerSpec extends BeforeAndAfterEach with DefaultTimeout with Implicit
"stop continuous scheduling if the task throws exception" taggedAs TimingTest in {
EventFilter[Exception]("TEST", occurrences = 1).intercept {
val count = new AtomicInteger(0)
- collectCancellable(scheduleAdapter.schedule(Duration.Zero, 20.millis, () => {
- val c = count.incrementAndGet()
- testActor ! c
- if (c == 3) throw new RuntimeException("TEST") with NoStackTrace
- }))
+ collectCancellable(scheduleAdapter.schedule(Duration.Zero, 20.millis,
+ () => {
+ val c = count.incrementAndGet()
+ testActor ! c
+ if (c == 3) throw new RuntimeException("TEST") with NoStackTrace
+ }))
expectMsg(1)
expectMsg(2)
expectMsg(3)
@@ -256,24 +257,26 @@ trait SchedulerSpec extends BeforeAndAfterEach with DefaultTimeout with Implicit
// when first throws
EventFilter[Exception]("TEST-1", occurrences = 1).intercept {
val count1 = new AtomicInteger(0)
- collectCancellable(scheduleAdapter.schedule(Duration.Zero, 20.millis, () => {
- val c = count1.incrementAndGet()
- if (c == 1)
- throw new IllegalStateException("TEST-1") with NoStackTrace
- else
- testActor ! c
- }))
+ collectCancellable(scheduleAdapter.schedule(Duration.Zero, 20.millis,
+ () => {
+ val c = count1.incrementAndGet()
+ if (c == 1)
+ throw new IllegalStateException("TEST-1") with NoStackTrace
+ else
+ testActor ! c
+ }))
expectNoMessage(200.millis)
}
// when later
EventFilter[Exception]("TEST-3", occurrences = 1).intercept {
val count2 = new AtomicInteger(0)
- collectCancellable(scheduleAdapter.schedule(Duration.Zero, 20.millis, () => {
- val c = count2.incrementAndGet()
- testActor ! c
- if (c == 3) throw new IllegalStateException("TEST-3") with NoStackTrace
- }))
+ collectCancellable(scheduleAdapter.schedule(Duration.Zero, 20.millis,
+ () => {
+ val c = count2.incrementAndGet()
+ testActor ! c
+ if (c == 3) throw new IllegalStateException("TEST-3") with NoStackTrace
+ }))
expectMsg(1)
expectMsg(2)
expectMsg(3)
@@ -286,9 +289,10 @@ trait SchedulerSpec extends BeforeAndAfterEach with DefaultTimeout with Implicit
val initialDelay = 200.millis.dilated
val delay = 10.millis.dilated
- val timeout = collectCancellable(scheduleAdapter.schedule(initialDelay, delay, () => {
- ticks.incrementAndGet()
- }))
+ val timeout = collectCancellable(scheduleAdapter.schedule(initialDelay, delay,
+ () => {
+ ticks.incrementAndGet()
+ }))
Thread.sleep(10.millis.dilated.toMillis)
timeout.cancel()
Thread.sleep((initialDelay + 100.millis.dilated).toMillis)
@@ -301,9 +305,10 @@ trait SchedulerSpec extends BeforeAndAfterEach with DefaultTimeout with Implicit
val initialDelay = 90.millis.dilated
val delay = 500.millis.dilated
- val timeout = collectCancellable(scheduleAdapter.schedule(initialDelay, delay, () => {
- ticks.incrementAndGet()
- }))
+ val timeout = collectCancellable(scheduleAdapter.schedule(initialDelay, delay,
+ () => {
+ ticks.incrementAndGet()
+ }))
Thread.sleep((initialDelay + 200.millis.dilated).toMillis)
timeout.cancel()
Thread.sleep((delay + 100.millis.dilated).toMillis)
@@ -473,9 +478,10 @@ class LightArrayRevolverSchedulerSpec extends AkkaSpec(SchedulerSpec.testConfRev
val counter = new AtomicInteger
val terminated = Future {
var rounds = 0
- while (Try(sched.scheduleOnce(Duration.Zero, new Scheduler.TaskRunOnClose {
- override def run(): Unit = ()
- })(localEC)).isSuccess) {
+ while (Try(sched.scheduleOnce(Duration.Zero,
+ new Scheduler.TaskRunOnClose {
+ override def run(): Unit = ()
+ })(localEC)).isSuccess) {
Thread.sleep(1)
driver.wakeUp(step)
rounds += 1
@@ -485,9 +491,10 @@ class LightArrayRevolverSchedulerSpec extends AkkaSpec(SchedulerSpec.testConfRev
def delay = if (ThreadLocalRandom.current.nextBoolean) step * 2 else step
val N = 1000000
(1 to N).foreach(_ =>
- sched.scheduleOnce(delay, new Scheduler.TaskRunOnClose {
- override def run(): Unit = counter.incrementAndGet()
- }))
+ sched.scheduleOnce(delay,
+ new Scheduler.TaskRunOnClose {
+ override def run(): Unit = counter.incrementAndGet()
+ }))
sched.close()
Await.result(terminated, 3.seconds.dilated) should be > 10
awaitAssert(counter.get should ===(N))
@@ -614,9 +621,10 @@ class LightArrayRevolverSchedulerSpec extends AkkaSpec(SchedulerSpec.testConfRev
var overrun = headroom
val cap = 1000000
val (success, failure) = Iterator
- .continually(Try(sched.scheduleOnce(100.millis, new Scheduler.TaskRunOnClose {
- override def run(): Unit = counter.incrementAndGet()
- })))
+ .continually(Try(sched.scheduleOnce(100.millis,
+ new Scheduler.TaskRunOnClose {
+ override def run(): Unit = counter.incrementAndGet()
+ })))
.take(cap)
.takeWhile(_.isSuccess || { overrun -= 1; overrun >= 0 })
.partition(_.isSuccess)
@@ -632,9 +640,10 @@ class LightArrayRevolverSchedulerSpec extends AkkaSpec(SchedulerSpec.testConfRev
import system.dispatcher
val counter = new AtomicInteger()
sched.scheduleOnce(10.seconds)(counter.incrementAndGet())
- sched.scheduleOnce(10.seconds, new Scheduler.TaskRunOnClose {
- override def run(): Unit = counter.incrementAndGet()
- })
+ sched.scheduleOnce(10.seconds,
+ new Scheduler.TaskRunOnClose {
+ override def run(): Unit = counter.incrementAndGet()
+ })
driver.close()
sched.close()
counter.get should ===(1)
diff --git a/akka-actor-tests/src/test/scala/akka/actor/SupervisorHierarchySpec.scala b/akka-actor-tests/src/test/scala/akka/actor/SupervisorHierarchySpec.scala
index 8d2c1a01c0..433b81a4c3 100644
--- a/akka-actor-tests/src/test/scala/akka/actor/SupervisorHierarchySpec.scala
+++ b/akka-actor-tests/src/test/scala/akka/actor/SupervisorHierarchySpec.scala
@@ -170,7 +170,7 @@ object SupervisorHierarchySpec {
val sizes = s / kids
var rest = s % kids
val propsTemplate = Props.empty.withDispatcher("hierarchy")
- (1 to kids).iterator.map { (id) =>
+ (1 to kids).iterator.map { id =>
val kidSize = if (rest > 0) {
rest -= 1; sizes + 1
} else sizes
@@ -821,14 +821,15 @@ class SupervisorHierarchySpec extends AkkaSpec(SupervisorHierarchySpec.config) w
"suspend children while failing" taggedAs LongRunningTest in {
val latch = TestLatch()
- val slowResumer = system.actorOf(Props(new Actor {
- override def supervisorStrategy = OneForOneStrategy() {
- case _ => Await.ready(latch, 4.seconds.dilated); SupervisorStrategy.Resume
- }
- def receive = {
- case "spawn" => sender() ! context.actorOf(Props[Resumer]())
- }
- }), "slowResumer")
+ val slowResumer = system.actorOf(
+ Props(new Actor {
+ override def supervisorStrategy = OneForOneStrategy() {
+ case _ => Await.ready(latch, 4.seconds.dilated); SupervisorStrategy.Resume
+ }
+ def receive = {
+ case "spawn" => sender() ! context.actorOf(Props[Resumer]())
+ }
+ }), "slowResumer")
slowResumer ! "spawn"
val boss = expectMsgType[ActorRef]
boss ! "spawn"
@@ -867,24 +868,24 @@ class SupervisorHierarchySpec extends AkkaSpec(SupervisorHierarchySpec.config) w
}
val child = context.actorOf(Props(new Actor {
- val ca = createAttempt.incrementAndGet()
-
- if (ca <= 6 && ca % 3 == 0)
- context.actorOf(Props(new Actor { override def receive = { case _ => } }), "workingChild")
-
- if (ca < 6) {
- throw new IllegalArgumentException("OH NO!")
- }
- override def preStart() = {
- preStartCalled.incrementAndGet()
- }
- override def postRestart(reason: Throwable) = {
- postRestartCalled.incrementAndGet()
- }
- override def receive = {
- case m => sender() ! m
- }
- }), "failChild")
+ val ca = createAttempt.incrementAndGet()
+
+ if (ca <= 6 && ca % 3 == 0)
+ context.actorOf(Props(new Actor { override def receive = { case _ => } }), "workingChild")
+
+ if (ca < 6) {
+ throw new IllegalArgumentException("OH NO!")
+ }
+ override def preStart() = {
+ preStartCalled.incrementAndGet()
+ }
+ override def postRestart(reason: Throwable) = {
+ postRestartCalled.incrementAndGet()
+ }
+ override def receive = {
+ case m => sender() ! m
+ }
+ }), "failChild")
override def receive = {
case m => child.forward(m)
diff --git a/akka-actor-tests/src/test/scala/akka/actor/SupervisorSpec.scala b/akka-actor-tests/src/test/scala/akka/actor/SupervisorSpec.scala
index 7f121ba627..c99e4ce3a8 100644
--- a/akka-actor-tests/src/test/scala/akka/actor/SupervisorSpec.scala
+++ b/akka-actor-tests/src/test/scala/akka/actor/SupervisorSpec.scala
@@ -197,7 +197,7 @@ class SupervisorSpec
def kill(pingPongActor: ActorRef) = {
val result = pingPongActor.?(DieReply)(DilatedTimeout)
- expectMsg(Timeout, ExceptionMessage) //this is sent from PingPongActor's postRestart()
+ expectMsg(Timeout, ExceptionMessage) // this is sent from PingPongActor's postRestart()
intercept[RuntimeException] { Await.result(result, DilatedTimeout) }
}
@@ -218,7 +218,7 @@ class SupervisorSpec
}
"restart properly when same instance is returned" in {
- val restarts = 3 //max number of restarts
+ val restarts = 3 // max number of restarts
lazy val childInstance = new Actor {
var preRestarts = 0
var postRestarts = 0
@@ -439,17 +439,17 @@ class SupervisorSpec
"not lose system messages when a NonFatal exception occurs when processing a system message" in {
val parent = system.actorOf(Props(new Actor {
- override val supervisorStrategy = OneForOneStrategy()({
+ override val supervisorStrategy = OneForOneStrategy() {
case e: IllegalStateException if e.getMessage == "OHNOES" => throw e
case _ => SupervisorStrategy.Restart
- })
+ }
val child = context.watch(context.actorOf(Props(new Actor {
- override def postRestart(reason: Throwable): Unit = testActor ! "child restarted"
- def receive = {
- case l: TestLatch => { Await.ready(l, 5 seconds); throw new IllegalStateException("OHNOES") }
- case "test" => sender() ! "child green"
- }
- }), "child"))
+ override def postRestart(reason: Throwable): Unit = testActor ! "child restarted"
+ def receive = {
+ case l: TestLatch => { Await.ready(l, 5 seconds); throw new IllegalStateException("OHNOES") }
+ case "test" => sender() ! "child green"
+ }
+ }), "child"))
override def postRestart(reason: Throwable): Unit = testActor ! "parent restarted"
@@ -559,7 +559,7 @@ class SupervisorSpec
val pingpong = child(supervisor, Props(new PingPongActor(testActor)))
- //impossible to confirm if the restart window is infinite, so making sure maxNrOfRetries is respected correctly
+ // impossible to confirm if the restart window is infinite, so making sure maxNrOfRetries is respected correctly
kill(pingpong)
kill(pingpong)
kill(pingpong)
diff --git a/akka-actor-tests/src/test/scala/akka/actor/Ticket669Spec.scala b/akka-actor-tests/src/test/scala/akka/actor/Ticket669Spec.scala
index 409bd3a5eb..267807e8e2 100644
--- a/akka-actor-tests/src/test/scala/akka/actor/Ticket669Spec.scala
+++ b/akka-actor-tests/src/test/scala/akka/actor/Ticket669Spec.scala
@@ -21,7 +21,7 @@ class Ticket669Spec extends AkkaSpec with BeforeAndAfterAll with ImplicitSender
// TODO: does this really make sense?
override def atStartup(): Unit = {
- Thread.interrupted() //remove interrupted status.
+ Thread.interrupted() // remove interrupted status.
}
"A supervised actor with lifecycle PERMANENT" should {
diff --git a/akka-actor-tests/src/test/scala/akka/actor/TypedActorSpec.scala b/akka-actor-tests/src/test/scala/akka/actor/TypedActorSpec.scala
index e1d7f2c276..ec1579157d 100644
--- a/akka-actor-tests/src/test/scala/akka/actor/TypedActorSpec.scala
+++ b/akka-actor-tests/src/test/scala/akka/actor/TypedActorSpec.scala
@@ -177,7 +177,7 @@ object TypedActorSpec {
}
class StackedImpl extends Stacked {
- override def stacked: String = "FOOBAR" //Uppercase
+ override def stacked: String = "FOOBAR" // Uppercase
}
trait LifeCycles {
@@ -410,18 +410,18 @@ class TypedActorSpec
t.incr()
t.failingPigdog()
- t.read() should ===(1) //Make sure state is not reset after failure
+ t.read() should ===(1) // Make sure state is not reset after failure
intercept[IllegalStateException] { Await.result(t.failingFuturePigdog(), 2 seconds) }.getMessage should ===(
"expected")
- t.read() should ===(1) //Make sure state is not reset after failure
+ t.read() should ===(1) // Make sure state is not reset after failure
intercept[IllegalStateException] { t.failingJOptionPigdog() }.getMessage should ===("expected")
- t.read() should ===(1) //Make sure state is not reset after failure
+ t.read() should ===(1) // Make sure state is not reset after failure
intercept[IllegalStateException] { t.failingOptionPigdog() }.getMessage should ===("expected")
- t.read() should ===(1) //Make sure state is not reset after failure
+ t.read() should ===(1) // Make sure state is not reset after failure
mustStop(t)
}
@@ -559,14 +559,14 @@ class TypedActorSpec
t.crash()
}
- //Sneak in a check for the Receiver override
+ // Sneak in a check for the Receiver override
val ref = ta.getActorRefFor(t)
ref.tell("pigdog", testActor)
expectMsg(timeout.duration, "dogpig")
- //Done with that now
+ // Done with that now
ta.poisonPill(t)
latch.await(10, TimeUnit.SECONDS) should ===(true)
diff --git a/akka-actor-tests/src/test/scala/akka/actor/UidClashTest.scala b/akka-actor-tests/src/test/scala/akka/actor/UidClashTest.scala
index 3e02ea7578..27cbb90582 100644
--- a/akka-actor-tests/src/test/scala/akka/actor/UidClashTest.scala
+++ b/akka-actor-tests/src/test/scala/akka/actor/UidClashTest.scala
@@ -25,7 +25,7 @@ object UidClashTest {
val eventStream: EventStream)
extends MinimalActorRef {
- //Ignore everything
+ // Ignore everything
override def isTerminated: Boolean = true
override def sendSystemMessage(message: SystemMessage): Unit = ()
override def !(message: Any)(implicit sender: ActorRef = Actor.noSender): Unit = ()
diff --git a/akka-actor-tests/src/test/scala/akka/actor/dispatch/ActorModelSpec.scala b/akka-actor-tests/src/test/scala/akka/actor/dispatch/ActorModelSpec.scala
index ae6f74f5fc..6f2870a0b0 100644
--- a/akka-actor-tests/src/test/scala/akka/actor/dispatch/ActorModelSpec.scala
+++ b/akka-actor-tests/src/test/scala/akka/actor/dispatch/ActorModelSpec.scala
@@ -261,9 +261,9 @@ abstract class ActorModelSpec(config: String) extends AkkaSpec(config) with Defa
def awaitStarted(ref: ActorRef): Unit = {
awaitCond(ref match {
- case r: RepointableRef => r.isStarted
- case _ => true
- }, 1 second, 10 millis)
+ case r: RepointableRef => r.isStarted
+ case _ => true
+ }, 1 second, 10 millis)
}
protected def interceptedDispatcher(): MessageDispatcherInterceptor
@@ -647,7 +647,7 @@ class BalancingDispatcherModelSpec extends ActorModelSpec(BalancingDispatcherMod
system.stop(a)
system.stop(b)
- while (!a.isTerminated && !b.isTerminated) {} //Busy wait for termination
+ while (!a.isTerminated && !b.isTerminated) {} // Busy wait for termination
assertRefDefaultZero(a)(registers = 1, unregisters = 1, msgsReceived = 1, msgsProcessed = 1)
assertRefDefaultZero(b)(registers = 1, unregisters = 1, msgsReceived = 1, msgsProcessed = 1)
diff --git a/akka-actor-tests/src/test/scala/akka/actor/dispatch/DispatchersSpec.scala b/akka-actor-tests/src/test/scala/akka/actor/dispatch/DispatchersSpec.scala
index 4e50b7a36c..72dfa0d39f 100644
--- a/akka-actor-tests/src/test/scala/akka/actor/dispatch/DispatchersSpec.scala
+++ b/akka-actor-tests/src/test/scala/akka/actor/dispatch/DispatchersSpec.scala
@@ -175,7 +175,7 @@ class DispatchersSpec extends AkkaSpec(DispatchersSpec.config) with ImplicitSend
}
"get the correct types of dispatchers" in {
- //All created/obtained dispatchers are of the expected type/instance
+ // All created/obtained dispatchers are of the expected type/instance
assert(typesAndValidators.forall(tuple => tuple._2(allDispatchers(tuple._1))))
}
diff --git a/akka-actor-tests/src/test/scala/akka/config/ConfigSpec.scala b/akka-actor-tests/src/test/scala/akka/config/ConfigSpec.scala
index 4261ec2ed1..112410e248 100644
--- a/akka-actor-tests/src/test/scala/akka/config/ConfigSpec.scala
+++ b/akka-actor-tests/src/test/scala/akka/config/ConfigSpec.scala
@@ -89,7 +89,7 @@ class ConfigSpec extends AkkaSpec(ConfigFactory.defaultReference(ActorSystem.fin
{
val c = config.getConfig("akka.actor.default-dispatcher")
- //General dispatcher config
+ // General dispatcher config
{
c.getString("type") should ===("Dispatcher")
@@ -100,13 +100,13 @@ class ConfigSpec extends AkkaSpec(ConfigFactory.defaultReference(ActorSystem.fin
c.getBoolean("attempt-teamwork") should ===(true)
}
- //Default executor config
+ // Default executor config
{
val pool = c.getConfig("default-executor")
pool.getString("fallback") should ===("fork-join-executor")
}
- //Fork join executor config
+ // Fork join executor config
{
val pool = c.getConfig("fork-join-executor")
@@ -116,7 +116,7 @@ class ConfigSpec extends AkkaSpec(ConfigFactory.defaultReference(ActorSystem.fin
pool.getString("task-peeking-mode") should be("FIFO")
}
- //Thread pool executor config
+ // Thread pool executor config
{
val pool = c.getConfig("thread-pool-executor")
diff --git a/akka-actor-tests/src/test/scala/akka/dispatch/ExecutionContextSpec.scala b/akka-actor-tests/src/test/scala/akka/dispatch/ExecutionContextSpec.scala
index 2e454241db..ec140d906c 100644
--- a/akka-actor-tests/src/test/scala/akka/dispatch/ExecutionContextSpec.scala
+++ b/akka-actor-tests/src/test/scala/akka/dispatch/ExecutionContextSpec.scala
@@ -27,16 +27,16 @@ class ExecutionContextSpec extends AkkaSpec with DefaultTimeout {
val es = Executors.newCachedThreadPool()
try {
val executor: Executor with ExecutionContext = ExecutionContext.fromExecutor(es)
- executor should not be (null)
+ executor should not be null
val executorService: ExecutorService with ExecutionContext = ExecutionContext.fromExecutorService(es)
- executorService should not be (null)
+ executorService should not be null
val jExecutor: ExecutionContextExecutor = ExecutionContext.fromExecutor(es)
- jExecutor should not be (null)
+ jExecutor should not be null
val jExecutorService: ExecutionContextExecutorService = ExecutionContexts.fromExecutorService(es)
- jExecutorService should not be (null)
+ jExecutorService should not be null
} finally {
es.shutdown
}
@@ -60,7 +60,7 @@ class ExecutionContextSpec extends AkkaSpec with DefaultTimeout {
(1 to 100).foreach { _ =>
batchable {
if (callingThreadLock.get != 0) p.tryFailure(new IllegalStateException("Batch was executed inline!"))
- else if (count.incrementAndGet == 100) p.trySuccess(()) //Done
+ else if (count.incrementAndGet == 100) p.trySuccess(()) // Done
else if (lock.compareAndSet(0, 1)) {
try Thread.sleep(10)
finally lock.compareAndSet(1, 0)
diff --git a/akka-actor-tests/src/test/scala/akka/dispatch/MailboxConfigSpec.scala b/akka-actor-tests/src/test/scala/akka/dispatch/MailboxConfigSpec.scala
index 3cee62d6c6..a5a6a1182c 100644
--- a/akka-actor-tests/src/test/scala/akka/dispatch/MailboxConfigSpec.scala
+++ b/akka-actor-tests/src/test/scala/akka/dispatch/MailboxConfigSpec.scala
@@ -82,7 +82,7 @@ abstract class MailboxSpec extends AkkaSpec with BeforeAndAfterAll with BeforeAn
}
}
- //CANDIDATE FOR TESTKIT
+ // CANDIDATE FOR TESTKIT
def spawn[T <: AnyRef](fun: => T): Future[T] = Future(fun)(ExecutionContext.global)
def createMessageInvocation(msg: Any): Envelope = Envelope(msg, system.deadLetters, system)
@@ -138,7 +138,7 @@ abstract class MailboxSpec extends AkkaSpec with BeforeAndAfterAll with BeforeAn
val q = factory(config)
ensureInitialMailboxState(config, q)
- EventFilter.warning(pattern = "received dead letter", occurrences = (enqueueN - dequeueN)).intercept {
+ EventFilter.warning(pattern = "received dead letter", occurrences = enqueueN - dequeueN).intercept {
def createProducer(fromNum: Int, toNum: Int): Future[Vector[Envelope]] = spawn {
val messages = Vector() ++ (for (i <- fromNum to toNum) yield createMessageInvocation(i))
@@ -171,13 +171,13 @@ abstract class MailboxSpec extends AkkaSpec with BeforeAndAfterAll with BeforeAn
val ps = producers.map(Await.result(_, remainingOrDefault))
val cs = consumers.map(Await.result(_, remainingOrDefault))
- ps.map(_.size).sum should ===(enqueueN) //Must have produced 1000 messages
- cs.map(_.size).sum should ===(dequeueN) //Must have consumed all produced messages
- //No message is allowed to be consumed by more than one consumer
+ ps.map(_.size).sum should ===(enqueueN) // Must have produced 1000 messages
+ cs.map(_.size).sum should ===(dequeueN) // Must have consumed all produced messages
+ // No message is allowed to be consumed by more than one consumer
cs.flatten.distinct.size should ===(dequeueN)
- //All consumed messages should have been produced
+ // All consumed messages should have been produced
cs.flatten.diff(ps.flatten).size should ===(0)
- //The ones that were produced and not consumed
+ // The ones that were produced and not consumed
ps.flatten.diff(cs.flatten).size should ===(enqueueN - dequeueN)
}
}
@@ -248,9 +248,9 @@ class CustomMailboxSpec extends AkkaSpec(CustomMailboxSpec.config) {
"support custom mailboxType" in {
val actor = system.actorOf(Props.empty.withDispatcher("my-dispatcher"))
awaitCond(actor match {
- case r: RepointableRef => r.isStarted
- case _ => true
- }, 1 second, 10 millis)
+ case r: RepointableRef => r.isStarted
+ case _ => true
+ }, 1 second, 10 millis)
val queue = actor.asInstanceOf[ActorRefWithCell].underlying.asInstanceOf[ActorCell].mailbox.messageQueue
queue.getClass should ===(classOf[CustomMailboxSpec.MyMailbox])
}
diff --git a/akka-actor-tests/src/test/scala/akka/dispatch/PriorityDispatcherSpec.scala b/akka-actor-tests/src/test/scala/akka/dispatch/PriorityDispatcherSpec.scala
index df3f051029..1f1b7f54b8 100644
--- a/akka-actor-tests/src/test/scala/akka/dispatch/PriorityDispatcherSpec.scala
+++ b/akka-actor-tests/src/test/scala/akka/dispatch/PriorityDispatcherSpec.scala
@@ -28,17 +28,17 @@ object PriorityDispatcherSpec {
class Unbounded(@unused settings: ActorSystem.Settings, @unused config: Config)
extends UnboundedPriorityMailbox(PriorityGenerator({
- case i: Int => i //Reverse order
+ case i: Int => i // Reverse order
case Result => Int.MaxValue
case _ => throw new RuntimeException() // compiler exhaustiveness check pleaser
}: Any => Int))
class Bounded(@unused settings: ActorSystem.Settings, @unused config: Config)
extends BoundedPriorityMailbox(PriorityGenerator({
- case i: Int => i //Reverse order
- case Result => Int.MaxValue
- case _ => throw new RuntimeException() // compiler exhaustiveness check pleaser
- }: Any => Int), 1000, 10 seconds)
+ case i: Int => i // Reverse order
+ case Result => Int.MaxValue
+ case _ => throw new RuntimeException() // compiler exhaustiveness check pleaser
+ }: Any => Int), 1000, 10 seconds)
}
diff --git a/akka-actor-tests/src/test/scala/akka/dispatch/StablePriorityDispatcherSpec.scala b/akka-actor-tests/src/test/scala/akka/dispatch/StablePriorityDispatcherSpec.scala
index 2a97f4381d..52615a6b0c 100644
--- a/akka-actor-tests/src/test/scala/akka/dispatch/StablePriorityDispatcherSpec.scala
+++ b/akka-actor-tests/src/test/scala/akka/dispatch/StablePriorityDispatcherSpec.scala
@@ -35,11 +35,11 @@ object StablePriorityDispatcherSpec {
class Bounded(@unused settings: ActorSystem.Settings, @unused config: Config)
extends BoundedStablePriorityMailbox(PriorityGenerator({
- case i: Int if i <= 100 => i // Small integers have high priority
- case _: Int => 101 // Don't care for other integers
- case Result => Int.MaxValue
- case _ => throw new RuntimeException() // compiler exhaustiveness check pleaser
- }: Any => Int), 1000, 10 seconds)
+ case i: Int if i <= 100 => i // Small integers have high priority
+ case _: Int => 101 // Don't care for other integers
+ case Result => Int.MaxValue
+ case _ => throw new RuntimeException() // compiler exhaustiveness check pleaser
+ }: Any => Int), 1000, 10 seconds)
}
diff --git a/akka-actor-tests/src/test/scala/akka/event/EventBusSpec.scala b/akka-actor-tests/src/test/scala/akka/event/EventBusSpec.scala
index 18d2c7d8fb..fb3434a164 100644
--- a/akka-actor-tests/src/test/scala/akka/event/EventBusSpec.scala
+++ b/akka-actor-tests/src/test/scala/akka/event/EventBusSpec.scala
@@ -308,7 +308,7 @@ class ScanningEventBusSpec extends EventBusSpec("ScanningEventBus") {
def createNewEventBus(): BusType = new MyScanningEventBus
- def createEvents(numberOfEvents: Int) = (0 until numberOfEvents)
+ def createEvents(numberOfEvents: Int) = 0 until numberOfEvents
def createSubscriber(pipeTo: ActorRef) = new Procedure[Int] { def apply(i: Int) = pipeTo ! i }
@@ -339,7 +339,7 @@ class LookupEventBusSpec extends EventBusSpec("LookupEventBus") {
def createNewEventBus(): BusType = new MyLookupEventBus
- def createEvents(numberOfEvents: Int) = (0 until numberOfEvents)
+ def createEvents(numberOfEvents: Int) = 0 until numberOfEvents
def createSubscriber(pipeTo: ActorRef) = new Procedure[Int] { def apply(i: Int) = pipeTo ! i }
diff --git a/akka-actor-tests/src/test/scala/akka/event/EventStreamSpec.scala b/akka-actor-tests/src/test/scala/akka/event/EventStreamSpec.scala
index 9547631271..5cac228b3e 100644
--- a/akka-actor-tests/src/test/scala/akka/event/EventStreamSpec.scala
+++ b/akka-actor-tests/src/test/scala/akka/event/EventStreamSpec.scala
@@ -74,10 +74,10 @@ class EventStreamSpec extends AkkaSpec(EventStreamSpec.config) {
"An EventStream" must {
"manage subscriptions" in {
- //#event-bus-start-unsubscriber-scala
+ // #event-bus-start-unsubscriber-scala
val bus = new EventStream(system, true)
bus.startUnsubscriber()
- //#event-bus-start-unsubscriber-scala
+ // #event-bus-start-unsubscriber-scala
bus.subscribe(testActor, classOf[M])
bus.publish(M(42))
@@ -294,8 +294,8 @@ class EventStreamSpec extends AkkaSpec(EventStreamSpec.config) {
val tm = new A
val target = sys.actorOf(Props(new Actor {
- def receive = { case in => a1.ref.forward(in) }
- }), "to-be-killed")
+ def receive = { case in => a1.ref.forward(in) }
+ }), "to-be-killed")
es.subscribe(a2.ref, classOf[Any])
es.subscribe(target, classOf[A]) should ===(true)
@@ -322,8 +322,8 @@ class EventStreamSpec extends AkkaSpec(EventStreamSpec.config) {
val probe = TestProbe()
val terminated = system.actorOf(Props(new Actor {
- def receive = { case _ => }
- }), "to-be-killed")
+ def receive = { case _ => }
+ }), "to-be-killed")
watch(terminated)
terminated ! PoisonPill
diff --git a/akka-actor-tests/src/test/scala/akka/event/LoggerSpec.scala b/akka-actor-tests/src/test/scala/akka/event/LoggerSpec.scala
index ff488701b4..054307318b 100644
--- a/akka-actor-tests/src/test/scala/akka/event/LoggerSpec.scala
+++ b/akka-actor-tests/src/test/scala/akka/event/LoggerSpec.scala
@@ -96,7 +96,7 @@ object LoggerSpec {
sender() ! LoggerInitialized
case SetTarget(ref, `qualifier`) =>
target = Some(ref)
- ref ! ("OK")
+ ref ! "OK"
case event: LogEvent if !event.mdc.isEmpty =>
print(event)
target.foreach { _ ! event }
@@ -173,7 +173,7 @@ class LoggerSpec extends AnyWordSpec with Matchers {
"log messages to standard output" in {
val out = createSystemAndLogToBuffer("defaultLogger", defaultConfig, true)
- out.size should be > (0)
+ out.size should be > 0
}
"drain logger queue on system.terminate" in {
diff --git a/akka-actor-tests/src/test/scala/akka/event/LoggingReceiveSpec.scala b/akka-actor-tests/src/test/scala/akka/event/LoggingReceiveSpec.scala
index 37fa06eab8..f62b277cb3 100644
--- a/akka-actor-tests/src/test/scala/akka/event/LoggingReceiveSpec.scala
+++ b/akka-actor-tests/src/test/scala/akka/event/LoggingReceiveSpec.scala
@@ -68,9 +68,10 @@ class LoggingReceiveSpec extends AnyWordSpec with BeforeAndAfterAll {
system.eventStream.subscribe(testActor, classOf[UnhandledMessage])
val a = system.actorOf(Props(new Actor {
def receive =
- new LoggingReceive(Some("funky"), {
- case null =>
- })
+ new LoggingReceive(Some("funky"),
+ {
+ case null =>
+ })
}))
a ! "hallo"
expectMsg(
diff --git a/akka-actor-tests/src/test/scala/akka/event/jul/JavaLoggerSpec.scala b/akka-actor-tests/src/test/scala/akka/event/jul/JavaLoggerSpec.scala
index 937aa460f8..3c9c2be932 100644
--- a/akka-actor-tests/src/test/scala/akka/event/jul/JavaLoggerSpec.scala
+++ b/akka-actor-tests/src/test/scala/akka/event/jul/JavaLoggerSpec.scala
@@ -58,9 +58,9 @@ class JavaLoggerSpec extends AkkaSpec(JavaLoggerSpec.config) {
val record = expectMsgType[logging.LogRecord]
- record should not be (null)
- record.getMillis should not be (0)
- record.getThreadID should not be (0)
+ record should not be null
+ record.getMillis should not be 0
+ record.getThreadID should not be 0
record.getLevel should ===(logging.Level.SEVERE)
record.getMessage should ===("Simulated error")
record.getThrown.getClass should ===(classOf[JavaLoggerSpec.SimulatedExc])
@@ -73,9 +73,9 @@ class JavaLoggerSpec extends AkkaSpec(JavaLoggerSpec.config) {
val record = expectMsgType[logging.LogRecord]
- record should not be (null)
- record.getMillis should not be (0)
- record.getThreadID should not be (0)
+ record should not be null
+ record.getMillis should not be 0
+ record.getThreadID should not be 0
record.getLevel should ===(logging.Level.INFO)
record.getMessage should ===("3 is the magic number")
record.getThrown should ===(null)
diff --git a/akka-actor-tests/src/test/scala/akka/io/TcpConnectionSpec.scala b/akka-actor-tests/src/test/scala/akka/io/TcpConnectionSpec.scala
index 754c5e0b1d..c92285bd1b 100644
--- a/akka-actor-tests/src/test/scala/akka/io/TcpConnectionSpec.scala
+++ b/akka-actor-tests/src/test/scala/akka/io/TcpConnectionSpec.scala
@@ -380,32 +380,33 @@ class TcpConnectionSpec extends AkkaSpec("""
override implicit lazy val system: ActorSystem = ActorSystem("respectPullModeTest", config)
try run {
- val maxBufferSize = 1 * 1024
- val ts = "t" * maxBufferSize
- val us = "u" * (maxBufferSize / 2)
+ val maxBufferSize = 1 * 1024
+ val ts = "t" * maxBufferSize
+ val us = "u" * (maxBufferSize / 2)
- // send a batch that is bigger than the default buffer to make sure we don't recurse and
- // send more than one Received messages
- serverSideChannel.write(ByteBuffer.wrap((ts ++ us).getBytes("ASCII")))
- connectionHandler.expectNoMessage(100.millis)
+ // send a batch that is bigger than the default buffer to make sure we don't recurse and
+ // send more than one Received messages
+ serverSideChannel.write(ByteBuffer.wrap((ts ++ us).getBytes("ASCII")))
+ connectionHandler.expectNoMessage(100.millis)
- connectionActor ! ResumeReading
- connectionHandler.expectMsgType[Received].data.decodeString("ASCII") should ===(ts)
+ connectionActor ! ResumeReading
+ connectionHandler.expectMsgType[Received].data.decodeString("ASCII") should ===(ts)
- connectionHandler.expectNoMessage(100.millis)
+ connectionHandler.expectNoMessage(100.millis)
- connectionActor ! ResumeReading
- connectionHandler.expectMsgType[Received].data.decodeString("ASCII") should ===(us)
+ connectionActor ! ResumeReading
+ connectionHandler.expectMsgType[Received].data.decodeString("ASCII") should ===(us)
- connectionHandler.expectNoMessage(100.millis)
+ connectionHandler.expectNoMessage(100.millis)
- val vs = "v" * (maxBufferSize / 2)
- serverSideChannel.write(ByteBuffer.wrap(vs.getBytes("ASCII")))
+ val vs = "v" * (maxBufferSize / 2)
+ serverSideChannel.write(ByteBuffer.wrap(vs.getBytes("ASCII")))
- connectionActor ! ResumeReading
+ connectionActor ! ResumeReading
- connectionHandler.expectMsgType[Received].data.decodeString("ASCII") should ===(vs)
- } finally shutdown(system)
+ connectionHandler.expectMsgType[Received].data.decodeString("ASCII") should ===(vs)
+ }
+ finally shutdown(system)
}
"close the connection and reply with `Closed` upon reception of a `Close` command" in
@@ -653,7 +654,7 @@ class TcpConnectionSpec extends AkkaSpec("""
override lazy val connectionActor =
createConnectionActor(serverAddress = UnboundAddress, timeout = Option(100.millis))
run {
- connectionActor.toString should not be ("")
+ connectionActor.toString should not be ""
userHandler.expectMsg(CommandFailed(Connect(UnboundAddress, timeout = Option(100.millis))))
watch(connectionActor)
expectTerminated(connectionActor)
@@ -982,7 +983,7 @@ class TcpConnectionSpec extends AkkaSpec("""
override def run(body: => Unit): Unit = super.run {
try {
serverSideChannel.configureBlocking(false)
- serverSideChannel should not be (null)
+ serverSideChannel should not be null
interestCallReceiver.expectMsg(OP_CONNECT)
selector.send(connectionActor, ChannelConnectable)
diff --git a/akka-actor-tests/src/test/scala/akka/io/TcpIntegrationSpecSupport.scala b/akka-actor-tests/src/test/scala/akka/io/TcpIntegrationSpecSupport.scala
index 52a6ba33cd..436d1b9353 100644
--- a/akka-actor-tests/src/test/scala/akka/io/TcpIntegrationSpecSupport.scala
+++ b/akka-actor-tests/src/test/scala/akka/io/TcpIntegrationSpecSupport.scala
@@ -50,7 +50,7 @@ trait TcpIntegrationSpecSupport { this: AkkaSpec =>
connectCommander.sender() ! Register(clientHandler.ref)
bindHandler.expectMsgType[Connected] match {
- case Connected(`localAddress`, `endpoint`) => //ok
+ case Connected(`localAddress`, `endpoint`) => // ok
case other => fail(s"No match: ${other}")
}
val serverHandler = TestProbe()
diff --git a/akka-actor-tests/src/test/scala/akka/io/dns/AsyncDnsResolverIntegrationSpec.scala b/akka-actor-tests/src/test/scala/akka/io/dns/AsyncDnsResolverIntegrationSpec.scala
index cb312eb794..0e3b844020 100644
--- a/akka-actor-tests/src/test/scala/akka/io/dns/AsyncDnsResolverIntegrationSpec.scala
+++ b/akka-actor-tests/src/test/scala/akka/io/dns/AsyncDnsResolverIntegrationSpec.scala
@@ -116,7 +116,7 @@ class AsyncDnsResolverIntegrationSpec
val answer = (IO(Dns) ? DnsProtocol.Resolve(name)).mapTo[DnsProtocol.Resolved].futureValue
answer.name shouldEqual name
answer.records.collect { case r: CNameRecord => r.canonicalName }.toSet shouldEqual Set("a-single.bar.example")
- answer.records.collect { case r: ARecord => r.ip }.toSet shouldEqual Set(InetAddress.getByName("192.168.2.20"))
+ answer.records.collect { case r: ARecord => r.ip }.toSet shouldEqual Set(InetAddress.getByName("192.168.2.20"))
}
"resolve internal CNAME record" in {
@@ -124,7 +124,7 @@ class AsyncDnsResolverIntegrationSpec
val answer = resolve(name)
answer.name shouldEqual name
answer.records.collect { case r: CNameRecord => r.canonicalName }.toSet shouldEqual Set("a-double.foo.test")
- answer.records.collect { case r: ARecord => r.ip }.toSet shouldEqual Set(
+ answer.records.collect { case r: ARecord => r.ip }.toSet shouldEqual Set(
InetAddress.getByName("192.168.1.21"),
InetAddress.getByName("192.168.1.22"))
}
diff --git a/akka-actor-tests/src/test/scala/akka/io/dns/internal/AsyncDnsResolverSpec.scala b/akka-actor-tests/src/test/scala/akka/io/dns/internal/AsyncDnsResolverSpec.scala
index 102ac6d886..e3649a0415 100644
--- a/akka-actor-tests/src/test/scala/akka/io/dns/internal/AsyncDnsResolverSpec.scala
+++ b/akka-actor-tests/src/test/scala/akka/io/dns/internal/AsyncDnsResolverSpec.scala
@@ -227,8 +227,9 @@ class AsyncDnsResolverSpec extends AkkaSpec("""
def resolver(clients: List[ActorRef], config: Config): ActorRef = {
val settings = new DnsSettings(system.asInstanceOf[ExtendedActorSystem], config)
- system.actorOf(Props(new AsyncDnsResolver(settings, new SimpleDnsCache(), (_, _) => {
- clients
- })))
+ system.actorOf(Props(new AsyncDnsResolver(settings, new SimpleDnsCache(),
+ (_, _) => {
+ clients
+ })))
}
}
diff --git a/akka-actor-tests/src/test/scala/akka/pattern/AskSpec.scala b/akka-actor-tests/src/test/scala/akka/pattern/AskSpec.scala
index 8c0b79cca5..8eca542fc4 100644
--- a/akka-actor-tests/src/test/scala/akka/pattern/AskSpec.scala
+++ b/akka-actor-tests/src/test/scala/akka/pattern/AskSpec.scala
@@ -133,8 +133,8 @@ class AskSpec extends AkkaSpec("""
system.eventStream.subscribe(deadListener.ref, classOf[DeadLetter])
val echo = system.actorOf(Props(new Actor {
- def receive = { case x => context.actorSelection(sender().path) ! x }
- }), "select-echo2")
+ def receive = { case x => context.actorSelection(sender().path) ! x }
+ }), "select-echo2")
val f = echo ? "hi"
Await.result(f, 1 seconds) should ===("hi")
@@ -164,13 +164,13 @@ class AskSpec extends AkkaSpec("""
system.eventStream.subscribe(deadListener.ref, classOf[DeadLetter])
val echo = system.actorOf(Props(new Actor {
- def receive = {
- case x =>
- val name = sender().path.name
- val parent = sender().path.parent
- context.actorSelection(parent / ".." / "temp" / name) ! x
- }
- }), "select-echo4")
+ def receive = {
+ case x =>
+ val name = sender().path.name
+ val parent = sender().path.parent
+ context.actorSelection(parent / ".." / "temp" / name) ! x
+ }
+ }), "select-echo4")
val f = echo ? "hi"
intercept[AskTimeoutException] {
Await.result(f, 1 seconds) should ===("hi")
@@ -185,12 +185,12 @@ class AskSpec extends AkkaSpec("""
system.eventStream.subscribe(deadListener.ref, classOf[DeadLetter])
val echo = system.actorOf(Props(new Actor {
- def receive = {
- case x =>
- val parent = sender().path.parent
- context.actorSelection(parent / "missing") ! x
- }
- }), "select-echo5")
+ def receive = {
+ case x =>
+ val parent = sender().path.parent
+ context.actorSelection(parent / "missing") ! x
+ }
+ }), "select-echo5")
val f = echo ? "hi"
intercept[AskTimeoutException] {
Await.result(f, 1 seconds) should ===("hi")
@@ -204,11 +204,11 @@ class AskSpec extends AkkaSpec("""
system.eventStream.subscribe(deadListener.ref, classOf[DeadLetter])
val echo = system.actorOf(Props(new Actor {
- def receive = {
- case x =>
- context.actorSelection(sender().path / "missing") ! x
- }
- }), "select-echo6")
+ def receive = {
+ case x =>
+ context.actorSelection(sender().path / "missing") ! x
+ }
+ }), "select-echo6")
val f = echo ? "hi"
intercept[AskTimeoutException] {
Await.result(f, 1 seconds) should ===(ActorSelectionMessage("hi", Vector(SelectChildName("missing")), false))
@@ -242,10 +242,10 @@ class AskSpec extends AkkaSpec("""
val p = TestProbe()
val act = system.actorOf(Props(new Actor {
- def receive = {
- case msg => p.ref ! sender() -> msg
- }
- }), "myName")
+ def receive = {
+ case msg => p.ref ! sender() -> msg
+ }
+ }), "myName")
(act ? "ask").mapTo[String]
val (promiseActorRef, "ask") = p.expectMsgType[(ActorRef, String)]
diff --git a/akka-actor-tests/src/test/scala/akka/pattern/BackoffOnRestartSupervisorSpec.scala b/akka-actor-tests/src/test/scala/akka/pattern/BackoffOnRestartSupervisorSpec.scala
index 21ab9c2487..1edf230500 100644
--- a/akka-actor-tests/src/test/scala/akka/pattern/BackoffOnRestartSupervisorSpec.scala
+++ b/akka-actor-tests/src/test/scala/akka/pattern/BackoffOnRestartSupervisorSpec.scala
@@ -273,9 +273,9 @@ class BackoffOnRestartSupervisorSpec extends AkkaSpec("""
// note that the message could be lost (dead letters) because ended up with previous crashed child
probe.awaitAssert({
- supervisor ! "PING"
- probe.expectMsg("PING")
- }, 1.second)
+ supervisor ! "PING"
+ probe.expectMsg("PING")
+ }, 1.second)
}
}
}
diff --git a/akka-actor-tests/src/test/scala/akka/pattern/BackoffSupervisorSpec.scala b/akka-actor-tests/src/test/scala/akka/pattern/BackoffSupervisorSpec.scala
index 57bd9bab9e..f3f0026036 100644
--- a/akka-actor-tests/src/test/scala/akka/pattern/BackoffSupervisorSpec.scala
+++ b/akka-actor-tests/src/test/scala/akka/pattern/BackoffSupervisorSpec.scala
@@ -253,7 +253,7 @@ class BackoffSupervisorSpec extends AkkaSpec with ImplicitSender with Eventually
}
EventFilter.warning(pattern = ".*boom.*", occurrences = 1).intercept {
- supervisor ! "boom" //this will be sent to deadLetters
+ supervisor ! "boom" // this will be sent to deadLetters
expectNoMessage(500.milliseconds)
}
}
diff --git a/akka-actor-tests/src/test/scala/akka/pattern/CircuitBreakerMTSpec.scala b/akka-actor-tests/src/test/scala/akka/pattern/CircuitBreakerMTSpec.scala
index 533979ddd6..ac0b67e822 100644
--- a/akka-actor-tests/src/test/scala/akka/pattern/CircuitBreakerMTSpec.scala
+++ b/akka-actor-tests/src/test/scala/akka/pattern/CircuitBreakerMTSpec.scala
@@ -24,9 +24,9 @@ class CircuitBreakerMTSpec extends AkkaSpec {
// returns true if the breaker is open
def failingCall(): Boolean =
Await.result(breaker.withCircuitBreaker(Future.failed(new RuntimeException("FAIL"))).recover {
- case _: CircuitBreakerOpenException => true
- case _ => false
- }, remainingOrDefault)
+ case _: CircuitBreakerOpenException => true
+ case _ => false
+ }, remainingOrDefault)
// fire some failing calls
(1 to (maxFailures + 1)).foreach { _ =>
diff --git a/akka-actor-tests/src/test/scala/akka/pattern/CircuitBreakerSpec.scala b/akka-actor-tests/src/test/scala/akka/pattern/CircuitBreakerSpec.scala
index 837a96988d..9a30642c30 100644
--- a/akka-actor-tests/src/test/scala/akka/pattern/CircuitBreakerSpec.scala
+++ b/akka-actor-tests/src/test/scala/akka/pattern/CircuitBreakerSpec.scala
@@ -349,7 +349,7 @@ class CircuitBreakerSpec extends AkkaSpec("""
breaker().currentFailureCount should ===(0)
intercept[TestException] {
val ct = Thread.currentThread() // Ensure that the thunk is executed in the tests thread
- breaker().withSyncCircuitBreaker({ if (Thread.currentThread() eq ct) throwException else "fail" })
+ breaker().withSyncCircuitBreaker { if (Thread.currentThread() eq ct) throwException else "fail" }
}
breaker().currentFailureCount should ===(1)
breaker().withSyncCircuitBreaker(sayHi)
@@ -362,7 +362,7 @@ class CircuitBreakerSpec extends AkkaSpec("""
breaker().currentFailureCount should ===(0)
intercept[TestException] {
val ct = Thread.currentThread() // Ensure that the thunk is executed in the tests thread
- breaker().withSyncCircuitBreaker({ if (Thread.currentThread() eq ct) throwException else "fail" })
+ breaker().withSyncCircuitBreaker { if (Thread.currentThread() eq ct) throwException else "fail" }
}
breaker().currentFailureCount should ===(1)
@@ -385,7 +385,7 @@ class CircuitBreakerSpec extends AkkaSpec("""
breaker().currentFailureCount should ===(0)
intercept[TestException] {
val ct = Thread.currentThread() // Ensure that the thunk is executed in the tests thread
- breaker().withSyncCircuitBreaker({ if (Thread.currentThread() eq ct) throwException else "fail" })
+ breaker().withSyncCircuitBreaker { if (Thread.currentThread() eq ct) throwException else "fail" }
}
breaker().currentFailureCount should ===(1)
breaker().succeed()
diff --git a/akka-actor-tests/src/test/scala/akka/pattern/RetrySpec.scala b/akka-actor-tests/src/test/scala/akka/pattern/RetrySpec.scala
index 32a23337da..d934b34ce8 100644
--- a/akka-actor-tests/src/test/scala/akka/pattern/RetrySpec.scala
+++ b/akka-actor-tests/src/test/scala/akka/pattern/RetrySpec.scala
@@ -29,10 +29,10 @@ class RetrySpec extends AkkaSpec with RetrySupport {
@volatile var counter = 0
val retried = retry(
() =>
- Future.successful({
+ Future.successful {
counter += 1
counter
- }),
+ },
5,
1 second)
@@ -94,10 +94,11 @@ class RetrySpec extends AkkaSpec with RetrySupport {
} else Future.successful(5)
}
- val retried = retry(() => attempt(), 5, attempted => {
- attemptedCount = attempted
- Some(100.milliseconds * attempted)
- })
+ val retried = retry(() => attempt(), 5,
+ attempted => {
+ attemptedCount = attempted
+ Some(100.milliseconds * attempted)
+ })
within(30000000 seconds) {
intercept[IllegalStateException] { Await.result(retried, remaining) }.getMessage should ===("6")
attemptedCount shouldBe 5
diff --git a/akka-actor-tests/src/test/scala/akka/pattern/extended/ExplicitAskSpec.scala b/akka-actor-tests/src/test/scala/akka/pattern/extended/ExplicitAskSpec.scala
index 8f1c8b0331..0dead180c3 100644
--- a/akka-actor-tests/src/test/scala/akka/pattern/extended/ExplicitAskSpec.scala
+++ b/akka-actor-tests/src/test/scala/akka/pattern/extended/ExplicitAskSpec.scala
@@ -37,10 +37,10 @@ class ExplicitAskSpec extends AkkaSpec {
implicit val timeout: Timeout = Timeout(5.seconds)
val target = system.actorOf(Props(new Actor {
- def receive = {
- case Request(respondTo) => respondTo ! Response(self)
- }
- }), "select-echo")
+ def receive = {
+ case Request(respondTo) => respondTo ! Response(self)
+ }
+ }), "select-echo")
val selection = system.actorSelection("/user/select-echo")
val f = selection ? (respondTo => Request(respondTo))
diff --git a/akka-actor-tests/src/test/scala/akka/routing/MetricsBasedResizerSpec.scala b/akka-actor-tests/src/test/scala/akka/routing/MetricsBasedResizerSpec.scala
index 26d36c4cc2..be75223493 100644
--- a/akka-actor-tests/src/test/scala/akka/routing/MetricsBasedResizerSpec.scala
+++ b/akka-actor-tests/src/test/scala/akka/routing/MetricsBasedResizerSpec.scala
@@ -232,12 +232,12 @@ class MetricsBasedResizerSpec extends AkkaSpec(ResizerSpec.config) with DefaultT
val resizer = DefaultOptimalSizeExploringResizer()
val router = TestRouter(routees(2))
val msgs1 = router.sendToAll(await = true)
- val msgs2 = router.sendToAll(await = false) //make sure the routees are still busy after the first batch of messages get processed.
+ val msgs2 = router.sendToAll(await = false) // make sure the routees are still busy after the first batch of messages get processed.
val before = System.nanoTime()
- resizer.reportMessageCount(router.routees, router.msgs.size) //updates the records
+ resizer.reportMessageCount(router.routees, router.msgs.size) // updates the records
- msgs1.foreach(_.second.open()) //process two messages
+ msgs1.foreach(_.second.open()) // process two messages
// make sure some time passes in-between
Thread.sleep(300)
@@ -263,12 +263,12 @@ class MetricsBasedResizerSpec extends AkkaSpec(ResizerSpec.config) with DefaultT
val router = TestRouter(routees(2))
val msgs1 = router.sendToAll(await = true)
- val msgs2 = router.sendToAll(await = false) //make sure the routees are still busy after the first batch of messages get processed.
+ val msgs2 = router.sendToAll(await = false) // make sure the routees are still busy after the first batch of messages get processed.
val before = System.nanoTime()
- resizer.reportMessageCount(router.routees, router.msgs.size) //updates the records
+ resizer.reportMessageCount(router.routees, router.msgs.size) // updates the records
- msgs1.foreach(_.second.open()) //process two messages
+ msgs1.foreach(_.second.open()) // process two messages
// make sure some time passes in-between
Thread.sleep(300)
diff --git a/akka-actor-tests/src/test/scala/akka/routing/RandomSpec.scala b/akka-actor-tests/src/test/scala/akka/routing/RandomSpec.scala
index 5911ca4e41..e6f29ab459 100644
--- a/akka-actor-tests/src/test/scala/akka/routing/RandomSpec.scala
+++ b/akka-actor-tests/src/test/scala/akka/routing/RandomSpec.scala
@@ -23,14 +23,14 @@ class RandomSpec extends AkkaSpec with DefaultTimeout with ImplicitSender {
val stopLatch = new TestLatch(7)
val actor = system.actorOf(RandomPool(7).props(Props(new Actor {
- def receive = {
- case "hello" => sender() ! "world"
- }
+ def receive = {
+ case "hello" => sender() ! "world"
+ }
- override def postStop(): Unit = {
- stopLatch.countDown()
- }
- })), "random-shutdown")
+ override def postStop(): Unit = {
+ stopLatch.countDown()
+ }
+ })), "random-shutdown")
actor ! "hello"
actor ! "hello"
@@ -58,12 +58,12 @@ class RandomSpec extends AkkaSpec with DefaultTimeout with ImplicitSender {
}
val actor = system.actorOf(RandomPool(connectionCount).props(routeeProps = Props(new Actor {
- lazy val id = counter.getAndIncrement()
- def receive = {
- case "hit" => sender() ! id
- case "end" => doneLatch.countDown()
- }
- })), name = "random")
+ lazy val id = counter.getAndIncrement()
+ def receive = {
+ case "hit" => sender() ! id
+ case "end" => doneLatch.countDown()
+ }
+ })), name = "random")
for (_ <- 0 until iterationCount) {
for (_ <- 0 until connectionCount) {
@@ -77,7 +77,7 @@ class RandomSpec extends AkkaSpec with DefaultTimeout with ImplicitSender {
actor ! akka.routing.Broadcast("end")
Await.ready(doneLatch, 5 seconds)
- replies.values.foreach { _ should be > (0) }
+ replies.values.foreach { _ should be > 0 }
replies.values.sum should ===(iterationCount * connectionCount)
}
@@ -86,14 +86,14 @@ class RandomSpec extends AkkaSpec with DefaultTimeout with ImplicitSender {
val stopLatch = new TestLatch(6)
val actor = system.actorOf(RandomPool(6).props(routeeProps = Props(new Actor {
- def receive = {
- case "hello" => helloLatch.countDown()
- }
-
- override def postStop(): Unit = {
- stopLatch.countDown()
- }
- })), "random-broadcast")
+ def receive = {
+ case "hello" => helloLatch.countDown()
+ }
+
+ override def postStop(): Unit = {
+ stopLatch.countDown()
+ }
+ })), "random-broadcast")
actor ! akka.routing.Broadcast("hello")
Await.ready(helloLatch, 5 seconds)
diff --git a/akka-actor-tests/src/test/scala/akka/routing/ResizerSpec.scala b/akka-actor-tests/src/test/scala/akka/routing/ResizerSpec.scala
index c3b8ec6d79..50c7f90179 100644
--- a/akka-actor-tests/src/test/scala/akka/routing/ResizerSpec.scala
+++ b/akka-actor-tests/src/test/scala/akka/routing/ResizerSpec.scala
@@ -227,16 +227,16 @@ class ResizerSpec extends AkkaSpec(ResizerSpec.config) with DefaultTimeout with
}
val z = routeeSize(router)
- z should be > (2)
+ z should be > 2
Thread.sleep((300 millis).dilated.toMillis)
// let it cool down
awaitCond({
- router ! 0 // trigger resize
- Thread.sleep((20 millis).dilated.toMillis)
- routeeSize(router) < z
- }, interval = 500.millis.dilated)
+ router ! 0 // trigger resize
+ Thread.sleep((20 millis).dilated.toMillis)
+ routeeSize(router) < z
+ }, interval = 500.millis.dilated)
}
diff --git a/akka-actor-tests/src/test/scala/akka/routing/RoundRobinSpec.scala b/akka-actor-tests/src/test/scala/akka/routing/RoundRobinSpec.scala
index 76d246e047..3e75e2322e 100644
--- a/akka-actor-tests/src/test/scala/akka/routing/RoundRobinSpec.scala
+++ b/akka-actor-tests/src/test/scala/akka/routing/RoundRobinSpec.scala
@@ -30,14 +30,14 @@ class RoundRobinSpec extends AkkaSpec with DefaultTimeout with ImplicitSender {
val stopLatch = new TestLatch(5)
val actor = system.actorOf(RoundRobinPool(5).props(routeeProps = Props(new Actor {
- def receive = {
- case "hello" => helloLatch.countDown()
- }
+ def receive = {
+ case "hello" => helloLatch.countDown()
+ }
- override def postStop(): Unit = {
- stopLatch.countDown()
- }
- })), "round-robin-shutdown")
+ override def postStop(): Unit = {
+ stopLatch.countDown()
+ }
+ })), "round-robin-shutdown")
actor ! "hello"
actor ! "hello"
@@ -59,12 +59,12 @@ class RoundRobinSpec extends AkkaSpec with DefaultTimeout with ImplicitSender {
var replies: Map[Int, Int] = Map.empty.withDefaultValue(0)
val actor = system.actorOf(RoundRobinPool(connectionCount).props(routeeProps = Props(new Actor {
- lazy val id = counter.getAndIncrement()
- def receive = {
- case "hit" => sender() ! id
- case "end" => doneLatch.countDown()
- }
- })), "round-robin")
+ lazy val id = counter.getAndIncrement()
+ def receive = {
+ case "hit" => sender() ! id
+ case "end" => doneLatch.countDown()
+ }
+ })), "round-robin")
for (_ <- 1 to iterationCount; _ <- 1 to connectionCount) {
val id = Await.result((actor ? "hit").mapTo[Int], timeout.duration)
@@ -84,14 +84,14 @@ class RoundRobinSpec extends AkkaSpec with DefaultTimeout with ImplicitSender {
val stopLatch = new TestLatch(5)
val actor = system.actorOf(RoundRobinPool(5).props(routeeProps = Props(new Actor {
- def receive = {
- case "hello" => helloLatch.countDown()
- }
+ def receive = {
+ case "hello" => helloLatch.countDown()
+ }
- override def postStop(): Unit = {
- stopLatch.countDown()
- }
- })), "round-robin-broadcast")
+ override def postStop(): Unit = {
+ stopLatch.countDown()
+ }
+ })), "round-robin-broadcast")
actor ! akka.routing.Broadcast("hello")
Await.ready(helloLatch, 5 seconds)
@@ -102,8 +102,8 @@ class RoundRobinSpec extends AkkaSpec with DefaultTimeout with ImplicitSender {
"be controlled with management messages" in {
val actor = system.actorOf(RoundRobinPool(3).props(routeeProps = Props(new Actor {
- def receive = Actor.emptyBehavior
- })), "round-robin-managed")
+ def receive = Actor.emptyBehavior
+ })), "round-robin-managed")
routeeSize(actor) should ===(3)
actor ! AdjustPoolSize(+4)
@@ -130,11 +130,11 @@ class RoundRobinSpec extends AkkaSpec with DefaultTimeout with ImplicitSender {
val paths = (1 to connectionCount).map { n =>
val ref = system.actorOf(Props(new Actor {
- def receive = {
- case "hit" => sender() ! self.path.name
- case "end" => doneLatch.countDown()
- }
- }), name = "target-" + n)
+ def receive = {
+ case "hit" => sender() ! self.path.name
+ case "end" => doneLatch.countDown()
+ }
+ }), name = "target-" + n)
ref.path.toStringWithoutAddress
}
diff --git a/akka-actor-tests/src/test/scala/akka/routing/RoutingSpec.scala b/akka-actor-tests/src/test/scala/akka/routing/RoutingSpec.scala
index 141fedde64..7677b9b85e 100644
--- a/akka-actor-tests/src/test/scala/akka/routing/RoutingSpec.scala
+++ b/akka-actor-tests/src/test/scala/akka/routing/RoutingSpec.scala
@@ -136,15 +136,15 @@ class RoutingSpec extends AkkaSpec(RoutingSpec.config) with DefaultTimeout with
}
"set supplied supervisorStrategy" in {
- //#supervision
+ // #supervision
val escalator = OneForOneStrategy() {
- //#custom-strategy
+ // #custom-strategy
case e => testActor ! e; SupervisorStrategy.Escalate
- //#custom-strategy
+ // #custom-strategy
}
val router =
system.actorOf(RoundRobinPool(1, supervisorStrategy = escalator).props(routeeProps = Props[TestActor]()))
- //#supervision
+ // #supervision
router ! GetRoutees
EventFilter[ActorKilledException](occurrences = 1).intercept {
expectMsgType[Routees].routees.head.send(Kill, testActor)
diff --git a/akka-actor-tests/src/test/scala/akka/routing/ScatterGatherFirstCompletedSpec.scala b/akka-actor-tests/src/test/scala/akka/routing/ScatterGatherFirstCompletedSpec.scala
index 072aa79148..ca072c495b 100644
--- a/akka-actor-tests/src/test/scala/akka/routing/ScatterGatherFirstCompletedSpec.scala
+++ b/akka-actor-tests/src/test/scala/akka/routing/ScatterGatherFirstCompletedSpec.scala
@@ -28,9 +28,9 @@ object ScatterGatherFirstCompletedSpec {
system.actorOf(
Props(new Actor {
def receive = {
- case Stop(None) => context.stop(self)
- case Stop(Some(_id)) if (_id == id) => context.stop(self)
- case _id: Int if (_id == id) =>
+ case Stop(None) => context.stop(self)
+ case Stop(Some(_id)) if _id == id => context.stop(self)
+ case _id: Int if _id == id =>
case _ => {
Thread.sleep(100 * id)
sender() ! id
diff --git a/akka-actor-tests/src/test/scala/akka/routing/SmallestMailboxSpec.scala b/akka-actor-tests/src/test/scala/akka/routing/SmallestMailboxSpec.scala
index d19057f6f4..a2109b2cf9 100644
--- a/akka-actor-tests/src/test/scala/akka/routing/SmallestMailboxSpec.scala
+++ b/akka-actor-tests/src/test/scala/akka/routing/SmallestMailboxSpec.scala
@@ -51,15 +51,15 @@ class SmallestMailboxSpec extends AkkaSpec with DefaultTimeout with ImplicitSend
busy.countDown()
val busyPath = usedActors.get(0)
- busyPath should not be (null)
+ busyPath should not be null
val path1 = usedActors.get(1)
val path2 = usedActors.get(2)
val path3 = usedActors.get(3)
- path1 should not be (busyPath)
- path2 should not be (busyPath)
- path3 should not be (busyPath)
+ path1 should not be busyPath
+ path2 should not be busyPath
+ path3 should not be busyPath
}
}
diff --git a/akka-actor-tests/src/test/scala/akka/routing/TailChoppingSpec.scala b/akka-actor-tests/src/test/scala/akka/routing/TailChoppingSpec.scala
index e83d8631c0..ccd0dd7428 100644
--- a/akka-actor-tests/src/test/scala/akka/routing/TailChoppingSpec.scala
+++ b/akka-actor-tests/src/test/scala/akka/routing/TailChoppingSpec.scala
@@ -17,17 +17,17 @@ import akka.testkit._
object TailChoppingSpec {
def newActor(id: Int, sleepTime: Duration)(implicit system: ActorSystem) =
system.actorOf(Props(new Actor {
- var times: Int = _
-
- def receive = {
- case "stop" => context.stop(self)
- case "times" => sender() ! times
- case _ =>
- times += 1
- Thread.sleep(sleepTime.toMillis)
- sender() ! "ack"
- }
- }), "Actor:" + id)
+ var times: Int = _
+
+ def receive = {
+ case "stop" => context.stop(self)
+ case "times" => sender() ! times
+ case _ =>
+ times += 1
+ Thread.sleep(sleepTime.toMillis)
+ sender() ! "ack"
+ }
+ }), "Actor:" + id)
}
class TailChoppingSpec extends AkkaSpec with DefaultTimeout with ImplicitSender {
diff --git a/akka-actor-tests/src/test/scala/akka/util/BoundedBlockingQueueSpec.scala b/akka-actor-tests/src/test/scala/akka/util/BoundedBlockingQueueSpec.scala
index 94891eb367..141689c693 100644
--- a/akka-actor-tests/src/test/scala/akka/util/BoundedBlockingQueueSpec.scala
+++ b/akka-actor-tests/src/test/scala/akka/util/BoundedBlockingQueueSpec.scala
@@ -183,7 +183,7 @@ class BoundedBlockingQueueSpec
// queue.take() must happen first
Thread.sleep(50) // this is why this test is tagged as TimingTest
events should contain(awaitNotEmpty)
- events should not contain (poll)
+ events should not contain poll
}
"block until the backing queue is non-empty" taggedAs TimingTest in {
@@ -557,7 +557,7 @@ class BoundedBlockingQueueSpec
val target = mutable.Buffer[String]()
elems.foreach(queue.put)
queue.drainTo(target.asJava)
- elems should contain theSameElementsAs (target)
+ elems should contain theSameElementsAs target
}
}
@@ -617,7 +617,7 @@ class BoundedBlockingQueueSpec
queue.retainAll(elems.asJava) should equal(true)
queue.remainingCapacity() should equal(1)
queue.toArray() shouldNot contain("Akka")
- queue.toArray() should contain theSameElementsAs (elems)
+ queue.toArray() should contain theSameElementsAs elems
}
"return false if no elements were removed" in {
diff --git a/akka-actor-tests/src/test/scala/akka/util/ByteStringSpec.scala b/akka-actor-tests/src/test/scala/akka/util/ByteStringSpec.scala
index 7363df4cd1..29d9ccb1ca 100644
--- a/akka-actor-tests/src/test/scala/akka/util/ByteStringSpec.scala
+++ b/akka-actor-tests/src/test/scala/akka/util/ByteStringSpec.scala
@@ -313,10 +313,10 @@ class ByteStringSpec extends AnyWordSpec with Matchers with Checkers {
for (i <- 0 until data.length) builder.putLongPart(data(i), nBytes)(byteOrder)
reference.zipWithIndex
- .collect({ // Since there is no partial put on LongBuffer, we need to collect only the interesting bytes
+ .collect { // Since there is no partial put on LongBuffer, we need to collect only the interesting bytes
case (r, i) if byteOrder == ByteOrder.LITTLE_ENDIAN && i % elemSize < nBytes => r
case (r, i) if byteOrder == ByteOrder.BIG_ENDIAN && i % elemSize >= (elemSize - nBytes) => r
- })
+ }
.toSeq == builder.result()
}
@@ -886,13 +886,13 @@ class ByteStringSpec extends AnyWordSpec with Matchers with Checkers {
"calling span" in {
check { (a: ByteString, b: Byte) =>
- likeVector(a)({ _.span(_ != b) match { case (a, b) => (a, b) } })
+ likeVector(a) { _.span(_ != b) match { case (a, b) => (a, b) } }
}
}
"calling takeWhile" in {
check { (a: ByteString, b: Byte) =>
- likeVector(a)({ _.takeWhile(_ != b) })
+ likeVector(a) { _.takeWhile(_ != b) }
}
}
"calling dropWhile" in {
@@ -940,9 +940,9 @@ class ByteStringSpec extends AnyWordSpec with Matchers with Checkers {
check { (slice: ByteStringSlice) =>
slice match {
case (xs, from, until) =>
- likeVector(xs)({
+ likeVector(xs) {
_.slice(from, until)
- })
+ }
}
}
}
@@ -951,9 +951,9 @@ class ByteStringSpec extends AnyWordSpec with Matchers with Checkers {
check { (slice: ByteStringSlice) =>
slice match {
case (xs, from, until) =>
- likeVector(xs)({
+ likeVector(xs) {
_.drop(from).take(until - from)
- })
+ }
}
}
}
@@ -970,11 +970,11 @@ class ByteStringSpec extends AnyWordSpec with Matchers with Checkers {
check { (slice: ByteStringSlice) =>
slice match {
case (xs, from, until) =>
- likeVector(xs)({ it =>
+ likeVector(xs) { it =>
val array = new Array[Byte](xs.length)
it.copyToArray(array, from, until)
array.toSeq
- })
+ }
}
}
}
@@ -1114,8 +1114,8 @@ class ByteStringSpec extends AnyWordSpec with Matchers with Checkers {
slice match {
case (xs, from, until) =>
likeVecIt(xs)({
- _.slice(from, until).toSeq
- }, strict = false)
+ _.slice(from, until).toSeq
+ }, strict = false)
}
}
}
@@ -1125,8 +1125,8 @@ class ByteStringSpec extends AnyWordSpec with Matchers with Checkers {
slice match {
case (xs, from, until) =>
likeVecIt(xs)({
- _.drop(from).take(until - from).toSeq
- }, strict = false)
+ _.drop(from).take(until - from).toSeq
+ }, strict = false)
}
}
}
@@ -1136,10 +1136,10 @@ class ByteStringSpec extends AnyWordSpec with Matchers with Checkers {
slice match {
case (xs, from, until) =>
likeVecIt(xs)({ it =>
- val array = new Array[Byte](xs.length)
- it.slice(from, until).copyToArray(array, from, until)
- array.toSeq
- }, strict = false)
+ val array = new Array[Byte](xs.length)
+ it.slice(from, until).copyToArray(array, from, until)
+ array.toSeq
+ }, strict = false)
}
}
}
diff --git a/akka-actor-tests/src/test/scala/akka/util/FrequencyListSpec.scala b/akka-actor-tests/src/test/scala/akka/util/FrequencyListSpec.scala
index 75770a9e05..94d9d9e945 100644
--- a/akka-actor-tests/src/test/scala/akka/util/FrequencyListSpec.scala
+++ b/akka-actor-tests/src/test/scala/akka/util/FrequencyListSpec.scala
@@ -44,52 +44,52 @@ class FrequencyListSpec extends AnyWordSpec with Matchers {
check(frequency, Nil)
frequency.update("a")
- check(frequency, List( /* 1: */ "a"))
+ check(frequency, List(/* 1: */ "a"))
frequency.update("b").update("c")
- check(frequency, List( /* 1: */ "a", "b", "c"))
+ check(frequency, List(/* 1: */ "a", "b", "c"))
frequency.update("a").update("c")
- check(frequency, List( /* 1: */ "b", /* 2: */ "a", "c"))
+ check(frequency, List(/* 1: */ "b", /* 2: */ "a", "c"))
frequency.update("d").update("e").update("f").update("g")
- check(frequency, List( /* 1: */ "b", "d", "e", "f", "g", /* 2: */ "a", "c"))
+ check(frequency, List(/* 1: */ "b", "d", "e", "f", "g", /* 2: */ "a", "c"))
frequency.update("c").update("f")
- check(frequency, List( /* 1: */ "b", "d", "e", "g", /* 2: */ "a", "f", /* 3: */ "c"))
+ check(frequency, List(/* 1: */ "b", "d", "e", "g", /* 2: */ "a", "f", /* 3: */ "c"))
frequency.remove("d").remove("g").remove("b").remove("f")
- check(frequency, List( /* 1: */ "e", /* 2: */ "a", /* 3: */ "c"))
+ check(frequency, List(/* 1: */ "e", /* 2: */ "a", /* 3: */ "c"))
frequency.update("e").update("h").update("i")
- check(frequency, List( /* 1: */ "h", "i", /* 2: */ "a", "e", /* 3: */ "c"))
+ check(frequency, List(/* 1: */ "h", "i", /* 2: */ "a", "e", /* 3: */ "c"))
frequency.removeLeastFrequent(3) shouldBe List("h", "i", "a")
- check(frequency, List( /* 2: */ "e", /* 3: */ "c"))
+ check(frequency, List(/* 2: */ "e", /* 3: */ "c"))
frequency.update("j").update("k").update("l").update("m")
- check(frequency, List( /* 1: */ "j", "k", "l", "m", /* 2: */ "e", /* 3: */ "c"))
+ check(frequency, List(/* 1: */ "j", "k", "l", "m", /* 2: */ "e", /* 3: */ "c"))
frequency.removeLeastFrequent(skip = OptionVal.Some("j")) shouldBe List("k")
- check(frequency, List( /* 1: */ "j", "l", "m", /* 2: */ "e", /* 3: */ "c"))
+ check(frequency, List(/* 1: */ "j", "l", "m", /* 2: */ "e", /* 3: */ "c"))
frequency.removeLeastFrequent(2, skip = OptionVal.Some("l")) shouldBe List("j", "m")
- check(frequency, List( /* 1: */ "l", /* 2: */ "e", /* 3: */ "c"))
+ check(frequency, List(/* 1: */ "l", /* 2: */ "e", /* 3: */ "c"))
frequency.update("n").update("o").update("p").update("e").update("o").update("l")
- check(frequency, List( /* 1: */ "n", "p", /* 2: */ "o", "l", /* 3: */ "c", "e"))
+ check(frequency, List(/* 1: */ "n", "p", /* 2: */ "o", "l", /* 3: */ "c", "e"))
frequency.removeMostFrequent(3) shouldBe List("e", "c", "l")
- check(frequency, List( /* 1: */ "n", "p", /* 2: */ "o"))
+ check(frequency, List(/* 1: */ "n", "p", /* 2: */ "o"))
frequency.update("q").update("r").update("p").update("o").update("n")
- check(frequency, List( /* 1: */ "q", "r", /* 2: */ "p", "n", /* 3: */ "o"))
+ check(frequency, List(/* 1: */ "q", "r", /* 2: */ "p", "n", /* 3: */ "o"))
frequency.removeMostFrequent(skip = OptionVal.Some("o")) shouldBe List("n")
- check(frequency, List( /* 1: */ "q", "r", /* 2: */ "p", /* 3: */ "o"))
+ check(frequency, List(/* 1: */ "q", "r", /* 2: */ "p", /* 3: */ "o"))
frequency.removeMostFrequent(2, skip = OptionVal.Some("p")) shouldBe List("o", "r")
- check(frequency, List( /* 1: */ "q", /* 2: */ "p"))
+ check(frequency, List(/* 1: */ "q", /* 2: */ "p"))
}
"track overall recency of elements when enabled" in {
@@ -100,72 +100,72 @@ class FrequencyListSpec extends AnyWordSpec with Matchers {
clock.tick() // time = 1
frequency.update("a")
- check(frequency, List( /* 1: */ "a"))
+ check(frequency, List(/* 1: */ "a"))
checkRecency(frequency, List("a"))
clock.tick() // time = 2
frequency.update("b").update("c")
- check(frequency, List( /* 1: */ "a", "b", "c"))
+ check(frequency, List(/* 1: */ "a", "b", "c"))
checkRecency(frequency, List("a", "b", "c"))
clock.tick() // time = 3
frequency.update("a").update("c")
- check(frequency, List( /* 1: */ "b", /* 2: */ "a", "c"))
+ check(frequency, List(/* 1: */ "b", /* 2: */ "a", "c"))
checkRecency(frequency, List("b", "a", "c"))
clock.tick() // time = 4
frequency.update("d").update("e").update("f")
- check(frequency, List( /* 1: */ "b", "d", "e", "f", /* 2: */ "a", "c"))
+ check(frequency, List(/* 1: */ "b", "d", "e", "f", /* 2: */ "a", "c"))
checkRecency(frequency, List("b", "a", "c", "d", "e", "f"))
clock.tick() // time = 5
frequency.update("c").update("f")
- check(frequency, List( /* 1: */ "b", "d", "e", /* 2: */ "a", "f", /* 3: */ "c"))
+ check(frequency, List(/* 1: */ "b", "d", "e", /* 2: */ "a", "f", /* 3: */ "c"))
checkRecency(frequency, List("b", "a", "d", "e", "c", "f"))
clock.tick() // time = 6
frequency.remove("d").remove("b").remove("f")
- check(frequency, List( /* 1: */ "e", /* 2: */ "a", /* 3: */ "c"))
+ check(frequency, List(/* 1: */ "e", /* 2: */ "a", /* 3: */ "c"))
checkRecency(frequency, List("a", "e", "c"))
clock.tick() // time = 7
frequency.update("e").update("h").update("i")
- check(frequency, List( /* 1: */ "h", "i", /* 2: */ "a", "e", /* 3: */ "c"))
+ check(frequency, List(/* 1: */ "h", "i", /* 2: */ "a", "e", /* 3: */ "c"))
checkRecency(frequency, List("a", "c", "e", "h", "i"))
clock.tick() // time = 8
frequency.removeOverallLeastRecent() shouldBe List("a")
- check(frequency, List( /* 1: */ "h", "i", /* 2: */ "e", /* 3: */ "c"))
+ check(frequency, List(/* 1: */ "h", "i", /* 2: */ "e", /* 3: */ "c"))
checkRecency(frequency, List("c", "e", "h", "i"))
clock.tick() // time = 9
frequency.update("i").update("j").update("k")
- check(frequency, List( /* 1: */ "h", "j", "k", /* 2: */ "e", "i", /* 3: */ "c"))
+ check(frequency, List(/* 1: */ "h", "j", "k", /* 2: */ "e", "i", /* 3: */ "c"))
checkRecency(frequency, List("c", "e", "h", "i", "j", "k"))
clock.tick() // time = 10
frequency.removeOverallMostRecent() shouldBe List("k")
- check(frequency, List( /* 1: */ "h", "j", /* 2: */ "e", "i", /* 3: */ "c"))
+ check(frequency, List(/* 1: */ "h", "j", /* 2: */ "e", "i", /* 3: */ "c"))
checkRecency(frequency, List("c", "e", "h", "i", "j"))
clock.tick() // time = 11
frequency.removeOverallLeastRecentOutside(3.seconds) shouldBe List("c", "e", "h")
- check(frequency, List( /* 1: */ "j", /* 2: */ "i"))
+ check(frequency, List(/* 1: */ "j", /* 2: */ "i"))
checkRecency(frequency, List("i", "j"))
clock.tick() // time = 12
frequency.update("l").update("m")
- check(frequency, List( /* 1: */ "j", "l", "m", /* 2: */ "i"))
+ check(frequency, List(/* 1: */ "j", "l", "m", /* 2: */ "i"))
checkRecency(frequency, List("i", "j", "l", "m"))
clock.tick() // time = 13
frequency.removeOverallMostRecentWithin(3.seconds) shouldBe List("m", "l")
- check(frequency, List( /* 1: */ "j", /* 2: */ "i"))
+ check(frequency, List(/* 1: */ "j", /* 2: */ "i"))
checkRecency(frequency, List("i", "j"))
clock.tick() // time = 14
frequency.update("n").update("o").update("n")
- check(frequency, List( /* 1: */ "j", "o", /* 2: */ "i", "n"))
+ check(frequency, List(/* 1: */ "j", "o", /* 2: */ "i", "n"))
checkRecency(frequency, List("i", "j", "o", "n"))
}
@@ -177,80 +177,80 @@ class FrequencyListSpec extends AnyWordSpec with Matchers {
check(aging, Nil)
for (_ <- 1 to 10) regular.update("a").update("b").update("c")
- check(regular, List( /*10*/ "a", "b", "c"))
+ check(regular, List(/*10*/ "a", "b", "c"))
for (_ <- 1 to 10) aging.update("a").update("b").update("c")
- check(aging, List( /*10+0*/ "a", "b", "c"))
+ check(aging, List(/*10+0*/ "a", "b", "c"))
// age = 0
regular.update("x").update("y").update("z")
- check(regular, List( /*1*/ "x", "y", "z", /*10*/ "a", "b", "c"))
+ check(regular, List(/*1*/ "x", "y", "z", /*10*/ "a", "b", "c"))
aging.update("x").update("y").update("z")
- check(aging, List( /*1+0*/ "x", "y", "z", /*10+0*/ "a", "b", "c"))
+ check(aging, List(/*1+0*/ "x", "y", "z", /*10+0*/ "a", "b", "c"))
regular.removeLeastFrequent() shouldBe List("x")
- check(regular, List( /*1*/ "y", "z", /*10*/ "a", "b", "c"))
+ check(regular, List(/*1*/ "y", "z", /*10*/ "a", "b", "c"))
aging.removeLeastFrequent() shouldBe List("x")
- check(aging, List( /*1+0*/ "y", "z", /*10+0*/ "a", "b", "c"))
+ check(aging, List(/*1+0*/ "y", "z", /*10+0*/ "a", "b", "c"))
// age = 1 (from last removal of "x")
regular.update("x").update("y").update("z").update("z")
- check(regular, List( /*1*/ "x", /*2*/ "y", /*3*/ "z", /*10*/ "a", "b", "c"))
+ check(regular, List(/*1*/ "x", /*2*/ "y", /*3*/ "z", /*10*/ "a", "b", "c"))
aging.update("x").update("y").update("z").update("z")
- check(aging, List( /*1+1*/ "x", /*2+1*/ "y", /*3+1*/ "z", /*10+0*/ "a", "b", "c"))
+ check(aging, List(/*1+1*/ "x", /*2+1*/ "y", /*3+1*/ "z", /*10+0*/ "a", "b", "c"))
regular.removeLeastFrequent(2) shouldBe List("x", "y")
- check(regular, List( /*3*/ "z", /*10*/ "a", "b", "c"))
+ check(regular, List(/*3*/ "z", /*10*/ "a", "b", "c"))
aging.removeLeastFrequent(2) shouldBe List("x", "y")
- check(aging, List( /*3+1*/ "z", /*10+0*/ "a", "b", "c"))
+ check(aging, List(/*3+1*/ "z", /*10+0*/ "a", "b", "c"))
// age = 3 (from last removal of "y")
regular.update("x").update("y").update("z")
- check(regular, List( /*1*/ "x", "y", /*4*/ "z", /*10*/ "a", "b", "c"))
+ check(regular, List(/*1*/ "x", "y", /*4*/ "z", /*10*/ "a", "b", "c"))
aging.update("x").update("y").update("z")
- check(aging, List( /*1+3*/ "x", "y", /*4+3*/ "z", /*10+0*/ "a", "b", "c"))
+ check(aging, List(/*1+3*/ "x", "y", /*4+3*/ "z", /*10+0*/ "a", "b", "c"))
regular.removeLeastFrequent(3) shouldBe List("x", "y", "z")
- check(regular, List( /*10*/ "a", "b", "c"))
+ check(regular, List(/*10*/ "a", "b", "c"))
aging.removeLeastFrequent(3) shouldBe List("x", "y", "z")
- check(aging, List( /*10+0*/ "a", "b", "c"))
+ check(aging, List(/*10+0*/ "a", "b", "c"))
// age = 7 (from last removal of "z")
regular.update("x").update("y").update("y").update("z").update("z").update("z")
- check(regular, List( /*1*/ "x", /*2*/ "y", /*3*/ "z", /*10*/ "a", "b", "c"))
+ check(regular, List(/*1*/ "x", /*2*/ "y", /*3*/ "z", /*10*/ "a", "b", "c"))
aging.update("x").update("y").update("y").update("z").update("z").update("z")
- check(aging, List( /*1+7*/ "x", /*2+7*/ "y", /*10+0*/ "a", "b", "c", /*3+7*/ "z"))
+ check(aging, List(/*1+7*/ "x", /*2+7*/ "y", /*10+0*/ "a", "b", "c", /*3+7*/ "z"))
regular.removeLeastFrequent(2) shouldBe List("x", "y")
- check(regular, List( /*3*/ "z", /*10*/ "a", "b", "c"))
+ check(regular, List(/*3*/ "z", /*10*/ "a", "b", "c"))
aging.removeLeastFrequent(2) shouldBe List("x", "y")
- check(aging, List( /*10+0*/ "a", "b", "c", /*3+7*/ "z"))
+ check(aging, List(/*10+0*/ "a", "b", "c", /*3+7*/ "z"))
// age = 9 (from last removal of "y")
regular.update("x").update("y").update("z")
- check(regular, List( /*1*/ "x", "y", /*4*/ "z", /*10*/ "a", "b", "c"))
+ check(regular, List(/*1*/ "x", "y", /*4*/ "z", /*10*/ "a", "b", "c"))
aging.update("x").update("y").update("z")
- check(aging, List( /*10+0*/ "a", "b", "c", /*1+9*/ "x", "y", /*4+9*/ "z"))
+ check(aging, List(/*10+0*/ "a", "b", "c", /*1+9*/ "x", "y", /*4+9*/ "z"))
regular.removeLeastFrequent(3) shouldBe List("x", "y", "z")
- check(regular, List( /*10*/ "a", "b", "c"))
+ check(regular, List(/*10*/ "a", "b", "c"))
aging.removeLeastFrequent(3) shouldBe List("a", "b", "c")
- check(aging, List( /*1+9*/ "x", "y", /*4+9*/ "z"))
+ check(aging, List(/*1+9*/ "x", "y", /*4+9*/ "z"))
// age = 10 (from last removal of "c")
}
diff --git a/akka-actor-tests/src/test/scala/akka/util/IndexSpec.scala b/akka-actor-tests/src/test/scala/akka/util/IndexSpec.scala
index 1aa570031a..835d4dd5be 100644
--- a/akka-actor-tests/src/test/scala/akka/util/IndexSpec.scala
+++ b/akka-actor-tests/src/test/scala/akka/util/IndexSpec.scala
@@ -19,9 +19,10 @@ import akka.testkit.DefaultTimeout
class IndexSpec extends AkkaSpec with Matchers with DefaultTimeout {
implicit val ec: ExecutionContextExecutor = system.dispatcher
private def emptyIndex =
- new Index[String, Int](100, new Comparator[Int] {
- override def compare(a: Int, b: Int): Int = Integer.compare(a, b)
- })
+ new Index[String, Int](100,
+ new Comparator[Int] {
+ override def compare(a: Int, b: Int): Int = Integer.compare(a, b)
+ })
private def indexWithValues = {
val index = emptyIndex
@@ -58,11 +59,11 @@ class IndexSpec extends AkkaSpec with Matchers with DefaultTimeout {
index.put("s1", 2)
index.put("s2", 1)
index.put("s2", 2)
- //Remove value
+ // Remove value
index.remove("s1", 1) should ===(true)
index.remove("s1", 1) should ===(false)
index.valueIterator("s1").toSet should ===(Set(2))
- //Remove key
+ // Remove key
index.remove("s2") match {
case Some(iter) => iter.toSet should ===(Set(1, 2))
case None => fail()
@@ -101,16 +102,17 @@ class IndexSpec extends AkkaSpec with Matchers with DefaultTimeout {
index.isEmpty should ===(true)
}
"be able to be accessed in parallel" in {
- val index = new Index[Int, Int](100, new Comparator[Int] {
- override def compare(a: Int, b: Int): Int = Integer.compare(a, b)
- })
+ val index = new Index[Int, Int](100,
+ new Comparator[Int] {
+ override def compare(a: Int, b: Int): Int = Integer.compare(a, b)
+ })
val nrOfTasks = 10000
val nrOfKeys = 10
val nrOfValues = 10
- //Fill index
+ // Fill index
for (key <- 0 until nrOfKeys; value <- 0 until nrOfValues)
index.put(key, value)
- //Tasks to be executed in parallel
+ // Tasks to be executed in parallel
def putTask() = Future {
index.put(Random.nextInt(nrOfKeys), Random.nextInt(nrOfValues))
}
diff --git a/akka-actor-typed-tests/src/test/scala/akka/actor/typed/BehaviorSpec.scala b/akka-actor-typed-tests/src/test/scala/akka/actor/typed/BehaviorSpec.scala
index a652757d04..6e232ed956 100644
--- a/akka-actor-typed-tests/src/test/scala/akka/actor/typed/BehaviorSpec.scala
+++ b/akka-actor-typed-tests/src/test/scala/akka/actor/typed/BehaviorSpec.scala
@@ -488,9 +488,9 @@ class DeferredScalaBehaviorSpec extends ImmutableWithSignalScalaBehaviorSpec {
override def behavior(monitor: ActorRef[Event]): (Behavior[Command], Aux) = {
val inbox = TestInbox[Done]("deferredListener")
(SBehaviors.setup(_ => {
- inbox.ref ! Done
- super.behavior(monitor)._1
- }), inbox)
+ inbox.ref ! Done
+ super.behavior(monitor)._1
+ }), inbox)
}
override def checkAux(signal: Signal, aux: Aux): Unit =
@@ -594,10 +594,12 @@ class ImmutableJavaBehaviorSpec extends Messages with Become with Stoppable {
class TransformMessagesJavaBehaviorSpec extends ImmutableWithSignalJavaBehaviorSpec with Reuse with Siphon {
override def behavior(monitor: ActorRef[Event]): (Behavior[Command], Aux) = {
val inbox = TestInbox[Command]("transformMessagesListener")
- JBehaviors.transformMessages(classOf[Command], super.behavior(monitor)._1, pf(_.`match`(classOf[Command], fi(x => {
- inbox.ref ! x
- x
- })))) -> inbox
+ JBehaviors.transformMessages(classOf[Command], super.behavior(monitor)._1,
+ pf(_.`match`(classOf[Command],
+ fi(x => {
+ inbox.ref ! x
+ x
+ })))) -> inbox
}
}
@@ -607,9 +609,9 @@ class DeferredJavaBehaviorSpec extends ImmutableWithSignalJavaBehaviorSpec {
override def behavior(monitor: ActorRef[Event]): (Behavior[Command], Aux) = {
val inbox = TestInbox[Done]("deferredListener")
(JBehaviors.setup(_ => {
- inbox.ref ! Done
- super.behavior(monitor)._1
- }), inbox)
+ inbox.ref ! Done
+ super.behavior(monitor)._1
+ }), inbox)
}
override def checkAux(signal: Signal, aux: Aux): Unit =
diff --git a/akka-actor-typed-tests/src/test/scala/akka/actor/typed/DeferredSpec.scala b/akka-actor-typed-tests/src/test/scala/akka/actor/typed/DeferredSpec.scala
index e6bca05641..2bc367f321 100644
--- a/akka-actor-typed-tests/src/test/scala/akka/actor/typed/DeferredSpec.scala
+++ b/akka-actor-typed-tests/src/test/scala/akka/actor/typed/DeferredSpec.scala
@@ -120,10 +120,11 @@ class DeferredSpec extends ScalaTestWithActorTestKit with AnyWordSpecLike with L
// monitor is implemented with tap, so this is testing both
val probe = TestProbe[Event]("evt")
val monitorProbe = TestProbe[Command]("monitor")
- val behv = Behaviors.monitor(monitorProbe.ref, Behaviors.setup[Command] { _ =>
- probe.ref ! Started
- target(probe.ref)
- })
+ val behv = Behaviors.monitor(monitorProbe.ref,
+ Behaviors.setup[Command] { _ =>
+ probe.ref ! Started
+ target(probe.ref)
+ })
probe.expectNoMessage() // not yet
val ref = spawn(behv)
// it's supposed to be created immediately (not waiting for first message)
diff --git a/akka-actor-typed-tests/src/test/scala/akka/actor/typed/InterceptSpec.scala b/akka-actor-typed-tests/src/test/scala/akka/actor/typed/InterceptSpec.scala
index 25397497e2..cb3472a8bd 100644
--- a/akka-actor-typed-tests/src/test/scala/akka/actor/typed/InterceptSpec.scala
+++ b/akka-actor-typed-tests/src/test/scala/akka/actor/typed/InterceptSpec.scala
@@ -483,10 +483,11 @@ class InterceptSpec extends ScalaTestWithActorTestKit with AnyWordSpecLike with
"be possible to combine with MDC" in {
val probe = createTestProbe[String]()
val ref = spawn(Behaviors.setup[Command] { _ =>
- Behaviors.withMdc(staticMdc = Map("x" -> "y"), mdcForMessage = (msg: Command) => {
- probe.ref ! s"mdc:${msg.s.toUpperCase()}"
- Map("msg" -> msg.s.toUpperCase())
- }) {
+ Behaviors.withMdc(staticMdc = Map("x" -> "y"),
+ mdcForMessage = (msg: Command) => {
+ probe.ref ! s"mdc:${msg.s.toUpperCase()}"
+ Map("msg" -> msg.s.toUpperCase())
+ }) {
MultiProtocol(probe.ref)
}
})
diff --git a/akka-actor-typed-tests/src/test/scala/akka/actor/typed/MailboxSelectorSpec.scala b/akka-actor-typed-tests/src/test/scala/akka/actor/typed/MailboxSelectorSpec.scala
index 2261e9028a..6907f8590f 100644
--- a/akka-actor-typed-tests/src/test/scala/akka/actor/typed/MailboxSelectorSpec.scala
+++ b/akka-actor-typed-tests/src/test/scala/akka/actor/typed/MailboxSelectorSpec.scala
@@ -66,14 +66,14 @@ class MailboxSelectorSpec extends ScalaTestWithActorTestKit("""
val latch = new CountDownLatch(1)
val probe = testKit.createTestProbe[String]()
val actor = spawn(Behaviors.receiveMessage[String] {
- case "one" =>
- // block here so we can fill mailbox up
- probe ! "blocking-on-one"
- latch.await(10, TimeUnit.SECONDS)
- Behaviors.same
- case _ =>
- Behaviors.same
- }, MailboxSelector.bounded(2))
+ case "one" =>
+ // block here so we can fill mailbox up
+ probe ! "blocking-on-one"
+ latch.await(10, TimeUnit.SECONDS)
+ Behaviors.same
+ case _ =>
+ Behaviors.same
+ }, MailboxSelector.bounded(2))
actor ! "one" // actor will block here
probe.expectMessage("blocking-on-one")
actor ! "two"
diff --git a/akka-actor-typed-tests/src/test/scala/akka/actor/typed/WatchSpec.scala b/akka-actor-typed-tests/src/test/scala/akka/actor/typed/WatchSpec.scala
index 80c0329871..6d66dbd386 100644
--- a/akka-actor-typed-tests/src/test/scala/akka/actor/typed/WatchSpec.scala
+++ b/akka-actor-typed-tests/src/test/scala/akka/actor/typed/WatchSpec.scala
@@ -160,14 +160,14 @@ class WatchSpec extends ScalaTestWithActorTestKit with AnyWordSpecLike with LogC
spawn(
Behaviors.setup[Any] { context =>
val middleManagement = context.spawn(Behaviors.setup[Any] { context =>
- val sixPackJoe = context.spawn(Behaviors.receive[Any]((_, _) => throw ex), "joe")
- context.watch(sixPackJoe)
-
- Behaviors.receive[Any] { (_, message) =>
- sixPackJoe ! message
- Behaviors.same
- } // no handling of terminated, even though we watched!!!
- }, "middle-management")
+ val sixPackJoe = context.spawn(Behaviors.receive[Any]((_, _) => throw ex), "joe")
+ context.watch(sixPackJoe)
+
+ Behaviors.receive[Any] { (_, message) =>
+ sixPackJoe ! message
+ Behaviors.same
+ } // no handling of terminated, even though we watched!!!
+ }, "middle-management")
context.watch(middleManagement)
diff --git a/akka-actor-typed-tests/src/test/scala/akka/actor/typed/delivery/TestConsumer.scala b/akka-actor-typed-tests/src/test/scala/akka/actor/typed/delivery/TestConsumer.scala
index 7838f58280..17ca1733d3 100644
--- a/akka-actor-typed-tests/src/test/scala/akka/actor/typed/delivery/TestConsumer.scala
+++ b/akka-actor-typed-tests/src/test/scala/akka/actor/typed/delivery/TestConsumer.scala
@@ -103,7 +103,8 @@ class TestConsumer(
case job @ SomeAsyncJob(_, confirmTo, producerId, seqNr) =>
// when replacing producer the seqNr may start from 1 again
val cleanProcessed =
- if (seqNr == 1L) processed.filterNot { case (pid, _) => pid == producerId } else processed
+ if (seqNr == 1L) processed.filterNot { case (pid, _) => pid == producerId }
+ else processed
if (cleanProcessed((producerId, seqNr)))
throw new RuntimeException(s"Received duplicate [($producerId,$seqNr)]")
diff --git a/akka-actor-typed-tests/src/test/scala/akka/actor/typed/internal/ActorSystemSpec.scala b/akka-actor-typed-tests/src/test/scala/akka/actor/typed/internal/ActorSystemSpec.scala
index e796ce64c8..463a601fb1 100644
--- a/akka-actor-typed-tests/src/test/scala/akka/actor/typed/internal/ActorSystemSpec.scala
+++ b/akka-actor-typed-tests/src/test/scala/akka/actor/typed/internal/ActorSystemSpec.scala
@@ -62,10 +62,11 @@ class ActorSystemSpec
"An ActorSystem" must {
"start the guardian actor and terminate when it terminates" in {
- withSystem("a", Behaviors.receiveMessage[Probe] { p =>
- p.replyTo ! p.message
- Behaviors.stopped
- }, doTerminate = false) { sys =>
+ withSystem("a",
+ Behaviors.receiveMessage[Probe] { p =>
+ p.replyTo ! p.message
+ Behaviors.stopped
+ }, doTerminate = false) { sys =>
val inbox = TestInbox[String]("a")
sys ! Probe("hello", inbox.ref)
eventually {
@@ -92,13 +93,13 @@ class ActorSystemSpec
"terminate the guardian actor" in {
val inbox = TestInbox[String]("terminate")
val sys = system(Behaviors.setup[Any] { _ =>
- inbox.ref ! "started"
- Behaviors.receiveSignal {
- case (_, PostStop) =>
- inbox.ref ! "done"
- Behaviors.same
- }
- }, "terminate")
+ inbox.ref ! "started"
+ Behaviors.receiveSignal {
+ case (_, PostStop) =>
+ inbox.ref ! "done"
+ Behaviors.same
+ }
+ }, "terminate")
eventually {
inbox.hasMessages should ===(true)
@@ -114,8 +115,8 @@ class ActorSystemSpec
"be able to terminate immediately" in {
val sys = system(Behaviors.receiveMessage[Probe] { _ =>
- Behaviors.unhandled
- }, "terminate")
+ Behaviors.unhandled
+ }, "terminate")
// for this case the guardian might not have been started before
// the system terminates and then it will not receive PostStop, which
// is OK since it wasn't really started yet
diff --git a/akka-actor-typed-tests/src/test/scala/akka/actor/typed/javadsl/AdaptationFailureSpec.scala b/akka-actor-typed-tests/src/test/scala/akka/actor/typed/javadsl/AdaptationFailureSpec.scala
index 0311b501eb..f51a4f8fee 100644
--- a/akka-actor-typed-tests/src/test/scala/akka/actor/typed/javadsl/AdaptationFailureSpec.scala
+++ b/akka-actor-typed-tests/src/test/scala/akka/actor/typed/javadsl/AdaptationFailureSpec.scala
@@ -72,10 +72,11 @@ class AdaptationFailureSpec extends ScalaTestWithActorTestKit with AnyWordSpecLi
val probe = createTestProbe[Any]()
val threw = Promise[Done]()
val ref = spawn(Behaviors.setup[Any] { ctx =>
- val adapter = ctx.messageAdapter[Any](classOf[Any], { _ =>
- threw.success(Done)
- throw TestException("boom")
- })
+ val adapter = ctx.messageAdapter[Any](classOf[Any],
+ { _ =>
+ threw.success(Done)
+ throw TestException("boom")
+ })
adapter ! "go boom"
behavior
})
diff --git a/akka-actor-typed-tests/src/test/scala/akka/actor/typed/scaladsl/ActorContextAskSpec.scala b/akka-actor-typed-tests/src/test/scala/akka/actor/typed/scaladsl/ActorContextAskSpec.scala
index d95c12c802..1b6d3aef45 100644
--- a/akka-actor-typed-tests/src/test/scala/akka/actor/typed/scaladsl/ActorContextAskSpec.scala
+++ b/akka-actor-typed-tests/src/test/scala/akka/actor/typed/scaladsl/ActorContextAskSpec.scala
@@ -44,9 +44,9 @@ class ActorContextAskSpec
case class Pong(selfName: String, threadName: String)
val pingPong = spawn(Behaviors.receive[Ping] { (context, message) =>
- message.sender ! Pong(context.self.path.name, Thread.currentThread().getName)
- Behaviors.same
- }, "ping-pong", Props.empty.withDispatcherFromConfig("ping-pong-dispatcher"))
+ message.sender ! Pong(context.self.path.name, Thread.currentThread().getName)
+ Behaviors.same
+ }, "ping-pong", Props.empty.withDispatcherFromConfig("ping-pong-dispatcher"))
val probe = TestProbe[Pong]()
diff --git a/akka-actor-typed-tests/src/test/scala/akka/actor/typed/scaladsl/ActorLoggingSpec.scala b/akka-actor-typed-tests/src/test/scala/akka/actor/typed/scaladsl/ActorLoggingSpec.scala
index 2f71d4fd0b..1914fd72bf 100644
--- a/akka-actor-typed-tests/src/test/scala/akka/actor/typed/scaladsl/ActorLoggingSpec.scala
+++ b/akka-actor-typed-tests/src/test/scala/akka/actor/typed/scaladsl/ActorLoggingSpec.scala
@@ -119,43 +119,43 @@ class ActorLoggingSpec extends ScalaTestWithActorTestKit("""
}
"contain the class name where the first log was called" in {
- val eventFilter = LoggingTestKit.custom({
+ val eventFilter = LoggingTestKit.custom {
case event if event.loggerName == classOf[ActorLoggingSpec].getName =>
true
case event =>
println(event.loggerName)
false
- })
+ }
eventFilter.expect(spawn(Behaviors.setup[String] { context =>
- context.log.info("Started")
+ context.log.info("Started")
- Behaviors.receive { (context, message) =>
- context.log.info("got message {}", message)
- Behaviors.same
- }
- }, "the-actor-with-class"))
+ Behaviors.receive { (context, message) =>
+ context.log.info("got message {}", message)
+ Behaviors.same
+ }
+ }, "the-actor-with-class"))
}
"contain the object class name where the first log was called" in {
- val eventFilter = LoggingTestKit.custom({
+ val eventFilter = LoggingTestKit.custom {
case event if event.loggerName == WhereTheBehaviorIsDefined.getClass.getName => true
case other =>
println(other.loggerName)
false
- })
+ }
eventFilter.expect(spawn(WhereTheBehaviorIsDefined.behavior, "the-actor-with-object"))
}
"contain the abstract behavior class name where the first log was called" in {
- val eventFilter = LoggingTestKit.custom({
+ val eventFilter = LoggingTestKit.custom {
case event if event.loggerName == classOf[BehaviorWhereTheLoggerIsUsed].getName => true
case other =>
println(other.loggerName)
false
- })
+ }
eventFilter.expect {
spawn(Behaviors.setup[String](context => new BehaviorWhereTheLoggerIsUsed(context)), "the-actor-with-behavior")
@@ -200,7 +200,7 @@ class ActorLoggingSpec extends ScalaTestWithActorTestKit("""
true // any is fine, we're just after the right count of statements reaching the listener
}
.withOccurrences(36)
- .expect({
+ .expect {
spawn(Behaviors.setup[String] {
context =>
context.log.debug("message")
@@ -247,7 +247,7 @@ class ActorLoggingSpec extends ScalaTestWithActorTestKit("""
Behaviors.stopped
})
- })
+ }
}
"use Slf4jLogger from akka-slf4j automatically" in {
@@ -490,8 +490,7 @@ class ActorLoggingSpec extends ScalaTestWithActorTestKit("""
Map(
ActorMdc.AkkaAddressKey -> system.classicSystem.asInstanceOf[ExtendedActorSystem].provider.addressString,
ActorMdc.AkkaSourceKey -> actorPath.get.toString,
- ActorMdc.SourceActorSystemKey -> system.name)
- )
+ ActorMdc.SourceActorSystemKey -> system.name))
true
} catch {
case ex: Throwable =>
diff --git a/akka-actor-typed-tests/src/test/scala/akka/actor/typed/scaladsl/GracefulStopSpec.scala b/akka-actor-typed-tests/src/test/scala/akka/actor/typed/scaladsl/GracefulStopSpec.scala
index 2f3baa0e5b..c9575d3fc7 100644
--- a/akka-actor-typed-tests/src/test/scala/akka/actor/typed/scaladsl/GracefulStopSpec.scala
+++ b/akka-actor-typed-tests/src/test/scala/akka/actor/typed/scaladsl/GracefulStopSpec.scala
@@ -23,16 +23,16 @@ final class GracefulStopSpec extends ScalaTestWithActorTestKit with AnyWordSpecL
val behavior =
Behaviors.setup[akka.NotUsed] { context =>
context.spawn[NotUsed](Behaviors.receiveSignal {
- case (_, PostStop) =>
- probe.ref ! "child-done"
- Behaviors.stopped
- }, "child1")
+ case (_, PostStop) =>
+ probe.ref ! "child-done"
+ Behaviors.stopped
+ }, "child1")
context.spawn[NotUsed](Behaviors.receiveSignal {
- case (_, PostStop) =>
- probe.ref ! "child-done"
- Behaviors.stopped
- }, "child2")
+ case (_, PostStop) =>
+ probe.ref ! "child-done"
+ Behaviors.stopped
+ }, "child2")
Behaviors.stopped { () =>
// cleanup function body
diff --git a/akka-actor-typed-tests/src/test/scala/akka/actor/typed/scaladsl/MessageAdapterSpec.scala b/akka-actor-typed-tests/src/test/scala/akka/actor/typed/scaladsl/MessageAdapterSpec.scala
index a28f2b90be..fed724f49e 100644
--- a/akka-actor-typed-tests/src/test/scala/akka/actor/typed/scaladsl/MessageAdapterSpec.scala
+++ b/akka-actor-typed-tests/src/test/scala/akka/actor/typed/scaladsl/MessageAdapterSpec.scala
@@ -70,9 +70,9 @@ class MessageAdapterSpec
case class AnotherPong(selfName: String, threadName: String)
val pingPong = spawn(Behaviors.receive[Ping] { (context, message) =>
- message.sender ! Pong(context.self.path.name, Thread.currentThread().getName)
- Behaviors.same
- }, "ping-pong", Props.empty.withDispatcherFromConfig("ping-pong-dispatcher"))
+ message.sender ! Pong(context.self.path.name, Thread.currentThread().getName)
+ Behaviors.same
+ }, "ping-pong", Props.empty.withDispatcherFromConfig("ping-pong-dispatcher"))
val probe = TestProbe[AnotherPong]()
diff --git a/akka-actor-typed-tests/src/test/scala/akka/actor/typed/scaladsl/OnSignalSpec.scala b/akka-actor-typed-tests/src/test/scala/akka/actor/typed/scaladsl/OnSignalSpec.scala
index bfd7cfd544..2e9e78a53e 100644
--- a/akka-actor-typed-tests/src/test/scala/akka/actor/typed/scaladsl/OnSignalSpec.scala
+++ b/akka-actor-typed-tests/src/test/scala/akka/actor/typed/scaladsl/OnSignalSpec.scala
@@ -35,8 +35,8 @@ final class OnSignalSpec extends ScalaTestWithActorTestKit with AnyWordSpecLike
def stopper(probe: TestProbe[Done], children: Int) = Behaviors.setup[String] { ctx =>
(0 until children).foreach { i =>
ctx.spawn(Behaviors.receiveMessage[String] { _ =>
- Behaviors.same
- }, s"$i")
+ Behaviors.same
+ }, s"$i")
}
Behaviors
.receiveMessagePartial[String] {
diff --git a/akka-actor-typed-tests/src/test/scala/akka/actor/typed/scaladsl/adapter/AdapterSpec.scala b/akka-actor-typed-tests/src/test/scala/akka/actor/typed/scaladsl/adapter/AdapterSpec.scala
index 28a0884ed5..26fe75b9b6 100644
--- a/akka-actor-typed-tests/src/test/scala/akka/actor/typed/scaladsl/adapter/AdapterSpec.scala
+++ b/akka-actor-typed-tests/src/test/scala/akka/actor/typed/scaladsl/adapter/AdapterSpec.scala
@@ -213,12 +213,12 @@ class AdapterSpec extends AnyWordSpec with Matchers with BeforeAndAfterAll with
var systemN: akka.actor.typed.ActorSystem[Done] = null
try {
systemN = ActorSystem.create(Behaviors.receive[Done] { (context, message) =>
- context.self ! Done
- message match {
- case Done => Behaviors.stopped
- }
+ context.self ! Done
+ message match {
+ case Done => Behaviors.stopped
+ }
- }, "AdapterSpec-stopping-guardian-2")
+ }, "AdapterSpec-stopping-guardian-2")
} finally if (system != null) TestKit.shutdownActorSystem(systemN.toClassic)
}
@@ -231,7 +231,7 @@ class AdapterSpec extends AnyWordSpec with Matchers with BeforeAndAfterAll with
}
"allow seamless access to untyped extensions" in {
- SerializationExtension(typedSystem) should not be (null)
+ SerializationExtension(typedSystem) should not be null
}
}
diff --git a/akka-actor-typed-tests/src/test/scala/docs/akka/typed/AggregatorSpec.scala b/akka-actor-typed-tests/src/test/scala/docs/akka/typed/AggregatorSpec.scala
index 0784dfe310..444e4de0f1 100644
--- a/akka-actor-typed-tests/src/test/scala/docs/akka/typed/AggregatorSpec.scala
+++ b/akka-actor-typed-tests/src/test/scala/docs/akka/typed/AggregatorSpec.scala
@@ -14,7 +14,7 @@ import org.scalatest.wordspec.AnyWordSpecLike
object AggregatorSpec {
object IllustrateUsage {
- //#usage
+ // #usage
object Hotel1 {
final case class RequestQuote(replyTo: ActorRef[Quote])
final case class Quote(hotel: String, price: BigDecimal)
@@ -65,7 +65,7 @@ object AggregatorSpec {
}
}
}
- //#usage
+ // #usage
}
}
diff --git a/akka-actor-typed-tests/src/test/scala/docs/akka/typed/DispatchersDocSpec.scala b/akka-actor-typed-tests/src/test/scala/docs/akka/typed/DispatchersDocSpec.scala
index 645ed7afc7..5f34f92542 100644
--- a/akka-actor-typed-tests/src/test/scala/docs/akka/typed/DispatchersDocSpec.scala
+++ b/akka-actor-typed-tests/src/test/scala/docs/akka/typed/DispatchersDocSpec.scala
@@ -42,7 +42,7 @@ object DispatchersDocSpec {
val yourBehavior: Behavior[String] = Behaviors.same
val example = Behaviors.receive[Any] { (context, _) =>
- //#spawn-dispatcher
+ // #spawn-dispatcher
import akka.actor.typed.DispatcherSelector
context.spawn(yourBehavior, "DefaultDispatcher")
@@ -50,7 +50,7 @@ object DispatchersDocSpec {
context.spawn(yourBehavior, "BlockingDispatcher", DispatcherSelector.blocking())
context.spawn(yourBehavior, "ParentDispatcher", DispatcherSelector.sameAsParent())
context.spawn(yourBehavior, "DispatcherFromConfig", DispatcherSelector.fromConfig("your-dispatcher"))
- //#spawn-dispatcher
+ // #spawn-dispatcher
Behaviors.same
}
diff --git a/akka-actor-typed-tests/src/test/scala/docs/akka/typed/FSMDocSpec.scala b/akka-actor-typed-tests/src/test/scala/docs/akka/typed/FSMDocSpec.scala
index 56db8238b7..b094f36bd2 100644
--- a/akka-actor-typed-tests/src/test/scala/docs/akka/typed/FSMDocSpec.scala
+++ b/akka-actor-typed-tests/src/test/scala/docs/akka/typed/FSMDocSpec.scala
@@ -16,10 +16,10 @@ import org.scalatest.wordspec.AnyWordSpecLike
object FSMDocSpec {
- //#simple-state
- //#simple-events
+ // #simple-state
+ // #simple-events
object Buncher {
- //#simple-state
+ // #simple-state
// FSM event becomes the type of the message Actor supports
sealed trait Event
@@ -27,17 +27,17 @@ object FSMDocSpec {
final case class Queue(obj: Any) extends Event
case object Flush extends Event
private case object Timeout extends Event
- //#simple-events
+ // #simple-events
- //#storing-state
+ // #storing-state
sealed trait Data
case object Uninitialized extends Data
final case class Todo(target: ActorRef[Batch], queue: immutable.Seq[Any]) extends Data
final case class Batch(obj: immutable.Seq[Any])
- //#storing-state
+ // #storing-state
- //#simple-state
+ // #simple-state
// states of the FSM represented as behaviors
// initial state
@@ -67,10 +67,10 @@ object FSMDocSpec {
}
}
- //#simple-events
+ // #simple-events
}
- //#simple-events
- //#simple-state
+ // #simple-events
+ // #simple-state
}
class FSMDocSpec extends ScalaTestWithActorTestKit with AnyWordSpecLike with LogCapturing {
diff --git a/akka-actor-typed-tests/src/test/scala/docs/akka/typed/GracefulStopDocSpec.scala b/akka-actor-typed-tests/src/test/scala/docs/akka/typed/GracefulStopDocSpec.scala
index e96f7fe0a5..4c023cec2e 100644
--- a/akka-actor-typed-tests/src/test/scala/docs/akka/typed/GracefulStopDocSpec.scala
+++ b/akka-actor-typed-tests/src/test/scala/docs/akka/typed/GracefulStopDocSpec.scala
@@ -22,7 +22,7 @@ import akka.actor.testkit.typed.scaladsl.ScalaTestWithActorTestKit
object GracefulStopDocSpec {
- //#master-actor
+ // #master-actor
object MasterControlProgram {
sealed trait Command
@@ -51,9 +51,9 @@ object GracefulStopDocSpec {
}
}
}
- //#master-actor
+ // #master-actor
- //#worker-actor
+ // #worker-actor
object Job {
sealed trait Command
@@ -66,10 +66,10 @@ object GracefulStopDocSpec {
}
}
}
- //#worker-actor
+ // #worker-actor
object IllustrateWatch {
- //#master-actor-watch
+ // #master-actor-watch
object MasterControlProgram {
sealed trait Command
@@ -93,11 +93,11 @@ object GracefulStopDocSpec {
}
}
}
- //#master-actor-watch
+ // #master-actor-watch
}
object IllustrateWatchWith {
- //#master-actor-watchWith
+ // #master-actor-watchWith
object MasterControlProgram {
sealed trait Command
@@ -121,7 +121,7 @@ object GracefulStopDocSpec {
}
}
}
- //#master-actor-watchWith
+ // #master-actor-watchWith
}
}
@@ -133,7 +133,7 @@ class GracefulStopDocSpec extends ScalaTestWithActorTestKit with AnyWordSpecLike
"Graceful stop example" must {
"start some workers" in {
- //#start-workers
+ // #start-workers
import MasterControlProgram._
val system: ActorSystem[Command] = ActorSystem(MasterControlProgram(), "B6700")
@@ -148,7 +148,7 @@ class GracefulStopDocSpec extends ScalaTestWithActorTestKit with AnyWordSpecLike
system.terminate()
Await.result(system.whenTerminated, 3.seconds)
- //#start-workers
+ // #start-workers
}
"gracefully stop workers and master" in {
diff --git a/akka-actor-typed-tests/src/test/scala/docs/akka/typed/InteractionPatternsSpec.scala b/akka-actor-typed-tests/src/test/scala/docs/akka/typed/InteractionPatternsSpec.scala
index 76dff0df9f..5a36eee90b 100644
--- a/akka-actor-typed-tests/src/test/scala/docs/akka/typed/InteractionPatternsSpec.scala
+++ b/akka-actor-typed-tests/src/test/scala/docs/akka/typed/InteractionPatternsSpec.scala
@@ -170,7 +170,7 @@ class InteractionPatternsSpec extends ScalaTestWithActorTestKit with AnyWordSpec
"contain a sample for scheduling messages to self" in {
- //#timer
+ // #timer
object Buncher {
sealed trait Command
@@ -214,7 +214,7 @@ class InteractionPatternsSpec extends ScalaTestWithActorTestKit with AnyWordSpec
}
}
}
- //#timer
+ // #timer
val probe = createTestProbe[Buncher.Batch]()
val buncher: ActorRef[Buncher.Command] = spawn(Buncher(probe.ref, 1.second, 10))
@@ -581,7 +581,7 @@ class InteractionPatternsSpec extends ScalaTestWithActorTestKit with AnyWordSpec
}
"contain a sample for pipeToSelf" in {
- //#pipeToSelf
+ // #pipeToSelf
trait CustomerDataAccess {
def update(value: Customer): Future[Done]
@@ -632,7 +632,7 @@ class InteractionPatternsSpec extends ScalaTestWithActorTestKit with AnyWordSpec
}
}
}
- //#pipeToSelf
+ // #pipeToSelf
val dataAccess = new CustomerDataAccess {
override def update(value: Customer): Future[Done] = Future.successful(Done)
diff --git a/akka-actor-typed-tests/src/test/scala/docs/akka/typed/IntroSpec.scala b/akka-actor-typed-tests/src/test/scala/docs/akka/typed/IntroSpec.scala
index 76ce758bd1..257f69d342 100644
--- a/akka-actor-typed-tests/src/test/scala/docs/akka/typed/IntroSpec.scala
+++ b/akka-actor-typed-tests/src/test/scala/docs/akka/typed/IntroSpec.scala
@@ -109,7 +109,7 @@ object IntroSpec {
final case class SayHello(name: String)
- //#hello-world-main-with-dispatchers
+ // #hello-world-main-with-dispatchers
def apply(): Behavior[SayHello] =
Behaviors.setup { context =>
val dispatcherPath = "akka.actor.default-blocking-io-dispatcher"
@@ -124,21 +124,21 @@ object IntroSpec {
Behaviors.same
}
}
- //#hello-world-main-with-dispatchers
+ // #hello-world-main-with-dispatchers
}
}
- //#chatroom-protocol
- //#chatroom-behavior
+ // #chatroom-protocol
+ // #chatroom-behavior
object ChatRoom {
- //#chatroom-behavior
+ // #chatroom-behavior
sealed trait RoomCommand
final case class GetSession(screenName: String, replyTo: ActorRef[SessionEvent]) extends RoomCommand
- //#chatroom-protocol
- //#chatroom-behavior
+ // #chatroom-protocol
+ // #chatroom-behavior
private final case class PublishSessionMessage(screenName: String, message: String) extends RoomCommand
- //#chatroom-behavior
- //#chatroom-protocol
+ // #chatroom-behavior
+ // #chatroom-protocol
sealed trait SessionEvent
final case class SessionGranted(handle: ActorRef[PostMessage]) extends SessionEvent
@@ -148,8 +148,8 @@ object IntroSpec {
sealed trait SessionCommand
final case class PostMessage(message: String) extends SessionCommand
private final case class NotifyClient(message: MessagePosted) extends SessionCommand
- //#chatroom-protocol
- //#chatroom-behavior
+ // #chatroom-protocol
+ // #chatroom-behavior
def apply(): Behavior[RoomCommand] =
chatRoom(List.empty)
@@ -185,24 +185,24 @@ object IntroSpec {
client ! message
Behaviors.same
}
- //#chatroom-protocol
+ // #chatroom-protocol
}
- //#chatroom-behavior
- //#chatroom-protocol
+ // #chatroom-behavior
+ // #chatroom-protocol
- //#chatroom-gabbler
+ // #chatroom-gabbler
object Gabbler {
import ChatRoom._
def apply(): Behavior[SessionEvent] =
Behaviors.setup { context =>
Behaviors.receiveMessage {
- //#chatroom-gabbler
+ // #chatroom-gabbler
// We document that the compiler warns about the missing handler for `SessionDenied`
case SessionDenied(reason) =>
context.log.info("cannot start chat room session: {}", reason)
Behaviors.stopped
- //#chatroom-gabbler
+ // #chatroom-gabbler
case SessionGranted(handle) =>
handle ! PostMessage("Hello World!")
Behaviors.same
@@ -212,9 +212,9 @@ object IntroSpec {
}
}
}
- //#chatroom-gabbler
+ // #chatroom-gabbler
- //#chatroom-main
+ // #chatroom-main
object Main {
def apply(): Behavior[NotUsed] =
Behaviors.setup { context =>
@@ -234,7 +234,7 @@ object IntroSpec {
}
}
- //#chatroom-main
+ // #chatroom-main
}
@@ -244,7 +244,7 @@ class IntroSpec extends ScalaTestWithActorTestKit with AnyWordSpecLike with LogC
"Intro sample" must {
"say hello" in {
- //#hello-world
+ // #hello-world
val system: ActorSystem[HelloWorldMain.SayHello] =
ActorSystem(HelloWorldMain(), "hello")
@@ -252,7 +252,7 @@ class IntroSpec extends ScalaTestWithActorTestKit with AnyWordSpecLike with LogC
system ! HelloWorldMain.SayHello("World")
system ! HelloWorldMain.SayHello("Akka")
- //#hello-world
+ // #hello-world
Thread.sleep(500) // it will not fail if too short
ActorTestKit.shutdown(system)
diff --git a/akka-actor-typed-tests/src/test/scala/docs/akka/typed/LoggingDocExamples.scala b/akka-actor-typed-tests/src/test/scala/docs/akka/typed/LoggingDocExamples.scala
index c6a2b269ca..d0d0f9eca4 100644
--- a/akka-actor-typed-tests/src/test/scala/docs/akka/typed/LoggingDocExamples.scala
+++ b/akka-actor-typed-tests/src/test/scala/docs/akka/typed/LoggingDocExamples.scala
@@ -26,14 +26,14 @@ object LoggingDocExamples {
def howToUse(): Unit = {
- //#context-log
+ // #context-log
Behaviors.receive[String] { (context, message) =>
context.log.info("Received message: {}", message)
Behaviors.same
}
- //#context-log
+ // #context-log
- //#logger-name
+ // #logger-name
Behaviors.setup[String] { context =>
context.setLoggerName("com.myservice.BackendManager")
context.log.info("Starting up")
@@ -43,9 +43,9 @@ object LoggingDocExamples {
Behaviors.same
}
}
- //#logger-name
+ // #logger-name
- //#logger-factory
+ // #logger-factory
val log = LoggerFactory.getLogger("com.myservice.BackendTask")
Future {
@@ -55,21 +55,21 @@ object LoggingDocExamples {
case Success(result) => log.info("Task completed: {}", result)
case Failure(exc) => log.error("Task failed", exc)
}
- //#logger-factory
+ // #logger-factory
}
def placeholders(): Unit = {
- //#info2
+ // #info2
import akka.actor.typed.scaladsl.LoggerOps
Behaviors.receive[String] { (context, message) =>
context.log.info2("{} received message: {}", context.self.path.name, message)
Behaviors.same
}
- //#info2
+ // #info2
- //#infoN
+ // #infoN
import akka.actor.typed.scaladsl.LoggerOps
Behaviors.receive[String] { (context, message) =>
@@ -80,23 +80,23 @@ object LoggingDocExamples {
message.take(10))
Behaviors.same
}
- //#infoN
+ // #infoN
}
def logMessages(): Unit = {
- //#logMessages
+ // #logMessages
import akka.actor.typed.LogOptions
import org.slf4j.event.Level
Behaviors.logMessages(LogOptions().withLevel(Level.TRACE), BackendManager())
- //#logMessages
+ // #logMessages
}
def withMdc(): Unit = {
val system: ActorSystem[_] = ???
- //#withMdc
+ // #withMdc
val staticMdc = Map("startTime" -> system.startTime.toString)
Behaviors.withMdc[BackendManager.Command](
staticMdc,
@@ -104,7 +104,7 @@ object LoggingDocExamples {
(msg: BackendManager.Command) => Map("identifier" -> msg.identifier, "upTime" -> system.uptime.toString)) {
BackendManager()
}
- //#withMdc
+ // #withMdc
}
def logging(): Unit = {
@@ -112,18 +112,18 @@ object LoggingDocExamples {
final case class Message(s: String)
val ref: ActorRef[Message] = ???
- //#test-logging
+ // #test-logging
import akka.actor.testkit.typed.scaladsl.LoggingTestKit
// implicit ActorSystem is needed, but that is given by ScalaTestWithActorTestKit
- //implicit val system: ActorSystem[_]
+ // implicit val system: ActorSystem[_]
LoggingTestKit.info("Received message").expect {
ref ! Message("hello")
}
- //#test-logging
+ // #test-logging
- //#test-logging-criteria
+ // #test-logging-criteria
LoggingTestKit
.error[IllegalArgumentException]
.withMessageRegex(".*was rejected.*expecting ascii input.*")
@@ -138,15 +138,15 @@ object LoggingDocExamples {
ref ! Message("hellö")
ref ! Message("hejdå")
}
- //#test-logging-criteria
+ // #test-logging-criteria
}
def tagsExample(): Unit = {
Behaviors.setup[AnyRef] { context =>
val myBehavior = Behaviors.empty[AnyRef]
- //#tags
+ // #tags
context.spawn(myBehavior, "MyActor", ActorTags("processing"))
- //#tags
+ // #tags
Behaviors.stopped
}
}
diff --git a/akka-actor-typed-tests/src/test/scala/docs/akka/typed/OOIntroSpec.scala b/akka-actor-typed-tests/src/test/scala/docs/akka/typed/OOIntroSpec.scala
index 656f3374da..7d31984cbb 100644
--- a/akka-actor-typed-tests/src/test/scala/docs/akka/typed/OOIntroSpec.scala
+++ b/akka-actor-typed-tests/src/test/scala/docs/akka/typed/OOIntroSpec.scala
@@ -22,17 +22,17 @@ import org.scalatest.wordspec.AnyWordSpecLike
object OOIntroSpec {
- //#chatroom-protocol
- //#chatroom-behavior
+ // #chatroom-protocol
+ // #chatroom-behavior
object ChatRoom {
- //#chatroom-behavior
+ // #chatroom-behavior
sealed trait RoomCommand
final case class GetSession(screenName: String, replyTo: ActorRef[SessionEvent]) extends RoomCommand
- //#chatroom-protocol
- //#chatroom-behavior
+ // #chatroom-protocol
+ // #chatroom-behavior
private final case class PublishSessionMessage(screenName: String, message: String) extends RoomCommand
- //#chatroom-behavior
- //#chatroom-protocol
+ // #chatroom-behavior
+ // #chatroom-protocol
sealed trait SessionEvent
final case class SessionGranted(handle: ActorRef[PostMessage]) extends SessionEvent
@@ -42,8 +42,8 @@ object OOIntroSpec {
sealed trait SessionCommand
final case class PostMessage(message: String) extends SessionCommand
private final case class NotifyClient(message: MessagePosted) extends SessionCommand
- //#chatroom-protocol
- //#chatroom-behavior
+ // #chatroom-protocol
+ // #chatroom-behavior
def apply(): Behavior[RoomCommand] =
Behaviors.setup(context => new ChatRoomBehavior(context))
@@ -96,12 +96,12 @@ object OOIntroSpec {
Behaviors.same
}
}
- //#chatroom-protocol
+ // #chatroom-protocol
}
- //#chatroom-protocol
- //#chatroom-behavior
+ // #chatroom-protocol
+ // #chatroom-behavior
- //#chatroom-gabbler
+ // #chatroom-gabbler
object Gabbler {
import ChatRoom._
@@ -119,10 +119,10 @@ object OOIntroSpec {
Behaviors.stopped
}
}
- //#chatroom-gabbler
+ // #chatroom-gabbler
}
- //#chatroom-main
+ // #chatroom-main
object Main {
def apply(): Behavior[NotUsed] =
Behaviors.setup { context =>
@@ -142,7 +142,7 @@ object OOIntroSpec {
}
}
- //#chatroom-main
+ // #chatroom-main
}
diff --git a/akka-actor-typed-tests/src/test/scala/docs/akka/typed/RouterSpec.scala b/akka-actor-typed-tests/src/test/scala/docs/akka/typed/RouterSpec.scala
index 55cf8cc417..c9002d352a 100644
--- a/akka-actor-typed-tests/src/test/scala/docs/akka/typed/RouterSpec.scala
+++ b/akka-actor-typed-tests/src/test/scala/docs/akka/typed/RouterSpec.scala
@@ -33,7 +33,7 @@ object RouterSpec {
// #routee
- //intentionally out of the routee section
+ // intentionally out of the routee section
class DoBroadcastLog(text: String) extends Worker.DoLog(text)
object DoBroadcastLog {
def apply(text: String) = new DoBroadcastLog(text)
@@ -93,17 +93,17 @@ class RouterSpec extends ScalaTestWithActorTestKit("akka.loglevel=warning") with
val alternativeRouter = ctx.spawn(alternativePool, "alternative-pool")
alternativeRouter ! Worker.DoLog("msg")
- //#pool
+ // #pool
// #broadcast
val poolWithBroadcast = pool.withBroadcastPredicate(_.isInstanceOf[DoBroadcastLog])
val routerWithBroadcast = ctx.spawn(poolWithBroadcast, "pool-with-broadcast")
- //this will be sent to all 4 routees
+ // this will be sent to all 4 routees
routerWithBroadcast ! DoBroadcastLog("msg")
Behaviors.empty
// #broadcast
}
- //#pool
+ // #pool
)
probe.receiveMessages(15)
@@ -164,17 +164,17 @@ class RouterSpec extends ScalaTestWithActorTestKit("akka.loglevel=warning") with
}
}
- //registering proxies
+ // registering proxies
val proxy1 = spawn(Proxy(probe1.ref))
val proxy2 = spawn(Proxy(probe2.ref))
val waiterProbe = createTestProbe[Receptionist.Registered]()
system.receptionist ! Receptionist.Register(Proxy.RegisteringKey, proxy1, waiterProbe.ref)
system.receptionist ! Receptionist.Register(Proxy.RegisteringKey, proxy2, waiterProbe.ref)
- //wait until both registrations get Receptionist.Registered
+ // wait until both registrations get Receptionist.Registered
waiterProbe.receiveMessages(2)
- //messages sent to a router with consistent hashing
+ // messages sent to a router with consistent hashing
// #consistent-hashing
val router = spawn(Routers.group(Proxy.RegisteringKey).withConsistentHashingRouting(10, Proxy.mapping))
@@ -185,8 +185,8 @@ class RouterSpec extends ScalaTestWithActorTestKit("akka.loglevel=warning") with
router ! Proxy.Message("zh3", "Text4")
// the hash is calculated over the Proxy.Message first parameter obtained through the Proxy.mapping function
// #consistent-hashing
- //Then messages with equal Message.id reach the same actor
- //so the first message in each probe queue is equal to its second
+ // Then messages with equal Message.id reach the same actor
+ // so the first message in each probe queue is equal to its second
probe1.receiveMessage() shouldBe probe1.receiveMessage()
probe2.receiveMessage() shouldBe probe2.receiveMessage()
diff --git a/akka-actor-typed-tests/src/test/scala/docs/akka/typed/SpawnProtocolDocSpec.scala b/akka-actor-typed-tests/src/test/scala/docs/akka/typed/SpawnProtocolDocSpec.scala
index 1ed7e41323..03429531bd 100644
--- a/akka-actor-typed-tests/src/test/scala/docs/akka/typed/SpawnProtocolDocSpec.scala
+++ b/akka-actor-typed-tests/src/test/scala/docs/akka/typed/SpawnProtocolDocSpec.scala
@@ -34,7 +34,7 @@ object SpawnProtocolDocSpec {
// Silent because we want to name the unused 'context' parameter
@nowarn("msg=never used")
- //#main
+ // #main
object HelloWorldMain {
def apply(): Behavior[SpawnProtocol.Command] =
Behaviors.setup { context =>
@@ -44,7 +44,7 @@ object SpawnProtocolDocSpec {
SpawnProtocol()
}
}
- //#main
+ // #main
}
class SpawnProtocolDocSpec extends ScalaTestWithActorTestKit with AnyWordSpecLike with LogCapturing {
@@ -53,7 +53,7 @@ class SpawnProtocolDocSpec extends ScalaTestWithActorTestKit with AnyWordSpecLik
"ActorSystem with SpawnProtocol" must {
"be able to spawn actors" in {
- //#system-spawn
+ // #system-spawn
implicit val system: ActorSystem[SpawnProtocol.Command] =
ActorSystem(HelloWorldMain(), "hello")
@@ -78,7 +78,7 @@ class SpawnProtocolDocSpec extends ScalaTestWithActorTestKit with AnyWordSpecLik
greeterRef ! HelloWorld.Greet("Akka", replyToRef)
}
- //#system-spawn
+ // #system-spawn
Thread.sleep(500) // it will not fail if too short
ActorTestKit.shutdown(system)
diff --git a/akka-actor-typed-tests/src/test/scala/docs/akka/typed/StyleGuideDocExamples.scala b/akka-actor-typed-tests/src/test/scala/docs/akka/typed/StyleGuideDocExamples.scala
index 15092ec4bb..2bee8f5c71 100644
--- a/akka-actor-typed-tests/src/test/scala/docs/akka/typed/StyleGuideDocExamples.scala
+++ b/akka-actor-typed-tests/src/test/scala/docs/akka/typed/StyleGuideDocExamples.scala
@@ -31,15 +31,15 @@ object StyleGuideDocExamples {
object FunctionalStyle {
- //#fun-style
+ // #fun-style
- //#messages
+ // #messages
object Counter {
sealed trait Command
case object Increment extends Command
final case class GetValue(replyTo: ActorRef[Value]) extends Command
final case class Value(n: Int)
- //#messages
+ // #messages
def apply(): Behavior[Command] =
counter(0)
@@ -56,16 +56,16 @@ object StyleGuideDocExamples {
Behaviors.same
}
}
- //#messages
+ // #messages
}
- //#messages
- //#fun-style
+ // #messages
+ // #fun-style
}
object OOStyle {
- //#oo-style
+ // #oo-style
object Counter {
sealed trait Command
@@ -95,7 +95,7 @@ object StyleGuideDocExamples {
}
}
}
- //#oo-style
+ // #oo-style
}
@@ -270,7 +270,7 @@ object StyleGuideDocExamples {
}
object FactoryMethod {
- //#behavior-factory-method
+ // #behavior-factory-method
object CountDown {
sealed trait Command
case object Down extends Command
@@ -284,7 +284,7 @@ object StyleGuideDocExamples {
import CountDown._
private def counter(remaining: Int): Behavior[Command] = {
- //#exhastivness-check
+ // #exhastivness-check
Behaviors.receiveMessage {
case Down =>
if (remaining == 1) {
@@ -293,28 +293,28 @@ object StyleGuideDocExamples {
} else
counter(remaining - 1)
}
- //#exhastivness-check
+ // #exhastivness-check
}
}
- //#behavior-factory-method
+ // #behavior-factory-method
object Usage {
val context: ActorContext[_] = ???
val doneRef: ActorRef[Done] = ???
- //#behavior-factory-method-spawn
+ // #behavior-factory-method-spawn
val countDown = context.spawn(CountDown(100, doneRef), "countDown")
- //#behavior-factory-method-spawn
+ // #behavior-factory-method-spawn
- //#message-prefix-in-tell
+ // #message-prefix-in-tell
countDown ! CountDown.Down
- //#message-prefix-in-tell
+ // #message-prefix-in-tell
}
}
object Messages {
- //#message-protocol
+ // #message-protocol
object CounterProtocol {
sealed trait Command
@@ -325,11 +325,11 @@ object StyleGuideDocExamples {
case object Confirmed extends OperationResult
final case class Rejected(reason: String) extends OperationResult
}
- //#message-protocol
+ // #message-protocol
}
object PublicVsPrivateMessages1 {
- //#public-private-messages-1
+ // #public-private-messages-1
object Counter {
sealed trait Command
case object Increment extends Command
@@ -366,11 +366,11 @@ object StyleGuideDocExamples {
Behaviors.same
}
}
- //#public-private-messages-1
+ // #public-private-messages-1
}
object PublicVsPrivateMessages2 {
- //#public-private-messages-2
+ // #public-private-messages-2
// above example is preferred, but this is possible and not wrong
object Counter {
// The type of all public and private messages the Counter actor handles
@@ -417,7 +417,7 @@ object StyleGuideDocExamples {
Behaviors.same
}
}
- //#public-private-messages-2
+ // #public-private-messages-2
}
object Ask {
@@ -425,7 +425,7 @@ object StyleGuideDocExamples {
implicit val system: ActorSystem[Nothing] = ???
- //#ask-1
+ // #ask-1
import akka.actor.typed.scaladsl.AskPattern._
import akka.util.Timeout
@@ -433,11 +433,11 @@ object StyleGuideDocExamples {
val counter: ActorRef[Command] = ???
val result: Future[OperationResult] = counter.ask(replyTo => Increment(delta = 2, replyTo))
- //#ask-1
+ // #ask-1
- //#ask-2
+ // #ask-2
val result2: Future[OperationResult] = counter.ask(Increment(delta = 2, _))
- //#ask-2
+ // #ask-2
/*
//#ask-3
@@ -446,26 +446,26 @@ object StyleGuideDocExamples {
//#ask-3
*/
- //#ask-4
+ // #ask-4
val result3: Future[OperationResult] = counter ? (Increment(delta = 2, _))
- //#ask-4
+ // #ask-4
}
object ExhaustivenessCheck {
object CountDown {
- //#messages-sealed
+ // #messages-sealed
sealed trait Command
case object Down extends Command
final case class GetValue(replyTo: ActorRef[Value]) extends Command
final case class Value(n: Int)
- //#messages-sealed
+ // #messages-sealed
}
class CountDown() {
import CountDown._
- //#pattern-match-unhandled
+ // #pattern-match-unhandled
val zero: Behavior[Command] = {
Behaviors.receiveMessage {
case GetValue(replyTo) =>
@@ -475,11 +475,11 @@ object StyleGuideDocExamples {
Behaviors.unhandled
}
}
- //#pattern-match-unhandled
+ // #pattern-match-unhandled
@nowarn
object partial {
- //#pattern-match-partial
+ // #pattern-match-partial
val zero: Behavior[Command] = {
Behaviors.receiveMessagePartial {
case GetValue(replyTo) =>
@@ -487,7 +487,7 @@ object StyleGuideDocExamples {
Behaviors.same
}
}
- //#pattern-match-partial
+ // #pattern-match-partial
}
}
@@ -495,22 +495,22 @@ object StyleGuideDocExamples {
object BehaviorCompositionWithPartialFunction {
- //#messages-sealed-composition
+ // #messages-sealed-composition
sealed trait Command
case object Down extends Command
final case class GetValue(replyTo: ActorRef[Value]) extends Command
final case class Value(n: Int)
- //#messages-sealed-composition
+ // #messages-sealed-composition
- //#get-handler-partial
+ // #get-handler-partial
def getHandler(value: Int): PartialFunction[Command, Behavior[Command]] = {
case GetValue(replyTo) =>
replyTo ! Value(value)
Behaviors.same
}
- //#get-handler-partial
+ // #get-handler-partial
- //#set-handler-non-zero-partial
+ // #set-handler-non-zero-partial
def setHandlerNotZero(value: Int): PartialFunction[Command, Behavior[Command]] = {
case Down =>
if (value == 1)
@@ -518,17 +518,17 @@ object StyleGuideDocExamples {
else
nonZero(value - 1)
}
- //#set-handler-non-zero-partial
+ // #set-handler-non-zero-partial
- //#set-handler-zero-partial
+ // #set-handler-zero-partial
def setHandlerZero(log: Logger): PartialFunction[Command, Behavior[Command]] = {
case Down =>
log.error("Counter is already at zero!")
Behaviors.same
}
- //#set-handler-zero-partial
+ // #set-handler-zero-partial
- //#top-level-behaviors-partial
+ // #top-level-behaviors-partial
val zero: Behavior[Command] = Behaviors.setup { context =>
Behaviors.receiveMessagePartial(getHandler(0).orElse(setHandlerZero(context.log)))
}
@@ -538,13 +538,13 @@ object StyleGuideDocExamples {
// Default Initial Behavior for this actor
def apply(initialCapacity: Int): Behavior[Command] = nonZero(initialCapacity)
- //#top-level-behaviors-partial
+ // #top-level-behaviors-partial
}
object NestingSample1 {
sealed trait Command
- //#nesting
+ // #nesting
def apply(): Behavior[Command] =
Behaviors.setup[Command](context =>
Behaviors.withStash(100)(stash =>
@@ -552,19 +552,19 @@ object StyleGuideDocExamples {
context.log.debug("Starting up")
// behavior using context, stash and timers ...
- //#nesting
+ // #nesting
timers.isTimerActive("aa")
stash.isEmpty
Behaviors.empty
- //#nesting
+ // #nesting
}))
- //#nesting
+ // #nesting
}
object NestingSample2 {
sealed trait Command
- //#nesting-supervise
+ // #nesting-supervise
def apply(): Behavior[Command] =
Behaviors.setup { context =>
// only run on initial actor start, not on crash-restart
@@ -575,13 +575,13 @@ object StyleGuideDocExamples {
// every time the actor crashes and restarts a new stash is created (previous stash is lost)
context.log.debug("Starting up with stash")
// Behaviors.receiveMessage { ... }
- //#nesting-supervise
+ // #nesting-supervise
stash.isEmpty
Behaviors.empty
- //#nesting-supervise
+ // #nesting-supervise
})
.onFailure[RuntimeException](SupervisorStrategy.restart)
}
- //#nesting-supervise
+ // #nesting-supervise
}
}
diff --git a/akka-actor-typed-tests/src/test/scala/docs/akka/typed/coexistence/ClassicWatchingTypedSpec.scala b/akka-actor-typed-tests/src/test/scala/docs/akka/typed/coexistence/ClassicWatchingTypedSpec.scala
index 04d370dcbd..267ef5cef9 100644
--- a/akka-actor-typed-tests/src/test/scala/docs/akka/typed/coexistence/ClassicWatchingTypedSpec.scala
+++ b/akka-actor-typed-tests/src/test/scala/docs/akka/typed/coexistence/ClassicWatchingTypedSpec.scala
@@ -26,7 +26,7 @@ object ClassicWatchingTypedSpec {
def props() = classic.Props(new Classic)
}
- //#classic-watch
+ // #classic-watch
class Classic extends classic.Actor with ActorLogging {
// context.spawn is an implicit extension method
val second: ActorRef[Typed.Command] =
@@ -51,9 +51,9 @@ object ClassicWatchingTypedSpec {
context.stop(self)
}
}
- //#classic-watch
+ // #classic-watch
- //#typed
+ // #typed
object Typed {
sealed trait Command
final case class Ping(replyTo: ActorRef[Pong.type]) extends Command
@@ -70,7 +70,7 @@ object ClassicWatchingTypedSpec {
}
}
}
- //#typed
+ // #typed
}
class ClassicWatchingTypedSpec extends AnyWordSpec with LogCapturing {
@@ -80,9 +80,9 @@ class ClassicWatchingTypedSpec extends AnyWordSpec with LogCapturing {
"Classic -> Typed" must {
"support creating, watching and messaging" in {
val system = classic.ActorSystem("Coexistence")
- //#create-classic
+ // #create-classic
val classicActor = system.actorOf(Classic.props())
- //#create-classic
+ // #create-classic
val probe = TestProbe()(system)
probe.watch(classicActor)
probe.expectTerminated(classicActor, 200.millis)
@@ -90,11 +90,11 @@ class ClassicWatchingTypedSpec extends AnyWordSpec with LogCapturing {
}
"support converting a classic actor system to an actor system" in {
- //#convert-classic
+ // #convert-classic
val system = akka.actor.ActorSystem("ClassicToTypedSystem")
val typedSystem: ActorSystem[Nothing] = system.toTyped
- //#convert-classic
+ // #convert-classic
typedSystem.scheduler // remove compile warning
TestKit.shutdownActorSystem(system)
}
diff --git a/akka-actor-typed-tests/src/test/scala/docs/akka/typed/coexistence/TypedWatchingClassicSpec.scala b/akka-actor-typed-tests/src/test/scala/docs/akka/typed/coexistence/TypedWatchingClassicSpec.scala
index 990250b4d4..bb207dc425 100644
--- a/akka-actor-typed-tests/src/test/scala/docs/akka/typed/coexistence/TypedWatchingClassicSpec.scala
+++ b/akka-actor-typed-tests/src/test/scala/docs/akka/typed/coexistence/TypedWatchingClassicSpec.scala
@@ -21,7 +21,7 @@ import scala.concurrent.duration._
object TypedWatchingClassicSpec {
- //#typed
+ // #typed
object Typed {
final case class Ping(replyTo: akka.actor.typed.ActorRef[Pong.type])
sealed trait Command
@@ -52,9 +52,9 @@ object TypedWatchingClassicSpec {
}
}
}
- //#typed
+ // #typed
- //#classic
+ // #classic
object Classic {
def props(): classic.Props = classic.Props(new Classic)
}
@@ -64,7 +64,7 @@ object TypedWatchingClassicSpec {
replyTo ! Typed.Pong
}
}
- //#classic
+ // #classic
}
class TypedWatchingClassicSpec extends AnyWordSpec with LogCapturing {
@@ -73,10 +73,10 @@ class TypedWatchingClassicSpec extends AnyWordSpec with LogCapturing {
"Typed -> Classic" must {
"support creating, watching and messaging" in {
- //#create
+ // #create
val system = classic.ActorSystem("TypedWatchingClassic")
val typed = system.spawn(Typed.behavior, "Typed")
- //#create
+ // #create
val probe = TestProbe()(system)
probe.watch(typed.toClassic)
probe.expectTerminated(typed.toClassic, 200.millis)
diff --git a/akka-actor-typed-tests/src/test/scala/docs/akka/typed/extensions/ExtensionDocSpec.scala b/akka-actor-typed-tests/src/test/scala/docs/akka/typed/extensions/ExtensionDocSpec.scala
index aefcf2a8ec..c0c85f6604 100644
--- a/akka-actor-typed-tests/src/test/scala/docs/akka/typed/extensions/ExtensionDocSpec.scala
+++ b/akka-actor-typed-tests/src/test/scala/docs/akka/typed/extensions/ExtensionDocSpec.scala
@@ -51,10 +51,10 @@ object ExtensionDocSpec {
val initialBehavior: Behavior[Any] = Behaviors.empty[Any]
- //#usage
+ // #usage
Behaviors.setup[Any] { ctx =>
DatabasePool(ctx.system).connection().executeQuery("insert into...")
initialBehavior
}
- //#usage
+ // #usage
}
diff --git a/akka-actor-typed-tests/src/test/scala/docs/akka/typed/fromclassic/ClassicSample.scala b/akka-actor-typed-tests/src/test/scala/docs/akka/typed/fromclassic/ClassicSample.scala
index 2831c1e32f..17607da53b 100644
--- a/akka-actor-typed-tests/src/test/scala/docs/akka/typed/fromclassic/ClassicSample.scala
+++ b/akka-actor-typed-tests/src/test/scala/docs/akka/typed/fromclassic/ClassicSample.scala
@@ -13,7 +13,7 @@ import akka.actor.Props
object ClassicSample {
- //#hello-world-actor
+ // #hello-world-actor
object HelloWorld {
final case class Greet(whom: String)
final case class Greeted(whom: String)
@@ -27,11 +27,11 @@ object ClassicSample {
override def receive: Receive = {
case Greet(whom) =>
- //#fiddle_code
+ // #fiddle_code
log.info("Hello {}!", whom)
sender() ! Greeted(whom)
}
}
- //#hello-world-actor
+ // #hello-world-actor
}
diff --git a/akka-actor-typed-tests/src/test/scala/docs/akka/typed/fromclassic/TypedSample.scala b/akka-actor-typed-tests/src/test/scala/docs/akka/typed/fromclassic/TypedSample.scala
index 7387eeb8d6..50a86e9664 100644
--- a/akka-actor-typed-tests/src/test/scala/docs/akka/typed/fromclassic/TypedSample.scala
+++ b/akka-actor-typed-tests/src/test/scala/docs/akka/typed/fromclassic/TypedSample.scala
@@ -15,7 +15,7 @@ import akka.actor.typed.scaladsl.Behaviors
object TypedSample {
- //#hello-world-actor
+ // #hello-world-actor
object HelloWorld {
final case class Greet(whom: String, replyTo: ActorRef[Greeted])
final case class Greeted(whom: String, from: ActorRef[Greet])
@@ -33,9 +33,9 @@ object TypedSample {
this
}
}
- //#hello-world-actor
+ // #hello-world-actor
- //#children
+ // #children
object Parent {
sealed trait Command
case class DelegateToChild(name: String, message: Child.Command) extends Command
@@ -66,7 +66,7 @@ object TypedSample {
updated(Map.empty)
}
}
- //#children
+ // #children
object Child {
sealed trait Command
diff --git a/akka-actor-typed-tests/src/test/scala/docs/akka/typed/supervision/SupervisionCompileOnly.scala b/akka-actor-typed-tests/src/test/scala/docs/akka/typed/supervision/SupervisionCompileOnly.scala
index 9f1b904a5a..384654087e 100644
--- a/akka-actor-typed-tests/src/test/scala/docs/akka/typed/supervision/SupervisionCompileOnly.scala
+++ b/akka-actor-typed-tests/src/test/scala/docs/akka/typed/supervision/SupervisionCompileOnly.scala
@@ -17,37 +17,37 @@ object SupervisionCompileOnly {
val behavior = Behaviors.empty[String]
- //#restart
+ // #restart
Behaviors.supervise(behavior).onFailure[IllegalStateException](SupervisorStrategy.restart)
- //#restart
+ // #restart
- //#resume
+ // #resume
Behaviors.supervise(behavior).onFailure[IllegalStateException](SupervisorStrategy.resume)
- //#resume
+ // #resume
- //#restart-limit
+ // #restart-limit
Behaviors
.supervise(behavior)
.onFailure[IllegalStateException](
SupervisorStrategy.restart.withLimit(maxNrOfRetries = 10, withinTimeRange = 10.seconds))
- //#restart-limit
+ // #restart-limit
- //#multiple
+ // #multiple
Behaviors
.supervise(Behaviors.supervise(behavior).onFailure[IllegalStateException](SupervisorStrategy.restart))
.onFailure[IllegalArgumentException](SupervisorStrategy.stop)
- //#multiple
+ // #multiple
- //#wrap
+ // #wrap
object Counter {
sealed trait Command
case class Increment(nr: Int) extends Command
case class GetCount(replyTo: ActorRef[Int]) extends Command
- //#top-level
+ // #top-level
def apply(): Behavior[Command] =
Behaviors.supervise(counter(1)).onFailure(SupervisorStrategy.restart)
- //#top-level
+ // #top-level
private def counter(count: Int): Behavior[Command] =
Behaviors.receiveMessage[Command] {
@@ -58,9 +58,9 @@ object SupervisionCompileOnly {
Behaviors.same
}
}
- //#wrap
+ // #wrap
- //#restart-stop-children
+ // #restart-stop-children
def child(size: Long): Behavior[String] =
Behaviors.receiveMessage(msg => child(size + msg.length))
@@ -82,9 +82,9 @@ object SupervisionCompileOnly {
}
.onFailure(SupervisorStrategy.restart)
}
- //#restart-stop-children
+ // #restart-stop-children
- //#restart-keep-children
+ // #restart-keep-children
def parent2: Behavior[String] = {
Behaviors.setup { ctx =>
val child1 = ctx.spawn(child(0), "child1")
@@ -104,7 +104,7 @@ object SupervisionCompileOnly {
.onFailure(SupervisorStrategy.restart.withStopChildren(false))
}
}
- //#restart-keep-children
+ // #restart-keep-children
trait Resource {
def close(): Unit
@@ -113,7 +113,7 @@ object SupervisionCompileOnly {
def claimResource(): Resource = ???
@nowarn("msg=never used")
- //#restart-PreRestart-signal
+ // #restart-PreRestart-signal
def withPreRestart: Behavior[String] = {
Behaviors
.supervise[String] {
@@ -138,5 +138,5 @@ object SupervisionCompileOnly {
.onFailure[Exception](SupervisorStrategy.restart)
}
- //#restart-PreRestart-signal
+ // #restart-PreRestart-signal
}
diff --git a/akka-actor-typed/src/main/scala/akka/actor/typed/ActorSystem.scala b/akka-actor-typed/src/main/scala/akka/actor/typed/ActorSystem.scala
index 757389d689..b86929b1df 100644
--- a/akka-actor-typed/src/main/scala/akka/actor/typed/ActorSystem.scala
+++ b/akka-actor-typed/src/main/scala/akka/actor/typed/ActorSystem.scala
@@ -11,7 +11,7 @@ import scala.concurrent.{ ExecutionContextExecutor, Future }
import com.typesafe.config.{ Config, ConfigFactory }
import org.slf4j.Logger
-import akka.{ Done, actor => classic }
+import akka.{ actor => classic, Done }
import akka.actor.{ Address, BootstrapSetup, ClassicActorSystemProvider }
import akka.actor.setup.ActorSystemSetup
import akka.actor.typed.eventstream.EventStream
diff --git a/akka-actor-typed/src/main/scala/akka/actor/typed/Behavior.scala b/akka-actor-typed/src/main/scala/akka/actor/typed/Behavior.scala
index e0f4eb6b87..6efee5a7d1 100644
--- a/akka-actor-typed/src/main/scala/akka/actor/typed/Behavior.scala
+++ b/akka-actor-typed/src/main/scala/akka/actor/typed/Behavior.scala
@@ -133,7 +133,6 @@ object Behavior {
* The `ClassTag` for `Outer` ensures that only messages of this class or a subclass thereof will be
* intercepted. Other message types (e.g. a private protocol) will bypass
* the interceptor and be continue to the inner behavior untouched.
- *
*/
def transformMessages[Outer: ClassTag](matcher: PartialFunction[Outer, Inner]): Behavior[Outer] =
BehaviorImpl.transformMessages(behavior, matcher)
diff --git a/akka-actor-typed/src/main/scala/akka/actor/typed/Scheduler.scala b/akka-actor-typed/src/main/scala/akka/actor/typed/Scheduler.scala
index 3bd59a6be8..7e1e687282 100644
--- a/akka-actor-typed/src/main/scala/akka/actor/typed/Scheduler.scala
+++ b/akka-actor-typed/src/main/scala/akka/actor/typed/Scheduler.scala
@@ -39,7 +39,6 @@ trait Scheduler {
* reach (calculated as: `delay / tickNanos > Int.MaxValue`).
*
* Note: For scheduling within actors `Behaviors.withTimers` or `ActorContext.scheduleOnce` should be preferred.
- *
*/
def scheduleOnce(delay: java.time.Duration, runnable: Runnable, executor: ExecutionContext): Cancellable
@@ -62,7 +61,6 @@ trait Scheduler {
* reach (calculated as: `delay / tickNanos > Int.MaxValue`).
*
* Note: For scheduling within actors `Behaviors.withTimers` should be preferred.
- *
*/
def scheduleWithFixedDelay(initialDelay: FiniteDuration, delay: FiniteDuration)(runnable: Runnable)(
implicit executor: ExecutionContext): Cancellable
@@ -124,7 +122,6 @@ trait Scheduler {
* reach (calculated as: `delay / tickNanos > Int.MaxValue`).
*
* Note: For scheduling within actors `Behaviors.withTimers` should be preferred.
- *
*/
def scheduleAtFixedRate(initialDelay: FiniteDuration, interval: FiniteDuration)(runnable: Runnable)(
implicit executor: ExecutionContext): Cancellable
diff --git a/akka-actor-typed/src/main/scala/akka/actor/typed/delivery/internal/ProducerControllerImpl.scala b/akka-actor-typed/src/main/scala/akka/actor/typed/delivery/internal/ProducerControllerImpl.scala
index 1b7bfd4a5a..9a2ce8f60c 100644
--- a/akka-actor-typed/src/main/scala/akka/actor/typed/delivery/internal/ProducerControllerImpl.scala
+++ b/akka-actor-typed/src/main/scala/akka/actor/typed/delivery/internal/ProducerControllerImpl.scala
@@ -258,8 +258,7 @@ object ProducerControllerImpl {
settings: ProducerController.Settings,
initialState: Option[DurableProducerQueue.State[A]])(
thenBecomeActive: (
- ActorRef[RequestNext[A]],
- ActorRef[ConsumerController.Command[A]],
+ ActorRef[RequestNext[A]], ActorRef[ConsumerController.Command[A]],
DurableProducerQueue.State[A]) => Behavior[InternalCommand]): Behavior[InternalCommand] = {
Behaviors.receiveMessagePartial[InternalCommand] {
case RegisterConsumer(c: ActorRef[ConsumerController.Command[A]] @unchecked) =>
@@ -346,7 +345,8 @@ object ProducerControllerImpl {
val manifest = Serializers.manifestFor(ser, mAnyRef)
val serializerId = ser.identifier
if (bytes.length <= chunkSize) {
- ChunkedMessage(ByteString.fromArrayUnsafe(bytes), firstChunk = true, lastChunk = true, serializerId, manifest) :: Nil
+ ChunkedMessage(ByteString.fromArrayUnsafe(bytes), firstChunk = true, lastChunk = true, serializerId,
+ manifest) :: Nil
} else {
val builder = Vector.newBuilder[ChunkedMessage]
val chunksIter = ByteString.fromArrayUnsafe(bytes).grouped(chunkSize)
diff --git a/akka-actor-typed/src/main/scala/akka/actor/typed/delivery/internal/WorkPullingProducerControllerImpl.scala b/akka-actor-typed/src/main/scala/akka/actor/typed/delivery/internal/WorkPullingProducerControllerImpl.scala
index c85710600b..0012d31b8d 100644
--- a/akka-actor-typed/src/main/scala/akka/actor/typed/delivery/internal/WorkPullingProducerControllerImpl.scala
+++ b/akka-actor-typed/src/main/scala/akka/actor/typed/delivery/internal/WorkPullingProducerControllerImpl.scala
@@ -373,7 +373,7 @@ private class WorkPullingProducerControllerImpl[A: ClassTag](
false
} else {
throw new IllegalStateException(s"Invalid combination of hasRequested [${s.requested}], " +
- s"wasStashed [$wasStashed], hasMoreDemand [$hasMoreDemand], stashBuffer.isEmpty [${stashBuffer.isEmpty}]")
+ s"wasStashed [$wasStashed], hasMoreDemand [$hasMoreDemand], stashBuffer.isEmpty [${stashBuffer.isEmpty}]")
}
s.copy(out = newOut, requested = newRequested, preselectedWorkers = s.preselectedWorkers - totalSeqNr)
@@ -443,7 +443,8 @@ private class WorkPullingProducerControllerImpl[A: ClassTag](
currentSeqNr = s.currentSeqNr + 1,
preselectedWorkers =
s.preselectedWorkers.updated(s.currentSeqNr, PreselectedWorker(outKey, out.confirmationQualifier)),
- handOver = s.handOver.updated(s.currentSeqNr, HandOver(resend.oldConfirmationQualifier, resend.oldSeqNr))))
+ handOver =
+ s.handOver.updated(s.currentSeqNr, HandOver(resend.oldConfirmationQualifier, resend.oldSeqNr))))
case None =>
checkStashFull(stashBuffer)
// no demand from any workers, or all already preselected
diff --git a/akka-actor-typed/src/main/scala/akka/actor/typed/eventstream/EventStream.scala b/akka-actor-typed/src/main/scala/akka/actor/typed/eventstream/EventStream.scala
index 491fc0d9d2..731e546012 100644
--- a/akka-actor-typed/src/main/scala/akka/actor/typed/eventstream/EventStream.scala
+++ b/akka-actor-typed/src/main/scala/akka/actor/typed/eventstream/EventStream.scala
@@ -43,7 +43,6 @@ object EventStream {
* def subscribe(actorSystem: ActorSystem[_], actorRef: ActorRef[A]) =
* actorSystem.eventStream ! EventStream.Subscribe[A1](actorRef)
* }}}
- *
*/
final case class Subscribe[E](subscriber: ActorRef[E])(implicit classTag: ClassTag[E]) extends Command {
diff --git a/akka-actor-typed/src/main/scala/akka/actor/typed/internal/ActorContextImpl.scala b/akka-actor-typed/src/main/scala/akka/actor/typed/internal/ActorContextImpl.scala
index 36f8c79a1e..1cc966cc04 100644
--- a/akka-actor-typed/src/main/scala/akka/actor/typed/internal/ActorContextImpl.scala
+++ b/akka-actor-typed/src/main/scala/akka/actor/typed/internal/ActorContextImpl.scala
@@ -218,7 +218,7 @@ import scala.util.Success
override def ask[Req, Res](target: RecipientRef[Req], createRequest: ActorRef[Res] => Req)(
mapResponse: Try[Res] => T)(implicit responseTimeout: Timeout, classTag: ClassTag[Res]): Unit = {
import akka.actor.typed.scaladsl.AskPattern._
- pipeToSelf((target.ask(createRequest))(responseTimeout, system.scheduler))(mapResponse)
+ pipeToSelf(target.ask(createRequest)(responseTimeout, system.scheduler))(mapResponse)
}
override def askWithStatus[Req, Res](target: RecipientRef[Req], createRequest: ActorRef[StatusReply[Res]] => Req)(
diff --git a/akka-actor-typed/src/main/scala/akka/actor/typed/internal/ExtensionsImpl.scala b/akka-actor-typed/src/main/scala/akka/actor/typed/internal/ExtensionsImpl.scala
index a9ebe68d09..407ad6804b 100644
--- a/akka-actor-typed/src/main/scala/akka/actor/typed/internal/ExtensionsImpl.scala
+++ b/akka-actor-typed/src/main/scala/akka/actor/typed/internal/ExtensionsImpl.scala
@@ -100,15 +100,15 @@ private[akka] trait ExtensionsImpl extends Extensions { self: ActorSystem[_] wit
}
} catch {
case t: Throwable =>
- //In case shit hits the fan, remove the inProcess signal and escalate to caller
+ // In case shit hits the fan, remove the inProcess signal and escalate to caller
extensions.replace(ext, inProcessOfRegistration, t)
throw t
} finally {
- //Always notify listeners of the inProcess signal
+ // Always notify listeners of the inProcess signal
inProcessOfRegistration.countDown()
}
case _ =>
- //Someone else is in process of registering an extension for this Extension, retry
+ // Someone else is in process of registering an extension for this Extension, retry
registerExtension(ext)
}
}
@@ -119,10 +119,10 @@ private[akka] trait ExtensionsImpl extends Extensions { self: ActorSystem[_] wit
@tailrec
private def findExtension[T <: Extension](ext: ExtensionId[T]): T = extensions.get(ext) match {
case c: CountDownLatch =>
- //Registration in process, await completion and retry
+ // Registration in process, await completion and retry
c.await()
findExtension(ext)
- case t: Throwable => throw t //Initialization failed, throw same again
- case other => other.asInstanceOf[T] //could be a T or null, in which case we return the null as T
+ case t: Throwable => throw t // Initialization failed, throw same again
+ case other => other.asInstanceOf[T] // could be a T or null, in which case we return the null as T
}
}
diff --git a/akka-actor-typed/src/main/scala/akka/actor/typed/internal/InterceptorImpl.scala b/akka-actor-typed/src/main/scala/akka/actor/typed/internal/InterceptorImpl.scala
index 658ff63713..dd7540e377 100644
--- a/akka-actor-typed/src/main/scala/akka/actor/typed/internal/InterceptorImpl.scala
+++ b/akka-actor-typed/src/main/scala/akka/actor/typed/internal/InterceptorImpl.scala
@@ -95,7 +95,8 @@ private[akka] final class InterceptorImpl[O, I](
private def deduplicate(interceptedResult: Behavior[I], ctx: TypedActorContext[O]): Behavior[O] = {
val started = Behavior.start(interceptedResult, ctx.asInstanceOf[TypedActorContext[I]])
- if (started == BehaviorImpl.UnhandledBehavior || started == BehaviorImpl.SameBehavior || !Behavior.isAlive(started)) {
+ if (started == BehaviorImpl.UnhandledBehavior || started == BehaviorImpl.SameBehavior || !Behavior.isAlive(
+ started)) {
started.unsafeCast[O]
} else {
// returned behavior could be nested in setups, so we need to start before we deduplicate
diff --git a/akka-actor-typed/src/main/scala/akka/actor/typed/internal/StashBufferImpl.scala b/akka-actor-typed/src/main/scala/akka/actor/typed/internal/StashBufferImpl.scala
index 1e088e59ee..b2036560a9 100644
--- a/akka-actor-typed/src/main/scala/akka/actor/typed/internal/StashBufferImpl.scala
+++ b/akka-actor-typed/src/main/scala/akka/actor/typed/internal/StashBufferImpl.scala
@@ -186,14 +186,15 @@ import java.util.function.Predicate
else {
val node = messages.next()
val message = wrap(node.message)
- val interpretResult = try {
- message match {
- case sig: Signal => Behavior.interpretSignal(b2, ctx, sig)
- case msg => interpretUnstashedMessage(b2, ctx, msg, node)
+ val interpretResult =
+ try {
+ message match {
+ case sig: Signal => Behavior.interpretSignal(b2, ctx, sig)
+ case msg => interpretUnstashedMessage(b2, ctx, msg, node)
+ }
+ } catch {
+ case NonFatal(e) => throw UnstashException(e, b2)
}
- } catch {
- case NonFatal(e) => throw UnstashException(e, b2)
- }
val actualNext =
if (interpretResult == BehaviorImpl.same) b2
diff --git a/akka-actor-typed/src/main/scala/akka/actor/typed/internal/Supervision.scala b/akka-actor-typed/src/main/scala/akka/actor/typed/internal/Supervision.scala
index 46d3ac9355..5c463bf0ea 100644
--- a/akka-actor-typed/src/main/scala/akka/actor/typed/internal/Supervision.scala
+++ b/akka-actor-typed/src/main/scala/akka/actor/typed/internal/Supervision.scala
@@ -34,7 +34,7 @@ import scala.util.Try
@InternalApi private[akka] object Supervisor {
def apply[T, Thr <: Throwable: ClassTag](initialBehavior: Behavior[T], strategy: SupervisorStrategy): Behavior[T] = {
if (initialBehavior.isInstanceOf[scaladsl.AbstractBehavior[_]] || initialBehavior
- .isInstanceOf[javadsl.AbstractBehavior[_]]) {
+ .isInstanceOf[javadsl.AbstractBehavior[_]]) {
throw new IllegalArgumentException(
"The supervised Behavior must not be a AbstractBehavior instance directly," +
"because a different instance should be created when it is restarted. Wrap in Behaviors.setup.")
@@ -303,18 +303,20 @@ private class RestartSupervisor[T, Thr <: Throwable: ClassTag](initial: Behavior
override protected def handleSignalException(
ctx: TypedActorContext[Any],
target: SignalTarget[T]): Catcher[Behavior[T]] = {
- handleException(ctx, signalRestart = {
- case e: UnstashException[Any] @unchecked => Behavior.interpretSignal(e.behavior, ctx, PreRestart)
- case _ => target(ctx, PreRestart)
- })
+ handleException(ctx,
+ signalRestart = {
+ case e: UnstashException[Any] @unchecked => Behavior.interpretSignal(e.behavior, ctx, PreRestart)
+ case _ => target(ctx, PreRestart)
+ })
}
override protected def handleReceiveException(
ctx: TypedActorContext[Any],
target: ReceiveTarget[T]): Catcher[Behavior[T]] = {
- handleException(ctx, signalRestart = {
- case e: UnstashException[Any] @unchecked => Behavior.interpretSignal(e.behavior, ctx, PreRestart)
- case _ => target.signalRestart(ctx)
- })
+ handleException(ctx,
+ signalRestart = {
+ case e: UnstashException[Any] @unchecked => Behavior.interpretSignal(e.behavior, ctx, PreRestart)
+ case _ => target.signalRestart(ctx)
+ })
}
private def handleException(ctx: TypedActorContext[Any], signalRestart: Throwable => Unit): Catcher[Behavior[T]] = {
@@ -391,10 +393,11 @@ private class RestartSupervisor[T, Thr <: Throwable: ClassTag](initial: Behavior
case _ => newBehavior
}
nextBehavior.narrow
- } catch handleException(ctx, signalRestart = {
- case e: UnstashException[Any] @unchecked => Behavior.interpretSignal(e.behavior, ctx, PreRestart)
- case _ => ()
- })
+ } catch handleException(ctx,
+ signalRestart = {
+ case e: UnstashException[Any] @unchecked => Behavior.interpretSignal(e.behavior, ctx, PreRestart)
+ case _ => ()
+ })
}
private def stopChildren(ctx: TypedActorContext[_], children: Set[ActorRef[Nothing]]): Unit = {
diff --git a/akka-actor-typed/src/main/scala/akka/actor/typed/internal/SystemMessage.scala b/akka-actor-typed/src/main/scala/akka/actor/typed/internal/SystemMessage.scala
index 85ad125aba..daaf3bab61 100644
--- a/akka-actor-typed/src/main/scala/akka/actor/typed/internal/SystemMessage.scala
+++ b/akka-actor-typed/src/main/scala/akka/actor/typed/internal/SystemMessage.scala
@@ -33,7 +33,6 @@ private[typed] object SystemMessageList {
}
/**
- *
* INTERNAL API
*
* Value class supporting list operations on system messages. The `next` field of [[SystemMessage]]
@@ -45,7 +44,6 @@ private[typed] object SystemMessageList {
*
* The type of the list also encodes that the messages contained are in reverse order, i.e. the head of the list is the
* latest appended element.
- *
*/
private[typed] class LatestFirstSystemMessageList(val head: SystemMessage) extends AnyVal {
import SystemMessageList._
@@ -94,7 +92,6 @@ private[typed] class LatestFirstSystemMessageList(val head: SystemMessage) exten
}
/**
- *
* INTERNAL API
*
* Value class supporting list operations on system messages. The `next` field of [[SystemMessage]]
@@ -106,7 +103,6 @@ private[typed] class LatestFirstSystemMessageList(val head: SystemMessage) exten
*
* This list type also encodes that the messages contained are in reverse order, i.e. the head of the list is the
* latest appended element.
- *
*/
private[typed] class EarliestFirstSystemMessageList(val head: SystemMessage) extends AnyVal {
import SystemMessageList._
diff --git a/akka-actor-typed/src/main/scala/akka/actor/typed/internal/TimerSchedulerImpl.scala b/akka-actor-typed/src/main/scala/akka/actor/typed/internal/TimerSchedulerImpl.scala
index f1035688b3..3c2ca13ba3 100644
--- a/akka-actor-typed/src/main/scala/akka/actor/typed/internal/TimerSchedulerImpl.scala
+++ b/akka-actor-typed/src/main/scala/akka/actor/typed/internal/TimerSchedulerImpl.scala
@@ -69,7 +69,7 @@ import scala.concurrent.duration.FiniteDuration
startTimerAtFixedRate(key, msg, initialDelay.asScala, interval.asScala)
override final def startPeriodicTimer(key: Any, msg: T, interval: Duration): Unit = {
- //this follows the deprecation note in the super class
+ // this follows the deprecation note in the super class
startTimerWithFixedDelay(key, msg, interval.asScala)
}
diff --git a/akka-actor-typed/src/main/scala/akka/actor/typed/internal/adapter/ActorAdapter.scala b/akka-actor-typed/src/main/scala/akka/actor/typed/internal/adapter/ActorAdapter.scala
index d6011b65fd..8904863b56 100644
--- a/akka-actor-typed/src/main/scala/akka/actor/typed/internal/adapter/ActorAdapter.scala
+++ b/akka-actor-typed/src/main/scala/akka/actor/typed/internal/adapter/ActorAdapter.scala
@@ -118,7 +118,7 @@ import akka.util.OptionVal
if (c.hasTimer) {
msg match {
case timerMsg: TimerMsg =>
- //we can only get this kind of message if the timer is of this concrete class
+ // we can only get this kind of message if the timer is of this concrete class
c.timer.asInstanceOf[TimerSchedulerImpl[T]].interceptTimerMsg(ctx.log, timerMsg) match {
case OptionVal.Some(m) =>
next(Behavior.interpretMessage(behavior, c, m), m)
@@ -187,17 +187,18 @@ import akka.util.OptionVal
private def withSafelyAdapted[U, V](adapt: () => U)(body: U => V): Unit = {
var failed = false
- val adapted: U = try {
- adapt()
- } catch {
- case NonFatal(ex) =>
- // pass it on through the signal handler chain giving supervision a chance to deal with it
- handleSignal(MessageAdaptionFailure(ex))
- // Signal handler should actually throw so this is mostly to keep compiler happy (although a user could override
- // the MessageAdaptionFailure handling to do something weird)
- failed = true
- null.asInstanceOf[U]
- }
+ val adapted: U =
+ try {
+ adapt()
+ } catch {
+ case NonFatal(ex) =>
+ // pass it on through the signal handler chain giving supervision a chance to deal with it
+ handleSignal(MessageAdaptionFailure(ex))
+ // Signal handler should actually throw so this is mostly to keep compiler happy (although a user could override
+ // the MessageAdaptionFailure handling to do something weird)
+ failed = true
+ null.asInstanceOf[U]
+ }
if (!failed) {
if (adapted != null) body(adapted)
else
@@ -222,33 +223,34 @@ import akka.util.OptionVal
case ex =>
ctx.setCurrentActorThread()
try ex match {
- case TypedActorFailedException(cause) =>
- // These have already been optionally logged by typed supervision
- recordChildFailure(cause)
- classic.SupervisorStrategy.Stop
- case _ =>
- val isTypedActor = sender() match {
- case afwc: ActorRefWithCell =>
- afwc.underlying.props.producer.actorClass == classOf[ActorAdapter[_]]
- case _ =>
- false
- }
- recordChildFailure(ex)
- val logMessage = ex match {
- case e: ActorInitializationException if e.getCause ne null =>
- e.getCause match {
- case ex: InvocationTargetException if ex.getCause ne null => ex.getCause.getMessage
- case ex => ex.getMessage
- }
- case e => e.getMessage
- }
- // log at Error as that is what the supervision strategy would have done.
- ctx.log.error(logMessage, ex)
- if (isTypedActor)
+ case TypedActorFailedException(cause) =>
+ // These have already been optionally logged by typed supervision
+ recordChildFailure(cause)
classic.SupervisorStrategy.Stop
- else
- ActorAdapter.classicSupervisorDecider(ex)
- } finally {
+ case _ =>
+ val isTypedActor = sender() match {
+ case afwc: ActorRefWithCell =>
+ afwc.underlying.props.producer.actorClass == classOf[ActorAdapter[_]]
+ case _ =>
+ false
+ }
+ recordChildFailure(ex)
+ val logMessage = ex match {
+ case e: ActorInitializationException if e.getCause ne null =>
+ e.getCause match {
+ case ex: InvocationTargetException if ex.getCause ne null => ex.getCause.getMessage
+ case ex => ex.getMessage
+ }
+ case e => e.getMessage
+ }
+ // log at Error as that is what the supervision strategy would have done.
+ ctx.log.error(logMessage, ex)
+ if (isTypedActor)
+ classic.SupervisorStrategy.Stop
+ else
+ ActorAdapter.classicSupervisorDecider(ex)
+ }
+ finally {
ctx.clearCurrentActorThread()
}
}
diff --git a/akka-actor-typed/src/main/scala/akka/actor/typed/internal/receptionist/LocalReceptionist.scala b/akka-actor-typed/src/main/scala/akka/actor/typed/internal/receptionist/LocalReceptionist.scala
index 45993f0c19..0f1d8fe0a4 100644
--- a/akka-actor-typed/src/main/scala/akka/actor/typed/internal/receptionist/LocalReceptionist.scala
+++ b/akka-actor-typed/src/main/scala/akka/actor/typed/internal/receptionist/LocalReceptionist.scala
@@ -197,12 +197,13 @@ private[akka] object LocalReceptionist extends ReceptionistBehaviorProvider {
case None =>
}
- updateServices(Set(key), { state =>
- val newState = state.serviceInstanceRemoved(key)(serviceInstance)
- if (state.servicesPerActor.getOrElse(serviceInstance, Set.empty).isEmpty)
- ctx.unwatch(serviceInstance)
- newState
- })
+ updateServices(Set(key),
+ { state =>
+ val newState = state.serviceInstanceRemoved(key)(serviceInstance)
+ if (state.servicesPerActor.getOrElse(serviceInstance, Set.empty).isEmpty)
+ ctx.unwatch(serviceInstance)
+ newState
+ })
}
diff --git a/akka-actor-typed/src/main/scala/akka/actor/typed/internal/routing/RoutingLogic.scala b/akka-actor-typed/src/main/scala/akka/actor/typed/internal/routing/RoutingLogic.scala
index 4197cb7db3..ca3bc94d3b 100644
--- a/akka-actor-typed/src/main/scala/akka/actor/typed/internal/routing/RoutingLogic.scala
+++ b/akka-actor-typed/src/main/scala/akka/actor/typed/internal/routing/RoutingLogic.scala
@@ -62,8 +62,8 @@ private[akka] object RoutingLogics {
val firstDiffIndex = {
var idx = 0
while (idx < currentRoutees.length &&
- idx < sortedNewRoutees.length &&
- currentRoutees(idx) == sortedNewRoutees(idx)) {
+ idx < sortedNewRoutees.length &&
+ currentRoutees(idx) == sortedNewRoutees(idx)) {
idx += 1
}
idx
diff --git a/akka-actor-typed/src/main/scala/akka/actor/typed/javadsl/AskPattern.scala b/akka-actor-typed/src/main/scala/akka/actor/typed/javadsl/AskPattern.scala
index b48e3d1428..4010991804 100644
--- a/akka-actor-typed/src/main/scala/akka/actor/typed/javadsl/AskPattern.scala
+++ b/akka-actor-typed/src/main/scala/akka/actor/typed/javadsl/AskPattern.scala
@@ -27,7 +27,6 @@ import akka.util.JavaDurationConverters._
* message that is sent to the target Actor in order to function as a reply-to
* address, therefore the argument to the ask method is not the message itself
* but a function that given the reply-to address will create the message.
- *
*/
object AskPattern {
@@ -40,7 +39,7 @@ object AskPattern {
messageFactory: JFunction[ActorRef[Res], Req],
timeout: Duration,
scheduler: Scheduler): CompletionStage[Res] =
- (actor.ask(messageFactory.apply)(timeout.asScala, scheduler)).toJava
+ actor.ask(messageFactory.apply)(timeout.asScala, scheduler).toJava
/**
* The same as [[ask]] but only for requests that result in a response of type [[akka.pattern.StatusReply]].
@@ -53,6 +52,6 @@ object AskPattern {
messageFactory: JFunction[ActorRef[StatusReply[Res]], Req],
timeout: Duration,
scheduler: Scheduler): CompletionStage[Res] =
- (actor.askWithStatus(messageFactory.apply)(timeout.asScala, scheduler).toJava)
+ actor.askWithStatus(messageFactory.apply)(timeout.asScala, scheduler).toJava
}
diff --git a/akka-actor-typed/src/main/scala/akka/actor/typed/javadsl/Behaviors.scala b/akka-actor-typed/src/main/scala/akka/actor/typed/javadsl/Behaviors.scala
index 43f8377ae5..ada286b3b6 100644
--- a/akka-actor-typed/src/main/scala/akka/actor/typed/javadsl/Behaviors.scala
+++ b/akka-actor-typed/src/main/scala/akka/actor/typed/javadsl/Behaviors.scala
@@ -5,7 +5,7 @@
package akka.actor.typed.javadsl
import java.util.Collections
-import java.util.function.{ Supplier, Function => JFunction }
+import java.util.function.{ Function => JFunction, Supplier }
import scala.reflect.ClassTag
@@ -154,9 +154,10 @@ object Behaviors {
def receive[T](
onMessage: JapiFunction2[ActorContext[T], T, Behavior[T]],
onSignal: JapiFunction2[ActorContext[T], Signal, Behavior[T]]): Behavior[T] = {
- new BehaviorImpl.ReceiveBehavior((ctx, msg) => onMessage.apply(ctx.asJava, msg), {
- case (ctx, sig) => onSignal.apply(ctx.asJava, sig)
- })
+ new BehaviorImpl.ReceiveBehavior((ctx, msg) => onMessage.apply(ctx.asJava, msg),
+ {
+ case (ctx, sig) => onSignal.apply(ctx.asJava, sig)
+ })
}
/**
@@ -327,7 +328,6 @@ object Behaviors {
* each message processing by the inner behavior is done.
* @param behavior The actual behavior handling the messages, the MDC is used for the log entries logged through
* `ActorContext.log`
- *
*/
def withMdc[T](
interceptMessageClass: Class[T],
@@ -344,7 +344,6 @@ object Behaviors {
* @param staticMdc This MDC is setup in the logging context for every message
* @param behavior The actual behavior handling the messages, the MDC is used for the log entries logged through
* `ActorContext.log`
- *
*/
def withMdc[T](
interceptMessageClass: Class[T],
@@ -369,7 +368,6 @@ object Behaviors {
* each message processing by the inner behavior is done.
* @param behavior The actual behavior handling the messages, the MDC is used for the log entries logged through
* `ActorContext.log`
- *
*/
def withMdc[T](
interceptMessageClass: Class[T],
diff --git a/akka-actor-typed/src/main/scala/akka/actor/typed/javadsl/Receive.scala b/akka-actor-typed/src/main/scala/akka/actor/typed/javadsl/Receive.scala
index ba31fa4493..e68ee3dec0 100644
--- a/akka-actor-typed/src/main/scala/akka/actor/typed/javadsl/Receive.scala
+++ b/akka-actor-typed/src/main/scala/akka/actor/typed/javadsl/Receive.scala
@@ -28,7 +28,6 @@ abstract class Receive[T] extends ExtensibleBehavior[T] {
* * returning `stopped` will terminate this Behavior
* * returning `same` designates to reuse the current Behavior
* * returning `unhandled` keeps the same Behavior and signals that the message was not yet handled
- *
*/
@throws(classOf[Exception])
def receiveMessage(msg: T): Behavior[T]
diff --git a/akka-actor-typed/src/main/scala/akka/actor/typed/javadsl/ReceiveBuilder.scala b/akka-actor-typed/src/main/scala/akka/actor/typed/javadsl/ReceiveBuilder.scala
index 103b9633b3..f54d6c6928 100644
--- a/akka-actor-typed/src/main/scala/akka/actor/typed/javadsl/ReceiveBuilder.scala
+++ b/akka-actor-typed/src/main/scala/akka/actor/typed/javadsl/ReceiveBuilder.scala
@@ -77,12 +77,14 @@ final class ReceiveBuilder[T] private (
* @return this behavior builder
*/
def onMessageEquals(msg: T, handler: Creator[Behavior[T]]): ReceiveBuilder[T] =
- withMessage(OptionVal.Some(msg.getClass), OptionVal.Some(new JPredicate[T] {
- override def test(param: T): Boolean = param == (msg)
- }), new JFunction[T, Behavior[T]] {
- // invoke creator without the message
- override def apply(param: T): Behavior[T] = handler.create()
- })
+ withMessage(OptionVal.Some(msg.getClass),
+ OptionVal.Some(new JPredicate[T] {
+ override def test(param: T): Boolean = param == msg
+ }),
+ new JFunction[T, Behavior[T]] {
+ // invoke creator without the message
+ override def apply(param: T): Behavior[T] = handler.create()
+ })
/**
* Add a new case to the message handling matching any message. Subsequent `onMessage` clauses will
@@ -128,11 +130,13 @@ final class ReceiveBuilder[T] private (
* @return this behavior builder
*/
def onSignalEquals(signal: Signal, handler: Creator[Behavior[T]]): ReceiveBuilder[T] =
- withSignal(signal.getClass, OptionVal.Some(new JPredicate[Signal] {
- override def test(param: Signal): Boolean = param == signal
- }), new JFunction[Signal, Behavior[T]] {
- override def apply(param: Signal): Behavior[T] = handler.create()
- })
+ withSignal(signal.getClass,
+ OptionVal.Some(new JPredicate[Signal] {
+ override def test(param: Signal): Boolean = param == signal
+ }),
+ new JFunction[Signal, Behavior[T]] {
+ override def apply(param: Signal): Behavior[T] = handler.create()
+ })
private def withMessage[M <: T](
`type`: OptionVal[Class[M]],
diff --git a/akka-actor-typed/src/main/scala/akka/actor/typed/javadsl/StashBuffer.scala b/akka-actor-typed/src/main/scala/akka/actor/typed/javadsl/StashBuffer.scala
index 6df2c2fe47..6cc5ee722c 100644
--- a/akka-actor-typed/src/main/scala/akka/actor/typed/javadsl/StashBuffer.scala
+++ b/akka-actor-typed/src/main/scala/akka/actor/typed/javadsl/StashBuffer.scala
@@ -8,7 +8,7 @@ import akka.actor.typed.{ scaladsl, Behavior }
import akka.annotation.DoNotInherit
import akka.japi.function.Procedure
-import java.util.function.{ Predicate, Function => JFunction }
+import java.util.function.{ Function => JFunction, Predicate }
/**
* A non thread safe mutable message buffer that can be used to buffer messages inside actors
diff --git a/akka-actor-typed/src/main/scala/akka/actor/typed/scaladsl/AbstractBehavior.scala b/akka-actor-typed/src/main/scala/akka/actor/typed/scaladsl/AbstractBehavior.scala
index a358b0a7c4..ee357720bb 100644
--- a/akka-actor-typed/src/main/scala/akka/actor/typed/scaladsl/AbstractBehavior.scala
+++ b/akka-actor-typed/src/main/scala/akka/actor/typed/scaladsl/AbstractBehavior.scala
@@ -49,7 +49,6 @@ abstract class AbstractBehavior[T](protected val context: ActorContext[T]) exten
* <li>returning `this` or `same` designates to reuse the current Behavior</li>
* <li>returning `unhandled` keeps the same Behavior and signals that the message was not yet handled</li>
* </ul>
- *
*/
@throws(classOf[Exception])
def onMessage(msg: T): Behavior[T]
@@ -87,9 +86,10 @@ abstract class AbstractBehavior[T](protected val context: ActorContext[T]) exten
@throws(classOf[Exception])
override final def receiveSignal(ctx: TypedActorContext[T], msg: Signal): Behavior[T] = {
checkRightContext(ctx)
- onSignal.applyOrElse(msg, {
- case MessageAdaptionFailure(ex) => throw ex
- case _ => Behaviors.unhandled
- }: PartialFunction[Signal, Behavior[T]])
+ onSignal.applyOrElse(msg,
+ {
+ case MessageAdaptionFailure(ex) => throw ex
+ case _ => Behaviors.unhandled
+ }: PartialFunction[Signal, Behavior[T]])
}
}
diff --git a/akka-actor-typed/src/main/scala/akka/actor/typed/scaladsl/Behaviors.scala b/akka-actor-typed/src/main/scala/akka/actor/typed/scaladsl/Behaviors.scala
index c45bceb72f..db1ef0a62b 100644
--- a/akka-actor-typed/src/main/scala/akka/actor/typed/scaladsl/Behaviors.scala
+++ b/akka-actor-typed/src/main/scala/akka/actor/typed/scaladsl/Behaviors.scala
@@ -250,7 +250,6 @@ object Behaviors {
* each message processing by the inner behavior is done.
* @param behavior The actual behavior handling the messages, the MDC is used for the log entries logged through
* `ActorContext.log`
- *
*/
def withMdc[T: ClassTag](mdcForMessage: T => Map[String, String])(behavior: Behavior[T]): Behavior[T] =
withMdc[T](Map.empty[String, String], mdcForMessage)(behavior)
@@ -265,7 +264,6 @@ object Behaviors {
* @param staticMdc This MDC is setup in the logging context for every message
* @param behavior The actual behavior handling the messages, the MDC is used for the log entries logged through
* `ActorContext.log`
- *
*/
def withMdc[T: ClassTag](staticMdc: Map[String, String])(behavior: Behavior[T]): Behavior[T] =
withMdc[T](staticMdc, (_: T) => Map.empty[String, String])(behavior)
@@ -288,7 +286,6 @@ object Behaviors {
* each message processing by the inner behavior is done.
* @param behavior The actual behavior handling the messages, the MDC is used for the log entries logged through
* `ActorContext.log`
- *
*/
def withMdc[T: ClassTag](staticMdc: Map[String, String], mdcForMessage: T => Map[String, String])(
behavior: Behavior[T]): Behavior[T] =
diff --git a/akka-actor-typed/src/main/scala/akka/actor/typed/scaladsl/package.scala b/akka-actor-typed/src/main/scala/akka/actor/typed/scaladsl/package.scala
index 05fafc44f4..2da3ca6193 100644
--- a/akka-actor-typed/src/main/scala/akka/actor/typed/scaladsl/package.scala
+++ b/akka-actor-typed/src/main/scala/akka/actor/typed/scaladsl/package.scala
@@ -21,7 +21,7 @@ package object scaladsl {
* }}}
* or
* {{{
- *import akka.actor.typed.scaladsl._
+ * import akka.actor.typed.scaladsl._
* }}}
*
* @param log the underlying [[org.slf4j.Logger]]
diff --git a/akka-actor/src/main/scala-2.12/akka/util/ByteIterator.scala b/akka-actor/src/main/scala-2.12/akka/util/ByteIterator.scala
index 903ad6cd4d..8ebfb31d1f 100644
--- a/akka-actor/src/main/scala-2.12/akka/util/ByteIterator.scala
+++ b/akka-actor/src/main/scala-2.12/akka/util/ByteIterator.scala
@@ -70,12 +70,12 @@ object ByteIterator {
final override def clone: ByteArrayIterator = new ByteArrayIterator(array, from, until)
final override def take(n: Int): this.type = {
- if (n < len) until = { if (n > 0) (from + n) else from }
+ if (n < len) until = { if (n > 0) from + n else from }
this
}
final override def drop(n: Int): this.type = {
- if (n > 0) from = { if (n < len) (from + n) else until }
+ if (n > 0) from = { if (n < len) from + n else until }
this
}
@@ -153,7 +153,7 @@ object ByteIterator {
def asInputStream: java.io.InputStream = new java.io.InputStream {
override def available: Int = iterator.len
- def read: Int = if (hasNext) (next().toInt & 0xff) else -1
+ def read: Int = if (hasNext) next().toInt & 0xFF else -1
override def read(b: Array[Byte], off: Int, len: Int): Int = {
if ((off < 0) || (len < 0) || (off + len > b.length)) throw new IndexOutOfBoundsException
@@ -372,7 +372,7 @@ object ByteIterator {
def asInputStream: java.io.InputStream = new java.io.InputStream {
override def available: Int = current.len
- def read: Int = if (hasNext) (next().toInt & 0xff) else -1
+ def read: Int = if (hasNext) next().toInt & 0xFF else -1
override def read(b: Array[Byte], off: Int, len: Int): Int = {
val nRead = current.asInputStream.read(b, off, len)
@@ -511,9 +511,9 @@ abstract class ByteIterator extends BufferedIterator[Byte] {
*/
def getShort(implicit byteOrder: ByteOrder): Short = {
if (byteOrder == ByteOrder.BIG_ENDIAN)
- ((next() & 0xff) << 8 | (next() & 0xff) << 0).toShort
+ ((next() & 0xFF) << 8 | (next() & 0xFF) << 0).toShort
else if (byteOrder == ByteOrder.LITTLE_ENDIAN)
- ((next() & 0xff) << 0 | (next() & 0xff) << 8).toShort
+ ((next() & 0xFF) << 0 | (next() & 0xFF) << 8).toShort
else throw new IllegalArgumentException("Unknown byte order " + byteOrder)
}
@@ -522,15 +522,15 @@ abstract class ByteIterator extends BufferedIterator[Byte] {
*/
def getInt(implicit byteOrder: ByteOrder): Int = {
if (byteOrder == ByteOrder.BIG_ENDIAN)
- ((next() & 0xff) << 24
- | (next() & 0xff) << 16
- | (next() & 0xff) << 8
- | (next() & 0xff) << 0)
+ ((next() & 0xFF) << 24
+ | (next() & 0xFF) << 16
+ | (next() & 0xFF) << 8
+ | (next() & 0xFF) << 0)
else if (byteOrder == ByteOrder.LITTLE_ENDIAN)
- ((next() & 0xff) << 0
- | (next() & 0xff) << 8
- | (next() & 0xff) << 16
- | (next() & 0xff) << 24)
+ ((next() & 0xFF) << 0
+ | (next() & 0xFF) << 8
+ | (next() & 0xFF) << 16
+ | (next() & 0xFF) << 24)
else throw new IllegalArgumentException("Unknown byte order " + byteOrder)
}
@@ -539,23 +539,23 @@ abstract class ByteIterator extends BufferedIterator[Byte] {
*/
def getLong(implicit byteOrder: ByteOrder): Long = {
if (byteOrder == ByteOrder.BIG_ENDIAN)
- ((next().toLong & 0xff) << 56
- | (next().toLong & 0xff) << 48
- | (next().toLong & 0xff) << 40
- | (next().toLong & 0xff) << 32
- | (next().toLong & 0xff) << 24
- | (next().toLong & 0xff) << 16
- | (next().toLong & 0xff) << 8
- | (next().toLong & 0xff) << 0)
+ ((next().toLong & 0xFF) << 56
+ | (next().toLong & 0xFF) << 48
+ | (next().toLong & 0xFF) << 40
+ | (next().toLong & 0xFF) << 32
+ | (next().toLong & 0xFF) << 24
+ | (next().toLong & 0xFF) << 16
+ | (next().toLong & 0xFF) << 8
+ | (next().toLong & 0xFF) << 0)
else if (byteOrder == ByteOrder.LITTLE_ENDIAN)
- ((next().toLong & 0xff) << 0
- | (next().toLong & 0xff) << 8
- | (next().toLong & 0xff) << 16
- | (next().toLong & 0xff) << 24
- | (next().toLong & 0xff) << 32
- | (next().toLong & 0xff) << 40
- | (next().toLong & 0xff) << 48
- | (next().toLong & 0xff) << 56)
+ ((next().toLong & 0xFF) << 0
+ | (next().toLong & 0xFF) << 8
+ | (next().toLong & 0xFF) << 16
+ | (next().toLong & 0xFF) << 24
+ | (next().toLong & 0xFF) << 32
+ | (next().toLong & 0xFF) << 40
+ | (next().toLong & 0xFF) << 48
+ | (next().toLong & 0xFF) << 56)
else throw new IllegalArgumentException("Unknown byte order " + byteOrder)
}
@@ -566,11 +566,11 @@ abstract class ByteIterator extends BufferedIterator[Byte] {
def getLongPart(n: Int)(implicit byteOrder: ByteOrder): Long = {
if (byteOrder == ByteOrder.BIG_ENDIAN) {
var x = 0L
- (1 to n).foreach(_ => x = (x << 8) | (next() & 0xff))
+ (1 to n).foreach(_ => x = (x << 8) | (next() & 0xFF))
x
} else if (byteOrder == ByteOrder.LITTLE_ENDIAN) {
var x = 0L
- (0 until n).foreach(i => x |= (next() & 0xff) << 8 * i)
+ (0 until n).foreach(i => x |= (next() & 0xFF) << 8 * i)
x
} else throw new IllegalArgumentException("Unknown byte order " + byteOrder)
}
diff --git a/akka-actor/src/main/scala-2.12/akka/util/ByteString.scala b/akka-actor/src/main/scala-2.12/akka/util/ByteString.scala
index ba4cdc9c22..b11e3046c6 100644
--- a/akka-actor/src/main/scala-2.12/akka/util/ByteString.scala
+++ b/akka-actor/src/main/scala-2.12/akka/util/ByteString.scala
@@ -75,7 +75,6 @@ object ByteString {
* want wrap it into an ByteArray, and from there on only use that reference (the ByteString)
* to operate on the wrapped data. For all other intents and purposes, please use the usual
* apply and create methods - which provide the immutability guarantees by copying the array.
- *
*/
def fromArrayUnsafe(array: Array[Byte]): ByteString = ByteString1C(array)
@@ -100,7 +99,6 @@ object ByteString {
* want wrap it into an ByteArray, and from there on only use that reference (the ByteString)
* to operate on the wrapped data. For all other intents and purposes, please use the usual
* apply and create methods - which provide the immutability guarantees by copying the array.
- *
*/
def fromArrayUnsafe(array: Array[Byte], offset: Int, length: Int): ByteString = ByteString1(array, offset, length)
@@ -304,7 +302,7 @@ object ByteString {
os.write(bytes, startIndex, length)
}
- def isCompact: Boolean = (length == bytes.length)
+ def isCompact: Boolean = length == bytes.length
private[akka] def byteStringCompanion = ByteString1
diff --git a/akka-actor/src/main/scala-2.12/akka/util/ccompat/package.scala b/akka-actor/src/main/scala-2.12/akka/util/ccompat/package.scala
index c2c9172615..3af8da6ae3 100644
--- a/akka-actor/src/main/scala-2.12/akka/util/ccompat/package.scala
+++ b/akka-actor/src/main/scala-2.12/akka/util/ccompat/package.scala
@@ -5,7 +5,7 @@
package akka.util
import scala.{ collection => c }
-import scala.collection.{ GenTraversable, immutable => i, mutable => m }
+import scala.collection.{ immutable => i, mutable => m, GenTraversable }
import scala.collection.generic.{ CanBuildFrom, GenericCompanion, Sorted, SortedSetFactory }
import scala.language.higherKinds
import scala.language.implicitConversions
@@ -49,8 +49,8 @@ package object ccompat {
simpleCBF(fact.newBuilder[A])
private[akka] implicit def sortedSetCompanionToCBF[
- A: Ordering,
- CC[X] <: c.SortedSet[X] with c.SortedSetLike[X, CC[X]]](fact: SortedSetFactory[CC]): CanBuildFrom[Any, A, CC[A]] =
+ A: Ordering, CC[X] <: c.SortedSet[X] with c.SortedSetLike[X, CC[X]]](
+ fact: SortedSetFactory[CC]): CanBuildFrom[Any, A, CC[A]] =
simpleCBF(fact.newBuilder[A])
private[ccompat] def build[T, CC](builder: m.Builder[T, CC], source: TraversableOnce[T]): CC = {
diff --git a/akka-actor/src/main/scala-2.13/akka/util/ByteIterator.scala b/akka-actor/src/main/scala-2.13/akka/util/ByteIterator.scala
index 88780bd50d..39ef608cdb 100644
--- a/akka-actor/src/main/scala-2.13/akka/util/ByteIterator.scala
+++ b/akka-actor/src/main/scala-2.13/akka/util/ByteIterator.scala
@@ -72,12 +72,12 @@ object ByteIterator {
final override def clone: ByteArrayIterator = new ByteArrayIterator(array, from, until)
final override def take(n: Int): this.type = {
- if (n < len) until = { if (n > 0) (from + n) else from }
+ if (n < len) until = { if (n > 0) from + n else from }
this
}
final override def drop(n: Int): this.type = {
- if (n > 0) from = { if (n < len) (from + n) else until }
+ if (n > 0) from = { if (n < len) from + n else until }
this
}
@@ -165,7 +165,7 @@ object ByteIterator {
def asInputStream: java.io.InputStream = new java.io.InputStream {
override def available: Int = iterator.len
- def read: Int = if (hasNext) (next().toInt & 0xff) else -1
+ def read: Int = if (hasNext) next().toInt & 0xFF else -1
override def read(b: Array[Byte], off: Int, len: Int): Int = {
if ((off < 0) || (len < 0) || (off + len > b.length)) throw new IndexOutOfBoundsException
@@ -386,7 +386,7 @@ object ByteIterator {
def asInputStream: java.io.InputStream = new java.io.InputStream {
override def available: Int = current.len
- def read: Int = if (hasNext) (next().toInt & 0xff) else -1
+ def read: Int = if (hasNext) next().toInt & 0xFF else -1
override def read(b: Array[Byte], off: Int, len: Int): Int = {
val nRead = current.asInputStream.read(b, off, len)
@@ -527,9 +527,9 @@ abstract class ByteIterator extends BufferedIterator[Byte] {
*/
def getShort(implicit byteOrder: ByteOrder): Short = {
if (byteOrder == ByteOrder.BIG_ENDIAN)
- ((next() & 0xff) << 8 | (next() & 0xff) << 0).toShort
+ ((next() & 0xFF) << 8 | (next() & 0xFF) << 0).toShort
else if (byteOrder == ByteOrder.LITTLE_ENDIAN)
- ((next() & 0xff) << 0 | (next() & 0xff) << 8).toShort
+ ((next() & 0xFF) << 0 | (next() & 0xFF) << 8).toShort
else throw new IllegalArgumentException("Unknown byte order " + byteOrder)
}
@@ -538,15 +538,15 @@ abstract class ByteIterator extends BufferedIterator[Byte] {
*/
def getInt(implicit byteOrder: ByteOrder): Int = {
if (byteOrder == ByteOrder.BIG_ENDIAN)
- ((next() & 0xff) << 24
- | (next() & 0xff) << 16
- | (next() & 0xff) << 8
- | (next() & 0xff) << 0)
+ ((next() & 0xFF) << 24
+ | (next() & 0xFF) << 16
+ | (next() & 0xFF) << 8
+ | (next() & 0xFF) << 0)
else if (byteOrder == ByteOrder.LITTLE_ENDIAN)
- ((next() & 0xff) << 0
- | (next() & 0xff) << 8
- | (next() & 0xff) << 16
- | (next() & 0xff) << 24)
+ ((next() & 0xFF) << 0
+ | (next() & 0xFF) << 8
+ | (next() & 0xFF) << 16
+ | (next() & 0xFF) << 24)
else throw new IllegalArgumentException("Unknown byte order " + byteOrder)
}
@@ -555,23 +555,23 @@ abstract class ByteIterator extends BufferedIterator[Byte] {
*/
def getLong(implicit byteOrder: ByteOrder): Long = {
if (byteOrder == ByteOrder.BIG_ENDIAN)
- ((next().toLong & 0xff) << 56
- | (next().toLong & 0xff) << 48
- | (next().toLong & 0xff) << 40
- | (next().toLong & 0xff) << 32
- | (next().toLong & 0xff) << 24
- | (next().toLong & 0xff) << 16
- | (next().toLong & 0xff) << 8
- | (next().toLong & 0xff) << 0)
+ ((next().toLong & 0xFF) << 56
+ | (next().toLong & 0xFF) << 48
+ | (next().toLong & 0xFF) << 40
+ | (next().toLong & 0xFF) << 32
+ | (next().toLong & 0xFF) << 24
+ | (next().toLong & 0xFF) << 16
+ | (next().toLong & 0xFF) << 8
+ | (next().toLong & 0xFF) << 0)
else if (byteOrder == ByteOrder.LITTLE_ENDIAN)
- ((next().toLong & 0xff) << 0
- | (next().toLong & 0xff) << 8
- | (next().toLong & 0xff) << 16
- | (next().toLong & 0xff) << 24
- | (next().toLong & 0xff) << 32
- | (next().toLong & 0xff) << 40
- | (next().toLong & 0xff) << 48
- | (next().toLong & 0xff) << 56)
+ ((next().toLong & 0xFF) << 0
+ | (next().toLong & 0xFF) << 8
+ | (next().toLong & 0xFF) << 16
+ | (next().toLong & 0xFF) << 24
+ | (next().toLong & 0xFF) << 32
+ | (next().toLong & 0xFF) << 40
+ | (next().toLong & 0xFF) << 48
+ | (next().toLong & 0xFF) << 56)
else throw new IllegalArgumentException("Unknown byte order " + byteOrder)
}
@@ -582,11 +582,11 @@ abstract class ByteIterator extends BufferedIterator[Byte] {
def getLongPart(n: Int)(implicit byteOrder: ByteOrder): Long = {
if (byteOrder == ByteOrder.BIG_ENDIAN) {
var x = 0L
- (1 to n).foreach(_ => x = (x << 8) | (next() & 0xff))
+ (1 to n).foreach(_ => x = (x << 8) | (next() & 0xFF))
x
} else if (byteOrder == ByteOrder.LITTLE_ENDIAN) {
var x = 0L
- (0 until n).foreach(i => x |= (next() & 0xff) << 8 * i)
+ (0 until n).foreach(i => x |= (next() & 0xFF) << 8 * i)
x
} else throw new IllegalArgumentException("Unknown byte order " + byteOrder)
}
diff --git a/akka-actor/src/main/scala-2.13/akka/util/ByteString.scala b/akka-actor/src/main/scala-2.13/akka/util/ByteString.scala
index e009f3153b..182fa91e06 100644
--- a/akka-actor/src/main/scala-2.13/akka/util/ByteString.scala
+++ b/akka-actor/src/main/scala-2.13/akka/util/ByteString.scala
@@ -78,7 +78,6 @@ object ByteString {
* want wrap it into an ByteArray, and from there on only use that reference (the ByteString)
* to operate on the wrapped data. For all other intents and purposes, please use the usual
* apply and create methods - which provide the immutability guarantees by copying the array.
- *
*/
def fromArrayUnsafe(array: Array[Byte]): ByteString = ByteString1C(array)
@@ -103,7 +102,6 @@ object ByteString {
* want wrap it into an ByteArray, and from there on only use that reference (the ByteString)
* to operate on the wrapped data. For all other intents and purposes, please use the usual
* apply and create methods - which provide the immutability guarantees by copying the array.
- *
*/
def fromArrayUnsafe(array: Array[Byte], offset: Int, length: Int): ByteString = ByteString1(array, offset, length)
@@ -313,7 +311,7 @@ object ByteString {
os.write(bytes, startIndex, length)
}
- def isCompact: Boolean = (length == bytes.length)
+ def isCompact: Boolean = length == bytes.length
private[akka] def byteStringCompanion = ByteString1
diff --git a/akka-actor/src/main/scala-3/akka/util/ByteIterator.scala b/akka-actor/src/main/scala-3/akka/util/ByteIterator.scala
index d7d7b29205..6345477f91 100644
--- a/akka-actor/src/main/scala-3/akka/util/ByteIterator.scala
+++ b/akka-actor/src/main/scala-3/akka/util/ByteIterator.scala
@@ -71,12 +71,12 @@ object ByteIterator {
final override def clone: ByteArrayIterator = new ByteArrayIterator(array, from, until)
final override def take(n: Int): this.type = {
- if (n < len) until = { if (n > 0) (from + n) else from }
+ if (n < len) until = { if (n > 0) from + n else from }
this
}
final override def drop(n: Int): this.type = {
- if (n > 0) from = { if (n < len) (from + n) else until }
+ if (n > 0) from = { if (n < len) from + n else until }
this
}
@@ -162,7 +162,7 @@ object ByteIterator {
def asInputStream: java.io.InputStream = new java.io.InputStream {
override def available: Int = iterator.len
- def read: Int = if (hasNext) (next().toInt & 0xff) else -1
+ def read: Int = if (hasNext) next().toInt & 0xFF else -1
override def read(b: Array[Byte], off: Int, len: Int): Int = {
if ((off < 0) || (len < 0) || (off + len > b.length)) throw new IndexOutOfBoundsException
@@ -382,7 +382,7 @@ object ByteIterator {
def asInputStream: java.io.InputStream = new java.io.InputStream {
override def available: Int = current.len
- def read: Int = if (hasNext) (next().toInt & 0xff) else -1
+ def read: Int = if (hasNext) next().toInt & 0xFF else -1
override def read(b: Array[Byte], off: Int, len: Int): Int = {
val nRead = current.asInputStream.read(b, off, len)
@@ -523,9 +523,9 @@ abstract class ByteIterator extends BufferedIterator[Byte] {
*/
def getShort(implicit byteOrder: ByteOrder): Short = {
if (byteOrder == ByteOrder.BIG_ENDIAN)
- ((next() & 0xff) << 8 | (next() & 0xff) << 0).toShort
+ ((next() & 0xFF) << 8 | (next() & 0xFF) << 0).toShort
else if (byteOrder == ByteOrder.LITTLE_ENDIAN)
- ((next() & 0xff) << 0 | (next() & 0xff) << 8).toShort
+ ((next() & 0xFF) << 0 | (next() & 0xFF) << 8).toShort
else throw new IllegalArgumentException("Unknown byte order " + byteOrder)
}
@@ -534,15 +534,15 @@ abstract class ByteIterator extends BufferedIterator[Byte] {
*/
def getInt(implicit byteOrder: ByteOrder): Int = {
if (byteOrder == ByteOrder.BIG_ENDIAN)
- ((next() & 0xff) << 24
- | (next() & 0xff) << 16
- | (next() & 0xff) << 8
- | (next() & 0xff) << 0)
+ ((next() & 0xFF) << 24
+ | (next() & 0xFF) << 16
+ | (next() & 0xFF) << 8
+ | (next() & 0xFF) << 0)
else if (byteOrder == ByteOrder.LITTLE_ENDIAN)
- ((next() & 0xff) << 0
- | (next() & 0xff) << 8
- | (next() & 0xff) << 16
- | (next() & 0xff) << 24)
+ ((next() & 0xFF) << 0
+ | (next() & 0xFF) << 8
+ | (next() & 0xFF) << 16
+ | (next() & 0xFF) << 24)
else throw new IllegalArgumentException("Unknown byte order " + byteOrder)
}
@@ -551,23 +551,23 @@ abstract class ByteIterator extends BufferedIterator[Byte] {
*/
def getLong(implicit byteOrder: ByteOrder): Long = {
if (byteOrder == ByteOrder.BIG_ENDIAN)
- ((next().toLong & 0xff) << 56
- | (next().toLong & 0xff) << 48
- | (next().toLong & 0xff) << 40
- | (next().toLong & 0xff) << 32
- | (next().toLong & 0xff) << 24
- | (next().toLong & 0xff) << 16
- | (next().toLong & 0xff) << 8
- | (next().toLong & 0xff) << 0)
+ ((next().toLong & 0xFF) << 56
+ | (next().toLong & 0xFF) << 48
+ | (next().toLong & 0xFF) << 40
+ | (next().toLong & 0xFF) << 32
+ | (next().toLong & 0xFF) << 24
+ | (next().toLong & 0xFF) << 16
+ | (next().toLong & 0xFF) << 8
+ | (next().toLong & 0xFF) << 0)
else if (byteOrder == ByteOrder.LITTLE_ENDIAN)
- ((next().toLong & 0xff) << 0
- | (next().toLong & 0xff) << 8
- | (next().toLong & 0xff) << 16
- | (next().toLong & 0xff) << 24
- | (next().toLong & 0xff) << 32
- | (next().toLong & 0xff) << 40
- | (next().toLong & 0xff) << 48
- | (next().toLong & 0xff) << 56)
+ ((next().toLong & 0xFF) << 0
+ | (next().toLong & 0xFF) << 8
+ | (next().toLong & 0xFF) << 16
+ | (next().toLong & 0xFF) << 24
+ | (next().toLong & 0xFF) << 32
+ | (next().toLong & 0xFF) << 40
+ | (next().toLong & 0xFF) << 48
+ | (next().toLong & 0xFF) << 56)
else throw new IllegalArgumentException("Unknown byte order " + byteOrder)
}
@@ -578,11 +578,11 @@ abstract class ByteIterator extends BufferedIterator[Byte] {
def getLongPart(n: Int)(implicit byteOrder: ByteOrder): Long = {
if (byteOrder == ByteOrder.BIG_ENDIAN) {
var x = 0L
- (1 to n).foreach(_ => x = (x << 8) | (next() & 0xff))
+ (1 to n).foreach(_ => x = (x << 8) | (next() & 0xFF))
x
} else if (byteOrder == ByteOrder.LITTLE_ENDIAN) {
var x = 0L
- (0 until n).foreach(i => x |= (next() & 0xff) << 8 * i)
+ (0 until n).foreach(i => x |= (next() & 0xFF) << 8 * i)
x
} else throw new IllegalArgumentException("Unknown byte order " + byteOrder)
}
diff --git a/akka-actor/src/main/scala-3/akka/util/ByteString.scala b/akka-actor/src/main/scala-3/akka/util/ByteString.scala
index a5744dd5e8..4ae11d7ec6 100644
--- a/akka-actor/src/main/scala-3/akka/util/ByteString.scala
+++ b/akka-actor/src/main/scala-3/akka/util/ByteString.scala
@@ -80,7 +80,6 @@ object ByteString {
* want wrap it into an ByteArray, and from there on only use that reference (the ByteString)
* to operate on the wrapped data. For all other intents and purposes, please use the usual
* apply and create methods - which provide the immutability guarantees by copying the array.
- *
*/
def fromArrayUnsafe(array: Array[Byte]): ByteString = ByteString1C(array)
@@ -105,7 +104,6 @@ object ByteString {
* want wrap it into an ByteArray, and from there on only use that reference (the ByteString)
* to operate on the wrapped data. For all other intents and purposes, please use the usual
* apply and create methods - which provide the immutability guarantees by copying the array.
- *
*/
def fromArrayUnsafe(array: Array[Byte], offset: Int, length: Int): ByteString = ByteString1(array, offset, length)
@@ -314,7 +312,7 @@ object ByteString {
os.write(bytes, startIndex, length)
}
- def isCompact: Boolean = (length == bytes.length)
+ def isCompact: Boolean = length == bytes.length
private[akka] def byteStringCompanion = ByteString1
diff --git a/akka-actor/src/main/scala/akka/AkkaVersion.scala b/akka-actor/src/main/scala/akka/AkkaVersion.scala
index 2aabdfef74..461b94d8ea 100644
--- a/akka-actor/src/main/scala/akka/AkkaVersion.scala
+++ b/akka-actor/src/main/scala/akka/AkkaVersion.scala
@@ -40,8 +40,8 @@ object AkkaVersion {
if (mOrRc ne null) currentPatchStr.toInt - 1
else currentPatchStr.toInt
if (requiredMajorStr.toInt != currentMajorStr.toInt ||
- requiredMinorStr.toInt > currentMinorStr.toInt ||
- (requiredMinorStr == currentMinorStr && requiredPatchStr.toInt > currentPatch))
+ requiredMinorStr.toInt > currentMinorStr.toInt ||
+ (requiredMinorStr == currentMinorStr && requiredPatchStr.toInt > currentPatch))
throw new UnsupportedAkkaVersion(
s"Current version of Akka is [$currentVersion], but $libraryName requires version [$requiredVersion]")
case _ => // SNAPSHOT or unknown - you're on your own
diff --git a/akka-actor/src/main/scala/akka/actor/AbstractActor.scala b/akka-actor/src/main/scala/akka/actor/AbstractActor.scala
index f1bcb74862..0855a63bfd 100644
--- a/akka-actor/src/main/scala/akka/actor/AbstractActor.scala
+++ b/akka-actor/src/main/scala/akka/actor/AbstractActor.scala
@@ -215,7 +215,6 @@ object AbstractActor {
* }
* }
* </pre>
- *
*/
abstract class AbstractActor extends Actor {
@@ -352,7 +351,6 @@ abstract class UntypedAbstractActor extends AbstractActor {
* Java API: compatible with lambda expressions
*
* Actor base class that mixes in logging into the Actor.
- *
*/
abstract class AbstractLoggingActor extends AbstractActor with ActorLogging
@@ -398,7 +396,6 @@ abstract class AbstractLoggingActor extends AbstractActor with ActorLogging
* For a `Stash` based actor that enforces unbounded deques see [[akka.actor.AbstractActorWithUnboundedStash]].
* There is also an unrestricted version [[akka.actor.AbstractActorWithUnrestrictedStash]] that does not
* enforce the mailbox type.
- *
*/
abstract class AbstractActorWithStash extends AbstractActor with Stash
@@ -408,7 +405,6 @@ abstract class AbstractActorWithStash extends AbstractActor with Stash
* Actor base class with `Stash` that enforces an unbounded deque for the actor. The proper mailbox has to be configured
* manually, and the mailbox should extend the [[akka.dispatch.DequeBasedMessageQueueSemantics]] marker trait.
* See [[akka.actor.AbstractActorWithStash]] for details on how `Stash` works.
- *
*/
abstract class AbstractActorWithUnboundedStash extends AbstractActor with UnboundedStash
@@ -417,6 +413,5 @@ abstract class AbstractActorWithUnboundedStash extends AbstractActor with Unboun
*
* Actor base class with `Stash` that does not enforce any mailbox type. The mailbox of the actor has to be configured
* manually. See [[akka.actor.AbstractActorWithStash]] for details on how `Stash` works.
- *
*/
abstract class AbstractActorWithUnrestrictedStash extends AbstractActor with UnrestrictedStash
diff --git a/akka-actor/src/main/scala/akka/actor/AbstractFSM.scala b/akka-actor/src/main/scala/akka/actor/AbstractFSM.scala
index 6b560e6269..48c667a4d2 100644
--- a/akka-actor/src/main/scala/akka/actor/AbstractFSM.scala
+++ b/akka-actor/src/main/scala/akka/actor/AbstractFSM.scala
@@ -10,7 +10,6 @@ import akka.util.JavaDurationConverters._
/**
* Java API: compatible with lambda expressions
- *
*/
object AbstractFSM {
@@ -29,7 +28,6 @@ object AbstractFSM {
* Java API: compatible with lambda expressions
*
* Finite State Machine actor abstract base class.
- *
*/
abstract class AbstractFSM[S, D] extends FSM[S, D] {
import java.util.{ List => JList }
@@ -553,7 +551,6 @@ abstract class AbstractFSM[S, D] extends FSM[S, D] {
* Java API: compatible with lambda expressions
*
* Finite State Machine actor abstract base class.
- *
*/
abstract class AbstractLoggingFSM[S, D] extends AbstractFSM[S, D] with LoggingFSM[S, D]
@@ -561,6 +558,5 @@ abstract class AbstractLoggingFSM[S, D] extends AbstractFSM[S, D] with LoggingFS
* Java API: compatible with lambda expressions
*
* Finite State Machine actor abstract base class with Stash support.
- *
*/
abstract class AbstractFSMWithStash[S, D] extends AbstractFSM[S, D] with Stash
diff --git a/akka-actor/src/main/scala/akka/actor/AbstractProps.scala b/akka-actor/src/main/scala/akka/actor/AbstractProps.scala
index 04a84d1783..278495223f 100644
--- a/akka-actor/src/main/scala/akka/actor/AbstractProps.scala
+++ b/akka-actor/src/main/scala/akka/actor/AbstractProps.scala
@@ -14,7 +14,6 @@ import akka.japi.Creator
import akka.util.Reflect
/**
- *
* Java API: Factory for Props instances.
*/
private[akka] trait AbstractProps {
@@ -26,7 +25,7 @@ private[akka] trait AbstractProps {
if (Modifier.isAbstract(clazz.getModifiers)) {
throw new IllegalArgumentException(s"Actor class [${clazz.getName}] must not be abstract")
} else if (!classOf[Actor].isAssignableFrom(clazz) &&
- !classOf[IndirectActorProducer].isAssignableFrom(clazz)) {
+ !classOf[IndirectActorProducer].isAssignableFrom(clazz)) {
throw new IllegalArgumentException(
s"Actor class [${clazz.getName}] must be subClass of akka.actor.Actor or akka.actor.IndirectActorProducer.")
}
diff --git a/akka-actor/src/main/scala/akka/actor/Actor.scala b/akka-actor/src/main/scala/akka/actor/Actor.scala
index 7f5ebb3215..49d5e5d809 100644
--- a/akka-actor/src/main/scala/akka/actor/Actor.scala
+++ b/akka-actor/src/main/scala/akka/actor/Actor.scala
@@ -376,10 +376,10 @@ object Actor {
/**
* Type alias representing a Receive-expression for Akka Actors.
*/
- //#receive
+ // #receive
type Receive = PartialFunction[Any, Unit]
- //#receive
+ // #receive
/**
* emptyBehavior is a Receive-expression that matches no messages at all, ever.
@@ -503,7 +503,7 @@ trait Actor {
* self ! message
* </pre>
*/
- implicit final val self: ActorRef = context.self //MUST BE A VAL, TRUST ME
+ implicit final val self: ActorRef = context.self // MUST BE A VAL, TRUST ME
/**
* The reference sender Actor of the last received message.
@@ -519,9 +519,9 @@ trait Actor {
* Scala API: This defines the initial actor behavior, it must return a partial function
* with the actor logic.
*/
- //#receive
+ // #receive
def receive: Actor.Receive
- //#receive
+ // #receive
/**
* INTERNAL API.
@@ -585,10 +585,10 @@ trait Actor {
* Empty default implementation.
*/
@throws(classOf[Exception]) // when changing this you MUST also change ActorDocTest
- //#lifecycle-hooks
+ // #lifecycle-hooks
def preStart(): Unit = ()
- //#lifecycle-hooks
+ // #lifecycle-hooks
/**
* User overridable callback.
@@ -597,10 +597,10 @@ trait Actor {
* Empty default implementation.
*/
@throws(classOf[Exception]) // when changing this you MUST also change ActorDocTest
- //#lifecycle-hooks
+ // #lifecycle-hooks
def postStop(): Unit = ()
- //#lifecycle-hooks
+ // #lifecycle-hooks
/**
* Scala API: User overridable callback: '''By default it disposes of all children and then calls `postStop()`.'''
@@ -611,7 +611,7 @@ trait Actor {
* up of resources before Actor is terminated.
*/
@throws(classOf[Exception]) // when changing this you MUST also change ActorDocTest
- //#lifecycle-hooks
+ // #lifecycle-hooks
def preRestart(@unused reason: Throwable, @unused message: Option[Any]): Unit = {
context.children.foreach { child =>
context.unwatch(child)
@@ -620,7 +620,7 @@ trait Actor {
postStop()
}
- //#lifecycle-hooks
+ // #lifecycle-hooks
/**
* User overridable callback: By default it calls `preStart()`.
@@ -629,11 +629,11 @@ trait Actor {
* Is called right AFTER restart on the newly created Actor to allow reinitialization after an Actor crash.
*/
@throws(classOf[Exception]) // when changing this you MUST also change ActorDocTest
- //#lifecycle-hooks
+ // #lifecycle-hooks
def postRestart(@unused reason: Throwable): Unit = {
preStart()
}
- //#lifecycle-hooks
+ // #lifecycle-hooks
/**
* User overridable callback.
diff --git a/akka-actor/src/main/scala/akka/actor/ActorCell.scala b/akka-actor/src/main/scala/akka/actor/ActorCell.scala
index eabd5e1e9f..de0ca9c047 100644
--- a/akka-actor/src/main/scala/akka/actor/ActorCell.scala
+++ b/akka-actor/src/main/scala/akka/actor/ActorCell.scala
@@ -467,7 +467,7 @@ private[akka] class ActorCell(
/*
* MESSAGE PROCESSING
*/
- //Memory consistency is handled by the Mailbox (reading mailbox status then processing messages, then writing mailbox status
+ // Memory consistency is handled by the Mailbox (reading mailbox status then processing messages, then writing mailbox status
final def systemInvoke(message: SystemMessage): Unit = {
/*
* When recreate/suspend/resume are received while restarting (i.e. between
@@ -521,8 +521,8 @@ private[akka] class ActorCell(
case NoMessage => // only here to suppress warning
}
} catch handleNonFatalOrInterruptedException { e =>
- handleInvokeFailure(Nil, e)
- }
+ handleInvokeFailure(Nil, e)
+ }
val newState = calculateState
// As each state accepts a strict subset of another state, it is enough to unstash if we "walk up" the state
// chain
@@ -535,7 +535,7 @@ private[akka] class ActorCell(
invokeAll(new EarliestFirstSystemMessageList(message), calculateState)
}
- //Memory consistency is handled by the Mailbox (reading mailbox status then processing messages, then writing mailbox status
+ // Memory consistency is handled by the Mailbox (reading mailbox status then processing messages, then writing mailbox status
final def invoke(messageHandle: Envelope): Unit = {
val msg = messageHandle.message
val timeoutBeforeReceive = cancelReceiveTimeoutIfNeeded(msg)
@@ -548,10 +548,11 @@ private[akka] class ActorCell(
}
currentMessage = null // reset current message after successful invocation
} catch handleNonFatalOrInterruptedException { e =>
- handleInvokeFailure(Nil, e)
- } finally
- // Schedule or reschedule receive timeout
- checkReceiveTimeoutIfNeeded(msg, timeoutBeforeReceive)
+ handleInvokeFailure(Nil, e)
+ }
+ finally
+ // Schedule or reschedule receive timeout
+ checkReceiveTimeoutIfNeeded(msg, timeoutBeforeReceive)
}
def autoReceiveMessage(msg: Envelope): Unit = {
@@ -607,7 +608,7 @@ private[akka] class ActorCell(
* ACTOR INSTANCE HANDLING
*/
- //This method is in charge of setting up the contextStack and create a new instance of the Actor
+ // This method is in charge of setting up the contextStack and create a new instance of the Actor
protected def newActor(): Actor = {
contextStack.set(this :: contextStack.get)
try {
diff --git a/akka-actor/src/main/scala/akka/actor/ActorPath.scala b/akka-actor/src/main/scala/akka/actor/ActorPath.scala
index cb9b488ce2..49a2b5ebea 100644
--- a/akka-actor/src/main/scala/akka/actor/ActorPath.scala
+++ b/akka-actor/src/main/scala/akka/actor/ActorPath.scala
@@ -89,17 +89,18 @@ object ActorPath {
// If the number of cases increase remember to add a `@switch` annotation e.g.:
// (findInvalidPathElementCharPosition(element): @switch) match {
- (findInvalidPathElementCharPosition(element)) match {
+ findInvalidPathElementCharPosition(element) match {
case ValidPathCode =>
// valid
case EmptyPathCode =>
throw InvalidActorNameException(s"Actor path element must not be empty $fullPathMsg")
case invalidAt =>
- throw InvalidActorNameException(s"""Invalid actor path element [$element]$fullPathMsg, illegal character [${element(
- invalidAt)}] at position: $invalidAt. """ +
- """Actor paths MUST: """ +
- """not start with `$`, """ +
- s"""include only ASCII letters and can only contain these special characters: ${ActorPath.ValidSymbols}.""")
+ throw InvalidActorNameException(
+ s"""Invalid actor path element [$element]$fullPathMsg, illegal character [${element(
+ invalidAt)}] at position: $invalidAt. """ +
+ """Actor paths MUST: """ +
+ """not start with `$`, """ +
+ s"""include only ASCII letters and can only contain these special characters: ${ActorPath.ValidSymbols}.""")
}
}
@@ -130,7 +131,8 @@ object ActorPath {
case '%' if pos + 2 < len && isHexChar(s.charAt(pos + 1)) && isHexChar(s.charAt(pos + 2)) =>
validate(pos + 3)
case _ => pos
- } else ValidPathCode
+ }
+ else ValidPathCode
if (len > 0 && s.charAt(0) != '$') validate(0) else 0
}
diff --git a/akka-actor/src/main/scala/akka/actor/ActorRef.scala b/akka-actor/src/main/scala/akka/actor/ActorRef.scala
index ad479f40f4..6e7b49526d 100644
--- a/akka-actor/src/main/scala/akka/actor/ActorRef.scala
+++ b/akka-actor/src/main/scala/akka/actor/ActorRef.scala
@@ -643,7 +643,7 @@ trait WrappedMessage {
private[akka] object DeadLetterActorRef {
@SerialVersionUID(1L)
- class SerializedDeadLetterActorRef extends Serializable { //TODO implement as Protobuf for performance?
+ class SerializedDeadLetterActorRef extends Serializable { // TODO implement as Protobuf for performance?
@throws(classOf[java.io.ObjectStreamException])
private def readResolve(): AnyRef = JavaSerializer.currentSystem.value.deadLetters
}
@@ -895,7 +895,7 @@ private[akka] class VirtualPathContainer(
case u: Unwatch => remWatcher(u.watchee, u.watcher)
case DeathWatchNotification(actorRef, _, _) =>
this.!(Terminated(actorRef)(existenceConfirmed = true, addressTerminated = false))(actorRef)
- case _ => //ignore all other messages
+ case _ => // ignore all other messages
}
}
@@ -912,7 +912,7 @@ private[akka] class VirtualPathContainer(
@InternalApi
override private[akka] def isTerminated: Boolean = _watchedBy.isEmpty
- //noinspection EmptyCheck
+ // noinspection EmptyCheck
protected def sendTerminated(): Unit = {
def unwatchWatched(watched: ActorRef): Unit =
watched.asInstanceOf[InternalActorRef].sendSystemMessage(Unwatch(watched, this))
diff --git a/akka-actor/src/main/scala/akka/actor/ActorRefProvider.scala b/akka-actor/src/main/scala/akka/actor/ActorRefProvider.scala
index 46b047a90a..1b4141ab75 100644
--- a/akka-actor/src/main/scala/akka/actor/ActorRefProvider.scala
+++ b/akka-actor/src/main/scala/akka/actor/ActorRefProvider.scala
@@ -446,7 +446,7 @@ private[akka] class LocalActorRefProvider private[akka] (
override def stop(): Unit = {
causeOfTermination.trySuccess(
- Terminated(provider.rootGuardian)(existenceConfirmed = true, addressTerminated = true)) //Idempotent
+ Terminated(provider.rootGuardian)(existenceConfirmed = true, addressTerminated = true)) // Idempotent
terminationPromise.completeWith(causeOfTermination.future) // Signal termination downstream, idempotent
}
diff --git a/akka-actor/src/main/scala/akka/actor/ActorSelection.scala b/akka-actor/src/main/scala/akka/actor/ActorSelection.scala
index 91c6dabfa0..221fc4a3d4 100644
--- a/akka-actor/src/main/scala/akka/actor/ActorSelection.scala
+++ b/akka-actor/src/main/scala/akka/actor/ActorSelection.scala
@@ -96,7 +96,6 @@ abstract class ActorSelection extends Serializable {
* if such an actor exists. It is completed with failure [[ActorNotFound]] if
* no such actor exists or the identification didn't complete within the
* supplied `timeout`.
- *
*/
@deprecated("Use the overloaded method resolveOne which accepts java.time.Duration instead.", since = "2.5.20")
def resolveOneCS(timeout: FiniteDuration): CompletionStage[ActorRef] =
@@ -110,7 +109,6 @@ abstract class ActorSelection extends Serializable {
* if such an actor exists. It is completed with failure [[ActorNotFound]] if
* no such actor exists or the identification didn't complete within the
* supplied `timeout`.
- *
*/
@deprecated("Use the overloaded method resolveOne which accepts java.time.Duration instead.", since = "2.5.20")
def resolveOneCS(timeout: java.time.Duration): CompletionStage[ActorRef] = resolveOne(timeout)
@@ -123,7 +121,6 @@ abstract class ActorSelection extends Serializable {
* if such an actor exists. It is completed with failure [[ActorNotFound]] if
* no such actor exists or the identification didn't complete within the
* supplied `timeout`.
- *
*/
def resolveOne(timeout: java.time.Duration): CompletionStage[ActorRef] = {
import JavaDurationConverters._
@@ -189,7 +186,7 @@ abstract class ActorSelection extends Serializable {
* allowing for broadcasting of messages to that section.
*/
object ActorSelection {
- //This cast is safe because the self-type of ActorSelection requires that it mixes in ScalaActorSelection
+ // This cast is safe because the self-type of ActorSelection requires that it mixes in ScalaActorSelection
implicit def toScala(sel: ActorSelection): ScalaActorSelection = sel.asInstanceOf[ScalaActorSelection]
/**
diff --git a/akka-actor/src/main/scala/akka/actor/ActorSystem.scala b/akka-actor/src/main/scala/akka/actor/ActorSystem.scala
index d5734f3bf5..7ae33b4b08 100644
--- a/akka-actor/src/main/scala/akka/actor/ActorSystem.scala
+++ b/akka-actor/src/main/scala/akka/actor/ActorSystem.scala
@@ -338,7 +338,7 @@ object ActorSystem {
val loggingFilterAlreadyConfigured =
configuredLoggingFilter == slf4jLoggingFilterClassName || configuredLoggingFilter != classOf[
- DefaultLoggingFilter].getName
+ DefaultLoggingFilter].getName
def newLoggingFilterConfStr = s"""$loggingFilterConfKey = "$slf4jLoggingFilterClassName""""
@@ -351,7 +351,7 @@ object ActorSystem {
} else {
val confKey = "akka.use-slf4j"
if (config.hasPath(confKey) && config.getBoolean(confKey) && dynamicAccess.classIsOnClasspath(
- slf4jLoggerClassName)) {
+ slf4jLoggerClassName)) {
val newLoggers = slf4jLoggerClassName +: configuredLoggers.filterNot(_ == classOf[DefaultLogger].getName)
val newLoggersConfStr = s"$loggersConfKey = [${newLoggers.mkString("\"", "\", \"", "\"")}]"
val newConfStr =
@@ -935,19 +935,20 @@ private[akka] class ActorSystemImpl(
val scheduler: Scheduler = createScheduler()
- val provider: ActorRefProvider = try {
- val arguments = Vector(
- classOf[String] -> name,
- classOf[Settings] -> settings,
- classOf[EventStream] -> eventStream,
- classOf[DynamicAccess] -> dynamicAccess)
-
- dynamicAccess.createInstanceFor[ActorRefProvider](ProviderClass, arguments).get
- } catch {
- case NonFatal(e) =>
- Try(stopScheduler())
- throw e
- }
+ val provider: ActorRefProvider =
+ try {
+ val arguments = Vector(
+ classOf[String] -> name,
+ classOf[Settings] -> settings,
+ classOf[EventStream] -> eventStream,
+ classOf[DynamicAccess] -> dynamicAccess)
+
+ dynamicAccess.createInstanceFor[ActorRefProvider](ProviderClass, arguments).get
+ } catch {
+ case NonFatal(e) =>
+ Try(stopScheduler())
+ throw e
+ }
def deadLetters: ActorRef = provider.deadLetters
@@ -1026,28 +1027,29 @@ private[akka] class ActorSystemImpl(
"The calling code expected that the ActorSystem was initialized but it wasn't yet. " +
"This is probably a bug in the ActorSystem initialization sequence often related to initialization of extensions. " +
"Please report at https://github.com/akka/akka/issues.")
- private lazy val _start: this.type = try {
-
- registerOnTermination(stopScheduler())
- // the provider is expected to start default loggers, LocalActorRefProvider does this
- provider.init(this)
- // at this point it should be initialized "enough" for most extensions that we might want to guard against otherwise
- _initialized = true
-
- if (settings.LogDeadLetters > 0)
- logDeadLetterListener = Some(systemActorOf(Props[DeadLetterListener](), "deadLetterListener"))
- eventStream.startUnsubscriber()
- ManifestInfo(this).checkSameVersion("Akka", allModules, logWarning = true)
- if (!terminating)
- loadExtensions()
- if (LogConfigOnStart) logConfiguration()
- this
- } catch {
- case NonFatal(e) =>
- try terminate()
- catch { case NonFatal(_) => Try(stopScheduler()) }
- throw e
- }
+ private lazy val _start: this.type =
+ try {
+
+ registerOnTermination(stopScheduler())
+ // the provider is expected to start default loggers, LocalActorRefProvider does this
+ provider.init(this)
+ // at this point it should be initialized "enough" for most extensions that we might want to guard against otherwise
+ _initialized = true
+
+ if (settings.LogDeadLetters > 0)
+ logDeadLetterListener = Some(systemActorOf(Props[DeadLetterListener](), "deadLetterListener"))
+ eventStream.startUnsubscriber()
+ ManifestInfo(this).checkSameVersion("Akka", allModules, logWarning = true)
+ if (!terminating)
+ loadExtensions()
+ if (LogConfigOnStart) logConfiguration()
+ this
+ } catch {
+ case NonFatal(e) =>
+ try terminate()
+ catch { case NonFatal(_) => Try(stopScheduler()) }
+ throw e
+ }
def start(): this.type = _start
def registerOnTermination[T](code: => T): Unit = { registerOnTermination(new Runnable { def run() = code }) }
@@ -1096,7 +1098,7 @@ private[akka] class ActorSystemImpl(
terminate()
}
- //#create-scheduler
+ // #create-scheduler
/**
* Create the scheduler service. This one needs one special behavior: if
* Closeable, it MUST execute all outstanding tasks upon .close() in order
@@ -1115,7 +1117,7 @@ private[akka] class ActorSystemImpl(
classOf[LoggingAdapter] -> log,
classOf[ThreadFactory] -> threadFactory.withName(threadFactory.name + "-scheduler")))
.get
- //#create-scheduler
+ // #create-scheduler
/*
* This is called after the last actor has signaled its termination, i.e.
@@ -1148,16 +1150,16 @@ private[akka] class ActorSystemImpl(
"A serializer must not access the SerializationExtension from its constructor. Use lazy init."
else "Could be deadlock due to cyclic initialization of extensions."))
}
- findExtension(ext) //Registration in process, await completion and retry
- case t: Throwable => throw t //Initialization failed, throw same again
+ findExtension(ext) // Registration in process, await completion and retry
+ case t: Throwable => throw t // Initialization failed, throw same again
case other =>
- other.asInstanceOf[T] //could be a T or null, in which case we return the null as T
+ other.asInstanceOf[T] // could be a T or null, in which case we return the null as T
}
@tailrec
final def registerExtension[T <: Extension](ext: ExtensionId[T]): T = {
findExtension(ext) match {
- case null => //Doesn't already exist, commence registration
+ case null => // Doesn't already exist, commence registration
val inProcessOfRegistration = new CountDownLatch(1)
extensions.putIfAbsent(ext, inProcessOfRegistration) match { // Signal that registration is in process
case null =>
@@ -1166,18 +1168,18 @@ private[akka] class ActorSystemImpl(
case null =>
throw new IllegalStateException(s"Extension instance created as 'null' for extension [$ext]")
case instance =>
- extensions.replace(ext, inProcessOfRegistration, instance) //Replace our in process signal with the initialized extension
- instance //Profit!
+ extensions.replace(ext, inProcessOfRegistration, instance) // Replace our in process signal with the initialized extension
+ instance // Profit!
}
} catch {
case t: Throwable =>
- extensions.replace(ext, inProcessOfRegistration, t) //In case shit hits the fan, remove the inProcess signal
- throw t //Escalate to caller
+ extensions.replace(ext, inProcessOfRegistration, t) // In case shit hits the fan, remove the inProcess signal
+ throw t // Escalate to caller
} finally {
- inProcessOfRegistration.countDown() //Always notify listeners of the inProcess signal
+ inProcessOfRegistration.countDown() // Always notify listeners of the inProcess signal
}
case _ =>
- registerExtension(ext) //Someone else is in process of registering an extension for this Extension, retry
+ registerExtension(ext) // Someone else is in process of registering an extension for this Extension, retry
}
case existing => existing.asInstanceOf[T]
}
diff --git a/akka-actor/src/main/scala/akka/actor/Address.scala b/akka-actor/src/main/scala/akka/actor/Address.scala
index c9d9f95f0d..f01f98351a 100644
--- a/akka-actor/src/main/scala/akka/actor/Address.scala
+++ b/akka-actor/src/main/scala/akka/actor/Address.scala
@@ -89,7 +89,8 @@ final case class Address private[akka] (protocol: String, system: String, host:
*/
def hostPort: String = toString.substring(protocol.length + 3)
- /** INTERNAL API
+ /**
+ * INTERNAL API
* Check if the address is not created through `AddressFromURIString`, if there
* are any unusual characters in the host string.
*/
diff --git a/akka-actor/src/main/scala/akka/actor/CoordinatedShutdown.scala b/akka-actor/src/main/scala/akka/actor/CoordinatedShutdown.scala
index 09ef75ab28..81b32d53b1 100644
--- a/akka-actor/src/main/scala/akka/actor/CoordinatedShutdown.scala
+++ b/akka-actor/src/main/scala/akka/actor/CoordinatedShutdown.scala
@@ -735,25 +735,26 @@ final class CoordinatedShutdown private[akka] (
val result = phaseDef.run(recoverEnabled)
val timeout = phases(phaseName).timeout
val deadline = Deadline.now + timeout
- val timeoutFut = try {
- after(timeout, system.scheduler) {
- if (phaseName == CoordinatedShutdown.PhaseActorSystemTerminate && deadline.hasTimeLeft()) {
- // too early, i.e. triggered by system termination
+ val timeoutFut =
+ try {
+ after(timeout, system.scheduler) {
+ if (phaseName == CoordinatedShutdown.PhaseActorSystemTerminate && deadline.hasTimeLeft()) {
+ // too early, i.e. triggered by system termination
+ result
+ } else if (result.isCompleted)
+ Future.successful(Done)
+ else if (recoverEnabled) {
+ log.warning("Coordinated shutdown phase [{}] timed out after {}", phaseName, timeout)
+ Future.successful(Done)
+ } else
+ Future.failed(
+ new TimeoutException(s"Coordinated shutdown phase [$phaseName] timed out after $timeout"))
+ }
+ } catch {
+ case _: IllegalStateException =>
+ // The call to `after` threw IllegalStateException, triggered by system termination
result
- } else if (result.isCompleted)
- Future.successful(Done)
- else if (recoverEnabled) {
- log.warning("Coordinated shutdown phase [{}] timed out after {}", phaseName, timeout)
- Future.successful(Done)
- } else
- Future.failed(
- new TimeoutException(s"Coordinated shutdown phase [$phaseName] timed out after $timeout"))
}
- } catch {
- case _: IllegalStateException =>
- // The call to `after` threw IllegalStateException, triggered by system termination
- result
- }
Future.firstCompletedOf(List(result, timeoutFut))
}
if (remaining.isEmpty)
diff --git a/akka-actor/src/main/scala/akka/actor/Deployer.scala b/akka-actor/src/main/scala/akka/actor/Deployer.scala
index 9f07e46ea4..0149bf3fc1 100644
--- a/akka-actor/src/main/scala/akka/actor/Deployer.scala
+++ b/akka-actor/src/main/scala/akka/actor/Deployer.scala
@@ -227,7 +227,7 @@ private[akka] class Deployer(val settings: ActorSystem.Settings, val dynamicAcce
.unwrapped
.asScala
.collect {
- case (key, value: String) => (key -> value)
+ case (key, value: String) => key -> value
}
.toMap
diff --git a/akka-actor/src/main/scala/akka/actor/Extension.scala b/akka-actor/src/main/scala/akka/actor/Extension.scala
index 93fa50429f..5b03769d71 100644
--- a/akka-actor/src/main/scala/akka/actor/Extension.scala
+++ b/akka-actor/src/main/scala/akka/actor/Extension.scala
@@ -91,7 +91,6 @@ trait ExtensionId[T <: Extension] {
* {{{
* override def get(system: ActorSystem): TheExtension = super.get(system)
* }}}
- *
*/
def get(system: ActorSystem): T = apply(system)
@@ -103,7 +102,6 @@ trait ExtensionId[T <: Extension] {
* {{{
* override def get(system: ClassicActorSystemProvider): TheExtension = super.get(system)
* }}}
- *
*/
def get(system: ClassicActorSystemProvider): T = apply(system)
diff --git a/akka-actor/src/main/scala/akka/actor/FaultHandling.scala b/akka-actor/src/main/scala/akka/actor/FaultHandling.scala
index 7670219655..4a2f2a3047 100644
--- a/akka-actor/src/main/scala/akka/actor/FaultHandling.scala
+++ b/akka-actor/src/main/scala/akka/actor/FaultHandling.scala
@@ -43,7 +43,7 @@ final case class ChildRestartStats(
def uid: Int = child.path.uid
- //FIXME How about making ChildRestartStats immutable and then move these methods into the actual supervisor strategies?
+ // FIXME How about making ChildRestartStats immutable and then move these methods into the actual supervisor strategies?
def requestRestartPermission(retriesWindow: (Option[Int], Option[Int])): Boolean =
retriesWindow match {
case (Some(retries), _) if retries < 1 => false
@@ -280,12 +280,12 @@ object SupervisorStrategy extends SupervisorStrategyLowPriorityImplicits {
*/
private[akka] def sort(in: Iterable[CauseDirective]): immutable.Seq[CauseDirective] =
in.foldLeft(new ArrayBuffer[CauseDirective](in.size)) { (buf, ca) =>
- buf.indexWhere(_._1.isAssignableFrom(ca._1)) match {
- case -1 => buf.append(ca)
- case x => buf.insert(x, ca)
- }
- buf
+ buf.indexWhere(_._1.isAssignableFrom(ca._1)) match {
+ case -1 => buf.append(ca)
+ case x => buf.insert(x, ca)
}
+ buf
+ }
.to(immutable.IndexedSeq)
private[akka] def withinTimeRangeOption(withinTimeRange: Duration): Option[Duration] =
@@ -548,7 +548,7 @@ case class AllForOneStrategy(
children: Iterable[ChildRestartStats]): Unit = {
if (children.nonEmpty) {
if (restart && children.forall(_.requestRestartPermission(retriesWindow)))
- children.foreach(crs => restartChild(crs.child, cause, suspendFirst = (crs.child != child)))
+ children.foreach(crs => restartChild(crs.child, cause, suspendFirst = crs.child != child))
else
for (c <- children) context.stop(c.child)
}
@@ -661,6 +661,6 @@ case class OneForOneStrategy(
if (restart && stats.requestRestartPermission(retriesWindow))
restartChild(child, cause, suspendFirst = false)
else
- context.stop(child) //TODO optimization to drop child here already?
+ context.stop(child) // TODO optimization to drop child here already?
}
}
diff --git a/akka-actor/src/main/scala/akka/actor/LightArrayRevolverScheduler.scala b/akka-actor/src/main/scala/akka/actor/LightArrayRevolverScheduler.scala
index 5b2894a736..c03214a82e 100644
--- a/akka-actor/src/main/scala/akka/actor/LightArrayRevolverScheduler.scala
+++ b/akka-actor/src/main/scala/akka/actor/LightArrayRevolverScheduler.scala
@@ -103,46 +103,47 @@ class LightArrayRevolverScheduler(config: Config, log: LoggingAdapter, threadFac
implicit executor: ExecutionContext): Cancellable = {
checkMaxDelay(roundUp(delay).toNanos)
try new AtomicReference[Cancellable](InitialRepeatMarker) with Cancellable { self =>
- compareAndSet(
- InitialRepeatMarker,
- schedule(
- executor,
- new AtomicLong(clock() + initialDelay.toNanos) with Runnable {
- override def run(): Unit = {
- try {
- runnable.run()
- val driftNanos = clock() - getAndAdd(delay.toNanos)
- if (self.get != null)
- swap(schedule(executor, this, Duration.fromNanos(Math.max(delay.toNanos - driftNanos, 1))))
- } catch {
- case _: SchedulerException => // ignore failure to enqueue or terminated target actor
+ compareAndSet(
+ InitialRepeatMarker,
+ schedule(
+ executor,
+ new AtomicLong(clock() + initialDelay.toNanos) with Runnable {
+ override def run(): Unit = {
+ try {
+ runnable.run()
+ val driftNanos = clock() - getAndAdd(delay.toNanos)
+ if (self.get != null)
+ swap(schedule(executor, this, Duration.fromNanos(Math.max(delay.toNanos - driftNanos, 1))))
+ } catch {
+ case _: SchedulerException => // ignore failure to enqueue or terminated target actor
+ }
}
- }
- },
- roundUp(initialDelay)))
+ },
+ roundUp(initialDelay)))
- @tailrec private def swap(c: Cancellable): Unit = {
- get match {
- case null => if (c != null) c.cancel()
- case old => if (!compareAndSet(old, c)) swap(c)
+ @tailrec private def swap(c: Cancellable): Unit = {
+ get match {
+ case null => if (c != null) c.cancel()
+ case old => if (!compareAndSet(old, c)) swap(c)
+ }
}
- }
- final def cancel(): Boolean = {
- @tailrec def tailrecCancel(): Boolean = {
- get match {
- case null => false
- case c =>
- if (c.cancel()) compareAndSet(c, null)
- else compareAndSet(c, null) || tailrecCancel()
+ final def cancel(): Boolean = {
+ @tailrec def tailrecCancel(): Boolean = {
+ get match {
+ case null => false
+ case c =>
+ if (c.cancel()) compareAndSet(c, null)
+ else compareAndSet(c, null) || tailrecCancel()
+ }
}
+
+ tailrecCancel()
}
- tailrecCancel()
+ override def isCancelled: Boolean = get == null
}
-
- override def isCancelled: Boolean = get == null
- } catch {
+ catch {
case cause @ SchedulerException(msg) => throw new IllegalStateException(msg, cause)
}
}
diff --git a/akka-actor/src/main/scala/akka/actor/ReflectiveDynamicAccess.scala b/akka-actor/src/main/scala/akka/actor/ReflectiveDynamicAccess.scala
index 96ab517f6a..27cf955bf3 100644
--- a/akka-actor/src/main/scala/akka/actor/ReflectiveDynamicAccess.scala
+++ b/akka-actor/src/main/scala/akka/actor/ReflectiveDynamicAccess.scala
@@ -25,11 +25,11 @@ import akka.annotation.DoNotInherit
class ReflectiveDynamicAccess(val classLoader: ClassLoader) extends DynamicAccess {
override def getClassFor[T: ClassTag](fqcn: String): Try[Class[_ <: T]] =
- Try[Class[_ <: T]]({
+ Try[Class[_ <: T]] {
val c = Class.forName(fqcn, false, classLoader).asInstanceOf[Class[_ <: T]]
val t = implicitly[ClassTag[T]].runtimeClass
if (t.isAssignableFrom(c)) c else throw new ClassCastException(t.toString + " is not assignable from " + c)
- })
+ }
override def createInstanceFor[T: ClassTag](clazz: Class[_], args: immutable.Seq[(Class[_], AnyRef)]): Try[T] =
Try {
diff --git a/akka-actor/src/main/scala/akka/actor/Scheduler.scala b/akka-actor/src/main/scala/akka/actor/Scheduler.scala
index 8a1f35ff5e..f65abcfc77 100644
--- a/akka-actor/src/main/scala/akka/actor/Scheduler.scala
+++ b/akka-actor/src/main/scala/akka/actor/Scheduler.scala
@@ -73,46 +73,47 @@ trait Scheduler {
def scheduleWithFixedDelay(initialDelay: FiniteDuration, delay: FiniteDuration)(runnable: Runnable)(
implicit executor: ExecutionContext): Cancellable = {
try new AtomicReference[Cancellable](Cancellable.initialNotCancelled) with Cancellable { self =>
- compareAndSet(
- Cancellable.initialNotCancelled,
- scheduleOnce(
- initialDelay,
- new Runnable {
- override def run(): Unit = {
- try {
- runnable.run()
- if (self.get != null)
- swap(scheduleOnce(delay, this))
- } catch {
- // ignore failure to enqueue or terminated target actor
- case _: SchedulerException =>
- case e: IllegalStateException if e.getCause != null && e.getCause.isInstanceOf[SchedulerException] =>
+ compareAndSet(
+ Cancellable.initialNotCancelled,
+ scheduleOnce(
+ initialDelay,
+ new Runnable {
+ override def run(): Unit = {
+ try {
+ runnable.run()
+ if (self.get != null)
+ swap(scheduleOnce(delay, this))
+ } catch {
+ // ignore failure to enqueue or terminated target actor
+ case _: SchedulerException =>
+ case e: IllegalStateException if e.getCause != null && e.getCause.isInstanceOf[SchedulerException] =>
+ }
}
- }
- }))
+ }))
- @tailrec private def swap(c: Cancellable): Unit = {
- get match {
- case null => if (c != null) c.cancel()
- case old => if (!compareAndSet(old, c)) swap(c)
+ @tailrec private def swap(c: Cancellable): Unit = {
+ get match {
+ case null => if (c != null) c.cancel()
+ case old => if (!compareAndSet(old, c)) swap(c)
+ }
}
- }
- final def cancel(): Boolean = {
- @tailrec def tailrecCancel(): Boolean = {
- get match {
- case null => false
- case c =>
- if (c.cancel()) compareAndSet(c, null)
- else compareAndSet(c, null) || tailrecCancel()
+ final def cancel(): Boolean = {
+ @tailrec def tailrecCancel(): Boolean = {
+ get match {
+ case null => false
+ case c =>
+ if (c.cancel()) compareAndSet(c, null)
+ else compareAndSet(c, null) || tailrecCancel()
+ }
}
+
+ tailrecCancel()
}
- tailrecCancel()
+ override def isCancelled: Boolean = get == null
}
-
- override def isCancelled: Boolean = get == null
- } catch {
+ catch {
case SchedulerException(msg) => throw new IllegalStateException(msg)
}
}
@@ -441,9 +442,10 @@ trait Scheduler {
implicit
executor: ExecutionContext,
sender: ActorRef = Actor.noSender): Cancellable =
- scheduleOnce(delay, new Runnable {
- override def run(): Unit = receiver ! message
- })
+ scheduleOnce(delay,
+ new Runnable {
+ override def run(): Unit = receiver ! message
+ })
/**
* Java API: Schedules a message to be sent once with a delay, i.e. a time period that has
diff --git a/akka-actor/src/main/scala/akka/actor/Stash.scala b/akka-actor/src/main/scala/akka/actor/Stash.scala
index 19c10545a2..db64c8da9a 100644
--- a/akka-actor/src/main/scala/akka/actor/Stash.scala
+++ b/akka-actor/src/main/scala/akka/actor/Stash.scala
@@ -198,11 +198,12 @@ private[akka] trait StashSupport {
* if the `unstash()` call successfully returns or throws an exception.
*/
private[akka] def unstash(): Unit =
- if (theStash.nonEmpty) try {
- enqueueFirst(theStash.head)
- } finally {
- theStash = theStash.tail
- }
+ if (theStash.nonEmpty)
+ try {
+ enqueueFirst(theStash.head)
+ } finally {
+ theStash = theStash.tail
+ }
/**
* Prepends all messages in the stash to the mailbox, and then clears the stash.
diff --git a/akka-actor/src/main/scala/akka/actor/TypedActor.scala b/akka-actor/src/main/scala/akka/actor/TypedActor.scala
index 0e206b2acd..b68121d0e4 100644
--- a/akka-actor/src/main/scala/akka/actor/TypedActor.scala
+++ b/akka-actor/src/main/scala/akka/actor/TypedActor.scala
@@ -75,9 +75,9 @@ trait TypedActorFactory {
* Creates a new TypedActor with the specified properties
*/
def typedActorOf[R <: AnyRef, T <: R](props: TypedProps[T]): R = {
- val proxyVar = new AtomVar[R] //Chicken'n'egg-resolver
- val c = props.creator //Cache this to avoid closing over the Props
- val i = props.interfaces //Cache this to avoid closing over the Props
+ val proxyVar = new AtomVar[R] // Chicken'n'egg-resolver
+ val c = props.creator // Cache this to avoid closing over the Props
+ val i = props.interfaces // Cache this to avoid closing over the Props
val ap = Props(new TypedActor.TypedActor[R, T](proxyVar, c(), i)).withDeploy(props.actorProps().deploy)
typedActor.createActorRefProxy(props, proxyVar, actorFactory.actorOf(ap))
}
@@ -86,9 +86,9 @@ trait TypedActorFactory {
* Creates a new TypedActor with the specified properties
*/
def typedActorOf[R <: AnyRef, T <: R](props: TypedProps[T], name: String): R = {
- val proxyVar = new AtomVar[R] //Chicken'n'egg-resolver
- val c = props.creator //Cache this to avoid closing over the Props
- val i = props.interfaces //Cache this to avoid closing over the Props
+ val proxyVar = new AtomVar[R] // Chicken'n'egg-resolver
+ val c = props.creator // Cache this to avoid closing over the Props
+ val i = props.interfaces // Cache this to avoid closing over the Props
val ap = Props(new akka.actor.TypedActor.TypedActor[R, T](proxyVar, c(), i)).withDeploy(props.actorProps().deploy)
typedActor.createActorRefProxy(props, proxyVar, actorFactory.actorOf(ap, name))
}
@@ -167,7 +167,7 @@ object TypedActor extends ExtensionId[TypedActorExtension] with ExtensionIdProvi
val p = ps(i)
val s = serialization.findSerializerFor(p)
val m = Serializers.manifestFor(s, p)
- serializedParameters(i) = (s.identifier, m, s.toBinary(parameters(i))) //Mutable for the sake of sanity
+ serializedParameters(i) = (s.identifier, m, s.toBinary(parameters(i))) // Mutable for the sake of sanity
}
SerializedMethodCall(method.getDeclaringClass, method.getName, method.getParameterTypes, serializedParameters)
@@ -185,8 +185,8 @@ object TypedActor extends ExtensionId[TypedActorExtension] with ExtensionIdProvi
parameterTypes: Array[Class[_]],
serializedParameters: Array[(Int, String, Array[Byte])]) {
- //TODO implement writeObject and readObject to serialize
- //TODO Possible optimization is to special encode the parameter-types to conserve space
+ // TODO implement writeObject and readObject to serialize
+ // TODO Possible optimization is to special encode the parameter-types to conserve space
@throws(classOf[ObjectStreamException]) private def readResolve(): AnyRef = {
val system = akka.serialization.JavaSerializer.currentSystem.value
if (system eq null)
@@ -200,7 +200,7 @@ object TypedActor extends ExtensionId[TypedActorExtension] with ExtensionIdProvi
case null => null
case a if a.length == 0 => Array[AnyRef]()
case a =>
- val deserializedParameters: Array[AnyRef] = new Array[AnyRef](a.length) //Mutable for the sake of sanity
+ 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)
deserializedParameters(i) = serialization.deserialize(bytes, sId, manifest).get
@@ -300,7 +300,7 @@ object TypedActor extends ExtensionId[TypedActorExtension] with ExtensionIdProvi
akka.actor.TypedActor(self.context.system).invocationHandlerFor(proxyVar.get) match {
case null =>
case some =>
- some.actorVar.set(self.context.system.deadLetters) //Point it to the DLQ
+ some.actorVar.set(self.context.system.deadLetters) // Point it to the DLQ
proxyVar.set(null.asInstanceOf[R])
}
}
@@ -310,7 +310,7 @@ object TypedActor extends ExtensionId[TypedActorExtension] with ExtensionIdProvi
case l: PreRestart => l.preRestart(reason, message)
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
+ .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
}
}
@@ -457,14 +457,14 @@ object TypedActor extends ExtensionId[TypedActorExtension] with ExtensionIdProvi
case "toString" => actor.toString
case "equals" =>
(args.length == 1 && (proxy eq args(0)) || actor == extension.getActorRefFor(args(0)))
- .asInstanceOf[AnyRef] //Force boxing of the boolean
+ .asInstanceOf[AnyRef] // Force boxing of the boolean
case "hashCode" => actor.hashCode.asInstanceOf[AnyRef]
case _ =>
implicit val dispatcher = extension.system.dispatcher
import akka.pattern.ask
MethodCall(method, args) match {
case m if m.isOneWay =>
- actor ! m; null //Null return value
+ actor ! m; null // Null return value
case m if m.returnsFuture =>
ask(actor, m)(timeout).map {
case NullResponse => null
@@ -649,8 +649,6 @@ final case class TypedProps[T <: AnyRef] protected[TypedProps] (
/**
* Scala API: return a new TypedProps that will use the specified Timeout for its non-void-returning methods,
* if None is specified, it will use the default timeout as specified in the configuration.
- *
- *
*/
def withTimeout(timeout: Option[Timeout]): TypedProps[T] = this.copy(timeout = timeout)
@@ -691,7 +689,7 @@ final case class ContextualTypedActorFactory(typedActor: TypedActorExtension, ac
@nowarn("msg=deprecated")
class TypedActorExtension(val system: ExtendedActorSystem) extends TypedActorFactory with Extension {
- import TypedActor._ //Import the goodies from the companion object
+ import TypedActor._ // Import the goodies from the companion object
protected def actorFactory: ActorRefFactory = system
protected def typedActor = this
@@ -725,13 +723,13 @@ class TypedActorExtension(val system: ExtendedActorSystem) extends TypedActorFac
props: TypedProps[T],
proxyVar: AtomVar[R],
actorRef: => ActorRef): R = {
- //Warning, do not change order of the following statements, it's some elaborate chicken-n-egg handling
+ // Warning, do not change order of the following statements, it's some elaborate chicken-n-egg handling
val actorVar = new AtomVar[ActorRef](null)
val proxy = Proxy
.newProxyInstance(
props.loader
.orElse(props.interfaces.collectFirst { case any => any.getClassLoader })
- .orNull, //If we have no loader, we arbitrarily take the loader of the first interface
+ .orNull, // If we have no loader, we arbitrarily take the loader of the first interface
props.interfaces.toArray,
new TypedActorInvocationHandler(this, actorVar, props.timeout.getOrElse(DefaultReturnTimeout)))
.asInstanceOf[R]
@@ -741,7 +739,7 @@ class TypedActorExtension(val system: ExtendedActorSystem) extends TypedActorFac
proxy
} else {
proxyVar.set(proxy) // Chicken and egg situation we needed to solve, set the proxy so that we can set the self-reference inside each receive
- actorVar.set(actorRef) //Make sure the InvocationHandler gets a hold of the actor reference, this is not a problem since the proxy hasn't escaped this method yet
+ actorVar.set(actorRef) // Make sure the InvocationHandler gets a hold of the actor reference, this is not a problem since the proxy hasn't escaped this method yet
proxyVar.get
}
}
@@ -751,7 +749,7 @@ class TypedActorExtension(val system: ExtendedActorSystem) extends TypedActorFac
*/
private[akka] def invocationHandlerFor(typedActor: AnyRef): TypedActorInvocationHandler =
if ((typedActor ne null) && classOf[Proxy].isAssignableFrom(typedActor.getClass) && Proxy.isProxyClass(
- typedActor.getClass)) typedActor match {
+ typedActor.getClass)) typedActor match {
case null => null
case other =>
Proxy.getInvocationHandler(other) match {
@@ -759,5 +757,6 @@ class TypedActorExtension(val system: ExtendedActorSystem) extends TypedActorFac
case handler: TypedActorInvocationHandler => handler
case _ => null
}
- } else null
+ }
+ else null
}
diff --git a/akka-actor/src/main/scala/akka/actor/dungeon/Children.scala b/akka-actor/src/main/scala/akka/actor/dungeon/Children.scala
index 284e8965d4..8815d3f92f 100644
--- a/akka-actor/src/main/scala/akka/actor/dungeon/Children.scala
+++ b/akka-actor/src/main/scala/akka/actor/dungeon/Children.scala
@@ -122,9 +122,9 @@ private[akka] trait Children { this: ActorCell =>
}
if (actor match {
- case r: RepointableRef => r.isStarted
- case _ => true
- }) shallDie(actor)
+ case r: RepointableRef => r.isStarted
+ case _ => true
+ }) shallDie(actor)
}
actor.asInstanceOf[InternalActorRef].stop()
}
@@ -272,17 +272,16 @@ private[akka] trait Children { this: ActorCell =>
if (oldInfo eq null)
Serialization.currentTransportInformation.value = system.provider.serializationInformation
- props.args.forall(
- arg =>
- arg == null ||
- arg.isInstanceOf[NoSerializationVerificationNeeded] ||
- settings.NoSerializationVerificationNeededClassPrefix.exists(arg.getClass.getName.startsWith) || {
- val o = arg.asInstanceOf[AnyRef]
- val serializer = ser.findSerializerFor(o)
- val bytes = serializer.toBinary(o)
- val ms = Serializers.manifestFor(serializer, o)
- ser.deserialize(bytes, serializer.identifier, ms).get != null
- })
+ props.args.forall(arg =>
+ arg == null ||
+ arg.isInstanceOf[NoSerializationVerificationNeeded] ||
+ settings.NoSerializationVerificationNeededClassPrefix.exists(arg.getClass.getName.startsWith) || {
+ val o = arg.asInstanceOf[AnyRef]
+ val serializer = ser.findSerializerFor(o)
+ val bytes = serializer.toBinary(o)
+ val ms = Serializers.manifestFor(serializer, o)
+ ser.deserialize(bytes, serializer.identifier, ms).get != null
+ })
} catch {
case NonFatal(e) =>
throw new IllegalArgumentException(s"pre-creation serialization check failed at [${cell.self.path}/$name]", e)
diff --git a/akka-actor/src/main/scala/akka/actor/dungeon/ChildrenContainer.scala b/akka-actor/src/main/scala/akka/actor/dungeon/ChildrenContainer.scala
index 7d056a3db2..d615424616 100644
--- a/akka-actor/src/main/scala/akka/actor/dungeon/ChildrenContainer.scala
+++ b/akka-actor/src/main/scala/akka/actor/dungeon/ChildrenContainer.scala
@@ -173,7 +173,8 @@ private[akka] object ChildrenContainer {
if (t.isEmpty) reason match {
case Termination => TerminatedChildrenContainer
case _ => NormalChildrenContainer(c - child.path.name)
- } else copy(c - child.path.name, t)
+ }
+ else copy(c - child.path.name, t)
}
override def getByName(name: String): Option[ChildStats] = c.get(name)
diff --git a/akka-actor/src/main/scala/akka/actor/dungeon/DeathWatch.scala b/akka-actor/src/main/scala/akka/actor/dungeon/DeathWatch.scala
index 35e002155d..a7c0b7bfd5 100644
--- a/akka-actor/src/main/scala/akka/actor/dungeon/DeathWatch.scala
+++ b/akka-actor/src/main/scala/akka/actor/dungeon/DeathWatch.scala
@@ -29,7 +29,8 @@ private[akka] trait DeathWatch { this: ActorCell =>
maintainAddressTerminatedSubscription(a) {
a.sendSystemMessage(Watch(a, self)) // ➡➡➡ NEVER SEND THE SAME SYSTEM MESSAGE OBJECT TO TWO ACTORS ⬅⬅⬅
updateWatching(a, None)
- } else
+ }
+ else
checkWatchingSame(a, None)
}
a
@@ -44,7 +45,8 @@ private[akka] trait DeathWatch { this: ActorCell =>
maintainAddressTerminatedSubscription(a) {
a.sendSystemMessage(Watch(a, self)) // ➡➡➡ NEVER SEND THE SAME SYSTEM MESSAGE OBJECT TO TWO ACTORS ⬅⬅⬅
updateWatching(a, Some(msg))
- } else
+ }
+ else
checkWatchingSame(a, Some(msg))
}
a
diff --git a/akka-actor/src/main/scala/akka/actor/dungeon/Dispatch.scala b/akka-actor/src/main/scala/akka/actor/dungeon/Dispatch.scala
index 11f6a9833a..71e86414e5 100644
--- a/akka-actor/src/main/scala/akka/actor/dungeon/Dispatch.scala
+++ b/akka-actor/src/main/scala/akka/actor/dungeon/Dispatch.scala
@@ -36,8 +36,7 @@ final case class SerializationCheckFailedException private[dungeon] (msg: Object
@InternalApi
private[akka] trait Dispatch { this: ActorCell =>
- @nowarn @volatile private var _mailboxDoNotCallMeDirectly
- : Mailbox = _ //This must be volatile since it isn't protected by the mailbox status
+ @nowarn @volatile private var _mailboxDoNotCallMeDirectly: Mailbox = _ // This must be volatile since it isn't protected by the mailbox status
@nowarn private def _preventPrivateUnusedErasure = {
_mailboxDoNotCallMeDirectly
@@ -177,11 +176,12 @@ private[akka] trait Dispatch { this: ActorCell =>
if (system.settings.NoSerializationVerificationNeededClassPrefix.exists(msg.getClass.getName.startsWith))
envelope
else {
- val deserializedMsg = try {
- serializeAndDeserializePayload(msg)
- } catch {
- case NonFatal(e) => throw SerializationCheckFailedException(msg, e)
- }
+ val deserializedMsg =
+ try {
+ serializeAndDeserializePayload(msg)
+ } catch {
+ case NonFatal(e) => throw SerializationCheckFailedException(msg, e)
+ }
envelope.message match {
case dl: DeadLetter => envelope.copy(message = dl.copy(message = deserializedMsg))
case _ => envelope.copy(message = deserializedMsg)
diff --git a/akka-actor/src/main/scala/akka/actor/dungeon/FaultHandling.scala b/akka-actor/src/main/scala/akka/actor/dungeon/FaultHandling.scala
index eeecb3e13a..48537c863a 100644
--- a/akka-actor/src/main/scala/akka/actor/dungeon/FaultHandling.scala
+++ b/akka-actor/src/main/scala/akka/actor/dungeon/FaultHandling.scala
@@ -93,9 +93,10 @@ private[akka] trait FaultHandling { this: ActorCell =>
// if the actor fails in preRestart, we can do nothing but log it: it’s best-effort
if (!isFailedFatally) failedActor.aroundPreRestart(cause, optionalMessage)
} catch handleNonFatalOrInterruptedException { e =>
- val ex = PreRestartException(self, e, cause, optionalMessage)
- publish(Error(ex, self.path.toString, clazz(failedActor), e.getMessage))
- } finally {
+ val ex = PreRestartException(self, e, cause, optionalMessage)
+ publish(Error(ex, self.path.toString, clazz(failedActor), e.getMessage))
+ }
+ finally {
clearActorFields(failedActor, recreate = true)
}
}
@@ -162,8 +163,8 @@ private[akka] trait FaultHandling { this: ActorCell =>
finally clearFailed()
try create(None)
catch handleNonFatalOrInterruptedException { e =>
- handleInvokeFailure(Nil, e)
- }
+ handleInvokeFailure(Nil, e)
+ }
}
protected def terminate(): Unit = {
@@ -203,33 +204,34 @@ private[akka] trait FaultHandling { this: ActorCell =>
@InternalStableApi
final def handleInvokeFailure(childrenNotToSuspend: immutable.Iterable[ActorRef], t: Throwable): Unit = {
// prevent any further messages to be processed until the actor has been restarted
- if (!isFailed) try {
- suspendNonRecursive()
- // suspend children
- val skip: Set[ActorRef] = currentMessage match {
- case Envelope(Failed(_, _, _), child) => setFailed(child); Set(child)
- case _ => setFailed(self); Set.empty
- }
- suspendChildren(exceptFor = skip ++ childrenNotToSuspend)
- t match {
- // tell supervisor
- case _: InterruptedException =>
- // ➡➡➡ NEVER SEND THE SAME SYSTEM MESSAGE OBJECT TO TWO ACTORS ⬅⬅⬅
- parent.sendSystemMessage(Failed(self, new ActorInterruptedException(t), uid))
- case _ =>
- // ➡➡➡ NEVER SEND THE SAME SYSTEM MESSAGE OBJECT TO TWO ACTORS ⬅⬅⬅
- parent.sendSystemMessage(Failed(self, t, uid))
- }
- } catch handleNonFatalOrInterruptedException { e =>
- publish(
- Error(
- e,
- self.path.toString,
- clazz(actor),
- "emergency stop: exception in failure handling for " + t.getClass + Logging.stackTraceFor(t)))
- try children.foreach(stop)
- finally finishTerminate()
- }
+ if (!isFailed)
+ try {
+ suspendNonRecursive()
+ // suspend children
+ val skip: Set[ActorRef] = currentMessage match {
+ case Envelope(Failed(_, _, _), child) => setFailed(child); Set(child)
+ case _ => setFailed(self); Set.empty
+ }
+ suspendChildren(exceptFor = skip ++ childrenNotToSuspend)
+ t match {
+ // tell supervisor
+ case _: InterruptedException =>
+ // ➡➡➡ NEVER SEND THE SAME SYSTEM MESSAGE OBJECT TO TWO ACTORS ⬅⬅⬅
+ parent.sendSystemMessage(Failed(self, new ActorInterruptedException(t), uid))
+ case _ =>
+ // ➡➡➡ NEVER SEND THE SAME SYSTEM MESSAGE OBJECT TO TWO ACTORS ⬅⬅⬅
+ parent.sendSystemMessage(Failed(self, t, uid))
+ }
+ } catch handleNonFatalOrInterruptedException { e =>
+ publish(
+ Error(
+ e,
+ self.path.toString,
+ clazz(actor),
+ "emergency stop: exception in failure handling for " + t.getClass + Logging.stackTraceFor(t)))
+ try children.foreach(stop)
+ finally finishTerminate()
+ }
}
private def finishTerminate(): Unit = {
@@ -241,20 +243,26 @@ private[akka] trait FaultHandling { this: ActorCell =>
*/
try if (a ne null) a.aroundPostStop()
catch handleNonFatalOrInterruptedException { e =>
- publish(Error(e, self.path.toString, clazz(a), e.getMessage))
- } finally try stopFunctionRefs()
- finally try dispatcher.detach(this)
- finally try parent.sendSystemMessage(
- DeathWatchNotification(self, existenceConfirmed = true, addressTerminated = false))
- finally try tellWatchersWeDied()
- finally try unwatchWatchedActors(a) // stay here as we expect an emergency stop from handleInvokeFailure
- finally {
- if (system.settings.DebugLifecycle)
- publish(Debug(self.path.toString, clazz(a), "stopped"))
-
- clearActorFields(a, recreate = false)
- clearFieldsForTermination()
- }
+ publish(Error(e, self.path.toString, clazz(a), e.getMessage))
+ }
+ finally
+ try stopFunctionRefs()
+ finally
+ try dispatcher.detach(this)
+ finally
+ try parent.sendSystemMessage(
+ DeathWatchNotification(self, existenceConfirmed = true, addressTerminated = false))
+ finally
+ try tellWatchersWeDied()
+ finally
+ try unwatchWatchedActors(a) // stay here as we expect an emergency stop from handleInvokeFailure
+ finally {
+ if (system.settings.DebugLifecycle)
+ publish(Debug(self.path.toString, clazz(a), "stopped"))
+
+ clearActorFields(a, recreate = false)
+ clearFieldsForTermination()
+ }
}
private def finishRecreate(cause: Throwable): Unit = {
@@ -272,17 +280,16 @@ private[akka] trait FaultHandling { this: ActorCell =>
if (system.settings.DebugLifecycle) publish(Debug(self.path.toString, clazz(freshActor), "restarted"))
// only after parent is up and running again do restart the children which were not stopped
- survivors.foreach(
- child =>
- try child.asInstanceOf[InternalActorRef].restart(cause)
- catch handleNonFatalOrInterruptedException { e =>
+ survivors.foreach(child =>
+ try child.asInstanceOf[InternalActorRef].restart(cause)
+ catch handleNonFatalOrInterruptedException { e =>
publish(Error(e, self.path.toString, clazz(freshActor), "restarting " + child))
})
} catch handleNonFatalOrInterruptedException { e =>
- setFailedFatally()
- clearActorFields(actor, recreate = false) // in order to prevent preRestart() from happening again
- handleInvokeFailure(survivors, PostRestartException(self, e, cause))
- }
+ setFailedFatally()
+ clearActorFields(actor, recreate = false) // in order to prevent preRestart() from happening again
+ handleInvokeFailure(survivors, PostRestartException(self, e, cause))
+ }
}
final protected def handleFailure(f: Failed): Unit = {
@@ -317,9 +324,9 @@ private[akka] trait FaultHandling { this: ActorCell =>
if (actor != null) {
try actor.supervisorStrategy.handleChildTerminated(this, child, children)
catch handleNonFatalOrInterruptedException { e =>
- publish(Error(e, self.path.toString, clazz(actor), "handleChildTerminated failed"))
- handleInvokeFailure(Nil, e)
- }
+ publish(Error(e, self.path.toString, clazz(actor), "handleChildTerminated failed"))
+ handleInvokeFailure(Nil, e)
+ }
}
/*
* if the removal changed the state of the (terminating) children container,
diff --git a/akka-actor/src/main/scala/akka/actor/dungeon/ReceiveTimeout.scala b/akka-actor/src/main/scala/akka/actor/dungeon/ReceiveTimeout.scala
index 13a8338f64..996091a2d3 100644
--- a/akka-actor/src/main/scala/akka/actor/dungeon/ReceiveTimeout.scala
+++ b/akka-actor/src/main/scala/akka/actor/dungeon/ReceiveTimeout.scala
@@ -48,7 +48,7 @@ private[akka] trait ReceiveTimeout { this: ActorCell =>
}
private def rescheduleReceiveTimeout(f: FiniteDuration): Unit = {
- receiveTimeoutData._2.cancel() //Cancel any ongoing future
+ receiveTimeoutData._2.cancel() // Cancel any ongoing future
val task = system.scheduler.scheduleOnce(f, self, akka.actor.ReceiveTimeout)(this.dispatcher)
receiveTimeoutData = (f, task)
}
diff --git a/akka-actor/src/main/scala/akka/dispatch/AbstractDispatcher.scala b/akka-actor/src/main/scala/akka/dispatch/AbstractDispatcher.scala
index ca11084607..671fb580e7 100644
--- a/akka-actor/src/main/scala/akka/dispatch/AbstractDispatcher.scala
+++ b/akka-actor/src/main/scala/akka/dispatch/AbstractDispatcher.scala
@@ -63,16 +63,17 @@ private[akka] trait LoadMetrics { self: Executor =>
* INTERNAL API
*/
private[akka] object MessageDispatcher {
- val UNSCHEDULED = 0 //WARNING DO NOT CHANGE THE VALUE OF THIS: It relies on the faster init of 0 in AbstractMessageDispatcher
+ val UNSCHEDULED = 0 // WARNING DO NOT CHANGE THE VALUE OF THIS: It relies on the faster init of 0 in AbstractMessageDispatcher
val SCHEDULED = 1
val RESCHEDULED = 2
// dispatcher debugging helper using println (see below)
// since this is a compile-time constant, scalac will elide code behind if (MessageDispatcher.debug) (RK checked with 2.9.1)
final val debug = false // Deliberately without type ascription to make it a compile-time constant
- lazy val actors = new Index[MessageDispatcher, ActorRef](16, new ju.Comparator[ActorRef] {
- override def compare(a: ActorRef, b: ActorRef): Int = a.compareTo(b)
- })
+ lazy val actors = new Index[MessageDispatcher, ActorRef](16,
+ new ju.Comparator[ActorRef] {
+ override def compare(a: ActorRef, b: ActorRef): Int = a.compareTo(b)
+ })
def printActors(): Unit =
if (debug) {
for {
@@ -194,9 +195,9 @@ abstract class MessageDispatcher(val configurator: MessageDispatcherConfigurator
private def scheduleShutdownAction(): Unit = {
// IllegalStateException is thrown if scheduler has been shutdown
try prerequisites.scheduler.scheduleOnce(shutdownTimeout, shutdownAction)(new ExecutionContext {
- override def execute(runnable: Runnable): Unit = runnable.run()
- override def reportFailure(t: Throwable): Unit = MessageDispatcher.this.reportFailure(t)
- })
+ override def execute(runnable: Runnable): Unit = runnable.run()
+ override def reportFailure(t: Throwable): Unit = MessageDispatcher.this.reportFailure(t)
+ })
catch {
case _: IllegalStateException =>
shutdown()
@@ -239,7 +240,7 @@ abstract class MessageDispatcher(val configurator: MessageDispatcherConfigurator
shutdownSchedule match {
case SCHEDULED =>
try {
- if (inhabitants == 0) shutdown() //Warning, racy
+ if (inhabitants == 0) shutdown() // Warning, racy
} finally {
while (!updateShutdownSchedule(shutdownSchedule, UNSCHEDULED)) {}
}
@@ -371,8 +372,8 @@ abstract class MessageDispatcherConfigurator(_config: Config, val prerequisites:
.recover {
case exception =>
throw new IllegalArgumentException(
- ("""Cannot instantiate ExecutorServiceConfigurator ("executor = [%s]"), defined in [%s],
- make sure it has an accessible constructor with a [%s,%s] signature""")
+ """Cannot instantiate ExecutorServiceConfigurator ("executor = [%s]"), defined in [%s],
+ make sure it has an accessible constructor with a [%s,%s] signature"""
.format(fqcn, config.getString("id"), classOf[Config], classOf[DispatcherPrerequisites]),
exception)
}
@@ -407,7 +408,7 @@ class ThreadPoolExecutorConfigurator(config: Config, prerequisites: DispatcherPr
case size if size > 0 =>
Some(config.getString("task-queue-type"))
.map {
- case "array" => ThreadPoolConfig.arrayBlockingQueue(size, false) //TODO config fairness?
+ case "array" => ThreadPoolConfig.arrayBlockingQueue(size, false) // TODO config fairness?
case "" | "linked" => ThreadPoolConfig.linkedBlockingQueue(size)
case x =>
throw new IllegalArgumentException("[%s] is not a valid task-queue-type [array|linked]!".format(x))
diff --git a/akka-actor/src/main/scala/akka/dispatch/BalancingDispatcher.scala b/akka-actor/src/main/scala/akka/dispatch/BalancingDispatcher.scala
index 586519de27..c8bea5f2ca 100644
--- a/akka-actor/src/main/scala/akka/dispatch/BalancingDispatcher.scala
+++ b/akka-actor/src/main/scala/akka/dispatch/BalancingDispatcher.scala
@@ -68,7 +68,7 @@ private[akka] class BalancingDispatcher(
with DefaultSystemMessageQueue {
override def cleanUp(): Unit = {
val dlq = mailboxes.deadLetterMailbox
- //Don't call the original implementation of this since it scraps all messages, and we don't want to do that
+ // Don't call the original implementation of this since it scraps all messages, and we don't want to do that
var messages = systemDrain(new LatestFirstSystemMessageList(NoMessage))
while (messages.nonEmpty) {
// message must be “virgin” before being able to systemEnqueue again
@@ -103,12 +103,12 @@ private[akka] class BalancingDispatcher(
if (attemptTeamWork) {
@tailrec def scheduleOne(i: Iterator[ActorCell] = team.iterator): Unit =
if (messageQueue.hasMessages
- && i.hasNext
- && (executorService.executor match {
- case lm: LoadMetrics => !lm.atFullThrottle()
- case _ => true
- })
- && !registerForExecution(i.next.mailbox, false, false))
+ && i.hasNext
+ && (executorService.executor match {
+ case lm: LoadMetrics => !lm.atFullThrottle()
+ case _ => true
+ })
+ && !registerForExecution(i.next.mailbox, false, false))
scheduleOne(i)
scheduleOne()
diff --git a/akka-actor/src/main/scala/akka/dispatch/BatchingExecutor.scala b/akka-actor/src/main/scala/akka/dispatch/BatchingExecutor.scala
index d7e58bb538..4bdf87aeb4 100644
--- a/akka-actor/src/main/scala/akka/dispatch/BatchingExecutor.scala
+++ b/akka-actor/src/main/scala/akka/dispatch/BatchingExecutor.scala
@@ -68,7 +68,7 @@ private[akka] trait BatchingExecutor extends Executor {
val current = _tasksLocal.get()
_tasksLocal.remove()
if ((current eq this) && !current.isEmpty) { // Resubmit ourselves if something bad happened and we still have work to do
- unbatchedExecute(current) //TODO what if this submission fails?
+ unbatchedExecute(current) // TODO what if this submission fails?
true
} else false
}
diff --git a/akka-actor/src/main/scala/akka/dispatch/Dispatcher.scala b/akka-actor/src/main/scala/akka/dispatch/Dispatcher.scala
index b23304e36b..75b2300f41 100644
--- a/akka-actor/src/main/scala/akka/dispatch/Dispatcher.scala
+++ b/akka-actor/src/main/scala/akka/dispatch/Dispatcher.scala
@@ -121,7 +121,7 @@ class Dispatcher(
mbox: Mailbox,
hasMessageHint: Boolean,
hasSystemMessageHint: Boolean): Boolean = {
- if (mbox.canBeScheduledForExecution(hasMessageHint, hasSystemMessageHint)) { //This needs to be here to ensure thread safety and no races
+ if (mbox.canBeScheduledForExecution(hasMessageHint, hasSystemMessageHint)) { // This needs to be here to ensure thread safety and no races
if (mbox.setAsScheduled()) {
try {
executorService.execute(mbox)
@@ -131,7 +131,7 @@ class Dispatcher(
try {
executorService.execute(mbox)
true
- } catch { //Retry once
+ } catch { // Retry once
case e: RejectedExecutionException =>
mbox.setAsIdle()
eventStream.publish(Error(e, getClass.getName, getClass, "registerForExecution was rejected twice!"))
diff --git a/akka-actor/src/main/scala/akka/dispatch/Future.scala b/akka-actor/src/main/scala/akka/dispatch/Future.scala
index dccb603e67..7c874f705c 100644
--- a/akka-actor/src/main/scala/akka/dispatch/Future.scala
+++ b/akka-actor/src/main/scala/akka/dispatch/Future.scala
@@ -20,7 +20,7 @@ import akka.annotation.InternalApi
import akka.annotation.InternalStableApi
import akka.compat
import akka.dispatch.internal.SameThreadExecutionContext
-import akka.japi.{ Procedure, Function => JFunc, Option => JOption }
+import akka.japi.{ Function => JFunc, Option => JOption, Procedure }
import akka.util.unused
/**
diff --git a/akka-actor/src/main/scala/akka/dispatch/Mailbox.scala b/akka-actor/src/main/scala/akka/dispatch/Mailbox.scala
index 6bde0d2251..2238b3e51e 100644
--- a/akka-actor/src/main/scala/akka/dispatch/Mailbox.scala
+++ b/akka-actor/src/main/scala/akka/dispatch/Mailbox.scala
@@ -106,10 +106,10 @@ private[akka] abstract class Mailbox(val messageQueue: MessageQueue)
def numberOfMessages: Int = messageQueue.numberOfMessages
@volatile
- protected var _statusDoNotCallMeDirectly: Status = _ //0 by default
+ protected var _statusDoNotCallMeDirectly: Status = _ // 0 by default
@volatile
- protected var _systemQueueDoNotCallMeDirectly: SystemMessage = _ //null by default
+ protected var _systemQueueDoNotCallMeDirectly: SystemMessage = _ // null by default
@inline
final def currentStatus: Mailbox.Status = Unsafe.instance.getIntVolatile(this, AbstractMailbox.mailboxStatusOffset)
@@ -226,12 +226,12 @@ private[akka] abstract class Mailbox(val messageQueue: MessageQueue)
override final def run(): Unit = {
try {
- if (!isClosed) { //Volatile read, needed here
- processAllSystemMessages() //First, deal with any system messages
- processMailbox() //Then deal with messages
+ if (!isClosed) { // Volatile read, needed here
+ processAllSystemMessages() // First, deal with any system messages
+ processMailbox() // Then deal with messages
}
} finally {
- setAsIdle() //Volatile write, needed here
+ setAsIdle() // Volatile write, needed here
dispatcher.registerForExecution(this, false, false)
}
}
@@ -998,26 +998,27 @@ object BoundedControlAwareMailbox {
var remaining = pushTimeOut.toNanos
putLock.lockInterruptibly()
- val inserted = try {
- var stop = false
- while (size.get() == capacity && !stop) {
- remaining = notFull.awaitNanos(remaining)
- stop = remaining <= 0
- }
+ val inserted =
+ try {
+ var stop = false
+ while (size.get() == capacity && !stop) {
+ remaining = notFull.awaitNanos(remaining)
+ stop = remaining <= 0
+ }
- if (stop) {
- false
- } else {
- q.add(envelope)
- val c = size.incrementAndGet()
+ if (stop) {
+ false
+ } else {
+ q.add(envelope)
+ val c = size.incrementAndGet()
- if (c < capacity) notFull.signal()
+ if (c < capacity) notFull.signal()
- true
+ true
+ }
+ } finally {
+ putLock.unlock()
}
- } finally {
- putLock.unlock()
- }
if (!inserted) {
receiver
diff --git a/akka-actor/src/main/scala/akka/dispatch/Mailboxes.scala b/akka-actor/src/main/scala/akka/dispatch/Mailboxes.scala
index e05e6c0368..ddddd0e3af 100644
--- a/akka-actor/src/main/scala/akka/dispatch/Mailboxes.scala
+++ b/akka-actor/src/main/scala/akka/dispatch/Mailboxes.scala
@@ -272,7 +272,7 @@ private[akka] class Mailboxes(
private final def warn(msg: String): Unit =
eventStream.publish(Warning("mailboxes", getClass, msg))
- //INTERNAL API
+ // INTERNAL API
private def config(id: String): Config = {
import akka.util.ccompat.JavaConverters._
ConfigFactory
diff --git a/akka-actor/src/main/scala/akka/dispatch/PinnedDispatcher.scala b/akka-actor/src/main/scala/akka/dispatch/PinnedDispatcher.scala
index 4239f57a50..b9168571a8 100644
--- a/akka-actor/src/main/scala/akka/dispatch/PinnedDispatcher.scala
+++ b/akka-actor/src/main/scala/akka/dispatch/PinnedDispatcher.scala
@@ -32,7 +32,7 @@ class PinnedDispatcher(
@volatile
private var owner: ActorCell = _actor
- //Relies on an external lock provided by MessageDispatcher.attach
+ // Relies on an external lock provided by MessageDispatcher.attach
protected[akka] override def register(actorCell: ActorCell) = {
val actor = owner
if ((actor ne null) && actorCell != actor)
@@ -40,7 +40,7 @@ class PinnedDispatcher(
owner = actorCell
super.register(actorCell)
}
- //Relies on an external lock provided by MessageDispatcher.detach
+ // Relies on an external lock provided by MessageDispatcher.detach
protected[akka] override def unregister(actor: ActorCell) = {
super.unregister(actor)
owner = null
diff --git a/akka-actor/src/main/scala/akka/dispatch/affinity/AffinityPool.scala b/akka-actor/src/main/scala/akka/dispatch/affinity/AffinityPool.scala
index 0595446669..a8dec2d298 100644
--- a/akka-actor/src/main/scala/akka/dispatch/affinity/AffinityPool.scala
+++ b/akka-actor/src/main/scala/akka/dispatch/affinity/AffinityPool.scala
@@ -170,7 +170,6 @@ private[akka] class AffinityPool(
* due to an exception being thrown in user code, the worker is
* responsible for adding one more worker to compensate for its
* own termination
- *
*/
private def onWorkerExit(w: AffinityPoolWorker, abruptTermination: Boolean): Unit =
bookKeepingLock.withGuard {
@@ -410,7 +409,7 @@ private[akka] final class FairDistributionHashCache(val config: Config) extends
override def toString: String =
s"FairDistributionHashCache(fairDistributionThreshold = $fairDistributionThreshold)"
private[this] final def improve(h: Int): Int =
- 0x7FFFFFFF & (reverseBytes(h * 0x9e3775cd) * 0x9e3775cd) // `sbhash`: In memory of Phil Bagwell.
+ 0x7FFFFFFF & (reverseBytes(h * 0x9E3775CD) * 0x9E3775CD) // `sbhash`: In memory of Phil Bagwell.
override final def getQueue(command: Runnable, queues: Int): Int = {
val runnableHash = command.hashCode()
if (fairDistributionThreshold == 0)
diff --git a/akka-actor/src/main/scala/akka/dispatch/sysmsg/SystemMessage.scala b/akka-actor/src/main/scala/akka/dispatch/sysmsg/SystemMessage.scala
index 299ad1904b..331041fdc8 100644
--- a/akka-actor/src/main/scala/akka/dispatch/sysmsg/SystemMessage.scala
+++ b/akka-actor/src/main/scala/akka/dispatch/sysmsg/SystemMessage.scala
@@ -36,7 +36,6 @@ private[akka] object SystemMessageList {
}
/**
- *
* INTERNAL API
*
* Value class supporting list operations on system messages. The `next` field of [[SystemMessage]]
@@ -48,7 +47,6 @@ private[akka] object SystemMessageList {
*
* The type of the list also encodes that the messages contained are in reverse order, i.e. the head of the list is the
* latest appended element.
- *
*/
private[akka] class LatestFirstSystemMessageList(val head: SystemMessage) extends AnyVal {
import SystemMessageList._
@@ -97,7 +95,6 @@ private[akka] class LatestFirstSystemMessageList(val head: SystemMessage) extend
}
/**
- *
* INTERNAL API
*
* Value class supporting list operations on system messages. The `next` field of [[SystemMessage]]
@@ -109,7 +106,6 @@ private[akka] class LatestFirstSystemMessageList(val head: SystemMessage) extend
*
* This list type also encodes that the messages contained are in reverse order, i.e. the head of the list is the
* latest appended element.
- *
*/
private[akka] class EarliestFirstSystemMessageList(val head: SystemMessage) extends AnyVal {
import SystemMessageList._
diff --git a/akka-actor/src/main/scala/akka/event/EventBus.scala b/akka-actor/src/main/scala/akka/event/EventBus.scala
index 80aa6c5e3d..1d36e70dde 100644
--- a/akka-actor/src/main/scala/akka/event/EventBus.scala
+++ b/akka-actor/src/main/scala/akka/event/EventBus.scala
@@ -25,7 +25,7 @@ trait EventBus {
type Classifier
type Subscriber
- //#event-bus-api
+ // #event-bus-api
/**
* Attempts to register the subscriber to the specified Classifier
* @return true if successful and false if not (because it was already
@@ -49,7 +49,7 @@ trait EventBus {
* Publishes the specified Event to this bus
*/
def publish(event: Event): Unit
- //#event-bus-api
+ // #event-bus-api
}
/**
@@ -82,9 +82,10 @@ trait PredicateClassifier { this: EventBus =>
*/
trait LookupClassification { this: EventBus =>
- protected final val subscribers = new Index[Classifier, Subscriber](mapSize(), new Comparator[Subscriber] {
- def compare(a: Subscriber, b: Subscriber): Int = compareSubscribers(a, b)
- })
+ protected final val subscribers = new Index[Classifier, Subscriber](mapSize(),
+ new Comparator[Subscriber] {
+ def compare(a: Subscriber, b: Subscriber): Int = compareSubscribers(a, b)
+ })
/**
* This is a size hint for the number of Classifiers you expect to have (use powers of 2)
@@ -297,7 +298,7 @@ trait ManagedActorClassification { this: ActorEventBus with ActorClassifier =>
/** The unsubscriber takes care of unsubscribing actors, which have terminated. */
protected lazy val unsubscriber =
- ActorClassificationUnsubscriber.start(system, this.toString(), (this.unsubscribe: ActorRef => Unit))
+ ActorClassificationUnsubscriber.start(system, this.toString(), this.unsubscribe: ActorRef => Unit)
@tailrec
protected final def associate(monitored: ActorRef, monitor: ActorRef): Boolean = {
diff --git a/akka-actor/src/main/scala/akka/event/Logging.scala b/akka-actor/src/main/scala/akka/event/Logging.scala
index 50ba6893fd..c203f284e5 100644
--- a/akka-actor/src/main/scala/akka/event/Logging.scala
+++ b/akka-actor/src/main/scala/akka/event/Logging.scala
@@ -144,12 +144,13 @@ trait LoggingBus extends ActorEventBus {
try {
if (system.settings.DebugUnhandledMessage)
subscribe(
- system.systemActorOf(Props(new Actor {
- def receive = {
- case UnhandledMessage(msg, sender, rcp) =>
- publish(Debug(rcp.path.toString, rcp.getClass, "unhandled message from " + sender + ": " + msg))
- }
- }), "UnhandledMessageForwarder"),
+ system.systemActorOf(
+ Props(new Actor {
+ def receive = {
+ case UnhandledMessage(msg, sender, rcp) =>
+ publish(Debug(rcp.path.toString, rcp.getClass, "unhandled message from " + sender + ": " + msg))
+ }
+ }), "UnhandledMessageForwarder"),
classOf[UnhandledMessage])
} catch {
case _: InvalidActorNameException => // ignore if it is already running
@@ -202,16 +203,17 @@ trait LoggingBus extends ActorEventBus {
val actor = system.systemActorOf(Props(clazz).withDispatcher(system.settings.LoggersDispatcher), name)
implicit def timeout: Timeout = system.settings.LoggerStartTimeout
import akka.pattern.ask
- val response = try Await.result(actor ? InitializeLogger(this), timeout.duration)
- catch {
- case _: TimeoutException =>
- publish(
- Warning(
- logName,
- this.getClass,
- "Logger " + name + " did not respond within " + timeout + " to InitializeLogger(bus)"))
- "[TIMEOUT]"
- }
+ val response =
+ try Await.result(actor ? InitializeLogger(this), timeout.duration)
+ catch {
+ case _: TimeoutException =>
+ publish(
+ Warning(
+ logName,
+ this.getClass,
+ "Logger " + name + " did not respond within " + timeout + " to InitializeLogger(bus)"))
+ "[TIMEOUT]"
+ }
if (response != LoggerInitialized)
throw new LoggerInitializationException(
"Logger " + name + " did not respond with LoggerInitialized, sent instead " + response)
@@ -1671,7 +1673,7 @@ trait DiagnosticLoggingAdapter extends LoggingAdapter {
def clearMDC(): Unit = mdc(emptyMDC)
}
-/** DO NOT INHERIT: Class is open only for use by akka-slf4j*/
+/** DO NOT INHERIT: Class is open only for use by akka-slf4j */
@DoNotInherit
class LogMarker(val name: String, val properties: Map[String, Any]) {
diff --git a/akka-actor/src/main/scala/akka/event/LoggingReceive.scala b/akka-actor/src/main/scala/akka/event/LoggingReceive.scala
index 9f6b601b57..5230a0c395 100644
--- a/akka-actor/src/main/scala/akka/event/LoggingReceive.scala
+++ b/akka-actor/src/main/scala/akka/event/LoggingReceive.scala
@@ -80,7 +80,7 @@ class LoggingReceive(source: Option[AnyRef], r: Receive, label: Option[String],
val src = source.getOrElse(context.asInstanceOf[ActorCell].actor)
val (str, clazz) = LogSource.fromAnyRef(src)
val message = "received " + (if (handled) "handled" else "unhandled") + " message " + o + " from " + context
- .sender() +
+ .sender() +
(label match {
case Some(l) => " in state " + l
case _ => ""
diff --git a/akka-actor/src/main/scala/akka/io/DirectByteBufferPool.scala b/akka-actor/src/main/scala/akka/io/DirectByteBufferPool.scala
index d7a9dffdd9..706125109b 100644
--- a/akka-actor/src/main/scala/akka/io/DirectByteBufferPool.scala
+++ b/akka-actor/src/main/scala/akka/io/DirectByteBufferPool.scala
@@ -88,9 +88,10 @@ private[akka] object DirectByteBufferPool {
{ (bb: ByteBuffer) =>
try if (bb.isDirect) {
- val cleaner = cleanerMethod.invoke(bb)
- cleanMethod.invoke(cleaner)
- } catch { case NonFatal(_) => /* ok, best effort attempt to cleanup failed */ }
+ val cleaner = cleanerMethod.invoke(bb)
+ cleanMethod.invoke(cleaner)
+ }
+ catch { case NonFatal(_) => /* ok, best effort attempt to cleanup failed */ }
}
} catch { case NonFatal(_) => _ => () /* reflection failed, use no-op fallback */ }
diff --git a/akka-actor/src/main/scala/akka/io/Dns.scala b/akka-actor/src/main/scala/akka/io/Dns.scala
index ceb92e2c54..b529122b2a 100644
--- a/akka-actor/src/main/scala/akka/io/Dns.scala
+++ b/akka-actor/src/main/scala/akka/io/Dns.scala
@@ -95,10 +95,11 @@ object Dns extends ExtensionId[DnsExt] with ExtensionIdProvider {
@deprecated("Use cached(DnsProtocol.Resolve)", "2.6.0")
def apply(newProtocol: DnsProtocol.Resolved): Resolved = {
- Resolved(newProtocol.name, newProtocol.records.collect {
- case r: ARecord => r.ip
- case r: AAAARecord => r.ip
- })
+ Resolved(newProtocol.name,
+ newProtocol.records.collect {
+ case r: ARecord => r.ip
+ case r: AAAARecord => r.ip
+ })
}
}
diff --git a/akka-actor/src/main/scala/akka/io/DnsProvider.scala b/akka-actor/src/main/scala/akka/io/DnsProvider.scala
index 9a735a63d0..d2f23aee47 100644
--- a/akka-actor/src/main/scala/akka/io/DnsProvider.scala
+++ b/akka-actor/src/main/scala/akka/io/DnsProvider.scala
@@ -12,7 +12,6 @@ import akka.actor.Actor
* It is expected that this will be deprecated/removed in future Akka versions
*
* TODO make private and remove deprecated in 2.7.0
- *
*/
@deprecated("Overriding the DNS implementation will be removed in future versions of Akka", "2.6.0")
trait DnsProvider {
diff --git a/akka-actor/src/main/scala/akka/io/SelectionHandler.scala b/akka-actor/src/main/scala/akka/io/SelectionHandler.scala
index 380328b75d..98187f8444 100644
--- a/akka-actor/src/main/scala/akka/io/SelectionHandler.scala
+++ b/akka-actor/src/main/scala/akka/io/SelectionHandler.scala
@@ -132,8 +132,9 @@ private[io] object SelectionHandler {
decision: SupervisorStrategy.Directive): Unit =
if (cause.isInstanceOf[DeathPactException]) {
try context.system.eventStream.publish {
- Logging.Debug(child.path.toString, getClass, "Closed after handler termination")
- } catch { case NonFatal(_) => }
+ Logging.Debug(child.path.toString, getClass, "Closed after handler termination")
+ }
+ catch { case NonFatal(_) => }
} else super.logFailure(context, child, cause, decision)
}
diff --git a/akka-actor/src/main/scala/akka/io/Tcp.scala b/akka-actor/src/main/scala/akka/io/Tcp.scala
index 87c0baeffc..f311f7c120 100644
--- a/akka-actor/src/main/scala/akka/io/Tcp.scala
+++ b/akka-actor/src/main/scala/akka/io/Tcp.scala
@@ -625,11 +625,11 @@ class TcpExt(system: ExtendedActorSystem) extends IO.Extension {
val FinishConnectRetries: Int =
getInt("finish-connect-retries").requiring(_ > 0, "finish-connect-retries must be > 0")
- val WindowsConnectionAbortWorkaroundEnabled
- : Boolean = getString("windows-connection-abort-workaround-enabled") match {
- case "auto" => Helpers.isWindows
- case _ => getBoolean("windows-connection-abort-workaround-enabled")
- }
+ val WindowsConnectionAbortWorkaroundEnabled: Boolean =
+ getString("windows-connection-abort-workaround-enabled") match {
+ case "auto" => Helpers.isWindows
+ case _ => getBoolean("windows-connection-abort-workaround-enabled")
+ }
private[this] def getIntBytes(path: String): Int = {
val size = getBytes(path)
@@ -640,7 +640,6 @@ class TcpExt(system: ExtendedActorSystem) extends IO.Extension {
}
/**
- *
*/
val manager: ActorRef = {
system.systemActorOf(
diff --git a/akka-actor/src/main/scala/akka/io/TcpConnection.scala b/akka-actor/src/main/scala/akka/io/TcpConnection.scala
index 986b61e1ba..1fa7fe8a4e 100644
--- a/akka-actor/src/main/scala/akka/io/TcpConnection.scala
+++ b/akka-actor/src/main/scala/akka/io/TcpConnection.scala
@@ -79,7 +79,7 @@ private[io] abstract class TcpConnection(val tcp: TcpExt, val channel: SocketCha
// if we are in push mode or already have resumed reading in pullMode while waiting for Register
// then register OP_READ interest
- if (!pullMode || (/*pullMode && */ !readingSuspended)) resumeReading(info, None)
+ if (!pullMode || ( /*pullMode && */ !readingSuspended)) resumeReading(info, None)
case ResumeReading =>
readingSuspended = false
@@ -286,16 +286,17 @@ private[io] abstract class TcpConnection(val tcp: TcpExt, val channel: SocketCha
val buffer = bufferPool.acquire()
try innerRead(buffer, ReceivedMessageSizeLimit) match {
- case AllRead => // nothing to do
- case MoreDataWaiting =>
- if (!pullMode) self ! ChannelReadable
- case EndOfStream if channel.socket.isOutputShutdown =>
- if (TraceLogging) log.debug("Read returned end-of-stream, our side already closed")
- doCloseConnection(info.handler, closeCommander, ConfirmedClosed)
- case EndOfStream =>
- if (TraceLogging) log.debug("Read returned end-of-stream, our side not yet closed")
- handleClose(info, closeCommander, PeerClosed)
- } catch {
+ case AllRead => // nothing to do
+ case MoreDataWaiting =>
+ if (!pullMode) self ! ChannelReadable
+ case EndOfStream if channel.socket.isOutputShutdown =>
+ if (TraceLogging) log.debug("Read returned end-of-stream, our side already closed")
+ doCloseConnection(info.handler, closeCommander, ConfirmedClosed)
+ case EndOfStream =>
+ if (TraceLogging) log.debug("Read returned end-of-stream, our side not yet closed")
+ handleClose(info, closeCommander, PeerClosed)
+ }
+ catch {
case e: IOException => handleError(info.handler, e)
} finally bufferPool.release(buffer)
}
@@ -529,7 +530,7 @@ private[io] abstract class TcpConnection(val tcp: TcpExt, val channel: SocketCha
self ! UpdatePendingWriteAndThen(updated, TcpConnection.doNothing)
} else {
release()
- val andThen = if (!ack.isInstanceOf[NoAck])() => commander ! ack else doNothing
+ val andThen = if (!ack.isInstanceOf[NoAck]) () => commander ! ack else doNothing
self ! UpdatePendingWriteAndThen(PendingWrite(commander, tail), andThen)
}
} catch {
diff --git a/akka-actor/src/main/scala/akka/io/TcpManager.scala b/akka-actor/src/main/scala/akka/io/TcpManager.scala
index f94401ed9e..af5f842180 100644
--- a/akka-actor/src/main/scala/akka/io/TcpManager.scala
+++ b/akka-actor/src/main/scala/akka/io/TcpManager.scala
@@ -43,7 +43,6 @@ import akka.actor.{ ActorLogging, Props }
* If the connect request is rejected because the Tcp system is not able to register more channels (see the nr-of-selectors
* and max-channels configuration options in the akka.io.tcp section of the configuration) the sender will be notified
* with a [[akka.io.Tcp.CommandFailed]] message. This message contains the original command for reference.
- *
*/
private[io] class TcpManager(tcp: TcpExt)
extends SelectionHandler.SelectorBasedManager(tcp.Settings, tcp.Settings.NrOfSelectors)
@@ -52,11 +51,11 @@ private[io] class TcpManager(tcp: TcpExt)
def receive = workerForCommandHandler {
case c: Connect =>
val commander = sender() // cache because we create a function that will run asynchly
- (registry => Props(classOf[TcpOutgoingConnection], tcp, registry, commander, c))
+ registry => Props(classOf[TcpOutgoingConnection], tcp, registry, commander, c)
case b: Bind =>
val commander = sender() // cache because we create a function that will run asynchly
- (registry => Props(classOf[TcpListener], selectorPool, tcp, registry, commander, b))
+ registry => Props(classOf[TcpListener], selectorPool, tcp, registry, commander, b)
}
}
diff --git a/akka-actor/src/main/scala/akka/io/TcpOutgoingConnection.scala b/akka-actor/src/main/scala/akka/io/TcpOutgoingConnection.scala
index 3f1e709f1b..98c2e3a33c 100644
--- a/akka-actor/src/main/scala/akka/io/TcpOutgoingConnection.scala
+++ b/akka-actor/src/main/scala/akka/io/TcpOutgoingConnection.scala
@@ -43,7 +43,7 @@ private[io] class TcpOutgoingConnection(
options.foreach(_.beforeConnect(channel.socket))
localAddress.foreach(channel.socket.bind)
channelRegistry.register(channel, 0)
- timeout.foreach(context.setReceiveTimeout) //Initiate connection timeout if supplied
+ timeout.foreach(context.setReceiveTimeout) // Initiate connection timeout if supplied
private def stop(cause: Throwable): Unit =
stopWith(CloseInformation(Set(commander), CommandFailed(connect).withCause(cause)), shouldAbort = true)
diff --git a/akka-actor/src/main/scala/akka/io/UdpManager.scala b/akka-actor/src/main/scala/akka/io/UdpManager.scala
index 462f7621e5..8054b6ad55 100644
--- a/akka-actor/src/main/scala/akka/io/UdpManager.scala
+++ b/akka-actor/src/main/scala/akka/io/UdpManager.scala
@@ -42,7 +42,6 @@ import akka.io.Udp._
* message that the service is available. UDP datagrams can be sent by sending [[akka.io.Udp.Send]] messages to the
* sender of SimpleSenderReady. All the datagrams will contain an ephemeral local port as sender and answers will be
* discarded.
- *
*/
private[io] class UdpManager(udp: UdpExt)
extends SelectionHandler.SelectorBasedManager(udp.settings, udp.settings.NrOfSelectors) {
@@ -50,11 +49,11 @@ private[io] class UdpManager(udp: UdpExt)
def receive = workerForCommandHandler {
case b: Bind =>
val commander = sender() // cache because we create a function that will run asynchly
- (registry => Props(classOf[UdpListener], udp, registry, commander, b))
+ registry => Props(classOf[UdpListener], udp, registry, commander, b)
case s: SimpleSender =>
val commander = sender() // cache because we create a function that will run asynchly
- (registry => Props(classOf[UdpSender], udp, registry, commander, s.options))
+ registry => Props(classOf[UdpSender], udp, registry, commander, s.options)
}
}
diff --git a/akka-actor/src/main/scala/akka/io/dns/DnsProtocol.scala b/akka-actor/src/main/scala/akka/io/dns/DnsProtocol.scala
index 551e959e67..ef22137a93 100644
--- a/akka-actor/src/main/scala/akka/io/dns/DnsProtocol.scala
+++ b/akka-actor/src/main/scala/akka/io/dns/DnsProtocol.scala
@@ -24,7 +24,6 @@ import akka.util.ccompat.JavaConverters._
*
* Allows for more detailed lookups, by specifying which records should be checked,
* and responses can more information than plain IP addresses (e.g. ports for SRV records).
- *
*/
object DnsProtocol {
@@ -88,13 +87,12 @@ object DnsProtocol {
* Java API
*
* Records that relate to the query but are not strickly answers e.g. A records for the records returned for an SRV query.
- *
*/
def getAdditionalRecords(): util.List[ResourceRecord] = additionalRecords.asJava
private val _address: Option[InetAddress] = {
val ipv4: Option[Inet4Address] = records.collectFirst { case ARecord(_, _, ip: Inet4Address) => ip }
- val ipv6: Option[Inet6Address] = records.collectFirst { case AAAARecord(_, _, ip) => ip }
+ val ipv6: Option[Inet6Address] = records.collectFirst { case AAAARecord(_, _, ip) => ip }
IpVersionSelector.getInetAddress(ipv4, ipv6)
}
diff --git a/akka-actor/src/main/scala/akka/io/dns/DnsResourceRecords.scala b/akka-actor/src/main/scala/akka/io/dns/DnsResourceRecords.scala
index 552029265a..fcfabbbdb4 100644
--- a/akka-actor/src/main/scala/akka/io/dns/DnsResourceRecords.scala
+++ b/akka-actor/src/main/scala/akka/io/dns/DnsResourceRecords.scala
@@ -150,7 +150,7 @@ private[dns] object ResourceRecord {
// If the number of cases increase remember to add a `@switch` annotation e.g.:
// val ttl = (it.getInt: @switch) match {
// According to https://www.ietf.org/rfc/rfc1035.txt: "TTL: positive values of a signed 32 bit number."
- val ttl = (it.getInt) match {
+ val ttl = it.getInt match {
case 0 => Ttl.never
case nonZero => Ttl.fromPositive(nonZero.seconds)
}
diff --git a/akka-actor/src/main/scala/akka/io/dns/internal/AsyncDnsManager.scala b/akka-actor/src/main/scala/akka/io/dns/internal/AsyncDnsManager.scala
index 6fa99d734b..046e9fd213 100644
--- a/akka-actor/src/main/scala/akka/io/dns/internal/AsyncDnsManager.scala
+++ b/akka-actor/src/main/scala/akka/io/dns/internal/AsyncDnsManager.scala
@@ -71,9 +71,10 @@ private[io] final class AsyncDnsManager(
private val resolver = {
val props: Props = FromConfig.props(
- Props(provider.actorClass, settings, cache, (factory: ActorRefFactory, dns: List[InetSocketAddress]) => {
- dns.map(ns => factory.actorOf(Props(new DnsClient(ns))))
- }).withDeploy(Deploy.local).withDispatcher(dispatcher))
+ Props(provider.actorClass, settings, cache,
+ (factory: ActorRefFactory, dns: List[InetSocketAddress]) => {
+ dns.map(ns => factory.actorOf(Props(new DnsClient(ns))))
+ }).withDeploy(Deploy.local).withDispatcher(dispatcher))
context.actorOf(props, name)
}
diff --git a/akka-actor/src/main/scala/akka/io/dns/internal/DnsMessage.scala b/akka-actor/src/main/scala/akka/io/dns/internal/DnsMessage.scala
index c0a3f28a5a..e59f607547 100644
--- a/akka-actor/src/main/scala/akka/io/dns/internal/DnsMessage.scala
+++ b/akka-actor/src/main/scala/akka/io/dns/internal/DnsMessage.scala
@@ -57,7 +57,7 @@ private[internal] case class MessageFlags(flags: Short) extends AnyVal {
def isRecursionAvailable: Boolean = (flags & (1 << 7)) != 0
def responseCode: ResponseCode.Value = {
- ResponseCode(flags & 0x0f)
+ ResponseCode(flags & 0x0F)
}
override def toString: String = {
diff --git a/akka-actor/src/main/scala/akka/io/dns/internal/DomainName.scala b/akka-actor/src/main/scala/akka/io/dns/internal/DomainName.scala
index d0fb3f0902..e9d86b119f 100644
--- a/akka-actor/src/main/scala/akka/io/dns/internal/DomainName.scala
+++ b/akka-actor/src/main/scala/akka/io/dns/internal/DomainName.scala
@@ -38,8 +38,8 @@ private[akka] object DomainName {
if (ret.nonEmpty)
ret.append('.')
- if ((length & 0xc0) == 0xc0) {
- val offset = ((length.toShort & 0x3f) << 8) | (it.getByte.toShort & 0x00ff)
+ if ((length & 0xC0) == 0xC0) {
+ val offset = ((length.toShort & 0x3F) << 8) | (it.getByte.toShort & 0x00FF)
return ret.result() + parse(msg.iterator.drop(offset), msg)
}
diff --git a/akka-actor/src/main/scala/akka/pattern/AskSupport.scala b/akka-actor/src/main/scala/akka/pattern/AskSupport.scala
index 8d863a3f10..9b0222f2f4 100644
--- a/akka-actor/src/main/scala/akka/pattern/AskSupport.scala
+++ b/akka-actor/src/main/scala/akka/pattern/AskSupport.scala
@@ -81,7 +81,6 @@ trait AskSupport {
* EnrichedMessage(response)
* } pipeTo nextActor
* }}}
- *
*/
def ask(actorRef: ActorRef, message: Any)(implicit timeout: Timeout): Future[Any] =
actorRef.internalAsk(message, timeout, ActorRef.noSender)
@@ -148,7 +147,6 @@ trait AskSupport {
* EnrichedMessage(response)
* } pipeTo nextActor
* }}}
- *
*/
def ask(actorSelection: ActorSelection, message: Any)(implicit timeout: Timeout): Future[Any] =
actorSelection.internalAsk(message, timeout, ActorRef.noSender)
@@ -270,7 +268,6 @@ trait ExplicitAskSupport {
* EnrichedMessage(response)
* } pipeTo nextActor
* }}}
- *
*/
def ask(actorSelection: ActorSelection, messageFactory: ActorRef => Any)(implicit timeout: Timeout): Future[Any] =
actorSelection.internalAsk(messageFactory, timeout, ActorRef.noSender)
@@ -335,7 +332,7 @@ final class AskableActorRef(val actorRef: ActorRef) extends AnyVal {
protected def ask(message: Any, timeout: Timeout): Future[Any] =
internalAsk(message, timeout, ActorRef.noSender)
- //todo add scaladoc
+ // todo add scaladoc
def ask(message: Any)(implicit timeout: Timeout, sender: ActorRef = Actor.noSender): Future[Any] =
internalAsk(message, timeout, sender)
diff --git a/akka-actor/src/main/scala/akka/pattern/Backoff.scala b/akka-actor/src/main/scala/akka/pattern/Backoff.scala
index d2325f7ca9..64b4a9b266 100644
--- a/akka-actor/src/main/scala/akka/pattern/Backoff.scala
+++ b/akka-actor/src/main/scala/akka/pattern/Backoff.scala
@@ -68,7 +68,6 @@ object Backoff {
* @param maxNrOfRetries maximum number of attempts to restart the child actor.
* The supervisor will terminate itself after the maxNoOfRetries is reached.
* In order to restart infinitely pass in `-1`.
- *
*/
@deprecated("Use BackoffOpts.onFailure instead", "2.5.22")
def onFailure(
@@ -606,7 +605,7 @@ private final case class BackoffOptionsImpl(
}
backoffType match {
- //onFailure method in companion object
+ // onFailure method in companion object
case RestartImpliesFailure =>
Props(
new BackoffOnRestartSupervisor(
@@ -618,7 +617,7 @@ private final case class BackoffOptionsImpl(
randomFactor,
supervisorStrategy,
replyWhileStopped.map(msg => ReplyWith(msg)).getOrElse(ForwardDeathLetters)))
- //onStop method in companion object
+ // onStop method in companion object
case StopImpliesFailure =>
Props(
new BackoffOnStopSupervisor(
diff --git a/akka-actor/src/main/scala/akka/pattern/BackoffSupervisor.scala b/akka-actor/src/main/scala/akka/pattern/BackoffSupervisor.scala
index 0283a77726..facad6115c 100644
--- a/akka-actor/src/main/scala/akka/pattern/BackoffSupervisor.scala
+++ b/akka-actor/src/main/scala/akka/pattern/BackoffSupervisor.scala
@@ -323,7 +323,7 @@ object BackoffSupervisor {
}
}
-final class BackoffSupervisor @deprecated("Use `BackoffSupervisor.props` method instead", since = "2.5.22")(
+final class BackoffSupervisor @deprecated("Use `BackoffSupervisor.props` method instead", since = "2.5.22") (
override val childProps: Props,
override val childName: String,
minBackoff: FiniteDuration,
diff --git a/akka-actor/src/main/scala/akka/pattern/CircuitBreaker.scala b/akka-actor/src/main/scala/akka/pattern/CircuitBreaker.scala
index 95e4bd11d7..ba35194a44 100644
--- a/akka-actor/src/main/scala/akka/pattern/CircuitBreaker.scala
+++ b/akka-actor/src/main/scala/akka/pattern/CircuitBreaker.scala
@@ -353,7 +353,6 @@ class CircuitBreaker(
* @param body Call needing protected
* @return [[scala.concurrent.Future]] containing the call result or a
* `scala.concurrent.TimeoutException` if the call timed out
- *
*/
def withCircuitBreaker[T](body: => Future[T]): Future[T] =
currentState.invoke(body, failureFn)
@@ -408,8 +407,8 @@ class CircuitBreaker(
body: Callable[CompletionStage[T]],
defineFailureFn: BiFunction[Optional[T], Optional[Throwable], java.lang.Boolean]): CompletionStage[T] =
FutureConverters.toJava[T](callWithCircuitBreaker(new Callable[Future[T]] {
- override def call(): Future[T] = FutureConverters.toScala(body.call())
- }, defineFailureFn))
+ override def call(): Future[T] = FutureConverters.toScala(body.call())
+ }, defineFailureFn))
/**
* Wraps invocations of synchronous calls that need to be protected.
@@ -925,20 +924,17 @@ class CircuitBreaker(
/**
* Invoked when call succeeds
- *
*/
def callSucceeds(): Unit
/**
* Invoked when call fails
- *
*/
def callFails(): Unit
/**
* Invoked on the transitioned-to state during transition. Notifies listeners after invoking subclass template
* method _enter
- *
*/
final def enter(): Unit = {
_enter()
@@ -947,7 +943,6 @@ class CircuitBreaker(
/**
* Template method for concrete traits
- *
*/
def _enter(): Unit
}
diff --git a/akka-actor/src/main/scala/akka/pattern/GracefulStopSupport.scala b/akka-actor/src/main/scala/akka/pattern/GracefulStopSupport.scala
index 0703bf483c..6b0d838c89 100644
--- a/akka-actor/src/main/scala/akka/pattern/GracefulStopSupport.scala
+++ b/akka-actor/src/main/scala/akka/pattern/GracefulStopSupport.scala
@@ -53,8 +53,8 @@ trait GracefulStopSupport {
internalTarget.sendSystemMessage(Watch(internalTarget, ref))
target.tell(stopMessage, Actor.noSender)
ref.result.future.transform({
- case Terminated(t) if t.path == target.path => true
- case _ => { internalTarget.sendSystemMessage(Unwatch(target, ref)); false }
- }, t => { internalTarget.sendSystemMessage(Unwatch(target, ref)); t })(ExecutionContexts.parasitic)
+ case Terminated(t) if t.path == target.path => true
+ case _ => { internalTarget.sendSystemMessage(Unwatch(target, ref)); false }
+ }, t => { internalTarget.sendSystemMessage(Unwatch(target, ref)); t })(ExecutionContexts.parasitic)
}
}
diff --git a/akka-actor/src/main/scala/akka/routing/Balancing.scala b/akka-actor/src/main/scala/akka/routing/Balancing.scala
index d5f0333286..aab33336e8 100644
--- a/akka-actor/src/main/scala/akka/routing/Balancing.scala
+++ b/akka-actor/src/main/scala/akka/routing/Balancing.scala
@@ -144,7 +144,7 @@ final case class BalancingPool(
other match {
case p: Pool =>
if ((this.supervisorStrategy eq Pool.defaultSupervisorStrategy)
- && (p.supervisorStrategy ne Pool.defaultSupervisorStrategy))
+ && (p.supervisorStrategy ne Pool.defaultSupervisorStrategy))
this.withSupervisorStrategy(p.supervisorStrategy)
else this
diff --git a/akka-actor/src/main/scala/akka/routing/ConsistentHash.scala b/akka-actor/src/main/scala/akka/routing/ConsistentHash.scala
index 844de44174..aee861c101 100644
--- a/akka-actor/src/main/scala/akka/routing/ConsistentHash.scala
+++ b/akka-actor/src/main/scala/akka/routing/ConsistentHash.scala
@@ -17,7 +17,6 @@ import scala.reflect.ClassTag
*
* Note that toString of the ring nodes are used for the node
* hash, i.e. make sure it is different for different nodes.
- *
*/
class ConsistentHash[T: ClassTag] private (nodes: immutable.SortedMap[Int, T], val virtualNodesFactor: Int) {
@@ -41,8 +40,8 @@ class ConsistentHash[T: ClassTag] private (nodes: immutable.SortedMap[Int, T], v
def :+(node: T): ConsistentHash[T] = {
val nodeHash = hashFor(node.toString)
new ConsistentHash(nodes ++ ((1 to virtualNodesFactor).map { r =>
- (concatenateNodeHash(nodeHash, r) -> node)
- }), virtualNodesFactor)
+ concatenateNodeHash(nodeHash, r) -> node
+ }), virtualNodesFactor)
}
/**
@@ -60,8 +59,8 @@ class ConsistentHash[T: ClassTag] private (nodes: immutable.SortedMap[Int, T], v
def :-(node: T): ConsistentHash[T] = {
val nodeHash = hashFor(node.toString)
new ConsistentHash(nodes -- ((1 to virtualNodesFactor).map { r =>
- concatenateNodeHash(nodeHash, r)
- }), virtualNodesFactor)
+ concatenateNodeHash(nodeHash, r)
+ }), virtualNodesFactor)
}
/**
@@ -119,7 +118,7 @@ object ConsistentHash {
node <- nodes
nodeHash = hashFor(node.toString)
vnode <- 1 to virtualNodesFactor
- } yield (concatenateNodeHash(nodeHash, vnode) -> node)),
+ } yield concatenateNodeHash(nodeHash, vnode) -> node),
virtualNodesFactor)
}
diff --git a/akka-actor/src/main/scala/akka/routing/ConsistentHashing.scala b/akka-actor/src/main/scala/akka/routing/ConsistentHashing.scala
index c1b443bfff..6dc89b2ac3 100644
--- a/akka-actor/src/main/scala/akka/routing/ConsistentHashing.scala
+++ b/akka-actor/src/main/scala/akka/routing/ConsistentHashing.scala
@@ -143,7 +143,6 @@ object ConsistentHashingRoutingLogic {
* use for the consistent hash key
*
* @param system the actor system hosting this router
- *
*/
@SerialVersionUID(1L)
final case class ConsistentHashingRoutingLogic(
@@ -347,7 +346,7 @@ final case class ConsistentHashingPool(
*/
override def withFallback(other: RouterConfig): RouterConfig = other match {
case _: FromConfig | _: NoRouter => this.overrideUnsetConfig(other)
- case otherRouter: ConsistentHashingPool => (copy(hashMapping = otherRouter.hashMapping)).overrideUnsetConfig(other)
+ case otherRouter: ConsistentHashingPool => copy(hashMapping = otherRouter.hashMapping).overrideUnsetConfig(other)
case _ => throw new IllegalArgumentException("Expected ConsistentHashingPool, got [%s]".format(other))
}
diff --git a/akka-actor/src/main/scala/akka/routing/MurmurHash.scala b/akka-actor/src/main/scala/akka/routing/MurmurHash.scala
index 919f9c1e55..a4e70268f3 100644
--- a/akka-actor/src/main/scala/akka/routing/MurmurHash.scala
+++ b/akka-actor/src/main/scala/akka/routing/MurmurHash.scala
@@ -38,18 +38,18 @@ import akka.util.ccompat._
object MurmurHash {
// Magic values used for MurmurHash's 32 bit hash.
// Don't change these without consulting a hashing expert!
- final private val visibleMagic: Int = 0x971e137b
+ final private val visibleMagic: Int = 0x971E137B
final private val hiddenMagicA: Int = 0x95543787
- final private val hiddenMagicB: Int = 0x2ad7eb25
- final private val visibleMixer: Int = 0x52dce729
- final private val hiddenMixerA: Int = 0x7b7d159c
- final private val hiddenMixerB: Int = 0x6bce6396
- final private val finalMixer1: Int = 0x85ebca6b
- final private val finalMixer2: Int = 0xc2b2ae35
+ final private val hiddenMagicB: Int = 0x2AD7EB25
+ final private val visibleMixer: Int = 0x52DCE729
+ final private val hiddenMixerA: Int = 0x7B7D159C
+ final private val hiddenMixerB: Int = 0x6BCE6396
+ final private val finalMixer1: Int = 0x85EBCA6B
+ final private val finalMixer2: Int = 0xC2B2AE35
// Arbitrary values used for hashing certain classes
- final private val seedString: Int = 0xf7ca7fd2
- final private val seedArray: Int = 0x3c074a61
+ final private val seedString: Int = 0xF7CA7FD2
+ final private val seedArray: Int = 0x3C074A61
/** The first 23 magic integers from the first stream are stored here */
private val storedMagicA: Array[Int] =
@@ -88,7 +88,7 @@ object MurmurHash {
/** Once all hashes have been incorporated, this performs a final mixing */
def finalizeHash(hash: Int): Int = {
- var i = (hash ^ (hash >>> 16))
+ var i = hash ^ (hash >>> 16)
i *= finalMixer1
i ^= (i >>> 13)
i *= finalMixer2
diff --git a/akka-actor/src/main/scala/akka/routing/OptimalSizeExploringResizer.scala b/akka-actor/src/main/scala/akka/routing/OptimalSizeExploringResizer.scala
index 1d71b7fdfe..9579e6f098 100644
--- a/akka-actor/src/main/scala/akka/routing/OptimalSizeExploringResizer.scala
+++ b/akka-actor/src/main/scala/akka/routing/OptimalSizeExploringResizer.scala
@@ -114,7 +114,6 @@ case object OptimalSizeExploringResizer {
*
* For documentation about the parameters, see the reference.conf -
* akka.actor.deployment.default.optimal-size-exploring-resizer
- *
*/
@SerialVersionUID(1L)
case class DefaultOptimalSizeExploringResizer(
@@ -237,7 +236,7 @@ case class DefaultOptimalSizeExploringResizer(
if (totalProcessed > 0) {
val duration = Duration.fromNanos(System.nanoTime() - record.checkTime)
val last: Duration = duration / totalProcessed
- //exponentially decrease the weight of old last metrics data
+ // exponentially decrease the weight of old last metrics data
val toUpdate = performanceLog.get(currentSize).fold(last) { oldSpeed =>
(oldSpeed * (1.0 - weightOfLatestMetric)) + (last * weightOfLatestMetric)
}
@@ -259,7 +258,8 @@ case class DefaultOptimalSizeExploringResizer(
val currentSize = currentRoutees.length
val now = LocalDateTime.now
val proposedChange =
- if (record.underutilizationStreak.fold(false)(_.start.isBefore(now.minus(downsizeAfterUnderutilizedFor.asJava)))) {
+ if (record.underutilizationStreak.fold(false)(
+ _.start.isBefore(now.minus(downsizeAfterUnderutilizedFor.asJava)))) {
val downsizeTo = (record.underutilizationStreak.get.highestUtilization * downsizeRatio).toInt
Math.min(downsizeTo - currentSize, 0)
} else if (performanceLog.isEmpty || record.underutilizationStreak.isDefined) {
diff --git a/akka-actor/src/main/scala/akka/routing/Resizer.scala b/akka-actor/src/main/scala/akka/routing/Resizer.scala
index 70dbb9b82b..c5ce29a8b8 100644
--- a/akka-actor/src/main/scala/akka/routing/Resizer.scala
+++ b/akka-actor/src/main/scala/akka/routing/Resizer.scala
@@ -153,7 +153,7 @@ case class DefaultResizer(
if (messagesPerResize <= 0)
throw new IllegalArgumentException("messagesPerResize must be > 0, was [%s]".format(messagesPerResize))
- def isTimeForResize(messageCounter: Long): Boolean = (messageCounter % messagesPerResize == 0)
+ def isTimeForResize(messageCounter: Long): Boolean = messageCounter % messagesPerResize == 0
override def resize(currentRoutees: immutable.IndexedSeq[Routee]): Int =
capacity(currentRoutees)
@@ -275,7 +275,7 @@ private[akka] final class ResizablePoolCell(
override def sendMessage(envelope: Envelope): Unit = {
if (!routerConfig.isManagementMessage(envelope.message) &&
- resizer.isTimeForResize(resizeCounter.getAndIncrement()) && resizeInProgress.compareAndSet(false, true)) {
+ resizer.isTimeForResize(resizeCounter.getAndIncrement()) && resizeInProgress.compareAndSet(false, true)) {
super.sendMessage(Envelope(ResizablePoolActor.Resize, self, system))
}
@@ -283,18 +283,19 @@ private[akka] final class ResizablePoolCell(
}
private[akka] def resize(initial: Boolean): Unit = {
- if (resizeInProgress.get || initial) try {
- tryReportMessageCount()
- val requestedCapacity = resizer.resize(router.routees)
- if (requestedCapacity > 0) {
- val newRoutees = Vector.fill(requestedCapacity)(pool.newRoutee(routeeProps, this))
- addRoutees(newRoutees)
- } else if (requestedCapacity < 0) {
- val currentRoutees = router.routees
- val abandon = currentRoutees.drop(currentRoutees.length + requestedCapacity)
- removeRoutees(abandon, stopChild = true)
- }
- } finally resizeInProgress.set(false)
+ if (resizeInProgress.get || initial)
+ try {
+ tryReportMessageCount()
+ val requestedCapacity = resizer.resize(router.routees)
+ if (requestedCapacity > 0) {
+ val newRoutees = Vector.fill(requestedCapacity)(pool.newRoutee(routeeProps, this))
+ addRoutees(newRoutees)
+ } else if (requestedCapacity < 0) {
+ val currentRoutees = router.routees
+ val abandon = currentRoutees.drop(currentRoutees.length + requestedCapacity)
+ removeRoutees(abandon, stopChild = true)
+ }
+ } finally resizeInProgress.set(false)
}
/**
@@ -303,7 +304,7 @@ private[akka] final class ResizablePoolCell(
private def tryReportMessageCount(): Unit = {
resizer match {
case r: OptimalSizeExploringResizer => r.reportMessageCount(router.routees, resizeCounter.get())
- case _ => //ignore
+ case _ => // ignore
}
}
diff --git a/akka-actor/src/main/scala/akka/routing/RouterConfig.scala b/akka-actor/src/main/scala/akka/routing/RouterConfig.scala
index 9a33ce85f3..10403d07ff 100644
--- a/akka-actor/src/main/scala/akka/routing/RouterConfig.scala
+++ b/akka-actor/src/main/scala/akka/routing/RouterConfig.scala
@@ -113,7 +113,7 @@ private[akka] trait PoolOverrideUnsetConfig[T <: Pool] extends Pool {
case p: Pool =>
val wssConf: PoolOverrideUnsetConfig[T] =
if ((this.supervisorStrategy eq Pool.defaultSupervisorStrategy)
- && (p.supervisorStrategy ne Pool.defaultSupervisorStrategy))
+ && (p.supervisorStrategy ne Pool.defaultSupervisorStrategy))
this.withSupervisorStrategy(p.supervisorStrategy).asInstanceOf[PoolOverrideUnsetConfig[T]]
else this
@@ -426,7 +426,6 @@ final case class AddRoutee(routee: Routee) extends RouterManagementMesssage
* For a pool, with child routees, the routee is stopped by sending a [[akka.actor.PoisonPill]]
* to the routee. Precautions are taken reduce the risk of dropping messages that are concurrently
* being routed to the removed routee, but there are no guarantees.
- *
*/
@SerialVersionUID(1L)
final case class RemoveRoutee(routee: Routee) extends RouterManagementMesssage
diff --git a/akka-actor/src/main/scala/akka/routing/SmallestMailbox.scala b/akka-actor/src/main/scala/akka/routing/SmallestMailbox.scala
index 54bfea0e5a..0ce5ab9b79 100644
--- a/akka-actor/src/main/scala/akka/routing/SmallestMailbox.scala
+++ b/akka-actor/src/main/scala/akka/routing/SmallestMailbox.scala
@@ -67,12 +67,12 @@ class SmallestMailboxRoutingLogic extends RoutingLogic {
val target = targets(at)
val newScore: Long =
if (isSuspended(target)) Long.MaxValue - 1
- else { //Just about better than the DeadLetters
+ else { // Just about better than the DeadLetters
(if (isProcessingMessage(target)) 1L else 0L) +
(if (!hasMessages(target)) 0L
- else { //Race between hasMessages and numberOfMessages here, unfortunate the numberOfMessages returns 0 if unknown
+ else { // Race between hasMessages and numberOfMessages here, unfortunate the numberOfMessages returns 0 if unknown
val noOfMsgs: Long = if (deep) numberOfMessages(target) else 0
- if (noOfMsgs > 0) noOfMsgs else Long.MaxValue - 3 //Just better than a suspended actorref
+ if (noOfMsgs > 0) noOfMsgs else Long.MaxValue - 3 // Just better than a suspended actorref
})
}
diff --git a/akka-actor/src/main/scala/akka/serialization/Serialization.scala b/akka-actor/src/main/scala/akka/serialization/Serialization.scala
index d1bbe9af33..65e3ae8c67 100644
--- a/akka-actor/src/main/scala/akka/serialization/Serialization.scala
+++ b/akka-actor/src/main/scala/akka/serialization/Serialization.scala
@@ -48,7 +48,7 @@ object Serialization {
private final def configToMap(cfg: Config): Map[String, String] = {
import akka.util.ccompat.JavaConverters._
- cfg.root.unwrapped.asScala.toMap.map { case (k, v) => (k -> v.toString) }
+ cfg.root.unwrapped.asScala.toMap.map { case (k, v) => k -> v.toString }
}
}
@@ -176,14 +176,15 @@ class Serialization(val system: ExtendedActorSystem) extends Extension {
@deprecated("Use deserialize that accepts the `manifest` as a class name.", since = "2.6.0")
def deserialize[T](bytes: Array[Byte], serializerId: Int, clazz: Option[Class[_ <: T]]): Try[T] =
Try {
- val serializer = try getSerializerById(serializerId)
- catch {
- case _: NoSuchElementException =>
- throw new NotSerializableException(
- s"Cannot find serializer with id [$serializerId]${clazz.map(c => " (class [" + c.getName + "])").getOrElse("")}. " +
- "The most probable reason is that the configuration entry " +
- "akka.actor.serializers is not in sync between the two systems.")
- }
+ val serializer =
+ try getSerializerById(serializerId)
+ catch {
+ case _: NoSuchElementException =>
+ throw new NotSerializableException(
+ s"Cannot find serializer with id [$serializerId]${clazz.map(c => " (class [" + c.getName + "])").getOrElse("")}. " +
+ "The most probable reason is that the configuration entry " +
+ "akka.actor.serializers is not in sync between the two systems.")
+ }
withTransportInformation { () =>
serializer.fromBinary(bytes, clazz).asInstanceOf[T]
}
@@ -196,13 +197,14 @@ class Serialization(val system: ExtendedActorSystem) extends Extension {
*/
def deserialize(bytes: Array[Byte], serializerId: Int, manifest: String): Try[AnyRef] =
Try {
- val serializer = try getSerializerById(serializerId)
- catch {
- case _: NoSuchElementException =>
- throw new NotSerializableException(
- s"Cannot find serializer with id [$serializerId] (manifest [$manifest]). The most probable reason is that the configuration entry " +
- "akka.actor.serializers is not in sync between the two systems.")
- }
+ val serializer =
+ try getSerializerById(serializerId)
+ catch {
+ case _: NoSuchElementException =>
+ throw new NotSerializableException(
+ s"Cannot find serializer with id [$serializerId] (manifest [$manifest]). The most probable reason is that the configuration entry " +
+ "akka.actor.serializers is not in sync between the two systems.")
+ }
deserializeByteArray(bytes, serializer, manifest)
}
@@ -246,13 +248,14 @@ class Serialization(val system: ExtendedActorSystem) extends Extension {
*/
@throws(classOf[NotSerializableException])
def deserializeByteBuffer(buf: ByteBuffer, serializerId: Int, manifest: String): AnyRef = {
- val serializer = try getSerializerById(serializerId)
- catch {
- case _: NoSuchElementException =>
- throw new NotSerializableException(
- s"Cannot find serializer with id [$serializerId] (manifest [$manifest]). The most probable reason is that the configuration entry " +
- "akka.actor.serializers is not in synch between the two systems.")
- }
+ val serializer =
+ try getSerializerById(serializerId)
+ catch {
+ case _: NoSuchElementException =>
+ throw new NotSerializableException(
+ s"Cannot find serializer with id [$serializerId] (manifest [$manifest]). The most probable reason is that the configuration entry " +
+ "akka.actor.serializers is not in synch between the two systems.")
+ }
// not using `withTransportInformation { () =>` because deserializeByteBuffer is supposed to be the
// possibility for allocation free serialization
@@ -483,14 +486,14 @@ class Serialization(val system: ExtendedActorSystem) extends Extension {
* obeying any order between unrelated subtypes (insert sort).
*/
private def sort(in: Iterable[ClassSerializer]): immutable.Seq[ClassSerializer] =
- (in
+ in
.foldLeft(new ArrayBuffer[ClassSerializer](in.size)) { (buf, ca) =>
buf.indexWhere(_._1.isAssignableFrom(ca._1)) match {
case -1 => buf.append(ca)
case x => buf.insert(x, ca)
}
buf
- })
+ }
.to(immutable.Seq)
/**
@@ -559,7 +562,7 @@ class Serialization(val system: ExtendedActorSystem) extends Extension {
@InternalApi private[akka] def shouldWarnAboutJavaSerializer(serializedClass: Class[_], serializer: Serializer) = {
def suppressWarningOnNonSerializationVerification(serializedClass: Class[_]) = {
- //suppressed, only when warn-on-no-serialization-verification = off, and extending NoSerializationVerificationNeeded
+ // suppressed, only when warn-on-no-serialization-verification = off, and extending NoSerializationVerificationNeeded
!isWarningOnNoVerificationEnabled && classOf[NoSerializationVerificationNeeded].isAssignableFrom(serializedClass)
}
diff --git a/akka-actor/src/main/scala/akka/serialization/Serializer.scala b/akka-actor/src/main/scala/akka/serialization/Serializer.scala
index 50960659df..cf77c5d530 100644
--- a/akka-actor/src/main/scala/akka/serialization/Serializer.scala
+++ b/akka-actor/src/main/scala/akka/serialization/Serializer.scala
@@ -177,7 +177,6 @@ abstract class SerializerWithStringManifest extends Serializer {
* // you need to know the maximum size in bytes of the serialized messages
* val pool = new akka.io.DirectByteBufferPool(defaultBufferSize = 1024 * 1024, maxPoolEntries = 10)
*
- *
* // Implement this method for compatibility with `SerializerWithStringManifest`.
* override def toBinary(o: AnyRef): Array[Byte] = {
* val buf = pool.acquire()
diff --git a/akka-actor/src/main/scala/akka/util/BoundedBlockingQueue.scala b/akka-actor/src/main/scala/akka/util/BoundedBlockingQueue.scala
index 076c1af042..dff4ee99b1 100644
--- a/akka-actor/src/main/scala/akka/util/BoundedBlockingQueue.scala
+++ b/akka-actor/src/main/scala/akka/util/BoundedBlockingQueue.scala
@@ -38,7 +38,7 @@ class BoundedBlockingQueue[E <: AnyRef](val maxCapacity: Int, private val backin
protected def createNotEmptyCondition(): Condition = lock.newCondition()
protected def createNotFullCondition(): Condition = lock.newCondition()
- def put(e: E): Unit = { //Blocks until not full
+ def put(e: E): Unit = { // Blocks until not full
if (e eq null) throw new NullPointerException
lock.lockInterruptibly()
@@ -56,7 +56,7 @@ class BoundedBlockingQueue[E <: AnyRef](val maxCapacity: Int, private val backin
} finally lock.unlock()
}
- def take(): E = { //Blocks until not empty
+ def take(): E = { // Blocks until not empty
lock.lockInterruptibly()
try {
@tailrec def takeElement(): E = {
@@ -74,26 +74,26 @@ class BoundedBlockingQueue[E <: AnyRef](val maxCapacity: Int, private val backin
} finally lock.unlock()
}
- def offer(e: E): Boolean = { //Tries to do it immediately, if fail return false
+ def offer(e: E): Boolean = { // Tries to do it immediately, if fail return false
if (e eq null) throw new NullPointerException
lock.lock()
try {
if (backing.size() == maxCapacity) false
else {
- require(backing.offer(e)) //Should never fail
+ require(backing.offer(e)) // Should never fail
notEmpty.signal()
true
}
} finally lock.unlock()
}
- def offer(e: E, timeout: Long, unit: TimeUnit): Boolean = { //Tries to do it within the timeout, return false if fail
+ def offer(e: E, timeout: Long, unit: TimeUnit): Boolean = { // Tries to do it within the timeout, return false if fail
if (e eq null) throw new NullPointerException
lock.lockInterruptibly()
try {
@tailrec def offerElement(remainingNanos: Long): Boolean = {
if (backing.size() < maxCapacity) {
- require(backing.offer(e)) //Should never fail
+ require(backing.offer(e)) // Should never fail
notEmpty.signal()
true
} else if (remainingNanos <= 0) false
@@ -103,7 +103,7 @@ class BoundedBlockingQueue[E <: AnyRef](val maxCapacity: Int, private val backin
} finally lock.unlock()
}
- def poll(timeout: Long, unit: TimeUnit): E = { //Tries to do it within the timeout, returns null if fail
+ def poll(timeout: Long, unit: TimeUnit): E = { // Tries to do it within the timeout, returns null if fail
lock.lockInterruptibly()
try {
@tailrec def pollElement(remainingNanos: Long): E = {
@@ -120,7 +120,7 @@ class BoundedBlockingQueue[E <: AnyRef](val maxCapacity: Int, private val backin
} finally lock.unlock()
}
- def poll(): E = { //Tries to remove the head of the queue immediately, if fail, return null
+ def poll(): E = { // Tries to remove the head of the queue immediately, if fail, return null
lock.lock()
try {
backing.poll() match {
@@ -132,7 +132,7 @@ class BoundedBlockingQueue[E <: AnyRef](val maxCapacity: Int, private val backin
} finally lock.unlock()
}
- override def remove(e: AnyRef): Boolean = { //Tries to do it immediately, if fail, return false
+ override def remove(e: AnyRef): Boolean = { // Tries to do it immediately, if fail, return false
if (e eq null) throw new NullPointerException
lock.lock()
try {
@@ -252,7 +252,7 @@ class BoundedBlockingQueue[E <: AnyRef](val maxCapacity: Int, private val backin
override def remove(): Unit = {
if (last < 0) throw new IllegalStateException
val target = elements(last)
- last = -1 //To avoid 2 subsequent removes without a next in between
+ last = -1 // To avoid 2 subsequent removes without a next in between
lock.lock()
try {
@tailrec def removeTarget(i: Iterator[E] = backing.iterator()): Unit =
diff --git a/akka-actor/src/main/scala/akka/util/Collections.scala b/akka-actor/src/main/scala/akka/util/Collections.scala
index e56faea859..f5d7468ac0 100644
--- a/akka-actor/src/main/scala/akka/util/Collections.scala
+++ b/akka-actor/src/main/scala/akka/util/Collections.scala
@@ -36,7 +36,7 @@ private[akka] object Collections {
_next = apply(potentiallyNext)
_hasNext = true
true
- } else tailrecHasNext() //Attempt to find the next
+ } else tailrecHasNext() // Attempt to find the next
} else _hasNext // Return if we found one
}
diff --git a/akka-actor/src/main/scala/akka/util/FrequencySketch.scala b/akka-actor/src/main/scala/akka/util/FrequencySketch.scala
index f944e29242..8930ff9b25 100644
--- a/akka-actor/src/main/scala/akka/util/FrequencySketch.scala
+++ b/akka-actor/src/main/scala/akka/util/FrequencySketch.scala
@@ -66,7 +66,7 @@ private[akka] object FrequencySketch {
* INTERNAL API
*
* A frequency sketch for estimating the popularity of items. For implementing the TinyLFU cache admission policy.
-
+ *
* This is a generalised frequency sketch with configurable depth (number of hash functions) and counter size.
*
* The matrix of counters is a two-dimensional array of longs, which each hold multiple counters depending on the
@@ -239,7 +239,7 @@ private[akka] object FastFrequencySketch {
* INTERNAL API
*
* A faster implementation of the frequency sketch (around twice as fast).
-
+ *
* This frequency sketch uses a fixed depth (number of hash functions) of 4 and a counter size of 4 bits (0-15),
* so that constants can be used for improved efficiency. It also uses its own rehashing of item hash codes.
*
@@ -301,8 +301,8 @@ private[akka] final class FastFrequencySketch[A](width: Int, resetSize: Int) {
// https://github.com/skeeto/hash-prospector
private def rehash(hash: Int): Int = {
var x = hash
- x = ((x >>> 15) ^ x) * 0xd168aaad
- x = ((x >>> 15) ^ x) * 0xaf723597
+ x = ((x >>> 15) ^ x) * 0xD168AAAD
+ x = ((x >>> 15) ^ x) * 0xAF723597
(x >>> 15) ^ x
}
diff --git a/akka-actor/src/main/scala/akka/util/HashCode.scala b/akka-actor/src/main/scala/akka/util/HashCode.scala
index fb3c756199..3eace37756 100644
--- a/akka-actor/src/main/scala/akka/util/HashCode.scala
+++ b/akka-actor/src/main/scala/akka/util/HashCode.scala
@@ -4,7 +4,7 @@
package akka.util
-import java.lang.{ Float => JFloat, Double => JDouble }
+import java.lang.{ Double => JDouble, Float => JFloat }
import java.lang.reflect.{ Array => JArray }
/**
diff --git a/akka-actor/src/main/scala/akka/util/Helpers.scala b/akka-actor/src/main/scala/akka/util/Helpers.scala
index 323eb7c80d..94db0fadfe 100644
--- a/akka-actor/src/main/scala/akka/util/Helpers.scala
+++ b/akka-actor/src/main/scala/akka/util/Helpers.scala
@@ -32,7 +32,7 @@ object Helpers {
* that the ordering is actually consistent and you cannot have a
* sequence which cyclically is monotone without end.
*/
- val diff = ((System.identityHashCode(a) & 0XFFFFFFFFL) - (System.identityHashCode(b) & 0XFFFFFFFFL))
+ val diff = (System.identityHashCode(a) & 0xFFFFFFFFL) - (System.identityHashCode(b) & 0xFFFFFFFFL)
if (diff > 0) 1 else if (diff < 0) -1 else 0
}
diff --git a/akka-actor/src/main/scala/akka/util/Index.scala b/akka-actor/src/main/scala/akka/util/Index.scala
index fd6938e3b8..a28180c810 100644
--- a/akka-actor/src/main/scala/akka/util/Index.scala
+++ b/akka-actor/src/main/scala/akka/util/Index.scala
@@ -32,7 +32,7 @@ class Index[K, V](val mapSize: Int, val valueComparator: Comparator[V]) {
* @return true if the value didn't exist for the key previously, and false otherwise
*/
def put(key: K, value: V): Boolean = {
- //Tailrecursive spin-locking put
+ // Tailrecursive spin-locking put
@tailrec
def spinPut(k: K, v: V): Boolean = {
var retry = false
@@ -41,8 +41,8 @@ class Index[K, V](val mapSize: Int, val valueComparator: Comparator[V]) {
if (set ne null) {
set.synchronized {
- if (set.isEmpty) retry = true //IF the set is empty then it has been removed, so signal retry
- else { //Else add the value to the set and signal that retry is not needed
+ if (set.isEmpty) retry = true // IF the set is empty then it has been removed, so signal retry
+ else { // Else add the value to the set and signal that retry is not needed
added = set.add(v)
retry = false
}
@@ -55,8 +55,8 @@ class Index[K, V](val mapSize: Int, val valueComparator: Comparator[V]) {
val oldSet = container.putIfAbsent(k, newSet)
if (oldSet ne null) {
oldSet.synchronized {
- if (oldSet.isEmpty) retry = true //IF the set is empty then it has been removed, so signal retry
- else { //Else try to add the value to the set and signal that retry is not needed
+ if (oldSet.isEmpty) retry = true // IF the set is empty then it has been removed, so signal retry
+ else { // Else try to add the value to the set and signal that retry is not needed
added = oldSet.add(v)
retry = false
}
@@ -125,14 +125,14 @@ class Index[K, V](val mapSize: Int, val valueComparator: Comparator[V]) {
if (set ne null) {
set.synchronized {
- if (set.remove(value)) { //If we can remove the value
- if (set.isEmpty) //and the set becomes empty
- container.remove(key, emptySet) //We try to remove the key if it's mapped to an empty set
+ if (set.remove(value)) { // If we can remove the value
+ if (set.isEmpty) // and the set becomes empty
+ container.remove(key, emptySet) // We try to remove the key if it's mapped to an empty set
- true //Remove succeeded
- } else false //Remove failed
+ true // Remove succeeded
+ } else false // Remove failed
}
- } else false //Remove failed
+ } else false // Remove failed
}
/**
@@ -150,7 +150,7 @@ class Index[K, V](val mapSize: Int, val valueComparator: Comparator[V]) {
set.clear() // Clear the original set to signal to any pending writers that there was a conflict
Some(ret)
}
- } else None //Remove failed
+ } else None // Remove failed
}
/**
@@ -164,9 +164,9 @@ class Index[K, V](val mapSize: Int, val valueComparator: Comparator[V]) {
if (set ne null) {
set.synchronized {
- if (set.remove(value)) { //If we can remove the value
- if (set.isEmpty) //and the set becomes empty
- container.remove(e.getKey, emptySet) //We try to remove the key if it's mapped to an empty set
+ if (set.remove(value)) { // If we can remove the value
+ if (set.isEmpty) // and the set becomes empty
+ container.remove(e.getKey, emptySet) // We try to remove the key if it's mapped to an empty set
}
}
}
diff --git a/akka-actor/src/main/scala/akka/util/LineNumbers.scala b/akka-actor/src/main/scala/akka/util/LineNumbers.scala
index 7298b01270..8a1d577a9b 100644
--- a/akka-actor/src/main/scala/akka/util/LineNumbers.scala
+++ b/akka-actor/src/main/scala/akka/util/LineNumbers.scala
@@ -217,7 +217,7 @@ object LineNumbers {
private def skipID(d: DataInputStream): Unit = {
val magic = d.readInt()
if (debug) println(f"LNB: magic=0x$magic%08X")
- if (magic != 0xcafebabe) throw new IllegalArgumentException("not a Java class file")
+ if (magic != 0xCAFEBABE) throw new IllegalArgumentException("not a Java class file")
}
private def skipVersion(d: DataInputStream): Unit = {
diff --git a/akka-actor/src/main/scala/akka/util/ManifestInfo.scala b/akka-actor/src/main/scala/akka/util/ManifestInfo.scala
index 2ec8fafe5f..5a8e2b6069 100644
--- a/akka-actor/src/main/scala/akka/util/ManifestInfo.scala
+++ b/akka-actor/src/main/scala/akka/util/ManifestInfo.scala
@@ -134,9 +134,9 @@ final class ManifestInfo(val system: ExtendedActorSystem) extends Extension {
}
if (title != null
- && version != null
- && vendor != null
- && knownVendors(vendor)) {
+ && version != null
+ && vendor != null
+ && knownVendors(vendor)) {
manifests = manifests.updated(title, new Version(version))
}
} finally {
diff --git a/akka-actor/src/main/scala/akka/util/PrettyByteString.scala b/akka-actor/src/main/scala/akka/util/PrettyByteString.scala
index 04c4c3a958..b8f8832453 100644
--- a/akka-actor/src/main/scala/akka/util/PrettyByteString.scala
+++ b/akka-actor/src/main/scala/akka/util/PrettyByteString.scala
@@ -19,7 +19,7 @@ private[akka] object PrettyByteString {
def formatBytes(bs: ByteString, maxBytes: Int = 16 * 5): Iterator[String] = {
def asHex(b: Byte): String = "%02X".format(b)
def asASCII(b: Byte): Char =
- if (b >= 0x20 && b < 0x7f) b.toChar
+ if (b >= 0x20 && b < 0x7F) b.toChar
else '.'
def formatLine(bs: ByteString): String = {
diff --git a/akka-actor/src/main/scala/akka/util/PrettyDuration.scala b/akka-actor/src/main/scala/akka/util/PrettyDuration.scala
index 4a4f98db4f..6a601bdf04 100644
--- a/akka-actor/src/main/scala/akka/util/PrettyDuration.scala
+++ b/akka-actor/src/main/scala/akka/util/PrettyDuration.scala
@@ -26,7 +26,7 @@ private[akka] object PrettyDuration {
implicit class PrettyPrintableDuration(val duration: Duration) extends AnyVal {
- /** Selects most appropriate TimeUnit for given duration and formats it accordingly, with 4 digits precision **/
+ /** Selects most appropriate TimeUnit for given duration and formats it accordingly, with 4 digits precision * */
def pretty: String = pretty(includeNanos = false)
/** Selects most appropriate TimeUnit for given duration and formats it accordingly */
diff --git a/akka-actor/src/main/scala/akka/util/UUIDComparator.scala b/akka-actor/src/main/scala/akka/util/UUIDComparator.scala
index 167603fb9f..a252b16a04 100644
--- a/akka-actor/src/main/scala/akka/util/UUIDComparator.scala
+++ b/akka-actor/src/main/scala/akka/util/UUIDComparator.scala
@@ -54,9 +54,9 @@ class UUIDComparator extends Comparator[UUID] {
* but if signs don't agree need to resolve differently
*/
if (i1 < 0) {
- if (i2 < 0) (i1 - i2) else 1
+ if (i2 < 0) i1 - i2 else 1
} else {
- if (i2 < 0) -1 else (i1 - i2)
+ if (i2 < 0) -1 else i1 - i2
}
}
diff --git a/akka-bench-jmh/src/main/scala/akka/actor/ActorBenchmark.scala b/akka-bench-jmh/src/main/scala/akka/actor/ActorBenchmark.scala
index 58c1f94f5c..657adb6301 100644
--- a/akka-bench-jmh/src/main/scala/akka/actor/ActorBenchmark.scala
+++ b/akka-bench-jmh/src/main/scala/akka/actor/ActorBenchmark.scala
@@ -37,7 +37,7 @@ class ActorBenchmark {
@Param(Array("50"))
var batchSize = 0
- //@Param(Array("akka.actor.ManyToOneArrayMailbox"))
+ // @Param(Array("akka.actor.ManyToOneArrayMailbox"))
@Param(
Array(
"akka.dispatch.SingleConsumerOnlyUnboundedMailbox",
diff --git a/akka-bench-jmh/src/main/scala/akka/actor/AffinityPoolComparativeBenchmark.scala b/akka-bench-jmh/src/main/scala/akka/actor/AffinityPoolComparativeBenchmark.scala
index 197ece0698..ad3636ffab 100644
--- a/akka-bench-jmh/src/main/scala/akka/actor/AffinityPoolComparativeBenchmark.scala
+++ b/akka-bench-jmh/src/main/scala/akka/actor/AffinityPoolComparativeBenchmark.scala
@@ -26,7 +26,7 @@ class AffinityPoolComparativeBenchmark {
@Param(Array("affinity-dispatcher", "default-fj-dispatcher", "fixed-size-dispatcher"))
var dispatcher = ""
- @Param(Array("SingleConsumerOnlyUnboundedMailbox")) //"default"
+ @Param(Array("SingleConsumerOnlyUnboundedMailbox")) // "default"
var mailbox = ""
final val numThreads, numActors = 8
diff --git a/akka-bench-jmh/src/main/scala/akka/actor/AffinityPoolRequestResponseBenchmark.scala b/akka-bench-jmh/src/main/scala/akka/actor/AffinityPoolRequestResponseBenchmark.scala
index 0cddc4b931..41e2430d5c 100644
--- a/akka-bench-jmh/src/main/scala/akka/actor/AffinityPoolRequestResponseBenchmark.scala
+++ b/akka-bench-jmh/src/main/scala/akka/actor/AffinityPoolRequestResponseBenchmark.scala
@@ -26,7 +26,7 @@ class AffinityPoolRequestResponseBenchmark {
@Param(Array("affinity-dispatcher", "default-fj-dispatcher", "fixed-size-dispatcher"))
var dispatcher = ""
- @Param(Array("SingleConsumerOnlyUnboundedMailbox")) //"default"
+ @Param(Array("SingleConsumerOnlyUnboundedMailbox")) // "default"
var mailbox = ""
final val numThreads, numActors = 8
diff --git a/akka-bench-jmh/src/main/scala/akka/actor/ScheduleBenchmark.scala b/akka-bench-jmh/src/main/scala/akka/actor/ScheduleBenchmark.scala
index d2ca283744..57215eb6bf 100644
--- a/akka-bench-jmh/src/main/scala/akka/actor/ScheduleBenchmark.scala
+++ b/akka-bench-jmh/src/main/scala/akka/actor/ScheduleBenchmark.scala
@@ -83,9 +83,10 @@ class ScheduleBenchmark {
val tryWithNext = (1 to to)
.foldLeft(0.millis -> List[Cancellable]()) {
case ((interv, c), idx) =>
- (interv + interval, scheduler.scheduleOnce(interv) {
- op(idx)
- } :: c)
+ (interv + interval,
+ scheduler.scheduleOnce(interv) {
+ op(idx)
+ } :: c)
}
._2
promise.future.onComplete {
diff --git a/akka-bench-jmh/src/main/scala/akka/actor/typed/delivery/ReliableDeliveryBenchmark.scala b/akka-bench-jmh/src/main/scala/akka/actor/typed/delivery/ReliableDeliveryBenchmark.scala
index 1787d0ef06..5c5f0b64c2 100644
--- a/akka-bench-jmh/src/main/scala/akka/actor/typed/delivery/ReliableDeliveryBenchmark.scala
+++ b/akka-bench-jmh/src/main/scala/akka/actor/typed/delivery/ReliableDeliveryBenchmark.scala
@@ -112,7 +112,7 @@ object WorkPullingProducer {
val requestNextAdapter =
context.messageAdapter[WorkPullingProducerController.RequestNext[Consumer.Command]](WrappedRequestNext(_))
var remaining = numberOfMessages + context.system.settings.config
- .getInt("akka.reliable-delivery.consumer-controller.flow-control-window")
+ .getInt("akka.reliable-delivery.consumer-controller.flow-control-window")
Behaviors.receiveMessagePartial {
case WrappedRequestNext(next) =>
diff --git a/akka-bench-jmh/src/main/scala/akka/cluster/ddata/VersionVectorBenchmark.scala b/akka-bench-jmh/src/main/scala/akka/cluster/ddata/VersionVectorBenchmark.scala
index 4c81f36680..c35924cff0 100644
--- a/akka-bench-jmh/src/main/scala/akka/cluster/ddata/VersionVectorBenchmark.scala
+++ b/akka-bench-jmh/src/main/scala/akka/cluster/ddata/VersionVectorBenchmark.scala
@@ -56,19 +56,19 @@ class VersionVectorBenchmark {
}
@Benchmark
- def increment: VersionVector = (vv1 + nodeA)
+ def increment: VersionVector = vv1 + nodeA
@Benchmark
- def compareSame1: Boolean = (vv1 == dot1)
+ def compareSame1: Boolean = vv1 == dot1
@Benchmark
- def compareSame2: Boolean = (vv2 == dot1)
+ def compareSame2: Boolean = vv2 == dot1
@Benchmark
- def compareGreaterThan1: Boolean = (vv1 > dot1)
+ def compareGreaterThan1: Boolean = vv1 > dot1
@Benchmark
- def compareGreaterThan2: Boolean = (vv2 > dot1)
+ def compareGreaterThan2: Boolean = vv2 > dot1
@Benchmark
def merge: VersionVector = vv1.merge(vv2)
diff --git a/akka-bench-jmh/src/main/scala/akka/dispatch/NodeQueueBenchmark.scala b/akka-bench-jmh/src/main/scala/akka/dispatch/NodeQueueBenchmark.scala
index ce9702ffa4..320861b29b 100644
--- a/akka-bench-jmh/src/main/scala/akka/dispatch/NodeQueueBenchmark.scala
+++ b/akka-bench-jmh/src/main/scala/akka/dispatch/NodeQueueBenchmark.scala
@@ -44,11 +44,11 @@ mailbox {
""").withFallback(ConfigFactory.load())
implicit val sys: ActorSystem = ActorSystem("ANQ", config)
val ref = sys.actorOf(Props(new Actor {
- def receive = {
- case Stop => sender() ! Stop
- case _ =>
- }
- }).withDispatcher("dispatcher").withMailbox("mailbox"), "receiver")
+ def receive = {
+ case Stop => sender() ! Stop
+ case _ =>
+ }
+ }).withDispatcher("dispatcher").withMailbox("mailbox"), "receiver")
@TearDown
def teardown(): Unit = Await.result(sys.terminate(), 5.seconds)
diff --git a/akka-bench-jmh/src/main/scala/akka/persistence/PersistentActorWithAtLeastOnceDeliveryBenchmark.scala b/akka-bench-jmh/src/main/scala/akka/persistence/PersistentActorWithAtLeastOnceDeliveryBenchmark.scala
index 26e452a19a..e1aec25af5 100644
--- a/akka-bench-jmh/src/main/scala/akka/persistence/PersistentActorWithAtLeastOnceDeliveryBenchmark.scala
+++ b/akka-bench-jmh/src/main/scala/akka/persistence/PersistentActorWithAtLeastOnceDeliveryBenchmark.scala
@@ -108,7 +108,7 @@ class NoPersistPersistentActorWithAtLeastOnceDelivery(
case n: Int =>
deliver(downStream)(deliveryId => Msg(deliveryId, n))
if (n == respondAfter)
- //switch to wait all message confirmed
+ // switch to wait all message confirmed
context.become(waitConfirm)
case Confirm(deliveryId) =>
confirmDelivery(deliveryId)
@@ -146,7 +146,7 @@ class PersistPersistentActorWithAtLeastOnceDelivery(
persist(MsgSent(n)) { _ =>
deliver(downStream)(deliveryId => Msg(deliveryId, n))
if (n == respondAfter)
- //switch to wait all message confirmed
+ // switch to wait all message confirmed
context.become(waitConfirm)
}
case Confirm(deliveryId) =>
@@ -185,7 +185,7 @@ class PersistAsyncPersistentActorWithAtLeastOnceDelivery(
persistAsync(MsgSent(n)) { _ =>
deliver(downStream)(deliveryId => Msg(deliveryId, n))
if (n == respondAfter)
- //switch to wait all message confirmed
+ // switch to wait all message confirmed
context.become(waitConfirm)
}
case Confirm(deliveryId) =>
@@ -227,7 +227,7 @@ class DestinationActor extends Actor {
case Msg(deliveryId, _) =>
seqNr += 1
if (seqNr % 11 == 0) {
- //drop it
+ // drop it
} else {
sender() ! Confirm(deliveryId)
}
diff --git a/akka-bench-jmh/src/main/scala/akka/remote/artery/compress/SerializationFormatCacheBenchmark.scala b/akka-bench-jmh/src/main/scala/akka/remote/artery/compress/SerializationFormatCacheBenchmark.scala
index e640fbe2ce..a4fa1099b1 100644
--- a/akka-bench-jmh/src/main/scala/akka/remote/artery/compress/SerializationFormatCacheBenchmark.scala
+++ b/akka-bench-jmh/src/main/scala/akka/remote/artery/compress/SerializationFormatCacheBenchmark.scala
@@ -63,14 +63,13 @@ class SerializationFormatCacheBenchmark {
@Setup
def init(): Unit = {
system = ActorSystem("SerializationFormatCacheBenchmark")
- temporaryActorRefs = Array.tabulate(uniqueTemporaryRefs)(
- n =>
- new PromiseActorRef(
- system.asInstanceOf[ExtendedActorSystem].provider,
- Promise(),
- "Any",
- // request path is encoded in this string
- s"_user_region_shard${n % 100}_entitypretendid${n}"))
+ temporaryActorRefs = Array.tabulate(uniqueTemporaryRefs)(n =>
+ new PromiseActorRef(
+ system.asInstanceOf[ExtendedActorSystem].provider,
+ Promise(),
+ "Any",
+ // request path is encoded in this string
+ s"_user_region_shard${n % 100}_entitypretendid${n}"))
topLevelActorRefs = Array.tabulate(uniqueTopLevelRefs)(n => system.actorOf(Props.empty, s"actor_$n"))
}
diff --git a/akka-bench-jmh/src/main/scala/akka/stream/EmptySourceBenchmark.scala b/akka-bench-jmh/src/main/scala/akka/stream/EmptySourceBenchmark.scala
index 2e2a6a3ade..979b03f4d6 100644
--- a/akka-bench-jmh/src/main/scala/akka/stream/EmptySourceBenchmark.scala
+++ b/akka-bench-jmh/src/main/scala/akka/stream/EmptySourceBenchmark.scala
@@ -39,5 +39,5 @@ class EmptySourceBenchmark {
Rewrite to GraphStage:
[info] EmptySourceBenchmark.empty thrpt 10 17.556 ± 2.865 ops/ms
- */
+ */
}
diff --git a/akka-bench-jmh/src/main/scala/akka/stream/InterpreterBenchmark.scala b/akka-bench-jmh/src/main/scala/akka/stream/InterpreterBenchmark.scala
index 378d9eb890..076f30eaee 100644
--- a/akka-bench-jmh/src/main/scala/akka/stream/InterpreterBenchmark.scala
+++ b/akka-bench-jmh/src/main/scala/akka/stream/InterpreterBenchmark.scala
@@ -38,7 +38,7 @@ class InterpreterBenchmark {
val b = builder(identities: _*).connect(source, identities.head.in).connect(identities.last.out, sink)
// FIXME: This should not be here, this is pure setup overhead
- for (i <- (0 until identities.size - 1)) {
+ for (i <- 0 until identities.size - 1) {
b.connect(identities(i).out, identities(i + 1).in)
}
@@ -77,13 +77,14 @@ object InterpreterBenchmark {
override val in: akka.stream.Inlet[T] = Inlet[T]("in")
in.id = 0
- setHandler(in, new InHandler {
- override def onPush(): Unit = {
- expected -= 1
- if (expected > 0) pull(in)
- // Otherwise do nothing, it will exit the interpreter
- }
- })
+ setHandler(in,
+ new InHandler {
+ override def onPush(): Unit = {
+ expected -= 1
+ if (expected > 0) pull(in)
+ // Otherwise do nothing, it will exit the interpreter
+ }
+ })
def requestOne(): Unit = pull(in)
}
diff --git a/akka-bench-jmh/src/main/scala/akka/stream/MaterializationBenchmark.scala b/akka-bench-jmh/src/main/scala/akka/stream/MaterializationBenchmark.scala
index 71c28a2c77..5a3f8e82dc 100644
--- a/akka-bench-jmh/src/main/scala/akka/stream/MaterializationBenchmark.scala
+++ b/akka-bench-jmh/src/main/scala/akka/stream/MaterializationBenchmark.scala
@@ -35,13 +35,13 @@ object MaterializationBenchmark {
var outlet = broadcast.out(0)
for (i <- 1 until numOfJunctions) {
val merge = b.add(Merge[Unit](2))
- outlet ~> merge
+ outlet ~> merge
broadcast.out(i) ~> merge
outlet = merge.out
}
Source.single(()) ~> broadcast
- outlet ~> Sink.ignore
+ outlet ~> Sink.ignore
ClosedShape
})
@@ -56,7 +56,7 @@ object MaterializationBenchmark {
}
Source.single(()) ~> broadcast
- merge ~> Sink.ignore
+ merge ~> Sink.ignore
ClosedShape
})
diff --git a/akka-cluster-metrics/src/main/scala/akka/cluster/metrics/ClusterMetricsCollector.scala b/akka-cluster-metrics/src/main/scala/akka/cluster/metrics/ClusterMetricsCollector.scala
index 9fc591963f..7c2949c9b7 100644
--- a/akka-cluster-metrics/src/main/scala/akka/cluster/metrics/ClusterMetricsCollector.scala
+++ b/akka-cluster-metrics/src/main/scala/akka/cluster/metrics/ClusterMetricsCollector.scala
@@ -197,7 +197,6 @@ private[metrics] class ClusterMetricsCollector extends Actor with ActorLogging {
if (m.status == MemberStatus.Up || m.status == MemberStatus.WeaklyUp)
addMember(m)
case _: MemberEvent => // not interested in other types of MemberEvent
-
}
override def postStop(): Unit = {
@@ -225,7 +224,7 @@ private[metrics] class ClusterMetricsCollector extends Actor with ActorLogging {
* Updates the initial node ring for those nodes that are [[akka.cluster.MemberStatus]] `Up`.
*/
def receiveState(state: CurrentClusterState): Unit =
- nodes = (state.members.diff(state.unreachable)).collect {
+ nodes = state.members.diff(state.unreachable).collect {
case m if m.status == MemberStatus.Up || m.status == MemberStatus.WeaklyUp => m.address
}
diff --git a/akka-cluster-metrics/src/main/scala/akka/cluster/metrics/ClusterMetricsExtension.scala b/akka-cluster-metrics/src/main/scala/akka/cluster/metrics/ClusterMetricsExtension.scala
index 15cb014afd..2541ad8c1d 100644
--- a/akka-cluster-metrics/src/main/scala/akka/cluster/metrics/ClusterMetricsExtension.scala
+++ b/akka-cluster-metrics/src/main/scala/akka/cluster/metrics/ClusterMetricsExtension.scala
@@ -54,7 +54,7 @@ class ClusterMetricsExtension(system: ExtendedActorSystem) extends Extension {
.getOrElse {
val log: LoggingAdapter = Logging(system, classOf[ClusterMetricsExtension])
log.error(s"Configured strategy provider ${SupervisorStrategyProvider} failed to load, using default ${classOf[
- ClusterMetricsStrategy].getName}.")
+ ClusterMetricsStrategy].getName}.")
new ClusterMetricsStrategy(SupervisorStrategyConfiguration)
}
diff --git a/akka-cluster-metrics/src/main/scala/akka/cluster/metrics/ClusterMetricsRouting.scala b/akka-cluster-metrics/src/main/scala/akka/cluster/metrics/ClusterMetricsRouting.scala
index 6849d3b0ee..8c0dad2b43 100644
--- a/akka-cluster-metrics/src/main/scala/akka/cluster/metrics/ClusterMetricsRouting.scala
+++ b/akka-cluster-metrics/src/main/scala/akka/cluster/metrics/ClusterMetricsRouting.scala
@@ -405,14 +405,14 @@ object MetricsSelector {
val args = List(classOf[Config] -> config)
dynamicAccess
.createInstanceFor[MetricsSelector](fqn, args)
- .recover({
+ .recover {
case exception =>
throw new IllegalArgumentException(
- (s"Cannot instantiate metrics-selector [$fqn], " +
+ s"Cannot instantiate metrics-selector [$fqn], " +
"make sure it extends [akka.cluster.routing.MetricsSelector] and " +
- "has constructor with [com.typesafe.config.Config] parameter"),
+ "has constructor with [com.typesafe.config.Config] parameter",
exception)
- })
+ }
.get
}
}
@@ -458,7 +458,7 @@ abstract class CapacityMetricsSelector extends MetricsSelector {
val (_, min) = capacity.minBy { case (_, c) => c }
// lowest usable capacity is 1% (>= 0.5% will be rounded to weight 1), also avoids div by zero
val divisor = math.max(0.01, min)
- capacity.map { case (address, c) => (address -> math.round((c) / divisor).toInt) }
+ capacity.map { case (address, c) => address -> math.round(c / divisor).toInt }
}
}
diff --git a/akka-cluster-metrics/src/main/scala/akka/cluster/metrics/EWMA.scala b/akka-cluster-metrics/src/main/scala/akka/cluster/metrics/EWMA.scala
index 026a395864..76fa25c2dc 100644
--- a/akka-cluster-metrics/src/main/scala/akka/cluster/metrics/EWMA.scala
+++ b/akka-cluster-metrics/src/main/scala/akka/cluster/metrics/EWMA.scala
@@ -23,7 +23,6 @@ import scala.concurrent.duration.FiniteDuration
* @param value the current exponentially weighted moving average, e.g. Y(n - 1), or,
* the sampled value resulting from the previous smoothing iteration.
* This value is always used as the previous EWMA to calculate the new EWMA.
- *
*/
@SerialVersionUID(1L)
final case class EWMA(value: Double, alpha: Double) {
diff --git a/akka-cluster-metrics/src/main/scala/akka/cluster/metrics/Metric.scala b/akka-cluster-metrics/src/main/scala/akka/cluster/metrics/Metric.scala
index ef18fdddbc..c2f0d88c2e 100644
--- a/akka-cluster-metrics/src/main/scala/akka/cluster/metrics/Metric.scala
+++ b/akka-cluster-metrics/src/main/scala/akka/cluster/metrics/Metric.scala
@@ -38,7 +38,8 @@ final case class Metric private[metrics] (name: String, value: Number, average:
case Some(avg) => copy(value = latest.value, average = Some(avg :+ latest.value.doubleValue))
case None if latest.average.isDefined => copy(value = latest.value, average = latest.average)
case _ => copy(value = latest.value)
- } else this
+ }
+ else this
/**
* The numerical value of the average, if defined, otherwise the latest value
diff --git a/akka-cluster-metrics/src/main/scala/akka/cluster/metrics/Provision.scala b/akka-cluster-metrics/src/main/scala/akka/cluster/metrics/Provision.scala
index 36645636fe..454fa052c2 100644
--- a/akka-cluster-metrics/src/main/scala/akka/cluster/metrics/Provision.scala
+++ b/akka-cluster-metrics/src/main/scala/akka/cluster/metrics/Provision.scala
@@ -67,9 +67,9 @@ trait SigarProvider {
TryNative {
... 36352 lines suppressed ...
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@pekko.apache.org
For additional commands, e-mail: commits-help@pekko.apache.org
[incubator-pekko] 02/03: Add .gitattributes to enforce unix line endings
Posted by md...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
mdedetrich pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/incubator-pekko.git
commit 0e876025e869b26b0051532beee56de27424ff97
Author: Matthew de Detrich <ma...@aiven.io>
AuthorDate: Wed Nov 2 21:17:07 2022 +0100
Add .gitattributes to enforce unix line endings
---
.gitattributes | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 0000000000..9dde9b9763
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1,5 @@
+# Activate line ending normalization, setting eol will make the behavior match core.autocrlf = input
+* text=auto eol=lf
+# Force batch scripts to always use CRLF line endings
+*.{cmd,[cC][mM][dD]} text eol=crlf
+*.{bat,[bB][aA][tT]} text eol=crlf
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@pekko.apache.org
For additional commands, e-mail: commits-help@pekko.apache.org
[incubator-pekko] 01/03: Update scalafmt
Posted by md...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
mdedetrich pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/incubator-pekko.git
commit b79cee657b36b1705a58ef8a1434ffd2fb2be0ae
Author: Matthew de Detrich <ma...@aiven.io>
AuthorDate: Wed Nov 2 09:19:40 2022 +0100
Update scalafmt
---
.scalafmt.conf | 61 ++++++++++++++++++++++++++++++++++++-----------------
project/plugins.sbt | 2 +-
2 files changed, 43 insertions(+), 20 deletions(-)
diff --git a/.scalafmt.conf b/.scalafmt.conf
index 5d45e749f6..efa297ee4a 100644
--- a/.scalafmt.conf
+++ b/.scalafmt.conf
@@ -1,21 +1,40 @@
-version = 2.1.0
-
-style = defaultWithAlign
-
-docstrings = JavaDoc
-indentOperator = spray
-maxColumn = 120
-lineEndings = preserve
-rewrite.rules = [RedundantParens, SortImports, AvoidInfix]
-unindentTopLevelOperators = true
-align.tokens = [{code = "=>", owner = "Case"}]
-align.openParenDefnSite = false
-align.openParenCallSite = false
-optIn.breakChainOnFirstMethodDot = false
-optIn.configStyleArguments = false
-danglingParentheses = false
-spaces.inImportCurlyBraces = true
-rewrite.neverInfix.excludeFilters = [
+version = 3.6.1
+runner.dialect = scala213
+project.git = true
+style = defaultWithAlign
+docstrings.style = Asterisk
+docstrings.wrap = false
+indentOperator.preset = spray
+maxColumn = 120
+lineEndings = preserve
+rewrite.rules = [RedundantParens, SortImports, AvoidInfix]
+indentOperator.exemptScope = all
+align.preset = some
+align.tokens."+" = [
+ {
+ code = "~>"
+ owners = [
+ { regex = "Term.ApplyInfix" }
+ ]
+ }
+]
+literals.hexDigits = upper
+literals.hexPrefix = lower
+binPack.unsafeCallSite = always
+binPack.unsafeDefnSite = always
+binPack.indentCallSiteSingleArg = false
+binPack.indentCallSiteOnce = true
+newlines.avoidForSimpleOverflow = [slc]
+newlines.source = keep
+newlines.beforeMultiline = keep
+align.openParenDefnSite = false
+align.openParenCallSite = false
+align.allowOverflow = true
+optIn.breakChainOnFirstMethodDot = false
+optIn.configStyleArguments = false
+danglingParentheses.preset = false
+spaces.inImportCurlyBraces = true
+rewrite.neverInfix.excludeFilters = [
and
min
max
@@ -47,8 +66,12 @@ rewrite.neverInfix.excludeFilters = [
theSameElementsAs
theSameElementsInOrderAs
]
-rewriteTokens = {
+rewriteTokens = {
"⇒": "=>"
"→": "->"
"←": "<-"
}
+project.excludeFilters = [
+ "scripts/authors.scala"
+]
+project.layout = StandardConvention
diff --git a/project/plugins.sbt b/project/plugins.sbt
index 61141db8e4..a70efe7e41 100644
--- a/project/plugins.sbt
+++ b/project/plugins.sbt
@@ -5,7 +5,7 @@ libraryDependencies += Defaults.sbtPluginExtra(
addSbtPlugin("com.lightbend.sbt" % "sbt-java-formatter" % "0.7.0")
addSbtPlugin("com.lightbend.sbt" % "sbt-bill-of-materials" % "1.0.2")
-addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.4.2")
+addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.4.6")
addSbtPlugin("ch.epfl.scala" % "sbt-scalafix" % "0.9.33")
// sbt-osgi 0.9.5 is available but breaks including jdk9-only classes
// sbt-osgi 0.9.6 is available but breaks populating akka-protobuf-v3
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@pekko.apache.org
For additional commands, e-mail: commits-help@pekko.apache.org