From 279d65a7faac5561d9488f502d4109fcfe269704 Mon Sep 17 00:00:00 2001 From: PJ Fanning Date: Wed, 21 Jun 2023 12:52:59 +0100 Subject: [PATCH] still finding some stray akka refs (#441) --- .../main/scala/org/apache/pekko/cluster/ddata/ORMap.scala | 6 +++--- .../scala/org/apache/pekko/cluster/ddata/ORMultiMap.scala | 4 ++-- .../main/scala/org/apache/pekko/cluster/ddata/ORSet.scala | 2 +- .../scala/org/apache/pekko/stream/scaladsl/FlowSpec.scala | 2 +- .../apache/pekko/stream/impl/streamref/SinkRefImpl.scala | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/distributed-data/src/main/scala/org/apache/pekko/cluster/ddata/ORMap.scala b/distributed-data/src/main/scala/org/apache/pekko/cluster/ddata/ORMap.scala index 71a057a630..dd6a806dc0 100644 --- a/distributed-data/src/main/scala/org/apache/pekko/cluster/ddata/ORMap.scala +++ b/distributed-data/src/main/scala/org/apache/pekko/cluster/ddata/ORMap.scala @@ -230,7 +230,7 @@ final class ORMap[A, B <: ReplicatedData] private[pekko] ( /** * Adds an entry to the map - * @see [[ORMap#put(node:akka\.cluster\.ddata\.SelfUniqueAddress*]] + * @see [[ORMap#put(node:org\.apache\.pekko\.cluster\.ddata\.SelfUniqueAddress*]] */ def :+(entry: (A, B))(implicit node: SelfUniqueAddress): ORMap[A, B] = { val (key, value) = entry @@ -249,13 +249,13 @@ final class ORMap[A, B <: ReplicatedData] private[pekko] ( * on other nodes and the outcome depends on what `ReplicatedData` * type that is used. * - * Consider using [[ORMap#updated(node:akka\.cluster\.ddata\.SelfUniqueAddress*]] + * Consider using [[ORMap#updated(node:org\.apache\.pekko\.cluster\.ddata\.SelfUniqueAddress*]] * instead of `put` if you want modify existing entry. * * `IllegalArgumentException` is thrown if you try to replace an existing `ORSet` * value, because important history can be lost when replacing the `ORSet` and * undesired effects of merging will occur. Use [[ORMultiMap]] or - * [[ORMap#updated(node:akka\.cluster\.ddata\.SelfUniqueAddress*]] instead. + * [[ORMap#updated(node:org\.apache\.pekko\.cluster\.ddata\.SelfUniqueAddress*]] instead. */ def put(node: SelfUniqueAddress, key: A, value: B): ORMap[A, B] = put(node.uniqueAddress, key, value) diff --git a/distributed-data/src/main/scala/org/apache/pekko/cluster/ddata/ORMultiMap.scala b/distributed-data/src/main/scala/org/apache/pekko/cluster/ddata/ORMultiMap.scala index d5c5d092ad..3a169c3c1d 100644 --- a/distributed-data/src/main/scala/org/apache/pekko/cluster/ddata/ORMultiMap.scala +++ b/distributed-data/src/main/scala/org/apache/pekko/cluster/ddata/ORMultiMap.scala @@ -148,7 +148,7 @@ final class ORMultiMap[A, B] private[pekko] ( /** * Convenience for put. Requires an implicit SelfUniqueAddress. - * @see [[ORMultiMap#put(node:akka\.cluster\.ddata\.SelfUniqueAddress,key:A,value:Set*]] + * @see [[ORMultiMap#put(node:org\.apache\.pekko\.cluster\.ddata\.SelfUniqueAddress,key:A,value:Set*]] */ def :+(entry: (A, Set[B]))(implicit node: SelfUniqueAddress): ORMultiMap[A, B] = { val (key, value) = entry @@ -207,7 +207,7 @@ final class ORMultiMap[A, B] private[pekko] ( /** * Convenience for remove. Requires an implicit Cluster. - * @see [[ORMultiMap#remove(node:akka\.cluster\.ddata\.SelfUniqueAddress*]] + * @see [[ORMultiMap#remove(node:org\.apache\.pekko\.cluster\.ddata\.SelfUniqueAddress*]] */ @deprecated("Use `remove` that takes a `SelfUniqueAddress` parameter instead.", since = "Akka 2.5.20") def -(key: A)(implicit node: Cluster): ORMultiMap[A, B] = remove(node.selfUniqueAddress, key) diff --git a/distributed-data/src/main/scala/org/apache/pekko/cluster/ddata/ORSet.scala b/distributed-data/src/main/scala/org/apache/pekko/cluster/ddata/ORSet.scala index 21034bb284..a3c8ef7f22 100644 --- a/distributed-data/src/main/scala/org/apache/pekko/cluster/ddata/ORSet.scala +++ b/distributed-data/src/main/scala/org/apache/pekko/cluster/ddata/ORSet.scala @@ -417,7 +417,7 @@ final class ORSet[A] private[pekko] ( /** * Removes all elements from the set, but keeps the history. * This has the same result as using - * [[ORSet#remove(node:akka\.cluster\.ddata\.SelfUniqueAddress*]] + * [[ORSet#remove(node:org\.apache\.pekko\.cluster\.ddata\.SelfUniqueAddress*]] * for each element, but it is more efficient. */ def clear(@unused node: SelfUniqueAddress): ORSet[A] = clear() diff --git a/stream-tests/src/test/scala/org/apache/pekko/stream/scaladsl/FlowSpec.scala b/stream-tests/src/test/scala/org/apache/pekko/stream/scaladsl/FlowSpec.scala index 2dd30f1cdf..1a3252e783 100644 --- a/stream-tests/src/test/scala/org/apache/pekko/stream/scaladsl/FlowSpec.scala +++ b/stream-tests/src/test/scala/org/apache/pekko/stream/scaladsl/FlowSpec.scala @@ -45,7 +45,7 @@ object FlowSpec { } @nowarn // tests type assignments compile -class FlowSpec extends StreamSpec(ConfigFactory.parseString("pekko.actor.debug.receive=off\nakka.loglevel=INFO")) { +class FlowSpec extends StreamSpec(ConfigFactory.parseString("pekko.actor.debug.receive=off\npekko.loglevel=INFO")) { import FlowSpec._ val settings = ActorMaterializerSettings(system).withInputBuffer(initialSize = 2, maxSize = 2) diff --git a/stream/src/main/scala/org/apache/pekko/stream/impl/streamref/SinkRefImpl.scala b/stream/src/main/scala/org/apache/pekko/stream/impl/streamref/SinkRefImpl.scala index 138efb21e7..f5830419b6 100644 --- a/stream/src/main/scala/org/apache/pekko/stream/impl/streamref/SinkRefImpl.scala +++ b/stream/src/main/scala/org/apache/pekko/stream/impl/streamref/SinkRefImpl.scala @@ -123,7 +123,7 @@ private[stream] final class SinkRefStageImpl[In] private[pekko] (val initialPart observeAndValidateSender( ref, "Illegal initialPartnerRef! This may be a bug, please report your " + - "usage and complete stack trace on the issue tracker: https://github.com/akka/akka") + "usage and complete stack trace on the issue tracker: https://github.com/apache/incubator-pekko") tryPull() case _ => log.debug(