diff --git a/src/com/wentch/redkale/net/Context.java b/src/com/wentch/redkale/net/Context.java index 0e2d92aea..ef5c0042c 100644 --- a/src/com/wentch/redkale/net/Context.java +++ b/src/com/wentch/redkale/net/Context.java @@ -11,6 +11,7 @@ import java.net.*; import java.nio.*; import java.nio.charset.*; import java.util.concurrent.*; +import java.util.function.*; import java.util.logging.*; /** @@ -89,6 +90,10 @@ public class Context { return bufferCapacity; } + public Supplier getBufferSupplier() { + return bufferPool; + } + public ByteBuffer pollBuffer() { return bufferPool.get(); } diff --git a/src/com/wentch/redkale/net/Transport.java b/src/com/wentch/redkale/net/Transport.java index 58c776aef..a40e99a68 100644 --- a/src/com/wentch/redkale/net/Transport.java +++ b/src/com/wentch/redkale/net/Transport.java @@ -13,6 +13,7 @@ import java.nio.channels.*; import java.util.*; import java.util.concurrent.*; import java.util.concurrent.atomic.*; +import java.util.function.*; /** * 传输客户端 @@ -115,6 +116,10 @@ public final class Transport { return bufferPool.get(); } + public Supplier getBufferSupplier() { + return bufferPool; + } + public void offerBuffer(ByteBuffer buffer) { bufferPool.offer(buffer); } diff --git a/src/com/wentch/redkale/net/http/HttpContext.java b/src/com/wentch/redkale/net/http/HttpContext.java index 3c5807013..32d015ea0 100644 --- a/src/com/wentch/redkale/net/http/HttpContext.java +++ b/src/com/wentch/redkale/net/http/HttpContext.java @@ -60,10 +60,6 @@ public final class HttpContext extends Context { return responsePool; } - protected ObjectPool getBufferPool() { - return bufferPool; - } - public JsonConvert getJsonConvert() { return jsonFactory.getConvert(); } diff --git a/src/com/wentch/redkale/net/http/HttpResponse.java b/src/com/wentch/redkale/net/http/HttpResponse.java index 616c5a1df..b40163940 100644 --- a/src/com/wentch/redkale/net/http/HttpResponse.java +++ b/src/com/wentch/redkale/net/http/HttpResponse.java @@ -18,7 +18,6 @@ import java.nio.file.*; import java.text.*; import java.util.*; import java.util.concurrent.atomic.*; -import java.util.function.*; /** * @@ -148,10 +147,6 @@ public class HttpResponse extends Response { return v == null ? defValue : v; } - protected Supplier getByteBufferSupplier() { - return ((HttpContext) context).getBufferPool(); - } - @Override public HttpContext getContext() { return (HttpContext) context; @@ -170,17 +165,17 @@ public class HttpResponse extends Response { public void finishJson(Object obj) { this.contentType = "text/plain; charset=utf-8"; - finish(request.convert.convertTo(context.getCharset(), getByteBufferSupplier(), obj)); + finish(request.convert.convertTo(context.getCharset(), context.getBufferSupplier(), obj)); } public void finishJson(Type type, Object obj) { this.contentType = "text/plain; charset=utf-8"; - finish(request.convert.convertTo(context.getCharset(), getByteBufferSupplier(), type, obj)); + finish(request.convert.convertTo(context.getCharset(), context.getBufferSupplier(), type, obj)); } public void finishJson(Object... objs) { this.contentType = "text/plain; charset=utf-8"; - finish(request.convert.convertTo(context.getCharset(), getByteBufferSupplier(), objs)); + finish(request.convert.convertTo(context.getCharset(), context.getBufferSupplier(), objs)); } public void finish(String obj) {