remove all but one occurrence of single-arg tell()

akka-docs/java/code/docs/actor/FSMDocTestBase.java

@@ -147,7 +147,7 @@ public class FSMDocTestBase {
     @Override
     public void transition(State old, State next) {
       if (old == State.ACTIVE) {
-        getTarget().tell(new Batch(drainQueue()));
+        getTarget().tell(new Batch(drainQueue()), getSelf());
       }
     }
 
@@ -175,11 +175,11 @@ public class FSMDocTestBase {
   public void mustBunch() {
     final ActorRef buncher = system.actorOf(new Props(MyFSM.class));
     final TestProbe probe = new TestProbe(system);
-    buncher.tell(new SetTarget(probe.ref()));
-    buncher.tell(new Queue(1));
-    buncher.tell(new Queue(2));
-    buncher.tell(flush);
-    buncher.tell(new Queue(3));
+    buncher.tell(new SetTarget(probe.ref()), null);
+    buncher.tell(new Queue(1), null);
+    buncher.tell(new Queue(2), null);
+    buncher.tell(flush, null);
+    buncher.tell(new Queue(3), null);
     final Batch b = probe.expectMsgClass(Batch.class);
     assert b.objects.size() == 2;
     assert b.objects.contains(1);

akka-docs/java/code/docs/actor/FaultHandlingTestBase.java

@@ -64,7 +64,7 @@ public class FaultHandlingTestBase {
 
     public void onReceive(Object o) {
       if (o instanceof Props) {
-        getSender().tell(getContext().actorOf((Props) o));
+        getSender().tell(getContext().actorOf((Props) o), getSelf());
       } else {
         unhandled(o);
       }
@@ -102,7 +102,7 @@ public class FaultHandlingTestBase {
 
     public void onReceive(Object o) {
       if (o instanceof Props) {
-        getSender().tell(getContext().actorOf((Props) o));
+        getSender().tell(getContext().actorOf((Props) o), getSelf());
       } else {
         unhandled(o);
       }
@@ -126,7 +126,7 @@ public class FaultHandlingTestBase {
       } else if (o instanceof Integer) {
         state = (Integer) o;
       } else if (o.equals("get")) {
-        getSender().tell(state);
+        getSender().tell(state, getSelf());
       } else {
         unhandled(o);
       }
@@ -167,21 +167,21 @@ public class FaultHandlingTestBase {
     //#create
 
     //#resume
-    child.tell(42);
+    child.tell(42, null);
     assert Await.result(ask(child, "get", 5000), timeout).equals(42);
-    child.tell(new ArithmeticException());
+    child.tell(new ArithmeticException(), null);
     assert Await.result(ask(child, "get", 5000), timeout).equals(42);
     //#resume
 
     //#restart
-    child.tell(new NullPointerException());
+    child.tell(new NullPointerException(), null);
     assert Await.result(ask(child, "get", 5000), timeout).equals(0);
     //#restart
 
     //#stop
     final TestProbe probe = new TestProbe(system);
     probe.watch(child);
-    child.tell(new IllegalArgumentException());
+    child.tell(new IllegalArgumentException(), null);
     probe.expectMsgClass(Terminated.class);
     //#stop
 
@@ -189,7 +189,7 @@ public class FaultHandlingTestBase {
     child = (ActorRef) Await.result(ask(supervisor, new Props(Child.class), 5000), timeout);
     probe.watch(child);
     assert Await.result(ask(child, "get", 5000), timeout).equals(0);
-    child.tell(new Exception());
+    child.tell(new Exception(), null);
     probe.expectMsgClass(Terminated.class);
     //#escalate-kill
 
@@ -197,9 +197,9 @@ public class FaultHandlingTestBase {
     superprops = new Props(Supervisor2.class);
     supervisor = system.actorOf(superprops);
     child = (ActorRef) Await.result(ask(supervisor, new Props(Child.class), 5000), timeout);
-    child.tell(23);
+    child.tell(23, null);
     assert Await.result(ask(child, "get", 5000), timeout).equals(23);
-    child.tell(new Exception());
+    child.tell(new Exception(), null);
     assert Await.result(ask(child, "get", 5000), timeout).equals(0);
     //#escalate-restart
     //#testkit

akka-docs/java/code/docs/actor/FirstUntypedActor.java

@@ -16,6 +16,6 @@ public class FirstUntypedActor extends UntypedActor {
 
   public void onReceive(Object message) {
     myActor.forward(message, getContext());
-    myActor.tell(PoisonPill.getInstance());
+    myActor.tell(PoisonPill.getInstance(), null);
   }
 }

akka-docs/java/code/docs/actor/MyReceivedTimeoutUntypedActor.java

@@ -16,7 +16,7 @@ public class MyReceivedTimeoutUntypedActor extends UntypedActor {
 
   public void onReceive(Object message) {
     if (message.equals("Hello")) {
-      getSender().tell("Hello world");
+      getSender().tell("Hello world", getSelf());
     } else if (message == ReceiveTimeout.getInstance()) {
       throw new RuntimeException("received timeout");
     } else {

akka-docs/java/code/docs/actor/SchedulerDocTestBase.java

@@ -24,7 +24,6 @@ import akka.testkit.AkkaSpec;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
-import static org.junit.Assert.*;
 
 public class SchedulerDocTestBase {
 
@@ -54,7 +53,7 @@ public class SchedulerDocTestBase {
     system.scheduler().scheduleOnce(Duration.create(50, TimeUnit.MILLISECONDS), new Runnable() {
       @Override
       public void run() {
-        testActor.tell(System.currentTimeMillis());
+        testActor.tell(System.currentTimeMillis(), null);
       }
     }, system.dispatcher());
     //#schedule-one-off-thunk

akka-docs/java/code/docs/actor/UntypedActorDocTestBase.java

@@ -54,21 +54,15 @@ import java.util.ArrayList;
 import akka.actor.UntypedActorWithStash;
 //#import-stash
 
-import akka.actor.Props;
 import akka.actor.UntypedActor;
 import akka.actor.UntypedActorFactory;
-import akka.dispatch.MessageDispatcher;
 
 import org.junit.Test;
 import scala.Option;
 import java.lang.Object;
-import java.util.ArrayList;
 import java.util.Iterator;
-import java.util.concurrent.TimeUnit;
 import akka.pattern.Patterns;
 
-import static org.junit.Assert.*;
-
 public class UntypedActorDocTestBase {
 
   @Test
@@ -95,7 +89,7 @@ public class UntypedActorDocTestBase {
     ActorSystem system = ActorSystem.create("MySystem");
     ActorRef myActor = system.actorOf(new Props(MyUntypedActor.class), "myactor");
     //#system-actorOf
-    myActor.tell("test");
+    myActor.tell("test", null);
     system.shutdown();
   }
 
@@ -105,7 +99,7 @@ public class UntypedActorDocTestBase {
     ActorSystem system = ActorSystem.create("MySystem");
     ActorRef myActor = system.actorOf(new Props(MyUntypedActor.class), "myactor");
     //#context-actorOf
-    myActor.tell("test");
+    myActor.tell("test", null);
     system.shutdown();
   }
 
@@ -120,7 +114,7 @@ public class UntypedActorDocTestBase {
       }
     }), "myactor");
     //#creating-constructor
-    myActor.tell("test");
+    myActor.tell("test", null);
     system.shutdown();
   }
 
@@ -130,7 +124,7 @@ public class UntypedActorDocTestBase {
     //#creating-props
     ActorRef myActor = system.actorOf(new Props(MyUntypedActor.class).withDispatcher("my-dispatcher"), "myactor");
     //#creating-props
-    myActor.tell("test");
+    myActor.tell("test", null);
     system.shutdown();
   }
 
@@ -154,7 +148,7 @@ public class UntypedActorDocTestBase {
   public void receiveTimeout() {
     ActorSystem system = ActorSystem.create("MySystem");
     ActorRef myActor = system.actorOf(new Props(MyReceivedTimeoutUntypedActor.class));
-    myActor.tell("Hello");
+    myActor.tell("Hello", null);
     system.shutdown();
   }
 
@@ -163,7 +157,7 @@ public class UntypedActorDocTestBase {
     ActorSystem system = ActorSystem.create("MySystem");
     ActorRef myActor = system.actorOf(new Props(MyUntypedActor.class));
     //#poison-pill
-    myActor.tell(PoisonPill.getInstance());
+    myActor.tell(PoisonPill.getInstance(), null);
     //#poison-pill
     system.shutdown();
   }
@@ -173,7 +167,7 @@ public class UntypedActorDocTestBase {
     ActorSystem system = ActorSystem.create("MySystem");
     ActorRef victim = system.actorOf(new Props(MyUntypedActor.class));
     //#kill
-    victim.tell(Kill.getInstance());
+    victim.tell(Kill.getInstance(), null);
     //#kill
     system.shutdown();
   }
@@ -186,9 +180,9 @@ public class UntypedActorDocTestBase {
         return new HotSwapActor();
       }
     }));
-    myActor.tell("foo");
-    myActor.tell("bar");
-    myActor.tell("bar");
+    myActor.tell("foo", null);
+    myActor.tell("bar", null);
+    myActor.tell("bar", null);
     system.shutdown();
   }
 
@@ -265,7 +259,7 @@ public class UntypedActorDocTestBase {
       try {
         operation();
       } catch (Exception e) {
-        getSender().tell(new akka.actor.Status.Failure(e));
+        getSender().tell(new akka.actor.Status.Failure(e), getSelf());
         throw e;
       }
     }
@@ -298,9 +292,9 @@ public class UntypedActorDocTestBase {
       //#reply-exception
       try {
         String result = operation();
-        getSender().tell(result);
+        getSender().tell(result, getSelf());
       } catch (Exception e) {
-        getSender().tell(new akka.actor.Status.Failure(e));
+        getSender().tell(new akka.actor.Status.Failure(e), getSelf());
         throw e;
       }
       //#reply-exception
@@ -318,7 +312,7 @@ public class UntypedActorDocTestBase {
       @Override
       public void apply(Object message) {
         if (message.equals("bar")) {
-          getSender().tell("I am already angry?");
+          getSender().tell("I am already angry?", getSelf());
         } else if (message.equals("foo")) {
           getContext().become(happy);
         }
@@ -329,7 +323,7 @@ public class UntypedActorDocTestBase {
       @Override
       public void apply(Object message) {
         if (message.equals("bar")) {
-          getSender().tell("I am already happy :-)");
+          getSender().tell("I am already happy :-)", getSelf());
         } else if (message.equals("foo")) {
           getContext().become(angry);
         }
@@ -390,7 +384,7 @@ public class UntypedActorDocTestBase {
       } else if (message instanceof Terminated) {
         final Terminated t = (Terminated) message;
         if (t.getActor() == child) {
-          lastSender.tell("finished");
+          lastSender.tell("finished", getSelf());
         }
       } else {
         unhandled(message);

akka-docs/java/code/docs/actor/UntypedActorSwapper.java

@@ -44,12 +44,12 @@ public class UntypedActorSwapper {
   public static void main(String... args) {
     ActorSystem system = ActorSystem.create("MySystem");
     ActorRef swap = system.actorOf(new Props(Swapper.class));
-    swap.tell(SWAP); // logs Hi
-    swap.tell(SWAP); // logs Ho
-    swap.tell(SWAP); // logs Hi
-    swap.tell(SWAP); // logs Ho
-    swap.tell(SWAP); // logs Hi
-    swap.tell(SWAP); // logs Ho
+    swap.tell(SWAP, null); // logs Hi
+    swap.tell(SWAP, null); // logs Ho
+    swap.tell(SWAP, null); // logs Hi
+    swap.tell(SWAP, null); // logs Ho
+    swap.tell(SWAP, null); // logs Hi
+    swap.tell(SWAP, null); // logs Ho
   }
 
 }