diff --git a/akka-actor-tests/src/test/scala/akka/routing/RoutingSpec.scala b/akka-actor-tests/src/test/scala/akka/routing/RoutingSpec.scala index 962eba6183..1460c81e03 100644 --- a/akka-actor-tests/src/test/scala/akka/routing/RoutingSpec.scala +++ b/akka-actor-tests/src/test/scala/akka/routing/RoutingSpec.scala @@ -29,13 +29,13 @@ class RoutingSpec extends WordSpec with MustMatchers { "be started when constructed" in { val actor1 = Actor.actorOf[TestActor].start - val actor = Routing.newRoutedActorRef("foo", List(actor1), RouterType.Direct) + val actor = Routing.actorOf("foo", List(actor1), RouterType.Direct) actor.isRunning must be(true) } "throw IllegalArgumentException at construction when no connections" in { try { - Routing.newRoutedActorRef("foo", List(), RouterType.Direct) + Routing.actorOf("foo", List(), RouterType.Direct) fail() } catch { case e: IllegalArgumentException ⇒ @@ -53,7 +53,7 @@ class RoutingSpec extends WordSpec with MustMatchers { } }).start() - val routedActor = Routing.newRoutedActorRef("foo", List(connection1), RouterType.Direct) + val routedActor = Routing.actorOf("foo", List(connection1), RouterType.Direct) routedActor ! "hello" routedActor ! "end" @@ -73,7 +73,7 @@ class RoutingSpec extends WordSpec with MustMatchers { } }).start() - val actor = Routing.newRoutedActorRef("foo", List(connection1), RouterType.Direct) + val actor = Routing.actorOf("foo", List(connection1), RouterType.Direct) actor ! Broadcast(1) actor ! "end" @@ -89,13 +89,13 @@ class RoutingSpec extends WordSpec with MustMatchers { "be started when constructed" in { val actor1 = Actor.actorOf[TestActor].start - val actor = Routing.newRoutedActorRef("foo", List(actor1), RouterType.RoundRobin) + val actor = Routing.actorOf("foo", List(actor1), RouterType.RoundRobin) actor.isRunning must be(true) } "throw IllegalArgumentException at construction when no connections" in { try { - Routing.newRoutedActorRef("foo", List(), RouterType.RoundRobin) + Routing.actorOf("foo", List(), RouterType.RoundRobin) fail() } catch { case e: IllegalArgumentException ⇒ @@ -127,7 +127,7 @@ class RoutingSpec extends WordSpec with MustMatchers { } //create the routed actor. - val actor = Routing.newRoutedActorRef("foo", connections, RouterType.RoundRobin) + val actor = Routing.actorOf("foo", connections, RouterType.RoundRobin) //send messages to the actor. for (i ← 0 until iterationCount) { @@ -165,7 +165,7 @@ class RoutingSpec extends WordSpec with MustMatchers { } }).start() - val actor = Routing.newRoutedActorRef("foo", List(connection1, connection2), RouterType.RoundRobin) + val actor = Routing.actorOf("foo", List(connection1, connection2), RouterType.RoundRobin) actor ! Broadcast(1) actor ! Broadcast("end") @@ -187,7 +187,7 @@ class RoutingSpec extends WordSpec with MustMatchers { } }).start() - val actor = Routing.newRoutedActorRef("foo", List(connection1), RouterType.RoundRobin) + val actor = Routing.actorOf("foo", List(connection1), RouterType.RoundRobin) try { actor ? Broadcast(1) @@ -208,13 +208,13 @@ class RoutingSpec extends WordSpec with MustMatchers { val actor1 = Actor.actorOf[TestActor].start - val actor = Routing.newRoutedActorRef("foo", List(actor1), RouterType.Random) + val actor = Routing.actorOf("foo", List(actor1), RouterType.Random) actor.isRunning must be(true) } "throw IllegalArgumentException at construction when no connections" in { try { - Routing.newRoutedActorRef("foo", List(), RouterType.Random) + Routing.actorOf("foo", List(), RouterType.Random) fail() } catch { case e: IllegalArgumentException ⇒ @@ -244,7 +244,7 @@ class RoutingSpec extends WordSpec with MustMatchers { } }).start() - val actor = Routing.newRoutedActorRef("foo", List(connection1, connection2), RouterType.Random) + val actor = Routing.actorOf("foo", List(connection1, connection2), RouterType.Random) actor ! Broadcast(1) actor ! Broadcast("end") @@ -266,7 +266,7 @@ class RoutingSpec extends WordSpec with MustMatchers { } }).start() - val actor = Routing.newRoutedActorRef("foo", List(connection1), RouterType.Random) + val actor = Routing.actorOf("foo", List(connection1), RouterType.Random) try { actor ? Broadcast(1) @@ -286,7 +286,7 @@ class RoutingSpec extends WordSpec with MustMatchers { val actor1 = Actor.actorOf[TestActor].start try { - Routing.newRoutedActorRef("foo", List(actor1), RouterType.LeastCPU) + Routing.actorOf("foo", List(actor1), RouterType.LeastCPU) } catch { case e: IllegalArgumentException ⇒ } @@ -298,7 +298,7 @@ class RoutingSpec extends WordSpec with MustMatchers { val actor1 = Actor.actorOf[TestActor].start try { - Routing.newRoutedActorRef("foo", List(actor1), RouterType.LeastRAM) + Routing.actorOf("foo", List(actor1), RouterType.LeastRAM) } catch { case e: IllegalArgumentException ⇒ } @@ -310,7 +310,7 @@ class RoutingSpec extends WordSpec with MustMatchers { val actor1 = Actor.actorOf[TestActor].start try { - Routing.newRoutedActorRef("foo", List(actor1), RouterType.LeastMessages) + Routing.actorOf("foo", List(actor1), RouterType.LeastMessages) } catch { case e: IllegalArgumentException ⇒ } diff --git a/akka-actor/src/main/scala/akka/routing/Routing.scala b/akka-actor/src/main/scala/akka/routing/Routing.scala index 4b6597393e..a0d5eadbb0 100644 --- a/akka-actor/src/main/scala/akka/routing/Routing.scala +++ b/akka-actor/src/main/scala/akka/routing/Routing.scala @@ -73,7 +73,7 @@ object Routing { * @throws IllegalArgumentException if the number of connections is zero, or if it depends on the actual router implementation * how many connections it can handle. */ - def newRoutedActorRef(actorAddress: String, connections: Iterable[ActorRef], routerType: RouterType): RoutedActorRef = { + def actorOf(actorAddress: String, connections: Iterable[ActorRef], routerType: RouterType): ActorRef = { if (connections.size == 0) throw new IllegalArgumentException("To create a routed actor ref, at least one connection is required") @@ -91,8 +91,8 @@ object Routing { ref.start() } - def newRoundRobinActorRef(actorAddress: String, connections: Iterable[ActorRef]): RoutedActorRef = { - newRoutedActorRef(actorAddress, connections, RoundRobin) + def actorOfWithRoundRobin(actorAddress: String, connections: Iterable[ActorRef]): ActorRef = { + actorOf(actorAddress, connections, RoundRobin) } } @@ -100,7 +100,7 @@ object Routing { * A RoutedActorRef is an ActorRef that has a set of connected ActorRef and it uses a Router to send a message to * on (or more) of these actors. */ -class RoutedActorRef(val address: String, val cons: Iterable[ActorRef]) extends UnsupportedActorRef with ScalaActorRef { +class RoutedActorRef(val address: String, val cons: Iterable[ActorRef]) extends UnsupportedActorRef { this: Router ⇒ def connections: Iterable[ActorRef] = cons diff --git a/akka-cluster/src/main/scala/akka/cluster/ClusterActorRef.scala b/akka-cluster/src/main/scala/akka/cluster/ClusterActorRef.scala index 87b120cf30..a1024316cf 100644 --- a/akka-cluster/src/main/scala/akka/cluster/ClusterActorRef.scala +++ b/akka-cluster/src/main/scala/akka/cluster/ClusterActorRef.scala @@ -25,7 +25,7 @@ import akka.routing.Router class ClusterActorRef private[akka] (inetSocketAddresses: Array[Tuple2[UUID, InetSocketAddress]], val address: String, _timeout: Long) - extends UnsupportedActorRef with ScalaActorRef { + extends UnsupportedActorRef { this: Router ⇒ timeout = _timeout 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 19cd7c45b2..39c91a06df 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 @@ -11,7 +11,7 @@ import akka.actor.Actor._ import akka.actor.{ ActorRegistry, ActorRef, Actor } import akka.camel._ import akka.camel.CamelServiceManager._ -import akka.routing.Routing._ +import akka.routing.Routing /** * @author Martin Krasser @@ -50,7 +50,7 @@ object HttpConcurrencyTestStress { startCamelService val workers = for (i ← 1 to 8) yield actorOf[HttpServerWorker].start - val balancer = newRoundRobinActorRef("loadbalancer", workers) + val balancer = Routing.actorOfWithRoundRobin("loadbalancer", workers) //service.get.awaitEndpointActivation(1) { // actorOf(new HttpServerActor(balancer)).start //} 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 dd026619c8..338133b38b 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 @@ -108,7 +108,7 @@ public class Pi { workers.add(worker); } - router = Routing.newRoundRobinActorRef("pi", JavaConversions.asIterable(workers)); + router = Routing.actorOfWithRoundRobin("pi", JavaConversions.asIterable(workers)); } // message handler 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 03aa6e41b8..b97e22f5a0 100644 --- a/akka-tutorials/akka-tutorial-first/src/main/scala/Pi.scala +++ b/akka-tutorials/akka-tutorial-first/src/main/scala/Pi.scala @@ -55,7 +55,7 @@ object Pi extends App { val workers = Vector.fill(nrOfWorkers)(actorOf[Worker].start()) // wrap them with a load-balancing router - val router = Routing.newRoundRobinActorRef("pi", workers) + val router = Routing.actorOfWithRoundRobin("pi", workers) // message handler def receive = { 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 c5da4f46cb..9fb2343b63 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 @@ -102,7 +102,7 @@ public class Pi { workers.add(worker); } - router = Routing.newRoundRobinActorRef("pi", JavaConversions.asIterable(workers)); + router = Routing.actorOfWithRoundRobin("pi", JavaConversions.asIterable(workers)); } @Override 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 d420ebc179..144457573e 100644 --- a/akka-tutorials/akka-tutorial-second/src/main/scala/Pi.scala +++ b/akka-tutorials/akka-tutorial-second/src/main/scala/Pi.scala @@ -53,7 +53,7 @@ object Pi extends App { val workers = Vector.fill(nrOfWorkers)(actorOf[Worker].start()) // wrap them with a load-balancing router - val router = Routing.newRoundRobinActorRef("pi", workers) + val router = Routing.actorOfWithRoundRobin("pi", workers) // phase 1, can accept a Calculate message def scatter: Receive = {