diff --git a/akka-actor-tests/src/test/java/akka/actor/JavaAPITestActor.java b/akka-actor-tests/src/test/java/akka/actor/JavaAPITestActor.java
index 172dd6c6e9..588307ee6c 100644
--- a/akka-actor-tests/src/test/java/akka/actor/JavaAPITestActor.java
+++ b/akka-actor-tests/src/test/java/akka/actor/JavaAPITestActor.java
@@ -2,6 +2,6 @@ package akka.actor;
public class JavaAPITestActor extends UntypedActor {
public void onReceive(Object msg) {
- getContext().tryReply("got it!");
+ tryReply("got it!");
}
}
diff --git a/akka-actor-tests/src/test/scala/akka/actor/ActorFireForgetRequestReplySpec.scala b/akka-actor-tests/src/test/scala/akka/actor/ActorFireForgetRequestReplySpec.scala
index 4f5dded329..1b9a3e1d81 100644
--- a/akka-actor-tests/src/test/scala/akka/actor/ActorFireForgetRequestReplySpec.scala
+++ b/akka-actor-tests/src/test/scala/akka/actor/ActorFireForgetRequestReplySpec.scala
@@ -21,9 +21,9 @@ object ActorFireForgetRequestReplySpec {
class ReplyActor extends Actor {
def receive = {
case "Send" ⇒
- self.reply("Reply")
+ reply("Reply")
case "SendImplicit" ⇒
- self.channel ! "ReplyImplicit"
+ channel ! "ReplyImplicit"
}
}
diff --git a/akka-actor-tests/src/test/scala/akka/actor/ActorRefSpec.scala b/akka-actor-tests/src/test/scala/akka/actor/ActorRefSpec.scala
index ba177698e2..f08dd47425 100644
--- a/akka-actor-tests/src/test/scala/akka/actor/ActorRefSpec.scala
+++ b/akka-actor-tests/src/test/scala/akka/actor/ActorRefSpec.scala
@@ -26,15 +26,15 @@ object ActorRefSpec {
def receive = {
case "complexRequest" ⇒ {
- replyTo = self.channel
+ replyTo = channel
val worker = actorOf(Props[WorkerActor])
worker ! "work"
}
case "complexRequest2" ⇒
val worker = actorOf(Props[WorkerActor])
- worker ! self.channel
+ worker ! channel
case "workDone" ⇒ replyTo ! "complexReply"
- case "simpleRequest" ⇒ self.reply("simpleReply")
+ case "simpleRequest" ⇒ reply("simpleReply")
}
}
@@ -42,7 +42,7 @@ object ActorRefSpec {
def receive = {
case "work" ⇒ {
work
- self.reply("workDone")
+ reply("workDone")
self.stop()
}
case replyTo: Channel[Any] ⇒ {
@@ -73,7 +73,7 @@ object ActorRefSpec {
class OuterActor(val inner: ActorRef) extends Actor {
def receive = {
- case "self" ⇒ self reply self
+ case "self" ⇒ reply(self)
case x ⇒ inner forward x
}
}
@@ -82,7 +82,7 @@ object ActorRefSpec {
val fail = new InnerActor
def receive = {
- case "self" ⇒ self reply self
+ case "self" ⇒ reply(self)
case x ⇒ inner forward x
}
}
@@ -93,8 +93,8 @@ object ActorRefSpec {
class InnerActor extends Actor {
def receive = {
- case "innerself" ⇒ self reply self
- case other ⇒ self reply other
+ case "innerself" ⇒ reply(self)
+ case other ⇒ reply(other)
}
}
@@ -102,8 +102,8 @@ object ActorRefSpec {
val fail = new InnerActor
def receive = {
- case "innerself" ⇒ self reply self
- case other ⇒ self reply other
+ case "innerself" ⇒ reply(self)
+ case other ⇒ reply(other)
}
}
@@ -258,7 +258,7 @@ class ActorRefSpec extends WordSpec with MustMatchers {
"support nested actorOfs" in {
val a = actorOf(new Actor {
val nested = actorOf(new Actor { def receive = { case _ ⇒ } })
- def receive = { case _ ⇒ self reply nested }
+ def receive = { case _ ⇒ reply(nested) }
})
val nested = (a ? "any").as[ActorRef].get
@@ -304,9 +304,11 @@ class ActorRefSpec extends WordSpec with MustMatchers {
"stop when sent a poison pill" in {
val timeout = Timeout(20000)
- val ref = actorOf(Props(self ⇒ {
- case 5 ⇒ self tryReply "five"
- case null ⇒ self tryReply "null"
+ val ref = actorOf(Props(new Actor {
+ def receive = {
+ case 5 ⇒ tryReply("five")
+ case null ⇒ tryReply("null")
+ }
}))
val ffive = (ref ? (5, timeout)).mapTo[String]
diff --git a/akka-actor-tests/src/test/scala/akka/actor/ActorRegistrySpec.scala b/akka-actor-tests/src/test/scala/akka/actor/ActorRegistrySpec.scala
index 10db8c377b..9638421bbb 100644
--- a/akka-actor-tests/src/test/scala/akka/actor/ActorRegistrySpec.scala
+++ b/akka-actor-tests/src/test/scala/akka/actor/ActorRegistrySpec.scala
@@ -12,16 +12,16 @@ object ActorRegistrySpec {
class TestActor extends Actor {
def receive = {
case "ping" ⇒
- self.reply("got ping")
+ reply("got ping")
}
}
class TestActor2 extends Actor {
def receive = {
case "ping" ⇒
- self.reply("got ping")
+ reply("got ping")
case "ping2" ⇒
- self.reply("got ping")
+ reply("got ping")
}
}
}
diff --git a/akka-actor-tests/src/test/scala/akka/actor/ActorRestartSpec.scala b/akka-actor-tests/src/test/scala/akka/actor/ActorRestartSpec.scala
index a2be02137d..1221658217 100644
--- a/akka-actor-tests/src/test/scala/akka/actor/ActorRestartSpec.scala
+++ b/akka-actor-tests/src/test/scala/akka/actor/ActorRestartSpec.scala
@@ -33,7 +33,7 @@ object ActorRestartSpec {
def receive = {
case x: Int ⇒ xx = x
case t: RestartType ⇒ restart = t
- case "get" ⇒ self reply xx
+ case "get" ⇒ reply(xx)
}
override def preStart { testActor ! (("preStart", gen)) }
override def preRestart(cause: Throwable, msg: Option[Any]) { testActor ! (("preRestart", msg, gen)) }
diff --git a/akka-actor-tests/src/test/scala/akka/actor/Bench.scala b/akka-actor-tests/src/test/scala/akka/actor/Bench.scala
index 53679ff3cb..221d72f443 100644
--- a/akka-actor-tests/src/test/scala/akka/actor/Bench.scala
+++ b/akka-actor-tests/src/test/scala/akka/actor/Bench.scala
@@ -44,7 +44,7 @@ object Chameneos {
case Exit ⇒
colour = FADED
- self.sender.get ! MeetingCount(meetings)
+ sender.get ! MeetingCount(meetings)
}
def complement(otherColour: Colour): Colour = colour match {
@@ -97,11 +97,11 @@ object Chameneos {
n -= 1
chameneo ! msg
waitingChameneo = None
- case None ⇒ waitingChameneo = self.sender
+ case None ⇒ waitingChameneo = sender
}
} else {
waitingChameneo.foreach(_ ! Exit)
- self.channel ! Exit
+ channel ! Exit
}
}
}
diff --git a/akka-actor-tests/src/test/scala/akka/actor/ForwardActorSpec.scala b/akka-actor-tests/src/test/scala/akka/actor/ForwardActorSpec.scala
index 6c6949a440..ad4bf88e0e 100644
--- a/akka-actor-tests/src/test/scala/akka/actor/ForwardActorSpec.scala
+++ b/akka-actor-tests/src/test/scala/akka/actor/ForwardActorSpec.scala
@@ -18,7 +18,7 @@ object ForwardActorSpec {
def createForwardingChain(): ActorRef = {
val replier = actorOf(new Actor {
- def receive = { case x ⇒ self reply x }
+ def receive = { case x ⇒ reply(x) }
})
def mkforwarder(forwardTo: ActorRef) = actorOf(
diff --git a/akka-actor-tests/src/test/scala/akka/actor/IOActor.scala b/akka-actor-tests/src/test/scala/akka/actor/IOActor.scala
index f224290aa2..31766fb3d7 100644
--- a/akka-actor-tests/src/test/scala/akka/actor/IOActor.scala
+++ b/akka-actor-tests/src/test/scala/akka/actor/IOActor.scala
@@ -48,7 +48,7 @@ object IOActorSpec {
def receiveIO = {
case length: Int ⇒
val bytes = socket.read(length)
- self reply bytes
+ reply(bytes)
}
}
}
@@ -107,9 +107,9 @@ object IOActorSpec {
case msg: NewClient ⇒ createWorker forward msg
case ('set, key: String, value: ByteString) ⇒
kvs += (key -> value)
- self tryReply (())
- case ('get, key: String) ⇒ self tryReply kvs.get(key)
- case 'getall ⇒ self tryReply kvs
+ tryReply(())
+ case ('get, key: String) ⇒ tryReply(kvs.get(key))
+ case 'getall ⇒ tryReply(kvs)
}
}
@@ -125,15 +125,15 @@ object IOActorSpec {
def receiveIO = {
case ('set, key: String, value: ByteString) ⇒
socket write (ByteString("SET " + key + " " + value.length + "\r\n") ++ value)
- self tryReply readResult
+ tryReply(readResult)
case ('get, key: String) ⇒
socket write ByteString("GET " + key + "\r\n")
- self tryReply readResult
+ tryReply(readResult)
case 'getall ⇒
socket write ByteString("GETALL\r\n")
- self tryReply readResult
+ tryReply(readResult)
}
def readResult = {
diff --git a/akka-actor-tests/src/test/scala/akka/actor/LoggingReceiveSpec.scala b/akka-actor-tests/src/test/scala/akka/actor/LoggingReceiveSpec.scala
index 292b70094a..6d0e3cd5de 100644
--- a/akka-actor-tests/src/test/scala/akka/actor/LoggingReceiveSpec.scala
+++ b/akka-actor-tests/src/test/scala/akka/actor/LoggingReceiveSpec.scala
@@ -75,7 +75,7 @@ class LoggingReceiveSpec
f.setBoolean(Actor, true)
val actor = TestActorRef(new Actor {
def receive = loggable(this) {
- case _ ⇒ self reply "x"
+ case _ ⇒ reply("x")
}
})
actor ! "buh"
@@ -102,7 +102,7 @@ class LoggingReceiveSpec
f.setBoolean(Actor, true)
val actor = TestActorRef(new Actor {
def receive = loggable(this)(loggable(this) {
- case _ ⇒ self reply "x"
+ case _ ⇒ reply("x")
})
})
actor ! "buh"
diff --git a/akka-actor-tests/src/test/scala/akka/actor/ReceiveTimeoutSpec.scala b/akka-actor-tests/src/test/scala/akka/actor/ReceiveTimeoutSpec.scala
index cebf0c1de8..741c4aec6c 100644
--- a/akka-actor-tests/src/test/scala/akka/actor/ReceiveTimeoutSpec.scala
+++ b/akka-actor-tests/src/test/scala/akka/actor/ReceiveTimeoutSpec.scala
@@ -22,7 +22,7 @@ class ReceiveTimeoutSpec extends WordSpec with MustMatchers {
val timeoutLatch = TestLatch()
val timeoutActor = actorOf(new Actor {
- self.receiveTimeout = Some(500L)
+ receiveTimeout = Some(500L)
protected def receive = {
case ReceiveTimeout ⇒ timeoutLatch.open
@@ -37,7 +37,7 @@ class ReceiveTimeoutSpec extends WordSpec with MustMatchers {
val timeoutLatch = TestLatch()
val timeoutActor = actorOf(new Actor {
- self.receiveTimeout = Some(500L)
+ receiveTimeout = Some(500L)
protected def receive = {
case ReceiveTimeout ⇒ timeoutLatch.open
@@ -61,7 +61,7 @@ class ReceiveTimeoutSpec extends WordSpec with MustMatchers {
case object Tick
val timeoutActor = actorOf(new Actor {
- self.receiveTimeout = Some(500L)
+ receiveTimeout = Some(500L)
protected def receive = {
case Tick ⇒ ()
@@ -81,14 +81,14 @@ class ReceiveTimeoutSpec extends WordSpec with MustMatchers {
case object Tick
val timeoutActor = actorOf(new Actor {
- self.receiveTimeout = Some(500L)
+ receiveTimeout = Some(500L)
protected def receive = {
case Tick ⇒ ()
case ReceiveTimeout ⇒
count.incrementAndGet
timeoutLatch.open
- self.receiveTimeout = None
+ receiveTimeout = None
}
})
diff --git a/akka-actor-tests/src/test/scala/akka/actor/SupervisorSpec.scala b/akka-actor-tests/src/test/scala/akka/actor/SupervisorSpec.scala
index 2e61d7cf4a..7b6bbbcf60 100644
--- a/akka-actor-tests/src/test/scala/akka/actor/SupervisorSpec.scala
+++ b/akka-actor-tests/src/test/scala/akka/actor/SupervisorSpec.scala
@@ -45,7 +45,7 @@ object SupervisorSpec {
def receive = {
case Ping ⇒
messageLog.put(PingMessage)
- self.tryReply(PongMessage)
+ tryReply(PongMessage)
case Die ⇒
throw new RuntimeException(ExceptionMessage)
}
@@ -366,7 +366,7 @@ class SupervisorSpec extends WordSpec with MustMatchers with BeforeAndAfterEach
if (inits.get % 2 == 0) throw new IllegalStateException("Don't wanna!")
def receive = {
- case Ping ⇒ self.tryReply(PongMessage)
+ case Ping ⇒ tryReply(PongMessage)
case Die ⇒ throw new RuntimeException("Expected")
}
}))
diff --git a/akka-actor-tests/src/test/scala/akka/actor/Ticket669Spec.scala b/akka-actor-tests/src/test/scala/akka/actor/Ticket669Spec.scala
index 4d9f6cc546..40f29f6939 100644
--- a/akka-actor-tests/src/test/scala/akka/actor/Ticket669Spec.scala
+++ b/akka-actor-tests/src/test/scala/akka/actor/Ticket669Spec.scala
@@ -69,11 +69,11 @@ object Ticket669Spec {
}
override def preRestart(reason: scala.Throwable, msg: Option[Any]) {
- self.tryReply("failure1")
+ tryReply("failure1")
}
override def postStop() {
- self.tryReply("failure2")
+ tryReply("failure2")
}
}
}
diff --git a/akka-actor-tests/src/test/scala/akka/actor/dispatch/ActorModelSpec.scala b/akka-actor-tests/src/test/scala/akka/actor/dispatch/ActorModelSpec.scala
index 4edc176649..ffe6c7b831 100644
--- a/akka-actor-tests/src/test/scala/akka/actor/dispatch/ActorModelSpec.scala
+++ b/akka-actor-tests/src/test/scala/akka/actor/dispatch/ActorModelSpec.scala
@@ -52,18 +52,18 @@ object ActorModelSpec {
class DispatcherActor extends Actor {
private val busy = new Switch(false)
- def dispatcher = self.dispatcher.asInstanceOf[MessageDispatcherInterceptor]
+ def interceptor = dispatcher.asInstanceOf[MessageDispatcherInterceptor]
def ack {
if (!busy.switchOn()) {
throw new Exception("isolation violated")
} else {
- dispatcher.getStats(self).msgsProcessed.incrementAndGet()
+ interceptor.getStats(self).msgsProcessed.incrementAndGet()
}
}
override def postRestart(reason: Throwable) {
- dispatcher.getStats(self).restarts.incrementAndGet()
+ interceptor.getStats(self).restarts.incrementAndGet()
}
def receive = {
@@ -71,8 +71,8 @@ object ActorModelSpec {
case Meet(sign, wait) ⇒ ack; sign.countDown(); wait.await(); busy.switchOff()
case Wait(time) ⇒ ack; Thread.sleep(time); busy.switchOff()
case WaitAck(time, l) ⇒ ack; Thread.sleep(time); l.countDown(); busy.switchOff()
- case Reply(msg) ⇒ ack; self.reply(msg); busy.switchOff()
- case TryReply(msg) ⇒ ack; self.tryReply(msg); busy.switchOff()
+ case Reply(msg) ⇒ ack; reply(msg); busy.switchOff()
+ case TryReply(msg) ⇒ ack; tryReply(msg); busy.switchOff()
case Forward(to, msg) ⇒ ack; to.forward(msg); busy.switchOff()
case CountDown(latch) ⇒ ack; latch.countDown(); busy.switchOff()
case Increment(count) ⇒ ack; count.incrementAndGet(); busy.switchOff()
@@ -184,7 +184,7 @@ object ActorModelSpec {
msgsReceived: Long = statsFor(actorRef).msgsReceived.get(),
msgsProcessed: Long = statsFor(actorRef).msgsProcessed.get(),
restarts: Long = statsFor(actorRef).restarts.get()) {
- val stats = statsFor(actorRef, Option(dispatcher).getOrElse(actorRef.asInstanceOf[SelfActorRef].dispatcher))
+ val stats = statsFor(actorRef, Option(dispatcher).getOrElse(actorRef.asInstanceOf[LocalActorRef].underlying.dispatcher))
assert(stats.suspensions.get() === suspensions, "Suspensions")
assert(stats.resumes.get() === resumes, "Resumes")
assert(stats.registers.get() === registers, "Registers")
diff --git a/akka-actor-tests/src/test/scala/akka/actor/dispatch/DispatcherActorSpec.scala b/akka-actor-tests/src/test/scala/akka/actor/dispatch/DispatcherActorSpec.scala
index f0b538b022..adeba45c81 100644
--- a/akka-actor-tests/src/test/scala/akka/actor/dispatch/DispatcherActorSpec.scala
+++ b/akka-actor-tests/src/test/scala/akka/actor/dispatch/DispatcherActorSpec.scala
@@ -12,7 +12,7 @@ import akka.actor.{ Props, Actor }
object DispatcherActorSpec {
class TestActor extends Actor {
def receive = {
- case "Hello" ⇒ self.reply("World")
+ case "Hello" ⇒ reply("World")
case "Failure" ⇒ throw new RuntimeException("Expected exception; to test fault-tolerance")
}
}
diff --git a/akka-actor-tests/src/test/scala/akka/actor/dispatch/PinnedActorSpec.scala b/akka-actor-tests/src/test/scala/akka/actor/dispatch/PinnedActorSpec.scala
index 90948aba07..4b31446ba6 100644
--- a/akka-actor-tests/src/test/scala/akka/actor/dispatch/PinnedActorSpec.scala
+++ b/akka-actor-tests/src/test/scala/akka/actor/dispatch/PinnedActorSpec.scala
@@ -15,7 +15,7 @@ import akka.actor.{ Props, Actor }
object PinnedActorSpec {
class TestActor extends Actor {
def receive = {
- case "Hello" ⇒ self.reply("World")
+ case "Hello" ⇒ reply("World")
case "Failure" ⇒ throw new RuntimeException("Expected exception; to test fault-tolerance")
}
}
diff --git a/akka-actor-tests/src/test/scala/akka/dispatch/FutureSpec.scala b/akka-actor-tests/src/test/scala/akka/dispatch/FutureSpec.scala
index 225292e030..bebf70f608 100644
--- a/akka-actor-tests/src/test/scala/akka/dispatch/FutureSpec.scala
+++ b/akka-actor-tests/src/test/scala/akka/dispatch/FutureSpec.scala
@@ -21,7 +21,7 @@ object FutureSpec {
class TestActor extends Actor {
def receive = {
case "Hello" ⇒
- self.reply("World")
+ reply("World")
case "NoReply" ⇒ {}
case "Failure" ⇒
throw new RuntimeException("Expected exception; to test fault-tolerance")
@@ -32,7 +32,7 @@ object FutureSpec {
def receive = {
case "Hello" ⇒
await.await
- self.reply("World")
+ reply("World")
case "NoReply" ⇒ { await.await }
case "Failure" ⇒
await.await
@@ -143,7 +143,7 @@ class FutureSpec extends WordSpec with MustMatchers with Checkers with BeforeAnd
"will return a result" must {
behave like futureWithResult { test ⇒
val actor1 = actorOf[TestActor]
- val actor2 = actorOf(new Actor { def receive = { case s: String ⇒ self reply s.toUpperCase } })
+ val actor2 = actorOf(new Actor { def receive = { case s: String ⇒ reply(s.toUpperCase) } })
val future = actor1 ? "Hello" flatMap { case s: String ⇒ actor2 ? s }
future.await
test(future, "WORLD")
@@ -155,7 +155,7 @@ class FutureSpec extends WordSpec with MustMatchers with Checkers with BeforeAnd
behave like futureWithException[ArithmeticException] { test ⇒
filterException[ArithmeticException] {
val actor1 = actorOf[TestActor]
- val actor2 = actorOf(new Actor { def receive = { case s: String ⇒ self reply (s.length / 0) } })
+ val actor2 = actorOf(new Actor { def receive = { case s: String ⇒ reply(s.length / 0) } })
val future = actor1 ? "Hello" flatMap { case s: String ⇒ actor2 ? s }
future.await
test(future, "/ by zero")
@@ -168,7 +168,7 @@ class FutureSpec extends WordSpec with MustMatchers with Checkers with BeforeAnd
behave like futureWithException[MatchError] { test ⇒
filterException[MatchError] {
val actor1 = actorOf[TestActor]
- val actor2 = actorOf(new Actor { def receive = { case s: String ⇒ self reply s.toUpperCase } })
+ val actor2 = actorOf(new Actor { def receive = { case s: String ⇒ reply(s.toUpperCase) } })
val future = actor1 ? "Hello" flatMap { case i: Int ⇒ actor2 ? i }
future.await
test(future, "World (of class java.lang.String)")
@@ -185,8 +185,8 @@ class FutureSpec extends WordSpec with MustMatchers with Checkers with BeforeAnd
filterException[ClassCastException] {
val actor = actorOf(new Actor {
def receive = {
- case s: String ⇒ self reply s.length
- case i: Int ⇒ self reply (i * 2).toString
+ case s: String ⇒ reply(s.length)
+ case i: Int ⇒ reply((i * 2).toString)
}
})
@@ -217,8 +217,8 @@ class FutureSpec extends WordSpec with MustMatchers with Checkers with BeforeAnd
case class Res[T](res: T)
val actor = actorOf(new Actor {
def receive = {
- case Req(s: String) ⇒ self reply Res(s.length)
- case Req(i: Int) ⇒ self reply Res((i * 2).toString)
+ case Req(s: String) ⇒ reply(Res(s.length))
+ case Req(i: Int) ⇒ reply(Res((i * 2).toString))
}
})
@@ -304,7 +304,7 @@ class FutureSpec extends WordSpec with MustMatchers with Checkers with BeforeAnd
"fold" in {
val actors = (1 to 10).toList map { _ ⇒
actorOf(new Actor {
- def receive = { case (add: Int, wait: Int) ⇒ Thread.sleep(wait); self tryReply add }
+ def receive = { case (add: Int, wait: Int) ⇒ Thread.sleep(wait); tryReply(add) }
})
}
val timeout = 10000
@@ -315,7 +315,7 @@ class FutureSpec extends WordSpec with MustMatchers with Checkers with BeforeAnd
"fold by composing" in {
val actors = (1 to 10).toList map { _ ⇒
actorOf(new Actor {
- def receive = { case (add: Int, wait: Int) ⇒ Thread.sleep(wait); self tryReply add }
+ def receive = { case (add: Int, wait: Int) ⇒ Thread.sleep(wait); tryReply(add) }
})
}
def futures = actors.zipWithIndex map { case (actor: ActorRef, idx: Int) ⇒ actor.?((idx, idx * 200), 10000).mapTo[Int] }
@@ -330,7 +330,7 @@ class FutureSpec extends WordSpec with MustMatchers with Checkers with BeforeAnd
case (add: Int, wait: Int) ⇒
Thread.sleep(wait)
if (add == 6) throw new IllegalArgumentException("shouldFoldResultsWithException: expected")
- self tryReply add
+ tryReply(add)
}
})
}
@@ -362,7 +362,7 @@ class FutureSpec extends WordSpec with MustMatchers with Checkers with BeforeAnd
"shouldReduceResults" in {
val actors = (1 to 10).toList map { _ ⇒
actorOf(new Actor {
- def receive = { case (add: Int, wait: Int) ⇒ Thread.sleep(wait); self tryReply add }
+ def receive = { case (add: Int, wait: Int) ⇒ Thread.sleep(wait); tryReply(add) }
})
}
val timeout = 10000
@@ -378,7 +378,7 @@ class FutureSpec extends WordSpec with MustMatchers with Checkers with BeforeAnd
case (add: Int, wait: Int) ⇒
Thread.sleep(wait)
if (add == 6) throw new IllegalArgumentException("shouldFoldResultsWithException: expected")
- self tryReply add
+ tryReply(add)
}
})
}
@@ -407,7 +407,7 @@ class FutureSpec extends WordSpec with MustMatchers with Checkers with BeforeAnd
var counter = 1
def receive = {
case 'GetNext ⇒
- self reply counter
+ reply(counter)
counter += 2
}
})
diff --git a/akka-actor-tests/src/test/scala/akka/dispatch/PriorityDispatcherSpec.scala b/akka-actor-tests/src/test/scala/akka/dispatch/PriorityDispatcherSpec.scala
index 57b60d650a..637d772900 100644
--- a/akka-actor-tests/src/test/scala/akka/dispatch/PriorityDispatcherSpec.scala
+++ b/akka-actor-tests/src/test/scala/akka/dispatch/PriorityDispatcherSpec.scala
@@ -31,7 +31,7 @@ class PriorityDispatcherSpec extends WordSpec with MustMatchers {
def receive = {
case i: Int ⇒ acc = i :: acc
- case 'Result ⇒ self tryReply acc
+ case 'Result ⇒ tryReply(acc)
}
}).withDispatcher(dispatcher)).asInstanceOf[LocalActorRef]
diff --git a/akka-actor-tests/src/test/scala/akka/performance/trading/common/MatchingEngine.scala b/akka-actor-tests/src/test/scala/akka/performance/trading/common/MatchingEngine.scala
index 03c6fa79b1..6c310264fb 100644
--- a/akka-actor-tests/src/test/scala/akka/performance/trading/common/MatchingEngine.scala
+++ b/akka-actor-tests/src/test/scala/akka/performance/trading/common/MatchingEngine.scala
@@ -48,7 +48,7 @@ class AkkaMatchingEngine(val meId: String, val orderbooks: List[Orderbook])
}
def done(status: Boolean) {
- self.channel ! new Rsp(status)
+ channel ! new Rsp(status)
}
def waitForStandby(pendingStandbyFuture: Future[_]) {
diff --git a/akka-actor-tests/src/test/scala/akka/performance/trading/common/OrderReceiver.scala b/akka-actor-tests/src/test/scala/akka/performance/trading/common/OrderReceiver.scala
index 9a6ba3ed9f..2c50bffdb0 100644
--- a/akka-actor-tests/src/test/scala/akka/performance/trading/common/OrderReceiver.scala
+++ b/akka-actor-tests/src/test/scala/akka/performance/trading/common/OrderReceiver.scala
@@ -42,7 +42,7 @@ class AkkaOrderReceiver extends Actor with OrderReceiver {
m.forward(order)
case None ⇒
EventHandler.warning(this, "Unknown orderbook: " + order.orderbookSymbol)
- self.channel ! new Rsp(false)
+ channel ! new Rsp(false)
}
}
}
diff --git a/akka-actor-tests/src/test/scala/akka/routing/ActorPoolSpec.scala b/akka-actor-tests/src/test/scala/akka/routing/ActorPoolSpec.scala
index 05e03ab25e..b1951d8f6d 100644
--- a/akka-actor-tests/src/test/scala/akka/routing/ActorPoolSpec.scala
+++ b/akka-actor-tests/src/test/scala/akka/routing/ActorPoolSpec.scala
@@ -43,7 +43,7 @@ class ActorPoolSpec extends WordSpec with MustMatchers {
case _ ⇒
count.incrementAndGet
latch.countDown()
- self tryReply "success"
+ tryReply("success")
}
})
@@ -92,7 +92,7 @@ class ActorPoolSpec extends WordSpec with MustMatchers {
def receive = {
case req: String ⇒ {
sleepFor(10 millis)
- self.tryReply("Response")
+ tryReply("Response")
}
}
})
diff --git a/akka-actor-tests/src/test/scala/akka/ticket/Ticket1111Spec.scala b/akka-actor-tests/src/test/scala/akka/ticket/Ticket1111Spec.scala
index ce22616396..6f6d5b0dac 100644
--- a/akka-actor-tests/src/test/scala/akka/ticket/Ticket1111Spec.scala
+++ b/akka-actor-tests/src/test/scala/akka/ticket/Ticket1111Spec.scala
@@ -179,7 +179,7 @@ class Ticket1111Spec extends WordSpec with MustMatchers {
case Stop(None) ⇒ self.stop(); shudownLatch.map(_.countDown())
case Stop(Some(_id)) if (_id == id) ⇒ self.stop(); shudownLatch.map(_.countDown())
case _id: Int if (_id == id) ⇒
- case _ ⇒ Thread sleep 100 * id; self tryReply id
+ case _ ⇒ Thread sleep 100 * id; tryReply(id)
}
})
diff --git a/akka-actor-tests/src/test/scala/akka/ticket/Ticket703Spec.scala b/akka-actor-tests/src/test/scala/akka/ticket/Ticket703Spec.scala
index a24c98a7b6..88ce2d3146 100644
--- a/akka-actor-tests/src/test/scala/akka/ticket/Ticket703Spec.scala
+++ b/akka-actor-tests/src/test/scala/akka/ticket/Ticket703Spec.scala
@@ -25,7 +25,7 @@ class Ticket703Spec extends WordSpec with MustMatchers {
def receive = {
case req: String ⇒
Thread.sleep(6000L)
- self.tryReply("Response")
+ tryReply("Response")
}
})
}).withFaultHandler(OneForOnePermanentStrategy(List(classOf[Exception]), 5, 1000)))
diff --git a/akka-actor/src/main/scala/akka/actor/Actor.scala b/akka-actor/src/main/scala/akka/actor/Actor.scala
index e92b457578..a9eee30c9d 100644
--- a/akka-actor/src/main/scala/akka/actor/Actor.scala
+++ b/akka-actor/src/main/scala/akka/actor/Actor.scala
@@ -25,6 +25,7 @@ import com.eaio.uuid.UUID
import java.lang.reflect.InvocationTargetException
import java.util.concurrent.TimeUnit
+import java.util.{ Collection ⇒ JCollection }
/**
* Marker trait to show which Messages are automatically handled by Akka
@@ -36,7 +37,7 @@ sealed trait AutoReceivedMessage extends Serializable
*/
sealed trait LifeCycleMessage extends Serializable { self: AutoReceivedMessage ⇒ }
-case class HotSwap(code: SelfActorRef ⇒ Actor.Receive, discardOld: Boolean = true) extends AutoReceivedMessage {
+case class HotSwap(code: ActorRef ⇒ Actor.Receive, discardOld: Boolean = true) extends AutoReceivedMessage {
/**
* Java API
@@ -403,43 +404,12 @@ object Actor {
*
* An actor has a well-defined (non-cyclic) life-cycle.
*
- * => NEW (newly created actor) - can't receive messages (yet)
- * => STARTED (when 'start' is invoked) - can receive messages
- * => SHUT DOWN (when 'exit' is invoked) - can't do anything
+ * => RUNNING (created and started actor) - can receive messages
+ * => SHUTDOWN (when 'stop' or 'exit' is invoked) - can't do anything
*
*
*
- * The Actor's API is available in the 'self' member variable.
- *
- *
- * Here you find functions like:
- * - !, ? and forward
- * - link, unlink etc
- * - start, stop
- * - etc.
- *
- *
- * Here you also find fields like
- * - dispatcher = ...
- * - id = ...
- * - lifeCycle = ...
- * - faultHandler = ...
- * - trapExit = ...
- * - etc.
- *
- *
- * This means that to use them you have to prefix them with 'self', like this: self ! Message
- *
- * However, for convenience you can import these functions and fields like below, which will allow you do
- * drop the 'self' prefix:
- *
- * class MyActor extends Actor {
- * import self._
- * id = ...
- * dispatcher = ...
- * ...
- * }
- *
+ * The Actor's own ActorRef is available in the 'self' member variable.
*
* @author Jonas Bonér
*/
@@ -456,7 +426,7 @@ trait Actor {
* Stores the context for this actor, including self, sender, and hotswap.
*/
@transient
- private[akka] val actorContext: ActorContext = {
+ private[akka] val context: ActorContext = {
val contextStack = ActorInstance.contextStack.get
def noContextError = {
@@ -480,7 +450,7 @@ trait Actor {
* Mainly for internal use, functions as the implicit sender references when invoking
* the 'forward' function.
*/
- def someSelf: Some[ScalaActorRef with SelfActorRef] = Some(actorContext.self)
+ def someSelf: Some[ActorRef with ScalaActorRef] = Some(context.self)
/*
* Option[ActorRef] representation of the 'self' ActorRef reference.
@@ -488,7 +458,7 @@ trait Actor {
* Mainly for internal use, functions as the implicit sender references when invoking
* one of the message send functions ('!' and '?').
*/
- def optionSelf: Option[ScalaActorRef with SelfActorRef] = someSelf
+ def optionSelf: Option[ActorRef with ScalaActorRef] = someSelf
/**
* The 'self' field holds the ActorRef for this actor.
@@ -497,27 +467,79 @@ trait Actor {
*
* self ! message
*
- * Here you also find most of the Actor API.
- *
- * For example fields like:
- *
- * self.dispatcher = ...
- * self.faultHandler = ...
- * self.lifeCycle = ...
- * self.sender
- *
- *
- * Here you also find methods like:
- *
- * self.reply(..)
- * self.link(..)
- * self.unlink(..)
- * self.stop(..)
- *
*/
- @transient
implicit def self = someSelf.get
+ /**
+ * The reference sender Actor of the last received message.
+ * Is defined if the message was sent from another Actor, else None.
+ */
+ def sender: Option[ActorRef] = context.sender
+
+ /**
+ * The reference sender future of the last received message.
+ * Is defined if the message was sent with sent with '?'/'ask', else None.
+ */
+ def senderFuture(): Option[Promise[Any]] = context.senderFuture
+
+ /**
+ * Abstraction for unification of sender and senderFuture for later reply
+ */
+ def channel: UntypedChannel = context.channel
+
+ // just for current compatibility
+ implicit def forwardable: ForwardableChannel = ForwardableChannel(channel)
+
+ /**
+ * Gets the current receive timeout
+ * When specified, the receive method should be able to handle a 'ReceiveTimeout' message.
+ */
+ def receiveTimeout: Option[Long] = context.receiveTimeout
+
+ /**
+ * User overridable callback/setting.
+ *
+ * Defines the default timeout for an initial receive invocation.
+ * When specified, the receive function should be able to handle a 'ReceiveTimeout' message.
+ */
+ def receiveTimeout_=(timeout: Option[Long]) = context.receiveTimeout = timeout
+
+ /**
+ * Akka Scala & Java API
+ * Use reply(..) to reply with a message to the original sender of the message currently
+ * being processed. This method fails if the original sender of the message could not be determined with an
+ * IllegalStateException.
+ *
+ * If you don't want deal with this IllegalStateException, but just a boolean, just use the tryReply(...)
+ * version.
+ *
+ *
+ * Throws an IllegalStateException if unable to determine what to reply to.
+ */
+ def reply(message: Any) = channel.!(message)(self)
+
+ /**
+ * Akka Scala & Java API
+ * Use tryReply(..) to try reply with a message to the original sender of the message currently
+ * being processed. This method
+ *
+ * Returns true if reply was sent, and false if unable to determine what to reply to.
+ *
+ * If you would rather have an exception, check the reply(..) version.
+ */
+ def tryReply(message: Any): Boolean = channel.tryTell(message)(self)
+
+ /**
+ * Returns an unmodifiable Java Collection containing the linked actors,
+ * please note that the backing map is thread-safe but not immutable
+ */
+ def linkedActors: JCollection[ActorRef] = context.linkedActors
+
+ /**
+ * Returns the dispatcher (MessageDispatcher) that is used for this Actor
+ */
+ def dispatcher: MessageDispatcher = context.dispatcher
+
/**
* User overridable callback/setting.
*
@@ -529,7 +551,7 @@ trait Actor {
* def receive = {
* case Ping =>
* println("got a 'Ping' message")
- * self.reply("pong")
+ * reply("pong")
*
* case OneWay =>
* println("got a 'OneWay' message")
@@ -601,15 +623,15 @@ trait Actor {
*/
def become(behavior: Receive, discardOld: Boolean = true) {
if (discardOld) unbecome()
- self.hotswap = self.hotswap.push(behavior)
+ context.hotswap = context.hotswap.push(behavior)
}
/**
* Reverts the Actor behavior to the previous one in the hotswap stack.
*/
def unbecome() {
- val h = self.hotswap
- if (h.nonEmpty) self.hotswap = h.pop
+ val h = context.hotswap
+ if (h.nonEmpty) context.hotswap = h.pop
}
// =========================================
@@ -618,7 +640,7 @@ trait Actor {
private[akka] final def apply(msg: Any) = {
if (msg.isInstanceOf[AnyRef] && (msg.asInstanceOf[AnyRef] eq null))
- throw new InvalidMessageException("Message from [" + self.channel + "] to [" + self.toString + "] is null")
+ throw new InvalidMessageException("Message from [" + channel + "] to [" + self.toString + "] is null")
def autoReceiveMessage(msg: AutoReceivedMessage): Boolean = {
if (debugAutoReceive) EventHandler.debug(this, "received AutoReceiveMessage " + msg)
@@ -635,17 +657,17 @@ trait Actor {
*/
msg match {
- case Init ⇒ self.reply(()); false //All gud nao FIXME remove reply when we can have fully async init
+ case Init ⇒ reply(()); false //All gud nao FIXME remove reply when we can have fully async init
case HotSwap(code, discardOld) ⇒ become(code(self), discardOld); false
case RevertHotSwap ⇒ unbecome(); false
- case d: Death ⇒ self.handleDeath(d); false
+ case d: Death ⇒ context.handleDeath(d); false
case Link(child) ⇒ self.link(child); false
case Unlink(child) ⇒ self.unlink(child); false
case UnlinkAndStop(child) ⇒ self.unlink(child); child.stop(); false
case Restart(reason) ⇒ throw reason
case Kill ⇒ throw new ActorKilledException("Kill")
case PoisonPill ⇒
- val ch = self.channel
+ val ch = channel
self.stop()
ch.sendException(new ActorKilledException("PoisonPill"))
false
@@ -655,7 +677,7 @@ trait Actor {
if (msg.isInstanceOf[AutoReceivedMessage])
autoReceiveMessage(msg.asInstanceOf[AutoReceivedMessage])
else {
- val behaviorStack = self.hotswap
+ val behaviorStack = context.hotswap
msg match {
case msg if behaviorStack.nonEmpty && behaviorStack.head.isDefinedAt(msg) ⇒ behaviorStack.head.apply(msg)
case msg if behaviorStack.isEmpty && processingBehavior.isDefinedAt(msg) ⇒ processingBehavior.apply(msg)
diff --git a/akka-actor/src/main/scala/akka/actor/ActorContext.scala b/akka-actor/src/main/scala/akka/actor/ActorContext.scala
deleted file mode 100644
index f24f644484..0000000000
--- a/akka-actor/src/main/scala/akka/actor/ActorContext.scala
+++ /dev/null
@@ -1,13 +0,0 @@
-/**
- * Copyright (C) 2009-2011 Typesafe Inc.
- */
-
-package akka.actor
-
-/**
- * Everything that gets injected into the actor.
- * Just a wrapper on self for now.
- */
-private[akka] class ActorContext(val self: LocalActorRef) {
-
-}
\ No newline at end of file
diff --git a/akka-actor/src/main/scala/akka/actor/ActorInstance.scala b/akka-actor/src/main/scala/akka/actor/ActorInstance.scala
index 9e2c43baac..8a9b77a3ae 100644
--- a/akka-actor/src/main/scala/akka/actor/ActorInstance.scala
+++ b/akka-actor/src/main/scala/akka/actor/ActorInstance.scala
@@ -14,6 +14,40 @@ import java.util.concurrent.atomic.AtomicReference
import scala.annotation.tailrec
import scala.collection.immutable.Stack
+/**
+ * The actor context - the view into the actor instance from the actor.
+ * Exposes contextual information for the actor and the current message.
+ * TODO: everything here for current compatibility - could be limited more
+ */
+private[akka] trait ActorContext {
+
+ def self: ActorRef with ScalaActorRef
+
+ def receiveTimeout: Option[Long]
+
+ def receiveTimeout_=(timeout: Option[Long]): Unit
+
+ def hotswap: Stack[PartialFunction[Any, Unit]]
+
+ def hotswap_=(stack: Stack[PartialFunction[Any, Unit]]): Unit
+
+ def currentMessage: MessageInvocation
+
+ def currentMessage_=(invocation: MessageInvocation): Unit
+
+ def sender: Option[ActorRef]
+
+ def senderFuture(): Option[Promise[Any]]
+
+ def channel: UntypedChannel
+
+ def linkedActors: JCollection[ActorRef]
+
+ def dispatcher: MessageDispatcher
+
+ def handleDeath(death: Death)
+}
+
private[akka] object ActorInstance {
sealed trait Status
object Status {
@@ -26,7 +60,13 @@ private[akka] object ActorInstance {
}
}
-private[akka] class ActorInstance(props: Props, self: LocalActorRef) {
+private[akka] class ActorInstance(
+ val self: ActorRef with ScalaActorRef,
+ props: Props,
+ _receiveTimeout: Option[Long],
+ _hotswap: Stack[PartialFunction[Any, Unit]])
+ extends ActorContext {
+
import ActorInstance._
val guard = new ReentrantGuard // TODO: remove this last synchronization point
@@ -52,9 +92,18 @@ private[akka] class ActorInstance(props: Props, self: LocalActorRef) {
@volatile
lazy val _linkedActors = new ConcurrentHashMap[Uuid, ActorRef]
+ @volatile
+ var hotswap: Stack[PartialFunction[Any, Unit]] = _hotswap // TODO: currently settable from outside for compatibility
+
+ @volatile
+ var receiveTimeout: Option[Long] = _receiveTimeout // TODO: currently settable from outside for compatibility
+
+ @volatile
+ var currentMessage: MessageInvocation = null
+
val actor: AtomicReference[Actor] = new AtomicReference[Actor]()
- def ref: ActorRef = self
+ def ref: ActorRef with ScalaActorRef = self
def uuid: Uuid = self.uuid
@@ -74,7 +123,7 @@ private[akka] class ActorInstance(props: Props, self: LocalActorRef) {
def newActor(restart: Boolean): Actor = {
val stackBefore = contextStack.get
- contextStack.set(stackBefore.push(new ActorContext(self)))
+ contextStack.set(stackBefore.push(this))
try {
if (restart) {
val a = actor.get()
@@ -106,7 +155,7 @@ private[akka] class ActorInstance(props: Props, self: LocalActorRef) {
private[akka] def stop(): Unit = guard.withGuard {
if (isRunning) {
- self.receiveTimeout = None
+ receiveTimeout = None
cancelReceiveTimeout
Actor.registry.unregister(self)
status = Status.Shutdown
@@ -126,7 +175,7 @@ private[akka] class ActorInstance(props: Props, self: LocalActorRef) {
} finally {
//if (supervisor.isDefined) supervisor.get ! Death(self, new ActorKilledException("Stopped"), false)
- self.currentMessage = null
+ currentMessage = null
clearActorContext()
}
}
@@ -164,24 +213,6 @@ private[akka] class ActorInstance(props: Props, self: LocalActorRef) {
def supervisor_=(sup: Option[ActorRef]): Unit = _supervisor = sup
- def sender: Option[ActorRef] = {
- val msg = self.currentMessage
- if (msg eq null) None
- else msg.channel match {
- case ref: ActorRef ⇒ Some(ref)
- case _ ⇒ None
- }
- }
-
- def senderFuture(): Option[Promise[Any]] = {
- val msg = self.currentMessage
- if (msg eq null) None
- else msg.channel match {
- case f: ActorPromise ⇒ Some(f)
- case _ ⇒ None
- }
- }
-
def postMessageToMailbox(message: Any, channel: UntypedChannel): Unit =
if (isRunning) dispatcher dispatchMessage new MessageInvocation(this, message, channel)
else throw new ActorInitializationException("Actor " + self + " is dead")
@@ -198,11 +229,34 @@ private[akka] class ActorInstance(props: Props, self: LocalActorRef) {
future
} else throw new ActorInitializationException("Actor " + self + " is dead")
+ def sender: Option[ActorRef] = {
+ val msg = currentMessage
+ if (msg eq null) None
+ else msg.channel match {
+ case ref: ActorRef ⇒ Some(ref)
+ case _ ⇒ None
+ }
+ }
+
+ def senderFuture(): Option[Promise[Any]] = {
+ val msg = currentMessage
+ if (msg eq null) None
+ else msg.channel match {
+ case f: ActorPromise ⇒ Some(f)
+ case _ ⇒ None
+ }
+ }
+
+ def channel: UntypedChannel = currentMessage match {
+ case null ⇒ NullChannel
+ case msg ⇒ msg.channel
+ }
+
def invoke(messageHandle: MessageInvocation): Unit = {
guard.lock.lock()
try {
if (!isShutdown) {
- self.currentMessage = messageHandle
+ currentMessage = messageHandle
try {
try {
cancelReceiveTimeout() // FIXME: leave this here?
@@ -218,7 +272,7 @@ private[akka] class ActorInstance(props: Props, self: LocalActorRef) {
}
a.apply(messageHandle.message)
- self.currentMessage = null // reset current message after successful invocation
+ currentMessage = null // reset current message after successful invocation
} catch {
case e ⇒
EventHandler.error(e, self, e.getMessage)
@@ -226,7 +280,7 @@ private[akka] class ActorInstance(props: Props, self: LocalActorRef) {
// prevent any further messages to be processed until the actor has been restarted
dispatcher.suspend(this)
- self.channel.sendException(e)
+ channel.sendException(e)
if (supervisor.isDefined) supervisor.get ! Death(self, e, true) else dispatcher.resume(this)
@@ -271,7 +325,7 @@ private[akka] class ActorInstance(props: Props, self: LocalActorRef) {
def performRestart() {
val failedActor = actor.get
if (Actor.debugLifecycle) EventHandler.debug(failedActor, "restarting")
- val message = if (self.currentMessage ne null) Some(self.currentMessage.message) else None
+ val message = if (currentMessage ne null) Some(currentMessage.message) else None
if (failedActor ne null) failedActor.preRestart(reason, message)
val freshActor = newActor(restart = true)
clearActorContext()
@@ -293,7 +347,7 @@ private[akka] class ActorInstance(props: Props, self: LocalActorRef) {
EventHandler.error(e, self, "Exception in restart of Actor [%s]".format(toString))
false // an error or exception here should trigger a retry
} finally {
- self.currentMessage = null
+ currentMessage = null
}
if (success) {
@@ -374,7 +428,7 @@ private[akka] class ActorInstance(props: Props, self: LocalActorRef) {
def checkReceiveTimeout() {
cancelReceiveTimeout()
- val recvtimeout = self.receiveTimeout
+ val recvtimeout = receiveTimeout
if (recvtimeout.isDefined && dispatcher.mailboxIsEmpty(this)) {
//Only reschedule if desired and there are currently no more messages to be processed
futureTimeout = Some(Scheduler.scheduleOnce(self, ReceiveTimeout, recvtimeout.get, TimeUnit.MILLISECONDS))
@@ -394,7 +448,7 @@ private[akka] class ActorInstance(props: Props, self: LocalActorRef) {
@tailrec
def lookupAndSetSelfFields(clazz: Class[_], actor: Actor, newContext: ActorContext): Boolean = {
val success = try {
- val contextField = clazz.getDeclaredField("actorContext")
+ val contextField = clazz.getDeclaredField("context")
contextField.setAccessible(true)
contextField.set(actor, newContext)
true
@@ -413,4 +467,13 @@ private[akka] class ActorInstance(props: Props, self: LocalActorRef) {
lookupAndSetSelfFields(actor.get.getClass, actor.get, newContext)
}
+
+ override def hashCode: Int = HashCode.hash(HashCode.SEED, uuid)
+
+ override def equals(that: Any): Boolean = {
+ that.isInstanceOf[ActorInstance] && that.asInstanceOf[ActorInstance].uuid == uuid
+ }
+
+ override def toString = "ActorInstance[%s]".format(uuid)
}
+
diff --git a/akka-actor/src/main/scala/akka/actor/ActorRef.scala b/akka-actor/src/main/scala/akka/actor/ActorRef.scala
index 467c19790a..4401013b18 100644
--- a/akka-actor/src/main/scala/akka/actor/ActorRef.scala
+++ b/akka-actor/src/main/scala/akka/actor/ActorRef.scala
@@ -11,7 +11,6 @@ import akka.serialization.{ Serializer, Serialization }
import ReflectiveAccess._
import ClusterModule._
import java.net.InetSocketAddress
-import java.util.{ Collection ⇒ JCollection }
import scala.collection.immutable.Stack
import java.lang.{ UnsupportedOperationException, IllegalStateException }
@@ -99,9 +98,9 @@ abstract class ActorRef extends ActorRefShared with UntypedChannel with ReplyCha
* Akka Java API.
* Forwards the message specified to this actor and preserves the original sender of the message
*/
- def forward(message: AnyRef, sender: SelfActorRef) {
+ def forward(message: AnyRef, sender: ActorRef) {
if (sender eq null) throw new IllegalArgumentException("The 'sender' argument to 'forward' can't be null")
- else forward(message)(sender)
+ else forward(message)(ForwardableChannel(sender))
}
/**
@@ -182,141 +181,6 @@ abstract class ActorRef extends ActorRefShared with UntypedChannel with ReplyCha
override def toString = "Actor[%s]".format(address)
}
-abstract class SelfActorRef extends ActorRef with ForwardableChannel { self: LocalActorRef with ScalaActorRef ⇒
- /**
- * Holds the hot swapped partial function.
- * WARNING: DO NOT USE THIS, IT IS INTERNAL AKKA USE ONLY
- */
- @volatile
- protected[akka] var hotswap = Stack[PartialFunction[Any, Unit]]()
-
- /**
- * This is a reference to the message currently being processed by the actor
- */
- @volatile
- protected[akka] var currentMessage: MessageInvocation = null
-
- /**
- * User overridable callback/setting.
- *
- * Defines the default timeout for an initial receive invocation.
- * When specified, the receive function should be able to handle a 'ReceiveTimeout' message.
- */
- @volatile
- var receiveTimeout: Option[Long] = None
-
- /**
- * Akka Java API.
- * The reference sender Actor of the last received message.
- * Is defined if the message was sent from another Actor, else None.
- */
- @deprecated("will be removed in 2.0, use channel instead", "1.2")
- def getSender: Option[ActorRef] = sender
-
- /**
- * Akka Java API.
- * The reference sender future of the last received message.
- * Is defined if the message was sent with sent with '?'/'ask', else None.
- */
- @deprecated("will be removed in 2.0, use channel instead", "1.2")
- def getSenderFuture: Option[Promise[Any]] = senderFuture
-
- /**
- * The reference sender Actor of the last received message.
- * Is defined if the message was sent from another Actor, else None.
- */
- @deprecated("will be removed in 2.0, use channel instead", "1.2")
- def sender: Option[ActorRef]
-
- /**
- * The reference sender future of the last received message.
- * Is defined if the message was sent with sent with '?'/'ask', else None.
- */
- @deprecated("will be removed in 2.0, use channel instead", "1.2")
- def senderFuture(): Option[Promise[Any]]
-
- /**
- * Abstraction for unification of sender and senderFuture for later reply
- */
- def channel: UntypedChannel = self.currentMessage match {
- case null ⇒ NullChannel
- case msg ⇒ msg.channel
- }
-
- /**
- * Akka Java API.
- * Defines the default timeout for an initial receive invocation.
- * When specified, the receive function should be able to handle a 'ReceiveTimeout' message.
- */
- def setReceiveTimeout(timeout: Long): Unit = this.receiveTimeout = Some(timeout)
-
- /**
- * Akka Java API.
- * Gets the current receive timeout
- * When specified, the receive method should be able to handle a 'ReceiveTimeout' message.
- */
- def getReceiveTimeout: Option[Long] = receiveTimeout
-
- /**
- * Java API.
- * Abstraction for unification of sender and senderFuture for later reply
- */
- def getChannel: UntypedChannel = channel
-
- /**
- * Akka Scala & Java API
- * Use self.reply(..) to reply with a message to the original sender of the message currently
- * being processed. This method fails if the original sender of the message could not be determined with an
- * IllegalStateException.
- *
- * If you don't want deal with this IllegalStateException, but just a boolean, just use the tryReply(...)
- * version.
- *
- *
- * Throws an IllegalStateException if unable to determine what to reply to.
- */
- def reply(message: Any) = channel.!(message)(this)
-
- /**
- * Akka Scala & Java API
- * Use tryReply(..) to try reply with a message to the original sender of the message currently
- * being processed. This method
- *
- * Returns true if reply was sent, and false if unable to determine what to reply to.
- *
- * If you would rather have an exception, check the reply(..) version.
- */
- def tryReply(message: Any): Boolean = channel.tryTell(message)(this)
-
- /**
- * Returns an unmodifiable Java Collection containing the linked actors,
- * please note that the backing map is thread-safe but not immutable
- */
- def linkedActors: JCollection[ActorRef]
-
- /**
- * Java API.
- * Returns an unmodifiable Java Collection containing the linked actors,
- * please note that the backing map is thread-safe but not immutable
- */
- def getLinkedActors: JCollection[ActorRef] = linkedActors
-
- /**
- * Scala API
- * Returns the dispatcher (MessageDispatcher) that is used for this Actor
- */
- def dispatcher: MessageDispatcher
-
- /**
- * Java API
- * Returns the dispatcher (MessageDispatcher) that is used for this Actor
- */
- final def getDispatcher(): MessageDispatcher = dispatcher
-
- /** INTERNAL API ONLY **/
- protected[akka] def handleDeath(death: Death): Unit
-}
-
/**
* Local (serializable) ActorRef that is used when referencing the Actor on its "home" node.
*
@@ -325,9 +189,11 @@ abstract class SelfActorRef extends ActorRef with ForwardableChannel { self: Loc
class LocalActorRef private[akka] (
private[this] val props: Props,
val address: String,
- val systemService: Boolean,
- override private[akka] val uuid: Uuid = newUuid)
- extends SelfActorRef with ScalaActorRef {
+ val systemService: Boolean = false,
+ override private[akka] val uuid: Uuid = newUuid,
+ receiveTimeout: Option[Long] = None,
+ hotswap: Stack[PartialFunction[Any, Unit]] = Stack.empty)
+ extends ActorRef with ScalaActorRef {
// used only for deserialization
private[akka] def this(
@@ -337,15 +203,13 @@ class LocalActorRef private[akka] (
__receiveTimeout: Option[Long],
__hotswap: Stack[PartialFunction[Any, Unit]]) = {
- this(__props, __address, false, __uuid) //Doesn't make any sense to move a system service
+ this(__props, __address, false, __uuid, __receiveTimeout, __hotswap)
- hotswap = __hotswap
- receiveTimeout = __receiveTimeout
- actorInstance.setActorContext(new ActorContext(this)) // this is needed for deserialization - why?
+ actorInstance.setActorContext(actorInstance) // this is needed for deserialization - why?
}
- private[this] val actorInstance = new ActorInstance(props, this)
- actorInstance.start() //Nonsense
+ private[this] val actorInstance = new ActorInstance(this, props, receiveTimeout, hotswap)
+ actorInstance.start()
/**
* Is the actor running?
@@ -357,11 +221,6 @@ class LocalActorRef private[akka] (
*/
def isShutdown: Boolean = actorInstance.isShutdown
- /**
- * Returns the dispatcher (MessageDispatcher) that is used for this Actor
- */
- def dispatcher: MessageDispatcher = props.dispatcher
-
/**
* Suspends the actor. It will not process messages while suspended.
*/
@@ -398,30 +257,11 @@ class LocalActorRef private[akka] (
*/
def unlink(actorRef: ActorRef): ActorRef = actorInstance.unlink(actorRef)
- /**
- * Returns an unmodifiable Java Collection containing the linked actors
- */
- def linkedActors: JCollection[ActorRef] = actorInstance.linkedActors
-
/**
* Returns the supervisor, if there is one.
*/
def supervisor: Option[ActorRef] = actorInstance.supervisor
- /**
- * The reference sender Actor of the last received message.
- * Is defined if the message was sent from another Actor, else None.
- */
- @deprecated("will be removed in 2.0, use channel instead", "1.2")
- def sender: Option[ActorRef] = actorInstance.sender
-
- /**
- * The reference sender future of the last received message.
- * Is defined if the message was sent with sent with '?'/'ask', else None.
- */
- @deprecated("will be removed in 2.0, use channel instead", "1.2")
- def senderFuture(): Option[Promise[Any]] = actorInstance.senderFuture
-
// ========= AKKA PROTECTED FUNCTIONS =========
protected[akka] def actorClass: Class[_] = actorInstance.actorClass
@@ -600,7 +440,7 @@ trait ScalaActorRef extends ActorRefShared with ReplyChannel[Any] { ref: ActorRe
*
* Works with '!' and '?'/'ask'.
*/
- def forward(message: Any)(implicit channel: ForwardableChannel) = postMessageToMailbox(message, channel.channel)
+ def forward(message: Any)(implicit forwardable: ForwardableChannel) = postMessageToMailbox(message, forwardable.channel)
}
/**
diff --git a/akka-actor/src/main/scala/akka/actor/Channel.scala b/akka-actor/src/main/scala/akka/actor/Channel.scala
index 888699cada..ce2beb224b 100644
--- a/akka-actor/src/main/scala/akka/actor/Channel.scala
+++ b/akka-actor/src/main/scala/akka/actor/Channel.scala
@@ -141,21 +141,6 @@ case object NullChannel extends UntypedChannel {
}
/**
- * A channel which may be forwarded: a message received with such a reply
- * channel attached can be passed on transparently such that a reply from a
- * later processing stage is sent directly back to the origin. Keep in mind
- * that not all channels can be used multiple times.
+ * Wraps a forwardable channel. Used implicitly by ScalaActorRef.forward
*/
-trait ForwardableChannel extends UntypedChannel with AvailableChannel[Any] {
- /**
- * Get channel by which this channel would reply (ActorRef.forward takes an
- * implicit ForwardableChannel and uses its .channel as message origin)
- */
- def channel: UntypedChannel
-}
-
-object ForwardableChannel {
- implicit def someS2FC(sender: Some[SelfActorRef]): ForwardableChannel = sender.get
- implicit def someIS2FC(implicit sender: Some[SelfActorRef]): ForwardableChannel = sender.get
-}
-
+case class ForwardableChannel(val channel: UntypedChannel)
diff --git a/akka-actor/src/main/scala/akka/actor/FSM.scala b/akka-actor/src/main/scala/akka/actor/FSM.scala
index 0f1e00453f..a8482369a5 100644
--- a/akka-actor/src/main/scala/akka/actor/FSM.scala
+++ b/akka-actor/src/main/scala/akka/actor/FSM.scala
@@ -483,7 +483,7 @@ trait FSM[S, D] extends ListenerManagement {
timeoutFuture = None
}
generation += 1
- processMsg(value, self.channel)
+ processMsg(value, channel)
}
}
@@ -507,7 +507,7 @@ trait FSM[S, D] extends ListenerManagement {
nextState.stopReason match {
case None ⇒ makeTransition(nextState)
case _ ⇒
- nextState.replies.reverse foreach (self reply _)
+ nextState.replies.reverse foreach reply
terminate(nextState)
self.stop()
}
@@ -517,7 +517,7 @@ trait FSM[S, D] extends ListenerManagement {
if (!stateFunctions.contains(nextState.stateName)) {
terminate(stay withStopReason Failure("Next state %s does not exist".format(nextState.stateName)))
} else {
- nextState.replies.reverse foreach (self reply _)
+ nextState.replies.reverse foreach reply
if (currentState.stateName != nextState.stateName) {
handleTransition(currentState.stateName, nextState.stateName)
notifyListeners(Transition(self, currentState.stateName, nextState.stateName))
diff --git a/akka-actor/src/main/scala/akka/actor/IO.scala b/akka-actor/src/main/scala/akka/actor/IO.scala
index 849aa42839..92a9cb5563 100644
--- a/akka-actor/src/main/scala/akka/actor/IO.scala
+++ b/akka-actor/src/main/scala/akka/actor/IO.scala
@@ -50,15 +50,15 @@ object IO {
override def asReadable = this
def read(len: Int)(implicit actor: Actor with IO): ByteString @cps[IOSuspendable[Any]] = shift { cont: (ByteString ⇒ IOSuspendable[Any]) ⇒
- ByteStringLength(cont, this, actor.self.currentMessage, len)
+ ByteStringLength(cont, this, actor.context.currentMessage, len)
}
def read()(implicit actor: Actor with IO): ByteString @cps[IOSuspendable[Any]] = shift { cont: (ByteString ⇒ IOSuspendable[Any]) ⇒
- ByteStringAny(cont, this, actor.self.currentMessage)
+ ByteStringAny(cont, this, actor.context.currentMessage)
}
def read(delimiter: ByteString, inclusive: Boolean = false)(implicit actor: Actor with IO): ByteString @cps[IOSuspendable[Any]] = shift { cont: (ByteString ⇒ IOSuspendable[Any]) ⇒
- ByteStringDelimited(cont, this, actor.self.currentMessage, delimiter, inclusive, 0)
+ ByteStringDelimited(cont, this, actor.context.currentMessage, delimiter, inclusive, 0)
}
}
@@ -176,7 +176,7 @@ trait IO {
}
run()
case msg if _next ne Idle ⇒
- _messages enqueue self.currentMessage
+ _messages enqueue context.currentMessage
case msg if _receiveIO.isDefinedAt(msg) ⇒
_next = reset { _receiveIO(msg); Idle }
run()
@@ -211,7 +211,7 @@ trait IO {
private def run(): Unit = {
_next match {
case ByteStringLength(continuation, handle, message, waitingFor) ⇒
- self.currentMessage = message
+ context.currentMessage = message
val st = state(handle)
if (st.readBytes.length >= waitingFor) {
val bytes = st.readBytes.take(waitingFor) //.compact
@@ -220,7 +220,7 @@ trait IO {
run()
}
case bsd @ ByteStringDelimited(continuation, handle, message, delimiter, inclusive, scanned) ⇒
- self.currentMessage = message
+ context.currentMessage = message
val st = state(handle)
val idx = st.readBytes.indexOfSlice(delimiter, scanned)
if (idx >= 0) {
@@ -233,7 +233,7 @@ trait IO {
_next = bsd.copy(scanned = math.min(idx - delimiter.length, 0))
}
case ByteStringAny(continuation, handle, message) ⇒
- self.currentMessage = message
+ context.currentMessage = message
val st = state(handle)
if (st.readBytes.length > 0) {
val bytes = st.readBytes //.compact
diff --git a/akka-actor/src/main/scala/akka/actor/Props.scala b/akka-actor/src/main/scala/akka/actor/Props.scala
index a61d236fab..cbaf77fae1 100644
--- a/akka-actor/src/main/scala/akka/actor/Props.scala
+++ b/akka-actor/src/main/scala/akka/actor/Props.scala
@@ -59,7 +59,7 @@ object Props {
*/
def apply(creator: Creator[_ <: Actor]): Props = default.withCreator(creator.create)
- def apply(behavior: (ScalaActorRef with SelfActorRef) ⇒ Actor.Receive): Props = apply(new Actor { def receive = behavior(self) })
+ def apply(behavior: ActorRef ⇒ Actor.Receive): Props = apply(new Actor { def receive = behavior(self) })
}
/**
diff --git a/akka-actor/src/main/scala/akka/actor/Supervisor.scala b/akka-actor/src/main/scala/akka/actor/Supervisor.scala
index 8f0696e74b..8a626cfe5f 100644
--- a/akka-actor/src/main/scala/akka/actor/Supervisor.scala
+++ b/akka-actor/src/main/scala/akka/actor/Supervisor.scala
@@ -167,7 +167,7 @@ sealed class Supervisor(handler: FaultHandlingStrategy, maxRestartsHandler: (Act
final class SupervisorActor private[akka] (maxRestartsHandler: (ActorRef, MaximumNumberOfRestartsWithinTimeRangeReached) ⇒ Unit) extends Actor {
override def postStop(): Unit = {
- val i = self.linkedActors.iterator
+ val i = linkedActors.iterator
while (i.hasNext) {
val ref = i.next
ref.stop()
diff --git a/akka-actor/src/main/scala/akka/actor/TypedActor.scala b/akka-actor/src/main/scala/akka/actor/TypedActor.scala
index 1a256291bb..c174dffce3 100644
--- a/akka-actor/src/main/scala/akka/actor/TypedActor.scala
+++ b/akka-actor/src/main/scala/akka/actor/TypedActor.scala
@@ -242,11 +242,11 @@ object TypedActor {
try {
if (m.isOneWay) m(me)
else if (m.returnsFuture_?) {
- self.channel match {
+ channel match {
case p: ActorPromise ⇒ p completeWith m(me).asInstanceOf[Future[Any]]
case _ ⇒ throw new IllegalStateException("Future-returning TypedActor didn't use ?/ask so cannot reply")
}
- } else self reply m(me)
+ } else reply(m(me))
} finally { selfReference set null }
}
diff --git a/akka-actor/src/main/scala/akka/actor/UntypedActor.scala b/akka-actor/src/main/scala/akka/actor/UntypedActor.scala
index f5e079c071..7200f8e403 100644
--- a/akka-actor/src/main/scala/akka/actor/UntypedActor.scala
+++ b/akka-actor/src/main/scala/akka/actor/UntypedActor.scala
@@ -5,6 +5,8 @@
package akka.actor
import akka.japi.{ Creator, Procedure }
+import akka.dispatch.{ MessageDispatcher, Promise }
+import java.util.{ Collection ⇒ JCollection }
/**
* Subclass this abstract class to create a MDB-style untyped actor.
@@ -20,20 +22,20 @@ import akka.japi.{ Creator, Procedure }
*
* if (msg.equals("UseReply")) {
* // Reply to original sender of message using the 'reply' method
- * getContext().reply(msg + ":" + getContext().getUuid());
+ * reply(msg + ":" + getSelf().getAddress());
*
- * } else if (msg.equals("UseSender") && getContext().getSender().isDefined()) {
+ * } else if (msg.equals("UseSender") && getSender().isDefined()) {
* // Reply to original sender of message using the sender reference
- * // also passing along my own reference (the context)
- * getContext().getSender().get().tell(msg, context);
+ * // also passing along my own reference (the self)
+ * getSender().get().tell(msg, getSelf());
*
- * } else if (msg.equals("UseSenderFuture") && getContext().getSenderFuture().isDefined()) {
+ * } else if (msg.equals("UseSenderFuture") && getSenderFuture().isDefined()) {
* // Reply to original sender of message using the sender future reference
- * getContext().getSenderFuture().get().completeWithResult(msg);
+ * getSenderFuture().get().completeWithResult(msg);
*
* } else if (msg.equals("SendToSelf")) {
* // Send message to the actor itself recursively
- * getContext().tell(msg)
+ * getSelf().tell(msg)
*
* } else if (msg.equals("ForwardMessage")) {
* // Retreive an actor from the ActorRegistry by ID and get an ActorRef back
@@ -62,14 +64,49 @@ abstract class UntypedActor extends Actor {
def onReceive(message: Any): Unit
/**
- * Returns the 'self' reference with the API.
+ * Returns the 'self' reference.
*/
- def getContext(): SelfActorRef = self
+ def getSelf(): ActorRef = self
/**
- * Returns the 'self' reference with the API.
+ * The reference sender Actor of the last received message.
+ * Is defined if the message was sent from another Actor, else None.
*/
- def context(): SelfActorRef = self
+ def getSender: Option[ActorRef] = sender
+
+ /**
+ * The reference sender future of the last received message.
+ * Is defined if the message was sent with sent with '?'/'ask', else None.
+ */
+ def getSenderFuture: Option[Promise[Any]] = senderFuture
+
+ /**
+ * Abstraction for unification of sender and senderFuture for later reply
+ */
+ def getChannel: UntypedChannel = channel
+
+ /**
+ * Gets the current receive timeout
+ * When specified, the receive method should be able to handle a 'ReceiveTimeout' message.
+ */
+ def getReceiveTimeout: Option[Long] = receiveTimeout
+
+ /**
+ * Defines the default timeout for an initial receive invocation.
+ * When specified, the receive function should be able to handle a 'ReceiveTimeout' message.
+ */
+ def setReceiveTimeout(timeout: Long): Unit = receiveTimeout = Some(timeout)
+
+ /**
+ * Returns an unmodifiable Java Collection containing the linked actors,
+ * please note that the backing map is thread-safe but not immutable
+ */
+ def getLinkedActors: JCollection[ActorRef] = linkedActors
+
+ /**
+ * Returns the dispatcher (MessageDispatcher) that is used for this Actor
+ */
+ def getDispatcher(): MessageDispatcher = dispatcher
/**
* Java API for become
diff --git a/akka-actor/src/main/scala/akka/dispatch/Future.scala b/akka-actor/src/main/scala/akka/dispatch/Future.scala
index a4607d5dba..0ecfbd90a3 100644
--- a/akka-actor/src/main/scala/akka/dispatch/Future.scala
+++ b/akka-actor/src/main/scala/akka/dispatch/Future.scala
@@ -6,7 +6,7 @@ package akka.dispatch
import akka.AkkaException
import akka.event.EventHandler
-import akka.actor.{ Actor, ForwardableChannel, UntypedChannel, Scheduler, Timeout, ExceptionChannel }
+import akka.actor.{ Actor, UntypedChannel, Scheduler, Timeout, ExceptionChannel }
import scala.Option
import akka.japi.{ Procedure, Function ⇒ JFunc, Option ⇒ JOption }
@@ -933,7 +933,7 @@ class DefaultPromise[T](val timeout: Timeout)(implicit val dispatcher: MessageDi
private def timeLeftNoinline(): Long = timeLeft()
}
-class ActorPromise(timeout: Timeout)(implicit dispatcher: MessageDispatcher) extends DefaultPromise[Any](timeout)(dispatcher) with ForwardableChannel with ExceptionChannel[Any] {
+class ActorPromise(timeout: Timeout)(implicit dispatcher: MessageDispatcher) extends DefaultPromise[Any](timeout)(dispatcher) with UntypedChannel with ExceptionChannel[Any] {
def !(message: Any)(implicit channel: UntypedChannel) = completeWithResult(message)
diff --git a/akka-actor/src/main/scala/akka/dispatch/MessageHandling.scala b/akka-actor/src/main/scala/akka/dispatch/MessageHandling.scala
index 0466587e10..c8af167d2c 100644
--- a/akka-actor/src/main/scala/akka/dispatch/MessageHandling.scala
+++ b/akka-actor/src/main/scala/akka/dispatch/MessageHandling.scala
@@ -72,8 +72,8 @@ abstract class MessageDispatcher extends Serializable {
/**
* Attaches the specified actor instance to this dispatcher
*/
- final def attach(actor: ActorInstance) {
- var promise = new ActorPromise(Timeout.never)(this)
+ final def attach(actor: ActorInstance): Unit = {
+ val promise = new ActorPromise(Timeout.never)(this)
guard.lock.lock()
try {
register(actor)
@@ -87,7 +87,7 @@ abstract class MessageDispatcher extends Serializable {
/**
* Detaches the specified actor instance from this dispatcher
*/
- final def detach(actor: ActorInstance) {
+ final def detach(actor: ActorInstance): Unit = {
guard withGuard {
unregister(actor)
}
diff --git a/akka-actor/src/main/scala/akka/routing/Pool.scala b/akka-actor/src/main/scala/akka/routing/Pool.scala
index c733550170..9960210f48 100644
--- a/akka-actor/src/main/scala/akka/routing/Pool.scala
+++ b/akka-actor/src/main/scala/akka/routing/Pool.scala
@@ -98,7 +98,7 @@ trait DefaultActorPool extends ActorPool { this: Actor ⇒
protected def _route(): Receive = {
// for testing...
case Stat ⇒
- self tryReply Stats(_delegates length)
+ tryReply(Stats(_delegates length))
case MaximumNumberOfRestartsWithinTimeRangeReached(victim, _, _, _) ⇒
_delegates = _delegates filterNot { _.uuid == victim.uuid }
case Death(victim, _, _) ⇒
@@ -152,7 +152,7 @@ trait SmallestMailboxSelector {
var take = if (partialFill) math.min(selectionCount, delegates.length) else selectionCount
def mailboxSize(a: ActorRef): Int = a match {
- case l: LocalActorRef ⇒ l.dispatcher.mailboxSize(l.underlying)
+ case l: LocalActorRef ⇒ l.underlying.dispatcher.mailboxSize(l.underlying)
case _ ⇒ Int.MaxValue //Non-local actors mailbox size is unknown, so consider them lowest priority
}
@@ -238,7 +238,7 @@ trait MailboxPressureCapacitor {
def pressureThreshold: Int
def pressure(delegates: Seq[ActorRef]): Int =
delegates count {
- case a: LocalActorRef ⇒ a.dispatcher.mailboxSize(a.underlying) > pressureThreshold
+ case a: LocalActorRef ⇒ a.underlying.dispatcher.mailboxSize(a.underlying) > pressureThreshold
case _ ⇒ false
}
}
@@ -249,8 +249,8 @@ trait MailboxPressureCapacitor {
trait ActiveFuturesPressureCapacitor {
def pressure(delegates: Seq[ActorRef]): Int =
delegates count {
- case fc: ForwardableChannel ⇒ fc.channel.isInstanceOf[Promise[_]]
- case _ ⇒ false
+ case a: LocalActorRef ⇒ a.underlying.channel.isInstanceOf[Promise[_]]
+ case _ ⇒ false
}
}
diff --git a/akka-camel-typed/src/test/scala/akka/camel/TypedCamelTestSupport.scala b/akka-camel-typed/src/test/scala/akka/camel/TypedCamelTestSupport.scala
index f8b597ba1e..4e5d92aa22 100644
--- a/akka-camel-typed/src/test/scala/akka/camel/TypedCamelTestSupport.scala
+++ b/akka-camel-typed/src/test/scala/akka/camel/TypedCamelTestSupport.scala
@@ -24,7 +24,7 @@ object TypedCamelTestSupport {
def countdown: Handler = {
case SetExpectedMessageCount(num) ⇒ {
latch = new CountDownLatch(num)
- self.reply(latch)
+ reply(latch)
}
case msg ⇒ latch.countDown
}
@@ -32,7 +32,7 @@ object TypedCamelTestSupport {
trait Respond { this: Actor ⇒
def respond: Handler = {
- case msg: Message ⇒ self.reply(response(msg))
+ case msg: Message ⇒ reply(response(msg))
}
def response(msg: Message): Any = "Hello %s" format msg.body
@@ -42,8 +42,8 @@ object TypedCamelTestSupport {
val messages = Buffer[Any]()
def retain: Handler = {
- case GetRetainedMessage ⇒ self.reply(messages.last)
- case GetRetainedMessages(p) ⇒ self.reply(messages.toList.filter(p))
+ case GetRetainedMessage ⇒ reply(messages.last)
+ case GetRetainedMessages(p) ⇒ reply(messages.toList.filter(p))
case msg ⇒ {
messages += msg
msg
diff --git a/akka-camel/src/main/scala/akka/camel/ConsumerPublisher.scala b/akka-camel/src/main/scala/akka/camel/ConsumerPublisher.scala
index 3045643cfb..aac68fc1e4 100644
--- a/akka-camel/src/main/scala/akka/camel/ConsumerPublisher.scala
+++ b/akka-camel/src/main/scala/akka/camel/ConsumerPublisher.scala
@@ -127,11 +127,11 @@ private[camel] class ActivationTracker extends Actor {
def receive = {
case SetExpectedActivationCount(num) ⇒ {
activationLatch = new CountDownLatch(num)
- self.reply(activationLatch)
+ reply(activationLatch)
}
case SetExpectedDeactivationCount(num) ⇒ {
deactivationLatch = new CountDownLatch(num)
- self.reply(deactivationLatch)
+ reply(deactivationLatch)
}
case EndpointActivated ⇒ activationLatch.countDown
case EndpointDeactivated ⇒ deactivationLatch.countDown
diff --git a/akka-camel/src/main/scala/akka/camel/Producer.scala b/akka-camel/src/main/scala/akka/camel/Producer.scala
index 972d42cb21..7f9e82290d 100644
--- a/akka-camel/src/main/scala/akka/camel/Producer.scala
+++ b/akka-camel/src/main/scala/akka/camel/Producer.scala
@@ -99,7 +99,7 @@ trait ProducerSupport { this: Actor ⇒
val producer = self
// Need copies of channel reference here since the callback could be done
// later by another thread.
- val channel = self.channel
+ val replyChannel = channel
def done(doneSync: Boolean): Unit = {
(doneSync, exchange.isFailed) match {
@@ -114,11 +114,11 @@ trait ProducerSupport { this: Actor ⇒
receiveAfterProduce(result)
private def dispatchAsync(result: Any) = {
- channel match {
+ replyChannel match {
case _: ActorPromise ⇒
- producer.postMessageToMailboxAndCreateFutureResultWithTimeout(result, producer.timeout, channel)
+ producer.postMessageToMailboxAndCreateFutureResultWithTimeout(result, producer.timeout, replyChannel)
case _ ⇒
- producer.postMessageToMailbox(result, channel)
+ producer.postMessageToMailbox(result, replyChannel)
}
}
})
@@ -159,7 +159,7 @@ trait ProducerSupport { this: Actor ⇒
* actor).
*/
protected def receiveAfterProduce: Receive = {
- case msg ⇒ if (!oneway) self.reply(msg)
+ case msg ⇒ if (!oneway) reply(msg)
}
/**
diff --git a/akka-camel/src/test/java/akka/camel/SampleUntypedConsumer.java b/akka-camel/src/test/java/akka/camel/SampleUntypedConsumer.java
index 3576e472bd..d86d4d5cc7 100644
--- a/akka-camel/src/test/java/akka/camel/SampleUntypedConsumer.java
+++ b/akka-camel/src/test/java/akka/camel/SampleUntypedConsumer.java
@@ -15,7 +15,7 @@ public class SampleUntypedConsumer extends UntypedConsumerActor {
Message msg = (Message)message;
String body = msg.getBodyAs(String.class);
String header = msg.getHeaderAs("test", String.class);
- getContext().tryReply(String.format("%s %s", body, header));
+ tryReply(String.format("%s %s", body, header));
}
}
diff --git a/akka-camel/src/test/java/akka/camel/SampleUntypedConsumerBlocking.java b/akka-camel/src/test/java/akka/camel/SampleUntypedConsumerBlocking.java
index 03f7f0648f..0e58677f54 100644
--- a/akka-camel/src/test/java/akka/camel/SampleUntypedConsumerBlocking.java
+++ b/akka-camel/src/test/java/akka/camel/SampleUntypedConsumerBlocking.java
@@ -17,7 +17,7 @@ public class SampleUntypedConsumerBlocking extends UntypedConsumerActor {
Message msg = (Message)message;
String body = msg.getBodyAs(String.class);
String header = msg.getHeaderAs("test", String.class);
- getContext().tryReply(String.format("%s %s", body, header));
+ tryReply(String.format("%s %s", body, header));
}
}
diff --git a/akka-camel/src/test/scala/akka/camel/CamelTestSupport.scala b/akka-camel/src/test/scala/akka/camel/CamelTestSupport.scala
index d190347acf..be5099d050 100644
--- a/akka-camel/src/test/scala/akka/camel/CamelTestSupport.scala
+++ b/akka-camel/src/test/scala/akka/camel/CamelTestSupport.scala
@@ -36,7 +36,7 @@ object CamelTestSupport {
def countdown: Handler = {
case SetExpectedMessageCount(num) ⇒ {
latch = new CountDownLatch(num)
- self.reply(latch)
+ reply(latch)
}
case msg ⇒ latch.countDown
}
@@ -44,7 +44,7 @@ object CamelTestSupport {
trait Respond { this: Actor ⇒
def respond: Handler = {
- case msg: Message ⇒ self.reply(response(msg))
+ case msg: Message ⇒ reply(response(msg))
}
def response(msg: Message): Any = "Hello %s" format msg.body
@@ -54,8 +54,8 @@ object CamelTestSupport {
val messages = Buffer[Any]()
def retain: Handler = {
- case GetRetainedMessage ⇒ self.reply(messages.last)
- case GetRetainedMessages(p) ⇒ self.reply(messages.toList.filter(p))
+ case GetRetainedMessage ⇒ reply(messages.last)
+ case GetRetainedMessages(p) ⇒ reply(messages.toList.filter(p))
case msg ⇒ {
messages += msg
msg
diff --git a/akka-camel/src/test/scala/akka/camel/ConsumerScalaTest.scala b/akka-camel/src/test/scala/akka/camel/ConsumerScalaTest.scala
index 924308779e..465e713b0e 100644
--- a/akka-camel/src/test/scala/akka/camel/ConsumerScalaTest.scala
+++ b/akka-camel/src/test/scala/akka/camel/ConsumerScalaTest.scala
@@ -212,7 +212,7 @@ object ConsumerScalaTest {
class TestConsumer(uri: String) extends Actor with Consumer {
def endpointUri = uri
protected def receive = {
- case msg: Message ⇒ self.reply("received %s" format msg.body)
+ case msg: Message ⇒ reply("received %s" format msg.body)
}
}
@@ -227,7 +227,7 @@ object ConsumerScalaTest {
def endpointUri = uri
override def autoack = false
protected def receive = {
- case msg: Message ⇒ self.reply(Ack)
+ case msg: Message ⇒ reply(Ack)
}
}
@@ -248,15 +248,15 @@ object ConsumerScalaTest {
protected def receive = {
case "fail" ⇒ { throw new Exception("test") }
- case "succeed" ⇒ self.reply("ok")
+ case "succeed" ⇒ reply("ok")
}
override def preRestart(reason: scala.Throwable, msg: Option[Any]) {
- self.tryReply("pr")
+ tryReply("pr")
}
override def postStop {
- self.tryReply("ps")
+ tryReply("ps")
}
}
@@ -289,7 +289,7 @@ object ConsumerScalaTest {
}
private def respondTo(msg: Message) =
- if (valid) self.reply("accepted: %s" format msg.body)
+ if (valid) reply("accepted: %s" format msg.body)
else throw new Exception("rejected: %s" format msg.body)
}
diff --git a/akka-camel/src/test/scala/akka/camel/ProducerFeatureTest.scala b/akka-camel/src/test/scala/akka/camel/ProducerFeatureTest.scala
index 334e5cd338..d7fbc783f0 100644
--- a/akka-camel/src/test/scala/akka/camel/ProducerFeatureTest.scala
+++ b/akka-camel/src/test/scala/akka/camel/ProducerFeatureTest.scala
@@ -253,8 +253,8 @@ object ProducerFeatureTest {
class TestResponder extends Actor {
protected def receive = {
case msg: Message ⇒ msg.body match {
- case "fail" ⇒ self.reply(Failure(new Exception("failure"), msg.headers))
- case _ ⇒ self.reply(msg.transformBody { body: String ⇒ "received %s" format body })
+ case "fail" ⇒ reply(Failure(new Exception("failure"), msg.headers))
+ case _ ⇒ reply(msg.transformBody { body: String ⇒ "received %s" format body })
}
}
}
@@ -262,9 +262,9 @@ object ProducerFeatureTest {
class ReplyingForwardTarget extends Actor {
protected def receive = {
case msg: Message ⇒
- self.reply(msg.addHeader("test" -> "result"))
+ reply(msg.addHeader("test" -> "result"))
case msg: Failure ⇒
- self.reply(Failure(msg.cause, msg.headers + ("test" -> "failure")))
+ reply(Failure(msg.cause, msg.headers + ("test" -> "failure")))
}
}
diff --git a/akka-camel/src/test/scala/akka/camel/component/ActorComponentFeatureTest.scala b/akka-camel/src/test/scala/akka/camel/component/ActorComponentFeatureTest.scala
index 5fe07b2cd4..d2b4067e2b 100644
--- a/akka-camel/src/test/scala/akka/camel/component/ActorComponentFeatureTest.scala
+++ b/akka-camel/src/test/scala/akka/camel/component/ActorComponentFeatureTest.scala
@@ -96,13 +96,13 @@ class ActorComponentFeatureTest extends FeatureSpec with BeforeAndAfterAll with
object ActorComponentFeatureTest {
class CustomIdActor extends Actor {
protected def receive = {
- case msg: Message ⇒ self.reply("Received %s" format msg.body)
+ case msg: Message ⇒ reply("Received %s" format msg.body)
}
}
class FailWithMessage extends Actor {
protected def receive = {
- case msg: Message ⇒ self.reply(Failure(new Exception("test")))
+ case msg: Message ⇒ reply(Failure(new Exception("test")))
}
}
diff --git a/akka-cluster/src/multi-jvm/scala/akka/cluster/api/registry/RegistryStoreMultiJvmSpec.scala b/akka-cluster/src/multi-jvm/scala/akka/cluster/api/registry/RegistryStoreMultiJvmSpec.scala
index 49c047c725..f9bbac2b70 100644
--- a/akka-cluster/src/multi-jvm/scala/akka/cluster/api/registry/RegistryStoreMultiJvmSpec.scala
+++ b/akka-cluster/src/multi-jvm/scala/akka/cluster/api/registry/RegistryStoreMultiJvmSpec.scala
@@ -25,7 +25,7 @@ object RegistryStoreMultiJvmSpec {
class HelloWorld1 extends Actor with Serializable {
def receive = {
case "Hello" ⇒
- self.reply("World from node [" + Config.nodename + "]")
+ reply("World from node [" + Config.nodename + "]")
}
}
@@ -36,7 +36,7 @@ object RegistryStoreMultiJvmSpec {
Thread.sleep(1000)
counter += 1
case "Count" ⇒
- self.reply(counter)
+ reply(counter)
}
}
}
diff --git a/akka-cluster/src/multi-jvm/scala/akka/cluster/migration/MigrationExplicitMultiJvmSpec.scala b/akka-cluster/src/multi-jvm/scala/akka/cluster/migration/MigrationExplicitMultiJvmSpec.scala
index 725b4ffd92..22333be938 100644
--- a/akka-cluster/src/multi-jvm/scala/akka/cluster/migration/MigrationExplicitMultiJvmSpec.scala
+++ b/akka-cluster/src/multi-jvm/scala/akka/cluster/migration/MigrationExplicitMultiJvmSpec.scala
@@ -25,7 +25,7 @@
* class HelloWorld extends Actor with Serializable {
* def receive = {
* case "Hello" ⇒
- * self.reply("World from node [" + Config.nodename + "]")
+ * reply("World from node [" + Config.nodename + "]")
* }
* }
* }
diff --git a/akka-cluster/src/multi-jvm/scala/akka/cluster/replication/transactionlog/writebehind/nosnapshot/ReplicationTransactionLogWriteBehindNoSnapshotMultiJvmSpec.scala b/akka-cluster/src/multi-jvm/scala/akka/cluster/replication/transactionlog/writebehind/nosnapshot/ReplicationTransactionLogWriteBehindNoSnapshotMultiJvmSpec.scala
index 8c3054cf81..b337007754 100644
--- a/akka-cluster/src/multi-jvm/scala/akka/cluster/replication/transactionlog/writebehind/nosnapshot/ReplicationTransactionLogWriteBehindNoSnapshotMultiJvmSpec.scala
+++ b/akka-cluster/src/multi-jvm/scala/akka/cluster/replication/transactionlog/writebehind/nosnapshot/ReplicationTransactionLogWriteBehindNoSnapshotMultiJvmSpec.scala
@@ -23,9 +23,9 @@
// def receive = {
// case Count(nr) ⇒
// log += nr.toString
-// self.reply("World from node [" + Config.nodename + "]")
+// reply("World from node [" + Config.nodename + "]")
// case GetLog ⇒
-// self.reply(Log(log))
+// reply(Log(log))
// }
// }
// }
diff --git a/akka-cluster/src/multi-jvm/scala/akka/cluster/replication/transactionlog/writebehind/snapshot/ReplicationTransactionLogWriteBehindSnapshotMultiJvmSpec.scala b/akka-cluster/src/multi-jvm/scala/akka/cluster/replication/transactionlog/writebehind/snapshot/ReplicationTransactionLogWriteBehindSnapshotMultiJvmSpec.scala
index 4415fd7c84..b60891300c 100644
--- a/akka-cluster/src/multi-jvm/scala/akka/cluster/replication/transactionlog/writebehind/snapshot/ReplicationTransactionLogWriteBehindSnapshotMultiJvmSpec.scala
+++ b/akka-cluster/src/multi-jvm/scala/akka/cluster/replication/transactionlog/writebehind/snapshot/ReplicationTransactionLogWriteBehindSnapshotMultiJvmSpec.scala
@@ -25,9 +25,9 @@
// case Count(nr) ⇒
// log += nr.toString
// //println("Message to HelloWorld log =======> " + log)
-// self.reply("World from node [" + Config.nodename + "]")
+// reply("World from node [" + Config.nodename + "]")
// case GetLog ⇒
-// self.reply(Log(log))
+// reply(Log(log))
// }
// }
// }
diff --git a/akka-cluster/src/multi-jvm/scala/akka/cluster/replication/transactionlog/writethrough/nosnapshot/ReplicationTransactionLogWriteThroughNoSnapshotMultiJvmSpec.scala b/akka-cluster/src/multi-jvm/scala/akka/cluster/replication/transactionlog/writethrough/nosnapshot/ReplicationTransactionLogWriteThroughNoSnapshotMultiJvmSpec.scala
index ca925d28b3..fd2ff324da 100644
--- a/akka-cluster/src/multi-jvm/scala/akka/cluster/replication/transactionlog/writethrough/nosnapshot/ReplicationTransactionLogWriteThroughNoSnapshotMultiJvmSpec.scala
+++ b/akka-cluster/src/multi-jvm/scala/akka/cluster/replication/transactionlog/writethrough/nosnapshot/ReplicationTransactionLogWriteThroughNoSnapshotMultiJvmSpec.scala
@@ -22,12 +22,12 @@
// var log = ""
// def receive = {
// case Count(nr) ⇒
-// println("Received number: " + nr + " on " + self.uuid)
+// println("Received number: " + nr + " on " + self.address)
// log += nr.toString
-// self.reply("World from node [" + Config.nodename + "]")
+// reply("World from node [" + Config.nodename + "]")
// case GetLog ⇒
-// println("Received getLog on " + self.uuid)
-// self.reply(Log(log))
+// println("Received getLog on " + uuid)
+// reply(Log(log))
// }
// }
// }
diff --git a/akka-cluster/src/multi-jvm/scala/akka/cluster/replication/transactionlog/writethrough/snapshot/ReplicationTransactionLogWriteThroughSnapshotMultiJvmSpec.scala b/akka-cluster/src/multi-jvm/scala/akka/cluster/replication/transactionlog/writethrough/snapshot/ReplicationTransactionLogWriteThroughSnapshotMultiJvmSpec.scala
index 44360ae359..583662ebe3 100644
--- a/akka-cluster/src/multi-jvm/scala/akka/cluster/replication/transactionlog/writethrough/snapshot/ReplicationTransactionLogWriteThroughSnapshotMultiJvmSpec.scala
+++ b/akka-cluster/src/multi-jvm/scala/akka/cluster/replication/transactionlog/writethrough/snapshot/ReplicationTransactionLogWriteThroughSnapshotMultiJvmSpec.scala
@@ -23,9 +23,9 @@
// def receive = {
// case Count(nr) ⇒
// log += nr.toString
-// self.reply("World from node [" + Config.nodename + "]")
+// reply("World from node [" + Config.nodename + "]")
// case GetLog ⇒
-// self.reply(Log(log))
+// reply(Log(log))
// }
// }
// }
diff --git a/akka-cluster/src/multi-jvm/scala/akka/cluster/routing/direct/failover/DirectRoutingFailoverMultiJvmSpec.scala b/akka-cluster/src/multi-jvm/scala/akka/cluster/routing/direct/failover/DirectRoutingFailoverMultiJvmSpec.scala
index 75ca543fb1..46463f6537 100644
--- a/akka-cluster/src/multi-jvm/scala/akka/cluster/routing/direct/failover/DirectRoutingFailoverMultiJvmSpec.scala
+++ b/akka-cluster/src/multi-jvm/scala/akka/cluster/routing/direct/failover/DirectRoutingFailoverMultiJvmSpec.scala
@@ -20,7 +20,7 @@ object DirectRoutingFailoverMultiJvmSpec {
def receive = {
case "identify" ⇒
- self.reply(Config.nodename)
+ reply(Config.nodename)
}
}
}
diff --git a/akka-cluster/src/multi-jvm/scala/akka/cluster/routing/direct/homenode/HomeNode1MultiJvmSpec.scala b/akka-cluster/src/multi-jvm/scala/akka/cluster/routing/direct/homenode/HomeNode1MultiJvmSpec.scala
index 0467a0c7a6..2b84c0c3c9 100644
--- a/akka-cluster/src/multi-jvm/scala/akka/cluster/routing/direct/homenode/HomeNode1MultiJvmSpec.scala
+++ b/akka-cluster/src/multi-jvm/scala/akka/cluster/routing/direct/homenode/HomeNode1MultiJvmSpec.scala
@@ -13,7 +13,7 @@ object HomeNodeMultiJvmSpec {
class SomeActor extends Actor with Serializable {
def receive = {
case "identify" ⇒ {
- self.reply(Config.nodename)
+ reply(Config.nodename)
}
}
}
diff --git a/akka-cluster/src/multi-jvm/scala/akka/cluster/routing/direct/normalusage/SingleReplicaDirectRoutingMultiJvmSpec.scala b/akka-cluster/src/multi-jvm/scala/akka/cluster/routing/direct/normalusage/SingleReplicaDirectRoutingMultiJvmSpec.scala
index cc928f999a..e96804dfe2 100644
--- a/akka-cluster/src/multi-jvm/scala/akka/cluster/routing/direct/normalusage/SingleReplicaDirectRoutingMultiJvmSpec.scala
+++ b/akka-cluster/src/multi-jvm/scala/akka/cluster/routing/direct/normalusage/SingleReplicaDirectRoutingMultiJvmSpec.scala
@@ -16,7 +16,7 @@ object SingleReplicaDirectRoutingMultiJvmSpec {
def receive = {
case "identify" ⇒ {
//println("The node received the 'identify' command: " + Config.nodename)
- self.reply(Config.nodename)
+ reply(Config.nodename)
}
}
}
diff --git a/akka-cluster/src/multi-jvm/scala/akka/cluster/routing/random/failover/RandomFailoverMultiJvmSpec.scala b/akka-cluster/src/multi-jvm/scala/akka/cluster/routing/random/failover/RandomFailoverMultiJvmSpec.scala
index 45a0d7bd6b..e13688f2dd 100644
--- a/akka-cluster/src/multi-jvm/scala/akka/cluster/routing/random/failover/RandomFailoverMultiJvmSpec.scala
+++ b/akka-cluster/src/multi-jvm/scala/akka/cluster/routing/random/failover/RandomFailoverMultiJvmSpec.scala
@@ -20,7 +20,7 @@ object RandomFailoverMultiJvmSpec {
def receive = {
case "identify" ⇒
- self.reply(Config.nodename)
+ reply(Config.nodename)
}
}
diff --git a/akka-cluster/src/multi-jvm/scala/akka/cluster/routing/random/homenode/HomeNodeMultiJvmSpec.scala b/akka-cluster/src/multi-jvm/scala/akka/cluster/routing/random/homenode/HomeNodeMultiJvmSpec.scala
index e7e18959ea..f29e441864 100644
--- a/akka-cluster/src/multi-jvm/scala/akka/cluster/routing/random/homenode/HomeNodeMultiJvmSpec.scala
+++ b/akka-cluster/src/multi-jvm/scala/akka/cluster/routing/random/homenode/HomeNodeMultiJvmSpec.scala
@@ -13,7 +13,7 @@ object HomeNodeMultiJvmSpec {
class SomeActor extends Actor with Serializable {
def receive = {
case "identify" ⇒ {
- self.reply(Config.nodename)
+ reply(Config.nodename)
}
}
}
diff --git a/akka-cluster/src/multi-jvm/scala/akka/cluster/routing/random/replicationfactor_1/Random1ReplicaMultiJvmSpec.scala b/akka-cluster/src/multi-jvm/scala/akka/cluster/routing/random/replicationfactor_1/Random1ReplicaMultiJvmSpec.scala
index 9166fa0adb..ddda4a07b7 100644
--- a/akka-cluster/src/multi-jvm/scala/akka/cluster/routing/random/replicationfactor_1/Random1ReplicaMultiJvmSpec.scala
+++ b/akka-cluster/src/multi-jvm/scala/akka/cluster/routing/random/replicationfactor_1/Random1ReplicaMultiJvmSpec.scala
@@ -19,7 +19,7 @@ object Random1ReplicaMultiJvmSpec {
class HelloWorld extends Actor with Serializable {
def receive = {
case "Hello" ⇒
- self.reply("World from node [" + Config.nodename + "]")
+ reply("World from node [" + Config.nodename + "]")
}
}
diff --git a/akka-cluster/src/multi-jvm/scala/akka/cluster/routing/random/replicationfactor_3/Random3ReplicasMultiJvmSpec.scala b/akka-cluster/src/multi-jvm/scala/akka/cluster/routing/random/replicationfactor_3/Random3ReplicasMultiJvmSpec.scala
index 6586fba98b..41f54911e1 100644
--- a/akka-cluster/src/multi-jvm/scala/akka/cluster/routing/random/replicationfactor_3/Random3ReplicasMultiJvmSpec.scala
+++ b/akka-cluster/src/multi-jvm/scala/akka/cluster/routing/random/replicationfactor_3/Random3ReplicasMultiJvmSpec.scala
@@ -20,7 +20,7 @@ object Random3ReplicasMultiJvmSpec {
class HelloWorld extends Actor with Serializable {
def receive = {
case "Hello" ⇒
- self.reply("World from node [" + Config.nodename + "]")
+ reply("World from node [" + Config.nodename + "]")
}
}
}
diff --git a/akka-cluster/src/multi-jvm/scala/akka/cluster/routing/roundrobin/failover/RoundRobinFailoverMultiJvmSpec.scala b/akka-cluster/src/multi-jvm/scala/akka/cluster/routing/roundrobin/failover/RoundRobinFailoverMultiJvmSpec.scala
index 2aa6b1b7d8..5b8791231d 100644
--- a/akka-cluster/src/multi-jvm/scala/akka/cluster/routing/roundrobin/failover/RoundRobinFailoverMultiJvmSpec.scala
+++ b/akka-cluster/src/multi-jvm/scala/akka/cluster/routing/roundrobin/failover/RoundRobinFailoverMultiJvmSpec.scala
@@ -21,7 +21,7 @@ object RoundRobinFailoverMultiJvmSpec {
def receive = {
case "identify" ⇒
- self.reply(Config.nodename)
+ reply(Config.nodename)
}
}
diff --git a/akka-cluster/src/multi-jvm/scala/akka/cluster/routing/roundrobin/homenode/HomeNodeMultiJvmSpec.scala b/akka-cluster/src/multi-jvm/scala/akka/cluster/routing/roundrobin/homenode/HomeNodeMultiJvmSpec.scala
index 5ffc7348b4..bb5499be58 100644
--- a/akka-cluster/src/multi-jvm/scala/akka/cluster/routing/roundrobin/homenode/HomeNodeMultiJvmSpec.scala
+++ b/akka-cluster/src/multi-jvm/scala/akka/cluster/routing/roundrobin/homenode/HomeNodeMultiJvmSpec.scala
@@ -13,7 +13,7 @@ object HomeNodeMultiJvmSpec {
class SomeActor extends Actor with Serializable {
def receive = {
case "identify" ⇒ {
- self.reply(Config.nodename)
+ reply(Config.nodename)
}
}
}
diff --git a/akka-cluster/src/multi-jvm/scala/akka/cluster/routing/roundrobin/replicationfactor_1/RoundRobin1ReplicaMultiJvmSpec.scala b/akka-cluster/src/multi-jvm/scala/akka/cluster/routing/roundrobin/replicationfactor_1/RoundRobin1ReplicaMultiJvmSpec.scala
index 65e0e2aa35..c229d2c6c9 100644
--- a/akka-cluster/src/multi-jvm/scala/akka/cluster/routing/roundrobin/replicationfactor_1/RoundRobin1ReplicaMultiJvmSpec.scala
+++ b/akka-cluster/src/multi-jvm/scala/akka/cluster/routing/roundrobin/replicationfactor_1/RoundRobin1ReplicaMultiJvmSpec.scala
@@ -18,7 +18,7 @@ object RoundRobin1ReplicaMultiJvmSpec {
class HelloWorld extends Actor with Serializable {
def receive = {
case "Hello" ⇒
- self.reply("World from node [" + Config.nodename + "]")
+ reply("World from node [" + Config.nodename + "]")
}
}
diff --git a/akka-cluster/src/multi-jvm/scala/akka/cluster/routing/roundrobin/replicationfactor_2/RoundRobin2ReplicasMultiJvmSpec.scala b/akka-cluster/src/multi-jvm/scala/akka/cluster/routing/roundrobin/replicationfactor_2/RoundRobin2ReplicasMultiJvmSpec.scala
index b08b26658f..7ad1305056 100644
--- a/akka-cluster/src/multi-jvm/scala/akka/cluster/routing/roundrobin/replicationfactor_2/RoundRobin2ReplicasMultiJvmSpec.scala
+++ b/akka-cluster/src/multi-jvm/scala/akka/cluster/routing/roundrobin/replicationfactor_2/RoundRobin2ReplicasMultiJvmSpec.scala
@@ -31,7 +31,7 @@ object RoundRobin2ReplicasMultiJvmSpec {
class HelloWorld extends Actor with Serializable {
def receive = {
case "Hello" ⇒
- self.reply("World from node [" + Config.nodename + "]")
+ reply("World from node [" + Config.nodename + "]")
}
}
}
diff --git a/akka-cluster/src/multi-jvm/scala/akka/cluster/routing/roundrobin/replicationfactor_3/RoundRobin3ReplicasMultiJvmSpec.scala b/akka-cluster/src/multi-jvm/scala/akka/cluster/routing/roundrobin/replicationfactor_3/RoundRobin3ReplicasMultiJvmSpec.scala
index 71963fa542..93bfbf4c47 100644
--- a/akka-cluster/src/multi-jvm/scala/akka/cluster/routing/roundrobin/replicationfactor_3/RoundRobin3ReplicasMultiJvmSpec.scala
+++ b/akka-cluster/src/multi-jvm/scala/akka/cluster/routing/roundrobin/replicationfactor_3/RoundRobin3ReplicasMultiJvmSpec.scala
@@ -27,7 +27,7 @@
// class HelloWorld extends Actor with Serializable {
// def receive = {
// case "Hello" ⇒
-// self.reply("World from node [" + Config.nodename + "]")
+// reply("World from node [" + Config.nodename + "]")
// }
// }
// }
diff --git a/akka-cluster/src/multi-jvm/scala/akka/cluster/routing/scattergather/failover/ScatterGatherFailoverMultiJvmSpec.scala b/akka-cluster/src/multi-jvm/scala/akka/cluster/routing/scattergather/failover/ScatterGatherFailoverMultiJvmSpec.scala
index 5e0c566b4d..b19571f5a4 100644
--- a/akka-cluster/src/multi-jvm/scala/akka/cluster/routing/scattergather/failover/ScatterGatherFailoverMultiJvmSpec.scala
+++ b/akka-cluster/src/multi-jvm/scala/akka/cluster/routing/scattergather/failover/ScatterGatherFailoverMultiJvmSpec.scala
@@ -32,11 +32,11 @@ object ScatterGatherFailoverMultiJvmSpec {
case Shutdown(None) ⇒ shutdownNode
case Sleep(node) if node.equals(Config.nodename) ⇒
Thread sleep 100
- self.reply(Config.nodename)
+ reply(Config.nodename)
case Shutdown(Some(node)) if node.equals(Config.nodename) ⇒ shutdownNode
case _ ⇒
Thread sleep 100
- self.reply(Config.nodename)
+ reply(Config.nodename)
}
}
diff --git a/akka-cluster/src/multi-jvm/scala/akka/cluster/sample/PingPongMultiJvmExample.scala b/akka-cluster/src/multi-jvm/scala/akka/cluster/sample/PingPongMultiJvmExample.scala
index d0abd0a27b..9de63ee28a 100644
--- a/akka-cluster/src/multi-jvm/scala/akka/cluster/sample/PingPongMultiJvmExample.scala
+++ b/akka-cluster/src/multi-jvm/scala/akka/cluster/sample/PingPongMultiJvmExample.scala
@@ -58,7 +58,7 @@ object PingPongMultiJvmExample {
def receive = {
case Ping ⇒
println("---->> PONG")
- self reply Pong
+ reply(Pong)
}
}
}
diff --git a/akka-cluster/src/test/scala/akka/cluster/sample/ClusteredPingPongSample.scala b/akka-cluster/src/test/scala/akka/cluster/sample/ClusteredPingPongSample.scala
index fe6bee6a9e..a0ba57c554 100644
--- a/akka-cluster/src/test/scala/akka/cluster/sample/ClusteredPingPongSample.scala
+++ b/akka-cluster/src/test/scala/akka/cluster/sample/ClusteredPingPongSample.scala
@@ -39,9 +39,9 @@ object PingPong {
if (count < NrOfPings) {
println("---->> PING (%s)" format count)
count += 1
- self reply Ball
+ reply(Ball)
} else {
- self.sender.foreach(s ⇒ (s ? Stop).await)
+ sender.foreach(s ⇒ (s ? Stop).await)
gameOverLatch.countDown
self.stop
}
@@ -53,9 +53,9 @@ object PingPong {
class PongActor extends Actor with Serializable {
def receive = {
case Ball ⇒
- self reply Ball
+ reply(Ball)
case Stop ⇒
- self reply Stop
+ reply(Stop)
self.stop
}
}
diff --git a/akka-docs/disabled/examples/Pi.scala b/akka-docs/disabled/examples/Pi.scala
index 5d69a702d4..7a08a449da 100644
--- a/akka-docs/disabled/examples/Pi.scala
+++ b/akka-docs/disabled/examples/Pi.scala
@@ -43,7 +43,7 @@ object Pi extends App {
def receive = {
case Work(start, nrOfElements) =>
- self reply Result(calculatePiFor(start, nrOfElements)) // perform the work
+ reply(Result(calculatePiFor(start, nrOfElements))) // perform the work
}
}
//#worker
diff --git a/akka-durable-mailboxes/akka-mailboxes-common/src/test/scala/akka/actor/mailbox/DurableMailboxSpec.scala b/akka-durable-mailboxes/akka-mailboxes-common/src/test/scala/akka/actor/mailbox/DurableMailboxSpec.scala
index 9a0342d7c8..205d8b2b68 100644
--- a/akka-durable-mailboxes/akka-mailboxes-common/src/test/scala/akka/actor/mailbox/DurableMailboxSpec.scala
+++ b/akka-durable-mailboxes/akka-mailboxes-common/src/test/scala/akka/actor/mailbox/DurableMailboxSpec.scala
@@ -15,7 +15,7 @@ import akka.dispatch.MessageDispatcher
object DurableMailboxSpecActorFactory {
class MailboxTestActor extends Actor {
- def receive = { case "sum" ⇒ self.reply("sum") }
+ def receive = { case "sum" ⇒ reply("sum") }
}
def createMailboxTestActor(id: String)(implicit dispatcher: MessageDispatcher): ActorRef =
diff --git a/akka-durable-mailboxes/akka-mongo-mailbox/src/test/scala/akka/actor/mailbox/MongoBasedMailboxSpec.scala b/akka-durable-mailboxes/akka-mongo-mailbox/src/test/scala/akka/actor/mailbox/MongoBasedMailboxSpec.scala
index 1ebded684e..1580e5c812 100644
--- a/akka-durable-mailboxes/akka-mongo-mailbox/src/test/scala/akka/actor/mailbox/MongoBasedMailboxSpec.scala
+++ b/akka-durable-mailboxes/akka-mongo-mailbox/src/test/scala/akka/actor/mailbox/MongoBasedMailboxSpec.scala
@@ -26,9 +26,8 @@ class MongoBasedMailboxSpec extends DurableMailboxSpec("mongodb", MongoNaiveDura
/*object DurableMongoMailboxSpecActorFactory {
class MongoMailboxTestActor extends Actor {
- self.lifeCycle = Temporary
def receive = {
- case "sum" => self.reply("sum")
+ case "sum" => reply("sum")
}
}
diff --git a/akka-http/src/main/scala/akka/http/Mist.scala b/akka-http/src/main/scala/akka/http/Mist.scala
index ef0ad699e4..8c181ea47b 100644
--- a/akka-http/src/main/scala/akka/http/Mist.scala
+++ b/akka-http/src/main/scala/akka/http/Mist.scala
@@ -258,7 +258,7 @@ trait Endpoint { this: Actor ⇒
if (!endpoints.isEmpty) endpoints.foreach { _.apply(uri) ! req }
else {
- self.channel match {
+ channel match {
case null | NullChannel ⇒ _na(uri, req)
case channel ⇒ channel ! NoneAvailable(uri, req)
}
diff --git a/akka-remote/src/main/scala/akka/serialization/SerializationProtocol.scala b/akka-remote/src/main/scala/akka/serialization/SerializationProtocol.scala
index 84f43f7dd1..65f3719441 100644
--- a/akka-remote/src/main/scala/akka/serialization/SerializationProtocol.scala
+++ b/akka-remote/src/main/scala/akka/serialization/SerializationProtocol.scala
@@ -129,13 +129,13 @@ object ActorSerialization {
}
}
- l.receiveTimeout.foreach(builder.setReceiveTimeout(_))
+ l.underlying.receiveTimeout.foreach(builder.setReceiveTimeout(_))
val actorInstance = l.underlyingActorInstance
Serialization.serialize(actorInstance.asInstanceOf[T]) match {
case Right(bytes) ⇒ builder.setActorInstance(ByteString.copyFrom(bytes))
case Left(exception) ⇒ throw new Exception("Error serializing : " + actorInstance.getClass.getName)
}
- val stack = l.hotswap
+ val stack = l.underlying.hotswap
if (!stack.isEmpty)
builder.setHotswapStack(ByteString.copyFrom(akka.serialization.JavaSerializer.toBinary(stack)))
}
diff --git a/akka-remote/src/test/scala/akka/serialization/ActorSerializeSpec.scala b/akka-remote/src/test/scala/akka/serialization/ActorSerializeSpec.scala
index 989f059bc7..80ce01141c 100644
--- a/akka-remote/src/test/scala/akka/serialization/ActorSerializeSpec.scala
+++ b/akka-remote/src/test/scala/akka/serialization/ActorSerializeSpec.scala
@@ -30,7 +30,7 @@ class ActorSerializeSpec extends WordSpec with ShouldMatchers with BeforeAndAfte
val actor2 = fromBinary(bytes).asInstanceOf[LocalActorRef]
(actor2 ? "hello").get should equal("world 3")
- actor2.receiveTimeout should equal(Some(1000))
+ actor2.underlying.receiveTimeout should equal(Some(1000))
actor1.stop()
actor2.stop()
}
@@ -40,15 +40,15 @@ class ActorSerializeSpec extends WordSpec with ShouldMatchers with BeforeAndAfte
val actor1 = new LocalActorRef(Props[MyStatelessActorWithMessagesInMailbox], newUuid.toString, systemService = true)
for (i ← 1 to 10) actor1 ! "hello"
- actor1.getDispatcher.mailboxSize(actor1.underlying) should be > (0)
+ actor1.underlying.dispatcher.mailboxSize(actor1.underlying) should be > (0)
val actor2 = fromBinary(toBinary(actor1)).asInstanceOf[LocalActorRef]
Thread.sleep(1000)
- actor2.getDispatcher.mailboxSize(actor1.underlying) should be > (0)
+ actor2.underlying.dispatcher.mailboxSize(actor1.underlying) should be > (0)
(actor2 ? "hello-reply").get should equal("world")
val actor3 = fromBinary(toBinary(actor1, false)).asInstanceOf[LocalActorRef]
Thread.sleep(1000)
- actor3.getDispatcher.mailboxSize(actor1.underlying) should equal(0)
+ actor3.underlying.dispatcher.mailboxSize(actor1.underlying) should equal(0)
(actor3 ? "hello-reply").get should equal("world")
}
@@ -66,15 +66,15 @@ class ActorSerializeSpec extends WordSpec with ShouldMatchers with BeforeAndAfte
(actor1 ! p1)
(actor1 ! p1)
(actor1 ! p1)
- actor1.getDispatcher.mailboxSize(actor1.underlying) should be > (0)
+ actor1.underlying.dispatcher.mailboxSize(actor1.underlying) should be > (0)
val actor2 = fromBinary(toBinary(actor1)).asInstanceOf[LocalActorRef]
Thread.sleep(1000)
- actor2.getDispatcher.mailboxSize(actor1.underlying) should be > (0)
+ actor2.underlying.dispatcher.mailboxSize(actor1.underlying) should be > (0)
(actor2 ? "hello-reply").get should equal("hello")
val actor3 = fromBinary(toBinary(actor1, false)).asInstanceOf[LocalActorRef]
Thread.sleep(1000)
- actor3.getDispatcher.mailboxSize(actor1.underlying) should equal(0)
+ actor3.underlying.dispatcher.mailboxSize(actor1.underlying) should equal(0)
(actor3 ? "hello-reply").get should equal("hello")
}
}
@@ -103,15 +103,15 @@ class ActorSerializeSpec extends WordSpec with ShouldMatchers with BeforeAndAfte
val msg = MyMessage(123, "debasish ghosh", true)
val b = ProtobufProtocol.MyMessage.newBuilder.setId(msg.id).setName(msg.name).setStatus(msg.status).build
for (i ← 1 to 10) actor1 ! b
- actor1.getDispatcher.mailboxSize(actor1.underlying) should be > (0)
+ actor1.underlying.dispatcher.mailboxSize(actor1.underlying) should be > (0)
val actor2 = fromBinary(toBinary(actor1)).asInstanceOf[LocalActorRef]
Thread.sleep(1000)
- actor2.getDispatcher.mailboxSize(actor1.underlying) should be > (0)
+ actor2.underlying.dispatcher.mailboxSize(actor1.underlying) should be > (0)
(actor2 ? "hello-reply").get should equal("world")
val actor3 = fromBinary(toBinary(actor1, false)).asInstanceOf[LocalActorRef]
Thread.sleep(1000)
- actor3.getDispatcher.mailboxSize(actor1.underlying) should equal(0)
+ actor3.underlying.dispatcher.mailboxSize(actor1.underlying) should equal(0)
(actor3 ? "hello-reply").get should equal("world")
}
}
@@ -119,12 +119,12 @@ class ActorSerializeSpec extends WordSpec with ShouldMatchers with BeforeAndAfte
class MyJavaSerializableActor extends Actor with scala.Serializable {
var count = 0
- self.receiveTimeout = Some(1000)
+ receiveTimeout = Some(1000)
def receive = {
case "hello" ⇒
count = count + 1
- self.reply("world " + count)
+ reply("world " + count)
}
}
@@ -132,7 +132,7 @@ class MyStatelessActorWithMessagesInMailbox extends Actor with scala.Serializabl
def receive = {
case "hello" ⇒
Thread.sleep(500)
- case "hello-reply" ⇒ self.reply("world")
+ case "hello-reply" ⇒ reply("world")
}
}
@@ -140,7 +140,7 @@ class MyActorWithProtobufMessagesInMailbox extends Actor with scala.Serializable
def receive = {
case m: Message ⇒
Thread.sleep(500)
- case "hello-reply" ⇒ self.reply("world")
+ case "hello-reply" ⇒ reply("world")
}
}
@@ -148,6 +148,6 @@ class PersonActorWithMessagesInMailbox extends Actor with scala.Serializable {
def receive = {
case p: Person ⇒
Thread.sleep(500)
- case "hello-reply" ⇒ self.reply("hello")
+ case "hello-reply" ⇒ reply("hello")
}
}
diff --git a/akka-samples/akka-sample-camel/src/main/java/sample/camel/UntypedConsumer1.java b/akka-samples/akka-sample-camel/src/main/java/sample/camel/UntypedConsumer1.java
index b84792ed89..8a09ed2c0f 100644
--- a/akka-samples/akka-sample-camel/src/main/java/sample/camel/UntypedConsumer1.java
+++ b/akka-samples/akka-sample-camel/src/main/java/sample/camel/UntypedConsumer1.java
@@ -15,6 +15,6 @@ public class UntypedConsumer1 extends UntypedConsumerActor {
public void onReceive(Object message) {
Message msg = (Message)message;
String body = msg.getBodyAs(String.class);
- getContext().tryReply(String.format("received %s", body));
+ tryReply(String.format("received %s", body));
}
}
diff --git a/akka-samples/akka-sample-camel/src/main/scala/sample/camel/Actors.scala b/akka-samples/akka-sample-camel/src/main/scala/sample/camel/Actors.scala
index 745dbcaa6c..1208e5fae0 100644
--- a/akka-samples/akka-sample-camel/src/main/scala/sample/camel/Actors.scala
+++ b/akka-samples/akka-sample-camel/src/main/scala/sample/camel/Actors.scala
@@ -12,7 +12,7 @@ class RemoteActor1 extends Actor with Consumer {
def endpointUri = "jetty:http://localhost:6644/camel/remote-actor-1"
protected def receive = {
- case msg: Message ⇒ self.reply(Message("hello %s" format msg.bodyAs[String], Map("sender" -> "remote1")))
+ case msg: Message ⇒ reply(Message("hello %s" format msg.bodyAs[String], Map("sender" -> "remote1")))
}
}
@@ -23,7 +23,7 @@ class RemoteActor2 extends Actor with Consumer {
def endpointUri = "jetty:http://localhost:6644/camel/remote-actor-2"
protected def receive = {
- case msg: Message ⇒ self.reply(Message("hello %s" format msg.bodyAs[String], Map("sender" -> "remote2")))
+ case msg: Message ⇒ reply(Message("hello %s" format msg.bodyAs[String], Map("sender" -> "remote2")))
}
}
@@ -44,7 +44,7 @@ class Consumer2 extends Actor with Consumer {
def endpointUri = "jetty:http://0.0.0.0:8877/camel/default"
def receive = {
- case msg: Message ⇒ self.reply("Hello %s" format msg.bodyAs[String])
+ case msg: Message ⇒ reply("Hello %s" format msg.bodyAs[String])
}
}
@@ -62,10 +62,10 @@ class Consumer4 extends Actor with Consumer {
def receive = {
case msg: Message ⇒ msg.bodyAs[String] match {
case "stop" ⇒ {
- self.reply("Consumer4 stopped")
+ reply("Consumer4 stopped")
self.stop
}
- case body ⇒ self.reply(body)
+ case body ⇒ reply(body)
}
}
}
@@ -76,7 +76,7 @@ class Consumer5 extends Actor with Consumer {
def receive = {
case _ ⇒ {
Actor.actorOf[Consumer4]
- self.reply("Consumer4 started")
+ reply("Consumer4 started")
}
}
}
@@ -106,7 +106,7 @@ class PublisherBridge(uri: String, publisher: ActorRef) extends Actor with Consu
protected def receive = {
case msg: Message ⇒ {
publisher ! msg.bodyAs[String]
- self.reply("message published")
+ reply("message published")
}
}
}
@@ -135,8 +135,8 @@ class HttpProducer(transformer: ActorRef) extends Actor with Producer {
class HttpTransformer extends Actor {
protected def receive = {
- case msg: Message ⇒ self.reply(msg.transformBody { body: String ⇒ body replaceAll ("Akka ", "AKKA ") })
- case msg: Failure ⇒ self.reply(msg)
+ case msg: Message ⇒ reply(msg.transformBody { body: String ⇒ body replaceAll ("Akka ", "AKKA ") })
+ case msg: Failure ⇒ reply(msg)
}
}
@@ -150,11 +150,11 @@ class FileConsumer extends Actor with Consumer {
case msg: Message ⇒ {
if (counter == 2) {
println("received %s" format msg.bodyAs[String])
- self.reply(Ack)
+ reply(Ack)
} else {
println("rejected %s" format msg.bodyAs[String])
counter += 1
- self.reply(Failure(new Exception("message number %s not accepted" format counter)))
+ reply(Failure(new Exception("message number %s not accepted" format counter)))
}
}
}
diff --git a/akka-samples/akka-sample-camel/src/test/java/sample/camel/SampleRemoteUntypedConsumer.java b/akka-samples/akka-sample-camel/src/test/java/sample/camel/SampleRemoteUntypedConsumer.java
index 04f414a89b..b0f3486e9a 100644
--- a/akka-samples/akka-sample-camel/src/test/java/sample/camel/SampleRemoteUntypedConsumer.java
+++ b/akka-samples/akka-sample-camel/src/test/java/sample/camel/SampleRemoteUntypedConsumer.java
@@ -15,7 +15,7 @@ public class SampleRemoteUntypedConsumer extends UntypedConsumerActor {
Message msg = (Message)message;
String body = msg.getBodyAs(String.class);
String header = msg.getHeaderAs("test", String.class);
- getContext().tryReply(String.format("%s %s", body, header));
+ tryReply(String.format("%s %s", body, header));
}
}
diff --git a/akka-samples/akka-sample-camel/src/test/scala/sample/camel/HttpConcurrencyTestStress.scala b/akka-samples/akka-sample-camel/src/test/scala/sample/camel/HttpConcurrencyTestStress.scala
index ee9532de17..a1e15b01b3 100644
--- a/akka-samples/akka-sample-camel/src/test/scala/sample/camel/HttpConcurrencyTestStress.scala
+++ b/akka-samples/akka-sample-camel/src/test/scala/sample/camel/HttpConcurrencyTestStress.scala
@@ -66,7 +66,7 @@ object HttpConcurrencyTestStress {
var correlationIds = Set[Any]()
override protected def receive = {
- case "getCorrelationIdCount" ⇒ self.reply(correlationIds.size)
+ case "getCorrelationIdCount" ⇒ reply(correlationIds.size)
case msg ⇒ super.receive(msg)
}
@@ -93,7 +93,7 @@ object HttpConcurrencyTestStress {
class HttpServerWorker extends Actor {
protected def receive = {
- case msg ⇒ self.reply(msg)
+ case msg ⇒ reply(msg)
}
}
}
diff --git a/akka-samples/akka-sample-camel/src/test/scala/sample/camel/RemoteConsumerTest.scala b/akka-samples/akka-sample-camel/src/test/scala/sample/camel/RemoteConsumerTest.scala
index 452a60153f..79ddae9bbc 100644
--- a/akka-samples/akka-sample-camel/src/test/scala/sample/camel/RemoteConsumerTest.scala
+++ b/akka-samples/akka-sample-camel/src/test/scala/sample/camel/RemoteConsumerTest.scala
@@ -94,8 +94,8 @@ object RemoteConsumerTest {
def endpointUri = "direct:remote-consumer"
protected def receive = {
- case "init" ⇒ self.reply("done")
- case m: Message ⇒ self.reply("remote actor: %s" format m.body)
+ case "init" ⇒ reply("done")
+ case m: Message ⇒ reply("remote actor: %s" format m.body)
}
}
}
diff --git a/akka-samples/akka-sample-chat/src/main/scala/ChatServer.scala b/akka-samples/akka-sample-chat/src/main/scala/ChatServer.scala
index b9ad4387ff..bc9de6bd2e 100644
--- a/akka-samples/akka-sample-chat/src/main/scala/ChatServer.scala
+++ b/akka-samples/akka-sample-chat/src/main/scala/ChatServer.scala
@@ -92,8 +92,6 @@
* Memory-backed chat storage implementation.
*/
class MemoryChatStorage extends ChatStorage {
- self.lifeCycle = Permanent
-
private var chatLog = TransactionalVector[Array[Byte]]()
EventHandler.info(this, "Memory-based chat storage is starting up...")
@@ -105,7 +103,7 @@
case GetChatLog(_) =>
val messageList = atomic { chatLog.map(bytes => new String(bytes, "UTF-8")).toList }
- self.reply(ChatLog(messageList))
+ reply(ChatLog(messageList))
}
override def postRestart(reason: Throwable) {
@@ -176,7 +174,7 @@
* Chat server. Manages sessions and redirects all other messages to the Session for the client.
*/
trait ChatServer extends Actor {
- self.faultHandler = OneForOnePermanentStrategy(List(classOf[Exception]),5, 5000)
+ //faultHandler = OneForOnePermanentStrategy(List(classOf[Exception]),5, 5000)
val storage: ActorRef
EventHandler.info(this, "Chat server is starting up...")
diff --git a/akka-samples/akka-sample-fsm/src/main/scala/DiningHakkersOnFsm.scala b/akka-samples/akka-sample-fsm/src/main/scala/DiningHakkersOnFsm.scala
index 014afec2c4..b59966c5ae 100644
--- a/akka-samples/akka-sample-fsm/src/main/scala/DiningHakkersOnFsm.scala
+++ b/akka-samples/akka-sample-fsm/src/main/scala/DiningHakkersOnFsm.scala
@@ -38,7 +38,7 @@ class Chopstick(name: String) 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(self.channel) replying Taken(self)
+ goto(Taken) using TakenBy(channel) replying Taken(self)
}
// When a chopstick is taken by a hakker
@@ -47,7 +47,7 @@ class Chopstick(name: String) extends Actor with FSM[ChopstickState, TakenBy] {
when(Taken) {
case Event(Take, currentState) ⇒
stay replying Busy(self)
- case Event(Put, TakenBy(hakker)) if self.channel == hakker ⇒
+ case Event(Put, TakenBy(hakker)) if channel == hakker ⇒
goto(Available) using TakenBy(NullChannel)
}
diff --git a/akka-samples/akka-sample-osgi/src/main/scala/OsgiExample.scala b/akka-samples/akka-sample-osgi/src/main/scala/OsgiExample.scala
index 3744061e23..3e2d7af049 100644
--- a/akka-samples/akka-sample-osgi/src/main/scala/OsgiExample.scala
+++ b/akka-samples/akka-sample-osgi/src/main/scala/OsgiExample.scala
@@ -26,6 +26,6 @@ class Activator extends BundleActivator {
class EchoActor extends Actor {
override def receive = {
- case x => self.reply(x)
+ case x => reply(x)
}
}
diff --git a/akka-samples/akka-sample-remote/src/main/scala/ServerManagedRemoteActorSample.scala b/akka-samples/akka-sample-remote/src/main/scala/ServerManagedRemoteActorSample.scala
index f3969112ef..84a201f530 100644
--- a/akka-samples/akka-sample-remote/src/main/scala/ServerManagedRemoteActorSample.scala
+++ b/akka-samples/akka-sample-remote/src/main/scala/ServerManagedRemoteActorSample.scala
@@ -10,7 +10,7 @@ import akka.actor. {ActorRegistry, Actor}
class HelloWorldActor extends Actor {
def receive = {
case "Hello" =>
- self.reply("World")
+ reply("World")
}
}
diff --git a/akka-sbt-plugin/src/main/scala/AkkaKernelPlugin.scala b/akka-sbt-plugin/src/main/scala/AkkaKernelPlugin.scala
index 7d3ba32117..3343fb93e7 100644
--- a/akka-sbt-plugin/src/main/scala/AkkaKernelPlugin.scala
+++ b/akka-sbt-plugin/src/main/scala/AkkaKernelPlugin.scala
@@ -38,7 +38,7 @@ object AkkaKernelPlugin extends Plugin {
val distNeedsPackageBin = dist <<= dist.dependsOn(packageBin in Compile)
- override lazy val settings =
+ lazy val distSettings: Seq[Setting[_]] =
inConfig(Dist)(Seq(
dist <<= packageBin.identity,
packageBin <<= distTask,
diff --git a/akka-stm/src/main/scala/akka/agent/Agent.scala b/akka-stm/src/main/scala/akka/agent/Agent.scala
index 2d044f1e13..37598b49ab 100644
--- a/akka-stm/src/main/scala/akka/agent/Agent.scala
+++ b/akka-stm/src/main/scala/akka/agent/Agent.scala
@@ -284,8 +284,8 @@ class AgentUpdater[T](agent: Agent[T]) extends Actor {
def receive = {
case update: Update[_] ⇒
- self.tryReply(atomic(txFactory) { agent.ref alter update.function.asInstanceOf[T ⇒ T] })
- case Get ⇒ self reply agent.get
+ tryReply(atomic(txFactory) { agent.ref alter update.function.asInstanceOf[T ⇒ T] })
+ case Get ⇒ reply(agent.get)
case _ ⇒ ()
}
}
@@ -298,7 +298,7 @@ class ThreadBasedAgentUpdater[T](agent: Agent[T]) extends Actor {
def receive = {
case update: Update[_] ⇒ try {
- self.tryReply(atomic(txFactory) { agent.ref alter update.function.asInstanceOf[T ⇒ T] })
+ tryReply(atomic(txFactory) { agent.ref alter update.function.asInstanceOf[T ⇒ T] })
} finally {
agent.resume()
self.stop()
diff --git a/akka-stm/src/test/java/akka/transactor/example/UntypedCoordinatedCounter.java b/akka-stm/src/test/java/akka/transactor/example/UntypedCoordinatedCounter.java
index 10420b4f9e..128a25bcf0 100644
--- a/akka-stm/src/test/java/akka/transactor/example/UntypedCoordinatedCounter.java
+++ b/akka-stm/src/test/java/akka/transactor/example/UntypedCoordinatedCounter.java
@@ -32,7 +32,7 @@ public class UntypedCoordinatedCounter extends UntypedActor {
} else if (incoming instanceof String) {
String message = (String) incoming;
if (message.equals("GetCount")) {
- getContext().reply(count.get());
+ reply(count.get());
}
}
}
diff --git a/akka-stm/src/test/java/akka/transactor/example/UntypedCounter.java b/akka-stm/src/test/java/akka/transactor/example/UntypedCounter.java
index 54f03eb809..5cad6e0e64 100644
--- a/akka-stm/src/test/java/akka/transactor/example/UntypedCounter.java
+++ b/akka-stm/src/test/java/akka/transactor/example/UntypedCounter.java
@@ -26,7 +26,7 @@ public class UntypedCounter extends UntypedTransactor {
@Override public boolean normally(Object message) {
if ("GetCount".equals(message)) {
- getContext().reply(count.get());
+ reply(count.get());
return true;
} else return false;
}
diff --git a/akka-stm/src/test/java/akka/transactor/test/UntypedCoordinatedCounter.java b/akka-stm/src/test/java/akka/transactor/test/UntypedCoordinatedCounter.java
index abde886454..c23d961055 100644
--- a/akka-stm/src/test/java/akka/transactor/test/UntypedCoordinatedCounter.java
+++ b/akka-stm/src/test/java/akka/transactor/test/UntypedCoordinatedCounter.java
@@ -57,7 +57,7 @@ public class UntypedCoordinatedCounter extends UntypedActor {
} else if (incoming instanceof String) {
String message = (String) incoming;
if (message.equals("GetCount")) {
- getContext().reply(count.get());
+ reply(count.get());
}
}
}
diff --git a/akka-stm/src/test/java/akka/transactor/test/UntypedCounter.java b/akka-stm/src/test/java/akka/transactor/test/UntypedCounter.java
index 14d6e453f9..1b561a2d25 100644
--- a/akka-stm/src/test/java/akka/transactor/test/UntypedCounter.java
+++ b/akka-stm/src/test/java/akka/transactor/test/UntypedCounter.java
@@ -70,7 +70,7 @@ public class UntypedCounter extends UntypedTransactor {
@Override public boolean normally(Object message) {
if ("GetCount".equals(message)) {
- getContext().reply(count.get());
+ reply(count.get());
return true;
} else return false;
}
diff --git a/akka-stm/src/test/scala/transactor/CoordinatedIncrementSpec.scala b/akka-stm/src/test/scala/transactor/CoordinatedIncrementSpec.scala
index 10bf440fc0..9b0b8106a3 100644
--- a/akka-stm/src/test/scala/transactor/CoordinatedIncrementSpec.scala
+++ b/akka-stm/src/test/scala/transactor/CoordinatedIncrementSpec.scala
@@ -35,7 +35,7 @@ object CoordinatedIncrement {
}
}
- case GetCount ⇒ self.reply(count.get)
+ case GetCount ⇒ reply(count.get)
}
}
diff --git a/akka-stm/src/test/scala/transactor/FickleFriendsSpec.scala b/akka-stm/src/test/scala/transactor/FickleFriendsSpec.scala
index 83e86d1e28..8c724654c7 100644
--- a/akka-stm/src/test/scala/transactor/FickleFriendsSpec.scala
+++ b/akka-stm/src/test/scala/transactor/FickleFriendsSpec.scala
@@ -55,7 +55,7 @@ object FickleFriends {
}
}
- case GetCount ⇒ self.reply(count.get)
+ case GetCount ⇒ reply(count.get)
}
}
@@ -92,7 +92,7 @@ object FickleFriends {
}
}
- case GetCount ⇒ self.reply(count.get)
+ case GetCount ⇒ reply(count.get)
}
}
}
diff --git a/akka-stm/src/test/scala/transactor/TransactorSpec.scala b/akka-stm/src/test/scala/transactor/TransactorSpec.scala
index 385bc3bd7b..cc63d60b2e 100644
--- a/akka-stm/src/test/scala/transactor/TransactorSpec.scala
+++ b/akka-stm/src/test/scala/transactor/TransactorSpec.scala
@@ -50,7 +50,7 @@ object TransactorIncrement {
}
override def normally = {
- case GetCount ⇒ self.reply(count.get)
+ case GetCount ⇒ reply(count.get)
}
}
diff --git a/akka-testkit/src/main/scala/akka/testkit/TestActorRef.scala b/akka-testkit/src/main/scala/akka/testkit/TestActorRef.scala
index 01bf530c2b..966f98debb 100644
--- a/akka-testkit/src/main/scala/akka/testkit/TestActorRef.scala
+++ b/akka-testkit/src/main/scala/akka/testkit/TestActorRef.scala
@@ -47,7 +47,7 @@ class TestActorRef[T <: Actor](props: Props, address: String) extends LocalActor
*/
override def supervisor_=(a: Option[ActorRef]) {
a match { //TODO This should probably be removed since the Supervisor could be a remote actor for all we know
- case Some(l: SelfActorRef) if !l.dispatcher.isInstanceOf[CallingThreadDispatcher] ⇒
+ case Some(l: LocalActorRef) if !l.underlying.dispatcher.isInstanceOf[CallingThreadDispatcher] ⇒
EventHandler.warning(this, "supervisor " + l + " does not use CallingThreadDispatcher")
case _ ⇒
}
diff --git a/akka-testkit/src/main/scala/akka/testkit/TestKit.scala b/akka-testkit/src/main/scala/akka/testkit/TestKit.scala
index c3f10af5f9..8485f41768 100644
--- a/akka-testkit/src/main/scala/akka/testkit/TestKit.scala
+++ b/akka-testkit/src/main/scala/akka/testkit/TestKit.scala
@@ -45,7 +45,7 @@ class TestActor(queue: BlockingDeque[TestActor.Message]) extends Actor with FSM[
case Event(x: AnyRef, ign) ⇒
val ignore = ign map (z ⇒ if (z isDefinedAt x) z(x) else false) getOrElse false
if (!ignore) {
- queue.offerLast(RealMessage(x, self.channel))
+ queue.offerLast(RealMessage(x, channel))
}
stay
}
diff --git a/akka-testkit/src/test/scala/akka/testkit/TestActorRefSpec.scala b/akka-testkit/src/test/scala/akka/testkit/TestActorRefSpec.scala
index 60e21fbe4c..0050d6dca3 100644
--- a/akka-testkit/src/test/scala/akka/testkit/TestActorRefSpec.scala
+++ b/akka-testkit/src/test/scala/akka/testkit/TestActorRefSpec.scala
@@ -40,22 +40,22 @@ object TestActorRefSpec {
def receiveT = {
case "complexRequest" ⇒ {
- replyTo = self.channel
+ replyTo = channel
val worker = TestActorRef(Props[WorkerActor])
worker ! "work"
}
case "complexRequest2" ⇒
val worker = TestActorRef(Props[WorkerActor])
- worker ! self.channel
+ worker ! channel
case "workDone" ⇒ replyTo ! "complexReply"
- case "simpleRequest" ⇒ self.reply("simpleReply")
+ case "simpleRequest" ⇒ reply("simpleReply")
}
}
class WorkerActor() extends TActor {
def receiveT = {
case "work" ⇒ {
- self.reply("workDone")
+ reply("workDone")
self.stop()
}
case replyTo: UntypedChannel ⇒ {
@@ -111,7 +111,7 @@ class TestActorRefSpec extends WordSpec with MustMatchers with BeforeAndAfterEac
"used with TestActorRef" in {
val a = TestActorRef(Props(new Actor {
val nested = TestActorRef(Props(self ⇒ { case _ ⇒ }))
- def receive = { case _ ⇒ self reply nested }
+ def receive = { case _ ⇒ reply(nested) }
}))
a must not be (null)
val nested = (a ? "any").as[ActorRef].get
@@ -122,7 +122,7 @@ class TestActorRefSpec extends WordSpec with MustMatchers with BeforeAndAfterEac
"used with ActorRef" in {
val a = TestActorRef(Props(new Actor {
val nested = Actor.actorOf(Props(self ⇒ { case _ ⇒ }))
- def receive = { case _ ⇒ self reply nested }
+ def receive = { case _ ⇒ reply(nested) }
}))
a must not be (null)
val nested = (a ? "any").as[ActorRef].get
@@ -216,12 +216,12 @@ class TestActorRefSpec extends WordSpec with MustMatchers with BeforeAndAfterEac
"set receiveTimeout to None" in {
val a = TestActorRef[WorkerActor]
- a.receiveTimeout must be(None)
+ a.underlyingActor.receiveTimeout must be(None)
}
"set CallingThreadDispatcher" in {
val a = TestActorRef[WorkerActor]
- a.dispatcher.getClass must be(classOf[CallingThreadDispatcher])
+ a.underlying.dispatcher.getClass must be(classOf[CallingThreadDispatcher])
}
"warn about scheduled supervisor" in {
diff --git a/akka-tutorials/akka-tutorial-first/src/main/java/akka/tutorial/first/java/Pi.java b/akka-tutorials/akka-tutorial-first/src/main/java/akka/tutorial/first/java/Pi.java
index 9eb219ec56..b05e1e800f 100644
--- a/akka-tutorials/akka-tutorial-first/src/main/java/akka/tutorial/first/java/Pi.java
+++ b/akka-tutorials/akka-tutorial-first/src/main/java/akka/tutorial/first/java/Pi.java
@@ -78,7 +78,7 @@ public class Pi {
double result = calculatePiFor(work.getStart(), work.getNrOfElements());
// reply with the result
- getContext().reply(new Result(result));
+ reply(new Result(result));
} else throw new IllegalArgumentException("Unknown message [" + message + "]");
}
@@ -118,7 +118,7 @@ public class Pi {
if (message instanceof Calculate) {
// schedule work
for (int start = 0; start < nrOfMessages; start++) {
- router.tell(new Work(start, nrOfElements), getContext());
+ router.tell(new Work(start, nrOfElements), getSelf());
}
// send a PoisonPill to all workers telling them to shut down themselves
@@ -133,7 +133,7 @@ public class Pi {
Result result = (Result) message;
pi += result.getValue();
nrOfResults += 1;
- if (nrOfResults == nrOfMessages) getContext().stop();
+ if (nrOfResults == nrOfMessages) getSelf().stop();
} else throw new IllegalArgumentException("Unknown message [" + message + "]");
}
diff --git a/akka-tutorials/akka-tutorial-first/src/main/scala/Pi.scala b/akka-tutorials/akka-tutorial-first/src/main/scala/Pi.scala
index 1c5b876536..eb5db541c9 100644
--- a/akka-tutorials/akka-tutorial-first/src/main/scala/Pi.scala
+++ b/akka-tutorials/akka-tutorial-first/src/main/scala/Pi.scala
@@ -40,7 +40,7 @@ object Pi extends App {
def receive = {
case Work(start, nrOfElements) ⇒
- self reply Result(calculatePiFor(start, nrOfElements)) // perform the work
+ reply(Result(calculatePiFor(start, nrOfElements))) // perform the work
}
}
diff --git a/akka-tutorials/akka-tutorial-second/src/main/java/akka/tutorial/java/second/Pi.java b/akka-tutorials/akka-tutorial-second/src/main/java/akka/tutorial/java/second/Pi.java
index 304e4f76a1..391feec26f 100644
--- a/akka-tutorials/akka-tutorial-second/src/main/java/akka/tutorial/java/second/Pi.java
+++ b/akka-tutorials/akka-tutorial-second/src/main/java/akka/tutorial/java/second/Pi.java
@@ -76,7 +76,7 @@ public class Pi {
public void onReceive(Object message) {
if (message instanceof Work) {
Work work = (Work) message;
- getContext().reply(new Result(calculatePiFor(work.getArg(), work.getNrOfElements()))); // perform the work
+ reply(new Result(calculatePiFor(work.getArg(), work.getNrOfElements()))); // perform the work
} else throw new IllegalArgumentException("Unknown message [" + message + "]");
}
}
@@ -120,10 +120,10 @@ public class Pi {
public void apply(Object msg) {
// schedule work
for (int arg = 0; arg < nrOfMessages; arg++) {
- router.tell(new Work(arg, nrOfElements), getContext());
+ router.tell(new Work(arg, nrOfElements), getSelf());
}
// Assume the gathering behavior
- become(gather(getContext().getChannel()));
+ become(gather(getChannel()));
}
};
@@ -138,7 +138,7 @@ public class Pi {
// send the pi result back to the guy who started the calculation
recipient.tell(pi);
// shut ourselves down, we're done
- getContext().stop();
+ getSelf().stop();
}
}
};
diff --git a/akka-tutorials/akka-tutorial-second/src/main/scala/Pi.scala b/akka-tutorials/akka-tutorial-second/src/main/scala/Pi.scala
index 6fe8d222ba..5fd4559a06 100644
--- a/akka-tutorials/akka-tutorial-second/src/main/scala/Pi.scala
+++ b/akka-tutorials/akka-tutorial-second/src/main/scala/Pi.scala
@@ -38,7 +38,7 @@ object Pi extends App {
def receive = {
case Work(arg, nrOfElements) ⇒
- self reply Result(calculatePiFor(arg, nrOfElements)) // perform the work
+ reply(Result(calculatePiFor(arg, nrOfElements))) // perform the work
}
}
@@ -62,7 +62,7 @@ object Pi extends App {
for (arg ← 0 until nrOfMessages) router ! Work(arg, nrOfElements)
//Assume the gathering behavior
- this become gather(self.channel)
+ this become gather(channel)
}
// phase 2, aggregate the results of the Calculation
diff --git a/project/AkkaBuild.scala b/project/AkkaBuild.scala
index 5b369a7b4d..33705bb857 100644
--- a/project/AkkaBuild.scala
+++ b/project/AkkaBuild.scala
@@ -331,7 +331,8 @@ object AkkaBuild extends Build {
testExcludes := akkaTestExcludes,
testOptions in Test <++= testExcludes map { _.map(exclude => Tests.Filter(test => !test.contains(exclude))) },
- testOptions in Test += Tests.Argument("-oF") //Gimmeh gud stacktraces plz
+ // show full stack traces
+ testOptions in Test += Tests.Argument("-oF")
)
lazy val formatSettings = ScalariformPlugin.settings ++ Seq(