diff --git a/dubbo-serialization/dubbo-serialization-protostuff/src/main/java/org/apache/dubbo/common/serialize/protostuff/ProtostuffObjectInput.java b/dubbo-serialization/dubbo-serialization-protostuff/src/main/java/org/apache/dubbo/common/serialize/protostuff/ProtostuffObjectInput.java index 6284d6a6777c..e8307748deb3 100644 --- a/dubbo-serialization/dubbo-serialization-protostuff/src/main/java/org/apache/dubbo/common/serialize/protostuff/ProtostuffObjectInput.java +++ b/dubbo-serialization/dubbo-serialization-protostuff/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 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/dubbo-serialization/dubbo-serialization-protostuff/src/main/java/org/apache/dubbo/common/serialize/protostuff/ProtostuffObjectOutput.java b/dubbo-serialization/dubbo-serialization-protostuff/src/main/java/org/apache/dubbo/common/serialize/protostuff/ProtostuffObjectOutput.java index 3e54282a6b44..f52c755d5d17 100644 --- a/dubbo-serialization/dubbo-serialization-protostuff/src/main/java/org/apache/dubbo/common/serialize/protostuff/ProtostuffObjectOutput.java +++ b/dubbo-serialization/dubbo-serialization-protostuff/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 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/dubbo-serialization/dubbo-serialization-test/src/test/java/org/apache/dubbo/common/serialize/protostuff/ProtostuffSerializationTest.java b/dubbo-serialization/dubbo-serialization-test/src/test/java/org/apache/dubbo/common/serialize/protostuff/ProtostuffSerializationTest.java index fb99d0e92741..02c278e00b01 100644 --- a/dubbo-serialization/dubbo-serialization-test/src/test/java/org/apache/dubbo/common/serialize/protostuff/ProtostuffSerializationTest.java +++ b/dubbo-serialization/dubbo-serialization-test/src/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 - } }