From 57c5dd00e0934afa4fbd7a4937a99390efaff76f Mon Sep 17 00:00:00 2001 From: Viktor Klang Date: Mon, 7 May 2012 20:37:56 +0200 Subject: [PATCH] Removing akka.actor.Actors since they were deprecated in 2.0.2 --- .../scala/akka/actor/ReceiveTimeoutSpec.scala | 4 -- .../src/main/java/akka/actor/Actors.java | 51 ------------------- .../src/main/scala/akka/actor/FSM.scala | 4 +- .../akka/docs/actor/FirstUntypedActor.java | 4 +- .../actor/MyReceivedTimeoutUntypedActor.java | 3 +- .../docs/actor/UntypedActorDocTestBase.java | 7 +-- .../actor/japi/FaultHandlingDocSample.java | 2 +- .../dispatcher/DispatcherDocTestBase.java | 16 ++---- .../code/akka/docs/camel/Consumers.scala | 8 +-- .../test/java/akka/spring/foo/PingActor.java | 1 - .../transactor/UntypedCoordinatedCounter.java | 1 - 11 files changed, 19 insertions(+), 82 deletions(-) delete mode 100644 akka-actor/src/main/java/akka/actor/Actors.java 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 0a28a8597e..dc08df1c98 100644 --- a/akka-actor-tests/src/test/scala/akka/actor/ReceiveTimeoutSpec.scala +++ b/akka-actor-tests/src/test/scala/akka/actor/ReceiveTimeoutSpec.scala @@ -86,9 +86,5 @@ class ReceiveTimeoutSpec extends AkkaSpec { intercept[TimeoutException] { Await.ready(timeoutLatch, 1 second) } system.stop(timeoutActor) } - - "have ReceiveTimeout eq to Actors ReceiveTimeout" in { - akka.actor.Actors.receiveTimeout must be theSameInstanceAs (ReceiveTimeout) - } } } diff --git a/akka-actor/src/main/java/akka/actor/Actors.java b/akka-actor/src/main/java/akka/actor/Actors.java deleted file mode 100644 index f0ee734c3b..0000000000 --- a/akka-actor/src/main/java/akka/actor/Actors.java +++ /dev/null @@ -1,51 +0,0 @@ -/** - * Copyright (C) 2009-2012 Typesafe Inc. - */ - -package akka.actor; - -/** - * JAVA API for - creating actors, - creating remote actors, - locating actors - */ -public class Actors { - /** - * The message that is sent when an Actor gets a receive timeout. - * - * 
-   * if (message == receiveTimeout()) {
-   *   // Timed out
-   * }
-   *
- * - * @return the single instance of ReceiveTimeout - */ - public final static ReceiveTimeout$ receiveTimeout() { - return ReceiveTimeout$.MODULE$; - } - - /** - * The message that when sent to an Actor kills it by throwing an exception. - * - * 
-   * actor.tell(kill());
-   *
- * - * @return the single instance of Kill - */ - public final static Kill$ kill() { - return Kill$.MODULE$; - } - - /** - * The message that when sent to an Actor shuts it down by calling 'stop'. - * - * 
-   * actor.tell(poisonPill());
-   *
- * - * @return the single instance of PoisonPill - */ - public final static PoisonPill$ poisonPill() { - return PoisonPill$.MODULE$; - } -} diff --git a/akka-actor/src/main/scala/akka/actor/FSM.scala b/akka-actor/src/main/scala/akka/actor/FSM.scala index e7e3744d71..3d1f8930c4 100644 --- a/akka-actor/src/main/scala/akka/actor/FSM.scala +++ b/akka-actor/src/main/scala/akka/actor/FSM.scala @@ -217,8 +217,8 @@ trait FSM[S, D] extends Listeners with ActorLogging { * @param timeout state timeout for the initial state, overriding the default timeout for that state */ protected final def startWith(stateName: S, - stateData: D, - timeout: Timeout = None): Unit = + stateData: D, + timeout: Timeout = None): Unit = currentState = FSM.State(stateName, stateData, timeout) /** diff --git a/akka-docs/java/code/akka/docs/actor/FirstUntypedActor.java b/akka-docs/java/code/akka/docs/actor/FirstUntypedActor.java index 8fb12df4f7..6cfbe75b99 100644 --- a/akka-docs/java/code/akka/docs/actor/FirstUntypedActor.java +++ b/akka-docs/java/code/akka/docs/actor/FirstUntypedActor.java @@ -5,7 +5,7 @@ package akka.docs.actor; import akka.actor.ActorRef; import akka.actor.Props; -import static akka.actor.Actors.*; +import akka.actor.PoisonPill; import akka.actor.UntypedActor; //#context-actorOf @@ -16,6 +16,6 @@ public class FirstUntypedActor extends UntypedActor { public void onReceive(Object message) { myActor.forward(message, getContext()); - myActor.tell(poisonPill()); + myActor.tell(PoisonPill.getInstance()); } } diff --git a/akka-docs/java/code/akka/docs/actor/MyReceivedTimeoutUntypedActor.java b/akka-docs/java/code/akka/docs/actor/MyReceivedTimeoutUntypedActor.java index 9131941851..97742d9bd1 100644 --- a/akka-docs/java/code/akka/docs/actor/MyReceivedTimeoutUntypedActor.java +++ b/akka-docs/java/code/akka/docs/actor/MyReceivedTimeoutUntypedActor.java @@ -4,7 +4,6 @@ package akka.docs.actor; //#receive-timeout -import akka.actor.Actors; import akka.actor.ReceiveTimeout; import akka.actor.UntypedActor; import akka.util.Duration; @@ -18,7 +17,7 @@ public class MyReceivedTimeoutUntypedActor extends UntypedActor { public void onReceive(Object message) { if (message.equals("Hello")) { getSender().tell("Hello world"); - } else if (message == Actors.receiveTimeout()) { + } else if (message == ReceiveTimeout.getInstance()) { throw new RuntimeException("received timeout"); } else { unhandled(message); diff --git a/akka-docs/java/code/akka/docs/actor/UntypedActorDocTestBase.java b/akka-docs/java/code/akka/docs/actor/UntypedActorDocTestBase.java index 1237797b62..65ff37c10e 100644 --- a/akka-docs/java/code/akka/docs/actor/UntypedActorDocTestBase.java +++ b/akka-docs/java/code/akka/docs/actor/UntypedActorDocTestBase.java @@ -19,7 +19,8 @@ import akka.util.Timeout; //#import-future //#import-actors -import static akka.actor.Actors.*; +import akka.actor.PoisonPill; +import akka.actor.Kill; //#import-actors //#import-procedure @@ -158,7 +159,7 @@ public class UntypedActorDocTestBase { ActorSystem system = ActorSystem.create("MySystem"); ActorRef myActor = system.actorOf(new Props(MyUntypedActor.class)); //#poison-pill - myActor.tell(poisonPill()); + myActor.tell(PoisonPill.getInstance()); //#poison-pill system.shutdown(); } @@ -168,7 +169,7 @@ public class UntypedActorDocTestBase { ActorSystem system = ActorSystem.create("MySystem"); ActorRef victim = system.actorOf(new Props(MyUntypedActor.class)); //#kill - victim.tell(kill()); + victim.tell(Kill.getInstance()); //#kill system.shutdown(); } diff --git a/akka-docs/java/code/akka/docs/actor/japi/FaultHandlingDocSample.java b/akka-docs/java/code/akka/docs/actor/japi/FaultHandlingDocSample.java index db39a5d663..4ba8358174 100644 --- a/akka-docs/java/code/akka/docs/actor/japi/FaultHandlingDocSample.java +++ b/akka-docs/java/code/akka/docs/actor/japi/FaultHandlingDocSample.java @@ -72,7 +72,7 @@ public class FaultHandlingDocSample { log.info("That's all, shutting down"); getContext().system().shutdown(); } - } else if (msg == Actors.receiveTimeout()) { + } else if (msg == ReceiveTimeout.getInstance()) { // No progress within 15 seconds, ServiceUnavailable log.error("Shutting down due to unavailable service"); getContext().system().shutdown(); diff --git a/akka-docs/java/code/akka/docs/dispatcher/DispatcherDocTestBase.java b/akka-docs/java/code/akka/docs/dispatcher/DispatcherDocTestBase.java index 5c3bc7b8ad..f080dd52b9 100644 --- a/akka-docs/java/code/akka/docs/dispatcher/DispatcherDocTestBase.java +++ b/akka-docs/java/code/akka/docs/dispatcher/DispatcherDocTestBase.java @@ -4,27 +4,22 @@ package akka.docs.dispatcher; //#imports +import akka.actor.*; import akka.actor.ActorRef; import akka.actor.Props; -import akka.dispatch.MessageDispatcher; - +import akka.actor.UntypedActor; +import akka.actor.UntypedActorFactory; //#imports //#imports-prio -import akka.actor.UntypedActor; -import akka.actor.UntypedActorFactory; -import akka.actor.Actors; import akka.event.Logging; import akka.event.LoggingAdapter; //#imports-prio //#imports-prio-mailbox -import akka.actor.ActorContext; import akka.dispatch.PriorityGenerator; import akka.dispatch.UnboundedPriorityMailbox; -import akka.dispatch.MailboxType; -import akka.dispatch.MessageQueue; import com.typesafe.config.Config; //#imports-prio-mailbox @@ -37,7 +32,6 @@ import static org.junit.Assert.*; import com.typesafe.config.ConfigFactory; -import akka.actor.ActorSystem; import akka.docs.actor.MyUntypedActor; import akka.docs.actor.UntypedActorDocTestBase.MyActor; import akka.testkit.AkkaSpec; @@ -93,7 +87,7 @@ public class DispatcherDocTestBase { getSelf().tell("pigdog2"); getSelf().tell("pigdog3"); getSelf().tell("highpriority"); - getSelf().tell(Actors.poisonPill()); + getSelf().tell(PoisonPill.getInstance()); } public void onReceive(Object message) { @@ -133,7 +127,7 @@ public class DispatcherDocTestBase { return 0; // 'highpriority messages should be treated first if possible else if (message.equals("lowpriority")) return 2; // 'lowpriority messages should be treated last if possible - else if (message.equals(Actors.poisonPill())) + else if (message.equals(PoisonPill.getInstance())) return 3; // PoisonPill when no other left else return 1; // By default they go between high and low prio diff --git a/akka-docs/scala/code/akka/docs/camel/Consumers.scala b/akka-docs/scala/code/akka/docs/camel/Consumers.scala index 87b13aa601..90f181df3f 100644 --- a/akka-docs/scala/code/akka/docs/camel/Consumers.scala +++ b/akka-docs/scala/code/akka/docs/camel/Consumers.scala @@ -3,26 +3,26 @@ package akka.docs.camel object Consumers { { //#Consumer1 - import akka.camel.{CamelMessage, Consumer} + import akka.camel.{ CamelMessage, Consumer } class Consumer1 extends Consumer { def endpointUri = "file:data/input/actor" def receive = { - case msg: CamelMessage => println("received %s" format msg.bodyAs[String]) + case msg: CamelMessage ⇒ println("received %s" format msg.bodyAs[String]) } } //#Consumer1 } { //#Consumer2 - import akka.camel.{CamelMessage, Consumer} + import akka.camel.{ CamelMessage, Consumer } class Consumer2 extends Consumer { def endpointUri = "jetty:http://localhost:8877/camel/default" def receive = { - case msg: CamelMessage => sender ! ("Hello %s" format msg.bodyAs[String]) + case msg: CamelMessage ⇒ sender ! ("Hello %s" format msg.bodyAs[String]) } } //#Consumer2 diff --git a/akka-spring/src/test/java/akka/spring/foo/PingActor.java b/akka-spring/src/test/java/akka/spring/foo/PingActor.java index 3a04ba77cf..fc1344ff73 100644 --- a/akka-spring/src/test/java/akka/spring/foo/PingActor.java +++ b/akka-spring/src/test/java/akka/spring/foo/PingActor.java @@ -1,6 +1,5 @@ package akka.spring.foo; -import static akka.actor.Actors.*; import akka.actor.ActorRef; import akka.actor.UntypedActor; diff --git a/akka-transactor/src/test/java/akka/transactor/UntypedCoordinatedCounter.java b/akka-transactor/src/test/java/akka/transactor/UntypedCoordinatedCounter.java index 61905a775c..8760db5084 100644 --- a/akka-transactor/src/test/java/akka/transactor/UntypedCoordinatedCounter.java +++ b/akka-transactor/src/test/java/akka/transactor/UntypedCoordinatedCounter.java @@ -5,7 +5,6 @@ package akka.transactor; import akka.actor.ActorRef; -import akka.actor.Actors; import akka.actor.UntypedActor; import scala.concurrent.stm.Ref; import scala.concurrent.stm.japi.STM;