Skip to content

Commit 285ec1f

Browse files
frsyukifrsyuki
committed
removed support for ByteBuffer
1 parent bc6830e commit 285ec1f

14 files changed

+91
-326
lines changed

‎msgpack-core/src/main/java/org/msgpack/core/MessagePack.java‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -133,6 +133,4 @@ public static MessageUnpacker newDefaultUnpacker(byte[] contents, int offset, in
133133
{
134134
return defaultFactory.newUnpacker(contents, offset, length);
135135
}
136-
137-
// TODO add convenient methods here to pack/unpack objects with byte array/stream
138136
}

‎msgpack-core/src/main/java/org/msgpack/core/MessagePacker.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -448,7 +448,7 @@ private void prepareEncoder()
448448
private int encodeStringToBufferAt(int pos, String s)
449449
{
450450
prepareEncoder();
451-
ByteBuffer bb = buffer.toByteBuffer(pos, buffer.size() - pos);
451+
ByteBuffer bb = buffer.sliceAsByteBuffer(pos, buffer.size() - pos);
452452
int startPosition = bb.position();
453453
CharBuffer in = CharBuffer.wrap(s);
454454
CoderResult cr = encoder.encode(in, bb, true);

‎msgpack-core/src/main/java/org/msgpack/core/MessageUnpacker.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ public class MessageUnpacker
106106
* Extra buffer for fixed-length data at the buffer boundary.
107107
* At most 8-byte buffer (for readLong used by uint 64 and UTF-8 character decoding) is required.
108108
*/
109-
private final MessageBuffer castBuffer = MessageBuffer.newBuffer(8);
109+
private final MessageBuffer castBuffer = MessageBuffer.allocate(8);
110110

111111
/**
112112
* Variable by ensureHeader method. Caller of the method should use this variable to read from returned MessageBuffer.
@@ -1032,7 +1032,7 @@ else if (bufferRemaining == 0) {
10321032
nextBuffer();
10331033
}
10341034
else {
1035-
ByteBuffer bb = buffer.toByteBuffer(position, bufferRemaining);
1035+
ByteBuffer bb = buffer.sliceAsByteBuffer(position, bufferRemaining);
10361036
int bbStartPosition = bb.position();
10371037
decodeBuffer.clear();
10381038

@@ -1114,7 +1114,7 @@ private String decodeStringFastPath(int length)
11141114
}
11151115
else {
11161116
resetDecoder();
1117-
ByteBuffer bb = buffer.toByteBuffer();
1117+
ByteBuffer bb = buffer.sliceAsByteBuffer();
11181118
bb.limit(position + length);
11191119
bb.position(position);
11201120
CharBuffer cb;
@@ -1395,8 +1395,8 @@ public MessageBuffer readPayloadAsReference(int length)
13951395
position += length;
13961396
return slice;
13971397
}
1398-
MessageBuffer dst = MessageBuffer.newBuffer(length);
1399-
readPayload(dst.getReference());
1398+
MessageBuffer dst = MessageBuffer.allocate(length);
1399+
readPayload(dst.sliceAsByteBuffer());
14001400
return dst;
14011401
}
14021402

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ public MessageBuffer toMessageBuffer()
6565
return list.get(0);
6666
}
6767
else if (list.isEmpty()) {
68-
return MessageBuffer.newBuffer(0);
68+
return MessageBuffer.allocate(0);
6969
}
7070
else {
7171
return MessageBuffer.wrap(toByteArray());
@@ -93,7 +93,7 @@ public MessageBuffer next(int mimimumSize)
9393
}
9494
else {
9595
int size = Math.max(bufferSize, mimimumSize);
96-
MessageBuffer buffer = MessageBuffer.newBuffer(size);
96+
MessageBuffer buffer = MessageBuffer.allocate(size);
9797
lastBuffer = buffer;
9898
return buffer;
9999
}
@@ -114,7 +114,7 @@ public void writeBuffer(int length)
114114
@Override
115115
public void write(byte[] buffer, int offset, int length)
116116
{
117-
MessageBuffer copy = MessageBuffer.newBuffer(length);
117+
MessageBuffer copy = MessageBuffer.allocate(length);
118118
copy.putBytes(0, buffer, offset, length);
119119
list.add(copy);
120120
}

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

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

‎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
@@ -40,7 +40,7 @@ public ChannelBufferInput(ReadableByteChannel channel, int bufferSize)
4040
{
4141
this.channel = checkNotNull(channel, "input channel is null");
4242
checkArgument(bufferSize > 0, "buffer size must be > 0: " + bufferSize);
43-
this.m = MessageBuffer.newBuffer(bufferSize);
43+
this.m = MessageBuffer.allocate(bufferSize);
4444
}
4545

4646
/**
@@ -61,7 +61,7 @@ public ReadableByteChannel reset(ReadableByteChannel channel)
6161
public MessageBuffer next()
6262
throws IOException
6363
{
64-
ByteBuffer b = m.toByteBuffer();
64+
ByteBuffer b = m.sliceAsByteBuffer();
6565
while (b.remaining() > 0) {
6666
int ret = channel.read(b);
6767
if (ret == -1) {

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ public ChannelBufferOutput(WritableByteChannel channel)
3838
public ChannelBufferOutput(WritableByteChannel channel, int bufferSize)
3939
{
4040
this.channel = checkNotNull(channel, "output channel is null");
41-
this.buffer = MessageBuffer.newBuffer(bufferSize);
41+
this.buffer = MessageBuffer.allocate(bufferSize);
4242
}
4343

4444
/**
@@ -60,7 +60,7 @@ public MessageBuffer next(int mimimumSize)
6060
throws IOException
6161
{
6262
if (buffer.size() < mimimumSize) {
63-
buffer = MessageBuffer.newBuffer(mimimumSize);
63+
buffer = MessageBuffer.allocate(mimimumSize);
6464
}
6565
return buffer;
6666
}
@@ -69,7 +69,7 @@ public MessageBuffer next(int mimimumSize)
6969
public void writeBuffer(int length)
7070
throws IOException
7171
{
72-
ByteBuffer bb = buffer.toByteBuffer(0, length);
72+
ByteBuffer bb = buffer.sliceAsByteBuffer(0, length);
7373
while (bb.hasRemaining()) {
7474
channel.write(bb);
7575
}

0 commit comments

Comments
 (0)