Removed packBinary helper methods since it can be written as packBinaryHeader(xx).writePayload(...)

xerial · xerial · commit e800df44962b · 2014-07-23T13:14:20.000+09:00
diff --git a/msgpack-core/src/main/java/org/msgpack/core/MessagePack.java b/msgpack-core/src/main/java/org/msgpack/core/MessagePack.java
@@ -1,5 +1,7 @@
 package org.msgpack.core;
 
+import org.msgpack.core.buffer.ArrayBufferInput;
+
 import java.nio.charset.Charset;
 import java.nio.charset.CodingErrorAction;
 
@@ -13,6 +15,12 @@ public class MessagePack {
 
     public static final Charset UTF8 = Charset.forName("UTF-8");
 
+    public static MessageUnpacker newUnpacker(byte[] src) {
+        return new MessageUnpacker(new ArrayBufferInput(src));
+    }
+
+
+
     /**
      * Message packer/unpacker configuration object
      */
diff --git a/msgpack-core/src/main/java/org/msgpack/core/MessagePacker.java b/msgpack-core/src/main/java/org/msgpack/core/MessagePacker.java
@@ -409,65 +409,41 @@ public MessagePacker packMapHeader(int mapSize) throws IOException {
         return this;
     }
 
-    public MessagePacker pack(Value v) throws IOException {
+    public MessagePacker packValue(Value v) throws IOException {
         v.writeTo(this);
         return this;
     }
 
-    public MessagePacker packExtendedType(int extType, byte[] src, int offset, int len) throws IOException {
-        return packExtendedTypeHeader(extType, len).writePayload(src, offset, len);
-    }
-
-    public MessagePacker packExtendedType(int extType, byte[] src) throws IOException {
-        return packExtendedType(extType, src, 0, src.length);
-    }
-
-    public MessagePacker packExtendedType(int extType, ByteBuffer src) throws IOException {
-        return packExtendedTypeHeader(extType, src.remaining()).writePayload(src);
-    }
-
-    public MessagePacker packExtendedTypeHeader(int extType, int dataLen) throws IOException {
-        if(dataLen < (1 << 8)) {
-            if(dataLen > 0 && (dataLen & (dataLen - 1)) == 0) { // check whether dataLen == 2^x
-                if(dataLen == 1) {
+    public MessagePacker packExtendedTypeHeader(int extType, int payloadLen) throws IOException {
+        if(payloadLen < (1 << 8)) {
+            if(payloadLen > 0 && (payloadLen & (payloadLen - 1)) == 0) { // check whether dataLen == 2^x
+                if(payloadLen == 1) {
                     writeByteAndByte(FIXEXT1, (byte) extType);
-                } else if(dataLen == 2){
+                } else if(payloadLen == 2){
                     writeByteAndByte(FIXEXT2, (byte) extType);
-                } else if(dataLen == 4) {
+                } else if(payloadLen == 4) {
                     writeByteAndByte(FIXEXT4, (byte) extType);
-                } else if(dataLen == 8) {
+                } else if(payloadLen == 8) {
                     writeByteAndByte(FIXEXT8, (byte) extType);
                 } else {
                     writeByteAndByte(FIXEXT16, (byte) extType);
                 }
             } else {
-                writeByteAndByte(EXT8, (byte) dataLen);
+                writeByteAndByte(EXT8, (byte) payloadLen);
                 writeByte((byte) extType);
             }
-        } else if(dataLen < (1 << 16)) {
-            writeByteAndShort(EXT16, (short) dataLen);
+        } else if(payloadLen < (1 << 16)) {
+            writeByteAndShort(EXT16, (short) payloadLen);
             writeByte((byte) extType);
         } else {
-            writeByteAndInt(EXT32, dataLen);
+            writeByteAndInt(EXT32, payloadLen);
             writeByte((byte) extType);
 
             // TODO support dataLen > 2^31 - 1
         }
         return this;
     }
 
-    public MessagePacker packBinary(byte[] src) throws IOException {
-        return packBinary(src, 0, src.length);
-    }
-
-    public MessagePacker packBinary(byte[] src, int offset, int len) throws IOException {
-        return packBinaryHeader(len).writePayload(src, offset, len);
-    }
-
-    public MessagePacker packBinary(ByteBuffer src) throws IOException {
-        return packBinaryHeader(src.remaining()).writePayload(src);
-    }
-
     public MessagePacker packBinaryHeader(int len) throws IOException {
         if(len < (1 << 8)) {
             writeByteAndByte(BIN8, (byte) len);
@@ -479,10 +455,6 @@ public MessagePacker packBinaryHeader(int len) throws IOException {
         return this;
     }
 
-    public MessagePacker packRawString(ByteBuffer src) throws IOException {
-        return packRawStringHeader(src.remaining()).writePayload(src);
-    }
-
     public MessagePacker packRawStringHeader(int len) throws IOException {
         if(len < (1 << 5)) {
             writeByte((byte) (FIXSTR_PREFIX | len));
diff --git a/msgpack-core/src/test/scala/org/msgpack/value/CursorTest.scala b/msgpack-core/src/test/scala/org/msgpack/value/CursorTest.scala
@@ -30,7 +30,7 @@ class CursorTest extends MessagePackSpec {
       val len = Random.nextInt(256)
       val b = new Array[Byte](len)
       Random.nextBytes(b)
-      packer.packBinary(b)
+      packer.packBinaryHeader(b.length).writePayload(b)
     }
   }
 

Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,7 @@ class CursorTest extends MessagePackSpec {`
`30`	`30`	`val len = Random.nextInt(256)`
`31`	`31`	`val b = new Array[Byte](len)`
`32`	`32`	`Random.nextBytes(b)`
`33`		`- packer.packBinary(b)`
	`33`	`+ packer.packBinaryHeader(b.length).writePayload(b)`
`34`	`34`	`}`
`35`	`35`	`}`
`36`	`36`