MessageBufferPacker.toByteArray flushes packer's internal buffer automatically

frsyuki · frsyuki · commit ff16522c5f33 · 2016-01-06T13:22:27.000-08:00
diff --git a/msgpack-core/src/main/java/org/msgpack/core/MessageBufferPacker.java b/msgpack-core/src/main/java/org/msgpack/core/MessageBufferPacker.java
@@ -59,16 +59,37 @@ public void clear()
 
     public byte[] toByteArray()
     {
+        try {
+            flush();
+        }
+        catch (IOException ex) {
+            // IOException must not happen because underlaying ArrayBufferOutput never throws IOException
+            throw new RuntimeException(ex);
+        }
         return getArrayBufferOut().toByteArray();
     }
 
     public MessageBuffer toMessageBuffer()
     {
+        try {
+            flush();
+        }
+        catch (IOException ex) {
+            // IOException must not happen because underlaying ArrayBufferOutput never throws IOException
+            throw new RuntimeException(ex);
+        }
         return getArrayBufferOut().toMessageBuffer();
     }
 
     public List<MessageBuffer> toBufferList()
     {
+        try {
+            flush();
+        }
+        catch (IOException ex) {
+            // IOException must not happen because underlaying ArrayBufferOutput never throws IOException
+            throw new RuntimeException(ex);
+        }
         return getArrayBufferOut().toBufferList();
     }
 }
diff --git a/msgpack-core/src/test/scala/org/msgpack/core/MessageBufferPackerTest.scala b/msgpack-core/src/test/scala/org/msgpack/core/MessageBufferPackerTest.scala
@@ -0,0 +1,46 @@
+//
+// MessagePack for Java
+//
+//    Licensed under the Apache License, Version 2.0 (the "License");
+//    you may not use this file except in compliance with the License.
+//    You may obtain a copy of the License at
+//
+//        http://www.apache.org/licenses/LICENSE-2.0
+//
+//    Unless required by applicable law or agreed to in writing, software
+//    distributed under the License is distributed on an "AS IS" BASIS,
+//    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//    See the License for the specific language governing permissions and
+//    limitations under the License.
+//
+package org.msgpack.core
+
+import java.io.ByteArrayOutputStream
+import java.util.Arrays
+import org.msgpack.core.MessagePack.{UnpackerConfig, PackerConfig}
+import org.msgpack.core.buffer.OutputStreamBufferOutput
+import org.msgpack.value.Value
+import org.msgpack.value.ValueFactory._
+
+/**
+ *
+ */
+class MessageBufferPackerTest extends MessagePackSpec {
+  "MessageBufferPacker" should {
+    "be equivalent to ByteArrayOutputStream" in {
+      val packer1 = MessagePack.newDefaultBufferPacker()
+      packer1.packValue(newMap(Array[Value](
+              newString("a"), newInteger(1),
+              newString("b"), newString("s"))))
+
+      val stream = new ByteArrayOutputStream()
+      val packer2 = MessagePack.newDefaultPacker(stream)
+      packer2.packValue(newMap(Array[Value](
+              newString("a"), newInteger(1),
+              newString("b"), newString("s"))))
+      packer2.flush()
+
+      Arrays.equals(packer1.toByteArray(), stream.toByteArray()) shouldBe true
+    }
+  }
+}

Original file line number	Diff line number	Diff line change
`@@ -59,16 +59,37 @@ public void clear()`
`59`	`59`
`60`	`60`	`public byte[] toByteArray()`
`61`	`61`	`{`
	`62`	`+ try {`
	`63`	`+ flush();`
	`64`	`+ }`
	`65`	`+ catch (IOException ex) {`
	`66`	`+ // IOException must not happen because underlaying ArrayBufferOutput never throws IOException`
	`67`	`+ throw new RuntimeException(ex);`
	`68`	`+ }`
`62`	`69`	`return getArrayBufferOut().toByteArray();`
`63`	`70`	`}`
`64`	`71`
`65`	`72`	`public MessageBuffer toMessageBuffer()`
`66`	`73`	`{`
	`74`	`+ try {`
	`75`	`+ flush();`
	`76`	`+ }`
	`77`	`+ catch (IOException ex) {`
	`78`	`+ // IOException must not happen because underlaying ArrayBufferOutput never throws IOException`
	`79`	`+ throw new RuntimeException(ex);`
	`80`	`+ }`
`67`	`81`	`return getArrayBufferOut().toMessageBuffer();`
`68`	`82`	`}`
`69`	`83`
`70`	`84`	`public List<MessageBuffer> toBufferList()`
`71`	`85`	`{`
	`86`	`+ try {`
	`87`	`+ flush();`
	`88`	`+ }`
	`89`	`+ catch (IOException ex) {`
	`90`	`+ // IOException must not happen because underlaying ArrayBufferOutput never throws IOException`
	`91`	`+ throw new RuntimeException(ex);`
	`92`	`+ }`
`72`	`93`	`return getArrayBufferOut().toBufferList();`
`73`	`94`	`}`
`74`	`95`	`}`