MessagePack.pack/unpack -> write/read

frsyuki · frsyuki · commit 305ecb208f85 · 2011-07-08T18:26:01.000+09:00
diff --git a/src/main/java/org/msgpack/MessagePack.java b/src/main/java/org/msgpack/MessagePack.java
@@ -45,81 +45,81 @@ public MessagePack(MessagePack parent) {
 	registry = new TemplateRegistry(parent.registry);
     }
 
-    public byte[] pack(Object v) throws IOException {
-	return pack(v, getTemplate(v.getClass()));
+    public byte[] write(Object v) throws IOException {
+        return write(v, getTemplate(v.getClass()));
     }
 
-    public byte[] pack(Object v, Template tmpl) throws IOException { // TODO IOException
-	BufferPacker pk = new BufferPacker();
-	tmpl.write(pk, v);
-	return pk.toByteArray();
+    public byte[] write(Object v, Template tmpl) throws IOException { // TODO IOException
+        BufferPacker pk = new BufferPacker();
+        tmpl.write(pk, v);
+        return pk.toByteArray();
     }
 
-    public void pack(OutputStream out, Object v) throws IOException {
-	pack(out, v, getTemplate(v.getClass()));
+    public void write(OutputStream out, Object v) throws IOException {
+        write(out, v, getTemplate(v.getClass()));
     }
 
-    public void pack(OutputStream out, Object v, Template tmpl) throws IOException {
+    public void write(OutputStream out, Object v, Template tmpl) throws IOException {
         StreamPacker pk = new StreamPacker(out);
         tmpl.write(pk, v);
     }
 
-    public byte[] pack(Value v) throws IOException {  // TODO IOException
+    public byte[] write(Value v) throws IOException {  // TODO IOException
         // FIXME ValueTemplate should do this
         BufferPacker pk = new BufferPacker();
         pk.write(v);
         return pk.toByteArray();
     }
 
-    public <T> T unpack(InputStream in, T v) throws IOException {
+    public <T> T read(InputStream in, T v) throws IOException {
         // TODO
         Template tmpl = getTemplate(v.getClass());
         return (T)tmpl.read(new StreamUnpacker(in), v);
     }
 
-    public <T> T unpack(InputStream in, Class<T> c) throws IOException {
+    public <T> T read(InputStream in, Class<T> c) throws IOException {
         // TODO
         Template tmpl = getTemplate(c);
         return (T)tmpl.read(new StreamUnpacker(in), null);
     }
 
-    public Value unpack(byte[] b) throws IOException {  // TODO IOException
-        return unpack(b, 0, b.length);
+    public Value read(byte[] b) throws IOException {  // TODO IOException
+        return read(b, 0, b.length);
     }
 
-    public Value unpack(byte[] b, int off, int len) throws IOException {  // TODO IOException
+    public Value read(byte[] b, int off, int len) throws IOException {  // TODO IOException
         return new BufferUnpacker().wrap(b, off, len).readValue();
     }
 
-    public Value unpack(ByteBuffer buf) throws IOException {  // TODO IOException
+    public Value read(ByteBuffer buf) throws IOException {  // TODO IOException
         return new BufferUnpacker().wrap(buf).readValue();
     }
 
-    public <T> T unpack(byte[] b, T v) throws IOException {  // TODO IOException
+    public <T> T read(byte[] b, T v) throws IOException {  // TODO IOException
         // TODO
         Template tmpl = getTemplate(v.getClass());
         BufferUnpacker u = new BufferUnpacker();
         u.wrap(b);
         return (T)tmpl.read(u, v);
     }
 
-    public <T> T unpack(byte[] b, Class<T> c) throws IOException {  // TODO IOException
+    public <T> T read(byte[] b, Class<T> c) throws IOException {  // TODO IOException
         // TODO
         Template tmpl = getTemplate(c);
         BufferUnpacker u = new BufferUnpacker();
         u.wrap(b);
         return (T)tmpl.read(u, null);
     }
 
-    public <T> T unpack(ByteBuffer b, T v) throws IOException {  // TODO IOException
+    public <T> T read(ByteBuffer b, T v) throws IOException {  // TODO IOException
         // TODO
         Template tmpl = getTemplate(v.getClass());
         BufferUnpacker u = new BufferUnpacker();
         u.wrap(b);
         return (T)tmpl.read(u, v);
     }
 
-    public <T> T unpack(ByteBuffer b, Class<T> c) {  // TODO IOException
+    public <T> T read(ByteBuffer b, Class<T> c) {  // TODO IOException
         // TODO
         Template tmpl = getTemplate(c);
         BufferUnpacker u = new BufferUnpacker();
diff --git a/src/test/java/org/msgpack/TestSimpleConvertUnconvert.java b/src/test/java/org/msgpack/TestSimpleConvertUnconvert.java
@@ -24,9 +24,9 @@ public class TestSimpleConvertUnconvert {
     @Test
     public void testSimpleConvert() throws IOException {
         MessagePack msgpack = new MessagePack();
-        byte[] raw = msgpack.pack(new int[] {1,2,3});
+        byte[] raw = msgpack.write(new int[] {1,2,3});
 
-        Value v = msgpack.unpack(raw);
+        Value v = msgpack.read(raw);
 
         int[] array = msgpack.convert(v, new int[3]);
         assertArrayEquals(new int[] {1,2,3}, array);
diff --git a/src/test/java/org/msgpack/TestSimplePackUnpack.java b/src/test/java/org/msgpack/TestSimplePackUnpack.java
@@ -22,13 +22,13 @@ public class TestSimplePackUnpack {
     @Test
     public void testSimplePackUnpack() throws IOException {
         MessagePack msgpack = new MessagePack();
-        byte[] raw = msgpack.pack(new int[] {1,2,3});
+        byte[] raw = msgpack.write(new int[] {1,2,3});
 
-        Value v = msgpack.unpack(raw);
-        int[] a = msgpack.unpack(raw, new int[3]);
+        Value v = msgpack.read(raw);
+        int[] a = msgpack.read(raw, new int[3]);
 
-        Value vb = msgpack.unpack(ByteBuffer.wrap(raw));
-        int[] ab = msgpack.unpack(ByteBuffer.wrap(raw), new int[3]);
+        Value vb = msgpack.read(ByteBuffer.wrap(raw));
+        int[] ab = msgpack.read(ByteBuffer.wrap(raw), new int[3]);
     }
 }
 
