internal/impl: fix legacy logic to know about the new XXX_OneofWrappers method
The XXX_OneofWrappers method is a simplified way to obtain the wrapper structs
compared the previous XXX_OneofFuncs method which returned far more information
that was strictly necessary.
Change-Id: I2670506a2a8f7e8e724846b8c4083e7995371007
Reviewed-on: https://go-review.googlesource.com/c/151679
Reviewed-by: Herbie Ong <herbie@google.com>
diff --git a/internal/testprotos/legacy/legacy.pb.go b/internal/testprotos/legacy/legacy.pb.go
index b629f42..0ac4cd7 100644
--- a/internal/testprotos/legacy/legacy.pb.go
+++ b/internal/testprotos/legacy/legacy.pb.go
@@ -11,11 +11,13 @@
proto2_v1_0 "github.com/golang/protobuf/v2/internal/testprotos/legacy/proto2.v1.0.0-20180125-92554152"
proto2_v1_1 "github.com/golang/protobuf/v2/internal/testprotos/legacy/proto2.v1.1.0-20180430-b4deda09"
proto2_v1_2 "github.com/golang/protobuf/v2/internal/testprotos/legacy/proto2.v1.2.0-20180814-aa810b61"
+ proto2_v1_21 "github.com/golang/protobuf/v2/internal/testprotos/legacy/proto2.v1.2.1-20181126-8d0c54c1"
proto3_v0_0 "github.com/golang/protobuf/v2/internal/testprotos/legacy/proto3.v0.0.0-20160225-2fc053c5"
proto3_v0_01 "github.com/golang/protobuf/v2/internal/testprotos/legacy/proto3.v0.0.0-20160519-a4ab9ec5"
proto3_v1_0 "github.com/golang/protobuf/v2/internal/testprotos/legacy/proto3.v1.0.0-20180125-92554152"
proto3_v1_1 "github.com/golang/protobuf/v2/internal/testprotos/legacy/proto3.v1.1.0-20180430-b4deda09"
proto3_v1_2 "github.com/golang/protobuf/v2/internal/testprotos/legacy/proto3.v1.2.0-20180814-aa810b61"
+ proto3_v1_21 "github.com/golang/protobuf/v2/internal/testprotos/legacy/proto3.v1.2.1-20181126-8d0c54c1"
math "math"
)
@@ -28,7 +30,7 @@
// is compatible with the proto package it is being compiled against.
// A compilation error at this line likely means your copy of the
// proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
type Legacy struct {
F1 *proto2_v0_0.Message `protobuf:"bytes,1,opt,name=f1,proto3" json:"f1,omitempty"`
@@ -41,6 +43,8 @@
F8 *proto3_v1_1.Message `protobuf:"bytes,8,opt,name=f8,proto3" json:"f8,omitempty"`
F9 *proto2_v1_2.Message `protobuf:"bytes,9,opt,name=f9,proto3" json:"f9,omitempty"`
F10 *proto3_v1_2.Message `protobuf:"bytes,10,opt,name=f10,proto3" json:"f10,omitempty"`
+ F11 *proto2_v1_21.Message `protobuf:"bytes,11,opt,name=f11,proto3" json:"f11,omitempty"`
+ F12 *proto3_v1_21.Message `protobuf:"bytes,12,opt,name=f12,proto3" json:"f12,omitempty"`
XXX_NoUnkeyedLiteral struct{} `json:"-"`
XXX_unrecognized []byte `json:"-"`
XXX_sizecache int32 `json:"-"`
@@ -141,6 +145,20 @@
return nil
}
+func (m *Legacy) GetF11() *proto2_v1_21.Message {
+ if m != nil {
+ return m.F11
+ }
+ return nil
+}
+
+func (m *Legacy) GetF12() *proto3_v1_21.Message {
+ if m != nil {
+ return m.F12
+ }
+ return nil
+}
+
func init() {
proto.RegisterType((*Legacy)(nil), "google.golang.org.Legacy")
}
@@ -150,28 +168,30 @@
}
var fileDescriptor_5fbf266527ec81d8 = []byte{
- // 364 bytes of a gzipped FileDescriptorProto
- 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0xd2, 0x3d, 0x4f, 0xf3, 0x30,
- 0x14, 0x05, 0x60, 0xf5, 0xe3, 0xed, 0x0b, 0x61, 0xa2, 0x93, 0xc5, 0x84, 0x58, 0x40, 0x48, 0x71,
- 0xec, 0x1b, 0x3b, 0x4d, 0x2a, 0x26, 0x24, 0x36, 0x58, 0x18, 0x59, 0x90, 0x93, 0x3a, 0xa6, 0x52,
- 0xa8, 0x51, 0x93, 0x56, 0xe2, 0xef, 0xf2, 0x4b, 0x10, 0x37, 0x44, 0x4a, 0xf9, 0x68, 0x5d, 0xda,
- 0x29, 0x8a, 0xa5, 0xe7, 0x9c, 0x33, 0x5c, 0xef, 0x7c, 0x3a, 0xab, 0xf4, 0x7c, 0xa6, 0x8a, 0xa0,
- 0xd2, 0x65, 0xf5, 0x32, 0xb7, 0x95, 0x2d, 0x83, 0x42, 0x1b, 0x95, 0xbd, 0x7e, 0x7e, 0x28, 0x3e,
- 0x0e, 0x8f, 0x8d, 0xb5, 0xa6, 0xd0, 0xd4, 0xd8, 0x42, 0xcd, 0x0c, 0xb5, 0x73, 0x73, 0x72, 0xb3,
- 0xc6, 0xe2, 0x1f, 0xd0, 0x25, 0xa3, 0x8c, 0x32, 0x1f, 0x18, 0x8f, 0x18, 0x80, 0xf4, 0x21, 0xcf,
- 0x98, 0x0c, 0x33, 0x89, 0xa2, 0x4e, 0xde, 0x1c, 0x13, 0xee, 0x27, 0x66, 0x75, 0x8d, 0xe4, 0x89,
- 0xaf, 0x84, 0x4a, 0x13, 0xbd, 0xd3, 0x9a, 0x3f, 0xc7, 0x00, 0x5d, 0xf2, 0x26, 0x26, 0x66, 0x1c,
- 0xa4, 0x9f, 0x80, 0x94, 0x82, 0x4b, 0xd8, 0x76, 0xcd, 0x3e, 0x62, 0x70, 0x0d, 0x6f, 0x62, 0x44,
- 0xc8, 0xfc, 0x54, 0x4c, 0xf4, 0x44, 0xb1, 0x64, 0xfb, 0x35, 0xbb, 0xc7, 0xe0, 0x1a, 0x68, 0x62,
- 0x62, 0x2e, 0x7c, 0xa5, 0x62, 0xce, 0xd2, 0x88, 0x6f, 0xbf, 0x66, 0x53, 0xcc, 0xd9, 0x5b, 0xdf,
- 0x1b, 0xdc, 0xa2, 0x1a, 0x8e, 0xbd, 0x6e, 0xce, 0x49, 0xe7, 0xb4, 0x73, 0x71, 0x04, 0x97, 0xf4,
- 0xdb, 0xc1, 0xd7, 0x00, 0x1e, 0x9b, 0x33, 0xa4, 0x77, 0xba, 0x2c, 0x95, 0xd1, 0xf7, 0xdd, 0x9c,
- 0xa3, 0x05, 0xd2, 0x5d, 0x6f, 0xc3, 0x9f, 0x2c, 0xa0, 0x0d, 0x49, 0xcf, 0xa9, 0x57, 0xf2, 0xa4,
- 0x65, 0x43, 0xb4, 0x82, 0xf4, 0x9d, 0x7a, 0x57, 0xad, 0x40, 0x2b, 0xc9, 0x3f, 0x87, 0x5e, 0x3c,
- 0xad, 0x96, 0x95, 0x68, 0x23, 0x32, 0x70, 0xe8, 0xfd, 0x6a, 0x23, 0xb4, 0x23, 0xf2, 0xdf, 0xa9,
- 0x57, 0x84, 0xac, 0x65, 0x47, 0x68, 0x63, 0x72, 0xe0, 0xd4, 0xbb, 0x6a, 0x63, 0xb4, 0x09, 0x39,
- 0x74, 0xea, 0x8d, 0xb9, 0x68, 0xd9, 0x64, 0x78, 0xe5, 0xf5, 0x72, 0xce, 0x88, 0xe7, 0x54, 0xdc,
- 0xc6, 0x1f, 0xec, 0x7a, 0xfc, 0x10, 0x9b, 0x69, 0xf5, 0xb4, 0x48, 0x69, 0x66, 0x9f, 0x83, 0x5a,
- 0xd5, 0x47, 0x9a, 0x2e, 0xf2, 0x60, 0x09, 0xc1, 0xef, 0xb7, 0x9c, 0x0e, 0xea, 0xe4, 0xf7, 0x00,
- 0x00, 0x00, 0xff, 0xff, 0xb8, 0x31, 0xcb, 0xb1, 0xab, 0x05, 0x00, 0x00,
+ // 400 bytes of a gzipped FileDescriptorProto
+ 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0xd3, 0xcf, 0xce, 0xd2, 0x40,
+ 0x14, 0x05, 0xf0, 0x00, 0x82, 0x5a, 0xdc, 0xc8, 0x6a, 0xe2, 0xca, 0xb8, 0xd1, 0x98, 0x74, 0x3a,
+ 0xf7, 0x76, 0xa6, 0x4c, 0x89, 0x2b, 0x13, 0x77, 0xba, 0x71, 0xe9, 0xc6, 0x4c, 0xcb, 0x74, 0x24,
+ 0xa9, 0xd4, 0xd0, 0x42, 0xe2, 0xcb, 0xfa, 0x2c, 0x86, 0x5b, 0x9a, 0x14, 0xf4, 0xe3, 0x1b, 0xfe,
+ 0xac, 0x08, 0x4d, 0x7e, 0xe7, 0x9c, 0xc5, 0xdc, 0xe0, 0xed, 0x6a, 0xdd, 0xd8, 0xcd, 0xda, 0x94,
+ 0x51, 0x63, 0xeb, 0xe6, 0xd7, 0xa6, 0x6a, 0xaa, 0x3a, 0x2a, 0xad, 0x33, 0xf9, 0xef, 0xc3, 0x0f,
+ 0xa7, 0x8f, 0xb3, 0x97, 0xae, 0xaa, 0x5c, 0x69, 0xb9, 0xab, 0x4a, 0xb3, 0x76, 0xbc, 0xda, 0xb8,
+ 0x57, 0x9f, 0xce, 0x58, 0xfa, 0x87, 0x7c, 0x27, 0xb8, 0xe0, 0x22, 0x44, 0x01, 0x89, 0x40, 0x54,
+ 0x21, 0x16, 0xb9, 0x50, 0x71, 0xae, 0x48, 0xb4, 0xc9, 0x8f, 0xc7, 0xc4, 0xf7, 0x89, 0x39, 0x5e,
+ 0xa3, 0x20, 0x0d, 0x8d, 0x34, 0x59, 0x6a, 0x6f, 0x5a, 0x73, 0x75, 0x0c, 0xf2, 0x1d, 0x74, 0x31,
+ 0x5a, 0x00, 0xaa, 0x30, 0x45, 0xa5, 0x24, 0x28, 0xbc, 0x74, 0xcd, 0x3d, 0x62, 0x68, 0x0d, 0x74,
+ 0x31, 0x32, 0x16, 0x61, 0x26, 0x97, 0x76, 0x69, 0x44, 0x7a, 0xf9, 0x9a, 0xdb, 0x63, 0x68, 0x0d,
+ 0x76, 0x31, 0x1a, 0x64, 0x68, 0x8c, 0x06, 0x91, 0x25, 0x70, 0xf9, 0x9a, 0xdb, 0x63, 0x0e, 0x6b,
+ 0x80, 0x62, 0x00, 0x30, 0x09, 0xf5, 0x52, 0xe4, 0x4a, 0xe6, 0x57, 0xad, 0x39, 0x1f, 0xf3, 0xe6,
+ 0xcf, 0x38, 0x98, 0x7c, 0x26, 0x35, 0x5b, 0x04, 0xc3, 0x02, 0xd8, 0xe0, 0xf5, 0xe0, 0xdd, 0x14,
+ 0xdf, 0xf3, 0x7f, 0xce, 0xaf, 0x05, 0xf8, 0xbd, 0x3b, 0x0a, 0xfe, 0xc5, 0xd6, 0xb5, 0x71, 0xf6,
+ 0xeb, 0xb0, 0x00, 0xb2, 0xc8, 0x86, 0xe7, 0x6d, 0xfc, 0x3f, 0x8b, 0x64, 0x63, 0x36, 0xf2, 0xea,
+ 0x55, 0x90, 0xf6, 0x6c, 0x4c, 0x56, 0xb2, 0x27, 0x5e, 0xbd, 0xc7, 0x56, 0x92, 0x55, 0x6c, 0xec,
+ 0xd1, 0x4b, 0x0f, 0xbd, 0x67, 0x15, 0xd9, 0x84, 0x4d, 0x3c, 0x7a, 0x4f, 0x6d, 0x42, 0x76, 0xce,
+ 0x9e, 0x7a, 0xf5, 0xca, 0x58, 0xf4, 0xec, 0x9c, 0xac, 0x66, 0xcf, 0xbc, 0x7a, 0x8f, 0xad, 0x26,
+ 0x9b, 0xb2, 0xe7, 0x5e, 0xbd, 0x1a, 0x64, 0xcf, 0xa6, 0xb3, 0x0f, 0xc1, 0xa8, 0x00, 0xc1, 0x02,
+ 0xaf, 0xe2, 0x3e, 0xde, 0xb3, 0x56, 0x03, 0x9b, 0xfa, 0x54, 0xef, 0x5f, 0x6a, 0x5f, 0x43, 0xab,
+ 0x91, 0xbd, 0xf0, 0xe9, 0x3e, 0xd5, 0xf8, 0x71, 0xf1, 0x4d, 0xbb, 0x55, 0xf3, 0x63, 0x9b, 0xf1,
+ 0xbc, 0xfa, 0x19, 0xb5, 0xaa, 0x3d, 0x90, 0x6c, 0x5b, 0x44, 0x3b, 0x8c, 0x1e, 0xbe, 0xa3, 0x6c,
+ 0xd2, 0x26, 0xff, 0x0d, 0x00, 0x00, 0xff, 0xff, 0x78, 0x39, 0xb9, 0x4a, 0xb5, 0x06, 0x00, 0x00,
}