fix(json): align jackson parser with fastjson defaults

Author: halibobo1205

common/src/main/java/org/tron/json/JSON.java

@@ -6,7 +6,6 @@
 import com.fasterxml.jackson.core.json.JsonReadFeature;
 import com.fasterxml.jackson.databind.DeserializationFeature;
 import com.fasterxml.jackson.databind.JsonNode;
-import com.fasterxml.jackson.databind.MapperFeature;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.SerializationFeature;
 import com.fasterxml.jackson.databind.json.JsonMapper;
@@ -41,22 +40,27 @@ public final class JSON {
       .enable(JsonReadFeature.ALLOW_UNQUOTED_FIELD_NAMES)
       // Fastjson Feature.AllowSingleQuotes (default ON)
       .enable(JsonReadFeature.ALLOW_SINGLE_QUOTES)
-      // Fastjson tolerates trailing commas (e.g. {"a":1,}) by default
+      // Partial compatibility with Fastjson Feature.AllowArbitraryCommas:
+      // this only covers a single trailing comma like {"a":1,} or [1,2,].
+      // Fastjson also accepts repeated/arbitrary commas like {"a":1,,,,} and
+      // [1,,2], which Jackson does not support with this feature.
       .enable(JsonReadFeature.ALLOW_TRAILING_COMMA)
-      // Fastjson accepts NaN as valid tokens, Infinity is invalid
+      // Fastjson accepts NaN as null but rejects Infinity by default.
+      // Jackson enables both with this feature, so every parse path must normalize
+      // NaN and reject +/-Infinity after reading.
       .enable(JsonReadFeature.ALLOW_NON_NUMERIC_NUMBERS)
-      // Fastjson accepts leading plus sign for numbers (e.g. +123)
+      // Fastjson accepts a leading plus sign for numbers (for example +123, +0.5)
       .enable(JsonReadFeature.ALLOW_LEADING_PLUS_SIGN_FOR_NUMBERS)
-      // Fastjson accepts leading decimal point for numbers (e.g. .5)
+      // Partial compatibility for Fastjson's asymmetric decimal behavior:
+      // Fastjson accepts +.5 but rejects .5 by default. Jackson cannot model only
+      // the signed form, so enabling this also accepts .5.
       .enable(JsonReadFeature.ALLOW_LEADING_DECIMAL_POINT_FOR_NUMBERS)
-      // Fastjson accepts trailing decimal point for numbers (e.g. 5.)
+      // Fastjson accepts a trailing decimal point for numbers (for example 5.)
       .enable(JsonReadFeature.ALLOW_TRAILING_DECIMAL_POINT_FOR_NUMBERS)
-      // Fastjson accepts leading zeros for numbers (e.g. 007)
+      // Fastjson accepts leading zeros for numbers (for example 007)
       .enable(JsonReadFeature.ALLOW_LEADING_ZEROS_FOR_NUMBERS)
-      // Fastjson accepts unescaped control chars in strings (e.g. raw tab/newline)
+      // Fastjson accepts unescaped control chars in strings (for example raw tab/newline)
       .enable(JsonReadFeature.ALLOW_UNESCAPED_CONTROL_CHARS)
-      // Fastjson accepts backslash-escaping any character (e.g. \q -> q)
-      .enable(JsonReadFeature.ALLOW_BACKSLASH_ESCAPING_ANY_CHARACTER)
       // Fastjson accepts Java-style comments (// and /* */)
       .enable(JsonReadFeature.ALLOW_JAVA_COMMENTS)
       // Fastjson Feature.UseBigDecimal (default ON)
@@ -69,11 +73,6 @@ public final class JSON {
       // Fastjson omits null-valued fields by default (WriteMapNullValue is OFF by default)
       // https://github.com/alibaba/fastjson/wiki/WriteNull_cn
       .serializationInclusion(JsonInclude.Include.NON_NULL)
-      // Fastjson uses WriteDateUseDateFormat (string) not timestamps by default
-      .disable(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS)
-      // Fastjson smart-match: field names are matched ignoring case/underscores by default
-      // (DisableFieldSmartMatch is OFF by default -> smart match ON)
-      .configure(MapperFeature.ACCEPT_CASE_INSENSITIVE_PROPERTIES, true)
       .build();
 
   private static JsonFactory buildFactory() {
@@ -230,23 +229,6 @@ public static JSONObject parseObject(String text) {
     }
   }
 
-  public static <T> T parseObject(String text, Class<T> clazz) {
-    if (isNullLiteral(text)) {
-      return null;
-    }
-    if (clazz == JSONObject.class) {
-      return clazz.cast(parseObject(text));
-    }
-    if (clazz == JSONArray.class) {
-      return clazz.cast(parseArray(text));
-    }
-    try {
-      return MAPPER.readValue(text, clazz);
-    } catch (Exception e) {
-      throw new JSONException(e.getMessage(), e);
-    }
-  }
-
   public static JsonNode parse(String text) {
     if (isNullLiteral(text)) {
       return null;

framework/src/test/java/org/tron/core/net/messagehandler/PbftDataSyncHandlerTest.java

@@ -1,5 +1,6 @@
 package org.tron.core.net.messagehandler;
 
+import com.fasterxml.jackson.databind.ObjectMapper;
 import com.google.protobuf.ByteString;
 import java.lang.reflect.Field;
 import java.util.ArrayList;
@@ -14,7 +15,6 @@
 import org.tron.core.db.PbftSignDataStore;
 import org.tron.core.net.message.pbft.PbftCommitMessage;
 import org.tron.core.store.DynamicPropertiesStore;
-import org.tron.json.JSON;
 import org.tron.protos.Protocol;
 
 public class PbftDataSyncHandlerTest {
@@ -52,7 +52,7 @@ public void testProcessMessage() throws Exception {
     pbftDataSyncHandler.processPBFTCommitData(blockCapsule);
     Field field1 = PbftDataSyncHandler.class.getDeclaredField("pbftCommitMessageCache");
     field1.setAccessible(true);
-    Map map = JSON.parseObject(JSON.toJSONString(field1.get(pbftDataSyncHandler)), Map.class);
+    Map map = new ObjectMapper().convertValue(field1.get(pbftDataSyncHandler), Map.class);
     Assert.assertFalse(map.containsKey(0));
   }
 }

framework/src/test/java/org/tron/json/JsonTest.java

@@ -12,6 +12,7 @@
 import java.math.BigDecimal;
 import java.math.BigInteger;
 import java.util.Arrays;
+import java.util.Date;
 import java.util.List;
 import org.junit.Test;
 
@@ -36,6 +37,8 @@ public void testTrailingComma() {
     assertEquals(3, array.size());
     assertEquals(2, array.get(1));
     assertEquals(1, ((JSONObject) array.get(2)).getIntValue("a"));
+    assertThrows(JSONException.class, () -> JSON.parseObject("{c:'NULL',,,,,,}"));
+    assertThrows(JSONException.class, () -> JSON.parseObject("[1,,2]"));
   }
 
   @Test
@@ -68,7 +71,7 @@ public void testLeadingNumbers() {
     assertNotNull(o);
     assertEquals(1, o.getIntValue("a"));
     assertEquals(-2, o.getIntValue("b"));
-    assertEquals("0.3", o.getBigDecimal("c").toPlainString()); // Fastjson will throw an error
+    assertEquals("0.3", o.getBigDecimal("c").toPlainString());
     assertEquals("-0.4", o.getBigDecimal("d").toPlainString());
     assertEquals("0.5", o.getBigDecimal("e").toPlainString());
     assertEquals(6, o.getIntValue("f"));
@@ -87,9 +90,7 @@ public void testUnescapedControlChars() {
 
   @Test
   public void testBackslashEscapeAnyChar() {
-    JSONObject obj = JSON.parseObject("{\"a\":\"\\q\"}"); // Fastjson will throw an error
-    assertNotNull(obj);
-    assertEquals("q", obj.getString("a"));
+    assertThrows(JSONException.class, () -> JSON.parseObject("{\"a\":\"\\q\"}"));
   }
 
   @Test
@@ -151,21 +152,12 @@ public void testUppercaseNull() {
   }
 
   @Test
-  public void testParseToClass() {
+  public void testParseHelpers() {
     assertNotNull(JSON.parse("{\"a\":1}"));
     assertEquals(1, JSON.parse("{\"a\":1}").get("a").intValue());
     assertNull(JSON.parse(null));
     assertNull(JSON.parse("null"));
 
-    // parseObject(text, Class) — JSONObject / JSONArray short-circuits
-    assertEquals(1, JSON.parseObject("{\"a\":1}", JSONObject.class).getIntValue("a"));
-    assertEquals(3, JSON.parseObject("[1,2,3]", JSONArray.class).size());
-
-    // parseObject(text, Class) — arbitrary POJO via Jackson
-    Pojo p = JSON.parseObject("{\"name\":\"x\"}", Pojo.class);
-    assertEquals("x", p.name);
-    assertNull(JSON.parseObject(null, Pojo.class));
-
     // JSONObject.parseObject delegate
     assertEquals(1, JSONObject.parseObject("{\"a\":1}").getIntValue("a"));
 
@@ -180,6 +172,7 @@ public void testToJSONString() {
     assertEquals("{\"a\":1}", JSON.toJSONString(new JSONObject().put("a", 1)));
     assertEquals("[1,2]", JSON.toJSONString(JSON.parseArray("[1,2]")));
     assertEquals("\"hi\"", JSON.toJSONString("hi"));
+    assertEquals("0", JSON.toJSONString(new Date(0)));
 
     // pretty variant differs from compact for containers (exercises the pretty branch)
     JSONObject obj = new JSONObject().put("a", 1);