BufferRefer: accepts ByteBuffer instead of byte array

frsyuki · frsyuki · commit 499dd52b35bc · 2011-07-31T12:50:33.000+09:00
diff --git a/src/main/java/org/msgpack/io/BufferReferer.java b/src/main/java/org/msgpack/io/BufferReferer.java
@@ -18,9 +18,10 @@
 package org.msgpack.io;
 
 import java.io.IOException;
+import java.nio.ByteBuffer;
 
 
 public interface BufferReferer {
-    public void refer(byte[] b, int off, int len, boolean gift) throws IOException;
+    public void refer(ByteBuffer bb, boolean gift) throws IOException;
 }
 
diff --git a/src/main/java/org/msgpack/io/LinkedBufferInput.java b/src/main/java/org/msgpack/io/LinkedBufferInput.java
@@ -69,11 +69,22 @@ public boolean tryRefer(BufferReferer ref, int len) throws IOException {
             throw new EndOfBufferException();
         } else if(bb.remaining() < len) {
             return false;
-        } else if(!bb.hasArray()) {
-            return false;
         }
-        ref.refer(bb.array(), bb.arrayOffset()+bb.position(), len, true);
-        bb.position(bb.position()+len);
+        boolean success = false;
+        int pos = bb.position();
+        int lim = bb.limit();
+        try {
+            bb.limit(pos+len);
+            ref.refer(bb, true);
+            success = true;
+        } finally {
+            bb.limit(lim);
+            if(success) {
+                bb.position(pos+len);
+            } else {
+                bb.position(pos);
+            }
+        }
         return true;
     }
 
diff --git a/src/main/java/org/msgpack/unpacker/Accept.java b/src/main/java/org/msgpack/unpacker/Accept.java
@@ -18,6 +18,7 @@
 package org.msgpack.unpacker;
 
 import java.io.IOException;
+import java.nio.ByteBuffer;
 import org.msgpack.io.BufferReferer;
 import org.msgpack.MessageTypeException;
 
@@ -99,7 +100,7 @@ void acceptDouble(double v) {
         throw new MessageTypeException("Unexpected float value");
     }
 
-    public void refer(byte[] b, int off, int size, boolean gift) throws IOException {
+    public void refer(ByteBuffer bb, boolean gift) throws IOException {
         throw new MessageTypeException("Unexpected raw value");
     }
 }
diff --git a/src/main/java/org/msgpack/unpacker/ByteArrayAccept.java b/src/main/java/org/msgpack/unpacker/ByteArrayAccept.java
@@ -18,6 +18,7 @@
 package org.msgpack.unpacker;
 
 import java.io.IOException;
+import java.nio.ByteBuffer;
 
 
 final class ByteArrayAccept extends Accept {
@@ -34,10 +35,10 @@ void acceptEmptyRaw() {
     }
 
     @Override
-    public void refer(byte[] b, int off, int len, boolean gift) throws IOException {
+    public void refer(ByteBuffer bb, boolean gift) throws IOException {
         // TODO gift
-        this.value = new byte[len];
-        System.arraycopy(b, off, value, 0, len);
+        this.value = new byte[bb.remaining()];
+        bb.get(value);
     }
 }
 
diff --git a/src/main/java/org/msgpack/unpacker/StringAccept.java b/src/main/java/org/msgpack/unpacker/StringAccept.java
@@ -18,10 +18,23 @@
 package org.msgpack.unpacker;
 
 import java.io.IOException;
+import java.nio.ByteBuffer;
+import java.nio.charset.Charset;
+import java.nio.charset.CharacterCodingException;
+import java.nio.charset.CharsetDecoder;
+import java.nio.charset.CodingErrorAction;
+import java.nio.charset.MalformedInputException;
 
 
 final class StringAccept extends Accept {
     String value;
+    private CharsetDecoder decoder;
+
+    public StringAccept() {
+        this.decoder = Charset.forName("UTF-8").newDecoder().
+            onMalformedInput(CodingErrorAction.REPORT).
+            onUnmappableCharacter(CodingErrorAction.REPORT);
+    }
 
     @Override
     void acceptRaw(byte[] raw) {
@@ -35,8 +48,9 @@ void acceptEmptyRaw() {
     }
 
     @Override
-    public void refer(byte[] b, int off, int len, boolean gift) throws IOException {
-        this.value = new String(b, off, len);
+    public void refer(ByteBuffer bb, boolean gift) throws IOException {
+        // TODO encoding error
+        this.value = decoder.decode(bb).toString();
     }
 }
 
diff --git a/src/main/java/org/msgpack/unpacker/ValueAccept.java b/src/main/java/org/msgpack/unpacker/ValueAccept.java
@@ -18,6 +18,7 @@
 package org.msgpack.unpacker;
 
 import java.io.IOException;
+import java.nio.ByteBuffer;
 import java.math.BigInteger;
 import org.msgpack.type.Value;
 import org.msgpack.type.ValueFactory;
@@ -96,9 +97,11 @@ void acceptEmptyRaw() {
     }
 
     @Override
-    public void refer(byte[] b, int off, int len, boolean gift) throws IOException {
+    public void refer(ByteBuffer bb, boolean gift) throws IOException {
         // TODO gift
-        uc.write(ValueFactory.rawValue(b, off, len));
+        byte[] raw = new byte[bb.remaining()];
+        bb.get(raw);
+        uc.write(ValueFactory.rawValue(raw, true));
     }
 
     @Override

Original file line number	Diff line number	Diff line change
`@@ -18,9 +18,10 @@`
`18`	`18`	`package org.msgpack.io;`
`19`	`19`
`20`	`20`	`import java.io.IOException;`
	`21`	`+import java.nio.ByteBuffer;`
`21`	`22`
`22`	`23`
`23`	`24`	`public interface BufferReferer {`
`24`		`- public void refer(byte[] b, int off, int len, boolean gift) throws IOException;`
	`25`	`+ public void refer(ByteBuffer bb, boolean gift) throws IOException;`
`25`	`26`	`}`
`26`	`27`
Original file line number	Diff line number	Diff line change
`@@ -18,6 +18,7 @@`
`18`	`18`	`package org.msgpack.unpacker;`
`19`	`19`
`20`	`20`	`import java.io.IOException;`
	`21`	`+import java.nio.ByteBuffer;`
`21`	`22`	`import org.msgpack.io.BufferReferer;`
`22`	`23`	`import org.msgpack.MessageTypeException;`
`23`	`24`
`@@ -99,7 +100,7 @@ void acceptDouble(double v) {`
`99`	`100`	`throw new MessageTypeException("Unexpected float value");`
`100`	`101`	`}`
`101`	`102`
`102`		`- public void refer(byte[] b, int off, int size, boolean gift) throws IOException {`
	`103`	`+ public void refer(ByteBuffer bb, boolean gift) throws IOException {`
`103`	`104`	`throw new MessageTypeException("Unexpected raw value");`
`104`	`105`	`}`
`105`	`106`	`}`