Fix for loop reference test pass on protostuff (#3252)

apache · Jan 24, 2019 · 33f1726 · 33f1726
1 parent e07038b
commit 33f1726
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 19 deletions.
diff --git a/...uff/src/main/java/org/apache/dubbo/common/serialize/protostuff/ProtostuffObjectInput.java b/...uff/src/main/java/org/apache/dubbo/common/serialize/protostuff/ProtostuffObjectInput.java
@@ -17,17 +17,15 @@
 
 package org.apache.dubbo.common.serialize.protostuff;
 
-import org.apache.dubbo.common.serialize.ObjectInput;
-import org.apache.dubbo.common.serialize.protostuff.utils.WrapperUtils;
-
-import io.protostuff.ProtobufIOUtil;
+import io.protostuff.GraphIOUtil;
 import io.protostuff.Schema;
 import io.protostuff.runtime.RuntimeSchema;
-
 import java.io.DataInputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.lang.reflect.Type;
+import org.apache.dubbo.common.serialize.ObjectInput;
+import org.apache.dubbo.common.serialize.protostuff.utils.WrapperUtils;
 
 /**
  * Protostuff object input implementation
@@ -63,12 +61,12 @@ public Object readObject() throws IOException, ClassNotFoundException {
         if (WrapperUtils.needWrapper(clazz)) {
             Schema<Wrapper> schema = RuntimeSchema.getSchema(Wrapper.class);
             Wrapper wrapper = schema.newMessage();
-            ProtobufIOUtil.mergeFrom(bytes, wrapper, schema);
+            GraphIOUtil.mergeFrom(bytes, wrapper, schema);
             result = wrapper.getData();
         } else {
             Schema schema = RuntimeSchema.getSchema(clazz);
             result = schema.newMessage();
-            ProtobufIOUtil.mergeFrom(bytes, result, schema);
+            GraphIOUtil.mergeFrom(bytes, result, schema);
         }
 
         return result;

diff --git a/...ff/src/main/java/org/apache/dubbo/common/serialize/protostuff/ProtostuffObjectOutput.java b/...ff/src/main/java/org/apache/dubbo/common/serialize/protostuff/ProtostuffObjectOutput.java
@@ -17,17 +17,15 @@
 
 package org.apache.dubbo.common.serialize.protostuff;
 
-import org.apache.dubbo.common.serialize.ObjectOutput;
-import org.apache.dubbo.common.serialize.protostuff.utils.WrapperUtils;
-
+import io.protostuff.GraphIOUtil;
 import io.protostuff.LinkedBuffer;
-import io.protostuff.ProtobufIOUtil;
 import io.protostuff.Schema;
 import io.protostuff.runtime.RuntimeSchema;
-
 import java.io.DataOutputStream;
 import java.io.IOException;
 import java.io.OutputStream;
+import org.apache.dubbo.common.serialize.ObjectOutput;
+import org.apache.dubbo.common.serialize.protostuff.utils.WrapperUtils;
 
 /**
  * Protostuff object output implementation
@@ -52,11 +50,11 @@ public void writeObject(Object obj) throws IOException {
             if (WrapperUtils.needWrapper(obj)) {
                 Schema<Wrapper> schema = RuntimeSchema.getSchema(Wrapper.class);
                 Wrapper wrapper = new Wrapper(obj);
-                bytes = ProtobufIOUtil.toByteArray(wrapper, schema, buffer);
+                bytes = GraphIOUtil.toByteArray(wrapper, schema, buffer);
                 classNameBytes = Wrapper.class.getName().getBytes();
             } else {
                 Schema schema = RuntimeSchema.getSchema(obj.getClass());
-                bytes = ProtobufIOUtil.toByteArray(obj, schema, buffer);
+                bytes = GraphIOUtil.toByteArray(obj, schema, buffer);
                 classNameBytes = obj.getClass().getName().getBytes();
             }
         } finally {

diff --git a/...c/test/java/org/apache/dubbo/common/serialize/protostuff/ProtostuffSerializationTest.java b/...c/test/java/org/apache/dubbo/common/serialize/protostuff/ProtostuffSerializationTest.java
@@ -25,9 +25,4 @@ public class ProtostuffSerializationTest extends AbstractSerializationTest {
         serialization = new ProtostuffSerialization();
     }
 
-    @Override
-    @Test
-    public void test_LoopReference() throws Exception {
-        // FIXME: cannot make this test pass on protostuff
-    }
 }