This is an automated email from the ASF dual-hosted git repository.
huxing 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 33f1726 Fix for loop reference test pass on protostuff (#3252)
33f1726 is described below
commit 33f1726713a4c5f2ce5880613acf2320ae2a4502
Author: Jia He <[email protected]>
AuthorDate: Thu Jan 24 10:31:46 2019 +0800
Fix for loop reference test pass on protostuff (#3252)
---
.../common/serialize/protostuff/ProtostuffObjectInput.java | 12 +++++-------
.../common/serialize/protostuff/ProtostuffObjectOutput.java | 12 +++++-------
.../serialize/protostuff/ProtostuffSerializationTest.java | 5 -----
3 files changed, 10 insertions(+), 19 deletions(-)
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 6284d6a..e830774 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 class ProtostuffObjectInput implements ObjectInput {
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/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 3e54282..f52c755 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 class ProtostuffObjectOutput implements ObjectOutput
{
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/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 fb99d0e..02c278e 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
- }
}
