From 308428e7bc83dc3fa4971cb44d8ed0ff3c9f2137 Mon Sep 17 00:00:00 2001 From: drexin Date: Thu, 2 May 2013 17:00:44 +0200 Subject: [PATCH 1/2] removed calls to deprecated Props constructor in java code --- .../src/test/java/akka/actor/JavaAPI.java | 6 +++--- .../test/java/akka/actor/NonPublicClass.java | 2 +- .../test/java/akka/actor/StashJavaAPI.java | 2 +- .../java/akka/routing/CustomRouteTest.java | 2 +- .../java/akka/camel/ConsumerJavaTestBase.java | 2 +- .../java/akka/camel/CustomRouteTestBase.java | 16 ++++++--------- .../contrib/pattern/ReliableProxyTest.java | 20 ++++--------------- .../sample/kernel/hello/java/HelloKernel.java | 4 ++-- .../java/JCalculatorApplication.java | 2 +- .../calculator/java/JCreationApplication.java | 9 ++------- .../calculator/java/JLookupApplication.java | 7 +------ .../akka/testkit/TestActorRefJavaCompile.java | 2 +- .../UntypedCoordinatedIncrementTest.java | 10 ++-------- .../transactor/UntypedTransactorTest.java | 12 ++--------- 14 files changed, 28 insertions(+), 68 deletions(-) diff --git a/akka-actor-tests/src/test/java/akka/actor/JavaAPI.java b/akka-actor-tests/src/test/java/akka/actor/JavaAPI.java index 16b92e9abc..467e51481b 100644 --- a/akka-actor-tests/src/test/java/akka/actor/JavaAPI.java +++ b/akka-actor-tests/src/test/java/akka/actor/JavaAPI.java @@ -52,13 +52,13 @@ public class JavaAPI { @Test public void mustBeAbleToCreateActorRefFromClass() { - ActorRef ref = system.actorOf(new Props(JavaAPITestActor.class)); + ActorRef ref = system.actorOf(Props.create(JavaAPITestActor.class)); assertNotNull(ref); } @Test public void mustBeAbleToCreateActorRefFromFactory() { - ActorRef ref = system.actorOf(new Props().withCreator(new Creator() { + ActorRef ref = system.actorOf(Props.empty().withCreator(new Creator() { public Actor create() { return new JavaAPITestActor(); } @@ -68,7 +68,7 @@ public class JavaAPI { @Test public void mustAcceptSingleArgTell() { - ActorRef ref = system.actorOf(new Props(JavaAPITestActor.class)); + ActorRef ref = system.actorOf(Props.create(JavaAPITestActor.class)); ref.tell("hallo"); ref.tell("hallo", ref); } diff --git a/akka-actor-tests/src/test/java/akka/actor/NonPublicClass.java b/akka-actor-tests/src/test/java/akka/actor/NonPublicClass.java index ac21542c46..83a1338135 100644 --- a/akka-actor-tests/src/test/java/akka/actor/NonPublicClass.java +++ b/akka-actor-tests/src/test/java/akka/actor/NonPublicClass.java @@ -6,7 +6,7 @@ package akka.actor; public class NonPublicClass { public static Props createProps() { - return new Props(MyNonPublicActorClass.class); + return Props.create(MyNonPublicActorClass.class); } } diff --git a/akka-actor-tests/src/test/java/akka/actor/StashJavaAPI.java b/akka-actor-tests/src/test/java/akka/actor/StashJavaAPI.java index 3c17f2fe45..77ea804559 100644 --- a/akka-actor-tests/src/test/java/akka/actor/StashJavaAPI.java +++ b/akka-actor-tests/src/test/java/akka/actor/StashJavaAPI.java @@ -24,7 +24,7 @@ public class StashJavaAPI { @Test public void mustBeAbleToUseStash() { - ActorRef ref = system.actorOf(new Props(StashJavaAPITestActor.class) + ActorRef ref = system.actorOf(Props.create(StashJavaAPITestActor.class) .withDispatcher("my-dispatcher")); ref.tell("Hello", ref); ref.tell("Hello", ref); diff --git a/akka-actor-tests/src/test/java/akka/routing/CustomRouteTest.java b/akka-actor-tests/src/test/java/akka/routing/CustomRouteTest.java index 2eca39d70b..4ad7d318ac 100644 --- a/akka-actor-tests/src/test/java/akka/routing/CustomRouteTest.java +++ b/akka-actor-tests/src/test/java/akka/routing/CustomRouteTest.java @@ -14,7 +14,7 @@ public class CustomRouteTest { // only to test compilability public void testRoute() { - final ActorRef ref = system.actorOf(new Props().withRouter(new RoundRobinRouter(1))); + final ActorRef ref = system.actorOf(Props.empty().withRouter(new RoundRobinRouter(1))); final scala.Function1, scala.collection.immutable.Iterable> route = ExtractRoute.apply(ref); route.apply(null); diff --git a/akka-camel/src/test/java/akka/camel/ConsumerJavaTestBase.java b/akka-camel/src/test/java/akka/camel/ConsumerJavaTestBase.java index 0ed6f85520..5e9a0d52a1 100644 --- a/akka-camel/src/test/java/akka/camel/ConsumerJavaTestBase.java +++ b/akka-camel/src/test/java/akka/camel/ConsumerJavaTestBase.java @@ -41,7 +41,7 @@ public class ConsumerJavaTestBase { ExecutionContext executionContext = system.dispatcher(); try { Await.result( - camel.activationFutureFor(system.actorOf(new Props(SampleErrorHandlingConsumer.class), "sample-error-handling-consumer"), timeout, executionContext), + camel.activationFutureFor(system.actorOf(Props.create(SampleErrorHandlingConsumer.class), "sample-error-handling-consumer"), timeout, executionContext), duration); return camel.template().requestBody("direct:error-handler-test-java", "hello", String.class); } diff --git a/akka-camel/src/test/java/akka/camel/CustomRouteTestBase.java b/akka-camel/src/test/java/akka/camel/CustomRouteTestBase.java index ae6d9c5531..6fbd598c59 100644 --- a/akka-camel/src/test/java/akka/camel/CustomRouteTestBase.java +++ b/akka-camel/src/test/java/akka/camel/CustomRouteTestBase.java @@ -38,7 +38,7 @@ public class CustomRouteTestBase { @Test public void testCustomProducerRoute() throws Exception { MockEndpoint mockEndpoint = camel.context().getEndpoint("mock:mockProducer", MockEndpoint.class); - ActorRef producer = system.actorOf(new Props(MockEndpointProducer.class), "mockEndpoint"); + ActorRef producer = system.actorOf(Props.create(MockEndpointProducer.class), "mockEndpoint"); camel.context().addRoutes(new CustomRouteBuilder("direct:test",producer)); camel.template().sendBody("direct:test", "test"); assertMockEndpoint(mockEndpoint); @@ -48,11 +48,7 @@ public class CustomRouteTestBase { @Test public void testCustomProducerUriRoute() throws Exception { MockEndpoint mockEndpoint = camel.context().getEndpoint("mock:mockProducerUri", MockEndpoint.class); - ActorRef producer = system.actorOf(new Props(new UntypedActorFactory(){ - public Actor create() { - return new EndpointProducer("mock:mockProducerUri"); - } - }), "mockEndpointUri"); + ActorRef producer = system.actorOf(Props.create(EndpointProducer.class, "mock:mockProducerUri"), "mockEndpointUri"); camel.context().addRoutes(new CustomRouteBuilder("direct:test",producer)); camel.template().sendBody("direct:test", "test"); assertMockEndpoint(mockEndpoint); @@ -66,7 +62,7 @@ public class CustomRouteTestBase { Timeout timeout = new Timeout(duration); ExecutionContext executionContext = system.dispatcher(); ActorRef consumer = Await.result( - camel.activationFutureFor(system.actorOf(new Props(TestConsumer.class), "testConsumer"), timeout, executionContext), + camel.activationFutureFor(system.actorOf(Props.create(TestConsumer.class), "testConsumer"), timeout, executionContext), duration); camel.context().addRoutes(new CustomRouteBuilder("direct:testRouteConsumer",consumer)); camel.template().sendBody("direct:testRouteConsumer", "test"); @@ -83,7 +79,7 @@ public class CustomRouteTestBase { ActorRef consumer = Await.result( camel.activationFutureFor( system.actorOf( - new Props( new UntypedActorFactory(){ public Actor create() { return new TestAckConsumer("direct:testConsumerAck","mock:mockAck"); } }), "testConsumerAck"), + Props.create(TestAckConsumer.class, "direct:testConsumerAck","mock:mockAck"), "testConsumerAck"), timeout, executionContext), duration); camel.context().addRoutes(new CustomRouteBuilder("direct:testAck", consumer, false, duration)); @@ -99,7 +95,7 @@ public class CustomRouteTestBase { FiniteDuration duration = Duration.create(10, TimeUnit.SECONDS); Timeout timeout = new Timeout(duration); ActorRef consumer = Await.result( - camel.activationFutureFor(system.actorOf(new Props( new UntypedActorFactory(){ public Actor create() { return new TestAckConsumer("direct:testConsumerAckFromUri","mock:mockAckUri"); } }), "testConsumerAckUri"), + camel.activationFutureFor(system.actorOf(Props.create(TestAckConsumer.class, "direct:testConsumerAckFromUri","mock:mockAckUri"), "testConsumerAckUri"), timeout, executionContext), duration); camel.context().addRoutes(new CustomRouteBuilder("direct:testAckFromUri","akka://test/user/testConsumerAckUri?autoAck=false")); @@ -114,7 +110,7 @@ public class CustomRouteTestBase { Timeout timeout = new Timeout(duration); ExecutionContext executionContext = system.dispatcher(); ActorRef consumer = Await.result( - camel.activationFutureFor(system.actorOf(new Props( new UntypedActorFactory(){ public Actor create() { return new TestAckConsumer("direct:testConsumerException","mock:mockException"); } }), "testConsumerException"), + camel.activationFutureFor(system.actorOf(Props.create(TestAckConsumer.class, "direct:testConsumerException","mock:mockException"), "testConsumerException"), timeout, executionContext), duration); camel.context().addRoutes(new CustomRouteBuilder("direct:testException", consumer, false, Duration.create(0, TimeUnit.SECONDS))); diff --git a/akka-contrib/src/test/java/akka/contrib/pattern/ReliableProxyTest.java b/akka-contrib/src/test/java/akka/contrib/pattern/ReliableProxyTest.java index 8a293bc201..ecfa7a8a07 100644 --- a/akka-contrib/src/test/java/akka/contrib/pattern/ReliableProxyTest.java +++ b/akka-contrib/src/test/java/akka/contrib/pattern/ReliableProxyTest.java @@ -49,12 +49,7 @@ public class ReliableProxyTest { //#demo-proxy final ActorRef proxy = getContext().actorOf( - new Props(new UntypedActorFactory() { - public Actor create() { - final FiniteDuration retry = Duration.create(100, "millis"); - return new ReliableProxy(target, retry); - } - })); + Props.create(ReliableProxy.class, target, Duration.create(100, "millis"))); public void onReceive(Object msg) { if ("hello".equals(msg)) { @@ -68,7 +63,7 @@ public class ReliableProxyTest { parent.tell("hello", null); probe.expectMsg("world!"); } - + @Test public void demonstrateTransitions() { final ActorRef target = system.deadLetters(); @@ -79,15 +74,8 @@ public class ReliableProxyTest { return new UntypedActor() { //#demo-transition - final ActorRef proxy = getContext().actorOf( - new Props(new UntypedActorFactory() { - public Actor create() { - final FiniteDuration retry = Duration.create(100, "millis"); - return new ReliableProxy(target, retry); - } - })); - ActorRef client = null; - + final ActorRef proxy = getContext().actorOf(Props.create(ReliableProxy.class, target, Duration.create(100, "millis"))); + ActorRef client = null; { proxy.tell(new FSM.SubscribeTransitionCallBack(getSelf()), getSelf()); } diff --git a/akka-samples/akka-sample-hello-kernel/src/main/java/sample/kernel/hello/java/HelloKernel.java b/akka-samples/akka-sample-hello-kernel/src/main/java/sample/kernel/hello/java/HelloKernel.java index 8d3936d400..0b2b0af269 100644 --- a/akka-samples/akka-sample-hello-kernel/src/main/java/sample/kernel/hello/java/HelloKernel.java +++ b/akka-samples/akka-sample-hello-kernel/src/main/java/sample/kernel/hello/java/HelloKernel.java @@ -14,7 +14,7 @@ public class HelloKernel implements Bootable { public static class HelloActor extends UntypedActor { final ActorRef worldActor = getContext().actorOf( - new Props(WorldActor.class)); + Props.create(WorldActor.class)); public void onReceive(Object message) { if (message == "start") @@ -37,7 +37,7 @@ public class HelloKernel implements Bootable { } public void startup() { - system.actorOf(new Props(HelloActor.class)).tell("start", null); + system.actorOf(Props.create(HelloActor.class)).tell("start", null); } public void shutdown() { diff --git a/akka-samples/akka-sample-remote/src/main/java/sample/remote/calculator/java/JCalculatorApplication.java b/akka-samples/akka-sample-remote/src/main/java/sample/remote/calculator/java/JCalculatorApplication.java index 4d9cf78ad6..2ea8d2a4bf 100644 --- a/akka-samples/akka-sample-remote/src/main/java/sample/remote/calculator/java/JCalculatorApplication.java +++ b/akka-samples/akka-sample-remote/src/main/java/sample/remote/calculator/java/JCalculatorApplication.java @@ -16,7 +16,7 @@ public class JCalculatorApplication implements Bootable { public JCalculatorApplication() { system = ActorSystem.create("CalculatorApplication", ConfigFactory.load() .getConfig("calculator")); - ActorRef actor = system.actorOf(new Props(JSimpleCalculatorActor.class), + ActorRef actor = system.actorOf(Props.create(JSimpleCalculatorActor.class), "simpleCalculator"); } diff --git a/akka-samples/akka-sample-remote/src/main/java/sample/remote/calculator/java/JCreationApplication.java b/akka-samples/akka-sample-remote/src/main/java/sample/remote/calculator/java/JCreationApplication.java index 2b966e8229..3aa9c2e8f0 100644 --- a/akka-samples/akka-sample-remote/src/main/java/sample/remote/calculator/java/JCreationApplication.java +++ b/akka-samples/akka-sample-remote/src/main/java/sample/remote/calculator/java/JCreationApplication.java @@ -7,7 +7,6 @@ import akka.actor.ActorRef; import akka.actor.ActorSystem; import akka.actor.Props; import akka.actor.UntypedActor; -import akka.actor.UntypedActorFactory; import akka.kernel.Bootable; import com.typesafe.config.ConfigFactory; @@ -19,13 +18,9 @@ public class JCreationApplication implements Bootable { public JCreationApplication() { system = ActorSystem.create("CreationApplication", ConfigFactory.load() .getConfig("remotecreation")); - final ActorRef remoteActor = system.actorOf(new Props(JAdvancedCalculatorActor.class), + final ActorRef remoteActor = system.actorOf(Props.create(JAdvancedCalculatorActor.class), "advancedCalculator"); - actor = system.actorOf(new Props().withCreator(new UntypedActorFactory() { - public UntypedActor create() { - return new JCreationActor(remoteActor); - } - }), "creationActor"); + actor = system.actorOf(Props.create(JCreationActor.class, remoteActor), "creationActor"); } diff --git a/akka-samples/akka-sample-remote/src/main/java/sample/remote/calculator/java/JLookupApplication.java b/akka-samples/akka-sample-remote/src/main/java/sample/remote/calculator/java/JLookupApplication.java index b44461523d..4373bcfa0a 100644 --- a/akka-samples/akka-sample-remote/src/main/java/sample/remote/calculator/java/JLookupApplication.java +++ b/akka-samples/akka-sample-remote/src/main/java/sample/remote/calculator/java/JLookupApplication.java @@ -8,7 +8,6 @@ import akka.actor.ActorRef; import akka.actor.ActorSystem; import akka.actor.Props; import akka.actor.UntypedActor; -import akka.actor.UntypedActorFactory; import akka.kernel.Bootable; import com.typesafe.config.ConfigFactory; //#imports @@ -21,11 +20,7 @@ public class JLookupApplication implements Bootable { public JLookupApplication() { system = ActorSystem.create("LookupApplication", ConfigFactory.load().getConfig("remotelookup")); final String path = "akka.tcp://CalculatorApplication@127.0.0.1:2552/user/simpleCalculator"; - actor = system.actorOf(new Props().withCreator(new UntypedActorFactory() { - public UntypedActor create() { - return new JLookupActor(path); - } - }), "lookupActor"); + actor = system.actorOf(Props.create(JLookupActor.class, path), "lookupActor"); } public void doSomething(Op.MathOp mathOp) { diff --git a/akka-testkit/src/test/java/akka/testkit/TestActorRefJavaCompile.java b/akka-testkit/src/test/java/akka/testkit/TestActorRefJavaCompile.java index 2664a31a60..009fbab5c6 100644 --- a/akka-testkit/src/test/java/akka/testkit/TestActorRefJavaCompile.java +++ b/akka-testkit/src/test/java/akka/testkit/TestActorRefJavaCompile.java @@ -11,7 +11,7 @@ public class TestActorRefJavaCompile { public void shouldBeAbleToCompileWhenUsingApply() { //Just a dummy call to make sure it compiles - TestActorRef ref = TestActorRef.apply(new Props(), null); + TestActorRef ref = TestActorRef.apply(Props.empty(), null); ref.toString(); } } diff --git a/akka-transactor/src/test/java/akka/transactor/UntypedCoordinatedIncrementTest.java b/akka-transactor/src/test/java/akka/transactor/UntypedCoordinatedIncrementTest.java index 13dcd2f760..51b87d619d 100644 --- a/akka-transactor/src/test/java/akka/transactor/UntypedCoordinatedIncrementTest.java +++ b/akka-transactor/src/test/java/akka/transactor/UntypedCoordinatedIncrementTest.java @@ -14,8 +14,6 @@ import org.junit.Before; import akka.actor.ActorSystem; import akka.actor.ActorRef; import akka.actor.Props; -import akka.actor.UntypedActor; -import akka.actor.UntypedActorFactory; import scala.concurrent.Await; import scala.concurrent.Future; import static akka.pattern.Patterns.ask; @@ -61,14 +59,10 @@ public class UntypedCoordinatedIncrementTest { counters = new ArrayList(); for (int i = 1; i <= numCounters; i++) { final String name = "counter" + i; - ActorRef counter = system.actorOf(new Props(new UntypedActorFactory() { - public UntypedActor create() { - return new UntypedCoordinatedCounter(name); - } - })); + ActorRef counter = system.actorOf(Props.create(UntypedCoordinatedCounter.class, name)); counters.add(counter); } - failer = system.actorOf(new Props(UntypedFailer.class)); + failer = system.actorOf(Props.create(UntypedFailer.class)); } @Test diff --git a/akka-transactor/src/test/java/akka/transactor/UntypedTransactorTest.java b/akka-transactor/src/test/java/akka/transactor/UntypedTransactorTest.java index 91a0fa6dc2..91b0d0c397 100644 --- a/akka-transactor/src/test/java/akka/transactor/UntypedTransactorTest.java +++ b/akka-transactor/src/test/java/akka/transactor/UntypedTransactorTest.java @@ -14,8 +14,6 @@ import org.junit.Before; import akka.actor.ActorSystem; import akka.actor.ActorRef; import akka.actor.Props; -import akka.actor.UntypedActor; -import akka.actor.UntypedActorFactory; import scala.concurrent.Await; import scala.concurrent.Future; import static akka.pattern.Patterns.ask; @@ -62,16 +60,10 @@ public class UntypedTransactorTest { counters = new ArrayList(); for (int i = 1; i <= numCounters; i++) { final String name = "counter" + i; - ActorRef counter = system.actorOf(new Props(new UntypedActorFactory() { - private static final long serialVersionUID = 1L; - - public UntypedActor create() { - return new UntypedCounter(name); - } - })); + ActorRef counter = system.actorOf(Props.create(UntypedCounter.class, name)); counters.add(counter); } - failer = system.actorOf(new Props(UntypedFailer.class)); + failer = system.actorOf(Props.create(UntypedFailer.class)); } @Test From b9d1e000d30a41dc7b7ff2ae7ee29d34c4bc9678 Mon Sep 17 00:00:00 2001 From: drexin Date: Thu, 2 May 2013 21:36:36 +0200 Subject: [PATCH 2/2] fixed indentation --- .../src/test/java/akka/contrib/pattern/ReliableProxyTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/akka-contrib/src/test/java/akka/contrib/pattern/ReliableProxyTest.java b/akka-contrib/src/test/java/akka/contrib/pattern/ReliableProxyTest.java index ecfa7a8a07..752063921f 100644 --- a/akka-contrib/src/test/java/akka/contrib/pattern/ReliableProxyTest.java +++ b/akka-contrib/src/test/java/akka/contrib/pattern/ReliableProxyTest.java @@ -75,7 +75,7 @@ public class ReliableProxyTest { //#demo-transition final ActorRef proxy = getContext().actorOf(Props.create(ReliableProxy.class, target, Duration.create(100, "millis"))); - ActorRef client = null; + ActorRef client = null; { proxy.tell(new FSM.SubscribeTransitionCallBack(getSelf()), getSelf()); }