TypeReference support null argument, for issue #1267

alibaba · Mar 22, 2023 · 6cc5039 · 6cc5039
1 parent 1dfcaa6
commit 6cc5039
Show file tree

Hide file tree

Showing 4 changed files with 92 additions and 0 deletions.
diff --git a/core/src/main/java/com/alibaba/fastjson2/TypeReference.java b/core/src/main/java/com/alibaba/fastjson2/TypeReference.java
@@ -80,6 +80,10 @@ public TypeReference(Type... actualTypeArguments) {
             throw new NullPointerException();
         }
 
+        if (actualTypeArguments.length == 1 && actualTypeArguments[0] == null) {
+            actualTypeArguments[0] = Object.class;
+        }
+
         Class<?> thisClass = getClass();
         Type superClass = thisClass.getGenericSuperclass();
         ParameterizedType argType = (ParameterizedType) ((ParameterizedType) superClass).getActualTypeArguments()[0];

diff --git a/core/src/test/java/com/alibaba/fastjson2/TypeReferenceTest4.java b/core/src/test/java/com/alibaba/fastjson2/TypeReferenceTest4.java
@@ -0,0 +1,41 @@
+package com.alibaba.fastjson2;
+
+import lombok.Data;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+public class TypeReferenceTest4 {
+    @Test
+    public void test() {
+        ExtInfoBean extInfoBean = new ExtInfoBean();
+        extInfoBean.setInfoId("id");
+        extInfoBean.setInfoName(ExtInfoBean.class.getName());
+        extInfoBean.setInfoData(null);
+
+        String json = JSON.toJSONString(extInfoBean);
+        assertEquals("{\"infoId\":\"id\",\"infoName\":\"com.alibaba.fastjson2.TypeReferenceTest4$ExtInfoBean\"}", json);
+
+        ExtInfoBean result = testTypeReference(json, null);
+        assertEquals(json, JSON.toJSONString(result));
+    }
+
+    private static <T> ExtInfoBean<T> testTypeReference(String extJson, Class<T> clz) {
+        ExtInfoBean extInfoBean = JSON.parseObject(extJson,
+                new TypeReference<ExtInfoBean<T>>(clz) {
+                });
+
+        return extInfoBean;
+    }
+
+    /**
+     * @author weizhiyu
+     * @since 2022/07/06 2:35 PM
+     */
+    @Data
+    public static class ExtInfoBean<T> {
+        private String infoId;
+        private String infoName;
+        private T infoData;
+    }
+}
diff --git a/fastjson1-compatible/src/main/java/com/alibaba/fastjson/TypeReference.java b/fastjson1-compatible/src/main/java/com/alibaba/fastjson/TypeReference.java
@@ -57,6 +57,12 @@ protected TypeReference() {
      * @since 1.2.9
      */
     protected TypeReference(Type... actualTypeArguments) {
+        if (actualTypeArguments != null
+                && actualTypeArguments.length == 1
+                && actualTypeArguments[0] == null) {
+            actualTypeArguments[0] = Object.class;
+        }
+
         Class<?> thisClass = this.getClass();
         Type superClass = thisClass.getGenericSuperclass();
 

diff --git a/fastjson1-compatible/src/test/java/com/alibaba/fastjson/TypeReferenceTest4.java b/fastjson1-compatible/src/test/java/com/alibaba/fastjson/TypeReferenceTest4.java
@@ -0,0 +1,41 @@
+package com.alibaba.fastjson;
+
+import lombok.Data;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+public class TypeReferenceTest4 {
+    @Test
+    public void test() {
+        ExtInfoBean extInfoBean = new ExtInfoBean();
+        extInfoBean.setInfoId("id");
+        extInfoBean.setInfoName(ExtInfoBean.class.getName());
+        extInfoBean.setInfoData(null);
+
+        String json = com.alibaba.fastjson2.JSON.toJSONString(extInfoBean);
+        assertEquals("{\"infoId\":\"id\",\"infoName\":\"com.alibaba.fastjson.TypeReferenceTest4$ExtInfoBean\"}", json);
+
+        ExtInfoBean result = testTypeReference(json, null);
+        assertEquals(json, com.alibaba.fastjson2.JSON.toJSONString(result));
+    }
+
+    private static <T> ExtInfoBean<T> testTypeReference(String extJson, Class<T> clz) {
+        ExtInfoBean extInfoBean = JSON.parseObject(extJson,
+                new TypeReference<ExtInfoBean<T>>(clz) {
+                });
+
+        return extInfoBean;
+    }
+
+    /**
+     * @author weizhiyu
+     * @since 2022/07/06 2:35 PM
+     */
+    @Data
+    public static class ExtInfoBean<T> {
+        private String infoId;
+        private String infoName;
+        private T infoData;
+    }
+}