lxy/redkale
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Convert增加convertMapToBytes方法

Browse Source
This commit is contained in:
Redkale
2021-01-20 18:15:25 +08:00
parent d997d3a7bb
commit 86fde56129
6 changed files with 75 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/org/redkale/convert/Convert.java
View File

@@ -65,6 +65,8 @@ public abstract class Convert<R extends Reader, W extends Writer> {
public abstract ByteBuffer[] convertTo(final Supplier<ByteBuffer> supplier, final Type type, final Object value);
public abstract byte[] convertMapToBytes(final Object... values);
public abstract ByteBuffer[] convertMapTo(final Supplier<ByteBuffer> supplier, final Object... values);
}

11
src/org/redkale/convert/bson/BsonConvert.java
View File

@@ -247,6 +247,17 @@ public class BsonConvert extends BinaryConvert<BsonReader, BsonWriter> {
return out.toBuffers();
}
@Override
public byte[] convertMapToBytes(final Object... values) {
BsonWriter out = pollBsonWriter();
if (values == null) {
out.writeNull();
} else {
((AnyEncoder) factory.getAnyEncoder()).convertMapTo(out, values);
}
return out.toArray();
}
@Override
public ByteBuffer[] convertMapTo(final Supplier<ByteBuffer> supplier, final Object... values) {
if (supplier == null) return null;

11
src/org/redkale/convert/json/JsonConvert.java
View File

@@ -366,6 +366,17 @@ public class JsonConvert extends TextConvert<JsonReader, JsonWriter> {
return out.toBuffers();
}
@Override
public byte[] convertMapToBytes(final Object... values) {
JsonWriter out = pollJsonWriter();
if (values == null) {
out.writeNull();
} else {
((AnyEncoder) factory.getAnyEncoder()).convertMapTo(out, values);
}
return out.toBytes();
}
@Override
public ByteBuffer[] convertMapTo(final Supplier<ByteBuffer> supplier, final Object... values) {
if (supplier == null) return null;

1
src/org/redkale/net/NioThread.java
View File

@@ -10,7 +10,6 @@ import java.nio.channels.*;
import java.util.*;
import java.util.concurrent.*;
import java.util.function.Consumer;
import org.redkale.net.*;
import org.redkale.util.*;
/**

2
src/org/redkale/net/Response.java
View File

@@ -25,6 +25,8 @@ import org.redkale.util.ObjectPool;
@SuppressWarnings("unchecked")
public abstract class Response<C extends Context, R extends Request<C>> {
protected static final boolean respConvertByBuffer = Boolean.getBoolean("resp.convert.bytebuffer");
protected final C context;
protected final ObjectPool<Response> responsePool; //虚拟构建的Response可能不存在responsePool

60
src/org/redkale/net/http/HttpResponse.java
View File

@@ -327,7 +327,11 @@ public class HttpResponse extends Response<HttpContext, HttpRequest> {
public void finishMapJson(final Object... objs) {
this.contentType = this.jsonContentType;
if (this.recycleListener != null) this.output = objs;
finish(request.getRespConvert().convertMapTo(getBodyBufferSupplier(), objs));
if (respConvertByBuffer) {
finish(request.getRespConvert().convertMapTo(getBodyBufferSupplier(), objs));
} else {
finish(request.getRespConvert().convertMapToBytes(objs));
}
}
/**
@@ -339,7 +343,11 @@ public class HttpResponse extends Response<HttpContext, HttpRequest> {
public void finishJson(final JsonConvert convert, final Object obj) {
this.contentType = this.jsonContentType;
if (this.recycleListener != null) this.output = obj;
finish(convert.convertTo(getBodyBufferSupplier(), obj));
if (respConvertByBuffer) {
finish(convert.convertTo(getBodyBufferSupplier(), obj));
} else {
finish(convert.convertToBytes(obj));
}
}
/**
@@ -352,7 +360,11 @@ public class HttpResponse extends Response<HttpContext, HttpRequest> {
public void finishMapJson(final JsonConvert convert, final Object... objs) {
this.contentType = this.jsonContentType;
if (this.recycleListener != null) this.output = objs;
finish(convert.convertMapTo(getBodyBufferSupplier(), objs));
if (respConvertByBuffer) {
finish(convert.convertMapTo(getBodyBufferSupplier(), objs));
} else {
finish(convert.convertMapToBytes(objs));
}
}
/**
@@ -364,7 +376,11 @@ public class HttpResponse extends Response<HttpContext, HttpRequest> {
public void finishJson(final Type type, final Object obj) {
this.contentType = this.jsonContentType;
this.output = obj;
finish(request.getRespConvert().convertTo(getBodyBufferSupplier(), type, obj));
if (respConvertByBuffer) {
finish(request.getRespConvert().convertTo(getBodyBufferSupplier(), type, obj));
} else {
finish(request.getRespConvert().convertToBytes(type, obj));
}
}
/**
@@ -377,7 +393,11 @@ public class HttpResponse extends Response<HttpContext, HttpRequest> {
public void finishJson(final JsonConvert convert, final Type type, final Object obj) {
this.contentType = this.jsonContentType;
if (this.recycleListener != null) this.output = obj;
finish(convert.convertTo(getBodyBufferSupplier(), type, obj));
if (respConvertByBuffer) {
finish(convert.convertTo(getBodyBufferSupplier(), type, obj));
} else {
finish(convert.convertToBytes(type, obj));
}
}
/**
@@ -388,7 +408,11 @@ public class HttpResponse extends Response<HttpContext, HttpRequest> {
public void finishJson(final Object... objs) {
this.contentType = this.jsonContentType;
if (this.recycleListener != null) this.output = objs;
finish(request.getRespConvert().convertTo(getBodyBufferSupplier(), objs));
if (respConvertByBuffer) {
finish(request.getRespConvert().convertTo(getBodyBufferSupplier(), objs));
} else {
finish(request.getRespConvert().convertToBytes(objs));
}
}
/**
@@ -408,7 +432,11 @@ public class HttpResponse extends Response<HttpContext, HttpRequest> {
}
Convert convert = ret == null ? null : ret.convert();
if (convert == null) convert = request.getRespConvert();
finish(convert.convertTo(getBodyBufferSupplier(), ret));
if (respConvertByBuffer) {
finish(convert.convertTo(getBodyBufferSupplier(), ret));
} else {
finish(convert.convertToBytes(ret));
}
}
/**
@@ -427,7 +455,11 @@ public class HttpResponse extends Response<HttpContext, HttpRequest> {
this.header.addValue("retcode", String.valueOf(ret.getRetcode()));
this.header.addValue("retinfo", ret.getRetinfo());
}
finish(convert.convertTo(getBodyBufferSupplier(), ret));
if (respConvertByBuffer) {
finish(convert.convertTo(getBodyBufferSupplier(), ret));
} else {
finish(convert.convertToBytes(ret));
}
}
/**
@@ -575,13 +607,19 @@ public class HttpResponse extends Response<HttpContext, HttpRequest> {
this.header.addValue("retcode", String.valueOf(ret.getRetcode())).addValue("retinfo", ret.getRetinfo());
}
}
if (this.channel == null) { //虚拟的HttpResponse
finish(type == null ? convert.convertToBytes(obj) : convert.convertToBytes(type, obj));
return;
}
ByteBuffer[] buffers = type == null ? convert.convertTo(getBodyBufferSupplier(), obj)
: convert.convertTo(getBodyBufferSupplier(), type, obj);
finish(buffers);
if (respConvertByBuffer) {
ByteBuffer[] buffers = type == null ? convert.convertTo(getBodyBufferSupplier(), obj)
: convert.convertTo(getBodyBufferSupplier(), type, obj);
finish(buffers);
} else {
byte[] bs = type == null ? convert.convertToBytes(obj) : convert.convertToBytes(type, obj);
finish(bs);
}
}
}