fix the bug when use protobuf-json (#4634)

Fix #4632
apache · Jul 23, 2019 · 5f938bf · 5f938bf
1 parent a5e3f54
commit 5f938bf
Show file tree

Hide file tree

Showing 4 changed files with 978 additions and 27 deletions.
diff --git a/...n/java/org/apache/dubbo/common/serialize/protobuf/support/GenericProtobufObjectInput.java b/...n/java/org/apache/dubbo/common/serialize/protobuf/support/GenericProtobufObjectInput.java
@@ -16,6 +16,13 @@
  */
 package org.apache.dubbo.common.serialize.protobuf.support;
 
+import com.google.common.base.Charsets;
+import com.google.protobuf.BoolValue;
+import com.google.protobuf.DoubleValue;
+import com.google.protobuf.FloatValue;
+import com.google.protobuf.Int32Value;
+import com.google.protobuf.Int64Value;
+import com.google.protobuf.StringValue;
 import org.apache.dubbo.common.serialize.ObjectInput;
 
 import java.io.BufferedReader;
@@ -24,6 +31,7 @@
 import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.lang.reflect.Type;
+import java.util.Map;
 
 /**
  * GenericGoogleProtobuf object input implementation
@@ -37,52 +45,52 @@ public GenericProtobufObjectInput(InputStream in) {
 
     @Override
     public boolean readBool() throws IOException {
-        return read(boolean.class);
+        return read(BoolValue.class).getValue();
     }
 
     @Override
     public byte readByte() throws IOException {
-        return read(byte.class);
+        return (byte) read(Int32Value.class).getValue();
     }
 
     @Override
     public short readShort() throws IOException {
-        return read(short.class);
+        return (short) read(Int32Value.class).getValue();
     }
 
     @Override
     public int readInt() throws IOException {
-        return read(int.class);
+        return read(Int32Value.class).getValue();
     }
 
     @Override
     public long readLong() throws IOException {
-        return read(long.class);
+        return read(Int64Value.class).getValue();
     }
 
     @Override
     public float readFloat() throws IOException {
-        return read(float.class);
+        return read(FloatValue.class).getValue();
     }
 
     @Override
     public double readDouble() throws IOException {
-        return read(double.class);
+        return read(DoubleValue.class).getValue();
     }
 
     @Override
     public String readUTF() throws IOException {
-        return read(String.class);
+        return read(StringValue.class).getValue();
     }
 
     @Override
     public byte[] readBytes() throws IOException {
-        return readLine().getBytes();
+        return readUTF().getBytes(Charsets.ISO_8859_1);
     }
 
     @Override
-    public Object readObject() throws IOException {
-        return read(String.class);
+    public Object readObject() {
+        throw new UnsupportedOperationException();
     }
 
     @Override
@@ -105,7 +113,11 @@ private String readLine() throws IOException {
     }
 
     private <T> T read(Class<T> cls) throws IOException {
-        if (!ProtobufUtils.isSupported(cls)) {
+        if (cls.equals(Map.class)) {
+            // only for attachments
+            String json = readLine();
+            return (T) ProtobufUtils.deserialize(json, MapValue.Map.class).getAttachmentsMap();
+        } else if (!ProtobufUtils.isSupported(cls)) {
             throw new IllegalArgumentException("This serialization only support google protobuf entity, the class is :" + cls.getName());
         }
 

diff --git a/.../java/org/apache/dubbo/common/serialize/protobuf/support/GenericProtobufObjectOutput.java b/.../java/org/apache/dubbo/common/serialize/protobuf/support/GenericProtobufObjectOutput.java
@@ -16,12 +16,20 @@
  */
 package org.apache.dubbo.common.serialize.protobuf.support;
 
+import com.google.common.base.Charsets;
+import com.google.protobuf.BoolValue;
+import com.google.protobuf.DoubleValue;
+import com.google.protobuf.FloatValue;
+import com.google.protobuf.Int32Value;
+import com.google.protobuf.Int64Value;
+import com.google.protobuf.StringValue;
 import org.apache.dubbo.common.serialize.ObjectOutput;
 
 import java.io.IOException;
 import java.io.OutputStream;
 import java.io.OutputStreamWriter;
 import java.io.PrintWriter;
+import java.util.Map;
 
 /**
  * GenericGoogleProtobuf object output implementation
@@ -36,61 +44,65 @@ public GenericProtobufObjectOutput(OutputStream out) {
 
     @Override
     public void writeBool(boolean v) throws IOException {
-        writeObject(v);
+
+        writeObject(BoolValue.newBuilder().setValue(v).build());
     }
 
     @Override
     public void writeByte(byte v) throws IOException {
-        writeObject(v);
+        writeObject(Int32Value.newBuilder().setValue((v)).build());
     }
 
     @Override
     public void writeShort(short v) throws IOException {
-        writeObject(v);
+        writeObject(Int32Value.newBuilder().setValue(v).build());
     }
 
     @Override
     public void writeInt(int v) throws IOException {
-        writeObject(v);
+        writeObject(Int32Value.newBuilder().setValue(v).build());
     }
 
     @Override
     public void writeLong(long v) throws IOException {
-        writeObject(v);
+        writeObject(Int64Value.newBuilder().setValue(v).build());
     }
 
     @Override
     public void writeFloat(float v) throws IOException {
-        writeObject(v);
+        writeObject(FloatValue.newBuilder().setValue(v).build());
     }
 
     @Override
     public void writeDouble(double v) throws IOException {
-        writeObject(v);
+        writeObject(DoubleValue.newBuilder().setValue(v).build());
     }
 
     @Override
     public void writeUTF(String v) throws IOException {
-        writeObject(v);
+        writeObject(StringValue.newBuilder().setValue(v).build());
     }
 
     @Override
-    public void writeBytes(byte[] b) {
-        writer.println(new String(b));
+    public void writeBytes(byte[] b) throws IOException {
+        writeUTF(new String(b, Charsets.ISO_8859_1));
     }
 
     @Override
-    public void writeBytes(byte[] b, int off, int len) {
-        writer.println(new String(b, off, len));
+    public void writeBytes(byte[] b, int off, int len) throws IOException {
+        writeUTF(new String(b, off, len, Charsets.ISO_8859_1));
     }
 
+
     @Override
     public void writeObject(Object obj) throws IOException {
         if (obj == null) {
             throw new IllegalArgumentException("This serialization only support google protobuf object, the object is : null");
         }
-
-        if (!ProtobufUtils.isSupported(obj.getClass())) {
+        if (obj instanceof Map) {
+            // only for attachment
+            obj = MapValue.Map.newBuilder().putAllAttachments((Map) obj).build();
+        } else if (!ProtobufUtils.isSupported(obj.getClass())) {
             throw new IllegalArgumentException("This serialization only support google protobuf object, the object class is: " + obj.getClass().getName());
         }