=act,clu,con,doc,per,rem,sam #15114 append missing parens at Actor.sender() invocations

This commit is contained in:
Marcin Kubala 2014-06-20 23:05:51 +02:00
parent 67784dbdae
commit f4793a399f
30 changed files with 78 additions and 78 deletions

View file

@ -326,7 +326,7 @@ class ActorSystemSpec extends AkkaSpec(ActorSystemSpec.config) with ImplicitSend
try {
val ref = system2.actorOf(Props(new Actor {
def receive = {
case "ping" sender ! "pong"
case "ping" sender() ! "pong"
}
}))
@ -351,7 +351,7 @@ class ActorSystemSpec extends AkkaSpec(ActorSystemSpec.config) with ImplicitSend
try {
val ref = system2.actorOf(Props(new Actor {
def receive = {
case "ping" sender ! "pong"
case "ping" sender() ! "pong"
}
}))

View file

@ -21,7 +21,7 @@ object BalancingSpec {
case msg
if (id == 1) Thread.sleep(10) // dispatch to other routees
else Await.ready(latch, 1.minute)
sender ! id
sender() ! id
}
}
}

View file

@ -69,7 +69,7 @@ object SurviveNetworkInstabilityMultiJvmSpec extends MultiNodeConfig {
class Echo extends Actor {
def receive = {
case m sender ! m
case m sender() ! m
}
}

View file

@ -149,7 +149,7 @@ object ClusterSingletonManagerSpec extends MultiNodeConfig {
case UnregistrationOk
context stop self
case Ping
sender ! Pong
sender() ! Pong
//#consumer-end
}
}

View file

@ -85,7 +85,7 @@ object ClusterSingletonProxySpec {
def receive: Actor.Receive = {
case msg
sender ! "Got " + msg
sender() ! "Got " + msg
}
}

View file

@ -18,7 +18,7 @@ class MyActor extends Actor {
import MyActor._
def receive = {
case message: Message => message match {
case BarMessage(bar) => sender ! BazMessage("Got " + bar)
case BarMessage(bar) => sender() ! BazMessage("Got " + bar)
// warning here:
// "match may not be exhaustive. It would fail on the following input: FooMessage(_)"
}

View file

@ -95,7 +95,7 @@ class Worker extends Actor with ActorLogging {
def receive = LoggingReceive {
case Start if progressListener.isEmpty =>
progressListener = Some(sender)
progressListener = Some(sender())
context.system.scheduler.schedule(Duration.Zero, 1 second, self, Do)
case Do =>

View file

@ -25,8 +25,8 @@ object PullReadingExample {
//#pull-accepting
case Bound(localAddress) =>
// Accept connections one by one
sender ! ResumeAccepting(batchSize = 1)
context.become(listening(sender))
sender() ! ResumeAccepting(batchSize = 1)
context.become(listening(sender()))
//#pull-accepting
monitor ! localAddress
}
@ -34,8 +34,8 @@ object PullReadingExample {
//#pull-accepting-cont
def listening(listener: ActorRef): Receive = {
case Connected(remote, local) =>
val handler = context.actorOf(Props(classOf[PullEcho], sender))
sender ! Register(handler, keepOpenOnPeerClosed = true)
val handler = context.actorOf(Props(classOf[PullEcho], sender()))
sender() ! Register(handler, keepOpenOnPeerClosed = true)
listener ! ResumeAccepting(batchSize = 1)
}
//#pull-accepting-cont

View file

@ -172,7 +172,7 @@ trait PersistenceDocSpec {
def receive = {
case p @ Persistent(payload, _) =>
//#channel-example-reply
channel ! Deliver(p.withPayload(s"processed ${payload}"), sender.path)
channel ! Deliver(p.withPayload(s"processed ${payload}"), sender().path)
//#channel-example-reply
}

View file

@ -295,8 +295,8 @@ private class ReliableDelivery(redeliverSettings: ChannelSettings) extends Actor
val psnr = persistent.sequenceNr
val confirm = persistent.confirmMessage.update(deliverySequenceNr = dsnr)
val updated = persistent.update(confirmMessage = confirm, sequenceNr = if (psnr == 0) dsnr else psnr)
context.actorSelection(destination).tell(updated, sender)
deliveryAttempts += (dsnr -> DeliveryAttempt(updated, destination, sender))
context.actorSelection(destination).tell(updated, sender())
deliveryAttempts += (dsnr -> DeliveryAttempt(updated, destination, sender()))
case d: Delivered
deliveryAttempts -= d.deliverySequenceNr
redelivery forward d

View file

@ -256,10 +256,10 @@ private class RequestWriter(channelId: String, channelSettings: PersistentChanne
}
if (!recoveryRunning && replyPersistent)
sender ! wrapped
sender() ! wrapped
case p: PersistenceFailure
if (replyPersistent) sender ! p
if (replyPersistent) sender() ! p
}
override protected[akka] def aroundReceive(receive: Receive, message: Any): Unit = {

View file

@ -81,7 +81,7 @@ trait AsyncWriteJournal extends Actor with WriteJournalBase with AsyncRecovery {
case Failure(e)
}
case LoopMessage(message, processor)
resequencer ! Desequenced(LoopMessageSuccess(message), resequencerCounter, processor, sender)
resequencer ! Desequenced(LoopMessageSuccess(message), resequencerCounter, processor, sender())
resequencerCounter += 1
}

View file

@ -77,21 +77,21 @@ private[persistence] class InmemStore extends Actor with InmemMessages {
def receive = {
case WriteMessages(msgs)
sender ! msgs.foreach(add)
sender() ! msgs.foreach(add)
case WriteConfirmations(cnfs)
sender ! cnfs.foreach(cnf update(cnf.processorId, cnf.sequenceNr)(p p.update(confirms = cnf.channelId +: p.confirms)))
sender() ! cnfs.foreach(cnf update(cnf.processorId, cnf.sequenceNr)(p p.update(confirms = cnf.channelId +: p.confirms)))
case DeleteMessages(msgIds, false)
sender ! msgIds.foreach(msgId update(msgId.processorId, msgId.sequenceNr)(_.update(deleted = true)))
sender() ! msgIds.foreach(msgId update(msgId.processorId, msgId.sequenceNr)(_.update(deleted = true)))
case DeleteMessages(msgIds, true)
sender ! msgIds.foreach(msgId delete(msgId.processorId, msgId.sequenceNr))
sender() ! msgIds.foreach(msgId delete(msgId.processorId, msgId.sequenceNr))
case DeleteMessagesTo(pid, tsnr, false)
sender ! (1L to tsnr foreach { snr update(pid, snr)(_.update(deleted = true)) })
sender() ! (1L to tsnr foreach { snr update(pid, snr)(_.update(deleted = true)) })
case DeleteMessagesTo(pid, tsnr, true)
sender ! (1L to tsnr foreach { snr delete(pid, snr) })
sender() ! (1L to tsnr foreach { snr delete(pid, snr) })
case ReplayMessages(pid, fromSnr, toSnr, max)
read(pid, fromSnr, toSnr, max).foreach(sender ! _)
sender ! ReplaySuccess
read(pid, fromSnr, toSnr, max).foreach(sender() ! _)
sender() ! ReplaySuccess
case ReadHighestSequenceNr(processorId, _)
sender ! highestSequenceNr(processorId)
sender() ! highestSequenceNr(processorId)
}
}

View file

@ -132,15 +132,15 @@ class SharedLeveldbStore extends { val configPath = "akka.persistence.journal.le
import AsyncWriteTarget._
def receive = {
case WriteMessages(msgs) sender ! writeMessages(msgs)
case WriteConfirmations(cnfs) sender ! writeConfirmations(cnfs)
case DeleteMessages(messageIds, permanent) sender ! deleteMessages(messageIds, permanent)
case DeleteMessagesTo(pid, tsnr, permanent) sender ! deleteMessagesTo(pid, tsnr, permanent)
case ReadHighestSequenceNr(pid, fromSequenceNr) sender ! readHighestSequenceNr(numericId(pid))
case WriteMessages(msgs) sender() ! writeMessages(msgs)
case WriteConfirmations(cnfs) sender() ! writeConfirmations(cnfs)
case DeleteMessages(messageIds, permanent) sender() ! deleteMessages(messageIds, permanent)
case DeleteMessagesTo(pid, tsnr, permanent) sender() ! deleteMessagesTo(pid, tsnr, permanent)
case ReadHighestSequenceNr(pid, fromSequenceNr) sender() ! readHighestSequenceNr(numericId(pid))
case ReplayMessages(pid, fromSnr, toSnr, max)
Try(replayMessages(numericId(pid), fromSnr, toSnr, max)(sender ! _)) match {
case Success(max) sender ! ReplaySuccess
case Failure(cause) sender ! ReplayFailure(cause)
Try(replayMessages(numericId(pid), fromSnr, toSnr, max)(sender() ! _)) match {
case Success(max) sender() ! ReplaySuccess
case Failure(cause) sender() ! ReplayFailure(cause)
}
}
}

View file

@ -23,14 +23,14 @@ trait SnapshotStore extends Actor {
final def receive = {
case LoadSnapshot(processorId, criteria, toSequenceNr)
val p = sender
val p = sender()
loadAsync(processorId, criteria.limit(toSequenceNr)) map {
sso LoadSnapshotResult(sso, toSequenceNr)
} recover {
case e LoadSnapshotResult(None, toSequenceNr)
} pipeTo (p)
case SaveSnapshot(metadata, snapshot)
val p = sender
val p = sender()
val md = metadata.copy(timestamp = System.currentTimeMillis)
saveAsync(md, snapshot) map {
_ SaveSnapshotSuccess(md)
@ -39,10 +39,10 @@ trait SnapshotStore extends Actor {
} to (self, p)
case evt @ SaveSnapshotSuccess(metadata)
saved(metadata)
sender ! evt // sender is processor
sender() ! evt // sender is processor
case evt @ SaveSnapshotFailure(metadata, _)
delete(metadata)
sender ! evt // sender is processor
sender() ! evt // sender is processor
case d @ DeleteSnapshot(metadata)
delete(metadata)
if (publish) context.system.eventStream.publish(d)

View file

@ -47,7 +47,7 @@ object FailureSpec {
def add(i: Int): Unit = {
state :+= i
if (state.length == numMessages) sender ! Done(state)
if (state.length == numMessages) sender() ! Done(state)
}
def shouldFail(rate: Double) =
@ -77,7 +77,7 @@ object FailureSpec {
}
case PersistenceFailure(i: Int, _, _)
// inform sender about journaling failure so that it can resend
sender ! JournalingFailure(i)
sender() ! JournalingFailure(i)
case RecoveryFailure(_)
// journal failed during recovery, throw exception to re-recover processor
throw new TestException(debugMessage("recovery failed"))
@ -89,7 +89,7 @@ object FailureSpec {
deleteMessage(p.sequenceNr)
log.debug(debugMessage(s"requested deletion of payload ${i}"))
// inform sender about processing failure so that it can resend
sender ! ProcessingFailure(i)
sender() ! ProcessingFailure(i)
case _
}
super.preRestart(reason, message)

View file

@ -33,10 +33,10 @@ object NumberProcessorSpec {
case Persistent(SetNumber(number), _) num = number
case Persistent(Add(number), _) num = num + number
case Persistent(Subtract(number), _) num = num - number
case GetNumber channel ! Deliver(Persistent(num), sender.path)
case GetNumber channel ! Deliver(Persistent(num), sender().path)
case p @ Persistent(DecrementAndGet, _)
num = num - 1
channel ! Deliver(p.withPayload(num), sender.path)
channel ! Deliver(p.withPayload(num), sender().path)
}
}
}

View file

@ -41,7 +41,7 @@ object PerformanceSpec {
def stopMeasure(): Unit = {
stopSequenceNr = lastSequenceNr
stopTime = System.nanoTime
sender ! (NanoToSecond * (stopSequenceNr - startSequenceNr) / (stopTime - startTime))
sender() ! (NanoToSecond * (stopSequenceNr - startSequenceNr) / (stopTime - startTime))
}
def lastSequenceNr: Long

View file

@ -36,9 +36,9 @@ object PersistentActorFailureSpec {
case ReplayMessages(pid, fromSnr, toSnr, max)
val readFromStore = read(pid, fromSnr, toSnr, max)
if (readFromStore.length == 0)
sender ! ReplaySuccess
sender() ! ReplaySuccess
else
sender ! ReplayFailure(new IllegalArgumentException(s"blahonga $fromSnr $toSnr"))
sender() ! ReplayFailure(new IllegalArgumentException(s"blahonga $fromSnr $toSnr"))
}
override def receive = failingReceive.orElse(super.receive)
@ -50,8 +50,8 @@ object PersistentActorFailureSpec {
}
def receive = {
case props: Props sender ! context.actorOf(props)
case m sender ! m
case props: Props sender() ! context.actorOf(props)
case m sender() ! m
}
}
}

View file

@ -24,17 +24,17 @@ object ProcessorChannelSpec {
channel forward Deliver(m.withPayload(s"fw: ${s}"), destination.path)
case m @ Persistent(s: String, _) if s.startsWith("b")
// reply to sender via channel
channel ! Deliver(m.withPayload(s"re: ${s}"), sender.path)
channel ! Deliver(m.withPayload(s"re: ${s}"), sender().path)
case m @ Persistent(s: String, _) if s.startsWith("c")
// don't use channel
sender ! s"got: ${s}"
sender() ! s"got: ${s}"
case "replay" throw new TestException("replay requested")
}
}
class TestDestination extends Actor {
def receive = {
case m: Persistent sender ! m
case m: Persistent sender() ! m
}
}

View file

@ -19,7 +19,7 @@ object ProcessorSpec {
case "boom" throw new TestException("boom")
case Persistent("boom", _) throw new TestException("boom")
case Persistent(payload, snr) state = s"${payload}-${snr}" :: state
case GetState sender ! state.reverse
case GetState sender() ! state.reverse
}
override def preRestart(reason: Throwable, message: Option[Any]) = {
@ -35,27 +35,27 @@ object ProcessorSpec {
class StoredSenderTestProcessor(name: String) extends NamedProcessor(name) {
def receive = {
case Persistent(payload, _) sender ! payload
case Persistent(payload, _) sender() ! payload
}
}
class RecoveryStatusTestProcessor(name: String) extends NamedProcessor(name) {
def receive = {
case Persistent("c", _) if !recoveryRunning sender ! "c"
case Persistent(payload, _) if recoveryRunning sender ! payload
case Persistent("c", _) if !recoveryRunning sender() ! "c"
case Persistent(payload, _) if recoveryRunning sender() ! payload
}
}
class BehaviorChangeTestProcessor(name: String) extends NamedProcessor(name) {
val acceptA: Actor.Receive = {
case Persistent("a", _)
sender ! "a"
sender() ! "a"
context.become(acceptB)
}
val acceptB: Actor.Receive = {
case Persistent("b", _)
sender ! "b"
sender() ! "b"
context.become(acceptA)
}
@ -78,7 +78,7 @@ object ProcessorSpec {
class OutboundMessageTestProcessor(name: String) extends NamedProcessor(name) {
def receive = {
case Persistent(payload, snr) sender ! Persistent(snr)
case Persistent(payload, snr) sender() ! Persistent(snr)
}
}
@ -102,7 +102,7 @@ object ProcessorSpec {
def receive = {
case "boom" throw new ResumeTestException
case Persistent(payload, snr) state = s"${payload}-${snr}" :: state
case GetState sender ! state.reverse
case GetState sender() ! state.reverse
}
}

View file

@ -26,7 +26,7 @@ object ProcessorStashSpec {
update("x")
case "boom" throw new TestException("boom")
case Persistent("boom", _) throw new TestException("boom")
case GetState sender ! state.reverse
case GetState sender() ! state.reverse
}
val behaviorB: Actor.Receive = {

View file

@ -139,17 +139,17 @@ class MessageSerializerPersistenceSpec extends AkkaSpec(customSerializers) {
object MessageSerializerRemotingSpec {
class LocalActor(port: Int) extends Actor {
def receive = {
case m context.actorSelection(s"akka.tcp://remote@127.0.0.1:${port}/user/remote") tell (m, sender)
case m context.actorSelection(s"akka.tcp://remote@127.0.0.1:${port}/user/remote") tell (m, sender())
}
}
class RemoteActor extends Actor {
def receive = {
case PersistentBatch(Persistent(MyPayload(data), _) +: tail) sender ! s"b${data}"
case ConfirmablePersistent(MyPayload(data), _, _) sender ! s"c${data}"
case Persistent(MyPayload(data), _) sender ! s"p${data}"
case DeliveredByChannel(pid, cid, msnr, dsnr, ep) sender ! s"${pid},${cid},${msnr},${dsnr},${ep.path.name.startsWith("testActor")}"
case DeliveredByPersistentChannel(cid, msnr, dsnr, ep) sender ! s"${cid},${msnr},${dsnr},${ep.path.name.startsWith("testActor")}"
case PersistentBatch(Persistent(MyPayload(data), _) +: tail) sender() ! s"b${data}"
case ConfirmablePersistent(MyPayload(data), _, _) sender() ! s"c${data}"
case Persistent(MyPayload(data), _) sender() ! s"p${data}"
case DeliveredByChannel(pid, cid, msnr, dsnr, ep) sender() ! s"${pid},${cid},${msnr},${dsnr},${ep.path.name.startsWith("testActor")}"
case DeliveredByPersistentChannel(cid, msnr, dsnr, ep) sender() ! s"${cid},${msnr},${dsnr},${ep.path.name.startsWith("testActor")}"
case Deliver(Persistent(payload, _), dp) context.actorSelection(dp) ! payload
}
}

View file

@ -53,7 +53,7 @@ object RemoteReDeploymentMultiJvmSpec extends MultiNodeConfig {
class Echo(target: ActorRef) extends Actor with ActorLogging {
def receive = {
case msg
log.info(s"received $msg from $sender")
log.info(s"received $msg from ${sender()}")
target ! msg
}
}

View file

@ -40,7 +40,7 @@ class Chopstick extends Actor with FSM[ChopstickState, TakenBy] {
// When a chopstick is available, it can be taken by a some hakker
when(Available) {
case Event(Take, _) =>
goto(Taken) using TakenBy(sender) replying Taken(self)
goto(Taken) using TakenBy(sender()) replying Taken(self)
}
// When a chopstick is taken by a hakker
@ -49,7 +49,7 @@ class Chopstick extends Actor with FSM[ChopstickState, TakenBy] {
when(Taken) {
case Event(Take, currentState) =>
stay replying Busy(self)
case Event(Put, TakenBy(hakker)) if sender == hakker =>
case Event(Put, TakenBy(hakker)) if sender() == hakker =>
goto(Available) using TakenBy(system.deadLetters)
}

View file

@ -165,8 +165,8 @@ class Hakker(name: String, chair: Int) extends Actor {
case state: CurrentClusterState => state.leader foreach updateTable
case LeaderChanged(Some(leaderAddress)) => updateTable(leaderAddress)
case SubscribeToHakkerStateChanges =>
subscribers += sender
context watch sender
subscribers += sender()
context watch sender()
case Terminated(subscriber) =>
subscribers -= subscriber
}

View file

@ -52,7 +52,7 @@ class HakkerTracker extends EventsourcedProcessor {
}
case GetEatingCount(name) =>
sender ! EatingCount(name, 17)
sender() ! EatingCount(name, 17)
}
}

View file

@ -17,9 +17,9 @@ object ConversationRecoveryExample extends App {
println(s"received ping ${counter} times ...")
m.confirm()
if (!recoveryRunning) Thread.sleep(1000)
pongChannel ! Deliver(m.withPayload(Pong), sender.path)
pongChannel ! Deliver(m.withPayload(Pong), sender().path)
case "init" if (counter == 0) =>
pongChannel ! Deliver(Persistent(Pong), sender.path)
pongChannel ! Deliver(Persistent(Pong), sender().path)
}
}
@ -33,7 +33,7 @@ object ConversationRecoveryExample extends App {
println(s"received pong ${counter} times ...")
m.confirm()
if (!recoveryRunning) Thread.sleep(1000)
pingChannel ! Deliver(m.withPayload(Ping), sender.path)
pingChannel ! Deliver(m.withPayload(Ping), sender().path)
}
}

View file

@ -21,7 +21,7 @@ object ProcessorChannelExample extends App {
def receive = {
case p @ ConfirmablePersistent(payload, snr, _) =>
println(s"received ${payload}")
sender ! s"re: ${payload} (${snr})"
sender() ! s"re: ${payload} (${snr})"
p.confirm()
}
}

View file

@ -77,7 +77,7 @@ object ReceiverApp /*extends App*/ { // no app until https://github.com/typesafe
def receive = {
case p @ ConfirmablePersistent(payload, snr, redel) =>
println(s"[destination] received payload: ${payload} (snr = ${snr}, redel = ${redel})")
sender ! s"re: ${payload} (snr = ${snr})"
sender() ! s"re: ${payload} (snr = ${snr})"
p.confirm()
}
}