diff --git a/src/org/redkale/convert/bson/BsonByteBufferWriter.java b/src/org/redkale/convert/bson/BsonByteBufferWriter.java index 2135f2334..4bcb36c9d 100644 --- a/src/org/redkale/convert/bson/BsonByteBufferWriter.java +++ b/src/org/redkale/convert/bson/BsonByteBufferWriter.java @@ -35,12 +35,8 @@ public class BsonByteBufferWriter extends BsonWriter { this.supplier = supplier; } - public ByteBuffer[] toBuffers() { - return toBuffers(supplier); - } - @Override - public ByteBuffer[] toBuffers(Supplier supplier) { + public ByteBuffer[] toBuffers() { if (buffers == null) return new ByteBuffer[0]; for (int i = index; i < this.buffers.length; i++) { ByteBuffer buf = this.buffers[i]; diff --git a/src/org/redkale/convert/bson/BsonWriter.java b/src/org/redkale/convert/bson/BsonWriter.java index 3fcc028ba..47f064bdc 100644 --- a/src/org/redkale/convert/bson/BsonWriter.java +++ b/src/org/redkale/convert/bson/BsonWriter.java @@ -6,7 +6,6 @@ package org.redkale.convert.bson; import java.nio.ByteBuffer; -import java.util.function.Supplier; import org.redkale.convert.*; import org.redkale.util.*; @@ -38,9 +37,8 @@ public class BsonWriter extends Writer { return newdata; } - public ByteBuffer[] toBuffers(final Supplier supplier) { - if (supplier == null) return new ByteBuffer[]{ByteBuffer.wrap(content, 0, count)}; - return ByteBufferWriter.create(supplier).put(content, 0, count).toBuffers(); + public ByteBuffer[] toBuffers() { + return new ByteBuffer[]{ByteBuffer.wrap(content, 0, count)}; } protected BsonWriter(byte[] bs) { diff --git a/src/org/redkale/convert/json/JsonByteBufferWriter.java b/src/org/redkale/convert/json/JsonByteBufferWriter.java index 8bf69b798..51c8e89be 100644 --- a/src/org/redkale/convert/json/JsonByteBufferWriter.java +++ b/src/org/redkale/convert/json/JsonByteBufferWriter.java @@ -55,12 +55,8 @@ public class JsonByteBufferWriter extends JsonWriter { return false; } - public ByteBuffer[] toBuffers() { - return toBuffers(supplier); - } - @Override - public ByteBuffer[] toBuffers(Supplier supplier) { + public ByteBuffer[] toBuffers() { if (buffers == null) return new ByteBuffer[0]; for (int i = index; i < this.buffers.length; i++) { ByteBuffer buf = this.buffers[i]; diff --git a/src/org/redkale/convert/json/JsonWriter.java b/src/org/redkale/convert/json/JsonWriter.java index 527e1bb7d..f15323ec6 100644 --- a/src/org/redkale/convert/json/JsonWriter.java +++ b/src/org/redkale/convert/json/JsonWriter.java @@ -6,7 +6,6 @@ package org.redkale.convert.json; import java.nio.ByteBuffer; -import java.util.function.Supplier; import org.redkale.convert.*; import org.redkale.util.*; @@ -107,9 +106,8 @@ public class JsonWriter extends Writer { return true; } - public ByteBuffer[] toBuffers(Supplier supplier) { - if (supplier == null) return new ByteBuffer[]{ByteBuffer.wrap(Utility.encodeUTF8(content, 0, count))}; - return ByteBufferWriter.create(supplier).put(Utility.encodeUTF8(content, 0, count)).toBuffers(); + public ByteBuffer[] toBuffers() { + return new ByteBuffer[]{ByteBuffer.wrap(Utility.encodeUTF8(content, 0, count))}; } public byte[] toBytes() { diff --git a/src/org/redkale/net/Response.java b/src/org/redkale/net/Response.java index 4ca82a3d0..f4e98c048 100644 --- a/src/org/redkale/net/Response.java +++ b/src/org/redkale/net/Response.java @@ -10,7 +10,6 @@ import java.nio.ByteBuffer; import java.nio.channels.CompletionHandler; import java.util.function.*; import java.util.logging.Level; -import org.redkale.util.ByteBufferWriter; /** * 协议响应对象 @@ -275,7 +274,7 @@ public abstract class Response> { buffer.flip(); this.finish(buffer); } else { - this.finish(ByteBufferWriter.toBuffers(this.context.getBufferSupplier(), bs)); + this.finish(ByteBuffer.wrap(bs)); } } diff --git a/src/org/redkale/net/http/HttpResponse.java b/src/org/redkale/net/http/HttpResponse.java index 075c75907..9d5b3acc6 100644 --- a/src/org/redkale/net/http/HttpResponse.java +++ b/src/org/redkale/net/http/HttpResponse.java @@ -636,7 +636,7 @@ public class HttpResponse extends Response { super.finish(false, headbuf); } else { headbuf.flip(); - super.finish(false, Utility.append(new ByteBuffer[]{headbuf}, ByteBufferWriter.toBuffers(context.getBufferSupplier(), content))); + super.finish(false, new ByteBuffer[]{headbuf, ByteBuffer.wrap(content)}); } } else { if (this.context.getBufferCapacity() >= content.length) { @@ -645,7 +645,7 @@ public class HttpResponse extends Response { buffer.flip(); this.finish(false, buffer); } else { - this.finish(false, ByteBufferWriter.toBuffers(context.getBufferSupplier(), content)); + this.finish(false, ByteBuffer.wrap(content)); } } diff --git a/src/org/redkale/net/sncp/SncpClient.java b/src/org/redkale/net/sncp/SncpClient.java index c39e48e39..05db0006c 100644 --- a/src/org/redkale/net/sncp/SncpClient.java +++ b/src/org/redkale/net/sncp/SncpClient.java @@ -367,7 +367,7 @@ public final class SncpClient { return future; } final AsyncConnection conn = conn0; - final ByteBuffer[] sendBuffers = writer.toBuffers(transport.getBufferSupplier()); + final ByteBuffer[] sendBuffers = writer.toBuffers(); fillHeader(sendBuffers[0], seqid, actionid, reqBodyLength); final ByteBuffer buffer = transport.pollBuffer(); diff --git a/src/org/redkale/net/sncp/SncpResponse.java b/src/org/redkale/net/sncp/SncpResponse.java index fde0c4b41..3938e925f 100644 --- a/src/org/redkale/net/sncp/SncpResponse.java +++ b/src/org/redkale/net/sncp/SncpResponse.java @@ -65,7 +65,7 @@ public final class SncpResponse extends Response { return; } final int respBodyLength = out.count(); //body总长度 - final ByteBuffer[] buffers = out.toBuffers(context.getBufferSupplier()); + final ByteBuffer[] buffers = out.toBuffers(); fillHeader(buffers[0], respBodyLength - HEADER_SIZE, retcode); finish(buffers); }