improve support custom deserialize & serialize

xiezheng-XD · Jul 27, 2023 · 2bd4b7e · 2bd4b7e
1 parent 59c7c76
commit 2bd4b7e
Show file tree

Hide file tree

Showing 40 changed files with 531 additions and 129 deletions.
diff --git a/core/src/main/java/com/alibaba/fastjson2/function/FieldBiConsumer.java b/core/src/main/java/com/alibaba/fastjson2/function/FieldBiConsumer.java
@@ -0,0 +1,19 @@
+package com.alibaba.fastjson2.function;
+
+import java.util.function.BiConsumer;
+
+public final class FieldBiConsumer<T>
+        implements BiConsumer<T, Object> {
+    public final int fieldIndex;
+    public final FieldConsumer<T> consumer;
+
+    public FieldBiConsumer(int fieldIndex, FieldConsumer<T> consumer) {
+        this.fieldIndex = fieldIndex;
+        this.consumer = consumer;
+    }
+
+    @Override
+    public void accept(T object, Object fieldValue) {
+        consumer.accept(object, fieldIndex, fieldValue);
+    }
+}
diff --git a/core/src/main/java/com/alibaba/fastjson2/function/FieldConsumer.java b/core/src/main/java/com/alibaba/fastjson2/function/FieldConsumer.java
@@ -0,0 +1,6 @@
+package com.alibaba.fastjson2.function;
+
+@FunctionalInterface
+public interface FieldConsumer<T> {
+    void accept(T object, int fieldIndex, Object fieldValue);
+}
diff --git a/core/src/main/java/com/alibaba/fastjson2/function/FieldSupplier.java b/core/src/main/java/com/alibaba/fastjson2/function/FieldSupplier.java
@@ -0,0 +1,6 @@
+package com.alibaba.fastjson2.function;
+
+@FunctionalInterface
+public interface FieldSupplier<T> {
+    Object get(T object, int fieldIndex);
+}
diff --git a/core/src/main/java/com/alibaba/fastjson2/function/FieldSupplierFunction.java b/core/src/main/java/com/alibaba/fastjson2/function/FieldSupplierFunction.java
@@ -0,0 +1,19 @@
+package com.alibaba.fastjson2.function;
+
+import java.util.function.Function;
+
+public final class FieldSupplierFunction<T>
+        implements Function<T, Object> {
+    public final FieldSupplier<T> supplier;
+    public final int fieldIndex;
+
+    public FieldSupplierFunction(FieldSupplier<T> supplier, int fieldIndex) {
+        this.supplier = supplier;
+        this.fieldIndex = fieldIndex;
+    }
+
+    @Override
+    public Object apply(T object) {
+        return supplier.get(object, fieldIndex);
+    }
+}
diff --git a/core/src/main/java/com/alibaba/fastjson2/internal/asm/ASMUtils.java b/core/src/main/java/com/alibaba/fastjson2/internal/asm/ASMUtils.java
@@ -66,6 +66,7 @@ public class ASMUtils {
     public static final String TYPE_OBJECT_WRITER = ObjectWriter.class.getName().replace('.', '/');
     public static final String TYPE_JSON_WRITER = JSONWriter.class.getName().replace('.', '/');
     public static final String TYPE_FIELD_WRITER = FieldWriter.class.getName().replace('.', '/');
+    public static final String TYPE_OBJECT = "java/lang/Object";
 
     public static final String DESC_FIELD_WRITER = 'L' + FieldWriter.class.getName().replace('.', '/') + ';';
     public static final String DESC_FIELD_WRITER_ARRAY = "[" + DESC_FIELD_WRITER;

diff --git a/core/src/main/java/com/alibaba/fastjson2/reader/FieldReader.java b/core/src/main/java/com/alibaba/fastjson2/reader/FieldReader.java
@@ -10,6 +10,7 @@
 import java.lang.reflect.*;
 import java.time.*;
 import java.util.*;
+import java.util.function.BiConsumer;
 import java.util.function.Function;
 
 import static com.alibaba.fastjson2.util.JDKUtils.UNSAFE;
@@ -529,4 +530,8 @@ static ObjectReader createFormattedObjectReader(Type fieldType, Class fieldClass
         }
         return null;
     }
+
+    public BiConsumer getFunction() {
+        return null;
+    }
 }
diff --git a/core/src/main/java/com/alibaba/fastjson2/reader/FieldReaderBigDecimalFunc.java b/core/src/main/java/com/alibaba/fastjson2/reader/FieldReaderBigDecimalFunc.java
@@ -94,4 +94,9 @@ public void readFieldValue(JSONReader jsonReader, T object) {
     public Object readFieldValue(JSONReader jsonReader) {
         return jsonReader.readBigDecimal();
     }
+
+    @Override
+    public BiConsumer getFunction() {
+        return function;
+    }
 }
diff --git a/core/src/main/java/com/alibaba/fastjson2/reader/FieldReaderBigIntegerFunc.java b/core/src/main/java/com/alibaba/fastjson2/reader/FieldReaderBigIntegerFunc.java
@@ -96,4 +96,9 @@ public void readFieldValue(JSONReader jsonReader, T object) {
     public Object readFieldValue(JSONReader jsonReader) {
         return jsonReader.readBigInteger();
     }
+
+    @Override
+    public BiConsumer getFunction() {
+        return function;
+    }
 }
diff --git a/core/src/main/java/com/alibaba/fastjson2/reader/FieldReaderBoolFunc.java b/core/src/main/java/com/alibaba/fastjson2/reader/FieldReaderBoolFunc.java
@@ -63,4 +63,9 @@ public void readFieldValue(JSONReader jsonReader, T object) {
     public Object readFieldValue(JSONReader jsonReader) {
         return jsonReader.readBool();
     }
+
+    @Override
+    public BiConsumer getFunction() {
+        return function;
+    }
 }
diff --git a/core/src/main/java/com/alibaba/fastjson2/reader/FieldReaderDoubleFunc.java b/core/src/main/java/com/alibaba/fastjson2/reader/FieldReaderDoubleFunc.java
@@ -67,4 +67,9 @@ public void readFieldValue(JSONReader jsonReader, T object) {
     public Object readFieldValue(JSONReader jsonReader) {
         return jsonReader.readDouble();
     }
+
+    @Override
+    public BiConsumer getFunction() {
+        return function;
+    }
 }
diff --git a/core/src/main/java/com/alibaba/fastjson2/reader/FieldReaderFloatFunc.java b/core/src/main/java/com/alibaba/fastjson2/reader/FieldReaderFloatFunc.java
@@ -63,4 +63,9 @@ public void readFieldValue(JSONReader jsonReader, T object) {
     public Object readFieldValue(JSONReader jsonReader) {
         return jsonReader.readFloat();
     }
+
+    @Override
+    public BiConsumer getFunction() {
+        return function;
+    }
 }
diff --git a/core/src/main/java/com/alibaba/fastjson2/reader/FieldReaderInt16Func.java b/core/src/main/java/com/alibaba/fastjson2/reader/FieldReaderInt16Func.java
@@ -64,4 +64,9 @@ public void readFieldValue(JSONReader jsonReader, T object) {
     public Object readFieldValue(JSONReader jsonReader) {
         return (short) jsonReader.readInt32Value();
     }
+
+    @Override
+    public BiConsumer getFunction() {
+        return function;
+    }
 }
diff --git a/core/src/main/java/com/alibaba/fastjson2/reader/FieldReaderInt32Func.java b/core/src/main/java/com/alibaba/fastjson2/reader/FieldReaderInt32Func.java
@@ -63,4 +63,9 @@ public void readFieldValue(JSONReader jsonReader, T object) {
     public Object readFieldValue(JSONReader jsonReader) {
         return jsonReader.readInt32();
     }
+
+    @Override
+    public BiConsumer getFunction() {
+        return function;
+    }
 }
diff --git a/core/src/main/java/com/alibaba/fastjson2/reader/FieldReaderInt64Func.java b/core/src/main/java/com/alibaba/fastjson2/reader/FieldReaderInt64Func.java
@@ -63,4 +63,9 @@ public void readFieldValue(JSONReader jsonReader, T object) {
     public Object readFieldValue(JSONReader jsonReader) {
         return jsonReader.readInt64();
     }
+
+    @Override
+    public BiConsumer getFunction() {
+        return function;
+    }
 }
diff --git a/core/src/main/java/com/alibaba/fastjson2/reader/FieldReaderInt8Func.java b/core/src/main/java/com/alibaba/fastjson2/reader/FieldReaderInt8Func.java
@@ -64,4 +64,9 @@ public void readFieldValue(JSONReader jsonReader, T object) {
     public Object readFieldValue(JSONReader jsonReader) {
         return jsonReader.readInt32();
     }
+
+    @Override
+    public BiConsumer getFunction() {
+        return function;
+    }
 }
diff --git a/core/src/main/java/com/alibaba/fastjson2/reader/FieldReaderNumberFunc.java b/core/src/main/java/com/alibaba/fastjson2/reader/FieldReaderNumberFunc.java
@@ -78,4 +78,9 @@ public void readFieldValue(JSONReader jsonReader, T object) {
     public Object readFieldValue(JSONReader jsonReader) {
         return jsonReader.readNumber();
     }
+
+    @Override
+    public BiConsumer getFunction() {
+        return function;
+    }
 }
diff --git a/core/src/main/java/com/alibaba/fastjson2/reader/FieldReaderObject.java b/core/src/main/java/com/alibaba/fastjson2/reader/FieldReaderObject.java
@@ -321,4 +321,9 @@ public void processExtra(JSONReader jsonReader, Object object) {
 
         jsonReader.skipValue();
     }
+
+    @Override
+    public BiConsumer getFunction() {
+        return function;
+    }
 }
diff --git a/core/src/main/java/com/alibaba/fastjson2/reader/FieldReaderStringFunc.java b/core/src/main/java/com/alibaba/fastjson2/reader/FieldReaderStringFunc.java
@@ -91,4 +91,9 @@ public Object readFieldValue(JSONReader jsonReader) {
     public boolean supportAcceptType(Class valueClass) {
         return true;
     }
+
+    @Override
+    public BiConsumer getFunction() {
+        return function;
+    }
 }