types: consistently name generated protos
Rename each generated protobuf package such that the base of the
Go package path is always equal to the Go package name to follow
proper Go package naming conventions.
The Go package name is derived from the .proto source file name by
replacing ".proto" with "pb" and stripping all underscores.
Change-Id: Iea05d1b5d94b1b2821ae10276ab771bb2df93c0e
Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/177380
Reviewed-by: Damien Neil <dneil@google.com>
diff --git a/encoding/prototext/decode_test.go b/encoding/prototext/decode_test.go
index 20fcc94..39d470a 100644
--- a/encoding/prototext/decode_test.go
+++ b/encoding/prototext/decode_test.go
@@ -18,7 +18,7 @@
"google.golang.org/protobuf/encoding/testprotos/pb2"
"google.golang.org/protobuf/encoding/testprotos/pb3"
- knownpb "google.golang.org/protobuf/types/known"
+ "google.golang.org/protobuf/types/known/anypb"
)
func TestUnmarshal(t *testing.T) {
@@ -1365,27 +1365,27 @@
}(),
}, {
desc: "Any not expanded",
- inputMessage: &knownpb.Any{},
+ inputMessage: &anypb.Any{},
inputText: `
type_url: "pb2.Nested"
value: "some bytes"
`,
- wantMessage: &knownpb.Any{
+ wantMessage: &anypb.Any{
TypeUrl: "pb2.Nested",
Value: []byte("some bytes"),
},
}, {
desc: "Any not expanded missing value",
- inputMessage: &knownpb.Any{},
+ inputMessage: &anypb.Any{},
inputText: `type_url: "pb2.Nested"`,
- wantMessage: &knownpb.Any{
+ wantMessage: &anypb.Any{
TypeUrl: "pb2.Nested",
},
}, {
desc: "Any not expanded missing type_url",
- inputMessage: &knownpb.Any{},
+ inputMessage: &anypb.Any{},
inputText: `value: "some bytes"`,
- wantMessage: &knownpb.Any{
+ wantMessage: &anypb.Any{
Value: []byte("some bytes"),
},
}, {
@@ -1393,7 +1393,7 @@
umo: prototext.UnmarshalOptions{
Resolver: preg.NewTypes(pimpl.Export{}.MessageTypeOf(&pb2.Nested{})),
},
- inputMessage: &knownpb.Any{},
+ inputMessage: &anypb.Any{},
inputText: `
[foobar/pb2.Nested]: {
opt_string: "embedded inside Any"
@@ -1413,7 +1413,7 @@
if err != nil {
t.Fatalf("error in binary marshaling message for Any.value: %v", err)
}
- return &knownpb.Any{
+ return &anypb.Any{
TypeUrl: "foobar/pb2.Nested",
Value: b,
}
@@ -1423,9 +1423,9 @@
umo: prototext.UnmarshalOptions{
Resolver: preg.NewTypes(pimpl.Export{}.MessageTypeOf(&pb2.Nested{})),
},
- inputMessage: &knownpb.Any{},
+ inputMessage: &anypb.Any{},
inputText: `[foo.com/pb2.Nested]: {}`,
- wantMessage: &knownpb.Any{
+ wantMessage: &anypb.Any{
TypeUrl: "foo.com/pb2.Nested",
},
}, {
@@ -1433,7 +1433,7 @@
umo: prototext.UnmarshalOptions{
Resolver: preg.NewTypes(pimpl.Export{}.MessageTypeOf(&pb2.PartialRequired{})),
},
- inputMessage: &knownpb.Any{},
+ inputMessage: &anypb.Any{},
inputText: `
[pb2.PartialRequired]: {
opt_string: "embedded inside Any"
@@ -1450,7 +1450,7 @@
if err != nil {
t.Fatalf("error in binary marshaling message for Any.value: %v", err)
}
- return &knownpb.Any{
+ return &anypb.Any{
TypeUrl: "pb2.PartialRequired",
Value: b,
}
@@ -1461,7 +1461,7 @@
umo: prototext.UnmarshalOptions{
Resolver: preg.NewTypes(pimpl.Export{}.MessageTypeOf(&pb3.Nested{})),
},
- inputMessage: &knownpb.Any{},
+ inputMessage: &anypb.Any{},
inputText: `
[pb3.Nested]: {
s_string: "abc\xff"
@@ -1476,7 +1476,7 @@
if !nerr.Merge(err) {
t.Fatalf("error in binary marshaling message for Any.value: %v", err)
}
- return &knownpb.Any{
+ return &anypb.Any{
TypeUrl: string(m.ProtoReflect().Descriptor().FullName()),
Value: b,
}
@@ -1485,7 +1485,7 @@
}, {
desc: "Any expanded with unregistered type",
umo: prototext.UnmarshalOptions{Resolver: preg.NewTypes()},
- inputMessage: &knownpb.Any{},
+ inputMessage: &anypb.Any{},
inputText: `[SomeMessage]: {}`,
wantErr: true,
}, {
@@ -1493,7 +1493,7 @@
umo: prototext.UnmarshalOptions{
Resolver: preg.NewTypes(pimpl.Export{}.MessageTypeOf(&pb2.Nested{})),
},
- inputMessage: &knownpb.Any{},
+ inputMessage: &anypb.Any{},
inputText: `[pb2.Nested]: 123`,
wantErr: true,
}, {
@@ -1501,7 +1501,7 @@
umo: prototext.UnmarshalOptions{
Resolver: preg.NewTypes(pimpl.Export{}.MessageTypeOf(&pb2.Nested{})),
},
- inputMessage: &knownpb.Any{},
+ inputMessage: &anypb.Any{},
inputText: `
[pb2.Nested]: {}
unknown: ""
@@ -1512,7 +1512,7 @@
umo: prototext.UnmarshalOptions{
Resolver: preg.NewTypes(pimpl.Export{}.MessageTypeOf(&pb2.Nested{})),
},
- inputMessage: &knownpb.Any{},
+ inputMessage: &anypb.Any{},
inputText: `
[pb2.Nested]: {}
type_url: "pb2.Nested"
diff --git a/encoding/prototext/encode_test.go b/encoding/prototext/encode_test.go
index b2fc57b..98732bc 100644
--- a/encoding/prototext/encode_test.go
+++ b/encoding/prototext/encode_test.go
@@ -25,7 +25,7 @@
"google.golang.org/protobuf/encoding/testprotos/pb2"
"google.golang.org/protobuf/encoding/testprotos/pb3"
- knownpb "google.golang.org/protobuf/types/known"
+ "google.golang.org/protobuf/types/known/anypb"
)
func init() {
@@ -1181,7 +1181,7 @@
if err != nil {
t.Fatalf("error in binary marshaling message for Any.value: %v", err)
}
- return &knownpb.Any{
+ return &anypb.Any{
TypeUrl: "pb2.Nested",
Value: b,
}
@@ -1205,7 +1205,7 @@
if err != nil {
t.Fatalf("error in binary marshaling message for Any.value: %v", err)
}
- return &knownpb.Any{
+ return &anypb.Any{
TypeUrl: "foo/pb2.Nested",
Value: b,
}
@@ -1233,7 +1233,7 @@
if err != nil {
t.Fatalf("error in binary marshaling message for Any.value: %v", err)
}
- return &knownpb.Any{
+ return &anypb.Any{
TypeUrl: string(m.ProtoReflect().Descriptor().FullName()),
Value: b,
}
@@ -1256,7 +1256,7 @@
if err != nil {
t.Fatalf("error in binary marshaling message for Any.value: %v", err)
}
- return &knownpb.Any{
+ return &anypb.Any{
TypeUrl: string(m.ProtoReflect().Descriptor().FullName()),
Value: bytes.Replace(b, []byte("abcd"), []byte("abc\xff"), -1),
}
@@ -1271,7 +1271,7 @@
mo: prototext.MarshalOptions{
Resolver: preg.NewTypes(pimpl.Export{}.MessageTypeOf(&pb2.Nested{})),
},
- input: &knownpb.Any{
+ input: &anypb.Any{
TypeUrl: "foo/pb2.Nested",
Value: dhex("80"),
},
diff --git a/encoding/prototext/other_test.go b/encoding/prototext/other_test.go
index 8262099..978a358 100644
--- a/encoding/prototext/other_test.go
+++ b/encoding/prototext/other_test.go
@@ -12,7 +12,12 @@
preg "google.golang.org/protobuf/reflect/protoregistry"
"google.golang.org/protobuf/encoding/testprotos/pb2"
- knownpb "google.golang.org/protobuf/types/known"
+ "google.golang.org/protobuf/types/known/anypb"
+ "google.golang.org/protobuf/types/known/durationpb"
+ "google.golang.org/protobuf/types/known/emptypb"
+ "google.golang.org/protobuf/types/known/structpb"
+ "google.golang.org/protobuf/types/known/timestamppb"
+ "google.golang.org/protobuf/types/known/wrapperspb"
)
func TestRoundTrip(t *testing.T) {
@@ -23,62 +28,62 @@
}{{
desc: "well-known type fields set to empty messages",
message: &pb2.KnownTypes{
- OptBool: &knownpb.BoolValue{},
- OptInt32: &knownpb.Int32Value{},
- OptInt64: &knownpb.Int64Value{},
- OptUint32: &knownpb.UInt32Value{},
- OptUint64: &knownpb.UInt64Value{},
- OptFloat: &knownpb.FloatValue{},
- OptDouble: &knownpb.DoubleValue{},
- OptString: &knownpb.StringValue{},
- OptBytes: &knownpb.BytesValue{},
- OptDuration: &knownpb.Duration{},
- OptTimestamp: &knownpb.Timestamp{},
- OptStruct: &knownpb.Struct{},
- OptList: &knownpb.ListValue{},
- OptValue: &knownpb.Value{},
- OptEmpty: &knownpb.Empty{},
- OptAny: &knownpb.Any{},
+ OptBool: &wrapperspb.BoolValue{},
+ OptInt32: &wrapperspb.Int32Value{},
+ OptInt64: &wrapperspb.Int64Value{},
+ OptUint32: &wrapperspb.UInt32Value{},
+ OptUint64: &wrapperspb.UInt64Value{},
+ OptFloat: &wrapperspb.FloatValue{},
+ OptDouble: &wrapperspb.DoubleValue{},
+ OptString: &wrapperspb.StringValue{},
+ OptBytes: &wrapperspb.BytesValue{},
+ OptDuration: &durationpb.Duration{},
+ OptTimestamp: ×tamppb.Timestamp{},
+ OptStruct: &structpb.Struct{},
+ OptList: &structpb.ListValue{},
+ OptValue: &structpb.Value{},
+ OptEmpty: &emptypb.Empty{},
+ OptAny: &anypb.Any{},
},
}, {
desc: "well-known type scalar fields",
message: &pb2.KnownTypes{
- OptBool: &knownpb.BoolValue{
+ OptBool: &wrapperspb.BoolValue{
Value: true,
},
- OptInt32: &knownpb.Int32Value{
+ OptInt32: &wrapperspb.Int32Value{
Value: -42,
},
- OptInt64: &knownpb.Int64Value{
+ OptInt64: &wrapperspb.Int64Value{
Value: -42,
},
- OptUint32: &knownpb.UInt32Value{
+ OptUint32: &wrapperspb.UInt32Value{
Value: 0xff,
},
- OptUint64: &knownpb.UInt64Value{
+ OptUint64: &wrapperspb.UInt64Value{
Value: 0xffff,
},
- OptFloat: &knownpb.FloatValue{
+ OptFloat: &wrapperspb.FloatValue{
Value: 1.234,
},
- OptDouble: &knownpb.DoubleValue{
+ OptDouble: &wrapperspb.DoubleValue{
Value: 1.23e308,
},
- OptString: &knownpb.StringValue{
+ OptString: &wrapperspb.StringValue{
Value: "谷歌",
},
- OptBytes: &knownpb.BytesValue{
+ OptBytes: &wrapperspb.BytesValue{
Value: []byte("\xe8\xb0\xb7\xe6\xad\x8c"),
},
},
}, {
desc: "well-known type time-related fields",
message: &pb2.KnownTypes{
- OptDuration: &knownpb.Duration{
+ OptDuration: &durationpb.Duration{
Seconds: -3600,
Nanos: -123,
},
- OptTimestamp: &knownpb.Timestamp{
+ OptTimestamp: ×tamppb.Timestamp{
Seconds: 1257894000,
Nanos: 123,
},
@@ -86,34 +91,34 @@
}, {
desc: "Struct field and different Value types",
message: &pb2.KnownTypes{
- OptStruct: &knownpb.Struct{
- Fields: map[string]*knownpb.Value{
- "bool": &knownpb.Value{
- Kind: &knownpb.Value_BoolValue{
+ OptStruct: &structpb.Struct{
+ Fields: map[string]*structpb.Value{
+ "bool": &structpb.Value{
+ Kind: &structpb.Value_BoolValue{
BoolValue: true,
},
},
- "double": &knownpb.Value{
- Kind: &knownpb.Value_NumberValue{
+ "double": &structpb.Value{
+ Kind: &structpb.Value_NumberValue{
NumberValue: 3.1415,
},
},
- "null": &knownpb.Value{
- Kind: &knownpb.Value_NullValue{
- NullValue: knownpb.NullValue_NULL_VALUE,
+ "null": &structpb.Value{
+ Kind: &structpb.Value_NullValue{
+ NullValue: structpb.NullValue_NULL_VALUE,
},
},
- "string": &knownpb.Value{
- Kind: &knownpb.Value_StringValue{
+ "string": &structpb.Value{
+ Kind: &structpb.Value_StringValue{
StringValue: "string",
},
},
- "struct": &knownpb.Value{
- Kind: &knownpb.Value_StructValue{
- StructValue: &knownpb.Struct{
- Fields: map[string]*knownpb.Value{
- "bool": &knownpb.Value{
- Kind: &knownpb.Value_BoolValue{
+ "struct": &structpb.Value{
+ Kind: &structpb.Value_StructValue{
+ StructValue: &structpb.Struct{
+ Fields: map[string]*structpb.Value{
+ "bool": &structpb.Value{
+ Kind: &structpb.Value_BoolValue{
BoolValue: false,
},
},
@@ -121,17 +126,17 @@
},
},
},
- "list": &knownpb.Value{
- Kind: &knownpb.Value_ListValue{
- ListValue: &knownpb.ListValue{
- Values: []*knownpb.Value{
+ "list": &structpb.Value{
+ Kind: &structpb.Value_ListValue{
+ ListValue: &structpb.ListValue{
+ Values: []*structpb.Value{
{
- Kind: &knownpb.Value_BoolValue{
+ Kind: &structpb.Value_BoolValue{
BoolValue: false,
},
},
{
- Kind: &knownpb.Value_StringValue{
+ Kind: &structpb.Value_StringValue{
StringValue: "hello",
},
},
@@ -157,7 +162,7 @@
t.Fatalf("error in binary marshaling message for Any.value: %v", err)
}
return &pb2.KnownTypes{
- OptAny: &knownpb.Any{
+ OptAny: &anypb.Any{
TypeUrl: string(m.ProtoReflect().Descriptor().FullName()),
Value: b,
},
@@ -178,7 +183,7 @@
t.Fatalf("error in binary marshaling message for Any.value: %v", err)
}
return &pb2.KnownTypes{
- OptAny: &knownpb.Any{
+ OptAny: &anypb.Any{
TypeUrl: string(m.ProtoReflect().Descriptor().FullName()),
Value: b,
},
@@ -188,7 +193,7 @@
desc: "Any field containing Any message",
resolver: func() *preg.Types {
mt1 := impl.Export{}.MessageTypeOf(&pb2.Nested{})
- mt2 := impl.Export{}.MessageTypeOf(&knownpb.Any{})
+ mt2 := impl.Export{}.MessageTypeOf(&anypb.Any{})
return preg.NewTypes(mt1, mt2)
}(),
message: func() *pb2.KnownTypes {
@@ -199,7 +204,7 @@
if err != nil {
t.Fatalf("error in binary marshaling message for Any.value: %v", err)
}
- m2 := &knownpb.Any{
+ m2 := &anypb.Any{
TypeUrl: "pb2.Nested",
Value: b1,
}
@@ -208,7 +213,7 @@
t.Fatalf("error in binary marshaling message for Any.value: %v", err)
}
return &pb2.KnownTypes{
- OptAny: &knownpb.Any{
+ OptAny: &anypb.Any{
TypeUrl: "google.protobuf.Any",
Value: b2,
},