From 28fbd28e7ab7c60956dd476045256967e1f33ffb Mon Sep 17 00:00:00 2001
From: Christopher Batey <christopher.batey@gmail.com>
Date: Wed, 29 May 2019 07:09:12 +0100
Subject: [PATCH] Various internal stable markers (#27004)

---
 .../src/main/scala/akka/cluster/sharding/Shard.scala           | 2 ++
 .../src/main/scala/akka/persistence/Eventsourced.scala         | 2 ++
 akka-remote/src/main/scala/akka/remote/RemoteTransport.scala   | 2 ++
 .../src/main/scala/akka/remote/artery/ArteryTransport.scala    | 3 ++-
 .../src/main/scala/akka/remote/artery/RemoteInstrument.scala   | 2 ++
 5 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/akka-cluster-sharding/src/main/scala/akka/cluster/sharding/Shard.scala b/akka-cluster-sharding/src/main/scala/akka/cluster/sharding/Shard.scala
index bd28c1b986..6ff768975f 100644
--- a/akka-cluster-sharding/src/main/scala/akka/cluster/sharding/Shard.scala
+++ b/akka-cluster-sharding/src/main/scala/akka/cluster/sharding/Shard.scala
@@ -163,6 +163,7 @@ private[akka] object Shard {
  *
  * @see [[ClusterSharding$ ClusterSharding extension]]
  */
+@InternalStableApi
 private[akka] class Shard(
     typeName: String,
     shardId: ShardRegion.ShardId,
@@ -381,6 +382,7 @@ private[akka] class Shard(
       entityTerminated(ref)
   }
 
+  @InternalStableApi
   def entityTerminated(ref: ActorRef): Unit = {
     val id = idByRef(ref)
     idByRef -= ref
diff --git a/akka-persistence/src/main/scala/akka/persistence/Eventsourced.scala b/akka-persistence/src/main/scala/akka/persistence/Eventsourced.scala
index a35cf79735..36f50f3f22 100644
--- a/akka-persistence/src/main/scala/akka/persistence/Eventsourced.scala
+++ b/akka-persistence/src/main/scala/akka/persistence/Eventsourced.scala
@@ -139,6 +139,7 @@ private[persistence] trait Eventsourced
    * Called whenever a message replay succeeds.
    * May be implemented by subclass.
    */
+  @InternalStableApi
   private[akka] def onReplaySuccess(): Unit = ()
 
   /**
@@ -231,6 +232,7 @@ private[persistence] trait Eventsourced
   private def unstashInternally(all: Boolean): Unit =
     if (all) internalStash.unstashAll() else internalStash.unstash()
 
+  @InternalStableApi
   private def startRecovery(recovery: Recovery): Unit = {
     val timeout = {
       val journalPluginConfig = this match {
diff --git a/akka-remote/src/main/scala/akka/remote/RemoteTransport.scala b/akka-remote/src/main/scala/akka/remote/RemoteTransport.scala
index e97cefdc3a..c47ab7d81e 100644
--- a/akka-remote/src/main/scala/akka/remote/RemoteTransport.scala
+++ b/akka-remote/src/main/scala/akka/remote/RemoteTransport.scala
@@ -7,6 +7,7 @@ package akka.remote
 import akka.AkkaException
 import akka.Done
 import akka.actor._
+import akka.annotation.InternalStableApi
 import akka.event.LoggingAdapter
 
 import scala.collection.immutable
@@ -95,6 +96,7 @@ private[akka] abstract class RemoteTransport(val system: ExtendedActorSystem, va
    * @param uid UID of the remote system, if the uid is not defined it will not be a strong quarantine but
    *   the current endpoint writer will be stopped (dropping system messages) and the address will be gated
    */
+  @InternalStableApi
   def quarantine(address: Address, uid: Option[Long], reason: String): Unit
 
 }
diff --git a/akka-remote/src/main/scala/akka/remote/artery/ArteryTransport.scala b/akka-remote/src/main/scala/akka/remote/artery/ArteryTransport.scala
index c92b21f8bf..f88d7e8794 100644
--- a/akka-remote/src/main/scala/akka/remote/artery/ArteryTransport.scala
+++ b/akka-remote/src/main/scala/akka/remote/artery/ArteryTransport.scala
@@ -24,12 +24,12 @@ import scala.util.Success
 import scala.util.Try
 import scala.util.control.NoStackTrace
 import scala.util.control.NonFatal
-
 import akka.Done
 import akka.NotUsed
 import akka.actor.Actor
 import akka.actor.Props
 import akka.actor._
+import akka.annotation.InternalStableApi
 import akka.dispatch.Dispatchers
 import akka.event.Logging
 import akka.event.LoggingAdapter
@@ -793,6 +793,7 @@ private[remote] abstract class ArteryTransport(_system: ExtendedActorSystem, _pr
     }
   }
 
+  @InternalStableApi
   override def quarantine(remoteAddress: Address, uid: Option[Long], reason: String): Unit = {
     quarantine(remoteAddress, uid, reason, harmless = false)
   }
diff --git a/akka-remote/src/main/scala/akka/remote/artery/RemoteInstrument.scala b/akka-remote/src/main/scala/akka/remote/artery/RemoteInstrument.scala
index 3f42d2eba8..a4dcbc7a80 100644
--- a/akka-remote/src/main/scala/akka/remote/artery/RemoteInstrument.scala
+++ b/akka-remote/src/main/scala/akka/remote/artery/RemoteInstrument.scala
@@ -10,6 +10,7 @@ import scala.annotation.tailrec
 import scala.collection.immutable
 import scala.util.control.NonFatal
 import akka.actor.{ ActorRef, ExtendedActorSystem }
+import akka.annotation.InternalStableApi
 import akka.event.{ Logging, LoggingAdapter }
 import akka.util.{ unused, OptionVal }
 import akka.util.ccompat._
@@ -327,6 +328,7 @@ private[remote] object RemoteInstruments {
   def getKey(kl: Int): Byte = (kl >>> 26).toByte
   def getLength(kl: Int): Int = kl & lengthMask
 
+  @InternalStableApi
   def create(system: ExtendedActorSystem, @unused log: LoggingAdapter): Vector[RemoteInstrument] = {
     val c = system.settings.config
     val path = "akka.remote.artery.advanced.instruments"