diff --git a/akka-actor-tests/src/test/java/akka/dispatch/JavaFutureTests.java b/akka-actor-tests/src/test/java/akka/dispatch/JavaFutureTests.java index 421cd488fb..6eebbfbfe6 100644 --- a/akka-actor-tests/src/test/java/akka/dispatch/JavaFutureTests.java +++ b/akka-actor-tests/src/test/java/akka/dispatch/JavaFutureTests.java @@ -63,7 +63,7 @@ public class JavaFutureTests extends JUnitSuite { }, system.dispatcher()); cf.success("foo"); - assertTrue(latch.await(5000, TimeUnit.MILLISECONDS)); + assertTrue(latch.await(5, TimeUnit.SECONDS)); assertEquals(Await.result(f, timeout), "foo"); } @@ -81,7 +81,7 @@ public class JavaFutureTests extends JUnitSuite { Throwable exception = new NullPointerException(); cf.failure(exception); - assertTrue(latch.await(5000, TimeUnit.MILLISECONDS)); + assertTrue(latch.await(5, TimeUnit.SECONDS)); assertEquals(f.value().get().failed().get(), exception); } @@ -97,7 +97,7 @@ public class JavaFutureTests extends JUnitSuite { }, system.dispatcher()); cf.success("foo"); - assertTrue(latch.await(5000, TimeUnit.MILLISECONDS)); + assertTrue(latch.await(5, TimeUnit.SECONDS)); assertEquals(Await.result(f, timeout), "foo"); } @@ -113,7 +113,7 @@ public class JavaFutureTests extends JUnitSuite { },system.dispatcher()); cf.success("foo"); - assertTrue(latch.await(5000, TimeUnit.MILLISECONDS)); + assertTrue(latch.await(5, TimeUnit.SECONDS)); assertEquals(Await.result(f, timeout), "foo"); } @@ -135,7 +135,7 @@ public class JavaFutureTests extends JUnitSuite { assertEquals(Await.result(f, timeout), "1000"); assertEquals(Await.result(r, timeout).intValue(), 1000); - assertTrue(latch.await(5000, TimeUnit.MILLISECONDS)); + assertTrue(latch.await(5, TimeUnit.SECONDS)); } @Test @@ -151,7 +151,7 @@ public class JavaFutureTests extends JUnitSuite { }), system.dispatcher()); cf.success("foo"); - assertTrue(latch.await(5000, TimeUnit.MILLISECONDS)); + assertTrue(latch.await(5, TimeUnit.SECONDS)); assertEquals(Await.result(f, timeout), "foo"); assertEquals(Await.result(r, timeout), "foo"); } diff --git a/akka-cluster-metrics/src/multi-jvm/scala/akka/cluster/metrics/ClusterMetricsRoutingSpec.scala b/akka-cluster-metrics/src/multi-jvm/scala/akka/cluster/metrics/ClusterMetricsRoutingSpec.scala index aedcbb1d1f..d87163eafd 100644 --- a/akka-cluster-metrics/src/multi-jvm/scala/akka/cluster/metrics/ClusterMetricsRoutingSpec.scala +++ b/akka-cluster-metrics/src/multi-jvm/scala/akka/cluster/metrics/ClusterMetricsRoutingSpec.scala @@ -61,7 +61,7 @@ object AdaptiveLoadBalancingRouterConfig extends MultiNodeConfig { // Extract individual sigar library for every node. nodeList foreach { role ⇒ nodeConfig(role) { - ConfigFactory.parseString("akka.cluster.metrics.native-library-extract-folder=${user.dir}/target/native/" + role.name) + ConfigFactory.parseString(s"akka.cluster.metrics.native-library-extract-folder=$${user.dir}/target/native/" + role.name) } } diff --git a/akka-docs/rst/java/code/docs/camel/CustomRouteTestBase.java b/akka-docs/rst/java/code/docs/camel/CustomRouteTestBase.java index 68a7a6e581..a02ac74d4a 100644 --- a/akka-docs/rst/java/code/docs/camel/CustomRouteTestBase.java +++ b/akka-docs/rst/java/code/docs/camel/CustomRouteTestBase.java @@ -16,7 +16,6 @@ public class CustomRouteTestBase { ActorRef responder = system.actorOf(Props.create(Responder.class), "TestResponder"); camel.context().addRoutes(new CustomRouteBuilder(responder)); //#CustomRoute - system.stop(responder); } finally { JavaTestKit.shutdownActorSystem(system); } diff --git a/akka-docs/rst/java/code/docs/pattern/SchedulerPatternTest.java b/akka-docs/rst/java/code/docs/pattern/SchedulerPatternTest.java index 01897cf545..8cd1928ee3 100644 --- a/akka-docs/rst/java/code/docs/pattern/SchedulerPatternTest.java +++ b/akka-docs/rst/java/code/docs/pattern/SchedulerPatternTest.java @@ -29,7 +29,7 @@ public class SchedulerPatternTest extends AbstractJavaTest { private final Cancellable tick = getContext().system().scheduler().schedule( Duration.create(500, TimeUnit.MILLISECONDS), - Duration.create(1000, TimeUnit.MILLISECONDS), + Duration.create(1, TimeUnit.SECONDS), getSelf(), "tick", getContext().dispatcher(), null); //#schedule-constructor // this variable and constructor is declared here to not show up in the docs @@ -92,7 +92,7 @@ public class SchedulerPatternTest extends AbstractJavaTest { if (message.equals("tick")) { // send another periodic tick after the specified delay getContext().system().scheduler().scheduleOnce( - Duration.create(1000, TimeUnit.MILLISECONDS), + Duration.create(1, TimeUnit.SECONDS), getSelf(), "tick", getContext().dispatcher(), null); // do something useful here //#schedule-receive diff --git a/akka-docs/rst/scala/code/docs/stream/cookbook/RecipeByteStrings.scala b/akka-docs/rst/scala/code/docs/stream/cookbook/RecipeByteStrings.scala index 8f3ddab71d..4c5f1d356e 100644 --- a/akka-docs/rst/scala/code/docs/stream/cookbook/RecipeByteStrings.scala +++ b/akka-docs/rst/scala/code/docs/stream/cookbook/RecipeByteStrings.scala @@ -69,7 +69,7 @@ class RecipeByteStrings extends RecipeSpec { val chunks = Await.result(chunksFuture, 3.seconds) chunks.forall(_.size <= 2) should be(true) - chunks.fold(ByteString())(_ ++ _) should be(ByteString(1, 2, 3, 4, 5, 6, 7, 8, 9)) + chunks.fold(ByteString.empty)(_ ++ _) should be(ByteString(1, 2, 3, 4, 5, 6, 7, 8, 9)) } "have a working bytes limiter" in { @@ -108,7 +108,7 @@ class RecipeByteStrings extends RecipeSpec { val bytes2 = Source(List(ByteString(1, 2), ByteString(3), ByteString(4, 5, 6), ByteString(7, 8, 9, 10))) Await.result(bytes1.via(limiter).limit(10).runWith(Sink.seq), 3.seconds) - .fold(ByteString())(_ ++ _) should be(ByteString(1, 2, 3, 4, 5, 6, 7, 8, 9)) + .fold(ByteString.empty)(_ ++ _) should be(ByteString(1, 2, 3, 4, 5, 6, 7, 8, 9)) an[IllegalStateException] must be thrownBy { Await.result(bytes2.via(limiter).limit(10).runWith(Sink.seq), 3.seconds) diff --git a/akka-http-tests/src/test/scala/akka/http/scaladsl/server/directives/FileUploadDirectivesSpec.scala b/akka-http-tests/src/test/scala/akka/http/scaladsl/server/directives/FileUploadDirectivesSpec.scala index 28e665647d..7851be1391 100644 --- a/akka-http-tests/src/test/scala/akka/http/scaladsl/server/directives/FileUploadDirectivesSpec.scala +++ b/akka-http-tests/src/test/scala/akka/http/scaladsl/server/directives/FileUploadDirectivesSpec.scala @@ -58,7 +58,7 @@ class FileUploadDirectivesSpec extends RoutingSpec { fileUpload("field1") { case (info, bytes) ⇒ // stream the bytes somewhere - val allBytesF = bytes.runFold(ByteString()) { (all, bytes) ⇒ all ++ bytes } + val allBytesF = bytes.runFold(ByteString.empty) { (all, bytes) ⇒ all ++ bytes } // sum all individual file sizes onSuccess(allBytesF) { allBytes ⇒ @@ -120,7 +120,7 @@ class FileUploadDirectivesSpec extends RoutingSpec { fileUpload("missing") { case (info, bytes) ⇒ // stream the bytes somewhere - val allBytesF = bytes.runFold(ByteString()) { (all, bytes) ⇒ all ++ bytes } + val allBytesF = bytes.runFold(ByteString.empty) { (all, bytes) ⇒ all ++ bytes } // sum all individual file sizes onSuccess(allBytesF) { allBytes ⇒ diff --git a/akka-stream-tests/src/test/java/akka/stream/io/OutputStreamSinkTest.java b/akka-stream-tests/src/test/java/akka/stream/io/OutputStreamSinkTest.java index af9be0391a..59c61f17bd 100644 --- a/akka-stream-tests/src/test/java/akka/stream/io/OutputStreamSinkTest.java +++ b/akka-stream-tests/src/test/java/akka/stream/io/OutputStreamSinkTest.java @@ -44,7 +44,7 @@ public class OutputStreamSinkTest extends StreamTest { } }; final CompletionStage resultFuture = Source.single(ByteString.fromString("123456")).runWith(StreamConverters.fromOutputStream(() -> os), materializer); - final IOResult result = resultFuture.toCompletableFuture().get(3000, TimeUnit.MILLISECONDS); + final IOResult result = resultFuture.toCompletableFuture().get(3, TimeUnit.SECONDS); assertFalse(result.wasSuccessful()); assertTrue(result.getError().getMessage().equals("Can't accept more data.")); diff --git a/akka-stream-tests/src/test/java/akka/stream/io/OutputStreamSourceTest.java b/akka-stream-tests/src/test/java/akka/stream/io/OutputStreamSourceTest.java index f2d0847077..220b07d810 100644 --- a/akka-stream-tests/src/test/java/akka/stream/io/OutputStreamSourceTest.java +++ b/akka-stream-tests/src/test/java/akka/stream/io/OutputStreamSourceTest.java @@ -33,7 +33,7 @@ public class OutputStreamSourceTest extends StreamTest { Utils.UnboundedMailboxConfig()); @Test public void mustSendEventsViaOutputStream() throws Exception { - final FiniteDuration timeout = FiniteDuration.create(3000, TimeUnit.MILLISECONDS); + final FiniteDuration timeout = FiniteDuration.create(3, TimeUnit.SECONDS); final JavaTestKit probe = new JavaTestKit(system); final Source source = StreamConverters.asOutputStream(timeout); diff --git a/akka-stream/src/main/scala/akka/stream/impl/io/OutputStreamSourceStage.scala b/akka-stream/src/main/scala/akka/stream/impl/io/OutputStreamSourceStage.scala index 15b0a03d1b..12bab04e08 100644 --- a/akka-stream/src/main/scala/akka/stream/impl/io/OutputStreamSourceStage.scala +++ b/akka-stream/src/main/scala/akka/stream/impl/io/OutputStreamSourceStage.scala @@ -122,7 +122,7 @@ final private[stream] class OutputStreamSourceStage(writeTimeout: FiniteDuration downstreamStatus.set(Canceled) dataQueue.clear() // if blocked reading, make sure the take() completes - dataQueue.put(ByteString()) + dataQueue.put(ByteString.empty) completeStage() } override def onPull(): Unit = { @@ -135,7 +135,7 @@ final private[stream] class OutputStreamSourceStage(writeTimeout: FiniteDuration } catch { case _: InterruptedException ⇒ Thread.interrupted() - ByteString() + ByteString.empty } finally { blockingThread = null }