Make reset() returns the old resource

komamitsu · komamitsu · commit b1c9caa42e1f · 2015-01-16T13:11:55.000+09:00
diff --git a/msgpack-core/src/main/java/org/msgpack/core/MessagePacker.java b/msgpack-core/src/main/java/org/msgpack/core/MessagePacker.java
@@ -86,14 +86,17 @@ public MessagePacker(MessageBufferOutput out, MessagePack.Config config) {
     /**
      * Reset output. This method doesn't close the old resource.
      * @param out new output
+     * @return the old resource
      */
-    public void reset(MessageBufferOutput out) throws IOException {
+    public MessageBufferOutput reset(MessageBufferOutput out) throws IOException {
         // Validate the argument
         MessageBufferOutput newOut = checkNotNull(out, "MessageBufferOutput is null");
 
         // Reset the internal states
+        MessageBufferOutput old = this.out;
         this.out = newOut;
         this.position = 0;
+        return old;
     }
 
 
diff --git a/msgpack-core/src/main/java/org/msgpack/core/MessageUnpacker.java b/msgpack-core/src/main/java/org/msgpack/core/MessageUnpacker.java
@@ -149,18 +149,21 @@ public MessageUnpacker(MessageBufferInput in, MessagePack.Config config) {
     /**
      * Reset input. This method doesn't close the old resource.
      * @param in new input
+     * @return the old resource
      */
-    public void reset(MessageBufferInput in) throws IOException {
+    public MessageBufferInput reset(MessageBufferInput in) throws IOException {
         MessageBufferInput newIn = checkNotNull(in, "MessageBufferInput is null");
 
         // Reset the internal states
+        MessageBufferInput old = this.in;
         this.in = newIn;
         this.buffer = EMPTY_BUFFER;
         this.position = 0;
         this.totalReadBytes = 0;
         this.secondaryBuffer = null;
         this.reachedEOF = false;
         // No need to initialize the already allocated string decoder here since we can reuse it.
+        return old;
     }
 
     public long getTotalReadBytes() {
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
@@ -27,10 +27,13 @@ public ArrayBufferInput(byte[] arr, int offset, int length) {
     /**
      * Reset buffer. This method doesn't close the old resource.
      * @param buf new buffer
+     * @return the old resource
      */
-    public void reset(MessageBuffer buf) {
+    public MessageBuffer reset(MessageBuffer buf) {
+        MessageBuffer old = this.buffer;
         this.buffer = buf;
         this.isRead = false;
+        return old;
     }
 
     public void reset(byte[] arr) {
diff --git a/msgpack-core/src/main/java/org/msgpack/core/buffer/ByteBufferInput.java b/msgpack-core/src/main/java/org/msgpack/core/buffer/ByteBufferInput.java
@@ -19,10 +19,13 @@ public ByteBufferInput(ByteBuffer input) {
     /**
      * Reset buffer. This method doesn't close the old resource.
      * @param input new buffer
+     * @return the old resource
      */
-    public void reset(ByteBuffer input) {
+    public ByteBuffer reset(ByteBuffer input) {
+        ByteBuffer old = this.input;
         this.input = input;
         isRead = false;
+        return old;
     }
 
     @Override
diff --git a/msgpack-core/src/main/java/org/msgpack/core/buffer/ChannelBufferInput.java b/msgpack-core/src/main/java/org/msgpack/core/buffer/ChannelBufferInput.java
@@ -28,10 +28,13 @@ public ChannelBufferInput(ReadableByteChannel channel, int bufferSize) {
     /**
      * Reset channel. This method doesn't close the old resource.
      * @param channel new channel
+     * @return the old resource
      */
-    public void reset(ReadableByteChannel channel) throws IOException {
+    public ReadableByteChannel reset(ReadableByteChannel channel) throws IOException {
+        ReadableByteChannel old = this.channel;
         this.channel = channel;
         this.reachedEOF = false;
+        return old;
     }
 
     @Override
diff --git a/msgpack-core/src/main/java/org/msgpack/core/buffer/ChannelBufferOutput.java b/msgpack-core/src/main/java/org/msgpack/core/buffer/ChannelBufferOutput.java
@@ -21,9 +21,12 @@ public ChannelBufferOutput(WritableByteChannel channel) {
     /**
      * Reset channel. This method doesn't close the old resource.
      * @param channel new channel
+     * @return the old resource
      */
-    public void reset(WritableByteChannel channel) throws IOException {
+    public WritableByteChannel reset(WritableByteChannel channel) throws IOException {
+        WritableByteChannel old = this.channel;
         this.channel = channel;
+        return old;
     }
 
 
diff --git a/msgpack-core/src/main/java/org/msgpack/core/buffer/InputStreamBufferInput.java b/msgpack-core/src/main/java/org/msgpack/core/buffer/InputStreamBufferInput.java
@@ -35,10 +35,13 @@ public InputStreamBufferInput(InputStream in, int bufferSize) {
     /**
      * Reset Stream. This method doesn't close the old resource.
      * @param in new stream
+     * @return the old resource
      */
-    public void reset(InputStream in) throws IOException {
+    public InputStream reset(InputStream in) throws IOException {
+        InputStream old = this.in;
         this.in = in;
         reachedEOF = false;
+        return old;
     }
 
 
diff --git a/msgpack-core/src/main/java/org/msgpack/core/buffer/OutputStreamBufferOutput.java b/msgpack-core/src/main/java/org/msgpack/core/buffer/OutputStreamBufferOutput.java
@@ -21,9 +21,12 @@ public OutputStreamBufferOutput(OutputStream out) {
     /**
      * Reset Stream. This method doesn't close the old resource.
      * @param out new stream
+     * @return the old resource
      */
-    public void reset(OutputStream out) throws IOException {
+    public OutputStream reset(OutputStream out) throws IOException {
+        OutputStream old = this.out;
         this.out = out;
+        return old;
     }
 
     @Override
