Refactor the original code

msgpack-core/src/main/java/org/msgpack/core/buffer/ArrayBufferInput.java

@@ -21,7 +21,7 @@
  * MessageBufferInput adapter for byte arrays
  */
 public class ArrayBufferInput
-        implements MessageBufferInput<byte[]>
+        implements MessageBufferInput
 {
     private MessageBuffer buffer;
     private boolean isEmpty;
@@ -66,14 +66,9 @@ public MessageBuffer reset(MessageBuffer buf)
         return old;
     }
 
-    @Override
-    public byte[] reset(byte[] arr)
+    public void reset(byte[] arr)
     {
-        final MessageBuffer messageBuffer = reset(MessageBuffer.wrap(checkNotNull(arr, "input array is null")));
-        if (messageBuffer == null) {
-            return null;
-        }
-        return messageBuffer.array();
+        reset(MessageBuffer.wrap(checkNotNull(arr, "input array is null")));
     }
 
     public void reset(byte[] arr, int offset, int len)

msgpack-core/src/main/java/org/msgpack/core/buffer/ByteBufferInput.java

@@ -23,7 +23,7 @@
  * {@link MessageBufferInput} adapter for {@link java.nio.ByteBuffer}
  */
 public class ByteBufferInput
-        implements MessageBufferInput<ByteBuffer>
+        implements MessageBufferInput
 {
     private ByteBuffer input;
     private boolean isRead = false;
@@ -39,7 +39,6 @@ public ByteBufferInput(ByteBuffer input)
      * @param input new buffer
      * @return the old buffer
      */
-    @Override
     public ByteBuffer reset(ByteBuffer input)
     {
         ByteBuffer old = this.input;

msgpack-core/src/main/java/org/msgpack/core/buffer/ChannelBufferInput.java

@@ -26,7 +26,7 @@
  * {@link MessageBufferInput} adapter for {@link java.nio.channels.ReadableByteChannel}
  */
 public class ChannelBufferInput
-        implements MessageBufferInput<ReadableByteChannel>
+        implements MessageBufferInput
 {
     private ReadableByteChannel channel;
     private final MessageBuffer buffer;
@@ -49,8 +49,8 @@ public ChannelBufferInput(ReadableByteChannel channel, int bufferSize)
      * @param channel new channel
      * @return the old resource
      */
-    @Override
     public ReadableByteChannel reset(ReadableByteChannel channel)
+            throws IOException
     {
         ReadableByteChannel old = this.channel;
         this.channel = channel;

msgpack-core/src/main/java/org/msgpack/core/buffer/InputStreamBufferInput.java

@@ -26,7 +26,7 @@
  * {@link MessageBufferInput} adapter for {@link InputStream}
  */
 public class InputStreamBufferInput
-        implements MessageBufferInput<InputStream>
+        implements MessageBufferInput
 {
     private InputStream in;
     private final byte[] buffer;
@@ -60,8 +60,8 @@ public InputStreamBufferInput(InputStream in, int bufferSize)
      * @param in new stream
      * @return the old resource
      */
-    @Override
     public InputStream reset(InputStream in)
+            throws IOException
     {
         InputStream old = this.in;
         this.in = in;

msgpack-core/src/main/java/org/msgpack/core/buffer/MessageBufferInput.java

@@ -24,7 +24,7 @@
  * A MessageBufferInput implementation has control of lifecycle of the memory so that it can reuse previously
  * allocated memory, use memory pools, or use memory-mapped files.
  */
-public interface MessageBufferInput<T>
+public interface MessageBufferInput
         extends Closeable
 {
     /**
@@ -40,8 +40,6 @@ public interface MessageBufferInput<T>
     MessageBuffer next()
             throws IOException;
 
-    T reset(T input);
-
     /**
      * Closes the input.
      * <p>

msgpack-core/src/test/java/org/msgpack/core/buffer/SequenceMessageBufferInput.java

@@ -24,7 +24,7 @@
  * {@link MessageBufferInput} adapter for {@link MessageBufferInput} Enumeration
  */
 public class SequenceMessageBufferInput
-        implements MessageBufferInput<Void>
+        implements MessageBufferInput
 {
     private Enumeration<? extends MessageBufferInput> sequence;
     private MessageBufferInput input;
@@ -54,11 +54,6 @@ public MessageBuffer next() throws IOException
         return buffer;
     }
 
-    @Override
-    public Void reset(Void input) {
-        throw new UnsupportedOperationException("reset");
-    }
-
     private void nextInput() throws IOException
     {
         if (input != null) {

msgpack-core/src/test/scala/org/msgpack/core/MessageUnpackerTest.scala

@@ -29,7 +29,7 @@ import scala.jdk.CollectionConverters._
 import scala.util.Random
 
 object MessageUnpackerTest {
-  class SplitMessageBufferInput(array: Array[Array[Byte]]) extends MessageBufferInput[Void] {
+  class SplitMessageBufferInput(array: Array[Array[Byte]]) extends MessageBufferInput {
     var cursor = 0
     override def next(): MessageBuffer = {
       if (cursor < array.length) {
@@ -41,9 +41,6 @@ object MessageUnpackerTest {
       }
     }
 
-
-    override def reset(input: Void): Void = throw new UnsupportedOperationException("reset")
-
     override def close(): Unit = {}
   }
 }

msgpack-core/src/test/scala/org/msgpack/core/buffer/ByteStringTest.scala

@@ -26,7 +26,7 @@ class ByteStringTest extends AirSpec {
   private val byteString     = ByteString(createMessagePackData(_.packString(unpackedString)))
 
   private def unpackString(messageBuffer: MessageBuffer) = {
-    val input = new MessageBufferInput[Void] {
+    val input = new MessageBufferInput {
 
       private var isRead = false
 
@@ -38,8 +38,6 @@ class ByteStringTest extends AirSpec {
           messageBuffer
         }
       override def close(): Unit = {}
-
-      override def reset(input: Void): Void = throw new UnsupportedOperationException("reset")
     }
 
     MessagePack.newDefaultUnpacker(input).unpackString()