Merge pull request #320 from msgpack/concept-of-empty-to-array-buffer-input

xerial · xerial · commit 175b7b79faf9 · 2016-01-07T09:52:21.000+09:00
Make it possible to make ArrayBufferInput empty
diff --git a/msgpack-core/src/main/java/org/msgpack/core/buffer/ArrayBufferInput.java b/msgpack-core/src/main/java/org/msgpack/core/buffer/ArrayBufferInput.java
@@ -26,11 +26,17 @@ public class ArrayBufferInput
         implements MessageBufferInput
 {
     private MessageBuffer buffer;
-    private boolean isRead = false;
+    private boolean isEmpty;
 
     public ArrayBufferInput(MessageBuffer buf)
     {
-        this.buffer = checkNotNull(buf, "input buffer is null");
+        this.buffer = buf;
+        if (buf == null) {
+            isEmpty = true;
+        }
+        else {
+            isEmpty = false;
+        }
     }
 
     public ArrayBufferInput(byte[] arr)
@@ -40,20 +46,25 @@ public ArrayBufferInput(byte[] arr)
 
     public ArrayBufferInput(byte[] arr, int offset, int length)
     {
-        this(MessageBuffer.wrap(checkNotNull(arr, "input array is null")).slice(offset, length));
+        this(MessageBuffer.wrap(checkNotNull(arr, "input array is null"), offset, length));
     }
 
     /**
-     * Reset buffer. This method doesn't close the old resource.
+     * Reset buffer. This method returns the old buffer.
      *
-     * @param buf new buffer
-     * @return the old resource
+     * @param buf new buffer. This can be null to make this input empty.
+     * @return the old buffer.
      */
     public MessageBuffer reset(MessageBuffer buf)
     {
         MessageBuffer old = this.buffer;
         this.buffer = buf;
-        this.isRead = false;
+        if (buf == null) {
+            isEmpty = true;
+        }
+        else {
+            isEmpty = false;
+        }
         return old;
     }
 
@@ -64,17 +75,17 @@ public void reset(byte[] arr)
 
     public void reset(byte[] arr, int offset, int len)
     {
-        reset(MessageBuffer.wrap(checkNotNull(arr, "input array is null")).slice(offset, len));
+        reset(MessageBuffer.wrap(checkNotNull(arr, "input array is null"), offset, len));
     }
 
     @Override
     public MessageBuffer next()
             throws IOException
     {
-        if (isRead) {
+        if (isEmpty) {
             return null;
         }
-        isRead = true;
+        isEmpty = true;
         return buffer;
     }
 
@@ -83,6 +94,6 @@ public void close()
             throws IOException
     {
         buffer = null;
-        isRead = false;
+        isEmpty = true;
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -26,11 +26,17 @@ public class ArrayBufferInput`
`26`	`26`	`implements MessageBufferInput`
`27`	`27`	`{`
`28`	`28`	`private MessageBuffer buffer;`
`29`		`- private boolean isRead = false;`
	`29`	`+ private boolean isEmpty;`
`30`	`30`
`31`	`31`	`public ArrayBufferInput(MessageBuffer buf)`
`32`	`32`	`{`
`33`		`- this.buffer = checkNotNull(buf, "input buffer is null");`
	`33`	`+ this.buffer = buf;`
	`34`	`+ if (buf == null) {`
	`35`	`+ isEmpty = true;`
	`36`	`+ }`
	`37`	`+ else {`
	`38`	`+ isEmpty = false;`
	`39`	`+ }`
`34`	`40`	`}`
`35`	`41`
`36`	`42`	`public ArrayBufferInput(byte[] arr)`
`@@ -40,20 +46,25 @@ public ArrayBufferInput(byte[] arr)`
`40`	`46`
`41`	`47`	`public ArrayBufferInput(byte[] arr, int offset, int length)`
`42`	`48`	`{`
`43`		`- this(MessageBuffer.wrap(checkNotNull(arr, "input array is null")).slice(offset, length));`
	`49`	`+ this(MessageBuffer.wrap(checkNotNull(arr, "input array is null"), offset, length));`
`44`	`50`	`}`
`45`	`51`
`46`	`52`	`/**`
`47`		`- * Reset buffer. This method doesn't close the old resource.`
	`53`	`+ * Reset buffer. This method returns the old buffer.`
`48`	`54`	`*`
`49`		`- * @param buf new buffer`
`50`		`- * @return the old resource`
	`55`	`+ * @param buf new buffer. This can be null to make this input empty.`
	`56`	`+ * @return the old buffer.`
`51`	`57`	`*/`
`52`	`58`	`public MessageBuffer reset(MessageBuffer buf)`
`53`	`59`	`{`
`54`	`60`	`MessageBuffer old = this.buffer;`
`55`	`61`	`this.buffer = buf;`
`56`		`- this.isRead = false;`
	`62`	`+ if (buf == null) {`
	`63`	`+ isEmpty = true;`
	`64`	`+ }`
	`65`	`+ else {`
	`66`	`+ isEmpty = false;`
	`67`	`+ }`
`57`	`68`	`return old;`
`58`	`69`	`}`
`59`	`70`
`@@ -64,17 +75,17 @@ public void reset(byte[] arr)`
`64`	`75`
`65`	`76`	`public void reset(byte[] arr, int offset, int len)`
`66`	`77`	`{`
`67`		`- reset(MessageBuffer.wrap(checkNotNull(arr, "input array is null")).slice(offset, len));`
	`78`	`+ reset(MessageBuffer.wrap(checkNotNull(arr, "input array is null"), offset, len));`
`68`	`79`	`}`
`69`	`80`
`70`	`81`	`@Override`
`71`	`82`	`public MessageBuffer next()`
`72`	`83`	`throws IOException`
`73`	`84`	`{`
`74`		`- if (isRead) {`
	`85`	`+ if (isEmpty) {`
`75`	`86`	`return null;`
`76`	`87`	`}`
`77`		`- isRead = true;`
	`88`	`+ isEmpty = true;`
`78`	`89`	`return buffer;`
`79`	`90`	`}`
`80`	`91`
`@@ -83,6 +94,6 @@ public void close()`
`83`	`94`	`throws IOException`
`84`	`95`	`{`
`85`	`96`	`buffer = null;`
`86`		`- isRead = false;`
	`97`	`+ isEmpty = true;`
`87`	`98`	`}`
`88`	`99`	`}`