Add ByteString.emptyByteString to Java API

To work around scala/bug#11509
akka · May 15, 2019 · b82d541 · b82d541
1 parent 18a3569
commit b82d541
Show file tree

Hide file tree

Showing 7 changed files with 20 additions and 7 deletions.
diff --git a/akka-actor/src/main/scala-2.13+/akka/util/ByteString.scala b/akka-actor/src/main/scala-2.13+/akka/util/ByteString.scala
@@ -141,6 +141,9 @@ object ByteString {
 
   val empty: ByteString = CompactByteString(Array.empty[Byte])
 
+  /** Java API */
+  val emptyByteString: ByteString = empty
+
   def newBuilder: ByteStringBuilder = new ByteStringBuilder
 
   /** Java API */

diff --git a/akka-actor/src/main/scala-2.13-/akka/util/ByteString.scala b/akka-actor/src/main/scala-2.13-/akka/util/ByteString.scala
@@ -138,6 +138,9 @@ object ByteString {
 
   val empty: ByteString = CompactByteString(Array.empty[Byte])
 
+  /** Java API */
+  val emptyByteString: ByteString = empty
+
   def newBuilder: ByteStringBuilder = new ByteStringBuilder
 
   /** Java API */

diff --git a/akka-docs/src/test/java/jdocs/io/UdpConnectedDocTest.java b/akka-docs/src/test/java/jdocs/io/UdpConnectedDocTest.java
@@ -19,6 +19,9 @@
 import akka.io.UdpConnectedMessage;
 import akka.io.UdpSO;
 import akka.util.ByteString;
+
+import static akka.util.ByteString.emptyByteString;
+
 // #imports
 
 public class UdpConnectedDocTest {
@@ -79,7 +82,7 @@ public Receive createReceive() {
       builder.matchEquals(
           "send",
           x -> {
-            ByteString data = ByteString.empty();
+            ByteString data = emptyByteString();
             // #send
             connectionActor.tell(UdpConnectedMessage.send(data), getSelf());
             // #send

diff --git a/akka-docs/src/test/java/jdocs/stream/BidiFlowDocTest.java b/akka-docs/src/test/java/jdocs/stream/BidiFlowDocTest.java
@@ -25,6 +25,7 @@
 import akka.stream.stage.*;
 import akka.util.ByteIterator;
 import akka.util.ByteString;
+import static akka.util.ByteString.emptyByteString;
 import akka.util.ByteStringBuilder;
 import static org.junit.Assert.assertArrayEquals;
 
@@ -156,7 +157,7 @@ public GraphStageLogic createLogic(Attributes inheritedAttributes) {
       return new GraphStageLogic(shape) {
 
         // this holds the received but not yet parsed bytes
-        private ByteString stash = ByteString.empty();
+        private ByteString stash = emptyByteString();
         // this holds the current message length or -1 if at a boundary
         private int needed = -1;
 

diff --git a/akka-docs/src/test/java/jdocs/stream/javadsl/cookbook/RecipeByteStrings.java b/akka-docs/src/test/java/jdocs/stream/javadsl/cookbook/RecipeByteStrings.java
@@ -13,6 +13,7 @@
 import akka.stream.stage.*;
 import akka.testkit.javadsl.TestKit;
 import akka.util.ByteString;
+import static akka.util.ByteString.emptyByteString;
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
 import org.junit.Test;
@@ -78,7 +79,7 @@ public FlowShape<ByteString, ByteString> shape() {
         @Override
         public GraphStageLogic createLogic(Attributes inheritedAttributes) {
           return new GraphStageLogic(shape) {
-            private ByteString buffer = ByteString.empty();
+            private ByteString buffer = emptyByteString();
 
             {
               setHandler(
@@ -149,7 +150,7 @@ private void emitChunk() {
           assertTrue(chunk.size() <= 2);
         }
 
-        ByteString sum = ByteString.empty();
+        ByteString sum = emptyByteString();
         for (ByteString chunk : chunks) {
           sum = sum.concat(chunk);
         }
@@ -244,7 +245,7 @@ public void onPush() throws Exception {
                 .runWith(Sink.seq(), mat)
                 .toCompletableFuture()
                 .get(3, TimeUnit.SECONDS);
-        ByteString acc = ByteString.empty();
+        ByteString acc = emptyByteString();
         for (ByteString b : got) {
           acc = acc.concat(b);
         }

diff --git a/akka-docs/src/test/java/jdocs/stream/javadsl/cookbook/RecipeDecompress.java b/akka-docs/src/test/java/jdocs/stream/javadsl/cookbook/RecipeDecompress.java
@@ -12,6 +12,7 @@
 import akka.stream.javadsl.Source;
 import akka.testkit.javadsl.TestKit;
 import akka.util.ByteString;
+import static akka.util.ByteString.emptyByteString;
 import org.junit.AfterClass;
 import org.junit.Assert;
 import org.junit.BeforeClass;
@@ -51,7 +52,7 @@ public void parseLines() throws Exception {
 
     ByteString decompressedData =
         decompressedStream
-            .runFold(ByteString.empty(), ByteString::concat, mat)
+            .runFold(emptyByteString(), ByteString::concat, mat)
             .toCompletableFuture()
             .get(1, TimeUnit.SECONDS);
     String decompressedString = decompressedData.utf8String();

diff --git a/akka-stream-tests/src/test/java/akka/stream/javadsl/TcpTest.java b/akka-stream-tests/src/test/java/akka/stream/javadsl/TcpTest.java
@@ -19,6 +19,7 @@
 import akka.testkit.javadsl.EventFilter;
 import akka.testkit.javadsl.TestKit;
 import akka.util.ByteString;
+import static akka.util.ByteString.emptyByteString;
 import org.junit.ClassRule;
 import org.junit.Test;
 
@@ -85,7 +86,7 @@ public void mustWorkInHappyCase() throws Exception {
                 Tcp.get(system)
                     .outgoingConnection(serverAddress.getHostString(), serverAddress.getPort()))
             .runFold(
-                ByteString.empty(),
+                emptyByteString(),
                 new Function2<ByteString, ByteString, ByteString>() {
                   public ByteString apply(ByteString acc, ByteString elem) {
                     return acc.concat(elem);