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

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


The following commit(s) were added to refs/heads/main by this push:
     new d2d52f30f1 chore: remove stale Akka-era references from Scaladoc and a 
log message (#3584)
d2d52f30f1 is described below

commit d2d52f30f1049f4f0b485e07c2194d96e0b6de96
Author: PJ Fanning <[email protected]>
AuthorDate: Fri Oct 9 07:40:34 2026 +0100

    chore: remove stale Akka-era references from Scaladoc and a log message 
(#3584)
    
    * chore: remove stale Akka-era references from Scaladoc and a log message
    
    Motivation:
    Some Scaladoc and one log message still refer to Akka-era details
    that are misleading for Pekko users.
    
    Modification:
    - RemoveInternalClusterShardingData: drop the -2.3 flag (for data
      written by Akka 2.3.x) from the usage example and description, and
      no longer mention auto-down as a cause of corrupt data
    - Cluster: the auto-down warning says auto-down is not supported in
      Pekko instead of "removed in Akka 2.6.0"
    - Sink.collection Scaladoc: refer to the collection `Factory` instead
      of `CanBuildFrom`
    
    Result:
    Scaladoc and the warning match Pekko.
    
    Tests:
    - Not run - Scaladoc and log message text only
    
    References:
    Refs #3583
    
    * docs: keep the -2.3 flag documentation in the Scaladoc
    
    ---------
    
    Co-authored-by: 虎鸣 <[email protected]>
---
 .../pekko/cluster/sharding/RemoveInternalClusterShardingData.scala  | 6 +++---
 cluster/src/main/scala/org/apache/pekko/cluster/Cluster.scala       | 2 +-
 stream/src/main/scala/org/apache/pekko/stream/scaladsl/Sink.scala   | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git 
a/cluster-sharding/src/main/scala/org/apache/pekko/cluster/sharding/RemoveInternalClusterShardingData.scala
 
b/cluster-sharding/src/main/scala/org/apache/pekko/cluster/sharding/RemoveInternalClusterShardingData.scala
index 4b4d5273a5..87290a1735 100644
--- 
a/cluster-sharding/src/main/scala/org/apache/pekko/cluster/sharding/RemoveInternalClusterShardingData.scala
+++ 
b/cluster-sharding/src/main/scala/org/apache/pekko/cluster/sharding/RemoveInternalClusterShardingData.scala
@@ -43,14 +43,14 @@ import pekko.persistence.journal.leveldb.SharedLeveldbStore
  *
  * It can be needed to remove the data if the Cluster `ShardCoordinator`
  * cannot startup because of corrupt data, which may happen if accidentally
- * two clusters were running at the same time, e.g. caused by using auto-down
- * and there was a network partition.
+ * two clusters were running at the same time, e.g. caused by a network 
partition
+ * without a proper downing strategy.
  *
  * Use this program as a standalone Java main program:
  * {{{
  * java -classpath <jar files, including pekko-cluster-sharding>
  *   org.apache.pekko.cluster.sharding.RemoveInternalClusterShardingData
- *     -2.3 entityType1 entityType2 entityType3
+ *     entityType1 entityType2 entityType3
  * }}}
  *
  * The program is included in the `pekko-cluster-sharding` jar file. It
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 cc8d07195e..f406367ef2 100644
--- a/cluster/src/main/scala/org/apache/pekko/cluster/Cluster.scala
+++ b/cluster/src/main/scala/org/apache/pekko/cluster/Cluster.scala
@@ -154,7 +154,7 @@ class Cluster(val system: ExtendedActorSystem) extends 
Extension {
       (settings.config.hasPath("auto-down-unreachable-after") && 
settings.config.getString(
         "auto-down-unreachable-after") != "off"))
       logWarning(
-        "auto-down has been removed in Akka 2.6.0. See " +
+        "auto-down is not supported in Pekko. See " +
         
"https://pekko.apache.org/docs/pekko/current/typed/cluster.html#downing for 
alternatives.")
   }
 
diff --git a/stream/src/main/scala/org/apache/pekko/stream/scaladsl/Sink.scala 
b/stream/src/main/scala/org/apache/pekko/stream/scaladsl/Sink.scala
index a7af800c13..bddc5f65f7 100644
--- a/stream/src/main/scala/org/apache/pekko/stream/scaladsl/Sink.scala
+++ b/stream/src/main/scala/org/apache/pekko/stream/scaladsl/Sink.scala
@@ -283,7 +283,7 @@ object Sink {
    * As upstream may be unbounded, `Flow[T].take` or the stricter 
`Flow[T].limit` (and their variants)
    * may be used to ensure boundedness.
    * Materializes into a `Future` of `That[T]` containing all the collected 
elements.
-   * `That[T]` is limited to the limitations of the CanBuildFrom associated 
with it. For example, `Seq` is limited to
+   * `That[T]` is limited to the limitations of the `Factory` associated with 
it. For example, `Seq` is limited to
    * `Int.MaxValue` elements. See [The Architecture of Scala 2.13's 
Collections](https://docs.scala-lang.org/overviews/core/architecture-of-scala-213-collections.html)
 for more info.
    * This Sink will cancel the stream after having received that many elements.
    *


---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to