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

JsonReader

Browse Source
This commit is contained in:
redkale
2024-09-17 11:40:41 +08:00
parent 64f6ac55e7
commit 8cc83af502
2 changed files with 37 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
src/main/java/org/redkale/convert/json/JsonConvert.java
View File

@@ -37,9 +37,9 @@ public class JsonConvert extends TextConvert<JsonReader, JsonWriter> {
private final ThreadLocal<JsonReader> readerPool = Utility.withInitialThreadLocal(JsonReader::new); private final ThreadLocal<JsonReader> readerPool = Utility.withInitialThreadLocal(JsonReader::new);
private Encodeable lastConvertEncodeable; private Encodeable lastEncodeable;
private Decodeable lastConvertDecodeable; private Decodeable lastDecodeable;
protected JsonConvert(JsonFactory factory, int features) { protected JsonConvert(JsonFactory factory, int features) {
super(factory, features); super(factory, features);
@@ -192,12 +192,14 @@ public class JsonConvert extends TextConvert<JsonReader, JsonWriter> {
if (text == null || type == null) { if (text == null || type == null) {
return null; return null;
} }
Decodeable decoder = this.lastConvertDecodeable; Decodeable decoder = this.lastDecodeable;
if (decoder == null || decoder.getType() != type) { if (decoder == null || decoder.getType() != type) {
decoder = factory.loadDecoder(type); decoder = factory.loadDecoder(type);
this.lastConvertDecodeable = decoder; this.lastDecodeable = decoder;
} }
T rs = (T) decoder.convertFrom(new JsonReader(text, offset, length)); JsonReader reader = pollReader().setText(text, offset, length);
T rs = (T) decoder.convertFrom(reader);
offerReader(reader);
return rs; return rs;
} }
@@ -205,10 +207,10 @@ public class JsonConvert extends TextConvert<JsonReader, JsonWriter> {
if (type == null || in == null) { if (type == null || in == null) {
return null; return null;
} }
Decodeable decoder = this.lastConvertDecodeable; Decodeable decoder = this.lastDecodeable;
if (decoder == null || decoder.getType() != type) { if (decoder == null || decoder.getType() != type) {
decoder = factory.loadDecoder(type); decoder = factory.loadDecoder(type);
this.lastConvertDecodeable = decoder; this.lastDecodeable = decoder;
} }
return (T) decoder.convertFrom(new JsonStreamReader(in)); return (T) decoder.convertFrom(new JsonStreamReader(in));
} }
@@ -218,10 +220,10 @@ public class JsonConvert extends TextConvert<JsonReader, JsonWriter> {
if (type == null || buffers == null || buffers.length == 0) { if (type == null || buffers == null || buffers.length == 0) {
return null; return null;
} }
Decodeable decoder = this.lastConvertDecodeable; Decodeable decoder = this.lastDecodeable;
if (decoder == null || decoder.getType() != type) { if (decoder == null || decoder.getType() != type) {
decoder = factory.loadDecoder(type); decoder = factory.loadDecoder(type);
this.lastConvertDecodeable = decoder; this.lastDecodeable = decoder;
} }
return (T) decoder.convertFrom(new JsonByteBufferReader(buffers)); return (T) decoder.convertFrom(new JsonByteBufferReader(buffers));
} }
@@ -231,10 +233,10 @@ public class JsonConvert extends TextConvert<JsonReader, JsonWriter> {
if (type == null) { if (type == null) {
return null; return null;
} }
Decodeable decoder = this.lastConvertDecodeable; Decodeable decoder = this.lastDecodeable;
if (decoder == null || decoder.getType() != type) { if (decoder == null || decoder.getType() != type) {
decoder = factory.loadDecoder(type); decoder = factory.loadDecoder(type);
this.lastConvertDecodeable = decoder; this.lastDecodeable = decoder;
} }
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")
T rs = (T) decoder.convertFrom(reader); T rs = (T) decoder.convertFrom(reader);
@@ -325,10 +327,10 @@ public class JsonConvert extends TextConvert<JsonReader, JsonWriter> {
} }
JsonCharsWriter writer = pollJsonCharsWriter(); JsonCharsWriter writer = pollJsonCharsWriter();
final Type t = type == null ? value.getClass() : type; final Type t = type == null ? value.getClass() : type;
Encodeable encoder = this.lastConvertEncodeable; Encodeable encoder = this.lastEncodeable;
if (encoder == null || encoder.getType() != t) { if (encoder == null || encoder.getType() != t) {
encoder = factory.loadEncoder(t); encoder = factory.loadEncoder(t);
this.lastConvertEncodeable = encoder; this.lastEncodeable = encoder;
} }
if (encoder.specifyable()) { if (encoder.specifyable()) {
writer.specificObjectType(t); writer.specificObjectType(t);
@@ -347,10 +349,10 @@ public class JsonConvert extends TextConvert<JsonReader, JsonWriter> {
} }
JsonBytesWriter writer = pollJsonBytesWriter(); JsonBytesWriter writer = pollJsonBytesWriter();
final Type t = type == null ? value.getClass() : type; final Type t = type == null ? value.getClass() : type;
Encodeable encoder = this.lastConvertEncodeable; Encodeable encoder = this.lastEncodeable;
if (encoder == null || encoder.getType() != t) { if (encoder == null || encoder.getType() != t) {
encoder = factory.loadEncoder(t); encoder = factory.loadEncoder(t);
this.lastConvertEncodeable = encoder; this.lastEncodeable = encoder;
} }
if (encoder.specifyable()) { if (encoder.specifyable()) {
writer.specificObjectType(t); writer.specificObjectType(t);
@@ -369,10 +371,10 @@ public class JsonConvert extends TextConvert<JsonReader, JsonWriter> {
writer.writeNull(); writer.writeNull();
} else { } else {
final Type t = type == null ? value.getClass() : type; final Type t = type == null ? value.getClass() : type;
Encodeable encoder = this.lastConvertEncodeable; Encodeable encoder = this.lastEncodeable;
if (encoder == null || encoder.getType() != t) { if (encoder == null || encoder.getType() != t) {
encoder = factory.loadEncoder(t); encoder = factory.loadEncoder(t);
this.lastConvertEncodeable = encoder; this.lastEncodeable = encoder;
} }
if (encoder.specifyable()) { if (encoder.specifyable()) {
writer.specificObjectType(t); writer.specificObjectType(t);
@@ -390,10 +392,10 @@ public class JsonConvert extends TextConvert<JsonReader, JsonWriter> {
writer.writeNull(); writer.writeNull();
} else { } else {
final Type t = type == null ? value.getClass() : type; final Type t = type == null ? value.getClass() : type;
Encodeable encoder = this.lastConvertEncodeable; Encodeable encoder = this.lastEncodeable;
if (encoder == null || encoder.getType() != t) { if (encoder == null || encoder.getType() != t) {
encoder = factory.loadEncoder(t); encoder = factory.loadEncoder(t);
this.lastConvertEncodeable = encoder; this.lastEncodeable = encoder;
} }
if (encoder.specifyable()) { if (encoder.specifyable()) {
writer.specificObjectType(t); writer.specificObjectType(t);
@@ -409,10 +411,10 @@ public class JsonConvert extends TextConvert<JsonReader, JsonWriter> {
} else { } else {
final Type t = type == null ? value.getClass() : type; final Type t = type == null ? value.getClass() : type;
JsonStreamWriter writer = configWrite(new JsonStreamWriter(features, out)); JsonStreamWriter writer = configWrite(new JsonStreamWriter(features, out));
Encodeable encoder = this.lastConvertEncodeable; Encodeable encoder = this.lastEncodeable;
if (encoder == null || encoder.getType() != t) { if (encoder == null || encoder.getType() != t) {
encoder = factory.loadEncoder(t); encoder = factory.loadEncoder(t);
this.lastConvertEncodeable = encoder; this.lastEncodeable = encoder;
} }
if (encoder.specifyable()) { if (encoder.specifyable()) {
writer.specificObjectType(t); writer.specificObjectType(t);
@@ -441,10 +443,10 @@ public class JsonConvert extends TextConvert<JsonReader, JsonWriter> {
writer.writeNull(); writer.writeNull();
} else { } else {
final Type t = type == null ? value.getClass() : type; final Type t = type == null ? value.getClass() : type;
Encodeable encoder = this.lastConvertEncodeable; Encodeable encoder = this.lastEncodeable;
if (encoder == null || encoder.getType() != t) { if (encoder == null || encoder.getType() != t) {
encoder = factory.loadEncoder(t); encoder = factory.loadEncoder(t);
this.lastConvertEncodeable = encoder; this.lastEncodeable = encoder;
} }
if (encoder.specifyable()) { if (encoder.specifyable()) {
writer.specificObjectType(t); writer.specificObjectType(t);

24
src/main/java/org/redkale/convert/json/JsonReader.java
View File

@@ -29,9 +29,6 @@ public class JsonReader extends Reader {
private CharArray array; private CharArray array;
// public static ObjectPool<JsonReader> createPool(int max) {
// return new ObjectPool<>(max, (Object... params) -> new JsonReader(), null, JsonReader::recycle);
// }
public JsonReader() {} public JsonReader() {}
public JsonReader(String json) { public JsonReader(String json) {
@@ -46,18 +43,19 @@ public class JsonReader extends Reader {
setText(text, start, len); setText(text, start, len);
} }
public final void setText(String text) { public final JsonReader setText(String text) {
setText(Utility.charArray(text)); return setText(Utility.charArray(text));
} }
public final void setText(char[] text) { public final JsonReader setText(char[] text) {
setText(text, 0, text.length); return setText(text, 0, text.length);
} }
public final void setText(char[] text, int start, int len) { public final JsonReader setText(char[] text, int start, int len) {
this.text = text; this.text = text;
this.position = start - 1; this.position = start - 1;
this.limit = start + len - 1; this.limit = start + len - 1;
return this;
} }
@Override @Override
@@ -72,7 +70,7 @@ public class JsonReader extends Reader {
this.limit = -1; this.limit = -1;
this.text = null; this.text = null;
if (this.array != null) { if (this.array != null) {
if (this.array.content.length > 102400) { if (this.array.content.length > CharArray.DEFAULT_SIZE * 200) {
this.array = null; this.array = null;
} else { } else {
this.array.clear(); this.array.clear();
@@ -278,7 +276,7 @@ public class JsonReader extends Reader {
return null; return null;
} }
throw new ConvertException("a json object text must begin with '{' (position = " + position + ") but '" + ch throw new ConvertException("a json object text must begin with '{' (position = " + position + ") but '" + ch
+ "' in (" + new String(this.text) + ")"); + "' in " + new String(this.text));
} }
@Override @Override
@@ -328,7 +326,7 @@ public class JsonReader extends Reader {
return SIGN_NULL; return SIGN_NULL;
} }
throw new ConvertException("a json array text must begin with '[' (position = " + position + ") but '" + ch throw new ConvertException("a json array text must begin with '[' (position = " + position + ") but '" + ch
+ "' in (" + new String(this.text) + ")"); + "' in " + new String(this.text));
} }
@Override @Override
@@ -1050,9 +1048,11 @@ public class JsonReader extends Reader {
protected static class CharArray { protected static class CharArray {
private static final int DEFAULT_SIZE = 1024;
private int count; private int count;
private char[] content = new char[1024]; private char[] content = new char[DEFAULT_SIZE];
private char[] expand(int len) { private char[] expand(int len) {
int newcount = count + len; int newcount = count + len;