Merge remote-tracking branch 'origin/master' into testing-2.9.2

akka-docs/java/code/akka/docs/dispatcher/DispatcherDocTestBase.java

@@ -60,19 +60,17 @@ public class DispatcherDocTestBase {
   @Test
   public void defineDispatcher() {
     //#defining-dispatcher
-    ActorRef myActor1 = system.actorOf(new Props(MyUntypedActor.class).withDispatcher("my-dispatcher"),
-        "myactor1");
-    ActorRef myActor2 = system.actorOf(new Props(MyUntypedActor.class).withDispatcher("my-dispatcher"),
-        "myactor2");
+    ActorRef myActor =
+      system.actorOf(new Props(MyUntypedActor.class).withDispatcher("my-dispatcher"),
+        "myactor3");
     //#defining-dispatcher
   }
 
   @Test
   public void definePinnedDispatcher() {
     //#defining-pinned-dispatcher
-    String name = "myactor";
     ActorRef myActor = system.actorOf(new Props(MyUntypedActor.class)
-        .withDispatcher("myactor-dispatcher"), name);
+        .withDispatcher("my-pinned-dispatcher"));
     //#defining-pinned-dispatcher
   }
 
@@ -80,11 +78,13 @@ public class DispatcherDocTestBase {
   public void priorityDispatcher() throws Exception {
     //#prio-dispatcher
 
-    ActorRef myActor = system.actorOf( // We create a new Actor that just prints out what it processes
+      // We create a new Actor that just prints out what it processes
+    ActorRef myActor = system.actorOf(
         new Props().withCreator(new UntypedActorFactory() {
           public UntypedActor create() {
             return new UntypedActor() {
-              LoggingAdapter log = Logging.getLogger(getContext().system(), this);
+              LoggingAdapter log =
+                      Logging.getLogger(getContext().system(), this);
               {
                 getSelf().tell("lowpriority");
                 getSelf().tell("lowpriority");
@@ -101,7 +101,7 @@ public class DispatcherDocTestBase {
               }
             };
           }
-        }).withDispatcher("prio-dispatcher-java"));
+        }).withDispatcher("prio-dispatcher"));
 
     /*
     Logs:
@@ -123,19 +123,20 @@ public class DispatcherDocTestBase {
   }
 
   //#prio-mailbox
-  public static class PrioMailbox extends UnboundedPriorityMailbox {
-    public PrioMailbox(Config config) { // needed for reflective instantiation
-      super(new PriorityGenerator() { // Create a new PriorityGenerator, lower prio means more important
+  public static class MyPrioMailbox extends UnboundedPriorityMailbox {
+    public MyPrioMailbox(ActorSystem.Settings settings, Config config) { // needed for reflective instantiation
+      // Create a new PriorityGenerator, lower prio means more important
+      super(new PriorityGenerator() {
         @Override
         public int gen(Object message) {
           if (message.equals("highpriority"))
             return 0; // 'highpriority messages should be treated first if possible
           else if (message.equals("lowpriority"))
-            return 100; // 'lowpriority messages should be treated last if possible
+            return 2; // 'lowpriority messages should be treated last if possible
           else if (message.equals(Actors.poisonPill()))
-            return 1000; // PoisonPill when no other left
+            return 3; // PoisonPill when no other left
           else
-            return 50; // We default to 50
+            return 1; // By default they go between high and low prio
         }
       });
     }

akka-docs/java/code/akka/docs/jrouting/RouterViaProgramExample.java

@@ -11,7 +11,7 @@ import akka.actor.Props;
 import akka.actor.UntypedActor;
 import akka.actor.ActorSystem;
 import akka.actor.Address;
-import akka.actor.AddressExtractor;
+import akka.actor.AddressFromURIString;
 import java.util.Arrays;
 
 public class RouterViaProgramExample {
@@ -73,7 +73,7 @@ public class RouterViaProgramExample {
     
     //#remoteRoutees
     Address addr1 = new Address("akka", "remotesys", "otherhost", 1234);
-    Address addr2 = AddressExtractor.parse("akka://othersys@anotherhost:1234");
+    Address addr2 = AddressFromURIString.parse("akka://othersys@anotherhost:1234");
     Address[] addresses = new Address[] { addr1, addr2 };
     ActorRef routerRemote = system.actorOf(new Props(ExampleActor.class)
       .withRouter(new RemoteRouterConfig(new RoundRobinRouter(5), addresses)));

akka-docs/java/code/akka/docs/remoting/RemoteDeploymentDocTestBase.java

@@ -10,7 +10,7 @@ import org.junit.Test;
 //#import
 import akka.actor.ActorRef;
 import akka.actor.Address;
-import akka.actor.AddressExtractor;
+import akka.actor.AddressFromURIString;
 import akka.actor.Deploy;
 import akka.actor.Props;
 import akka.actor.ActorSystem;
@@ -35,7 +35,7 @@ public class RemoteDeploymentDocTestBase {
   public void demonstrateDeployment() {
     //#make-address
     Address addr = new Address("akka", "sys", "host", 1234);
-    addr = AddressExtractor.parse("akka://sys@host:1234"); // the same
+    addr = AddressFromURIString.parse("akka://sys@host:1234"); // the same
     //#make-address
     //#deploy
     ActorRef ref = system.actorOf(new Props(RemoteDeploymentDocSpec.Echo.class).withDeploy(new Deploy(new RemoteScope(addr))));