raboof/pekko
1
0
Fork 0
Code Issues Pull requests Projects Releases 6 Packages Wiki Activity Actions 10

Merge pull request #20680 from akka/wip-ByteString.empty-patriknw

Browse source 
use ByteString.empty
This commit is contained in:
Patrik Nordwall 2016-06-02 14:37:03 +02:00
commit 03eaacdbbb
9 changed files with 17 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

1
akka-docs/rst/java/code/docs/camel/CustomRouteTestBase.java
View file

@ -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);
}

4
akka-docs/rst/java/code/docs/pattern/SchedulerPatternTest.java
View file

@ -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

4
akka-docs/rst/scala/code/docs/stream/cookbook/RecipeByteStrings.scala
View file

@ -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)