From c12eb92e559040640ce27f1597071d9f02da0ee8 Mon Sep 17 00:00:00 2001 From: Richard Imaoka Date: Thu, 23 Aug 2018 22:43:17 +0900 Subject: [PATCH] Formatting, and use java.time.Duration --- .../test/java/jdocs/future/FutureDocTest.java | 72 +++++++++++++------ 1 file changed, 49 insertions(+), 23 deletions(-) diff --git a/akka-docs/src/test/java/jdocs/future/FutureDocTest.java b/akka-docs/src/test/java/jdocs/future/FutureDocTest.java index 4324861ec2..37c2e13d0c 100644 --- a/akka-docs/src/test/java/jdocs/future/FutureDocTest.java +++ b/akka-docs/src/test/java/jdocs/future/FutureDocTest.java @@ -18,7 +18,7 @@ import akka.util.Timeout; //#imports1 //#imports2 -import scala.concurrent.duration.Duration; +import java.time.Duration; import akka.japi.Function; import java.util.concurrent.*; @@ -128,7 +128,7 @@ public class FutureDocTest extends AbstractJavaTest { ActorUsingPipeTo(ActorRef target) { this.target = target; - this.timeout = new Timeout(Duration.create(5, "seconds")); + this.timeout = Timeout.create(Duration.ofSeconds(5)); } @Override @@ -139,7 +139,7 @@ public class FutureDocTest extends AbstractJavaTest { ask(target, "some message", timeout).toCompletableFuture(); // the pipe pattern - pipe(fut, getContext().dispatcher()).to(sender()); + pipe(fut, getContext().dispatcher()).to(getSender()); }) .build(); } @@ -147,8 +147,20 @@ public class FutureDocTest extends AbstractJavaTest { //#pipe-to-usage //#pipe-to-returned-data - public class UserData { final String data; UserData(String data){ this.data = data; } } - public class UserActivity { final String activity; UserActivity(String activity){ this.activity = activity; } } + public class UserData { + final String data; + + UserData(String data){ + this.data = data; + } + } + + public class UserActivity { + final String activity; + UserActivity(String activity){ + this.activity = activity; + } + } //#pipe-to-returned-data //#pipe-to-user-data-actor @@ -204,7 +216,7 @@ public class FutureDocTest extends AbstractJavaTest { public class UserProxyActor extends AbstractActor { ActorRef userActor; ActorRef userActivityActor; - Timeout timeout = new Timeout(Duration.create(5, "seconds")); + Timeout timeout = Timeout.create(Duration.ofSeconds(5)); UserProxyActor(ActorRef userActor, ActorRef userActivityActor) { this.userActor = userActor; @@ -255,7 +267,7 @@ public class FutureDocTest extends AbstractJavaTest { ActorRef actor = system.actorOf(Props.create(MyActor.class)); String msg = "hello"; //#ask-blocking - Timeout timeout = new Timeout(Duration.create(5, "seconds")); + Timeout timeout = Timeout.create(Duration.ofSeconds(5)); Future future = Patterns.ask(actor, msg, timeout); String result = (String) Await.result(future, timeout.duration()); //#ask-blocking @@ -274,7 +286,8 @@ public class FutureDocTest extends AbstractJavaTest { f.onSuccess(new PrintResult(), system.dispatcher()); //#future-eval - String result = (String) Await.result(f, Duration.create(5, SECONDS)); + Timeout timeout = Timeout.create(Duration.ofSeconds(5)); + String result = (String) Await.result(f, timeout.duration()); assertEquals("HelloWorld", result); } @@ -297,7 +310,8 @@ public class FutureDocTest extends AbstractJavaTest { f2.onSuccess(new PrintResult(), system.dispatcher()); //#map - int result = Await.result(f2, Duration.create(5, SECONDS)); + Timeout timeout = Timeout.create(Duration.ofSeconds(5)); + int result = Await.result(f2, timeout.duration()); assertEquals(10, result); } @@ -324,7 +338,8 @@ public class FutureDocTest extends AbstractJavaTest { f2.onSuccess(new PrintResult(), system.dispatcher()); //#flat-map - int result = Await.result(f2, Duration.create(5, SECONDS)); + Timeout timeout = Timeout.create(Duration.ofSeconds(5)); + int result = Await.result(f2, timeout.duration()); assertEquals(10, result); } @@ -355,7 +370,8 @@ public class FutureDocTest extends AbstractJavaTest { futureSum.onSuccess(new PrintResult(), system.dispatcher()); //#sequence - long result = Await.result(futureSum, Duration.create(5, SECONDS)); + Timeout timeout = Timeout.create(Duration.ofSeconds(5)); + long result = Await.result(futureSum, timeout.duration()); assertEquals(3L, result); } @@ -380,7 +396,8 @@ public class FutureDocTest extends AbstractJavaTest { //Returns the sequence of strings as upper case futureResult.onSuccess(new PrintResult>(), system.dispatcher()); //#traverse - Iterable result = Await.result(futureResult, Duration.create(5, SECONDS)); + Timeout timeout = Timeout.create(Duration.ofSeconds(5)); + Iterable result = Await.result(futureResult, timeout.duration()); assertEquals(Arrays.asList("A", "B", "C"), result); } @@ -406,7 +423,8 @@ public class FutureDocTest extends AbstractJavaTest { resultFuture.onSuccess(new PrintResult(), system.dispatcher()); //#fold - String result = Await.result(resultFuture, Duration.create(5, SECONDS)); + Timeout timeout = Timeout.create(Duration.ofSeconds(5)); + String result = Await.result(resultFuture, timeout.duration()); assertEquals("ab", result); } @@ -430,7 +448,8 @@ public class FutureDocTest extends AbstractJavaTest { resultFuture.onSuccess(new PrintResult(), system.dispatcher()); //#reduce - Object result = Await.result(resultFuture, Duration.create(5, SECONDS)); + Timeout timeout = Timeout.create(Duration.ofSeconds(5)); + Object result = Await.result(resultFuture, timeout.duration()); assertEquals("ab", result); } @@ -450,12 +469,13 @@ public class FutureDocTest extends AbstractJavaTest { Future theFuture = promise.future(); promise.success("hello"); //#promise - Object result = Await.result(future, Duration.create(5, SECONDS)); + Timeout timeout = Timeout.create(Duration.ofSeconds(5)); + Object result = Await.result(future, timeout.duration()); assertEquals("Yay!", result); Throwable result2 = Await.result(otherFuture.failed(), - Duration.create(5, SECONDS)); + timeout.duration()); assertEquals("Bang!", result2.getMessage()); - String out = Await.result(theFuture, Duration.create(5, SECONDS)); + String out = Await.result(theFuture, timeout.duration()); assertEquals("hello", out); } @@ -528,7 +548,8 @@ public class FutureDocTest extends AbstractJavaTest { future.onSuccess(new PrintResult(), system.dispatcher()); //#recover - int result = Await.result(future, Duration.create(5, SECONDS)); + Timeout timeout = Timeout.create(Duration.ofSeconds(5)); + int result = Await.result(future, timeout.duration()); assertEquals(result, 0); } @@ -556,7 +577,8 @@ public class FutureDocTest extends AbstractJavaTest { future.onSuccess(new PrintResult(), system.dispatcher()); //#try-recover - int result = Await.result(future, Duration.create(5, SECONDS)); + Timeout timeout = Timeout.create(Duration.ofSeconds(5)); + int result = Await.result(future, timeout.duration()); assertEquals(result, 0); } @@ -629,7 +651,8 @@ public class FutureDocTest extends AbstractJavaTest { future3.onSuccess(new PrintResult(), system.dispatcher()); //#zip - String result = Await.result(future3, Duration.create(5, SECONDS)); + Timeout timeout = Timeout.create(Duration.ofSeconds(5)); + String result = Await.result(future3, timeout.duration()); assertEquals("foo bar", result); } @@ -642,7 +665,8 @@ public class FutureDocTest extends AbstractJavaTest { Future future4 = future1.fallbackTo(future2).fallbackTo(future3); future4.onSuccess(new PrintResult(), system.dispatcher()); //#fallback-to - String result = Await.result(future4, Duration.create(5, SECONDS)); + Timeout timeout = Timeout.create(Duration.ofSeconds(5)); + String result = Await.result(future4, timeout.duration()); assertEquals("bar", result); } @@ -654,7 +678,8 @@ public class FutureDocTest extends AbstractJavaTest { //#after final ExecutionContext ec = system.dispatcher(); Future failExc = Futures.failed(new IllegalStateException("OHNOES1")); - Future delayed = Patterns.after(Duration.create(200, "millis"), + Timeout delay = Timeout.create(Duration.ofSeconds(200)); + Future delayed = Patterns.after(delay.duration(), system.scheduler(), ec, failExc); Future future = future(new Callable() { public String call() throws InterruptedException { @@ -665,7 +690,8 @@ public class FutureDocTest extends AbstractJavaTest { Future result = Futures.firstCompletedOf( Arrays.>asList(future, delayed), ec); //#after - Await.result(result, Duration.create(2, SECONDS)); + Timeout timeout = Timeout.create(Duration.ofSeconds(2)); + Await.result(result, timeout.duration()); } @Test