From 8476a90d1fc466e61887570effa9f22c495c8f3e Mon Sep 17 00:00:00 2001 From: Christopher Batey Date: Wed, 25 Jul 2018 09:38:33 +0100 Subject: [PATCH] Remove use of deprecated methods in java docs --- .../test/java/jdocs/actor/InitializationDocTest.java | 2 +- .../src/test/java/jdocs/actor/SampleActorTest.java | 2 +- .../src/test/java/jdocs/actor/fsm/BuncherTest.java | 2 +- .../jdocs/circuitbreaker/TellPatternJavaActor.java | 6 +----- .../jdocs/stream/javadsl/cookbook/RecipeHold.java | 2 +- .../stream/javadsl/cookbook/RecipeManualTrigger.java | 12 ++++++------ .../stream/javadsl/cookbook/RecipeMissedTicks.java | 2 +- .../test/java/jdocs/tutorial_4/DeviceGroupTest.java | 2 +- .../src/test/java/jdocs/tutorial_4/DeviceTest.java | 4 ++-- .../test/java/jdocs/tutorial_5/DeviceGroupTest.java | 2 +- .../src/test/java/jdocs/tutorial_5/DeviceTest.java | 4 ++-- 11 files changed, 18 insertions(+), 22 deletions(-) diff --git a/akka-docs/src/test/java/jdocs/actor/InitializationDocTest.java b/akka-docs/src/test/java/jdocs/actor/InitializationDocTest.java index f3af32f89e..5e66133ef8 100644 --- a/akka-docs/src/test/java/jdocs/actor/InitializationDocTest.java +++ b/akka-docs/src/test/java/jdocs/actor/InitializationDocTest.java @@ -167,7 +167,7 @@ public class InitializationDocTest extends AbstractJavaTest { GenericMessage nonEmptyGenericMessage = new GenericMessage("a"); genericTestActor.tell(emptyGenericMessage, getRef()); - expectNoMsg(); + expectNoMessage(); genericTestActor.tell(nonEmptyGenericMessage, getRef()); expectMsgEquals("A"); diff --git a/akka-docs/src/test/java/jdocs/actor/SampleActorTest.java b/akka-docs/src/test/java/jdocs/actor/SampleActorTest.java index bb33e8c58f..44c803a76f 100644 --- a/akka-docs/src/test/java/jdocs/actor/SampleActorTest.java +++ b/akka-docs/src/test/java/jdocs/actor/SampleActorTest.java @@ -50,7 +50,7 @@ public class SampleActorTest extends AbstractJavaTest { assertTrue(expectMsgClass(String.class).startsWith("startsWith(guard):")); assertTrue(expectMsgClass(String.class).startsWith("contains(guard):")); expectMsgEquals(47110); - expectNoMsg(); + expectNoMessage(); }}; } } diff --git a/akka-docs/src/test/java/jdocs/actor/fsm/BuncherTest.java b/akka-docs/src/test/java/jdocs/actor/fsm/BuncherTest.java index e18caa1dd7..b8c6ea71a8 100644 --- a/akka-docs/src/test/java/jdocs/actor/fsm/BuncherTest.java +++ b/akka-docs/src/test/java/jdocs/actor/fsm/BuncherTest.java @@ -70,7 +70,7 @@ public class BuncherTest extends AbstractJavaTest { final ActorRef probe = getRef(); buncher.tell(new Queue(42), probe); - expectNoMsg(); + expectNoMessage(); system.stop(buncher); }}; } diff --git a/akka-docs/src/test/java/jdocs/circuitbreaker/TellPatternJavaActor.java b/akka-docs/src/test/java/jdocs/circuitbreaker/TellPatternJavaActor.java index 81c6399f4d..c7a3aaecb0 100644 --- a/akka-docs/src/test/java/jdocs/circuitbreaker/TellPatternJavaActor.java +++ b/akka-docs/src/test/java/jdocs/circuitbreaker/TellPatternJavaActor.java @@ -23,11 +23,7 @@ public class TellPatternJavaActor extends AbstractActor { this.breaker = new CircuitBreaker( getContext().dispatcher(), getContext().system().scheduler(), 5, Duration.ofSeconds(10), Duration.ofMinutes(1)) - .onOpen(new Runnable() { - public void run() { - notifyMeOnOpen(); - } - }); + .addOnOpenListener(this::notifyMeOnOpen); } public void notifyMeOnOpen() { diff --git a/akka-docs/src/test/java/jdocs/stream/javadsl/cookbook/RecipeHold.java b/akka-docs/src/test/java/jdocs/stream/javadsl/cookbook/RecipeHold.java index b675f37ddf..fdb7804597 100644 --- a/akka-docs/src/test/java/jdocs/stream/javadsl/cookbook/RecipeHold.java +++ b/akka-docs/src/test/java/jdocs/stream/javadsl/cookbook/RecipeHold.java @@ -179,7 +179,7 @@ public class RecipeHold extends RecipeTest { FiniteDuration timeout = FiniteDuration.create(200, TimeUnit.MILLISECONDS); sub.request(1); - sub.expectNoMsg(timeout); + sub.expectNoMessage(timeout); pub.sendNext(1); sub.expectNext(1); diff --git a/akka-docs/src/test/java/jdocs/stream/javadsl/cookbook/RecipeManualTrigger.java b/akka-docs/src/test/java/jdocs/stream/javadsl/cookbook/RecipeManualTrigger.java index ade38cff80..820fff5323 100644 --- a/akka-docs/src/test/java/jdocs/stream/javadsl/cookbook/RecipeManualTrigger.java +++ b/akka-docs/src/test/java/jdocs/stream/javadsl/cookbook/RecipeManualTrigger.java @@ -79,17 +79,17 @@ public class RecipeManualTrigger extends RecipeTest { FiniteDuration timeout = FiniteDuration.create(100, TimeUnit.MILLISECONDS); sub.expectSubscription().request(1000); - sub.expectNoMsg(timeout); + sub.expectNoMessage(timeout); pub.sendNext(TRIGGER); sub.expectNext(new Message("1")); - sub.expectNoMsg(timeout); + sub.expectNoMessage(timeout); pub.sendNext(TRIGGER); pub.sendNext(TRIGGER); sub.expectNext(new Message("2")); sub.expectNext(new Message("3")); - sub.expectNoMsg(timeout); + sub.expectNoMessage(timeout); pub.sendNext(TRIGGER); sub.expectNext(new Message("4")); @@ -132,17 +132,17 @@ public class RecipeManualTrigger extends RecipeTest { FiniteDuration timeout = FiniteDuration.create(100, TimeUnit.MILLISECONDS); sub.expectSubscription().request(1000); - sub.expectNoMsg(timeout); + sub.expectNoMessage(timeout); pub.sendNext(TRIGGER); sub.expectNext(new Message("1")); - sub.expectNoMsg(timeout); + sub.expectNoMessage(timeout); pub.sendNext(TRIGGER); pub.sendNext(TRIGGER); sub.expectNext(new Message("2")); sub.expectNext(new Message("3")); - sub.expectNoMsg(timeout); + sub.expectNoMessage(timeout); pub.sendNext(TRIGGER); sub.expectNext(new Message("4")); diff --git a/akka-docs/src/test/java/jdocs/stream/javadsl/cookbook/RecipeMissedTicks.java b/akka-docs/src/test/java/jdocs/stream/javadsl/cookbook/RecipeMissedTicks.java index b9a5a0bf19..d62a86ec9c 100644 --- a/akka-docs/src/test/java/jdocs/stream/javadsl/cookbook/RecipeMissedTicks.java +++ b/akka-docs/src/test/java/jdocs/stream/javadsl/cookbook/RecipeMissedTicks.java @@ -82,7 +82,7 @@ public class RecipeMissedTicks extends RecipeTest { sub.request(1); sub.expectNext(3); sub.request(1); - sub.expectNoMsg(timeout); + sub.expectNoMessage(timeout); pub.sendNext(Tick); sub.expectNext(0); diff --git a/akka-docs/src/test/java/jdocs/tutorial_4/DeviceGroupTest.java b/akka-docs/src/test/java/jdocs/tutorial_4/DeviceGroupTest.java index 8b6cd2ef4e..453f7892a8 100644 --- a/akka-docs/src/test/java/jdocs/tutorial_4/DeviceGroupTest.java +++ b/akka-docs/src/test/java/jdocs/tutorial_4/DeviceGroupTest.java @@ -63,7 +63,7 @@ public class DeviceGroupTest extends JUnitSuite { ActorRef groupActor = system.actorOf(DeviceGroup.props("group")); groupActor.tell(new DeviceManager.RequestTrackDevice("wrongGroup", "device1"), probe.getRef()); - probe.expectNoMsg(); + probe.expectNoMessage(); } //#device-group-test-registration diff --git a/akka-docs/src/test/java/jdocs/tutorial_4/DeviceTest.java b/akka-docs/src/test/java/jdocs/tutorial_4/DeviceTest.java index 9e409b569f..083f3dbf4a 100644 --- a/akka-docs/src/test/java/jdocs/tutorial_4/DeviceTest.java +++ b/akka-docs/src/test/java/jdocs/tutorial_4/DeviceTest.java @@ -49,10 +49,10 @@ public class DeviceTest extends JUnitSuite { ActorRef deviceActor = system.actorOf(Device.props("group", "device")); deviceActor.tell(new DeviceManager.RequestTrackDevice("wrongGroup", "device"), probe.getRef()); - probe.expectNoMsg(); + probe.expectNoMessage(); deviceActor.tell(new DeviceManager.RequestTrackDevice("group", "wrongDevice"), probe.getRef()); - probe.expectNoMsg(); + probe.expectNoMessage(); } //#device-registration-tests diff --git a/akka-docs/src/test/java/jdocs/tutorial_5/DeviceGroupTest.java b/akka-docs/src/test/java/jdocs/tutorial_5/DeviceGroupTest.java index 77148dc02e..2f666e86d8 100644 --- a/akka-docs/src/test/java/jdocs/tutorial_5/DeviceGroupTest.java +++ b/akka-docs/src/test/java/jdocs/tutorial_5/DeviceGroupTest.java @@ -66,7 +66,7 @@ public class DeviceGroupTest extends JUnitSuite { ActorRef groupActor = system.actorOf(DeviceGroup.props("group")); groupActor.tell(new DeviceManager.RequestTrackDevice("wrongGroup", "device1"), probe.getRef()); - probe.expectNoMsg(); + probe.expectNoMessage(); } @Test diff --git a/akka-docs/src/test/java/jdocs/tutorial_5/DeviceTest.java b/akka-docs/src/test/java/jdocs/tutorial_5/DeviceTest.java index 00709947f0..ebbe90f3e9 100644 --- a/akka-docs/src/test/java/jdocs/tutorial_5/DeviceTest.java +++ b/akka-docs/src/test/java/jdocs/tutorial_5/DeviceTest.java @@ -48,10 +48,10 @@ public class DeviceTest extends JUnitSuite { ActorRef deviceActor = system.actorOf(Device.props("group", "device")); deviceActor.tell(new DeviceManager.RequestTrackDevice("wrongGroup", "device"), probe.getRef()); - probe.expectNoMsg(); + probe.expectNoMessage(); deviceActor.tell(new DeviceManager.RequestTrackDevice("group", "wrongDevice"), probe.getRef()); - probe.expectNoMsg(); + probe.expectNoMessage(); } @Test