Merge pull request #26705 from akka/wip-revert-shard-patriknw

revert Shard constructor signature changes

akka-cluster-sharding/src/main/mima-filters/2.5.22.backwards.excludes

@@ -1,9 +1,5 @@
 # Cleaning up compiler warnings
 ProblemFilters.exclude[DirectMissingMethodProblem]("akka.cluster.sharding.RememberEntityStarter.this")
-ProblemFilters.exclude[DirectMissingMethodProblem]("akka.cluster.sharding.Shard.props")
-ProblemFilters.exclude[DirectMissingMethodProblem]("akka.cluster.sharding.DDataShard.this")
-ProblemFilters.exclude[DirectMissingMethodProblem]("akka.cluster.sharding.PersistentShard.this")
 ProblemFilters.exclude[DirectMissingMethodProblem]("akka.cluster.sharding.ShardCoordinator.this")
 ProblemFilters.exclude[DirectMissingMethodProblem]("akka.cluster.sharding.RememberEntityStarter.props")
-ProblemFilters.exclude[DirectMissingMethodProblem]("akka.cluster.sharding.Shard.this")
 ProblemFilters.exclude[DirectMissingMethodProblem]("akka.cluster.sharding.RemoveInternalClusterShardingData.remove")

akka-cluster-sharding/src/main/scala/akka/cluster/sharding/Shard.scala

@@ -119,6 +119,7 @@ private[akka] object Shard {
       entityProps: String => Props,
       settings: ClusterShardingSettings,
       extractEntityId: ShardRegion.ExtractEntityId,
+      extractShardId: ShardRegion.ExtractShardId,
       handOffStopMessage: Any,
       replicator: ActorRef,
       majorityMinCap: Int): Props = {
@@ -130,14 +131,22 @@ private[akka] object Shard {
           entityProps,
           settings,
           extractEntityId,
+          extractShardId,
           handOffStopMessage,
           replicator,
           majorityMinCap)).withDeploy(Deploy.local)
     } else if (settings.rememberEntities && settings.stateStoreMode == ClusterShardingSettings.StateStoreModePersistence)
-      Props(new PersistentShard(typeName, shardId, entityProps, settings, extractEntityId, handOffStopMessage))
-        .withDeploy(Deploy.local)
+      Props(
+        new PersistentShard(
+          typeName,
+          shardId,
+          entityProps,
+          settings,
+          extractEntityId,
+          extractShardId,
+          handOffStopMessage)).withDeploy(Deploy.local)
     else
-      Props(new Shard(typeName, shardId, entityProps, settings, extractEntityId, handOffStopMessage))
+      Props(new Shard(typeName, shardId, entityProps, settings, extractEntityId, extractShardId, handOffStopMessage))
         .withDeploy(Deploy.local)
   }
 
@@ -159,6 +168,7 @@ private[akka] class Shard(
     entityProps: String => Props,
     settings: ClusterShardingSettings,
     extractEntityId: ShardRegion.ExtractEntityId,
+    @unused extractShardId: ShardRegion.ExtractShardId,
     handOffStopMessage: Any)
     extends Actor
     with ActorLogging
@@ -623,8 +633,9 @@ private[akka] class PersistentShard(
     entityProps: String => Props,
     override val settings: ClusterShardingSettings,
     extractEntityId: ShardRegion.ExtractEntityId,
+    extractShardId: ShardRegion.ExtractShardId,
     handOffStopMessage: Any)
-    extends Shard(typeName, shardId, entityProps, settings, extractEntityId, handOffStopMessage)
+    extends Shard(typeName, shardId, entityProps, settings, extractEntityId, extractShardId, handOffStopMessage)
     with RememberingShard
     with PersistentActor
     with ActorLogging {
@@ -720,10 +731,11 @@ private[akka] class DDataShard(
     entityProps: String => Props,
     override val settings: ClusterShardingSettings,
     extractEntityId: ShardRegion.ExtractEntityId,
+    extractShardId: ShardRegion.ExtractShardId,
     handOffStopMessage: Any,
     replicator: ActorRef,
     majorityMinCap: Int)
-    extends Shard(typeName, shardId, entityProps, settings, extractEntityId, handOffStopMessage)
+    extends Shard(typeName, shardId, entityProps, settings, extractEntityId, extractShardId, handOffStopMessage)
     with RememberingShard
     with Stash
     with ActorLogging {

akka-cluster-sharding/src/main/scala/akka/cluster/sharding/ShardRegion.scala

@@ -915,7 +915,16 @@ private[akka] class ShardRegion(
             val shard = context.watch(
               context.actorOf(
                 Shard
-                  .props(typeName, id, props, settings, extractEntityId, handOffStopMessage, replicator, majorityMinCap)
+                  .props(
+                    typeName,
+                    id,
+                    props,
+                    settings,
+                    extractEntityId,
+                    extractShardId,
+                    handOffStopMessage,
+                    replicator,
+                    majorityMinCap)
                   .withDispatcher(context.props.dispatcher),
                 name))
             shardsByRef = shardsByRef.updated(shard, id)

akka-cluster-sharding/src/test/scala/akka/cluster/sharding/PersistentShardSpec.scala

@@ -32,6 +32,8 @@ class PersistentShardSpec extends AkkaSpec(PersistentShardSpec.config) with Word
       val props =
         Props(new PersistentShard("cats", "shard-1", _ => Props(new EntityActor), ClusterShardingSettings(system), {
           case _ => ("entity-1", "msg")
+        }, { _ =>
+          "shard-1"
         }, PoisonPill))
       val persistentShard = system.actorOf(props)
       watch(persistentShard)

akka-cluster-sharding/src/test/scala/akka/cluster/sharding/ShardSpec.scala

@@ -114,6 +114,7 @@ class ShardSpec extends AkkaSpec(ShardSpec.config) with ImplicitSender {
         _ ⇒ Props(new EntityActor()),
         settings,
         extractEntityId,
+        extractShardId,
         PoisonPill,
         system.deadLetters,
         1))