add MessagePacker.clear() method to clear position

isopov · isopov · commit 41e7fe7b8082 · 2018-02-12T17:41:57.000+03: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
@@ -56,11 +56,10 @@ private ArrayBufferOutput getArrayBufferOut()
         return (ArrayBufferOutput) out;
     }
 
-    /**
-     * Clears the written data.
-     */
+    @Override
     public void clear()
     {
+        super.clear();
         getArrayBufferOut().clear();
     }
 
diff --git a/msgpack-core/src/main/java/org/msgpack/core/MessagePacker.java b/msgpack-core/src/main/java/org/msgpack/core/MessagePacker.java
@@ -260,6 +260,14 @@ public long getTotalWrittenBytes()
         return totalFlushBytes + position;
     }
 
+    /**
+     * Clears the written data.
+     */
+    public void clear()
+    {
+        position = 0;
+    }
+
     /**
      * Flushes internal buffer to the underlying output.
      * <p>
diff --git a/msgpack-core/src/main/java/org/msgpack/core/buffer/ArrayBufferOutput.java b/msgpack-core/src/main/java/org/msgpack/core/buffer/ArrayBufferOutput.java
@@ -28,9 +28,9 @@
 public class ArrayBufferOutput
         implements MessageBufferOutput
 {
-    private List<MessageBuffer> list;
+    private final List<MessageBuffer> list;
+    private final int bufferSize;
     private MessageBuffer lastBuffer;
-    private int bufferSize;
 
     public ArrayBufferOutput()
     {
diff --git a/msgpack-core/src/test/scala/org/msgpack/core/MessageBufferPackerTest.scala b/msgpack-core/src/test/scala/org/msgpack/core/MessageBufferPackerTest.scala
@@ -16,6 +16,7 @@
 package org.msgpack.core
 
 import java.io.ByteArrayOutputStream
+import java.util.Arrays
 
 import org.msgpack.value.ValueFactory._
 
@@ -32,5 +33,19 @@ class MessageBufferPackerTest extends MessagePackSpec {
 
       packer1.toByteArray shouldBe stream.toByteArray
     }
+
+    "clear unflushed" in {
+      val packer = MessagePack.newDefaultBufferPacker
+      packer.packInt(1);
+      packer.clear();
+      packer.packInt(2);
+
+      packer.toByteArray shouldBe Array(2)
+      val buffer = packer.toBufferList().get(0)
+      buffer.toByteArray() shouldBe Array(2)
+      val array = Arrays.copyOf(buffer.sliceAsByteBuffer().array(), buffer.size())
+      array shouldBe Array(2)
+    }
+
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -56,11 +56,10 @@ private ArrayBufferOutput getArrayBufferOut()`
`56`	`56`	`return (ArrayBufferOutput) out;`
`57`	`57`	`}`
`58`	`58`
`59`		`- /**`
`60`		`- * Clears the written data.`
`61`		`- */`
	`59`	`+ @Override`
`62`	`60`	`public void clear()`
`63`	`61`	`{`
	`62`	`+ super.clear();`
`64`	`63`	`getArrayBufferOut().clear();`
`65`	`64`	`}`
`66`	`65`
Original file line number	Diff line number	Diff line change
`@@ -28,9 +28,9 @@`
`28`	`28`	`public class ArrayBufferOutput`
`29`	`29`	`implements MessageBufferOutput`
`30`	`30`	`{`
`31`		`- private List<MessageBuffer> list;`
	`31`	`+ private final List<MessageBuffer> list;`
	`32`	`+ private final int bufferSize;`
`32`	`33`	`private MessageBuffer lastBuffer;`
`33`		`- private int bufferSize;`
`34`	`34`
`35`	`35`	`public ArrayBufferOutput()`
`36`	`36`	`{`