You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pekko.apache.org by he...@apache.org on 2023/05/24 02:48:40 UTC
[incubator-pekko] branch main updated: Unwrap single string interpolation syntax
This is an automated email from the ASF dual-hosted git repository.
hepin pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/incubator-pekko.git
The following commit(s) were added to refs/heads/main by this push:
new 4a4f47c5c9 Unwrap single string interpolation syntax
4a4f47c5c9 is described below
commit 4a4f47c5c9e0611087655bf1770311d2f5d83f8e
Author: Matthew de Detrich <ma...@aiven.io>
AuthorDate: Mon May 22 20:47:29 2023 +0200
Unwrap single string interpolation syntax
---
.../pekko/actor/CoordinatedShutdownSpec.scala | 2 +-
.../pekko/io/TcpIntegrationSpecSupport.scala | 2 +-
.../io/dns/AsyncDnsResolverIntegrationSpec.scala | 2 +-
.../apache/pekko/actor/typed/SupervisionSpec.scala | 2 +-
.../org/apache/pekko/actor/typed/TimerSpec.scala | 2 +-
.../typed/delivery/ConsumerControllerSpec.scala | 38 ++++++++++----------
.../delivery/DurableProducerControllerSpec.scala | 10 +++---
.../typed/delivery/DurableWorkPullingSpec.scala | 8 ++---
.../typed/delivery/ProducerControllerSpec.scala | 18 +++++-----
.../delivery/ReliableDeliveryRandomSpec.scala | 8 ++---
.../typed/delivery/ReliableDeliverySpec.scala | 42 +++++++++++-----------
.../actor/typed/delivery/WorkPullingSpec.scala | 20 +++++------
.../pekko/actor/typed/internal/ActorRefImpl.scala | 2 +-
.../org/apache/pekko/pattern/StatusReply.scala | 2 +-
.../scala/org/apache/pekko/util/ManifestInfo.scala | 2 +-
.../main/scala/org/apache/pekko/BenchRunner.scala | 2 +-
.../SerializationFormatCacheBenchmark.scala | 2 +-
.../cluster/metrics/ClusterMetricsCollector.scala | 2 +-
.../cluster/metrics/ClusterMetricsExtension.scala | 2 +-
.../cluster/metrics/ClusterMetricsRouting.scala | 2 +-
.../pekko/cluster/metrics/MetricsCollector.scala | 2 +-
.../apache/pekko/cluster/metrics/TestUtil.scala | 2 +-
.../sharding/typed/ReplicatedEntityProvider.scala | 2 +-
.../ClusterShardingRememberEntitiesPerfSpec.scala | 4 +--
.../typed/delivery/DeliveryThroughputSpec.scala | 2 +-
...tExampleWithCommandHandlersInDurableState.scala | 2 +-
...oinConfigCompatCheckerClusterShardingSpec.scala | 2 +-
.../DDataRememberEntitiesCoordinatorStore.scala | 2 +-
.../sharding/ClusterShardingLeaseSpec.scala | 2 +-
.../cluster/sharding/ShardWithLeaseSpec.scala | 4 +--
.../cluster/pubsub/DistributedPubSubMediator.scala | 2 +-
.../DistributedPubSubMessageSerializer.scala | 2 +-
.../scala/org/apache/pekko/cluster/Cluster.scala | 2 +-
.../apache/pekko/cluster/ClusterHeartbeat.scala | 2 +-
.../scala/org/apache/pekko/cluster/Member.scala | 2 +-
.../protobuf/ClusterMessageSerializer.scala | 2 +-
.../cluster/MultiDcHeartbeatTakingOverSpec.scala | 4 +--
.../pekko/cluster/MultiDcSunnyWeatherSpec.scala | 2 +-
.../pekko/cluster/MultiNodeClusterSpec.scala | 2 +-
.../pekko/cluster/SharedMediaDriverSupport.scala | 2 +-
.../org/apache/pekko/cluster/StressSpec.scala | 28 +++++++--------
.../org/apache/pekko/cluster/ClusterSpec.scala | 4 +--
.../pekko/coordination/lease/TestLeaseActor.scala | 2 +-
.../apache/pekko/cluster/ddata/Replicator.scala | 2 +-
.../ddata/protobuf/SerializationSupport.scala | 2 +-
.../test/scala/docs/io/ScalaUdpMulticastSpec.scala | 2 +-
.../docs/persistence/PersistentActorExample.scala | 2 +-
.../persistence/serialization/SerializerSpec.scala | 18 +++++-----
.../persistence/journal/JournalPerfSpec.scala | 4 +--
.../pekko/persistence/journal/JournalSpec.scala | 4 +--
.../persistence/snapshot/SnapshotStoreSpec.scala | 2 +-
.../pekko/persistence/typed/internal/Running.scala | 4 +--
.../pekko/persistence/RecoveryPermitter.scala | 2 +-
.../pekko/persistence/journal/ReplayFilter.scala | 4 +--
.../snapshot/local/LocalSnapshotStore.scala | 2 +-
.../AtLeastOnceDeliveryFailureSpec.scala | 6 ++--
.../persistence/EventSourcedActorFailureSpec.scala | 6 ++--
.../pekko/persistence/ManyRecoveriesSpec.scala | 2 +-
.../apache/pekko/persistence/PerformanceSpec.scala | 2 +-
.../apache/pekko/persistence/PersistenceSpec.scala | 8 ++---
.../pekko/persistence/PersistentActorSpec.scala | 34 +++++++++---------
.../SnapshotFailureRobustnessSpec.scala | 4 +--
.../SnapshotRecoveryLocalStoreSpec.scala | 2 +-
.../SnapshotRecoveryWithEmptyJournalSpec.scala | 8 ++---
.../apache/pekko/persistence/SnapshotSpec.scala | 12 +++----
.../pekko/persistence/fsm/PersistentFSMSpec.scala | 4 +--
project/CopyrightHeader.scala | 2 +-
project/MiMa.scala | 4 +--
.../apache/pekko/remote/artery/LatencySpec.scala | 2 +-
.../apache/pekko/remote/artery/PlotResult.scala | 2 +-
.../pekko/remote/artery/TestRateReporter.scala | 8 ++---
.../artery/aeron/AeronStreamLatencySpec.scala | 2 +-
.../aeron/AeronStreamMaxThroughputSpec.scala | 2 +-
.../org/apache/pekko/remote/RemoteDeployer.scala | 2 +-
.../pekko/remote/RemotingLifecycleEvent.scala | 2 +-
.../pekko/remote/artery/aeron/AeronSink.scala | 2 +-
.../artery/compress/InboundCompressions.scala | 8 ++---
.../transport/AbstractTransportAdapter.scala | 4 +--
.../pekko/remote/transport/PekkoPduCodec.scala | 4 +--
.../apache/pekko/remote/AckedDeliverySpec.scala | 2 +-
.../org/apache/pekko/remote/RemoteRouterSpec.scala | 42 +++++++++++-----------
.../pekko/remote/artery/RemoteDeploymentSpec.scala | 4 +--
.../remote/artery/RemoteInstrumentsSpec.scala | 2 +-
.../pekko/remote/artery/RemoteRouterSpec.scala | 42 +++++++++++-----------
.../pekko/remote/classic/ActorsLeakSpec.scala | 2 +-
.../transport/PekkoProtocolStressTest.scala | 4 +--
.../apache/pekko/stream/testkit/ScriptedTest.scala | 4 +--
.../stream/scaladsl/FlowPrefixAndTailSpec.scala | 2 +-
.../apache/pekko/stream/ActorMaterializer.scala | 2 +-
.../stream/impl/ReactiveStreamsCompliance.scala | 8 ++---
.../stream/impl/fusing/ActorGraphInterpreter.scala | 2 +-
.../apache/pekko/stream/impl/io/TcpStages.scala | 2 +-
.../stream/impl/streamref/SourceRefImpl.scala | 2 +-
.../org/apache/pekko/stream/stage/GraphStage.scala | 2 +-
94 files changed, 276 insertions(+), 276 deletions(-)
diff --git a/actor-tests/src/test/scala/org/apache/pekko/actor/CoordinatedShutdownSpec.scala b/actor-tests/src/test/scala/org/apache/pekko/actor/CoordinatedShutdownSpec.scala
index d0b5adc267..66cbe226e9 100644
--- a/actor-tests/src/test/scala/org/apache/pekko/actor/CoordinatedShutdownSpec.scala
+++ b/actor-tests/src/test/scala/org/apache/pekko/actor/CoordinatedShutdownSpec.scala
@@ -197,7 +197,7 @@ class CoordinatedShutdownSpec
messages.distinct.size shouldEqual 2
messages.foreach {
case "copy1" | "copy3" => // OK
- case other => fail(s"Unexpected probe message ${other}!")
+ case other => fail(s"Unexpected probe message $other!")
}
}
}
diff --git a/actor-tests/src/test/scala/org/apache/pekko/io/TcpIntegrationSpecSupport.scala b/actor-tests/src/test/scala/org/apache/pekko/io/TcpIntegrationSpecSupport.scala
index f1237390cc..e9d6ebd363 100644
--- a/actor-tests/src/test/scala/org/apache/pekko/io/TcpIntegrationSpecSupport.scala
+++ b/actor-tests/src/test/scala/org/apache/pekko/io/TcpIntegrationSpecSupport.scala
@@ -61,7 +61,7 @@ trait TcpIntegrationSpecSupport { this: PekkoSpec =>
bindHandler.expectMsgType[Connected] match {
case Connected(`localAddress`, `endpoint`) => // ok
- case other => fail(s"No match: ${other}")
+ case other => fail(s"No match: $other")
}
val serverHandler = TestProbe()
bindHandler.sender() ! Register(serverHandler.ref)
diff --git a/actor-tests/src/test/scala/org/apache/pekko/io/dns/AsyncDnsResolverIntegrationSpec.scala b/actor-tests/src/test/scala/org/apache/pekko/io/dns/AsyncDnsResolverIntegrationSpec.scala
index bb703f6d7d..f2e1b7229c 100644
--- a/actor-tests/src/test/scala/org/apache/pekko/io/dns/AsyncDnsResolverIntegrationSpec.scala
+++ b/actor-tests/src/test/scala/org/apache/pekko/io/dns/AsyncDnsResolverIntegrationSpec.scala
@@ -45,7 +45,7 @@ object AsyncDnsResolverIntegrationSpec {
pekko.loglevel = DEBUG
pekko.loggers = ["org.apache.pekko.testkit.SilenceAllTestEventListener"]
pekko.io.dns.resolver = async-dns
- pekko.io.dns.async-dns.nameservers = ["localhost:${dockerDnsServerPort}"]
+ pekko.io.dns.async-dns.nameservers = ["localhost:$dockerDnsServerPort"]
pekko.io.dns.async-dns.search-domains = ["foo.test", "test"]
pekko.io.dns.async-dns.ndots = 2
pekko.io.dns.async-dns.resolve-timeout = ${defaultTimeout.duration.toSeconds}s
diff --git a/actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/SupervisionSpec.scala b/actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/SupervisionSpec.scala
index ee12312e38..8255b35124 100644
--- a/actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/SupervisionSpec.scala
+++ b/actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/SupervisionSpec.scala
@@ -302,7 +302,7 @@ class SupervisionSpec extends ScalaTestWithActorTestKit("""
val count = failCounter.getAndIncrement()
if (count < failCount) {
probe.ref ! StartFailed
- throw TestException(s"construction ${count} failed")
+ throw TestException(s"construction $count failed")
} else {
probe.ref ! Started
Behaviors.empty
diff --git a/actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/TimerSpec.scala b/actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/TimerSpec.scala
index 6104c680e9..354fad90c1 100644
--- a/actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/TimerSpec.scala
+++ b/actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/TimerSpec.scala
@@ -283,7 +283,7 @@ class TimerSpec extends ScalaTestWithActorTestKit with AnyWordSpecLike with LogC
"keep timers when behavior changes" in {
val probe = TestProbe[String]()
def newBehavior(n: Int): Behavior[String] = Behaviors.withTimers[String] { timers =>
- timers.startTimerWithFixedDelay(s"message${n}", 50.milli)
+ timers.startTimerWithFixedDelay(s"message$n", 50.milli)
Behaviors.receiveMessage { message =>
if (message == "stop") Behaviors.stopped
else {
diff --git a/actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/delivery/ConsumerControllerSpec.scala b/actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/delivery/ConsumerControllerSpec.scala
index 13dfd8eb0f..258d797630 100644
--- a/actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/delivery/ConsumerControllerSpec.scala
+++ b/actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/delivery/ConsumerControllerSpec.scala
@@ -53,7 +53,7 @@ class ConsumerControllerSpec
"resend RegisterConsumer" in {
nextId()
val consumerController =
- spawn(ConsumerController[TestConsumer.Job](), s"consumerController-${idCount}")
+ spawn(ConsumerController[TestConsumer.Job](), s"consumerController-$idCount")
val producerControllerProbe = createTestProbe[ProducerControllerImpl.InternalCommand]()
consumerController ! ConsumerController.RegisterToProducerController(producerControllerProbe.ref)
@@ -68,7 +68,7 @@ class ConsumerControllerSpec
nextId()
val consumerProbe = createTestProbe[ConsumerController.Delivery[TestConsumer.Job]]()
val consumerController =
- spawn(ConsumerController[TestConsumer.Job](), s"consumerController-${idCount}")
+ spawn(ConsumerController[TestConsumer.Job](), s"consumerController-$idCount")
val producerControllerProbe1 = createTestProbe[ProducerControllerImpl.InternalCommand]()
consumerController ! ConsumerController.Start(consumerProbe.ref)
@@ -90,7 +90,7 @@ class ConsumerControllerSpec
"resend initial Request" in {
nextId()
val consumerController =
- spawn(ConsumerController[TestConsumer.Job](), s"consumerController-${idCount}")
+ spawn(ConsumerController[TestConsumer.Job](), s"consumerController-$idCount")
.unsafeUpcast[ConsumerControllerImpl.InternalCommand]
val producerControllerProbe = createTestProbe[ProducerControllerImpl.InternalCommand]()
@@ -112,7 +112,7 @@ class ConsumerControllerSpec
nextId()
val windowSize = 20
val consumerController =
- spawn(ConsumerController[TestConsumer.Job](), s"consumerController-${idCount}")
+ spawn(ConsumerController[TestConsumer.Job](), s"consumerController-$idCount")
.unsafeUpcast[ConsumerControllerImpl.InternalCommand]
val producerControllerProbe = createTestProbe[ProducerControllerImpl.InternalCommand]()
@@ -147,7 +147,7 @@ class ConsumerControllerSpec
"detect lost message" in {
nextId()
val consumerController =
- spawn(ConsumerController[TestConsumer.Job](), s"consumerController-${idCount}")
+ spawn(ConsumerController[TestConsumer.Job](), s"consumerController-$idCount")
.unsafeUpcast[ConsumerControllerImpl.InternalCommand]
val producerControllerProbe = createTestProbe[ProducerControllerImpl.InternalCommand]()
@@ -185,7 +185,7 @@ class ConsumerControllerSpec
"resend Request" in {
nextId()
val consumerController =
- spawn(ConsumerController[TestConsumer.Job](), s"consumerController-${idCount}")
+ spawn(ConsumerController[TestConsumer.Job](), s"consumerController-$idCount")
.unsafeUpcast[ConsumerControllerImpl.InternalCommand]
val producerControllerProbe = createTestProbe[ProducerControllerImpl.InternalCommand]()
@@ -219,7 +219,7 @@ class ConsumerControllerSpec
"stash while waiting for consumer confirmation" in {
nextId()
val consumerController =
- spawn(ConsumerController[TestConsumer.Job](), s"consumerController-${idCount}")
+ spawn(ConsumerController[TestConsumer.Job](), s"consumerController-$idCount")
.unsafeUpcast[ConsumerControllerImpl.InternalCommand]
val producerControllerProbe = createTestProbe[ProducerControllerImpl.InternalCommand]()
@@ -272,7 +272,7 @@ class ConsumerControllerSpec
"optionally ack messages" in {
nextId()
val consumerController =
- spawn(ConsumerController[TestConsumer.Job](), s"consumerController-${idCount}")
+ spawn(ConsumerController[TestConsumer.Job](), s"consumerController-$idCount")
.unsafeUpcast[ConsumerControllerImpl.InternalCommand]
val producerControllerProbe = createTestProbe[ProducerControllerImpl.InternalCommand]()
@@ -310,7 +310,7 @@ class ConsumerControllerSpec
"allow restart of consumer" in {
nextId()
val consumerController =
- spawn(ConsumerController[TestConsumer.Job](), s"consumerController-${idCount}")
+ spawn(ConsumerController[TestConsumer.Job](), s"consumerController-$idCount")
.unsafeUpcast[ConsumerControllerImpl.InternalCommand]
val producerControllerProbe = createTestProbe[ProducerControllerImpl.InternalCommand]()
@@ -348,7 +348,7 @@ class ConsumerControllerSpec
"stop ConsumerController when consumer is stopped" in {
nextId()
val consumerController =
- spawn(ConsumerController[TestConsumer.Job](), s"consumerController-${idCount}")
+ spawn(ConsumerController[TestConsumer.Job](), s"consumerController-$idCount")
.unsafeUpcast[ConsumerControllerImpl.InternalCommand]
val producerControllerProbe = createTestProbe[ProducerControllerImpl.InternalCommand]()
@@ -367,7 +367,7 @@ class ConsumerControllerSpec
"stop ConsumerController when consumer is stopped before first message" in {
nextId()
val consumerController =
- spawn(ConsumerController[TestConsumer.Job](), s"consumerController-${idCount}")
+ spawn(ConsumerController[TestConsumer.Job](), s"consumerController-$idCount")
.unsafeUpcast[ConsumerControllerImpl.InternalCommand]
val consumerProbe1 = createTestProbe[ConsumerController.Delivery[TestConsumer.Job]]()
@@ -380,7 +380,7 @@ class ConsumerControllerSpec
"deduplicate resend of first message" in {
nextId()
val consumerController =
- spawn(ConsumerController[TestConsumer.Job](), s"consumerController-${idCount}")
+ spawn(ConsumerController[TestConsumer.Job](), s"consumerController-$idCount")
.unsafeUpcast[ConsumerControllerImpl.InternalCommand]
val producerControllerProbe = createTestProbe[ProducerControllerImpl.InternalCommand]()
@@ -410,7 +410,7 @@ class ConsumerControllerSpec
"request window after first" in {
nextId()
val consumerController =
- spawn(ConsumerController[TestConsumer.Job](), s"consumerController-${idCount}")
+ spawn(ConsumerController[TestConsumer.Job](), s"consumerController-$idCount")
.unsafeUpcast[ConsumerControllerImpl.InternalCommand]
val producerControllerProbe = createTestProbe[ProducerControllerImpl.InternalCommand]()
@@ -438,7 +438,7 @@ class ConsumerControllerSpec
"handle first message when waiting for lost (resending)" in {
nextId()
val consumerController =
- spawn(ConsumerController[TestConsumer.Job](), s"consumerController-${idCount}")
+ spawn(ConsumerController[TestConsumer.Job](), s"consumerController-$idCount")
.unsafeUpcast[ConsumerControllerImpl.InternalCommand]
val producerControllerProbe = createTestProbe[ProducerControllerImpl.InternalCommand]()
@@ -485,7 +485,7 @@ class ConsumerControllerSpec
"send Ack when stopped" in {
nextId()
val consumerController =
- spawn(ConsumerController[TestConsumer.Job](), s"consumerController-${idCount}")
+ spawn(ConsumerController[TestConsumer.Job](), s"consumerController-$idCount")
.unsafeUpcast[ConsumerControllerImpl.InternalCommand]
val producerControllerProbe = createTestProbe[ProducerControllerImpl.InternalCommand]()
@@ -515,7 +515,7 @@ class ConsumerControllerSpec
"support graceful stopping" in {
nextId()
val consumerController =
- spawn(ConsumerController[TestConsumer.Job](), s"consumerController-${idCount}")
+ spawn(ConsumerController[TestConsumer.Job](), s"consumerController-$idCount")
.unsafeUpcast[ConsumerControllerImpl.InternalCommand]
val producerControllerProbe = createTestProbe[ProducerControllerImpl.InternalCommand]()
@@ -563,7 +563,7 @@ class ConsumerControllerSpec
"collect and assemble chunks" in {
nextId()
val consumerController =
- spawn(ConsumerController[TestConsumer.Job](), s"consumerController-${idCount}")
+ spawn(ConsumerController[TestConsumer.Job](), s"consumerController-$idCount")
.unsafeUpcast[ConsumerControllerImpl.InternalCommand]
val producerControllerProbe = createTestProbe[ProducerControllerImpl.InternalCommand]()
@@ -616,7 +616,7 @@ class ConsumerControllerSpec
"send Request after half window size when many chunks" in {
nextId()
val consumerController =
- spawn(ConsumerController[TestConsumer.Job](), s"consumerController-${idCount}")
+ spawn(ConsumerController[TestConsumer.Job](), s"consumerController-$idCount")
.unsafeUpcast[ConsumerControllerImpl.InternalCommand]
val producerControllerProbe = createTestProbe[ProducerControllerImpl.InternalCommand]()
@@ -673,7 +673,7 @@ class ConsumerControllerSpec
val consumerController =
spawn(
ConsumerController[TestConsumer.Job](ConsumerController.Settings(system).withOnlyFlowControl(true)),
- s"consumerController-${idCount}").unsafeUpcast[ConsumerControllerImpl.InternalCommand]
+ s"consumerController-$idCount").unsafeUpcast[ConsumerControllerImpl.InternalCommand]
val producerControllerProbe = createTestProbe[ProducerControllerImpl.InternalCommand]()
val consumerProbe = createTestProbe[ConsumerController.Delivery[TestConsumer.Job]]()
diff --git a/actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/delivery/DurableProducerControllerSpec.scala b/actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/delivery/DurableProducerControllerSpec.scala
index 863c83c5be..3d9ca5f645 100644
--- a/actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/delivery/DurableProducerControllerSpec.scala
+++ b/actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/delivery/DurableProducerControllerSpec.scala
@@ -66,7 +66,7 @@ class DurableProducerControllerSpec
DurableProducerQueue.MessageSent(4, TestConsumer.Job("msg-4"), false, NoQualifier, TestTimestamp))))
val producerController =
- spawn(ProducerController[TestConsumer.Job](producerId, Some(durable)), s"producerController-${idCount}")
+ spawn(ProducerController[TestConsumer.Job](producerId, Some(durable)), s"producerController-$idCount")
.unsafeUpcast[ProducerControllerImpl.InternalCommand]
val producerProbe = createTestProbe[ProducerController.RequestNext[TestConsumer.Job]]()
producerController ! ProducerController.Start(producerProbe.ref)
@@ -100,7 +100,7 @@ class DurableProducerControllerSpec
(_: DurableProducerQueue.Command[_]) => false)
val producerController =
- spawn(ProducerController[TestConsumer.Job](producerId, Some(durable)), s"producerController-${idCount}")
+ spawn(ProducerController[TestConsumer.Job](producerId, Some(durable)), s"producerController-$idCount")
.unsafeUpcast[ProducerControllerImpl.InternalCommand]
val producerProbe = createTestProbe[ProducerController.RequestNext[TestConsumer.Job]]()
producerController ! ProducerController.Start(producerProbe.ref)
@@ -151,7 +151,7 @@ class DurableProducerControllerSpec
TestDurableProducerQueue[TestConsumer.Job](Duration.Zero, DurableProducerQueue.State.empty[TestConsumer.Job])
val producerController =
- spawn(ProducerController[TestConsumer.Job](producerId, Some(durable)), s"producerController-${idCount}")
+ spawn(ProducerController[TestConsumer.Job](producerId, Some(durable)), s"producerController-$idCount")
.unsafeUpcast[ProducerControllerImpl.InternalCommand]
val producerProbe = createTestProbe[ProducerController.RequestNext[TestConsumer.Job]]()
producerController ! ProducerController.Start(producerProbe.ref)
@@ -190,7 +190,7 @@ class DurableProducerControllerSpec
producerId,
Some(durable),
ProducerController.Settings(system).withChunkLargeMessagesBytes(1)),
- s"producerController-${idCount}").unsafeUpcast[ProducerControllerImpl.InternalCommand]
+ s"producerController-$idCount").unsafeUpcast[ProducerControllerImpl.InternalCommand]
val producerProbe = createTestProbe[ProducerController.RequestNext[TestConsumer.Job]]()
producerController ! ProducerController.Start(producerProbe.ref)
@@ -265,7 +265,7 @@ class DurableProducerControllerSpec
producerId,
Some(durable),
ProducerController.Settings(system).withChunkLargeMessagesBytes(1)),
- s"producerController-${idCount}").unsafeUpcast[ProducerControllerImpl.InternalCommand]
+ s"producerController-$idCount").unsafeUpcast[ProducerControllerImpl.InternalCommand]
val producerProbe = createTestProbe[ProducerController.RequestNext[TestConsumer.Job]]()
producerController ! ProducerController.Start(producerProbe.ref)
diff --git a/actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/delivery/DurableWorkPullingSpec.scala b/actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/delivery/DurableWorkPullingSpec.scala
index 987ea50594..efa9af1573 100644
--- a/actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/delivery/DurableWorkPullingSpec.scala
+++ b/actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/delivery/DurableWorkPullingSpec.scala
@@ -90,7 +90,7 @@ class DurableWorkPullingSpec
val workPullingController =
spawn(
WorkPullingProducerController[TestConsumer.Job](producerId, workerServiceKey, Some(durable)),
- s"workPullingController-${idCount}")
+ s"workPullingController-$idCount")
val producerProbe = createTestProbe[WorkPullingProducerController.RequestNext[TestConsumer.Job]]()
workPullingController ! WorkPullingProducerController.Start(producerProbe.ref)
@@ -123,7 +123,7 @@ class DurableWorkPullingSpec
val workPullingController =
spawn(
WorkPullingProducerController[TestConsumer.Job](producerId, workerServiceKey, Some(durable)),
- s"workPullingController-${idCount}")
+ s"workPullingController-$idCount")
val producerProbe = createTestProbe[WorkPullingProducerController.RequestNext[TestConsumer.Job]]()
workPullingController ! WorkPullingProducerController.Start(producerProbe.ref)
@@ -172,7 +172,7 @@ class DurableWorkPullingSpec
val workPullingController =
spawn(
WorkPullingProducerController[TestConsumer.Job](producerId, workerServiceKey, Some(durable)),
- s"workPullingController-${idCount}")
+ s"workPullingController-$idCount")
val producerProbe = createTestProbe[WorkPullingProducerController.RequestNext[TestConsumer.Job]]()
workPullingController ! WorkPullingProducerController.Start(producerProbe.ref)
@@ -294,7 +294,7 @@ class DurableWorkPullingSpec
val workPullingController =
spawn(
WorkPullingProducerController[TestConsumer.Job](producerId, workerServiceKey, Some(durable)),
- s"workPullingController-${idCount}")
+ s"workPullingController-$idCount")
val producerProbe = createTestProbe[WorkPullingProducerController.RequestNext[TestConsumer.Job]]()
workPullingController ! WorkPullingProducerController.Start(producerProbe.ref)
diff --git a/actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/delivery/ProducerControllerSpec.scala b/actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/delivery/ProducerControllerSpec.scala
index 6a784ef948..ee78643205 100644
--- a/actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/delivery/ProducerControllerSpec.scala
+++ b/actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/delivery/ProducerControllerSpec.scala
@@ -49,7 +49,7 @@ class ProducerControllerSpec
val consumerControllerProbe = createTestProbe[ConsumerController.Command[TestConsumer.Job]]()
val producerController =
- spawn(ProducerController[TestConsumer.Job](producerId, None), s"producerController-${idCount}")
+ spawn(ProducerController[TestConsumer.Job](producerId, None), s"producerController-$idCount")
val producerProbe = createTestProbe[ProducerController.RequestNext[TestConsumer.Job]]()
producerController ! ProducerController.Start(producerProbe.ref)
@@ -76,7 +76,7 @@ class ProducerControllerSpec
val consumerControllerProbe = createTestProbe[ConsumerController.Command[TestConsumer.Job]]()
val producerController =
- spawn(ProducerController[TestConsumer.Job](producerId, None), s"producerController-${idCount}")
+ spawn(ProducerController[TestConsumer.Job](producerId, None), s"producerController-$idCount")
.unsafeUpcast[ProducerControllerImpl.InternalCommand]
val producerProbe = createTestProbe[ProducerController.RequestNext[TestConsumer.Job]]()
producerController ! ProducerController.Start(producerProbe.ref)
@@ -113,7 +113,7 @@ class ProducerControllerSpec
val consumerControllerProbe = createTestProbe[ConsumerController.Command[TestConsumer.Job]]()
val producerController =
- spawn(ProducerController[TestConsumer.Job](producerId, None), s"producerController-${idCount}")
+ spawn(ProducerController[TestConsumer.Job](producerId, None), s"producerController-$idCount")
.unsafeUpcast[ProducerControllerImpl.InternalCommand]
val producerProbe = createTestProbe[ProducerController.RequestNext[TestConsumer.Job]]()
producerController ! ProducerController.Start(producerProbe.ref)
@@ -150,7 +150,7 @@ class ProducerControllerSpec
nextId()
val producerController =
- spawn(ProducerController[TestConsumer.Job](producerId, None), s"producerController-${idCount}")
+ spawn(ProducerController[TestConsumer.Job](producerId, None), s"producerController-$idCount")
.unsafeUpcast[ProducerControllerImpl.InternalCommand]
val producerProbe = createTestProbe[ProducerController.RequestNext[TestConsumer.Job]]()
producerController ! ProducerController.Start(producerProbe.ref)
@@ -189,7 +189,7 @@ class ProducerControllerSpec
val consumerControllerProbe = createTestProbe[ConsumerController.Command[TestConsumer.Job]]()
val producerController =
- spawn(ProducerController[TestConsumer.Job](producerId, None), s"producerController-${idCount}")
+ spawn(ProducerController[TestConsumer.Job](producerId, None), s"producerController-$idCount")
.unsafeUpcast[ProducerControllerImpl.InternalCommand]
val producerProbe = createTestProbe[ProducerController.RequestNext[TestConsumer.Job]]()
producerController ! ProducerController.Start(producerProbe.ref)
@@ -231,7 +231,7 @@ class ProducerControllerSpec
val consumerControllerProbe = createTestProbe[ConsumerController.Command[TestConsumer.Job]]()
val producerController =
- spawn(ProducerController[TestConsumer.Job](producerId, None), s"producerController-${idCount}")
+ spawn(ProducerController[TestConsumer.Job](producerId, None), s"producerController-$idCount")
.unsafeUpcast[ProducerControllerImpl.InternalCommand]
val producerProbe1 = createTestProbe[ProducerController.RequestNext[TestConsumer.Job]]()
producerController ! ProducerController.Start(producerProbe1.ref)
@@ -270,7 +270,7 @@ class ProducerControllerSpec
producerId,
None,
ProducerController.Settings(system).withChunkLargeMessagesBytes(1)),
- s"producerController-${idCount}").unsafeUpcast[ProducerControllerImpl.InternalCommand]
+ s"producerController-$idCount").unsafeUpcast[ProducerControllerImpl.InternalCommand]
val producerProbe = createTestProbe[ProducerController.RequestNext[TestConsumer.Job]]()
producerController ! ProducerController.Start(producerProbe.ref)
@@ -312,7 +312,7 @@ class ProducerControllerSpec
val consumerControllerProbe = createTestProbe[ConsumerController.Command[TestConsumer.Job]]()
val producerController =
- spawn(ProducerController[TestConsumer.Job](producerId, None), s"producerController-${idCount}")
+ spawn(ProducerController[TestConsumer.Job](producerId, None), s"producerController-$idCount")
.unsafeUpcast[ProducerControllerImpl.InternalCommand]
val producerProbe = createTestProbe[ProducerController.RequestNext[TestConsumer.Job]]()
producerController ! ProducerController.Start(producerProbe.ref)
@@ -350,7 +350,7 @@ class ProducerControllerSpec
val consumerControllerProbe = createTestProbe[ConsumerController.Command[TestConsumer.Job]]()
val producerController =
- spawn(ProducerController[TestConsumer.Job](producerId, None), s"producerController-${idCount}")
+ spawn(ProducerController[TestConsumer.Job](producerId, None), s"producerController-$idCount")
.unsafeUpcast[ProducerControllerImpl.InternalCommand]
val producerProbe = createTestProbe[ProducerController.RequestNext[TestConsumer.Job]]()
producerController ! ProducerController.Start(producerProbe.ref)
diff --git a/actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/delivery/ReliableDeliveryRandomSpec.scala b/actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/delivery/ReliableDeliveryRandomSpec.scala
index 984ad16560..d62c114a5a 100644
--- a/actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/delivery/ReliableDeliveryRandomSpec.scala
+++ b/actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/delivery/ReliableDeliveryRandomSpec.scala
@@ -114,10 +114,10 @@ class ReliableDeliveryRandomSpec(config: Config)
spawn(
Behaviors.intercept(() => RandomFlakyNetwork[ConsumerController.Command[TestConsumer.Job]](rnd, consumerDrop))(
ConsumerController[TestConsumer.Job](serviceKey = None, consumerControllerSettings)),
- s"consumerController-${idCount}")
+ s"consumerController-$idCount")
spawn(
TestConsumer(consumerDelay, numberOfMessages, consumerEndProbe.ref, consumerController),
- name = s"destination-${idCount}")
+ name = s"destination-$idCount")
// RandomFlakyNetwork to simulate lost messages from consumerController to producerController
val producerDrop: Any => Double = {
@@ -138,8 +138,8 @@ class ReliableDeliveryRandomSpec(config: Config)
val producerController = spawn(
Behaviors.intercept(() => RandomFlakyNetwork[ProducerController.Command[TestConsumer.Job]](rnd, producerDrop))(
ProducerController[TestConsumer.Job](producerId, durableQueue)),
- s"producerController-${idCount}")
- val producer = spawn(TestProducer(producerDelay, producerController), name = s"producer-${idCount}")
+ s"producerController-$idCount")
+ val producer = spawn(TestProducer(producerDelay, producerController), name = s"producer-$idCount")
consumerController ! ConsumerController.RegisterToProducerController(producerController)
diff --git a/actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/delivery/ReliableDeliverySpec.scala b/actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/delivery/ReliableDeliverySpec.scala
index bf85792b9e..99fbd2d380 100644
--- a/actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/delivery/ReliableDeliverySpec.scala
+++ b/actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/delivery/ReliableDeliverySpec.scala
@@ -52,14 +52,14 @@ class ReliableDeliverySpec(config: Config)
nextId()
val consumerEndProbe = createTestProbe[TestConsumer.Collected]()
val consumerController =
- spawn(ConsumerController[TestConsumer.Job](), s"consumerController-${idCount}")
+ spawn(ConsumerController[TestConsumer.Job](), s"consumerController-$idCount")
spawn(
TestConsumer(defaultConsumerDelay, 42, consumerEndProbe.ref, consumerController),
- name = s"destination-${idCount}")
+ name = s"destination-$idCount")
val producerController =
- spawn(ProducerController[TestConsumer.Job](s"p-${idCount}", None), s"producerController-${idCount}")
- val producer = spawn(TestProducer(defaultProducerDelay, producerController), name = s"producer-${idCount}")
+ spawn(ProducerController[TestConsumer.Job](s"p-$idCount", None), s"producerController-$idCount")
+ val producer = spawn(TestProducer(defaultProducerDelay, producerController), name = s"producer-$idCount")
consumerController ! ConsumerController.RegisterToProducerController(producerController)
@@ -74,19 +74,19 @@ class ReliableDeliverySpec(config: Config)
nextId()
val consumerEndProbe = createTestProbe[TestConsumer.Collected]()
val consumerController =
- spawn(ConsumerController[TestConsumer.Job](), s"consumerController-${idCount}")
+ spawn(ConsumerController[TestConsumer.Job](), s"consumerController-$idCount")
spawn(
TestConsumer(defaultConsumerDelay, 42, consumerEndProbe.ref, consumerController),
- name = s"destination-${idCount}")
+ name = s"destination-$idCount")
val replyProbe = createTestProbe[Long]()
val producerController =
- spawn(ProducerController[TestConsumer.Job](s"p-${idCount}", None), s"producerController-${idCount}")
+ spawn(ProducerController[TestConsumer.Job](s"p-$idCount", None), s"producerController-$idCount")
val producer =
spawn(
TestProducerWithAsk(defaultProducerDelay, replyProbe.ref, producerController),
- name = s"producer-${idCount}")
+ name = s"producer-$idCount")
consumerController ! ConsumerController.RegisterToProducerController(producerController)
@@ -105,12 +105,12 @@ class ReliableDeliverySpec(config: Config)
nextId()
val consumerEndProbe = createTestProbe[TestConsumer.Collected]()
val consumerController =
- spawn(ConsumerController[TestConsumer.Job](), s"consumerController-${idCount}")
- spawn(TestConsumer(consumerDelay, 42, consumerEndProbe.ref, consumerController), name = s"destination-${idCount}")
+ spawn(ConsumerController[TestConsumer.Job](), s"consumerController-$idCount")
+ spawn(TestConsumer(consumerDelay, 42, consumerEndProbe.ref, consumerController), name = s"destination-$idCount")
val producerController =
- spawn(ProducerController[TestConsumer.Job](s"p-${idCount}", None), s"producerController-${idCount}")
- val producer = spawn(TestProducer(producerDelay, producerController), name = s"producer-${idCount}")
+ spawn(ProducerController[TestConsumer.Job](s"p-$idCount", None), s"producerController-$idCount")
+ val producer = spawn(TestProducer(producerDelay, producerController), name = s"producer-$idCount")
consumerController ! ConsumerController.RegisterToProducerController(producerController)
@@ -137,12 +137,12 @@ class ReliableDeliverySpec(config: Config)
nextId()
val consumerEndProbe = createTestProbe[TestConsumer.Collected]()
val consumerController =
- spawn(ConsumerController[TestConsumer.Job](), s"consumerController1-${idCount}")
- spawn(TestConsumer(defaultConsumerDelay, 42, consumerEndProbe.ref, consumerController), s"consumer1-${idCount}")
+ spawn(ConsumerController[TestConsumer.Job](), s"consumerController1-$idCount")
+ spawn(TestConsumer(defaultConsumerDelay, 42, consumerEndProbe.ref, consumerController), s"consumer1-$idCount")
val producerController =
- spawn(ProducerController[TestConsumer.Job](s"p-${idCount}", None), s"producerController-${idCount}")
- val producer = spawn(TestProducer(defaultProducerDelay, producerController), name = s"producer-${idCount}")
+ spawn(ProducerController[TestConsumer.Job](s"p-$idCount", None), s"producerController-$idCount")
+ val producer = spawn(TestProducer(defaultProducerDelay, producerController), name = s"producer-$idCount")
consumerController ! ConsumerController.RegisterToProducerController(producerController)
@@ -151,8 +151,8 @@ class ReliableDeliverySpec(config: Config)
val consumerEndProbe2 = createTestProbe[TestConsumer.Collected]()
val consumerController2 =
- spawn(ConsumerController[TestConsumer.Job](), s"consumerController2-${idCount}")
- spawn(TestConsumer(defaultConsumerDelay, 42, consumerEndProbe2.ref, consumerController2), s"consumer2-${idCount}")
+ spawn(ConsumerController[TestConsumer.Job](), s"consumerController2-$idCount")
+ spawn(TestConsumer(defaultConsumerDelay, 42, consumerEndProbe2.ref, consumerController2), s"consumer2-$idCount")
consumerController2 ! ConsumerController.RegisterToProducerController(producerController)
consumerEndProbe2.receiveMessage(5.seconds)
@@ -167,11 +167,11 @@ class ReliableDeliverySpec(config: Config)
val consumerProbe = createTestProbe[ConsumerController.Delivery[TestConsumer.Job]]()
val consumerController =
- spawn(ConsumerController[TestConsumer.Job](), s"consumerController-${idCount}")
+ spawn(ConsumerController[TestConsumer.Job](), s"consumerController-$idCount")
consumerController ! ConsumerController.Start(consumerProbe.ref)
val producerController1 =
- spawn(ProducerController[TestConsumer.Job](s"p-${idCount}", None), s"producerController1-${idCount}")
+ spawn(ProducerController[TestConsumer.Job](s"p-$idCount", None), s"producerController1-$idCount")
val producerProbe1 = createTestProbe[ProducerController.RequestNext[TestConsumer.Job]]()
producerController1 ! ProducerController.Start(producerProbe1.ref)
@@ -191,7 +191,7 @@ class ReliableDeliverySpec(config: Config)
testKit.stop(producerController1)
producerProbe1.expectTerminated(producerController1)
val producerController2 =
- spawn(ProducerController[TestConsumer.Job](s"p-${idCount}", None), s"producerController2-${idCount}")
+ spawn(ProducerController[TestConsumer.Job](s"p-$idCount", None), s"producerController2-$idCount")
val producerProbe2 = createTestProbe[ProducerController.RequestNext[TestConsumer.Job]]()
producerController2 ! ProducerController.Start(producerProbe2.ref)
producerController2 ! ProducerController.RegisterConsumer(consumerController)
diff --git a/actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/delivery/WorkPullingSpec.scala b/actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/delivery/WorkPullingSpec.scala
index 92386cfe99..19cff6c39e 100644
--- a/actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/delivery/WorkPullingSpec.scala
+++ b/actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/delivery/WorkPullingSpec.scala
@@ -62,23 +62,23 @@ class WorkPullingSpec
val workPullingController =
spawn(
WorkPullingProducerController[TestConsumer.Job](producerId, workerServiceKey, None),
- s"workPullingController-${idCount}")
+ s"workPullingController-$idCount")
val jobProducer =
- spawn(TestProducerWorkPulling(defaultProducerDelay, workPullingController), name = s"jobProducer-${idCount}")
+ spawn(TestProducerWorkPulling(defaultProducerDelay, workPullingController), name = s"jobProducer-$idCount")
val consumerEndProbe1 = createTestProbe[TestConsumer.Collected]()
val workerController1 =
- spawn(ConsumerController[TestConsumer.Job](workerServiceKey), s"workerController1-${idCount}")
+ spawn(ConsumerController[TestConsumer.Job](workerServiceKey), s"workerController1-$idCount")
spawn(
TestConsumer(defaultConsumerDelay, 42, consumerEndProbe1.ref, workerController1),
- name = s"worker1-${idCount}")
+ name = s"worker1-$idCount")
val consumerEndProbe2 = createTestProbe[TestConsumer.Collected]()
val workerController2 =
- spawn(ConsumerController[TestConsumer.Job](workerServiceKey), s"workerController2-${idCount}")
+ spawn(ConsumerController[TestConsumer.Job](workerServiceKey), s"workerController2-$idCount")
spawn(
TestConsumer(defaultConsumerDelay, 42, consumerEndProbe2.ref, workerController2),
- name = s"worker2-${idCount}")
+ name = s"worker2-$idCount")
consumerEndProbe1.receiveMessage(10.seconds)
consumerEndProbe2.receiveMessage()
@@ -95,7 +95,7 @@ class WorkPullingSpec
val workPullingController =
spawn(
WorkPullingProducerController[TestConsumer.Job](producerId, workerServiceKey, None),
- s"workPullingController-${idCount}")
+ s"workPullingController-$idCount")
val producerProbe = createTestProbe[WorkPullingProducerController.RequestNext[TestConsumer.Job]]()
workPullingController ! WorkPullingProducerController.Start(producerProbe.ref)
@@ -150,7 +150,7 @@ class WorkPullingSpec
val workPullingController =
spawn(
WorkPullingProducerController[TestConsumer.Job](producerId, workerServiceKey, None),
- s"workPullingController-${idCount}")
+ s"workPullingController-$idCount")
val producerProbe = createTestProbe[WorkPullingProducerController.RequestNext[TestConsumer.Job]]()
workPullingController ! WorkPullingProducerController.Start(producerProbe.ref)
@@ -192,7 +192,7 @@ class WorkPullingSpec
val workPullingController =
spawn(
WorkPullingProducerController[TestConsumer.Job](producerId, workerServiceKey, None),
- s"workPullingController-${idCount}")
+ s"workPullingController-$idCount")
val producerProbe = createTestProbe[WorkPullingProducerController.RequestNext[TestConsumer.Job]]()
workPullingController ! WorkPullingProducerController.Start(producerProbe.ref)
@@ -247,7 +247,7 @@ class WorkPullingSpec
val workPullingController =
spawn(
WorkPullingProducerController[TestConsumer.Job](producerId, workerServiceKey, None),
- s"workPullingController-${idCount}")
+ s"workPullingController-$idCount")
val producerProbe = createTestProbe[WorkPullingProducerController.RequestNext[TestConsumer.Job]]()
workPullingController ! WorkPullingProducerController.Start(producerProbe.ref)
diff --git a/actor-typed/src/main/scala/org/apache/pekko/actor/typed/internal/ActorRefImpl.scala b/actor-typed/src/main/scala/org/apache/pekko/actor/typed/internal/ActorRefImpl.scala
index 203fc12404..6cc2e4d7a5 100644
--- a/actor-typed/src/main/scala/org/apache/pekko/actor/typed/internal/ActorRefImpl.scala
+++ b/actor-typed/src/main/scala/org/apache/pekko/actor/typed/internal/ActorRefImpl.scala
@@ -49,5 +49,5 @@ private[pekko] trait ActorRefImpl[-T] extends ActorRef[T] { this: InternalRecipi
case _ => false
}
- override def toString: String = s"Actor[${path}#${path.uid}]"
+ override def toString: String = s"Actor[$path#${path.uid}]"
}
diff --git a/actor/src/main/scala/org/apache/pekko/pattern/StatusReply.scala b/actor/src/main/scala/org/apache/pekko/pattern/StatusReply.scala
index 95f5b17af8..d9a1105a93 100644
--- a/actor/src/main/scala/org/apache/pekko/pattern/StatusReply.scala
+++ b/actor/src/main/scala/org/apache/pekko/pattern/StatusReply.scala
@@ -177,7 +177,7 @@ object StatusReply {
case StatusReply.Success(v) => ScalaSuccess(v.asInstanceOf[T])
case StatusReply.Error(ex) => ScalaFailure[T](ex)
case unexpected =>
- ScalaFailure(new IllegalArgumentException(s"Unexpected status reply success value: ${unexpected}"))
+ ScalaFailure(new IllegalArgumentException(s"Unexpected status reply success value: $unexpected"))
}
case fail @ ScalaFailure(_) => fail.asInstanceOf[Try[T]]
}(ExecutionContexts.parasitic)
diff --git a/actor/src/main/scala/org/apache/pekko/util/ManifestInfo.scala b/actor/src/main/scala/org/apache/pekko/util/ManifestInfo.scala
index 6c3e2d7b1b..c9fc4ac0a4 100644
--- a/actor/src/main/scala/org/apache/pekko/util/ManifestInfo.scala
+++ b/actor/src/main/scala/org/apache/pekko/util/ManifestInfo.scala
@@ -96,7 +96,7 @@ object ManifestInfo extends ExtensionId[ManifestInfo] with ExtensionIdProvider {
s"you (perhaps indirectly) also depend on older versions of related artifacts. " +
s"You can solve this by adding an explicit dependency on version $highestVersion " +
s"of the [$toBeUpdated] artifacts to your project. " +
- s"Here's a complete collection of detected artifacts: ${groupedByVersion}. " +
+ s"Here's a complete collection of detected artifacts: $groupedByVersion. " +
"See also: https://pekko.apache.org/docs/pekko/current/common/binary-compatibility-rules.html#mixed-versioning-is-not-allowed")
} else None
}
diff --git a/bench-jmh/src/main/scala/org/apache/pekko/BenchRunner.scala b/bench-jmh/src/main/scala/org/apache/pekko/BenchRunner.scala
index c29495383d..ecf49a4e62 100644
--- a/bench-jmh/src/main/scala/org/apache/pekko/BenchRunner.scala
+++ b/bench-jmh/src/main/scala/org/apache/pekko/BenchRunner.scala
@@ -37,7 +37,7 @@ object BenchRunner {
result.getParams.getParamsKeys.asScala.map(key => s"$key=${result.getParams.getParam(key)}").mkString("_")
val score = result.getAggregatedResult.getPrimaryResult.getScore.round
val unit = result.getAggregatedResult.getPrimaryResult.getScoreUnit
- s"\t${bench}_${params}\t$score\t$unit"
+ s"\t${bench}_$params\t$score\t$unit"
}
report.toList.sorted.foreach(println)
diff --git a/bench-jmh/src/main/scala/org/apache/pekko/remote/artery/compress/SerializationFormatCacheBenchmark.scala b/bench-jmh/src/main/scala/org/apache/pekko/remote/artery/compress/SerializationFormatCacheBenchmark.scala
index c380d8f21f..831f150c81 100644
--- a/bench-jmh/src/main/scala/org/apache/pekko/remote/artery/compress/SerializationFormatCacheBenchmark.scala
+++ b/bench-jmh/src/main/scala/org/apache/pekko/remote/artery/compress/SerializationFormatCacheBenchmark.scala
@@ -79,7 +79,7 @@ class SerializationFormatCacheBenchmark {
Promise(),
"Any",
// request path is encoded in this string
- s"_user_region_shard${n % 100}_entitypretendid${n}"))
+ s"_user_region_shard${n % 100}_entitypretendid$n"))
topLevelActorRefs = Array.tabulate(uniqueTopLevelRefs)(n => system.actorOf(Props.empty, s"actor_$n"))
}
diff --git a/cluster-metrics/src/main/scala/org/apache/pekko/cluster/metrics/ClusterMetricsCollector.scala b/cluster-metrics/src/main/scala/org/apache/pekko/cluster/metrics/ClusterMetricsCollector.scala
index 9a7c062493..ea64884b06 100644
--- a/cluster-metrics/src/main/scala/org/apache/pekko/cluster/metrics/ClusterMetricsCollector.scala
+++ b/cluster-metrics/src/main/scala/org/apache/pekko/cluster/metrics/ClusterMetricsCollector.scala
@@ -69,7 +69,7 @@ private[metrics] class ClusterMetricsSupervisor extends Actor with ActorLogging
var collectorInstance = 0
- def collectorName = s"collector-${collectorInstance}"
+ def collectorName = s"collector-$collectorInstance"
override def preStart() = {
if (CollectorEnabled) {
diff --git a/cluster-metrics/src/main/scala/org/apache/pekko/cluster/metrics/ClusterMetricsExtension.scala b/cluster-metrics/src/main/scala/org/apache/pekko/cluster/metrics/ClusterMetricsExtension.scala
index 63ac6b2950..e9efcd032c 100644
--- a/cluster-metrics/src/main/scala/org/apache/pekko/cluster/metrics/ClusterMetricsExtension.scala
+++ b/cluster-metrics/src/main/scala/org/apache/pekko/cluster/metrics/ClusterMetricsExtension.scala
@@ -63,7 +63,7 @@ class ClusterMetricsExtension(system: ExtendedActorSystem) extends Extension {
immutable.Seq(classOf[Config] -> SupervisorStrategyConfiguration))
.getOrElse {
val log: LoggingAdapter = Logging(system, classOf[ClusterMetricsExtension])
- log.error(s"Configured strategy provider ${SupervisorStrategyProvider} failed to load, using default ${classOf[
+ log.error(s"Configured strategy provider $SupervisorStrategyProvider failed to load, using default ${classOf[
ClusterMetricsStrategy].getName}.")
new ClusterMetricsStrategy(SupervisorStrategyConfiguration)
}
diff --git a/cluster-metrics/src/main/scala/org/apache/pekko/cluster/metrics/ClusterMetricsRouting.scala b/cluster-metrics/src/main/scala/org/apache/pekko/cluster/metrics/ClusterMetricsRouting.scala
index 8f792e88f9..881040f30c 100644
--- a/cluster-metrics/src/main/scala/org/apache/pekko/cluster/metrics/ClusterMetricsRouting.scala
+++ b/cluster-metrics/src/main/scala/org/apache/pekko/cluster/metrics/ClusterMetricsRouting.scala
@@ -314,7 +314,7 @@ case object CpuMetricsSelector extends CapacityMetricsSelector {
// TODO read factor from reference.conf
/** How much extra weight to give to the stolen time. */
val factor = 0.3
- require(0.0 <= factor, s"factor must be non negative: ${factor}")
+ require(0.0 <= factor, s"factor must be non negative: $factor")
override def capacity(nodeMetrics: Set[NodeMetrics]): Map[Address, Double] = {
nodeMetrics.collect {
diff --git a/cluster-metrics/src/main/scala/org/apache/pekko/cluster/metrics/MetricsCollector.scala b/cluster-metrics/src/main/scala/org/apache/pekko/cluster/metrics/MetricsCollector.scala
index cb76318bbb..389c173de7 100644
--- a/cluster-metrics/src/main/scala/org/apache/pekko/cluster/metrics/MetricsCollector.scala
+++ b/cluster-metrics/src/main/scala/org/apache/pekko/cluster/metrics/MetricsCollector.scala
@@ -71,7 +71,7 @@ private[metrics] object MetricsCollector {
val useInternal = CollectorFallback && CollectorProvider == ""
def create(provider: String) = TryNative {
- log.debug(s"Trying ${provider}.")
+ log.debug(s"Trying $provider.")
system
.asInstanceOf[ExtendedActorSystem]
.dynamicAccess
diff --git a/cluster-metrics/src/test/scala/org/apache/pekko/cluster/metrics/TestUtil.scala b/cluster-metrics/src/test/scala/org/apache/pekko/cluster/metrics/TestUtil.scala
index 32ce9d17c4..421e645f1b 100644
--- a/cluster-metrics/src/test/scala/org/apache/pekko/cluster/metrics/TestUtil.scala
+++ b/cluster-metrics/src/test/scala/org/apache/pekko/cluster/metrics/TestUtil.scala
@@ -56,7 +56,7 @@ trait RedirectLogging {
* Provide sigar library from `project/target` location.
*/
case class SimpleSigarProvider(location: String = "native") extends SigarProvider {
- def extractFolder = s"${System.getProperty("user.dir")}/target/${location}"
+ def extractFolder = s"${System.getProperty("user.dir")}/target/$location"
}
/**
diff --git a/cluster-sharding-typed/src/main/scala/org/apache/pekko/cluster/sharding/typed/ReplicatedEntityProvider.scala b/cluster-sharding-typed/src/main/scala/org/apache/pekko/cluster/sharding/typed/ReplicatedEntityProvider.scala
index ebe495cc6d..1637cf97aa 100644
--- a/cluster-sharding-typed/src/main/scala/org/apache/pekko/cluster/sharding/typed/ReplicatedEntityProvider.scala
+++ b/cluster-sharding-typed/src/main/scala/org/apache/pekko/cluster/sharding/typed/ReplicatedEntityProvider.scala
@@ -67,7 +67,7 @@ object ReplicatedEntityProvider {
throw new IllegalArgumentException(
s"typeName [$typeName] contains [$Separator] which is a reserved character")
- val typeKey = EntityTypeKey[M](s"$typeName${Separator}${replicaId.id}")
+ val typeKey = EntityTypeKey[M](s"$typeName$Separator${replicaId.id}")
(settingsPerReplicaFactory(typeKey, replicaId), typeName)
}.toVector, directReplication = true)
}
diff --git a/cluster-sharding-typed/src/multi-jvm/scala/org/apache/pekko/cluster/sharding/ClusterShardingRememberEntitiesPerfSpec.scala b/cluster-sharding-typed/src/multi-jvm/scala/org/apache/pekko/cluster/sharding/ClusterShardingRememberEntitiesPerfSpec.scala
index 85947b8817..06d233db9a 100644
--- a/cluster-sharding-typed/src/multi-jvm/scala/org/apache/pekko/cluster/sharding/ClusterShardingRememberEntitiesPerfSpec.scala
+++ b/cluster-sharding-typed/src/multi-jvm/scala/org/apache/pekko/cluster/sharding/ClusterShardingRememberEntitiesPerfSpec.scala
@@ -170,7 +170,7 @@ abstract class ClusterShardingRememberEntitiesPerfSpec
val took = NANOSECONDS.toMillis(System.nanoTime - startTime)
val throughput = numberOfMessages * 1000.0 / took
println(
- s"### Test [${name}] stop with $numberOfMessages took $took ms, " +
+ s"### Test [$name] stop with $numberOfMessages took $took ms, " +
f"throughput $throughput%,.0f msg/s")
// println("Iteration Latencies: ")
// histogram.outputPercentileDistribution(System.out, 1.0)
@@ -184,7 +184,7 @@ abstract class ClusterShardingRememberEntitiesPerfSpec
.mkString(" ")}")
recording.endAndDump(Paths.get("target", s"${name.replace(" ", "-")}.jfr"))
}
- enterBarrier(s"after-start-stop-${testRun}")
+ enterBarrier(s"after-start-stop-$testRun")
}
"test when starting new entity" in {
diff --git a/cluster-sharding-typed/src/multi-jvm/scala/org/apache/pekko/cluster/sharding/typed/delivery/DeliveryThroughputSpec.scala b/cluster-sharding-typed/src/multi-jvm/scala/org/apache/pekko/cluster/sharding/typed/delivery/DeliveryThroughputSpec.scala
index d4abc53e57..78edb33057 100644
--- a/cluster-sharding-typed/src/multi-jvm/scala/org/apache/pekko/cluster/sharding/typed/delivery/DeliveryThroughputSpec.scala
+++ b/cluster-sharding-typed/src/multi-jvm/scala/org/apache/pekko/cluster/sharding/typed/delivery/DeliveryThroughputSpec.scala
@@ -180,7 +180,7 @@ object DeliveryThroughputSpec extends MultiNodeConfig {
resultReporter.reportResults(
s"=== ${resultReporter.testName} ${testSettings.testName}: " +
- f"throughput ${throughput}%,.0f msg/s, " +
+ f"throughput $throughput%,.0f msg/s, " +
s"$took ms to deliver $numberOfMessages.")
plotRef ! PlotResult().add(testSettings.testName, throughput)
diff --git a/cluster-sharding-typed/src/test/scala/docs/org/apache/pekko/cluster/sharding/typed/AccountExampleWithCommandHandlersInDurableState.scala b/cluster-sharding-typed/src/test/scala/docs/org/apache/pekko/cluster/sharding/typed/AccountExampleWithCommandHandlersInDurableState.scala
index 86286adb09..36a45b815f 100644
--- a/cluster-sharding-typed/src/test/scala/docs/org/apache/pekko/cluster/sharding/typed/AccountExampleWithCommandHandlersInDurableState.scala
+++ b/cluster-sharding-typed/src/test/scala/docs/org/apache/pekko/cluster/sharding/typed/AccountExampleWithCommandHandlersInDurableState.scala
@@ -105,7 +105,7 @@ object AccountExampleWithCommandHandlersInDurableState {
Effect.persist(copy(balance = balance - cmd.amount)).thenReply(cmd.replyTo)(_ => StatusReply.Ack)
else
Effect.reply(cmd.replyTo)(
- StatusReply.Error(s"Insufficient balance ${balance} to be able to withdraw ${cmd.amount}"))
+ StatusReply.Error(s"Insufficient balance $balance to be able to withdraw ${cmd.amount}"))
}
// #reply
diff --git a/cluster-sharding-typed/src/test/scala/org/apache/pekko/cluster/sharding/typed/JoinConfigCompatCheckerClusterShardingSpec.scala b/cluster-sharding-typed/src/test/scala/org/apache/pekko/cluster/sharding/typed/JoinConfigCompatCheckerClusterShardingSpec.scala
index 6cf72ad175..7e79170d55 100644
--- a/cluster-sharding-typed/src/test/scala/org/apache/pekko/cluster/sharding/typed/JoinConfigCompatCheckerClusterShardingSpec.scala
+++ b/cluster-sharding-typed/src/test/scala/org/apache/pekko/cluster/sharding/typed/JoinConfigCompatCheckerClusterShardingSpec.scala
@@ -81,7 +81,7 @@ class JoinConfigCompatCheckerClusterShardingSpec
"A Joining Node" must {
- s"not be allowed to join a cluster with different '${Key}'" taggedAs LongRunningTest in {
+ s"not be allowed to join a cluster with different '$Key'" taggedAs LongRunningTest in {
join(system)
val joining = ActorTestKit(system.name, joinConfig(Shards + 1)) // different
configured(joining.system) should ===(configured(system) + 1)
diff --git a/cluster-sharding/src/main/scala/org/apache/pekko/cluster/sharding/internal/DDataRememberEntitiesCoordinatorStore.scala b/cluster-sharding/src/main/scala/org/apache/pekko/cluster/sharding/internal/DDataRememberEntitiesCoordinatorStore.scala
index 55604ea379..2faedfd9d6 100644
--- a/cluster-sharding/src/main/scala/org/apache/pekko/cluster/sharding/internal/DDataRememberEntitiesCoordinatorStore.scala
+++ b/cluster-sharding/src/main/scala/org/apache/pekko/cluster/sharding/internal/DDataRememberEntitiesCoordinatorStore.scala
@@ -55,7 +55,7 @@ private[pekko] final class DDataRememberEntitiesCoordinatorStore(
private val readMajority = ReadMajority(settings.tuningParameters.waitingForStateTimeout, majorityMinCap)
private val writeMajority = WriteMajority(settings.tuningParameters.updatingStateTimeout, majorityMinCap)
- private val AllShardsKey = GSetKey[String](s"shard-${typeName}-all")
+ private val AllShardsKey = GSetKey[String](s"shard-$typeName-all")
private var allShards: Option[Set[ShardId]] = None
private var coordinatorWaitingForShards: Option[ActorRef] = None
diff --git a/cluster-sharding/src/test/scala/org/apache/pekko/cluster/sharding/ClusterShardingLeaseSpec.scala b/cluster-sharding/src/test/scala/org/apache/pekko/cluster/sharding/ClusterShardingLeaseSpec.scala
index ff7784179f..eac46c3c3f 100644
--- a/cluster-sharding/src/test/scala/org/apache/pekko/cluster/sharding/ClusterShardingLeaseSpec.scala
+++ b/cluster-sharding/src/test/scala/org/apache/pekko/cluster/sharding/ClusterShardingLeaseSpec.scala
@@ -110,7 +110,7 @@ class ClusterShardingLeaseSpec(config: Config, rememberEntities: Boolean)
}
def leaseNameFor(shardId: Int, typeName: String = typeName): String =
- s"${system.name}-shard-${typeName}-${shardId}"
+ s"${system.name}-shard-$typeName-$shardId"
"Cluster sharding with lease" should {
"not start until lease is acquired" in {
diff --git a/cluster-sharding/src/test/scala/org/apache/pekko/cluster/sharding/ShardWithLeaseSpec.scala b/cluster-sharding/src/test/scala/org/apache/pekko/cluster/sharding/ShardWithLeaseSpec.scala
index 697d5c9d38..12f28095b9 100644
--- a/cluster-sharding/src/test/scala/org/apache/pekko/cluster/sharding/ShardWithLeaseSpec.scala
+++ b/cluster-sharding/src/test/scala/org/apache/pekko/cluster/sharding/ShardWithLeaseSpec.scala
@@ -54,7 +54,7 @@ object ShardWithLeaseSpec {
override def receive: Receive = {
case msg =>
log.info("Msg {}", msg)
- sender() ! s"ack ${msg}"
+ sender() ! s"ack $msg"
}
}
@@ -165,7 +165,7 @@ class ShardWithLeaseSpec extends PekkoSpec(ShardWithLeaseSpec.config) with WithL
ClusterSharding(system).start(typeName, Props(new EntityActor()), settings, extractEntityId, extractShardId)
def leaseFor(shardId: ShardId) = awaitAssert {
- val leaseName = s"${system.name}-shard-${typeName}-${shardId}"
+ val leaseName = s"${system.name}-shard-$typeName-$shardId"
testLeaseExt.getTestLease(leaseName)
}
}
diff --git a/cluster-tools/src/main/scala/org/apache/pekko/cluster/pubsub/DistributedPubSubMediator.scala b/cluster-tools/src/main/scala/org/apache/pekko/cluster/pubsub/DistributedPubSubMediator.scala
index 36ab1244d8..b2f0c47f68 100644
--- a/cluster-tools/src/main/scala/org/apache/pekko/cluster/pubsub/DistributedPubSubMediator.scala
+++ b/cluster-tools/src/main/scala/org/apache/pekko/cluster/pubsub/DistributedPubSubMediator.scala
@@ -583,7 +583,7 @@ class DistributedPubSubMediator(settings: DistributedPubSubSettings)
require(
role.forall(cluster.selfRoles.contains),
- s"This cluster member [${selfAddress}] doesn't have the role [$role]")
+ s"This cluster member [$selfAddress] doesn't have the role [$role]")
val removedTimeToLiveMillis = removedTimeToLive.toMillis
diff --git a/cluster-tools/src/main/scala/org/apache/pekko/cluster/pubsub/protobuf/DistributedPubSubMessageSerializer.scala b/cluster-tools/src/main/scala/org/apache/pekko/cluster/pubsub/protobuf/DistributedPubSubMessageSerializer.scala
index 1e738fea28..a4742ccdaf 100644
--- a/cluster-tools/src/main/scala/org/apache/pekko/cluster/pubsub/protobuf/DistributedPubSubMessageSerializer.scala
+++ b/cluster-tools/src/main/scala/org/apache/pekko/cluster/pubsub/protobuf/DistributedPubSubMessageSerializer.scala
@@ -116,7 +116,7 @@ private[pekko] class DistributedPubSubMessageSerializer(val system: ExtendedActo
private def addressToProto(address: Address): dm.Address.Builder = address match {
case Address(protocol, system, Some(host), Some(port)) =>
dm.Address.newBuilder().setSystem(system).setHostname(host).setPort(port).setProtocol(protocol)
- case _ => throw new IllegalArgumentException(s"Address [${address}] could not be serialized: host or port missing.")
+ case _ => throw new IllegalArgumentException(s"Address [$address] could not be serialized: host or port missing.")
}
private def addressFromProto(address: dm.Address): Address =
diff --git a/cluster/src/main/scala/org/apache/pekko/cluster/Cluster.scala b/cluster/src/main/scala/org/apache/pekko/cluster/Cluster.scala
index e7d90a520a..430ab87cd3 100644
--- a/cluster/src/main/scala/org/apache/pekko/cluster/Cluster.scala
+++ b/cluster/src/main/scala/org/apache/pekko/cluster/Cluster.scala
@@ -91,7 +91,7 @@ class Cluster(val system: ExtendedActorSystem) extends Extension {
UniqueAddress(c.transport.defaultAddress, AddressUidExtension(system).longAddressUid)
case other =>
throw new ConfigurationException(
- s"ActorSystem [${system}] needs to have 'pekko.actor.provider' set to 'cluster' in the configuration, currently uses [${other.getClass.getName}]")
+ s"ActorSystem [$system] needs to have 'pekko.actor.provider' set to 'cluster' in the configuration, currently uses [${other.getClass.getName}]")
}
/**
diff --git a/cluster/src/main/scala/org/apache/pekko/cluster/ClusterHeartbeat.scala b/cluster/src/main/scala/org/apache/pekko/cluster/ClusterHeartbeat.scala
index 5dc1bb42bb..653f057309 100644
--- a/cluster/src/main/scala/org/apache/pekko/cluster/ClusterHeartbeat.scala
+++ b/cluster/src/main/scala/org/apache/pekko/cluster/ClusterHeartbeat.scala
@@ -343,7 +343,7 @@ private[cluster] final case class HeartbeatNodeRing(
unreachable: Set[UniqueAddress],
monitoredByNrOfMembers: Int) {
- require(nodes contains selfAddress, s"nodes [${nodes.mkString(", ")}] must contain selfAddress [${selfAddress}]")
+ require(nodes contains selfAddress, s"nodes [${nodes.mkString(", ")}] must contain selfAddress [$selfAddress]")
private val nodeRing: immutable.SortedSet[UniqueAddress] = {
implicit val ringOrdering: Ordering[UniqueAddress] = Ordering.fromLessThan[UniqueAddress] { (a, b) =>
diff --git a/cluster/src/main/scala/org/apache/pekko/cluster/Member.scala b/cluster/src/main/scala/org/apache/pekko/cluster/Member.scala
index d00ab8b40f..df2293c6f4 100644
--- a/cluster/src/main/scala/org/apache/pekko/cluster/Member.scala
+++ b/cluster/src/main/scala/org/apache/pekko/cluster/Member.scala
@@ -93,7 +93,7 @@ class Member private[cluster] (
val oldStatus = this.status
if (status == oldStatus) this
else {
- require(allowedTransitions(oldStatus)(status), s"Invalid member status transition [ ${this} -> ${status}]")
+ require(allowedTransitions(oldStatus)(status), s"Invalid member status transition [ $this -> $status]")
new Member(uniqueAddress, upNumber, status, roles, appVersion)
}
}
diff --git a/cluster/src/main/scala/org/apache/pekko/cluster/protobuf/ClusterMessageSerializer.scala b/cluster/src/main/scala/org/apache/pekko/cluster/protobuf/ClusterMessageSerializer.scala
index bb82605489..6f948d589d 100644
--- a/cluster/src/main/scala/org/apache/pekko/cluster/protobuf/ClusterMessageSerializer.scala
+++ b/cluster/src/main/scala/org/apache/pekko/cluster/protobuf/ClusterMessageSerializer.scala
@@ -153,7 +153,7 @@ final class ClusterMessageSerializer(val system: ExtendedActorSystem)
case OldDownManifest => deserializeDown(bytes)
case OldExitingConfirmedManifest => deserializeExitingConfirmed(bytes)
case OldClusterRouterPoolManifest => deserializeClusterRouterPool(bytes)
- case _ => throw new IllegalArgumentException(s"Unknown manifest [${manifest}]")
+ case _ => throw new IllegalArgumentException(s"Unknown manifest [$manifest]")
}
def compress(msg: MessageLite): Array[Byte] = {
diff --git a/cluster/src/multi-jvm/scala/org/apache/pekko/cluster/MultiDcHeartbeatTakingOverSpec.scala b/cluster/src/multi-jvm/scala/org/apache/pekko/cluster/MultiDcHeartbeatTakingOverSpec.scala
index 9080ca3dce..df34b23fe1 100644
--- a/cluster/src/multi-jvm/scala/org/apache/pekko/cluster/MultiDcHeartbeatTakingOverSpec.scala
+++ b/cluster/src/multi-jvm/scala/org/apache/pekko/cluster/MultiDcHeartbeatTakingOverSpec.scala
@@ -154,7 +154,7 @@ abstract class MultiDcHeartbeatTakingOverSpec extends MultiNodeClusterSpec(Multi
val preLeaveOldestAlphaAddress =
expectedAlphaHeartbeaterNodes.find(_.address.port.get == preLeaveOldestAlphaRole.port.get).get.address
runOn(preLeaveOldestAlphaRole) {
- info(s"Leaving: ${preLeaveOldestAlphaAddress}")
+ info(s"Leaving: $preLeaveOldestAlphaAddress")
cluster.leave(cluster.selfAddress)
}
@@ -213,7 +213,7 @@ abstract class MultiDcHeartbeatTakingOverSpec extends MultiNodeClusterSpec(Multi
private def membersAsRoles(ms: SortedSet[Member]): List[RoleName] = {
val res = ms.toList.flatMap(m => roleName(m.address))
- require(res.size == ms.size, s"Not all members were converted to roles! Got: ${ms}, found ${res}")
+ require(res.size == ms.size, s"Not all members were converted to roles! Got: $ms, found $res")
res
}
}
diff --git a/cluster/src/multi-jvm/scala/org/apache/pekko/cluster/MultiDcSunnyWeatherSpec.scala b/cluster/src/multi-jvm/scala/org/apache/pekko/cluster/MultiDcSunnyWeatherSpec.scala
index 75efd6a2f5..8243713b9b 100644
--- a/cluster/src/multi-jvm/scala/org/apache/pekko/cluster/MultiDcSunnyWeatherSpec.scala
+++ b/cluster/src/multi-jvm/scala/org/apache/pekko/cluster/MultiDcSunnyWeatherSpec.scala
@@ -171,7 +171,7 @@ abstract class MultiDcSunnyWeatherSpec extends MultiNodeClusterSpec(MultiDcSunny
private def membersAsRoles(ms: immutable.Set[Member]): immutable.Set[RoleName] = {
val res = ms.flatMap(m => roleName(m.address))
- require(res.size == ms.size, s"Not all members were converted to roles! Got: ${ms}, found ${res}")
+ require(res.size == ms.size, s"Not all members were converted to roles! Got: $ms, found $res")
res
}
}
diff --git a/cluster/src/multi-jvm/scala/org/apache/pekko/cluster/MultiNodeClusterSpec.scala b/cluster/src/multi-jvm/scala/org/apache/pekko/cluster/MultiNodeClusterSpec.scala
index c663b3fd31..ec661157a6 100644
--- a/cluster/src/multi-jvm/scala/org/apache/pekko/cluster/MultiNodeClusterSpec.scala
+++ b/cluster/src/multi-jvm/scala/org/apache/pekko/cluster/MultiNodeClusterSpec.scala
@@ -362,7 +362,7 @@ abstract class MultiNodeClusterSpec(multiNodeconfig: MultiNodeConfig)
try Await.result(exitingLatch, timeout)
catch {
case cause: Exception =>
- throw new AssertionError(s"Member ${toBeRemovedAddress} was not removed within ${timeout}!", cause)
+ throw new AssertionError(s"Member $toBeRemovedAddress was not removed within $timeout!", cause)
}
awaiter ! PoisonPill // you've done your job, now die
diff --git a/cluster/src/multi-jvm/scala/org/apache/pekko/cluster/SharedMediaDriverSupport.scala b/cluster/src/multi-jvm/scala/org/apache/pekko/cluster/SharedMediaDriverSupport.scala
index 0635560f93..4a01d2f442 100644
--- a/cluster/src/multi-jvm/scala/org/apache/pekko/cluster/SharedMediaDriverSupport.scala
+++ b/cluster/src/multi-jvm/scala/org/apache/pekko/cluster/SharedMediaDriverSupport.scala
@@ -94,7 +94,7 @@ object SharedMediaDriverSupport {
}
} catch {
case NonFatal(e) =>
- println(s"Failed to start media driver in [${aeronDir}]: ${e.getMessage}")
+ println(s"Failed to start media driver in [$aeronDir]: ${e.getMessage}")
}
}
}
diff --git a/cluster/src/multi-jvm/scala/org/apache/pekko/cluster/StressSpec.scala b/cluster/src/multi-jvm/scala/org/apache/pekko/cluster/StressSpec.scala
index b4fe55f04a..3643a8c14f 100644
--- a/cluster/src/multi-jvm/scala/org/apache/pekko/cluster/StressSpec.scala
+++ b/cluster/src/multi-jvm/scala/org/apache/pekko/cluster/StressSpec.scala
@@ -148,7 +148,7 @@ private[cluster] object StressMultiJvmSpec extends MultiNodeConfig {
val numberOfNodesJoiningToSeedNodes = (totalNumberOfNodes - numberOfSeedNodes -
numberOfNodesJoiningToSeedNodesInitially - numberOfNodesJoiningOneByOneSmall -
numberOfNodesJoiningOneByOneLarge - numberOfNodesJoiningToOneNode)
- .requiring(_ >= 0, s"too many configured nr-of-nodes-joining-*, total should be <= ${totalNumberOfNodes}")
+ .requiring(_ >= 0, s"too many configured nr-of-nodes-joining-*, total should be <= $totalNumberOfNodes")
val numberOfNodesLeavingOneByOneSmall = getInt("nr-of-nodes-leaving-one-by-one-small") * nFactor
val numberOfNodesLeavingOneByOneLarge = getInt("nr-of-nodes-leaving-one-by-one-large") * nFactor
val numberOfNodesLeaving = getInt("nr-of-nodes-leaving") * nFactor
@@ -167,20 +167,20 @@ private[cluster] object StressMultiJvmSpec extends MultiNodeConfig {
require(
numberOfSeedNodes + numberOfNodesJoiningToSeedNodesInitially + numberOfNodesJoiningOneByOneSmall +
numberOfNodesJoiningOneByOneLarge + numberOfNodesJoiningToOneNode + numberOfNodesJoiningToSeedNodes <= totalNumberOfNodes,
- s"specified number of joining nodes <= ${totalNumberOfNodes}")
+ s"specified number of joining nodes <= $totalNumberOfNodes")
// don't shutdown the 3 nodes hosting the master actors
require(
numberOfNodesLeavingOneByOneSmall + numberOfNodesLeavingOneByOneLarge + numberOfNodesLeaving +
numberOfNodesShutdownOneByOneSmall + numberOfNodesShutdownOneByOneLarge + numberOfNodesShutdown <= totalNumberOfNodes - 3,
- s"specified number of leaving/shutdown nodes <= ${totalNumberOfNodes - 3}")
+ s"""specified number of leaving/shutdown nodes <= ${totalNumberOfNodes - 3}""")
require(
numberOfNodesJoinRemove <= totalNumberOfNodes,
- s"nr-of-nodes-join-remove should be <= ${totalNumberOfNodes}")
+ s"nr-of-nodes-join-remove should be <= $totalNumberOfNodes")
override def toString: String = {
- testConfig.withFallback(ConfigFactory.parseString(s"nrOfNodes=${totalNumberOfNodes}")).root.render
+ testConfig.withFallback(ConfigFactory.parseString(s"nrOfNodes=$totalNumberOfNodes")).root.render
}
}
@@ -218,14 +218,14 @@ private[cluster] object StressMultiJvmSpec extends MultiNodeConfig {
case StatsResult(from, stats) => clusterStatsObservedByNode += from -> stats
case ReportTick =>
if (infolog)
- log.info(s"[${title}] in progress\n\n${formatPhi}\n\n${formatStats}")
+ log.info(s"[$title] in progress\n\n$formatPhi\n\n$formatStats")
case r: ClusterResult =>
results :+= r
if (results.size == expectedResults) {
val aggregated = AggregatedClusterResult(title, maxDuration, totalGossipStats)
if (infolog)
log.info(
- s"[${title}] completed in [${aggregated.duration.toMillis}] ms\n${aggregated.clusterStats}\n\n${formatPhi}\n\n${formatStats}")
+ s"[$title] completed in [${aggregated.duration.toMillis}] ms\n${aggregated.clusterStats}\n\n$formatPhi\n\n$formatStats")
reportTo.foreach { _ ! aggregated }
context.stop(self)
}
@@ -258,7 +258,7 @@ private[cluster] object StressMultiJvmSpec extends MultiNodeConfig {
def formatPhiHeader: String = "[Monitor]\t[Subject]\t[count]\t[count phi > 1.0]\t[max phi]"
def formatPhiLine(monitor: Address, subject: Address, phi: PhiValue): String =
- s"${monitor}\t${subject}\t${phi.count}\t${phi.countAboveOne}\t${phi.max.form}"
+ s"$monitor\t$subject\t${phi.count}\t${phi.countAboveOne}\t${phi.max.form}"
def formatStats: String = {
def f(stats: CurrentInternalStats) = {
@@ -267,7 +267,7 @@ private[cluster] object StressMultiJvmSpec extends MultiNodeConfig {
s"ClusterStats($receivedGossipCount, $mergeCount, $sameCount, $newerCount, $olderCount, $versionSize, $seenLatest)"
}
clusterStatsObservedByNode
- .map { case (monitor, stats) => s"${monitor}\t${f(stats)}" }
+ .map { case (monitor, stats) => s"$monitor\t${f(stats)}" }
.mkString("ClusterStats(gossip, merge, same, newer, older, vclockSize, seenLatest)\n", "\n", "")
}
@@ -600,7 +600,7 @@ abstract class StressSpec extends MultiNodeClusterSpec(StressMultiJvmSpec) with
def joinOne(): Unit = within(5.seconds + convergenceWithin(2.seconds, nbrUsedRoles + 1)) {
val currentRoles = roles.take(nbrUsedRoles + 1)
- val title = s"join one to ${nbrUsedRoles} nodes cluster"
+ val title = s"join one to $nbrUsedRoles nodes cluster"
createResultAggregator(title, expectedResults = currentRoles.size, includeInHistory = true)
runOn(currentRoles: _*) {
reportResult {
@@ -620,7 +620,7 @@ abstract class StressSpec extends MultiNodeClusterSpec(StressMultiJvmSpec) with
val currentRoles = roles.take(nbrUsedRoles + numberOfNodes)
val joiningRoles = currentRoles.takeRight(numberOfNodes)
val title =
- s"join ${numberOfNodes} to ${if (toSeedNodes) "seed nodes" else "one node"}, in ${nbrUsedRoles} nodes cluster"
+ s"join $numberOfNodes to ${if (toSeedNodes) "seed nodes" else "one node"}, in $nbrUsedRoles nodes cluster"
createResultAggregator(title, expectedResults = currentRoles.size, includeInHistory = true)
runOn(currentRoles: _*) {
reportResult {
@@ -646,7 +646,7 @@ abstract class StressSpec extends MultiNodeClusterSpec(StressMultiJvmSpec) with
def removeOne(shutdown: Boolean): Unit = within(25.seconds + convergenceWithin(3.seconds, nbrUsedRoles - 1)) {
val currentRoles = roles.take(nbrUsedRoles - 1)
- val title = s"${if (shutdown) "shutdown" else "remove"} one from ${nbrUsedRoles} nodes cluster"
+ val title = s"${if (shutdown) "shutdown" else "remove"} one from $nbrUsedRoles nodes cluster"
createResultAggregator(title, expectedResults = currentRoles.size, includeInHistory = true)
val removeRole = roles(nbrUsedRoles - 1)
val removeAddress = address(removeRole)
@@ -692,7 +692,7 @@ abstract class StressSpec extends MultiNodeClusterSpec(StressMultiJvmSpec) with
within(25.seconds + convergenceWithin(5.seconds, nbrUsedRoles - numberOfNodes)) {
val currentRoles = roles.take(nbrUsedRoles - numberOfNodes)
val removeRoles = roles.slice(currentRoles.size, nbrUsedRoles)
- val title = s"${if (shutdown) "shutdown" else "leave"} ${numberOfNodes} in ${nbrUsedRoles} nodes cluster"
+ val title = s"${if (shutdown) "shutdown" else "leave"} $numberOfNodes in $nbrUsedRoles nodes cluster"
createResultAggregator(title, expectedResults = currentRoles.size, includeInHistory = true)
runOn(removeRoles: _*) {
if (!shutdown) cluster.leave(myself)
@@ -718,7 +718,7 @@ abstract class StressSpec extends MultiNodeClusterSpec(StressMultiJvmSpec) with
within(25.seconds + convergenceWithin(5.seconds, nbrUsedRoles - numberOfNodes)) {
val currentRoles = roles.take(nbrUsedRoles - numberOfNodes)
val removeRoles = roles.slice(currentRoles.size, nbrUsedRoles)
- val title = s"partition ${numberOfNodes} in ${nbrUsedRoles} nodes cluster"
+ val title = s"partition $numberOfNodes in $nbrUsedRoles nodes cluster"
createResultAggregator(title, expectedResults = currentRoles.size, includeInHistory = true)
runOn(roles.head) {
diff --git a/cluster/src/test/scala/org/apache/pekko/cluster/ClusterSpec.scala b/cluster/src/test/scala/org/apache/pekko/cluster/ClusterSpec.scala
index 4a2c87e246..348740623b 100644
--- a/cluster/src/test/scala/org/apache/pekko/cluster/ClusterSpec.scala
+++ b/cluster/src/test/scala/org/apache/pekko/cluster/ClusterSpec.scala
@@ -353,8 +353,8 @@ class ClusterSpec extends PekkoSpec(ClusterSpec.config) with ImplicitSender {
"register multiple cluster JMX MBeans with pekko.cluster.jmx.multi-mbeans-in-same-jvm = on" in {
def getConfig = (port: Int) => ConfigFactory.parseString(s"""
pekko.cluster.jmx.multi-mbeans-in-same-jvm = on
- pekko.remote.classic.netty.tcp.port = ${port}
- pekko.remote.artery.canonical.port = ${port}
+ pekko.remote.classic.netty.tcp.port = $port
+ pekko.remote.artery.canonical.port = $port
""").withFallback(ConfigFactory.parseString(ClusterSpec.config))
val sys1 = ActorSystem("ClusterSpec4", getConfig(7355))
diff --git a/coordination/src/test/scala/org/apache/pekko/coordination/lease/TestLeaseActor.scala b/coordination/src/test/scala/org/apache/pekko/coordination/lease/TestLeaseActor.scala
index 414fa80f41..7902fcbdc0 100644
--- a/coordination/src/test/scala/org/apache/pekko/coordination/lease/TestLeaseActor.scala
+++ b/coordination/src/test/scala/org/apache/pekko/coordination/lease/TestLeaseActor.scala
@@ -73,7 +73,7 @@ class TestLeaseActor extends Actor with ActorLogging {
snd ! result
requests = requests.filterNot(_._2 == request)
case None =>
- throw new RuntimeException(s"unknown request to action: ${request}. Requests: ${requests}")
+ throw new RuntimeException(s"unknown request to action: $request. Requests: $requests")
}
}
diff --git a/distributed-data/src/main/scala/org/apache/pekko/cluster/ddata/Replicator.scala b/distributed-data/src/main/scala/org/apache/pekko/cluster/ddata/Replicator.scala
index 87672840d3..55e09fa49b 100644
--- a/distributed-data/src/main/scala/org/apache/pekko/cluster/ddata/Replicator.scala
+++ b/distributed-data/src/main/scala/org/apache/pekko/cluster/ddata/Replicator.scala
@@ -1377,7 +1377,7 @@ final class Replicator(settings: ReplicatorSettings) extends Actor with ActorLog
require(!cluster.isTerminated, "Cluster node must not be terminated")
require(
roles.subsetOf(cluster.selfRoles),
- s"This cluster member [${selfAddress}] doesn't have all the roles [${roles.mkString(", ")}]")
+ s"This cluster member [$selfAddress] doesn't have all the roles [${roles.mkString(", ")}]")
private val payloadSizeAggregator = {
val sizeExceeding = settings.logDataSizeExceeding.getOrElse(Int.MaxValue)
diff --git a/distributed-data/src/main/scala/org/apache/pekko/cluster/ddata/protobuf/SerializationSupport.scala b/distributed-data/src/main/scala/org/apache/pekko/cluster/ddata/protobuf/SerializationSupport.scala
index 412fa7f2e5..e3ede878b8 100644
--- a/distributed-data/src/main/scala/org/apache/pekko/cluster/ddata/protobuf/SerializationSupport.scala
+++ b/distributed-data/src/main/scala/org/apache/pekko/cluster/ddata/protobuf/SerializationSupport.scala
@@ -95,7 +95,7 @@ trait SerializationSupport {
def addressToProto(address: Address): dm.Address.Builder = address match {
case Address(_, _, Some(host), Some(port)) =>
dm.Address.newBuilder().setHostname(host).setPort(port)
- case _ => throw new IllegalArgumentException(s"Address [${address}] could not be serialized: host or port missing.")
+ case _ => throw new IllegalArgumentException(s"Address [$address] could not be serialized: host or port missing.")
}
def addressFromProto(address: dm.Address): Address =
diff --git a/docs/src/test/scala/docs/io/ScalaUdpMulticastSpec.scala b/docs/src/test/scala/docs/io/ScalaUdpMulticastSpec.scala
index e40aa229e4..db1c502f1d 100644
--- a/docs/src/test/scala/docs/io/ScalaUdpMulticastSpec.scala
+++ b/docs/src/test/scala/docs/io/ScalaUdpMulticastSpec.scala
@@ -83,7 +83,7 @@ class ScalaUdpMulticastSpec
}
if (failures.size == ipv6ifaces.size)
- fail(s"Multicast failed on all available interfaces: ${failures}")
+ fail(s"Multicast failed on all available interfaces: $failures")
}
}
diff --git a/docs/src/test/scala/docs/persistence/PersistentActorExample.scala b/docs/src/test/scala/docs/persistence/PersistentActorExample.scala
index 5d96246f3a..7a1b07e791 100644
--- a/docs/src/test/scala/docs/persistence/PersistentActorExample.scala
+++ b/docs/src/test/scala/docs/persistence/PersistentActorExample.scala
@@ -46,7 +46,7 @@ class ExamplePersistentActor extends PersistentActor {
val snapShotInterval = 1000
val receiveCommand: Receive = {
case Cmd(data) =>
- persist(Evt(s"${data}-${numEvents}")) { event =>
+ persist(Evt(s"$data-$numEvents")) { event =>
updateState(event)
context.system.eventStream.publish(event)
if (lastSequenceNr % snapShotInterval == 0 && lastSequenceNr != 0)
diff --git a/persistence-shared/src/test/scala/org/apache/pekko/persistence/serialization/SerializerSpec.scala b/persistence-shared/src/test/scala/org/apache/pekko/persistence/serialization/SerializerSpec.scala
index 2bd5d4cbf5..089e30c864 100644
--- a/persistence-shared/src/test/scala/org/apache/pekko/persistence/serialization/SerializerSpec.scala
+++ b/persistence-shared/src/test/scala/org/apache/pekko/persistence/serialization/SerializerSpec.scala
@@ -313,16 +313,16 @@ class MessageSerializerPersistenceSpec extends PekkoSpec(customSerializers) {
object MessageSerializerRemotingSpec {
class LocalActor(port: Int) extends Actor {
def receive = {
- case m => context.actorSelection(s"pekko://remote@127.0.0.1:${port}/user/remote").tell(m, Actor.noSender)
+ case m => context.actorSelection(s"pekko://remote@127.0.0.1:$port/user/remote").tell(m, Actor.noSender)
}
}
class RemoteActor extends Actor {
def receive = {
- case p @ PersistentRepr(MyPayload(data), _) => p.sender ! s"p${data}"
+ case p @ PersistentRepr(MyPayload(data), _) => p.sender ! s"p$data"
case a: AtomicWrite =>
a.payload.foreach {
- case p @ PersistentRepr(MyPayload(data), _) => p.sender ! s"p${data}"
+ case p @ PersistentRepr(MyPayload(data), _) => p.sender ! s"p$data"
case x => throw new RuntimeException(s"Unexpected payload: $x")
}
}
@@ -393,13 +393,13 @@ class MyPayloadSerializer extends Serializer {
def includeManifest: Boolean = true
def toBinary(o: AnyRef): Array[Byte] = o match {
- case MyPayload(data) => s".${data}".getBytes(UTF_8)
+ case MyPayload(data) => s".$data".getBytes(UTF_8)
case x => throw new NotSerializableException(s"Unexpected object: $x")
}
def fromBinary(bytes: Array[Byte], manifest: Option[Class[_]]): AnyRef = manifest match {
case Some(MyPayloadClass) => MyPayload(s"${new String(bytes, UTF_8)}.")
- case Some(c) => throw new Exception(s"unexpected manifest ${c}")
+ case Some(c) => throw new Exception(s"unexpected manifest $c")
case None => throw new Exception("no manifest")
}
}
@@ -437,13 +437,13 @@ class MySnapshotSerializer extends Serializer {
def includeManifest: Boolean = true
def toBinary(o: AnyRef): Array[Byte] = o match {
- case MySnapshot(data) => s".${data}".getBytes(UTF_8)
+ case MySnapshot(data) => s".$data".getBytes(UTF_8)
case x => throw new NotSerializableException(s"Unexpected object: $x")
}
def fromBinary(bytes: Array[Byte], manifest: Option[Class[_]]): AnyRef = manifest match {
case Some(MySnapshotClass) => MySnapshot(s"${new String(bytes, UTF_8)}.")
- case Some(c) => throw new Exception(s"unexpected manifest ${c}")
+ case Some(c) => throw new Exception(s"unexpected manifest $c")
case None => throw new Exception("no manifest")
}
}
@@ -457,7 +457,7 @@ class MySnapshotSerializer2 extends SerializerWithStringManifest {
def manifest(o: AnyRef): String = CurrentManifest
def toBinary(o: AnyRef): Array[Byte] = o match {
- case MySnapshot2(data) => s".${data}".getBytes(UTF_8)
+ case MySnapshot2(data) => s".$data".getBytes(UTF_8)
case unexpected => throw new NotSerializableException(s"Unexpected: $unexpected")
}
@@ -478,7 +478,7 @@ class OldPayloadSerializer extends SerializerWithStringManifest {
def manifest(o: AnyRef): String = o.getClass.getName
def toBinary(o: AnyRef): Array[Byte] = o match {
- case MyPayload(data) => s".${data}".getBytes(UTF_8)
+ case MyPayload(data) => s".$data".getBytes(UTF_8)
case old if old.getClass.getName == OldPayloadClassName =>
o.toString.getBytes(UTF_8)
case x => throw new NotSerializableException(s"Unexpected object: $x")
diff --git a/persistence-tck/src/main/scala/org/apache/pekko/persistence/journal/JournalPerfSpec.scala b/persistence-tck/src/main/scala/org/apache/pekko/persistence/journal/JournalPerfSpec.scala
index bf404bb6ff..df7a592f3f 100644
--- a/persistence-tck/src/main/scala/org/apache/pekko/persistence/journal/JournalPerfSpec.scala
+++ b/persistence-tck/src/main/scala/org/apache/pekko/persistence/journal/JournalPerfSpec.scala
@@ -64,7 +64,7 @@ object JournalPerfSpec {
case Cmd("n", payload) =>
counter += 1
- require(payload == counter, s"Expected to receive [$counter] yet got: [${payload}]")
+ require(payload == counter, s"Expected to receive [$counter] yet got: [$payload]")
if (counter == replyAfter) replyTo ! payload
case ResetCounter =>
@@ -74,7 +74,7 @@ object JournalPerfSpec {
override def receiveRecover: Receive = {
case Cmd(_, payload) =>
counter += 1
- require(payload == counter, s"Expected to receive [$counter] yet got: [${payload}]")
+ require(payload == counter, s"Expected to receive [$counter] yet got: [$payload]")
if (counter == replyAfter) replyTo ! payload
}
diff --git a/persistence-tck/src/main/scala/org/apache/pekko/persistence/journal/JournalSpec.scala b/persistence-tck/src/main/scala/org/apache/pekko/persistence/journal/JournalSpec.scala
index e1bc18a748..d9f8be96d1 100644
--- a/persistence-tck/src/main/scala/org/apache/pekko/persistence/journal/JournalSpec.scala
+++ b/persistence-tck/src/main/scala/org/apache/pekko/persistence/journal/JournalSpec.scala
@@ -91,7 +91,7 @@ abstract class JournalSpec(config: Config)
extension.journalFor(null)
def replayedMessage(snr: Long, deleted: Boolean = false): ReplayedMessage =
- ReplayedMessage(PersistentImpl(s"a-${snr}", snr, pid, "", deleted, Actor.noSender, writerUuid, 0L, None))
+ ReplayedMessage(PersistentImpl(s"a-$snr", snr, pid, "", deleted, Actor.noSender, writerUuid, 0L, None))
def writeMessages(fromSnr: Int, toSnr: Int, pid: String, sender: ActorRef, writerUuid: String): Unit = {
@@ -125,7 +125,7 @@ abstract class JournalSpec(config: Config)
(fromSnr to toSnr).foreach { i =>
probe.expectMsgPF() {
case WriteMessageSuccess(PersistentImpl(payload, `i`, `pid`, _, _, `sender`, `writerUuid`, _, _), _) =>
- payload should be(s"a-${i}")
+ payload should be(s"a-$i")
}
}
}
diff --git a/persistence-tck/src/main/scala/org/apache/pekko/persistence/snapshot/SnapshotStoreSpec.scala b/persistence-tck/src/main/scala/org/apache/pekko/persistence/snapshot/SnapshotStoreSpec.scala
index a06633cb5a..c300144063 100644
--- a/persistence-tck/src/main/scala/org/apache/pekko/persistence/snapshot/SnapshotStoreSpec.scala
+++ b/persistence-tck/src/main/scala/org/apache/pekko/persistence/snapshot/SnapshotStoreSpec.scala
@@ -76,7 +76,7 @@ abstract class SnapshotStoreSpec(config: Config)
def writeSnapshots(): Seq[SnapshotMetadata] = {
(1 to 5).map { i =>
val metadata = SnapshotMetadata(pid, i + 10)
- snapshotStore.tell(SaveSnapshot(metadata, s"s-${i}"), senderProbe.ref)
+ snapshotStore.tell(SaveSnapshot(metadata, s"s-$i"), senderProbe.ref)
senderProbe.expectMsgPF() { case SaveSnapshotSuccess(md) => md }
}
}
diff --git a/persistence-typed/src/main/scala/org/apache/pekko/persistence/typed/internal/Running.scala b/persistence-typed/src/main/scala/org/apache/pekko/persistence/typed/internal/Running.scala
index bde8c63edf..040aae769a 100644
--- a/persistence-typed/src/main/scala/org/apache/pekko/persistence/typed/internal/Running.scala
+++ b/persistence-typed/src/main/scala/org/apache/pekko/persistence/typed/internal/Running.scala
@@ -155,9 +155,9 @@ private[pekko] object Running {
case Some(replicatedMeta: ReplicatedEventMetadata) => replicatedMeta.originReplica == replicaId
case _ =>
throw new IllegalArgumentException(
- s"Replication stream from replica ${replicaId} for ${setup.persistenceId} contains event " +
+ s"Replication stream from replica $replicaId for ${setup.persistenceId} contains event " +
s"(sequence nr ${event.sequenceNr}) without replication metadata. " +
- s"Is the persistence id used by a regular event sourced actor there or the journal for that replica (${queryPluginId}) " +
+ s"Is the persistence id used by a regular event sourced actor there or the journal for that replica ($queryPluginId) " +
"used that does not support Replicated Event Sourcing?")
})
.viaMat(new FastForwardingFilter)(Keep.right)
diff --git a/persistence/src/main/scala/org/apache/pekko/persistence/RecoveryPermitter.scala b/persistence/src/main/scala/org/apache/pekko/persistence/RecoveryPermitter.scala
index f1259ad460..0a150299fd 100644
--- a/persistence/src/main/scala/org/apache/pekko/persistence/RecoveryPermitter.scala
+++ b/persistence/src/main/scala/org/apache/pekko/persistence/RecoveryPermitter.scala
@@ -78,7 +78,7 @@ import pekko.util.MessageBuffer
private def onReturnRecoveryPermit(ref: ActorRef): Unit = {
usedPermits -= 1
context.unwatch(ref)
- if (usedPermits < 0) throw new IllegalStateException(s"permits must not be negative (returned by: ${ref})")
+ if (usedPermits < 0) throw new IllegalStateException(s"permits must not be negative (returned by: $ref)")
if (!pendingBuffer.isEmpty) {
val ref = pendingBuffer.head()._2
pendingBuffer.dropHead()
diff --git a/persistence/src/main/scala/org/apache/pekko/persistence/journal/ReplayFilter.scala b/persistence/src/main/scala/org/apache/pekko/persistence/journal/ReplayFilter.scala
index 480ac26b8e..afecdfb1c9 100644
--- a/persistence/src/main/scala/org/apache/pekko/persistence/journal/ReplayFilter.scala
+++ b/persistence/src/main/scala/org/apache/pekko/persistence/journal/ReplayFilter.scala
@@ -92,7 +92,7 @@ private[pekko] class ReplayFilter(
if (r.persistent.sequenceNr < seqNo) {
val errMsg =
s"Invalid replayed event [sequenceNr=${r.persistent.sequenceNr}, writerUUID=${r.persistent.writerUuid}] as " +
- s"the sequenceNr should be equal to or greater than already-processed event [sequenceNr=${seqNo}, writerUUID=${writerUuid}] from the same writer, for the same persistenceId [${r.persistent.persistenceId}]. " +
+ s"the sequenceNr should be equal to or greater than already-processed event [sequenceNr=$seqNo, writerUUID=$writerUuid] from the same writer, for the same persistenceId [${r.persistent.persistenceId}]. " +
"Perhaps, events were journaled out of sequence, or duplicate persistenceId for different entities?"
logIssue(errMsg)
mode match {
@@ -111,7 +111,7 @@ private[pekko] class ReplayFilter(
// from old writer
val errMsg =
s"Invalid replayed event [sequenceNr=${r.persistent.sequenceNr}, writerUUID=${r.persistent.writerUuid}]. " +
- s"There was already a newer writer whose last replayed event was [sequenceNr=${seqNo}, writerUUID=${writerUuid}] for the same persistenceId [${r.persistent.persistenceId}]." +
+ s"There was already a newer writer whose last replayed event was [sequenceNr=$seqNo, writerUUID=$writerUuid] for the same persistenceId [${r.persistent.persistenceId}]." +
"Perhaps, the old writer kept journaling messages after the new writer created, or duplicate persistenceId for different entities?"
logIssue(errMsg)
mode match {
diff --git a/persistence/src/main/scala/org/apache/pekko/persistence/snapshot/local/LocalSnapshotStore.scala b/persistence/src/main/scala/org/apache/pekko/persistence/snapshot/local/LocalSnapshotStore.scala
index b22dba8de4..85118ee05c 100644
--- a/persistence/src/main/scala/org/apache/pekko/persistence/snapshot/local/LocalSnapshotStore.scala
+++ b/persistence/src/main/scala/org/apache/pekko/persistence/snapshot/local/LocalSnapshotStore.scala
@@ -160,7 +160,7 @@ private[persistence] class LocalSnapshotStore(config: Config) extends SnapshotSt
protected def snapshotFileForWrite(metadata: SnapshotMetadata, extension: String = ""): File =
new File(
snapshotDir(),
- s"snapshot-${URLEncoder.encode(metadata.persistenceId, UTF_8)}-${metadata.sequenceNr}-${metadata.timestamp}${extension}")
+ s"snapshot-${URLEncoder.encode(metadata.persistenceId, UTF_8)}-${metadata.sequenceNr}-${metadata.timestamp}$extension")
private def snapshotMetadatas(
persistenceId: String,
diff --git a/persistence/src/test/scala/org/apache/pekko/persistence/AtLeastOnceDeliveryFailureSpec.scala b/persistence/src/test/scala/org/apache/pekko/persistence/AtLeastOnceDeliveryFailureSpec.scala
index 4e60621d78..01d906beb2 100644
--- a/persistence/src/test/scala/org/apache/pekko/persistence/AtLeastOnceDeliveryFailureSpec.scala
+++ b/persistence/src/test/scala/org/apache/pekko/persistence/AtLeastOnceDeliveryFailureSpec.scala
@@ -89,7 +89,7 @@ object AtLeastOnceDeliveryFailureSpec {
def receiveCommand: Receive = {
case i: Int =>
if (contains(i)) {
- log.debug(debugMessage(s"ignored duplicate ${i}"))
+ log.debug(debugMessage(s"ignored duplicate $i"))
sender() ! Ack(i)
} else {
persist(MsgSent(i)) { evt =>
@@ -125,7 +125,7 @@ object AtLeastOnceDeliveryFailureSpec {
}
private def debugMessage(msg: String): String =
- s"[sender] ${msg} (mode = ${if (recoveryRunning) "replay" else "live"} snr = ${lastSequenceNr} state = ${state.sorted})"
+ s"[sender] $msg (mode = ${if (recoveryRunning) "replay" else "live"} snr = $lastSequenceNr state = ${state.sorted})"
override protected def onRecoveryFailure(cause: Throwable, event: Option[Any]): Unit = {
// mute logging
@@ -155,7 +155,7 @@ object AtLeastOnceDeliveryFailureSpec {
}
private def debugMessage(msg: String, m: Msg): String =
- s"[destination] ${msg} (message = $m)"
+ s"[destination] $msg (message = $m)"
}
class ChaosApp(probe: ActorRef) extends Actor with ActorLogging {
diff --git a/persistence/src/test/scala/org/apache/pekko/persistence/EventSourcedActorFailureSpec.scala b/persistence/src/test/scala/org/apache/pekko/persistence/EventSourcedActorFailureSpec.scala
index 2a7636babe..44a4541fbf 100644
--- a/persistence/src/test/scala/org/apache/pekko/persistence/EventSourcedActorFailureSpec.scala
+++ b/persistence/src/test/scala/org/apache/pekko/persistence/EventSourcedActorFailureSpec.scala
@@ -118,7 +118,7 @@ object EventSourcedActorFailureSpec {
class FailingRecovery(name: String) extends ExamplePersistentActor(name) {
override val receiveCommand: Receive = commonBehavior.orElse {
- case Cmd(data) => persist(Evt(s"${data}"))(updateState)
+ case Cmd(data) => persist(Evt(s"$data"))(updateState)
}
val failingRecover: Receive = {
@@ -133,7 +133,7 @@ object EventSourcedActorFailureSpec {
class ThrowingActor1(name: String) extends ExamplePersistentActor(name) {
override val receiveCommand: Receive = commonBehavior.orElse {
case Cmd(data) =>
- persist(Evt(s"${data}"))(updateState)
+ persist(Evt(s"$data"))(updateState)
if (data == "err")
throw new SimulatedException("Simulated exception 1")
}
@@ -142,7 +142,7 @@ object EventSourcedActorFailureSpec {
class ThrowingActor2(name: String) extends ExamplePersistentActor(name) {
override val receiveCommand: Receive = commonBehavior.orElse {
case Cmd(data) =>
- persist(Evt(s"${data}")) { evt =>
+ persist(Evt(s"$data")) { evt =>
if (data == "err")
throw new SimulatedException("Simulated exception 1")
updateState(evt)
diff --git a/persistence/src/test/scala/org/apache/pekko/persistence/ManyRecoveriesSpec.scala b/persistence/src/test/scala/org/apache/pekko/persistence/ManyRecoveriesSpec.scala
index 38d6ba8585..cf2917a26e 100644
--- a/persistence/src/test/scala/org/apache/pekko/persistence/ManyRecoveriesSpec.scala
+++ b/persistence/src/test/scala/org/apache/pekko/persistence/ManyRecoveriesSpec.scala
@@ -41,7 +41,7 @@ object ManyRecoveriesSpec {
override def receiveCommand: Receive = {
case Cmd(s) =>
persist(Evt(s)) { _ =>
- sender() ! s"$persistenceId-$s-${lastSequenceNr}"
+ sender() ! s"$persistenceId-$s-$lastSequenceNr"
}
case "stop" =>
context.stop(self)
diff --git a/persistence/src/test/scala/org/apache/pekko/persistence/PerformanceSpec.scala b/persistence/src/test/scala/org/apache/pekko/persistence/PerformanceSpec.scala
index c241f8250f..4d3bbcb346 100644
--- a/persistence/src/test/scala/org/apache/pekko/persistence/PerformanceSpec.scala
+++ b/persistence/src/test/scala/org/apache/pekko/persistence/PerformanceSpec.scala
@@ -138,7 +138,7 @@ class PerformanceSpec
val m = new Measure(loadCycles)
m.startMeasure()
(1 to loadCycles).foreach { i =>
- persistentActor ! s"msg${i}"
+ persistentActor ! s"msg$i"
}
persistentActor ! StopMeasure
expectMsg(100.seconds, StopMeasure)
diff --git a/persistence/src/test/scala/org/apache/pekko/persistence/PersistenceSpec.scala b/persistence/src/test/scala/org/apache/pekko/persistence/PersistenceSpec.scala
index 5527cb6b0c..ca5ccf5445 100644
--- a/persistence/src/test/scala/org/apache/pekko/persistence/PersistenceSpec.scala
+++ b/persistence/src/test/scala/org/apache/pekko/persistence/PersistenceSpec.scala
@@ -62,7 +62,7 @@ abstract class PersistenceSpec(config: Config)
system.actorOf(Props(implicitly[ClassTag[T]].runtimeClass, name, providedConfig))
override protected def beforeEach(): Unit = {
- _name = s"${namePrefix}-${counter.incrementAndGet()}"
+ _name = s"$namePrefix-${counter.incrementAndGet()}"
}
}
@@ -79,10 +79,10 @@ object PersistenceSpec {
pekko.actor.allow-java-serialization = on
pekko.actor.warn-about-java-serializer-usage = off
pekko.persistence.publish-plugin-commands = on
- pekko.persistence.journal.plugin = "pekko.persistence.journal.${plugin}"
- pekko.persistence.journal.leveldb.dir = "target/journal-${test}"
+ pekko.persistence.journal.plugin = "pekko.persistence.journal.$plugin"
+ pekko.persistence.journal.leveldb.dir = "target/journal-$test"
pekko.persistence.snapshot-store.plugin = "pekko.persistence.snapshot-store.local"
- pekko.persistence.snapshot-store.local.dir = "target/snapshots-${test}/"
+ pekko.persistence.snapshot-store.local.dir = "target/snapshots-$test/"
pekko.test.single-expect-default = 10s
"""))
}
diff --git a/persistence/src/test/scala/org/apache/pekko/persistence/PersistentActorSpec.scala b/persistence/src/test/scala/org/apache/pekko/persistence/PersistentActorSpec.scala
index 83028f5706..7e19e1e770 100644
--- a/persistence/src/test/scala/org/apache/pekko/persistence/PersistentActorSpec.scala
+++ b/persistence/src/test/scala/org/apache/pekko/persistence/PersistentActorSpec.scala
@@ -76,7 +76,7 @@ object PersistentActorSpec {
class Behavior1PersistentActor(name: String) extends ExamplePersistentActor(name) {
val receiveCommand: Receive = commonBehavior.orElse {
case Cmd(data) =>
- persistAll(Seq(Evt(s"${data}-1"), Evt(s"${data}-2")))(updateState)
+ persistAll(Seq(Evt(s"$data-1"), Evt(s"$data-2")))(updateState)
case d: DeleteMessagesSuccess =>
val replyTo = askedForDelete.getOrElse(
throw new RuntimeException("Received DeleteMessagesSuccess without anyone asking for delete!"))
@@ -106,8 +106,8 @@ object PersistentActorSpec {
class Behavior2PersistentActor(name: String) extends ExamplePersistentActor(name) {
val receiveCommand: Receive = commonBehavior.orElse {
case Cmd(data) =>
- persistAll(Seq(Evt(s"${data}-1"), Evt(s"${data}-2")))(updateState)
- persistAll(Seq(Evt(s"${data}-3"), Evt(s"${data}-4")))(updateState)
+ persistAll(Seq(Evt(s"$data-1"), Evt(s"$data-2")))(updateState)
+ persistAll(Seq(Evt(s"$data-3"), Evt(s"$data-4")))(updateState)
}
}
class Behavior2PersistentActorWithInmemRuntimePluginConfig(name: String, val providedConfig: Config)
@@ -117,8 +117,8 @@ object PersistentActorSpec {
class Behavior3PersistentActor(name: String) extends ExamplePersistentActor(name) {
val receiveCommand: Receive = commonBehavior.orElse {
case Cmd(data) =>
- persistAll(Seq(Evt(s"${data}-11"), Evt(s"${data}-12")))(updateState)
- updateState(Evt(s"${data}-10"))
+ persistAll(Seq(Evt(s"$data-11"), Evt(s"$data-12")))(updateState)
+ updateState(Evt(s"$data-10"))
}
}
class Behavior3PersistentActorWithInmemRuntimePluginConfig(name: String, val providedConfig: Config)
@@ -128,8 +128,8 @@ object PersistentActorSpec {
class ChangeBehaviorInLastEventHandlerPersistentActor(name: String) extends ExamplePersistentActor(name) {
val newBehavior: Receive = {
case Cmd(data) =>
- persist(Evt(s"${data}-21"))(updateState)
- persist(Evt(s"${data}-22")) { event =>
+ persist(Evt(s"$data-21"))(updateState)
+ persist(Evt(s"$data-22")) { event =>
updateState(event)
context.unbecome()
}
@@ -137,7 +137,7 @@ object PersistentActorSpec {
val receiveCommand: Receive = commonBehavior.orElse {
case Cmd(data) =>
- persist(Evt(s"${data}-0")) { event =>
+ persist(Evt(s"$data-0")) { event =>
updateState(event)
context.become(newBehavior)
}
@@ -152,16 +152,16 @@ object PersistentActorSpec {
class ChangeBehaviorInFirstEventHandlerPersistentActor(name: String) extends ExamplePersistentActor(name) {
val newBehavior: Receive = {
case Cmd(data) =>
- persist(Evt(s"${data}-21")) { event =>
+ persist(Evt(s"$data-21")) { event =>
updateState(event)
context.unbecome()
}
- persist(Evt(s"${data}-22"))(updateState)
+ persist(Evt(s"$data-22"))(updateState)
}
val receiveCommand: Receive = commonBehavior.orElse {
case Cmd(data) =>
- persist(Evt(s"${data}-0")) { event =>
+ persist(Evt(s"$data-0")) { event =>
updateState(event)
context.become(newBehavior)
}
@@ -177,14 +177,14 @@ object PersistentActorSpec {
val newBehavior: Receive = {
case Cmd(data) =>
context.unbecome()
- persistAll(Seq(Evt(s"${data}-31"), Evt(s"${data}-32")))(updateState)
- updateState(Evt(s"${data}-30"))
+ persistAll(Seq(Evt(s"$data-31"), Evt(s"$data-32")))(updateState)
+ updateState(Evt(s"$data-30"))
}
val receiveCommand: Receive = commonBehavior.orElse {
case Cmd(data) =>
context.become(newBehavior)
- persist(Evt(s"${data}-0"))(updateState)
+ persist(Evt(s"$data-0"))(updateState)
}
}
class ChangeBehaviorInCommandHandlerFirstPersistentActorWithInmemRuntimePluginConfig(
@@ -196,14 +196,14 @@ object PersistentActorSpec {
class ChangeBehaviorInCommandHandlerLastPersistentActor(name: String) extends ExamplePersistentActor(name) {
val newBehavior: Receive = {
case Cmd(data) =>
- persistAll(Seq(Evt(s"${data}-31"), Evt(s"${data}-32")))(updateState)
- updateState(Evt(s"${data}-30"))
+ persistAll(Seq(Evt(s"$data-31"), Evt(s"$data-32")))(updateState)
+ updateState(Evt(s"$data-30"))
context.unbecome()
}
val receiveCommand: Receive = commonBehavior.orElse {
case Cmd(data) =>
- persist(Evt(s"${data}-0"))(updateState)
+ persist(Evt(s"$data-0"))(updateState)
context.become(newBehavior)
}
}
diff --git a/persistence/src/test/scala/org/apache/pekko/persistence/SnapshotFailureRobustnessSpec.scala b/persistence/src/test/scala/org/apache/pekko/persistence/SnapshotFailureRobustnessSpec.scala
index ab8d3f9f12..12d1b6055e 100644
--- a/persistence/src/test/scala/org/apache/pekko/persistence/SnapshotFailureRobustnessSpec.scala
+++ b/persistence/src/test/scala/org/apache/pekko/persistence/SnapshotFailureRobustnessSpec.scala
@@ -70,14 +70,14 @@ object SnapshotFailureRobustnessSpec {
class LoadSnapshotTestPersistentActor(name: String, probe: ActorRef) extends NamedPersistentActor(name) {
override def receiveRecover: Receive = {
case SnapshotOffer(md, s) => probe ! ((md, s))
- case payload: String => probe ! s"${payload}-${lastSequenceNr}"
+ case payload: String => probe ! s"$payload-$lastSequenceNr"
case other => probe ! other
}
override def receiveCommand = {
case Cmd(payload) =>
persist(payload) { _ =>
- probe ! s"${payload}-${lastSequenceNr}"
+ probe ! s"$payload-$lastSequenceNr"
}
case SnapshotOffer(md, s) => probe ! ((md, s))
case other => probe ! other
diff --git a/persistence/src/test/scala/org/apache/pekko/persistence/SnapshotRecoveryLocalStoreSpec.scala b/persistence/src/test/scala/org/apache/pekko/persistence/SnapshotRecoveryLocalStoreSpec.scala
index 0efcbb2b59..01e58515b6 100644
--- a/persistence/src/test/scala/org/apache/pekko/persistence/SnapshotRecoveryLocalStoreSpec.scala
+++ b/persistence/src/test/scala/org/apache/pekko/persistence/SnapshotRecoveryLocalStoreSpec.scala
@@ -24,7 +24,7 @@ object SnapshotRecoveryLocalStoreSpec {
case object TakeSnapshot
class SaveSnapshotTestPersistentActor(name: String, probe: ActorRef) extends NamedPersistentActor(name) {
- var state = s"State for actor ${name}"
+ var state = s"State for actor $name"
def receiveCommand = {
case TakeSnapshot => saveSnapshot(state)
case SaveSnapshotSuccess(md) => probe ! md.sequenceNr
diff --git a/persistence/src/test/scala/org/apache/pekko/persistence/SnapshotRecoveryWithEmptyJournalSpec.scala b/persistence/src/test/scala/org/apache/pekko/persistence/SnapshotRecoveryWithEmptyJournalSpec.scala
index 6de5bd107b..6878a01d06 100644
--- a/persistence/src/test/scala/org/apache/pekko/persistence/SnapshotRecoveryWithEmptyJournalSpec.scala
+++ b/persistence/src/test/scala/org/apache/pekko/persistence/SnapshotRecoveryWithEmptyJournalSpec.scala
@@ -32,14 +32,14 @@ object SnapshotRecoveryWithEmptyJournalSpec {
var state = List.empty[String]
override def receiveRecover: Receive = {
- case payload: String => state = s"${payload}-${lastSequenceNr}" :: state
+ case payload: String => state = s"$payload-$lastSequenceNr" :: state
case SnapshotOffer(_, snapshot: List[_]) => state = snapshot.asInstanceOf[List[String]]
}
override def receiveCommand: PartialFunction[Any, Unit] = {
case payload: String =>
persist(payload) { _ =>
- state = s"${payload}-${lastSequenceNr}" :: state
+ state = s"$payload-$lastSequenceNr" :: state
}
case TakeSnapshot => saveSnapshot(state)
case SaveSnapshotSuccess(md) => probe ! md.sequenceNr
@@ -53,7 +53,7 @@ object SnapshotRecoveryWithEmptyJournalSpec {
override def recovery: Recovery = _recovery
override def receiveRecover: Receive = {
- case payload: String => probe ! s"${payload}-${lastSequenceNr}"
+ case payload: String => probe ! s"$payload-$lastSequenceNr"
case offer: SnapshotOffer => probe ! offer
case other => probe ! other
}
@@ -62,7 +62,7 @@ object SnapshotRecoveryWithEmptyJournalSpec {
case "done" => probe ! "done"
case payload: String =>
persist(payload) { _ =>
- probe ! s"${payload}-${lastSequenceNr}"
+ probe ! s"$payload-$lastSequenceNr"
}
case offer: SnapshotOffer => probe ! offer
case other => probe ! other
diff --git a/persistence/src/test/scala/org/apache/pekko/persistence/SnapshotSpec.scala b/persistence/src/test/scala/org/apache/pekko/persistence/SnapshotSpec.scala
index 6e8c0106ef..80eb60e754 100644
--- a/persistence/src/test/scala/org/apache/pekko/persistence/SnapshotSpec.scala
+++ b/persistence/src/test/scala/org/apache/pekko/persistence/SnapshotSpec.scala
@@ -24,14 +24,14 @@ object SnapshotSpec {
var state = List.empty[String]
override def receiveRecover: Receive = {
- case payload: String => state = s"${payload}-${lastSequenceNr}" :: state
+ case payload: String => state = s"$payload-$lastSequenceNr" :: state
case SnapshotOffer(_, snapshot: List[_]) => state = snapshot.asInstanceOf[List[String]]
}
override def receiveCommand = {
case payload: String =>
persist(payload) { _ =>
- state = s"${payload}-${lastSequenceNr}" :: state
+ state = s"$payload-$lastSequenceNr" :: state
}
case TakeSnapshot => saveSnapshot(state)
case SaveSnapshotSuccess(md) => probe ! md.sequenceNr
@@ -44,7 +44,7 @@ object SnapshotSpec {
override def recovery: Recovery = _recovery
override def receiveRecover: Receive = {
- case payload: String => probe ! s"${payload}-${lastSequenceNr}"
+ case payload: String => probe ! s"$payload-$lastSequenceNr"
case offer: SnapshotOffer => probe ! offer
case other => probe ! other
}
@@ -53,7 +53,7 @@ object SnapshotSpec {
case "done" => probe ! "done"
case payload: String =>
persist(payload) { _ =>
- probe ! s"${payload}-${lastSequenceNr}"
+ probe ! s"$payload-$lastSequenceNr"
}
case offer: SnapshotOffer => probe ! offer
case other => probe ! other
@@ -65,7 +65,7 @@ object SnapshotSpec {
override def recovery: Recovery = _recovery
override def receiveRecover: Receive = {
- case payload: String => probe ! s"${payload}-${lastSequenceNr}"
+ case payload: String => probe ! s"$payload-$lastSequenceNr"
case other if !other.isInstanceOf[SnapshotOffer] => probe ! other
}
@@ -73,7 +73,7 @@ object SnapshotSpec {
case "done" => probe ! "done"
case payload: String =>
persist(payload) { _ =>
- probe ! s"${payload}-${lastSequenceNr}"
+ probe ! s"$payload-$lastSequenceNr"
}
case other => probe ! other
}
diff --git a/persistence/src/test/scala/org/apache/pekko/persistence/fsm/PersistentFSMSpec.scala b/persistence/src/test/scala/org/apache/pekko/persistence/fsm/PersistentFSMSpec.scala
index ee80570fce..f2e52c242c 100644
--- a/persistence/src/test/scala/org/apache/pekko/persistence/fsm/PersistentFSMSpec.scala
+++ b/persistence/src/test/scala/org/apache/pekko/persistence/fsm/PersistentFSMSpec.scala
@@ -645,7 +645,7 @@ object PersistentFSMSpec {
case Event("4x", _) =>
goto(Persist4xAtOnce)
case Event(SaveSnapshotSuccess(metadata), _) =>
- probe ! s"SeqNo=${metadata.sequenceNr}, StateData=${stateData}"
+ probe ! s"SeqNo=${metadata.sequenceNr}, StateData=$stateData"
stay()
}
@@ -653,7 +653,7 @@ object PersistentFSMSpec {
case Event(i: Int, _) =>
stay().applying(IntAdded(i), IntAdded(i), IntAdded(i), IntAdded(i))
case Event(SaveSnapshotSuccess(metadata), _) =>
- probe ! s"SeqNo=${metadata.sequenceNr}, StateData=${stateData}"
+ probe ! s"SeqNo=${metadata.sequenceNr}, StateData=$stateData"
stay()
}
}
diff --git a/project/CopyrightHeader.scala b/project/CopyrightHeader.scala
index 84ea9bfe84..c075f89835 100644
--- a/project/CopyrightHeader.scala
+++ b/project/CopyrightHeader.scala
@@ -71,7 +71,7 @@ trait CopyrightHeader extends AutoPlugin {
case Some(currentText) if isOnlyLightbendOrEpflCopyrightAnnotated(currentText) =>
HeaderCommentStyle.cStyleBlockComment.commentCreator(text, existingText) + NewLine * 2 + currentText
case Some(currentText) =>
- throw new IllegalStateException(s"Unable to detect copyright for header:[${currentText}]")
+ throw new IllegalStateException(s"Unable to detect copyright for header:[$currentText]")
case None =>
HeaderCommentStyle.cStyleBlockComment.commentCreator(text, existingText)
}
diff --git a/project/MiMa.scala b/project/MiMa.scala
index f66ba7c711..9e03354f85 100644
--- a/project/MiMa.scala
+++ b/project/MiMa.scala
@@ -39,8 +39,8 @@ object MiMa extends AutoPlugin {
val nextVersionFilterDir =
moduleRoot / "src" / "main" / "mima-filters" / s"2.6.${latestPatchOf26 + 1}.backwards.excludes"
if (nextVersionFilterDir.exists()) {
- throw new IllegalArgumentException(s"Incorrect mima filter directory exists: '${nextVersionFilterDir}' " +
- s"should be with number from current release '${moduleRoot / "src" / "main" / "mima-filters" / s"2.6.${latestPatchOf26}.backwards.excludes"}")
+ throw new IllegalArgumentException(s"Incorrect mima filter directory exists: '$nextVersionFilterDir' " +
+ s"should be with number from current release '${moduleRoot / "src" / "main" / "mima-filters" / s"2.6.$latestPatchOf26.backwards.excludes"}")
}
}
diff --git a/remote-tests/src/multi-jvm/scala/org/apache/pekko/remote/artery/LatencySpec.scala b/remote-tests/src/multi-jvm/scala/org/apache/pekko/remote/artery/LatencySpec.scala
index 24950ff125..796ed96034 100644
--- a/remote-tests/src/multi-jvm/scala/org/apache/pekko/remote/artery/LatencySpec.scala
+++ b/remote-tests/src/multi-jvm/scala/org/apache/pekko/remote/artery/LatencySpec.scala
@@ -164,7 +164,7 @@ object LatencySpec extends MultiNodeConfig {
f"50%%ile: ${percentile(50.0)}%.0f µs, " +
f"90%%ile: ${percentile(90.0)}%.0f µs, " +
f"99%%ile: ${percentile(99.0)}%.0f µs, " +
- f"rate: ${throughput}%,.0f msg/s")
+ f"rate: $throughput%,.0f msg/s")
println("Histogram of RTT latencies in microseconds.")
histogram.outputPercentileDistribution(System.out, 1000.0)
diff --git a/remote-tests/src/multi-jvm/scala/org/apache/pekko/remote/artery/PlotResult.scala b/remote-tests/src/multi-jvm/scala/org/apache/pekko/remote/artery/PlotResult.scala
index 508a9ae172..37f05d3eaa 100644
--- a/remote-tests/src/multi-jvm/scala/org/apache/pekko/remote/artery/PlotResult.scala
+++ b/remote-tests/src/multi-jvm/scala/org/apache/pekko/remote/artery/PlotResult.scala
@@ -26,7 +26,7 @@ final case class PlotResult(values: Vector[(String, Number)] = Vector.empty) {
def csvValues: String = values.map(_._2).mkString("\"", "\",\"", "\"")
// this can be split to two lines with bash: cut -d':' -f2,3 | tr ':' $'\n'
- def csv(name: String): String = s"PLOT_${name}:${csvLabels}:${csvValues}"
+ def csv(name: String): String = s"PLOT_$name:$csvLabels:$csvValues"
}
diff --git a/remote-tests/src/multi-jvm/scala/org/apache/pekko/remote/artery/TestRateReporter.scala b/remote-tests/src/multi-jvm/scala/org/apache/pekko/remote/artery/TestRateReporter.scala
index 57b70cf76e..078a60687f 100644
--- a/remote-tests/src/multi-jvm/scala/org/apache/pekko/remote/artery/TestRateReporter.scala
+++ b/remote-tests/src/multi-jvm/scala/org/apache/pekko/remote/artery/TestRateReporter.scala
@@ -26,13 +26,13 @@ class TestRateReporter(name: String)
if (totalBytes > 0) {
println(
name +
- f": ${messagesPerSec}%,.0f msgs/sec, ${bytesPerSec}%,.0f bytes/sec, " +
- f"totals ${totalMessages}%,d messages ${totalBytes / (1024 * 1024)}%,d MB")
+ f": $messagesPerSec%,.0f msgs/sec, $bytesPerSec%,.0f bytes/sec, " +
+ f"totals $totalMessages%,d messages ${totalBytes / (1024 * 1024)}%,d MB")
} else {
println(
name +
- f": ${messagesPerSec}%,.0f msgs/sec " +
- f"total ${totalMessages}%,d messages")
+ f": $messagesPerSec%,.0f msgs/sec " +
+ f"total $totalMessages%,d messages")
}
}
}) {}
diff --git a/remote-tests/src/multi-jvm/scala/org/apache/pekko/remote/artery/aeron/AeronStreamLatencySpec.scala b/remote-tests/src/multi-jvm/scala/org/apache/pekko/remote/artery/aeron/AeronStreamLatencySpec.scala
index be31381463..6a56aeb354 100644
--- a/remote-tests/src/multi-jvm/scala/org/apache/pekko/remote/artery/aeron/AeronStreamLatencySpec.scala
+++ b/remote-tests/src/multi-jvm/scala/org/apache/pekko/remote/artery/aeron/AeronStreamLatencySpec.scala
@@ -148,7 +148,7 @@ abstract class AeronStreamLatencySpec
f"50%%ile: ${percentile(50.0)}%.0f µs, " +
f"90%%ile: ${percentile(90.0)}%.0f µs, " +
f"99%%ile: ${percentile(99.0)}%.0f µs, " +
- f"rate: ${throughput}%,.0f msg/s")
+ f"rate: $throughput%,.0f msg/s")
println("Histogram of RTT latencies in microseconds.")
histogram.outputPercentileDistribution(System.out, 1000.0)
diff --git a/remote-tests/src/multi-jvm/scala/org/apache/pekko/remote/artery/aeron/AeronStreamMaxThroughputSpec.scala b/remote-tests/src/multi-jvm/scala/org/apache/pekko/remote/artery/aeron/AeronStreamMaxThroughputSpec.scala
index 32c4822ffb..7bb6b5f96d 100644
--- a/remote-tests/src/multi-jvm/scala/org/apache/pekko/remote/artery/aeron/AeronStreamMaxThroughputSpec.scala
+++ b/remote-tests/src/multi-jvm/scala/org/apache/pekko/remote/artery/aeron/AeronStreamMaxThroughputSpec.scala
@@ -141,7 +141,7 @@ abstract class AeronStreamMaxThroughputSpec
val throughput = 1000.0 * total / d
println(
f"=== AeronStreamMaxThroughput $testName: " +
- f"${throughput}%,.0f msg/s, ${throughput * payloadSize}%,.0f bytes/s, " +
+ f"$throughput%,.0f msg/s, ${throughput * payloadSize}%,.0f bytes/s, " +
s"payload size $payloadSize, " +
s"$d ms to deliver $total messages")
plot = plot.add(testName, throughput * payloadSize / 1024 / 1024)
diff --git a/remote/src/main/scala/org/apache/pekko/remote/RemoteDeployer.scala b/remote/src/main/scala/org/apache/pekko/remote/RemoteDeployer.scala
index 6d6a232a3e..2b92c1266a 100644
--- a/remote/src/main/scala/org/apache/pekko/remote/RemoteDeployer.scala
+++ b/remote/src/main/scala/org/apache/pekko/remote/RemoteDeployer.scala
@@ -39,7 +39,7 @@ private[pekko] class RemoteDeployer(_settings: ActorSystem.Settings, _pm: Dynami
case d @ Some(deploy) =>
deploy.config.getString("remote") match {
case AddressFromURIString(r) => Some(deploy.copy(scope = RemoteScope(r)))
- case str if !str.isEmpty => throw new ConfigurationException(s"unparseable remote node name [${str}]")
+ case str if !str.isEmpty => throw new ConfigurationException(s"unparseable remote node name [$str]")
case _ =>
val nodes = immutableSeq(deploy.config.getStringList("target.nodes")).map(AddressFromURIString(_))
if (nodes.isEmpty || deploy.routerConfig == NoRouter) d
diff --git a/remote/src/main/scala/org/apache/pekko/remote/RemotingLifecycleEvent.scala b/remote/src/main/scala/org/apache/pekko/remote/RemotingLifecycleEvent.scala
index 38261ca8ae..65e33b2846 100644
--- a/remote/src/main/scala/org/apache/pekko/remote/RemotingLifecycleEvent.scala
+++ b/remote/src/main/scala/org/apache/pekko/remote/RemotingLifecycleEvent.scala
@@ -145,7 +145,7 @@ final case class GracefulShutdownQuarantinedEvent(uniqueAddress: UniqueAddress,
final case class ThisActorSystemQuarantinedEvent(localAddress: Address, remoteAddress: Address)
extends RemotingLifecycleEvent {
override def logLevel: LogLevel = Logging.WarningLevel
- override val toString: String = s"The remote system ${remoteAddress} has quarantined this system ${localAddress}."
+ override val toString: String = s"The remote system $remoteAddress has quarantined this system $localAddress."
}
/**
diff --git a/remote/src/main/scala/org/apache/pekko/remote/artery/aeron/AeronSink.scala b/remote/src/main/scala/org/apache/pekko/remote/artery/aeron/AeronSink.scala
index a31c47fb60..ab2ff6ed50 100644
--- a/remote/src/main/scala/org/apache/pekko/remote/artery/aeron/AeronSink.scala
+++ b/remote/src/main/scala/org/apache/pekko/remote/artery/aeron/AeronSink.scala
@@ -230,7 +230,7 @@ private[remote] class AeronSink(
private def onPublicationClosed(): Unit = {
offerTaskInProgress = false
- val cause = new PublicationClosedException(s"Aeron Publication to [${channel}] was closed.")
+ val cause = new PublicationClosedException(s"Aeron Publication to [$channel] was closed.")
// this is not exepected, since we didn't close the publication ourselves
flightRecorder.aeronSinkPublicationClosedUnexpectedly(channel, streamId)
completedValue = Failure(cause)
diff --git a/remote/src/main/scala/org/apache/pekko/remote/artery/compress/InboundCompressions.scala b/remote/src/main/scala/org/apache/pekko/remote/artery/compress/InboundCompressions.scala
index 2cc39f7671..ca50b8a478 100644
--- a/remote/src/main/scala/org/apache/pekko/remote/artery/compress/InboundCompressions.scala
+++ b/remote/src/main/scala/org/apache/pekko/remote/artery/compress/InboundCompressions.scala
@@ -289,7 +289,7 @@ private[remote] object InboundCompression {
def selectTable(version: Int): OptionVal[DecompressionTable[T]] = {
if (activeTable.version == version) {
if (ArterySettings.Compression.Debug)
- println(s"[compress] Found table [version: ${version}], was [ACTIVE]${activeTable}")
+ println(s"[compress] Found table [version: $version], was [ACTIVE]$activeTable")
OptionVal.Some(activeTable)
} else {
@tailrec def find(tables: List[DecompressionTable[T]]): OptionVal[DecompressionTable[T]] = {
@@ -306,10 +306,10 @@ private[remote] object InboundCompression {
found match {
case OptionVal.Some(t) =>
println(
- s"[compress] Found table [version: ${version}], was [OLD][${t}], old tables: [${oldTables.map(_.version)}]")
+ s"[compress] Found table [version: $version], was [OLD][$t], old tables: [${oldTables.map(_.version)}]")
case OptionVal.None =>
- println(s"[compress] Did not find table [version: ${version}], old tables: [${oldTables
- .map(_.version)}], activeTable: ${activeTable}, nextTable: ${nextTable}")
+ println(s"[compress] Did not find table [version: $version], old tables: [${oldTables
+ .map(_.version)}], activeTable: $activeTable, nextTable: $nextTable")
}
}
found
diff --git a/remote/src/main/scala/org/apache/pekko/remote/transport/AbstractTransportAdapter.scala b/remote/src/main/scala/org/apache/pekko/remote/transport/AbstractTransportAdapter.scala
index 4626e2bd04..1bb4e948e2 100644
--- a/remote/src/main/scala/org/apache/pekko/remote/transport/AbstractTransportAdapter.scala
+++ b/remote/src/main/scala/org/apache/pekko/remote/transport/AbstractTransportAdapter.scala
@@ -45,7 +45,7 @@ class TransportAdapters(system: ExtendedActorSystem) extends Extension {
name -> system.dynamicAccess
.createInstanceFor[TransportAdapterProvider](fqn, immutable.Seq.empty)
.recover {
- case e => throw new IllegalArgumentException(s"Cannot instantiate transport adapter [${fqn}]", e)
+ case e => throw new IllegalArgumentException(s"Cannot instantiate transport adapter [$fqn]", e)
}
.get
}
@@ -53,7 +53,7 @@ class TransportAdapters(system: ExtendedActorSystem) extends Extension {
def getAdapterProvider(name: String): TransportAdapterProvider = adaptersTable.get(name) match {
case Some(provider) => provider
case None =>
- throw new IllegalArgumentException(s"There is no registered transport adapter provider with name: [${name}]")
+ throw new IllegalArgumentException(s"There is no registered transport adapter provider with name: [$name]")
}
}
diff --git a/remote/src/main/scala/org/apache/pekko/remote/transport/PekkoPduCodec.scala b/remote/src/main/scala/org/apache/pekko/remote/transport/PekkoPduCodec.scala
index 271db738f5..bbaac95789 100644
--- a/remote/src/main/scala/org/apache/pekko/remote/transport/PekkoPduCodec.scala
+++ b/remote/src/main/scala/org/apache/pekko/remote/transport/PekkoPduCodec.scala
@@ -256,7 +256,7 @@ private[remote] object PekkoPduProtobufCodec$ extends PekkoPduCodec {
case CommandType.DISASSOCIATE_QUARANTINED => Disassociate(AssociationHandle.Quarantined)
case CommandType.HEARTBEAT => Heartbeat
case x =>
- throw new PduCodecException(s"Decoding of control PDU failed, invalid format, unexpected: [${x}]", null)
+ throw new PduCodecException(s"Decoding of control PDU failed, invalid format, unexpected: [$x]", null)
}
}
@@ -290,7 +290,7 @@ private[remote] object PekkoPduProtobufCodec$ extends PekkoPduCodec {
private def serializeAddress(address: Address): AddressData = address match {
case Address(protocol, system, Some(host), Some(port)) =>
AddressData.newBuilder.setHostname(host).setPort(port).setSystem(system).setProtocol(protocol).build()
- case _ => throw new IllegalArgumentException(s"Address [${address}] could not be serialized: host or port missing.")
+ case _ => throw new IllegalArgumentException(s"Address [$address] could not be serialized: host or port missing.")
}
}
diff --git a/remote/src/test/scala/org/apache/pekko/remote/AckedDeliverySpec.scala b/remote/src/test/scala/org/apache/pekko/remote/AckedDeliverySpec.scala
index d66b5a01c4..fb1f7734b7 100644
--- a/remote/src/test/scala/org/apache/pekko/remote/AckedDeliverySpec.scala
+++ b/remote/src/test/scala/org/apache/pekko/remote/AckedDeliverySpec.scala
@@ -331,7 +331,7 @@ class AckedDeliverySpec extends PekkoSpec {
receiverStep(DeliveryProbability)
steps -= s
}
- info(s"Successfully delivered ${received.size} messages from ${MsgCount}")
+ info(s"Successfully delivered ${received.size} messages from $MsgCount")
info("Entering reliable phase")
// Finalizing phase
diff --git a/remote/src/test/scala/org/apache/pekko/remote/RemoteRouterSpec.scala b/remote/src/test/scala/org/apache/pekko/remote/RemoteRouterSpec.scala
index 0006785e7a..f5a3b51e1c 100644
--- a/remote/src/test/scala/org/apache/pekko/remote/RemoteRouterSpec.scala
+++ b/remote/src/test/scala/org/apache/pekko/remote/RemoteRouterSpec.scala
@@ -73,7 +73,7 @@ class RemoteRouterSpec extends PekkoSpec(s"""
/blub {
router = round-robin-pool
nr-of-instances = 2
- target.nodes = ["$protocol://${sysName}@localhost:${port}"]
+ target.nodes = ["$protocol://$sysName@localhost:$port"]
}
/elastic-blub {
router = round-robin-pool
@@ -81,10 +81,10 @@ class RemoteRouterSpec extends PekkoSpec(s"""
lower-bound = 2
upper-bound = 3
}
- target.nodes = ["$protocol://${sysName}@localhost:${port}"]
+ target.nodes = ["$protocol://$sysName@localhost:$port"]
}
/remote-blub {
- remote = "$protocol://${sysName}@localhost:${port}"
+ remote = "$protocol://$sysName@localhost:$port"
router = round-robin-pool
nr-of-instances = 2
}
@@ -92,12 +92,12 @@ class RemoteRouterSpec extends PekkoSpec(s"""
remote = "pekko://$masterSystemName"
router = round-robin-pool
nr-of-instances = 2
- target.nodes = ["$protocol://${sysName}@localhost:${port}"]
+ target.nodes = ["$protocol://$sysName@localhost:$port"]
}
/local-blub2 {
router = round-robin-pool
nr-of-instances = 4
- target.nodes = ["$protocol://${sysName}@localhost:${port}"]
+ target.nodes = ["$protocol://$sysName@localhost:$port"]
}
}
}""").withFallback(system.settings.config)
@@ -125,7 +125,7 @@ class RemoteRouterSpec extends PekkoSpec(s"""
val children = replies.toSet
children should have size 2
children.map(_.parent) should have size 1
- children.foreach(_.address.toString should ===(s"$protocol://${sysName}@localhost:${port}"))
+ children.foreach(_.address.toString should ===(s"$protocol://$sysName@localhost:$port"))
masterSystem.stop(router)
}
@@ -139,7 +139,7 @@ class RemoteRouterSpec extends PekkoSpec(s"""
val children = replies.toSet
children should have size 2
children.map(_.parent) should have size 1
- children.foreach(_.address.toString should ===(s"$protocol://${sysName}@localhost:${port}"))
+ children.foreach(_.address.toString should ===(s"$protocol://$sysName@localhost:$port"))
masterSystem.stop(router)
}
@@ -150,21 +150,21 @@ class RemoteRouterSpec extends PekkoSpec(s"""
val children = replies.toSet
children.size should be >= 2
children.map(_.parent) should have size 1
- children.foreach(_.address.toString should ===(s"$protocol://${sysName}@localhost:${port}"))
+ children.foreach(_.address.toString should ===(s"$protocol://$sysName@localhost:$port"))
masterSystem.stop(router)
}
"deploy remote routers based on configuration" in {
val probe = TestProbe()(masterSystem)
val router = masterSystem.actorOf(FromConfig.props(echoActorProps), "remote-blub")
- router.path.address.toString should ===(s"$protocol://${sysName}@localhost:${port}")
+ router.path.address.toString should ===(s"$protocol://$sysName@localhost:$port")
val replies = collectRouteePaths(probe, router, 5)
val children = replies.toSet
children should have size 2
val parents = children.map(_.parent)
parents should have size 1
parents.head should ===(router.path)
- children.foreach(_.address.toString should ===(s"$protocol://${sysName}@localhost:${port}"))
+ children.foreach(_.address.toString should ===(s"$protocol://$sysName@localhost:$port"))
masterSystem.stop(router)
}
@@ -173,16 +173,16 @@ class RemoteRouterSpec extends PekkoSpec(s"""
val router = masterSystem.actorOf(
RoundRobinPool(2)
.props(echoActorProps)
- .withDeploy(Deploy(scope = RemoteScope(AddressFromURIString(s"$protocol://${sysName}@localhost:${port}")))),
+ .withDeploy(Deploy(scope = RemoteScope(AddressFromURIString(s"$protocol://$sysName@localhost:$port")))),
"remote-blub2")
- router.path.address.toString should ===(s"$protocol://${sysName}@localhost:${port}")
+ router.path.address.toString should ===(s"$protocol://$sysName@localhost:$port")
val replies = collectRouteePaths(probe, router, 5)
val children = replies.toSet
children should have size 2
val parents = children.map(_.parent)
parents should have size 1
parents.head should ===(router.path)
- children.foreach(_.address.toString should ===(s"$protocol://${sysName}@localhost:${port}"))
+ children.foreach(_.address.toString should ===(s"$protocol://$sysName@localhost:$port"))
masterSystem.stop(router)
}
@@ -191,7 +191,7 @@ class RemoteRouterSpec extends PekkoSpec(s"""
val router = masterSystem.actorOf(
RoundRobinPool(2)
.props(echoActorProps)
- .withDeploy(Deploy(scope = RemoteScope(AddressFromURIString(s"$protocol://${sysName}@localhost:${port}")))),
+ .withDeploy(Deploy(scope = RemoteScope(AddressFromURIString(s"$protocol://$sysName@localhost:$port")))),
"local-blub")
router.path.address.toString should ===(s"pekko://$masterSystemName")
val replies = collectRouteePaths(probe, router, 5)
@@ -200,7 +200,7 @@ class RemoteRouterSpec extends PekkoSpec(s"""
val parents = children.map(_.parent)
parents should have size 1
parents.head.address should ===(Address(protocol, sysName, "localhost", port))
- children.foreach(_.address.toString should ===(s"$protocol://${sysName}@localhost:${port}"))
+ children.foreach(_.address.toString should ===(s"$protocol://$sysName@localhost:$port"))
masterSystem.stop(router)
}
@@ -209,16 +209,16 @@ class RemoteRouterSpec extends PekkoSpec(s"""
val router = masterSystem.actorOf(
RoundRobinPool(2)
.props(echoActorProps)
- .withDeploy(Deploy(scope = RemoteScope(AddressFromURIString(s"$protocol://${sysName}@localhost:${port}")))),
+ .withDeploy(Deploy(scope = RemoteScope(AddressFromURIString(s"$protocol://$sysName@localhost:$port")))),
"local-blub2")
- router.path.address.toString should ===(s"$protocol://${sysName}@localhost:${port}")
+ router.path.address.toString should ===(s"$protocol://$sysName@localhost:$port")
val replies = collectRouteePaths(probe, router, 5)
val children = replies.toSet
children should have size 4
val parents = children.map(_.parent)
parents should have size 1
parents.head should ===(router.path)
- children.foreach(_.address.toString should ===(s"$protocol://${sysName}@localhost:${port}"))
+ children.foreach(_.address.toString should ===(s"$protocol://$sysName@localhost:$port"))
masterSystem.stop(router)
}
@@ -227,16 +227,16 @@ class RemoteRouterSpec extends PekkoSpec(s"""
val router = masterSystem.actorOf(
RoundRobinPool(2)
.props(echoActorProps)
- .withDeploy(Deploy(scope = RemoteScope(AddressFromURIString(s"$protocol://${sysName}@localhost:${port}")))),
+ .withDeploy(Deploy(scope = RemoteScope(AddressFromURIString(s"$protocol://$sysName@localhost:$port")))),
"remote-override")
- router.path.address.toString should ===(s"$protocol://${sysName}@localhost:${port}")
+ router.path.address.toString should ===(s"$protocol://$sysName@localhost:$port")
val replies = collectRouteePaths(probe, router, 5)
val children = replies.toSet
children should have size 4
val parents = children.map(_.parent)
parents should have size 1
parents.head should ===(router.path)
- children.foreach(_.address.toString should ===(s"$protocol://${sysName}@localhost:${port}"))
+ children.foreach(_.address.toString should ===(s"$protocol://$sysName@localhost:$port"))
masterSystem.stop(router)
}
diff --git a/remote/src/test/scala/org/apache/pekko/remote/artery/RemoteDeploymentSpec.scala b/remote/src/test/scala/org/apache/pekko/remote/artery/RemoteDeploymentSpec.scala
index ce6d88a30a..a1ba137d9a 100644
--- a/remote/src/test/scala/org/apache/pekko/remote/artery/RemoteDeploymentSpec.scala
+++ b/remote/src/test/scala/org/apache/pekko/remote/artery/RemoteDeploymentSpec.scala
@@ -108,7 +108,7 @@ class RemoteDeploymentSpec
val senderProbe = TestProbe()(masterSystem)
val r = masterSystem.actorOf(Props[Echo1](), "blub")
r.path.toString should ===(
- s"pekko://${system.name}@localhost:${port}/remote/pekko/${masterSystem.name}@localhost:${masterPort}/user/blub")
+ s"pekko://${system.name}@localhost:$port/remote/pekko/${masterSystem.name}@localhost:$masterPort/user/blub")
r.tell(42, senderProbe.ref)
senderProbe.expectMsg(42)
@@ -126,7 +126,7 @@ class RemoteDeploymentSpec
val senderProbe = TestProbe()(masterSystem)
val r = masterSystem.actorOf(Props[Echo1](), "blub2")
r.path.toString should ===(
- s"pekko://${system.name}@localhost:${port}/remote/pekko/${masterSystem.name}@localhost:${masterPort}/user/blub2")
+ s"pekko://${system.name}@localhost:$port/remote/pekko/${masterSystem.name}@localhost:$masterPort/user/blub2")
r.tell(42, senderProbe.ref)
senderProbe.expectMsg(42)
diff --git a/remote/src/test/scala/org/apache/pekko/remote/artery/RemoteInstrumentsSpec.scala b/remote/src/test/scala/org/apache/pekko/remote/artery/RemoteInstrumentsSpec.scala
index 8949740e51..88b6b23644 100644
--- a/remote/src/test/scala/org/apache/pekko/remote/artery/RemoteInstrumentsSpec.scala
+++ b/remote/src/test/scala/org/apache/pekko/remote/artery/RemoteInstrumentsSpec.scala
@@ -21,7 +21,7 @@ import org.scalatestplus.scalacheck.Checkers
class RemoteInstrumentsSpec extends AnyWordSpec with Matchers with Checkers {
case class KeyLen(k: Key, l: Len) {
- override def toString = s" key = ${k}, len = ${l}"
+ override def toString = s" key = $k, len = $l"
}
type Key = Byte
type Len = Int
diff --git a/remote/src/test/scala/org/apache/pekko/remote/artery/RemoteRouterSpec.scala b/remote/src/test/scala/org/apache/pekko/remote/artery/RemoteRouterSpec.scala
index 780fbafcd8..d0a52fa796 100644
--- a/remote/src/test/scala/org/apache/pekko/remote/artery/RemoteRouterSpec.scala
+++ b/remote/src/test/scala/org/apache/pekko/remote/artery/RemoteRouterSpec.scala
@@ -62,7 +62,7 @@ class RemoteRouterSpec
/blub {
router = round-robin-pool
nr-of-instances = 2
- target.nodes = ["pekko://${sysName}@localhost:${port}"]
+ target.nodes = ["pekko://$sysName@localhost:$port"]
}
/elastic-blub {
router = round-robin-pool
@@ -70,10 +70,10 @@ class RemoteRouterSpec
lower-bound = 2
upper-bound = 3
}
- target.nodes = ["pekko://${sysName}@localhost:${port}"]
+ target.nodes = ["pekko://$sysName@localhost:$port"]
}
/remote-blub {
- remote = "pekko://${sysName}@localhost:${port}"
+ remote = "pekko://$sysName@localhost:$port"
router = round-robin-pool
nr-of-instances = 2
}
@@ -81,12 +81,12 @@ class RemoteRouterSpec
remote = "pekko://MasterRemoteRouterSpec"
router = round-robin-pool
nr-of-instances = 2
- target.nodes = ["pekko://${sysName}@localhost:${port}"]
+ target.nodes = ["pekko://$sysName@localhost:$port"]
}
/local-blub2 {
router = round-robin-pool
nr-of-instances = 4
- target.nodes = ["pekko://${sysName}@localhost:${port}"]
+ target.nodes = ["pekko://$sysName@localhost:$port"]
}
}
}""").withFallback(system.settings.config)
@@ -115,7 +115,7 @@ class RemoteRouterSpec
val children = replies.toSet
children should have size 2
children.map(_.parent) should have size 1
- children.foreach(_.address.toString should ===(s"pekko://${sysName}@localhost:${port}"))
+ children.foreach(_.address.toString should ===(s"pekko://$sysName@localhost:$port"))
masterSystem.stop(router)
}
@@ -130,7 +130,7 @@ class RemoteRouterSpec
val children = replies.toSet
children should have size 2
children.map(_.parent) should have size 1
- children.foreach(_.address.toString should ===(s"pekko://${sysName}@localhost:${port}"))
+ children.foreach(_.address.toString should ===(s"pekko://$sysName@localhost:$port"))
masterSystem.stop(router)
}
@@ -141,21 +141,21 @@ class RemoteRouterSpec
val children = replies.toSet
children.size should be >= 2
children.map(_.parent) should have size 1
- children.foreach(_.address.toString should ===(s"pekko://${sysName}@localhost:${port}"))
+ children.foreach(_.address.toString should ===(s"pekko://$sysName@localhost:$port"))
masterSystem.stop(router)
}
"deploy remote routers based on configuration" in {
val probe = TestProbe()(masterSystem)
val router = masterSystem.actorOf(FromConfig.props(echoActorProps), "remote-blub")
- router.path.address.toString should ===(s"pekko://${sysName}@localhost:${port}")
+ router.path.address.toString should ===(s"pekko://$sysName@localhost:$port")
val replies = collectRouteePaths(probe, router, 5)
val children = replies.toSet
children should have size 2
val parents = children.map(_.parent)
parents should have size 1
parents.head should ===(router.path)
- children.foreach(_.address.toString should ===(s"pekko://${sysName}@localhost:${port}"))
+ children.foreach(_.address.toString should ===(s"pekko://$sysName@localhost:$port"))
masterSystem.stop(router)
}
@@ -164,16 +164,16 @@ class RemoteRouterSpec
val router = masterSystem.actorOf(
RoundRobinPool(2)
.props(echoActorProps)
- .withDeploy(Deploy(scope = RemoteScope(AddressFromURIString(s"pekko://${sysName}@localhost:${port}")))),
+ .withDeploy(Deploy(scope = RemoteScope(AddressFromURIString(s"pekko://$sysName@localhost:$port")))),
"remote-blub2")
- router.path.address.toString should ===(s"pekko://${sysName}@localhost:${port}")
+ router.path.address.toString should ===(s"pekko://$sysName@localhost:$port")
val replies = collectRouteePaths(probe, router, 5)
val children = replies.toSet
children should have size 2
val parents = children.map(_.parent)
parents should have size 1
parents.head should ===(router.path)
- children.foreach(_.address.toString should ===(s"pekko://${sysName}@localhost:${port}"))
+ children.foreach(_.address.toString should ===(s"pekko://$sysName@localhost:$port"))
masterSystem.stop(router)
}
@@ -182,7 +182,7 @@ class RemoteRouterSpec
val router = masterSystem.actorOf(
RoundRobinPool(2)
.props(echoActorProps)
- .withDeploy(Deploy(scope = RemoteScope(AddressFromURIString(s"pekko://${sysName}@localhost:${port}")))),
+ .withDeploy(Deploy(scope = RemoteScope(AddressFromURIString(s"pekko://$sysName@localhost:$port")))),
"local-blub")
router.path.address.toString should ===("pekko://MasterRemoteRouterSpec")
val replies = collectRouteePaths(probe, router, 5)
@@ -191,7 +191,7 @@ class RemoteRouterSpec
val parents = children.map(_.parent)
parents should have size 1
parents.head.address should ===(Address("pekko", sysName, "localhost", port))
- children.foreach(_.address.toString should ===(s"pekko://${sysName}@localhost:${port}"))
+ children.foreach(_.address.toString should ===(s"pekko://$sysName@localhost:$port"))
masterSystem.stop(router)
}
@@ -200,16 +200,16 @@ class RemoteRouterSpec
val router = masterSystem.actorOf(
RoundRobinPool(2)
.props(echoActorProps)
- .withDeploy(Deploy(scope = RemoteScope(AddressFromURIString(s"pekko://${sysName}@localhost:${port}")))),
+ .withDeploy(Deploy(scope = RemoteScope(AddressFromURIString(s"pekko://$sysName@localhost:$port")))),
"local-blub2")
- router.path.address.toString should ===(s"pekko://${sysName}@localhost:${port}")
+ router.path.address.toString should ===(s"pekko://$sysName@localhost:$port")
val replies = collectRouteePaths(probe, router, 5)
val children = replies.toSet
children should have size 4
val parents = children.map(_.parent)
parents should have size 1
parents.head should ===(router.path)
- children.foreach(_.address.toString should ===(s"pekko://${sysName}@localhost:${port}"))
+ children.foreach(_.address.toString should ===(s"pekko://$sysName@localhost:$port"))
masterSystem.stop(router)
}
@@ -218,16 +218,16 @@ class RemoteRouterSpec
val router = masterSystem.actorOf(
RoundRobinPool(2)
.props(echoActorProps)
- .withDeploy(Deploy(scope = RemoteScope(AddressFromURIString(s"pekko://${sysName}@localhost:${port}")))),
+ .withDeploy(Deploy(scope = RemoteScope(AddressFromURIString(s"pekko://$sysName@localhost:$port")))),
"remote-override")
- router.path.address.toString should ===(s"pekko://${sysName}@localhost:${port}")
+ router.path.address.toString should ===(s"pekko://$sysName@localhost:$port")
val replies = collectRouteePaths(probe, router, 5)
val children = replies.toSet
children should have size 4
val parents = children.map(_.parent)
parents should have size 1
parents.head should ===(router.path)
- children.foreach(_.address.toString should ===(s"pekko://${sysName}@localhost:${port}"))
+ children.foreach(_.address.toString should ===(s"pekko://$sysName@localhost:$port"))
masterSystem.stop(router)
}
diff --git a/remote/src/test/scala/org/apache/pekko/remote/classic/ActorsLeakSpec.scala b/remote/src/test/scala/org/apache/pekko/remote/classic/ActorsLeakSpec.scala
index 9d3c2d67b6..a5d5d079fe 100644
--- a/remote/src/test/scala/org/apache/pekko/remote/classic/ActorsLeakSpec.scala
+++ b/remote/src/test/scala/org/apache/pekko/remote/classic/ActorsLeakSpec.scala
@@ -186,7 +186,7 @@ class ActorsLeakSpec extends PekkoSpec(ActorsLeakSpec.config) with ImplicitSende
}
EventFilter
- .warning(start = s"Association with remote system [${remoteAddress}] has failed", occurrences = 1)
+ .warning(start = s"Association with remote system [$remoteAddress] has failed", occurrences = 1)
.intercept {
Await.result(remoteSystem.whenTerminated, 10.seconds)
}
diff --git a/remote/src/test/scala/org/apache/pekko/remote/classic/transport/PekkoProtocolStressTest.scala b/remote/src/test/scala/org/apache/pekko/remote/classic/transport/PekkoProtocolStressTest.scala
index 4246629b15..15961efe17 100644
--- a/remote/src/test/scala/org/apache/pekko/remote/classic/transport/PekkoProtocolStressTest.scala
+++ b/remote/src/test/scala/org/apache/pekko/remote/classic/transport/PekkoProtocolStressTest.scala
@@ -89,7 +89,7 @@ object PekkoProtocolStressTest {
context.become(done)
}
} else {
- controller ! s"Received out of order message. Previous: ${maxSeq} Received: ${seq}"
+ controller ! s"Received out of order message. Previous: $maxSeq Received: $seq"
}
}
@@ -128,7 +128,7 @@ class PekkoProtocolStressTest extends PekkoSpec(configA) with ImplicitSender wit
expectMsgPF(60.seconds) {
case (received: Int, lost: Int) =>
- log.debug(s" ######## Received ${received - lost} messages from ${received} ########")
+ log.debug(s" ######## Received ${received - lost} messages from $received ########")
}
}
}
diff --git a/stream-testkit/src/test/scala/org/apache/pekko/stream/testkit/ScriptedTest.scala b/stream-testkit/src/test/scala/org/apache/pekko/stream/testkit/ScriptedTest.scala
index 3192da590c..acd5945a77 100644
--- a/stream-testkit/src/test/scala/org/apache/pekko/stream/testkit/ScriptedTest.scala
+++ b/stream-testkit/src/test/scala/org/apache/pekko/stream/testkit/ScriptedTest.scala
@@ -91,7 +91,7 @@ trait ScriptedTest extends Matchers {
def consumeOutput(out: Out): Script[In, Out] = {
if (noOutsPending)
- throw new ScriptException(s"Tried to produce element ${out} but no elements should be produced right now.")
+ throw new ScriptException(s"Tried to produce element $out but no elements should be produced right now.")
out should be(expectedOutputs(outputCursor))
new Script(
providedInputs,
@@ -211,7 +211,7 @@ trait ScriptedTest extends Matchers {
val tieBreak = ThreadLocalRandom.current().nextBoolean()
if (mayProvideInput && (!mayRequestMore || tieBreak)) {
val (input, nextScript) = currentScript.provideInput
- debugLog(s"test environment produces [${input}]")
+ debugLog(s"test environment produces [$input]")
pendingRequests -= 1
currentScript = nextScript
upstreamSubscription.sendNext(input)
diff --git a/stream-tests/src/test/scala/org/apache/pekko/stream/scaladsl/FlowPrefixAndTailSpec.scala b/stream-tests/src/test/scala/org/apache/pekko/stream/scaladsl/FlowPrefixAndTailSpec.scala
index aa9fed160f..116ba3a784 100644
--- a/stream-tests/src/test/scala/org/apache/pekko/stream/scaladsl/FlowPrefixAndTailSpec.scala
+++ b/stream-tests/src/test/scala/org/apache/pekko/stream/scaladsl/FlowPrefixAndTailSpec.scala
@@ -140,7 +140,7 @@ class FlowPrefixAndTailSpec extends StreamSpec("""
tail.to(Sink.fromSubscriber(subscriber)).run()(tightTimeoutMaterializer)
subscriber.expectSubscriptionAndError().getMessage should ===(
- s"Substream Source(TailSource) has not been materialized in ${ms} milliseconds")
+ s"Substream Source(TailSource) has not been materialized in $ms milliseconds")
}
"not fail the stream if substream has not been subscribed in time and configured subscription timeout is noop" in {
@nowarn("msg=deprecated")
diff --git a/stream/src/main/scala/org/apache/pekko/stream/ActorMaterializer.scala b/stream/src/main/scala/org/apache/pekko/stream/ActorMaterializer.scala
index 91be9452bc..514b1ed087 100644
--- a/stream/src/main/scala/org/apache/pekko/stream/ActorMaterializer.scala
+++ b/stream/src/main/scala/org/apache/pekko/stream/ActorMaterializer.scala
@@ -92,7 +92,7 @@ object ActorMaterializer {
PhasedFusingActorMaterializer(context, namePrefix, materializerSettings, materializerSettings.toAttributes)
case other =>
- throw new IllegalArgumentException(s"Unexpected type of context: ${other}")
+ throw new IllegalArgumentException(s"Unexpected type of context: $other")
}
}
diff --git a/stream/src/main/scala/org/apache/pekko/stream/impl/ReactiveStreamsCompliance.scala b/stream/src/main/scala/org/apache/pekko/stream/impl/ReactiveStreamsCompliance.scala
index 38d3b94b52..75b4a1eb94 100644
--- a/stream/src/main/scala/org/apache/pekko/stream/impl/ReactiveStreamsCompliance.scala
+++ b/stream/src/main/scala/org/apache/pekko/stream/impl/ReactiveStreamsCompliance.scala
@@ -101,7 +101,7 @@ import pekko.stream.SubscriptionWithCancelException
case other =>
try subscriber.onError(other)
catch {
- case NonFatal(t) => throw new SignalThrewException(s"${subscriber}.onError", t)
+ case NonFatal(t) => throw new SignalThrewException(s"$subscriber.onError", t)
}
}
@@ -109,21 +109,21 @@ import pekko.stream.SubscriptionWithCancelException
requireNonNullElement(element)
try subscriber.onNext(element)
catch {
- case NonFatal(t) => throw new SignalThrewException(s"${subscriber}.onNext", t)
+ case NonFatal(t) => throw new SignalThrewException(s"$subscriber.onNext", t)
}
}
final def tryOnSubscribe[T](subscriber: Subscriber[T], subscription: Subscription): Unit = {
try subscriber.onSubscribe(subscription)
catch {
- case NonFatal(t) => throw new SignalThrewException(s"${subscriber}.onSubscribe", t)
+ case NonFatal(t) => throw new SignalThrewException(s"$subscriber.onSubscribe", t)
}
}
final def tryOnComplete[T](subscriber: Subscriber[T]): Unit = {
try subscriber.onComplete()
catch {
- case NonFatal(t) => throw new SignalThrewException(s"${subscriber}.onComplete", t)
+ case NonFatal(t) => throw new SignalThrewException(s"$subscriber.onComplete", t)
}
}
diff --git a/stream/src/main/scala/org/apache/pekko/stream/impl/fusing/ActorGraphInterpreter.scala b/stream/src/main/scala/org/apache/pekko/stream/impl/fusing/ActorGraphInterpreter.scala
index cd905ef132..8fcd400d14 100644
--- a/stream/src/main/scala/org/apache/pekko/stream/impl/fusing/ActorGraphInterpreter.scala
+++ b/stream/src/main/scala/org/apache/pekko/stream/impl/fusing/ActorGraphInterpreter.scala
@@ -558,7 +558,7 @@ import pekko.util.OptionVal
tryAbort(
new TimeoutException(
"Streaming actor has been already stopped processing (normally), but not all of its " +
- s"inputs or outputs have been subscribed in [${subscriptionTimeout}}]. Aborting actor now."))
+ s"inputs or outputs have been subscribed in [$subscriptionTimeout}]. Aborting actor now."))
}
0
}
diff --git a/stream/src/main/scala/org/apache/pekko/stream/impl/io/TcpStages.scala b/stream/src/main/scala/org/apache/pekko/stream/impl/io/TcpStages.scala
index 6c6df21814..edbd51c3be 100644
--- a/stream/src/main/scala/org/apache/pekko/stream/impl/io/TcpStages.scala
+++ b/stream/src/main/scala/org/apache/pekko/stream/impl/io/TcpStages.scala
@@ -299,7 +299,7 @@ private[stream] object ConnectionSourceStage {
case ob @ Outbound(manager, cmd, _, _) =>
getStageActor(connecting(ob)).watch(manager)
manager ! cmd
- case other => throw new IllegalArgumentException(s"Unsupported TCP role: ${other}")
+ case other => throw new IllegalArgumentException(s"Unsupported TCP role: $other")
}
}
diff --git a/stream/src/main/scala/org/apache/pekko/stream/impl/streamref/SourceRefImpl.scala b/stream/src/main/scala/org/apache/pekko/stream/impl/streamref/SourceRefImpl.scala
index f21f0b81d4..2a208ec028 100644
--- a/stream/src/main/scala/org/apache/pekko/stream/impl/streamref/SourceRefImpl.scala
+++ b/stream/src/main/scala/org/apache/pekko/stream/impl/streamref/SourceRefImpl.scala
@@ -405,7 +405,7 @@ private[stream] final class SourceRefStageImpl[Out](val initialPartnerRef: Optio
s"[$stageActorName] CancellationDeadlineTimerKey can't happen in state $other")
}
- case other => throw new IllegalArgumentException(s"Unknown timer key: ${other}")
+ case other => throw new IllegalArgumentException(s"Unknown timer key: $other")
}
override def onDownstreamFinish(cause: Throwable): Unit = {
diff --git a/stream/src/main/scala/org/apache/pekko/stream/stage/GraphStage.scala b/stream/src/main/scala/org/apache/pekko/stream/stage/GraphStage.scala
index 05adf1bd0c..9992315894 100644
--- a/stream/src/main/scala/org/apache/pekko/stream/stage/GraphStage.scala
+++ b/stream/src/main/scala/org/apache/pekko/stream/stage/GraphStage.scala
@@ -1407,7 +1407,7 @@ abstract class GraphStageLogic private[stream] (val inCount: Int, val outCount:
}
private def streamDetachedException =
- new StreamDetachedException(s"Stage with GraphStageLogic ${this} stopped before async invocation was processed")
+ new StreamDetachedException(s"Stage with GraphStageLogic $this stopped before async invocation was processed")
/**
* Invoked before any external events are processed, at the startup of the operator.
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@pekko.apache.org
For additional commands, e-mail: commits-help@pekko.apache.org