Generate json and custom tags for oneof (#611) (#612)

- add test case in tags.proto file
gogo · Sep 8, 2019 · 3f2ed6d · 3f2ed6d
1 parent 23325ce
commit 3f2ed6d
Show file tree

Hide file tree

Showing 28 changed files with 437 additions and 436 deletions.
diff --git a/conformance/internal/conformance_proto/conformance.pb.go b/conformance/internal/conformance_proto/conformance.pb.go
diff --git a/jsonpb/jsonpb_test_proto/test_objects.pb.go b/jsonpb/jsonpb_test_proto/test_objects.pb.go
diff --git a/proto/proto3_proto/proto3.pb.go b/proto/proto3_proto/proto3.pb.go
diff --git a/proto/test_proto/test.pb.go b/proto/test_proto/test.pb.go
diff --git a/protoc-gen-gogo/generator/generator.go b/protoc-gen-gogo/generator/generator.go
@@ -2581,10 +2581,8 @@ func (g *Generator) generateOneofDecls(mc *msgCtx, topLevelFields []topLevelFiel
 	g.P()
 	for _, of := range ofields {
 		for i, sf := range of.subFields {
-			_, wiretype := g.GoType(mc.message, sf.protoField)
-			tag := "protobuf:" + g.goTag(mc.message, sf.protoField, wiretype)
 			fieldFullPath := fmt.Sprintf("%s,%d,%d", mc.message.path, messageFieldPath, i)
-			g.P("type ", Annotate(mc.message.file, fieldFullPath, sf.oneofTypeName), " struct{ ", Annotate(mc.message.file, fieldFullPath, sf.goName), " ", sf.goType, " `", tag, "` }")
+			g.P("type ", Annotate(mc.message.file, fieldFullPath, sf.oneofTypeName), " struct{ ", Annotate(mc.message.file, fieldFullPath, sf.goName), " ", sf.goType, " `", sf.tags, "` }")
 			if !gogoproto.IsStdType(sf.protoField) && !gogoproto.IsCustomType(sf.protoField) && !gogoproto.IsCastType(sf.protoField) {
 				g.RecordTypeUse(sf.protoField.GetTypeName())
 			}
@@ -2932,7 +2930,6 @@ func (g *Generator) generateMessage(message *Descriptor) {
 			}
 
 			oneofField := oFields[*field.OneofIndex]
-			tag = "protobuf:" + g.goTag(message, field, wiretype)
 			sf := oneofSubField{
 				fieldCommon: fieldCommon{
 					goName:     fieldName,

diff --git a/protoc-gen-gogo/testdata/deprecated/deprecated.pb.go b/protoc-gen-gogo/testdata/deprecated/deprecated.pb.go
diff --git a/protoc-gen-gogo/testdata/import_public/sub/a.pb.go b/protoc-gen-gogo/testdata/import_public/sub/a.pb.go
diff --git a/protoc-gen-gogo/testdata/my_test/test.pb.go b/protoc-gen-gogo/testdata/my_test/test.pb.go
diff --git a/test/issue322/issue322.pb.go b/test/issue322/issue322.pb.go
diff --git a/test/issue617/issue617.pb.go b/test/issue617/issue617.pb.go