Skip to content

Commit ac9d28a

Browse files
komamitsukomamitsu
committed
Refactor the original code
1 parent 56ac516 commit ac9d28a

14 files changed

Lines changed: 80 additions & 177 deletions

File tree

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

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
* MessageBufferInput adapter for byte arrays
2222
*/
2323
public class ArrayBufferInput
24-
implements MessageBufferInput<byte[]>
24+
implements MessageBufferInput
2525
{
2626
private MessageBuffer buffer;
2727
private boolean isEmpty;
@@ -66,14 +66,9 @@ public MessageBuffer reset(MessageBuffer buf)
6666
return old;
6767
}
6868

69-
@Override
70-
public byte[] reset(byte[] arr)
69+
public void reset(byte[] arr)
7170
{
72-
final MessageBuffer messageBuffer = reset(MessageBuffer.wrap(checkNotNull(arr, "input array is null")));
73-
if (messageBuffer == null) {
74-
return null;
75-
}
76-
return messageBuffer.array();
71+
reset(MessageBuffer.wrap(checkNotNull(arr, "input array is null")));
7772
}
7873

7974
public void reset(byte[] arr, int offset, int len)

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
* {@link MessageBufferInput} adapter for {@link java.nio.ByteBuffer}
2424
*/
2525
public class ByteBufferInput
26-
implements MessageBufferInput<ByteBuffer>
26+
implements MessageBufferInput
2727
{
2828
private ByteBuffer input;
2929
private boolean isRead = false;
@@ -39,7 +39,6 @@ public ByteBufferInput(ByteBuffer input)
3939
* @param input new buffer
4040
* @return the old buffer
4141
*/
42-
@Override
4342
public ByteBuffer reset(ByteBuffer input)
4443
{
4544
ByteBuffer old = this.input;

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
* {@link MessageBufferInput} adapter for {@link java.nio.channels.ReadableByteChannel}
2727
*/
2828
public class ChannelBufferInput
29-
implements MessageBufferInput<ReadableByteChannel>
29+
implements MessageBufferInput
3030
{
3131
private ReadableByteChannel channel;
3232
private final MessageBuffer buffer;
@@ -49,8 +49,8 @@ public ChannelBufferInput(ReadableByteChannel channel, int bufferSize)
4949
* @param channel new channel
5050
* @return the old resource
5151
*/
52-
@Override
5352
public ReadableByteChannel reset(ReadableByteChannel channel)
53+
throws IOException
5454
{
5555
ReadableByteChannel old = this.channel;
5656
this.channel = channel;

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
* {@link MessageBufferInput} adapter for {@link InputStream}
2727
*/
2828
public class InputStreamBufferInput
29-
implements MessageBufferInput<InputStream>
29+
implements MessageBufferInput
3030
{
3131
private InputStream in;
3232
private final byte[] buffer;
@@ -60,8 +60,8 @@ public InputStreamBufferInput(InputStream in, int bufferSize)
6060
* @param in new stream
6161
* @return the old resource
6262
*/
63-
@Override
6463
public InputStream reset(InputStream in)
64+
throws IOException
6565
{
6666
InputStream old = this.in;
6767
this.in = in;

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

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
* A MessageBufferInput implementation has control of lifecycle of the memory so that it can reuse previously
2525
* allocated memory, use memory pools, or use memory-mapped files.
2626
*/
27-
public interface MessageBufferInput<T>
27+
public interface MessageBufferInput
2828
extends Closeable
2929
{
3030
/**
@@ -40,8 +40,6 @@ public interface MessageBufferInput<T>
4040
MessageBuffer next()
4141
throws IOException;
4242

43-
T reset(T input);
44-
4543
/**
4644
* Closes the input.
4745
* <p>

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

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
* {@link MessageBufferInput} adapter for {@link MessageBufferInput} Enumeration
2525
*/
2626
public class SequenceMessageBufferInput
27-
implements MessageBufferInput<Void>
27+
implements MessageBufferInput
2828
{
2929
private Enumeration<? extends MessageBufferInput> sequence;
3030
private MessageBufferInput input;
@@ -54,11 +54,6 @@ public MessageBuffer next() throws IOException
5454
return buffer;
5555
}
5656

57-
@Override
58-
public Void reset(Void input) {
59-
throw new UnsupportedOperationException("reset");
60-
}
61-
6257
private void nextInput() throws IOException
6358
{
6459
if (input != null) {

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

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ import scala.jdk.CollectionConverters._
2929
import scala.util.Random
3030

3131
object MessageUnpackerTest {
32-
class SplitMessageBufferInput(array: Array[Array[Byte]]) extends MessageBufferInput[Void] {
32+
class SplitMessageBufferInput(array: Array[Array[Byte]]) extends MessageBufferInput {
3333
var cursor = 0
3434
override def next(): MessageBuffer = {
3535
if (cursor < array.length) {
@@ -41,9 +41,6 @@ object MessageUnpackerTest {
4141
}
4242
}
4343

44-
45-
override def reset(input: Void): Void = throw new UnsupportedOperationException("reset")
46-
4744
override def close(): Unit = {}
4845
}
4946
}

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

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ class ByteStringTest extends AirSpec {
2626
private val byteString = ByteString(createMessagePackData(_.packString(unpackedString)))
2727

2828
private def unpackString(messageBuffer: MessageBuffer) = {
29-
val input = new MessageBufferInput[Void] {
29+
val input = new MessageBufferInput {
3030

3131
private var isRead = false
3232

@@ -38,8 +38,6 @@ class ByteStringTest extends AirSpec {
3838
messageBuffer
3939
}
4040
override def close(): Unit = {}
41-
42-
override def reset(input: Void): Void = throw new UnsupportedOperationException("reset")
4341
}
4442

4543
MessagePack.newDefaultUnpacker(input).unpackString()

‎msgpack-jackson/src/main/java/org/msgpack/jackson/dataformat/MessageBufferInputLocator.java‎

Lines changed: 0 additions & 23 deletions
This file was deleted.

‎msgpack-jackson/src/main/java/org/msgpack/jackson/dataformat/MessageBufferInputProvider.java‎

Lines changed: 0 additions & 23 deletions
This file was deleted.

0 commit comments

Comments
 (0)