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

json

Browse Source
This commit is contained in:
redkale
2024-09-17 17:33:09 +08:00
parent 10842830dc
commit 79e63fa7ad
2 changed files with 58 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -877,44 +877,43 @@ public class JsonReader extends Reader {
protected String readString(boolean flag) {
final char[] text0 = this.text;
char expected = nextGoodChar(true);
final int end = limit;
char quote = nextGoodChar(true);
int curr = this.position;
if (expected != '"' && expected != '\'') {
if (expected == 'n'
&& text0.length > curr + 3
&& (text0[1 + curr] == 'u' && text0[2 + curr] == 'l' && text0[3 + curr] == 'l')) {
if (text0[++curr] == 'u' && text0[++curr] == 'l' && text0[++curr] == 'l') {
this.position = curr;
if (text0.length > curr + 4) {
char ch = text0[curr + 1];
if (ch == ',' || ch <= ' ' || ch == '}' || ch == ']' || (flag && ch == ':')) {
return null;
}
final int start = curr - 3;
for (; ; ) {
if (curr >= text0.length) {
break;
}
ch = text0[curr];
if (ch == ',' || ch <= ' ' || ch == '}' || ch == ']' || (flag && ch == ':')) {
break;
}
curr++;
}
if (curr == start) {
throw new ConvertException("expected a string after a key but '" + text0[position]
+ "' (position = " + position + ") in " + new String(this.text));
}
this.position = curr - 1;
return new String(text0, start, curr - start);
} else {
if (quote != '"' && quote != '\'') {
final int start = curr;
if (quote == 'n'
&& end >= curr + 3
&& text0[1 + curr] == 'u'
&& text0[2 + curr] == 'l'
&& text0[3 + curr] == 'l') {
curr += 3;
this.position = curr;
if (curr < end) {
char ch = text0[++curr];
if (ch == ',' || ch <= ' ' || ch == '}' || ch == ']' || (flag && ch == ':')) {
// null值
return null;
}
// null开头的字符串
for (; curr <= end; curr++) {
ch = text0[curr];
if (ch == ',' || ch <= ' ' || ch == '}' || ch == ']' || (flag && ch == ':')) {
break;
}
}
if (curr == start) {
throw new ConvertException("expected a string after a key but '" + text0[position]
+ "' (position = " + position + ") in " + new String(this.text));
}
this.position = curr - 1;
return new String(text0, start, curr - start);
} else { // null值，已到尾部
return null;
}
} else {
final int start = curr;
for (; ; ) {
if (curr >= text0.length) {
if (curr > end) {
break;
}
char ch = text0[curr];
@@ -930,17 +929,13 @@ public class JsonReader extends Reader {
this.position = curr - 1;
return new String(text0, start, curr - start);
}
this.position = curr;
throw new ConvertException("expected a ':' after a key but '" + text0[position] + "' (position = "
+ position + ") in " + new String(this.text));
}
final int start = ++curr;
int end = limit;
CharArray array = null;
char c;
for (; curr <= end; curr++) {
char ch = text0[curr];
if (ch == expected) {
if (ch == quote) {
break;
} else if (ch == '\\') {
if (array == null) {

26
src/test/java/org/redkale/test/convert/Json5Test.java
View File

@@ -5,11 +5,14 @@
*/
package org.redkale.test.convert;
import java.lang.reflect.Type;
import java.util.*;
import org.junit.jupiter.api.*;
import org.redkale.convert.Convert;
import org.redkale.convert.ConvertSmallString;
import org.redkale.convert.Decodeable;
import org.redkale.convert.json.*;
import org.redkale.util.TypeToken;
/** @author zhangjx */
public class Json5Test {
@@ -18,6 +21,7 @@ public class Json5Test {
Json5Test test = new Json5Test();
test.run1();
test.run2();
test.run3();
}
@Test
@@ -55,6 +59,28 @@ public class Json5Test {
System.out.println(convert.convertTo(bean));
}
@Test
public void run3() throws Exception {
Decodeable<JsonReader, String> decoder = JsonFactory.root().loadDecoder(String.class);
String val = decoder.convertFrom(new JsonReader("null"));
Assertions.assertTrue(val == null);
val = decoder.convertFrom(new JsonReader("nullable"));
Assertions.assertEquals("nullable", val);
LinkedHashMap<String, String> map = new LinkedHashMap<>();
map.put("name1", null);
map.put("name2", "nullable");
map.put("site", "002");
String json = JsonConvert.root().convertTo(map);
System.out.println(json);
Map<String, String> rs = JsonConvert.root().convertFrom(MAP_TYPE, json.replace("\"nullable\"", "nullable"));
String json2 = JsonConvert.root().convertTo(rs);
System.out.println(json2);
Assertions.assertEquals(json, json2);
}
private static Type MAP_TYPE = new TypeToken<LinkedHashMap<String, String>>() {}.getType();
public static class Json5Bean {
public int id;