raboof/pekko
1
0
Fork 0
Code Issues Pull requests Projects Releases 6 Packages Wiki Activity Actions 10

Annotated extendable cluster tool actors with DoNotInherit (#23335)

Browse source
This commit is contained in:
Johan Andrén 2017-07-26 10:42:13 +02:00 • committed by GitHub
parent daa1d6c5f0
commit 6cd3b17854
2 changed files with 12 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

6
akka-cluster-tools/src/main/scala/akka/cluster/pubsub/DistributedPubSubMediator.scala
View file

@ -10,7 +10,9 @@ import scala.concurrent.duration._
import java.util.concurrent.ThreadLocalRandom import java.util.concurrent.ThreadLocalRandom
import java.net.URLEncoder import java.net.URLEncoder
import java.net.URLDecoder import java.net.URLDecoder
import akka.actor._ import akka.actor._
import akka.annotation.DoNotInherit
import akka.cluster.Cluster import akka.cluster.Cluster
import akka.cluster.ClusterEvent._ import akka.cluster.ClusterEvent._
import akka.cluster.Member import akka.cluster.Member
@ -24,6 +26,7 @@ import akka.routing.RouterEnvelope
import akka.routing.RoundRobinRoutingLogic import akka.routing.RoundRobinRoutingLogic
import akka.routing.ConsistentHashingRoutingLogic import akka.routing.ConsistentHashingRoutingLogic
import akka.routing.BroadcastRoutingLogic import akka.routing.BroadcastRoutingLogic
import scala.collection.immutable.TreeMap import scala.collection.immutable.TreeMap
import com.typesafe.config.Config import com.typesafe.config.Config
import akka.dispatch.Dispatchers import akka.dispatch.Dispatchers
@ -475,7 +478,10 @@ trait DistributedPubSubMessage extends Serializable
* Successful `Subscribe` and `Unsubscribe` is acknowledged with * Successful `Subscribe` and `Unsubscribe` is acknowledged with
* [[DistributedPubSubMediator.SubscribeAck]] and [[DistributedPubSubMediator.UnsubscribeAck]] * [[DistributedPubSubMediator.SubscribeAck]] and [[DistributedPubSubMediator.UnsubscribeAck]]
* replies. * replies.
*
* Not intended for subclassing by user code.
*/ */
@DoNotInherit
class DistributedPubSubMediator(settings: DistributedPubSubSettings) extends Actor with ActorLogging with PerGroupingBuffer { class DistributedPubSubMediator(settings: DistributedPubSubSettings) extends Actor with ActorLogging with PerGroupingBuffer {
import DistributedPubSubMediator._ import DistributedPubSubMediator._

6
akka-cluster-tools/src/main/scala/akka/cluster/singleton/ClusterSingletonManager.scala
View file

@ -5,6 +5,7 @@
package akka.cluster.singleton package akka.cluster.singleton
import com.typesafe.config.Config import com.typesafe.config.Config
import scala.concurrent.duration._ import scala.concurrent.duration._
import scala.collection.immutable import scala.collection.immutable
import akka.actor.Actor import akka.actor.Actor
@ -25,9 +26,11 @@ import akka.AkkaException
import akka.actor.NoSerializationVerificationNeeded import akka.actor.NoSerializationVerificationNeeded
import akka.cluster.UniqueAddress import akka.cluster.UniqueAddress
import akka.cluster.ClusterEvent import akka.cluster.ClusterEvent
import scala.concurrent.Promise import scala.concurrent.Promise
import akka.Done import akka.Done
import akka.actor.CoordinatedShutdown import akka.actor.CoordinatedShutdown
import akka.annotation.DoNotInherit
import akka.pattern.ask import akka.pattern.ask
import akka.util.Timeout import akka.util.Timeout
@ -394,6 +397,8 @@ class ClusterSingletonManagerIsStuck(message: String) extends AkkaException(mess
* Use factory method [[ClusterSingletonManager#props]] to create the * Use factory method [[ClusterSingletonManager#props]] to create the
* [[akka.actor.Props]] for the actor. * [[akka.actor.Props]] for the actor.
* *
* Not intended for subclassing by user code.
*
* *
* @param singletonProps [[akka.actor.Props]] of the singleton actor instance. * @param singletonProps [[akka.actor.Props]] of the singleton actor instance.
* *
@ -407,6 +412,7 @@ class ClusterSingletonManagerIsStuck(message: String) extends AkkaException(mess
* *
* @param settings see [[ClusterSingletonManagerSettings]] * @param settings see [[ClusterSingletonManagerSettings]]
*/ */
@DoNotInherit
class ClusterSingletonManager( class ClusterSingletonManager(
singletonProps: Props, singletonProps: Props,
terminationMessage: Any, terminationMessage: Any,