change empty type to PbEmpty type

andeya · Feb 11, 2018 · 5ddca02 · 5ddca02
1 parent d3d9852
commit 5ddca02
Show file tree

Hide file tree

Showing 3 changed files with 46 additions and 44 deletions.
diff --git a/codec/empty.pb.go b/codec/empty.pb.go
diff --git a/codec/empty.proto b/codec/empty.proto
@@ -1,3 +1,3 @@
 syntax = "proto3";
 package codec;
-message empty {}
+message PbEmpty {}
diff --git a/codec/protobuf_codec.go b/codec/protobuf_codec.go
@@ -54,15 +54,19 @@ func (ProtoCodec) Unmarshal(data []byte, v interface{}) error {
 	return ProtoUnmarshal(data, v)
 }
 
-var emptyStruct = struct{}{}
+var (
+	// EmptyStruct empty struct for protobuf
+	EmptyStruct = new(PbEmpty)
+	emptyStruct = struct{}{}
+)
 
 // ProtoMarshal returns the Protobuf encoding of v.
 func ProtoMarshal(v interface{}) ([]byte, error) {
 	if p, ok := v.(proto.Message); ok {
 		return proto.Marshal(p)
 	}
 	if v == nil || v == emptyStruct {
-		return proto.Marshal(Empty)
+		return proto.Marshal(EmptyStruct)
 	}
 	return nil, fmt.Errorf("%T does not implement proto.Message", v)
 }