[incubator-dubbo] branch master updated: fix fastjson serialization with generic return type (#3771)

[ke...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

kexianjun pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-dubbo.git


The following commit(s) were added to refs/heads/master by this push:
     new 3b145c7  fix fastjson serialization with generic return type (#3771)
3b145c7 is described below

commit 3b145c75880b25343b67a0ae242f27322db9ba18
Author: cyejing <ji...@gmail.com>
AuthorDate: Mon Apr 1 12:40:48 2019 +0800

    fix fastjson serialization with generic return type (#3771)
---
 .../serialize/fastjson/FastJsonObjectInput.java    |  5 +--
 .../fastjson/FastJsonObjectInputTest.java          | 47 +++++++++++++++++++++-
 .../dubbo/common/serialize/model/Organization.java | 30 ++++++++++++++
 3 files changed, 78 insertions(+), 4 deletions(-)

diff --git a/dubbo-serialization/dubbo-serialization-fastjson/src/main/java/org/apache/dubbo/common/serialize/fastjson/FastJsonObjectInput.java b/dubbo-serialization/dubbo-serialization-fastjson/src/main/java/org/apache/dubbo/common/serialize/fastjson/FastJsonObjectInput.java
index 1a38f27..ccf6a2b 100644
--- a/dubbo-serialization/dubbo-serialization-fastjson/src/main/java/org/apache/dubbo/common/serialize/fastjson/FastJsonObjectInput.java
+++ b/dubbo-serialization/dubbo-serialization-fastjson/src/main/java/org/apache/dubbo/common/serialize/fastjson/FastJsonObjectInput.java
@@ -17,7 +17,6 @@
 package org.apache.dubbo.common.serialize.fastjson;
 
 import org.apache.dubbo.common.serialize.ObjectInput;
-import org.apache.dubbo.common.utils.PojoUtils;
 
 import com.alibaba.fastjson.JSON;
 
@@ -103,8 +102,8 @@ public class FastJsonObjectInput implements ObjectInput {
     @Override
     @SuppressWarnings("unchecked")
     public <T> T readObject(Class<T> cls, Type type) throws IOException, ClassNotFoundException {
-        Object value = readObject(cls);
-        return (T) PojoUtils.realize(value, cls, type);
+        String json = readLine();
+        return (T) JSON.parseObject(json, type);
     }
 
     private String readLine() throws IOException, EOFException {
diff --git a/dubbo-serialization/dubbo-serialization-test/src/test/java/org/apache/dubbo/common/serialize/fastjson/FastJsonObjectInputTest.java b/dubbo-serialization/dubbo-serialization-test/src/test/java/org/apache/dubbo/common/serialize/fastjson/FastJsonObjectInputTest.java
index 5711f13..bfc197c 100644
--- a/dubbo-serialization/dubbo-serialization-test/src/test/java/org/apache/dubbo/common/serialize/fastjson/FastJsonObjectInputTest.java
+++ b/dubbo-serialization/dubbo-serialization-test/src/test/java/org/apache/dubbo/common/serialize/fastjson/FastJsonObjectInputTest.java
@@ -18,6 +18,10 @@ package org.apache.dubbo.common.serialize.fastjson;
 
 import com.alibaba.fastjson.JSONObject;
 
+import java.lang.reflect.Method;
+import java.lang.reflect.Type;
+import java.util.List;
+import org.apache.dubbo.common.serialize.model.Organization;
 import org.apache.dubbo.common.serialize.model.Person;
 
 import org.junit.jupiter.api.Assertions;
@@ -32,6 +36,7 @@ import static org.hamcrest.CoreMatchers.not;
 import static org.hamcrest.CoreMatchers.nullValue;
 import static org.hamcrest.core.Is.is;
 import static org.hamcrest.MatcherAssert.assertThat;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 public class FastJsonObjectInputTest {
     private FastJsonObjectInput fastJsonObjectInput;
@@ -151,4 +156,44 @@ public class FastJsonObjectInputTest {
         assertThat(readObject.getString("name"), is("John"));
         assertThat(readObject.getInteger("age"), is(30));
     }
-}
\ No newline at end of file
+
+
+    @Test
+    public void testReadObjectWithTowType() throws Exception {
+        fastJsonObjectInput = new FastJsonObjectInput(new StringReader("[{\"name\":\"John\",\"age\":30},{\"name\":\"Born\",\"age\":24}]"));
+
+        Method methodReturnType = getClass().getMethod("towLayer");
+        Type type = methodReturnType.getGenericReturnType();
+        List<Person> o = fastJsonObjectInput.readObject(List.class, type);
+
+        assertTrue(o instanceof List);
+        assertTrue(o.get(0) instanceof Person);
+
+        assertThat(o.size(), is(2));
+        assertThat(o.get(1).getName(), is("Born"));
+    }
+
+    @Test
+    public void testReadObjectWithThreeType() throws Exception {
+        fastJsonObjectInput = new FastJsonObjectInput(new StringReader("{\"data\":[{\"name\":\"John\",\"age\":30},{\"name\":\"Born\",\"age\":24}]}"));
+
+        Method methodReturnType = getClass().getMethod("threeLayer");
+        Type type = methodReturnType.getGenericReturnType();
+        Organization<List<Person>> o = fastJsonObjectInput.readObject(Organization.class, type);
+
+        assertTrue(o instanceof Organization);
+        assertTrue(o.getData() instanceof List);
+        assertTrue(o.getData().get(0) instanceof Person);
+
+        assertThat(o.getData().size(), is(2));
+        assertThat(o.getData().get(1).getName(), is("Born"));
+    }
+
+    public List<Person> towLayer() {
+        return null;
+    }
+
+    public Organization<List<Person>> threeLayer() {
+        return null;
+    }
+}
diff --git a/dubbo-serialization/dubbo-serialization-test/src/test/java/org/apache/dubbo/common/serialize/model/Organization.java b/dubbo-serialization/dubbo-serialization-test/src/test/java/org/apache/dubbo/common/serialize/model/Organization.java
new file mode 100644
index 0000000..d36d68e
--- /dev/null
+++ b/dubbo-serialization/dubbo-serialization-test/src/test/java/org/apache/dubbo/common/serialize/model/Organization.java
@@ -0,0 +1,30 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.dubbo.common.serialize.model;
+
+public class Organization<T> {
+
+    private T data;
+
+    public T getData() {
+        return data;
+    }
+
+    public void setData(T data) {
+        this.data = data;
+    }
+}