designed getLastMessageSize and setMessageSizeLimit method APIs (not implemented yet)

muga · muga · commit efbee9e16d9b · 2011-11-02T18:32:19.000+09:00
diff --git a/src/main/java/org/msgpack/unpacker/Converter.java b/src/main/java/org/msgpack/unpacker/Converter.java
@@ -406,5 +406,15 @@ public void reset() {
     @Override
     public void close() throws IOException {
     }
+
+    @Override
+    public long getLastMessageSize() {
+        throw new UnsupportedOperationException("getLastMessageSize()");
+    }
+
+    @Override
+    public void setMessageSizeLimit(long size) {
+        throw new UnsupportedOperationException("setMessageSizeLimit()");
+    }
 }
 
diff --git a/src/main/java/org/msgpack/unpacker/MessagePackUnpacker.java b/src/main/java/org/msgpack/unpacker/MessagePackUnpacker.java
@@ -30,17 +30,16 @@
 
 
 public class MessagePackUnpacker extends AbstractUnpacker {
-    protected final Input in;
-
     private static final byte REQUIRE_TO_READ_HEAD = (byte)0xc6;
 
+    protected final Input in;
+    private final UnpackerStack stack = new UnpackerStack();
+
     private byte headByte = REQUIRE_TO_READ_HEAD;
 
     private byte[] raw;
     private int rawFilled;
 
-    private final UnpackerStack stack = new UnpackerStack();
-
     private final IntAccept intAccept = new IntAccept();
     private final LongAccept longAccept = new LongAccept();
     private final BigIntegerAccept bigIntegerAccept = new BigIntegerAccept();
@@ -558,5 +557,15 @@ public void reset() {
     public void close() throws IOException {
         in.close();
     }
+
+    @Override
+    public long getLastMessageSize() {
+        return in.getSize();
+    }
+
+    @Override
+    public void setMessageSizeLimit(long size) {
+        in.resetSize();
+    }
 }
 
diff --git a/src/main/java/org/msgpack/unpacker/Unpacker.java b/src/main/java/org/msgpack/unpacker/Unpacker.java
@@ -40,8 +40,8 @@ public interface Unpacker extends Iterable<Value>, Closeable {
 
     public <T> T read(T to, Template<T> tmpl) throws IOException;
 
-    public void skip() throws IOException;
 
+    public void skip() throws IOException;
 
     public int readArrayBegin() throws IOException;
 
@@ -86,5 +86,10 @@ public interface Unpacker extends Iterable<Value>, Closeable {
 
 
     public UnpackerIterator iterator();
+
+
+    public long getLastMessageSize();
+
+    public void setMessageSizeLimit(long size);
 }
 
diff --git a/src/main/java/org/msgpack/unpacker/UnpackerStack.java b/src/main/java/org/msgpack/unpacker/UnpackerStack.java
@@ -57,12 +57,9 @@ public void checkCount() {
 
         if(types[top] == TYPE_ARRAY) {
             throw new MessageTypeException("Array is end but readArrayEnd() is not called");
-
         } else if(types[top] == TYPE_MAP) {
             throw new MessageTypeException("Map is end but readMapEnd() is not called");
-
-        } else {
-            // empty
+        } else { // empty
             return;
         }
     }

Original file line number	Diff line number	Diff line change
`@@ -57,12 +57,9 @@ public void checkCount() {`
`57`	`57`
`58`	`58`	`if(types[top] == TYPE_ARRAY) {`
`59`	`59`	`throw new MessageTypeException("Array is end but readArrayEnd() is not called");`
`60`		`-`
`61`	`60`	`} else if(types[top] == TYPE_MAP) {`
`62`	`61`	`throw new MessageTypeException("Map is end but readMapEnd() is not called");`
`63`		`-`
`64`		`- } else {`
`65`		`- // empty`
	`62`	`+ } else { // empty`
`66`	`63`	`return;`
`67`	`64`	`}`
`68`	`65`	`}`