Skip to content

Commit ae2eaaf

Browse files
dsnetdsnet
committed
all: update import paths for generated protos
CL/177380 changed the import path of all generated protos. Change-Id: Ie3ec86f3f793fca80329f26864c5df206b9fba91 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/177623 Reviewed-by: Damien Neil <[email protected]>
1 parent a2cd3ac commit ae2eaaf

File tree

14 files changed

+201
-185
lines changed

14 files changed

+201
-185
lines changed

‎go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@ module github.com/golang/protobuf
22

33
go 1.9
44

5-
require google.golang.org/protobuf v0.0.0-20190516201745-40b83d67fc75
5+
require google.golang.org/protobuf v0.0.0-20190516215540-a95b29fbf623

‎go.sum

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
11
github.com/golang/protobuf v1.2.1-0.20190514181236-7800af189d76/go.mod h1:Zfz6qcDoDBESdv6JsKsGpgNHnkvwJAJwcA9eL+mOkgc=
22
github.com/golang/protobuf v1.2.1-0.20190515194842-7574ba03306e/go.mod h1:GjgUz9uwrRQmdPBBrFqiVbojAmlpy6ryM6DCzC+20rE=
3+
github.com/golang/protobuf v1.2.1-0.20190516201927-a2cd3ac1b343/go.mod h1:PScGDF2x230A126tLt9Ol9RjhXzbiPJrt/CogooD2mE=
34
github.com/google/go-cmp v0.3.0 h1:crn/baboCvb5fXaQ0IJ1SGTsTVrWpDsCWC8EGETZijY=
45
github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
56
google.golang.org/protobuf v0.0.0-20190514172829-e89e6244e0e8/go.mod h1:791zQGC15vDqjpmPRn1uGPu5oHy/Jzw/Q1n5JsgIIcY=
67
google.golang.org/protobuf v0.0.0-20190514231807-cdb777356907/go.mod h1:HeRLsKXv4+wE27dOIGwnqcOgq6a1O/GJ7mGhiEPnBrU=
7-
google.golang.org/protobuf v0.0.0-20190516201745-40b83d67fc75 h1:A9hovAkRmyzyLP+RCw0M+tVW0Ku3SZlCPLiABrEQJW0=
88
google.golang.org/protobuf v0.0.0-20190516201745-40b83d67fc75/go.mod h1:jf+u8AHuKtkib+0J4/bQXPNzCmT3V9a02hVzYKtatuw=
9+
google.golang.org/protobuf v0.0.0-20190516215540-a95b29fbf623 h1:66BSNYPKX6AuAowxFl47l/DSyZ/ZekFylmbpjDMScDQ=
10+
google.golang.org/protobuf v0.0.0-20190516215540-a95b29fbf623/go.mod h1:cWWmz5lsCWIcqGLROrKq5Lu231IJw2PzqOZ8cgspbfY=

‎internal/cmd/generate-alias/main.go

Lines changed: 14 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,14 @@ import (
2222
"google.golang.org/protobuf/reflect/protodesc"
2323
"google.golang.org/protobuf/reflect/protoreflect"
2424

25-
descriptorpb "google.golang.org/protobuf/types/descriptor"
26-
knownpb "google.golang.org/protobuf/types/known"
27-
pluginpb "google.golang.org/protobuf/types/plugin"
25+
"google.golang.org/protobuf/types/descriptorpb"
26+
"google.golang.org/protobuf/types/known/anypb"
27+
"google.golang.org/protobuf/types/known/durationpb"
28+
"google.golang.org/protobuf/types/known/emptypb"
29+
"google.golang.org/protobuf/types/known/structpb"
30+
"google.golang.org/protobuf/types/known/timestamppb"
31+
"google.golang.org/protobuf/types/known/wrapperspb"
32+
"google.golang.org/protobuf/types/pluginpb"
2833
)
2934

3035
func main() {
@@ -43,22 +48,22 @@ func main() {
4348
pbDesc: pluginpb.File_google_protobuf_compiler_plugin_proto,
4449
}, {
4550
goPkg: "github.com/golang/protobuf/ptypes/any;any",
46-
pbDesc: knownpb.File_google_protobuf_any_proto,
51+
pbDesc: anypb.File_google_protobuf_any_proto,
4752
}, {
4853
goPkg: "github.com/golang/protobuf/ptypes/duration;duration",
49-
pbDesc: knownpb.File_google_protobuf_duration_proto,
54+
pbDesc: durationpb.File_google_protobuf_duration_proto,
5055
}, {
5156
goPkg: "github.com/golang/protobuf/ptypes/timestamp;timestamp",
52-
pbDesc: knownpb.File_google_protobuf_timestamp_proto,
57+
pbDesc: timestamppb.File_google_protobuf_timestamp_proto,
5358
}, {
5459
goPkg: "github.com/golang/protobuf/ptypes/wrappers;wrappers",
55-
pbDesc: knownpb.File_google_protobuf_wrappers_proto,
60+
pbDesc: wrapperspb.File_google_protobuf_wrappers_proto,
5661
}, {
5762
goPkg: "github.com/golang/protobuf/ptypes/struct;structpb",
58-
pbDesc: knownpb.File_google_protobuf_struct_proto,
63+
pbDesc: structpb.File_google_protobuf_struct_proto,
5964
}, {
6065
goPkg: "github.com/golang/protobuf/ptypes/empty;empty",
61-
pbDesc: knownpb.File_google_protobuf_empty_proto,
66+
pbDesc: emptypb.File_google_protobuf_empty_proto,
6267
}}
6368

6469
// For each package, construct a proto file that public imports the package.

‎internal/proto/registry.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ import (
2222
"google.golang.org/protobuf/runtime/protoimpl"
2323
"google.golang.org/protobuf/runtime/protolegacy"
2424

25-
descriptorpb "google.golang.org/protobuf/types/descriptor"
25+
"google.golang.org/protobuf/types/descriptorpb"
2626
)
2727

2828
// filePath is the path to the proto source file.

‎proto/hooks_disabled.go

Lines changed: 41 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,17 @@ import (
1010
"io"
1111
"reflect"
1212

13-
descriptorpb "google.golang.org/protobuf/types/descriptor"
14-
knownpb "google.golang.org/protobuf/types/known"
13+
"google.golang.org/protobuf/types/descriptorpb"
14+
"google.golang.org/protobuf/types/known/anypb"
15+
"google.golang.org/protobuf/types/known/apipb"
16+
"google.golang.org/protobuf/types/known/durationpb"
17+
"google.golang.org/protobuf/types/known/emptypb"
18+
"google.golang.org/protobuf/types/known/fieldmaskpb"
19+
"google.golang.org/protobuf/types/known/sourcecontextpb"
20+
"google.golang.org/protobuf/types/known/structpb"
21+
"google.golang.org/protobuf/types/known/timestamppb"
22+
"google.golang.org/protobuf/types/known/typepb"
23+
"google.golang.org/protobuf/types/known/wrapperspb"
1524
)
1625

1726
var (
@@ -92,52 +101,52 @@ func init() {
92101
RegisterType((*descriptorpb.GeneratedCodeInfo_Annotation)(nil), "google.protobuf.GeneratedCodeInfo.Annotation")
93102

94103
// any.proto
95-
RegisterType((*knownpb.Any)(nil), "google.protobuf.Any")
104+
RegisterType((*anypb.Any)(nil), "google.protobuf.Any")
96105

97106
// api.proto
98-
RegisterType((*knownpb.Api)(nil), "google.protobuf.Api")
99-
RegisterType((*knownpb.Method)(nil), "google.protobuf.Method")
100-
RegisterType((*knownpb.Mixin)(nil), "google.protobuf.Mixin")
107+
RegisterType((*apipb.Api)(nil), "google.protobuf.Api")
108+
RegisterType((*apipb.Method)(nil), "google.protobuf.Method")
109+
RegisterType((*apipb.Mixin)(nil), "google.protobuf.Mixin")
101110

102111
// duration.proto
103-
RegisterType((*knownpb.Duration)(nil), "google.protobuf.Duration")
112+
RegisterType((*durationpb.Duration)(nil), "google.protobuf.Duration")
104113

105114
// empty.proto
106-
RegisterType((*knownpb.Empty)(nil), "google.protobuf.Empty")
115+
RegisterType((*emptypb.Empty)(nil), "google.protobuf.Empty")
107116

108117
// field_mask.proto
109-
RegisterType((*knownpb.FieldMask)(nil), "google.protobuf.FieldMask")
118+
RegisterType((*fieldmaskpb.FieldMask)(nil), "google.protobuf.FieldMask")
110119

111120
// source_context.proto
112-
RegisterType((*knownpb.SourceContext)(nil), "google.protobuf.SourceContext")
121+
RegisterType((*sourcecontextpb.SourceContext)(nil), "google.protobuf.SourceContext")
113122

114123
// struct.proto
115-
RegisterEnum("google.protobuf.NullValue", knownpb.NullValue_name, knownpb.NullValue_value)
116-
RegisterType((*knownpb.Struct)(nil), "google.protobuf.Struct")
117-
RegisterType((*knownpb.Value)(nil), "google.protobuf.Value")
118-
RegisterType((*knownpb.ListValue)(nil), "google.protobuf.ListValue")
124+
RegisterEnum("google.protobuf.NullValue", structpb.NullValue_name, structpb.NullValue_value)
125+
RegisterType((*structpb.Struct)(nil), "google.protobuf.Struct")
126+
RegisterType((*structpb.Value)(nil), "google.protobuf.Value")
127+
RegisterType((*structpb.ListValue)(nil), "google.protobuf.ListValue")
119128

120129
// timestamp.proto
121-
RegisterType((*knownpb.Timestamp)(nil), "google.protobuf.Timestamp")
130+
RegisterType((*timestamppb.Timestamp)(nil), "google.protobuf.Timestamp")
122131

123132
// type.proto
124-
RegisterEnum("google.protobuf.Syntax", knownpb.Syntax_name, knownpb.Syntax_value)
125-
RegisterEnum("google.protobuf.Field_Kind", knownpb.Field_Kind_name, knownpb.Field_Kind_value)
126-
RegisterEnum("google.protobuf.Field_Cardinality", knownpb.Field_Cardinality_name, knownpb.Field_Cardinality_value)
127-
RegisterType((*knownpb.Type)(nil), "google.protobuf.Type")
128-
RegisterType((*knownpb.Field)(nil), "google.protobuf.Field")
129-
RegisterType((*knownpb.Enum)(nil), "google.protobuf.Enum")
130-
RegisterType((*knownpb.EnumValue)(nil), "google.protobuf.EnumValue")
131-
RegisterType((*knownpb.Option)(nil), "google.protobuf.Option")
133+
RegisterEnum("google.protobuf.Syntax", typepb.Syntax_name, typepb.Syntax_value)
134+
RegisterEnum("google.protobuf.Field_Kind", typepb.Field_Kind_name, typepb.Field_Kind_value)
135+
RegisterEnum("google.protobuf.Field_Cardinality", typepb.Field_Cardinality_name, typepb.Field_Cardinality_value)
136+
RegisterType((*typepb.Type)(nil), "google.protobuf.Type")
137+
RegisterType((*typepb.Field)(nil), "google.protobuf.Field")
138+
RegisterType((*typepb.Enum)(nil), "google.protobuf.Enum")
139+
RegisterType((*typepb.EnumValue)(nil), "google.protobuf.EnumValue")
140+
RegisterType((*typepb.Option)(nil), "google.protobuf.Option")
132141

133142
// wrapper.proto
134-
RegisterType((*knownpb.DoubleValue)(nil), "google.protobuf.DoubleValue")
135-
RegisterType((*knownpb.FloatValue)(nil), "google.protobuf.FloatValue")
136-
RegisterType((*knownpb.Int64Value)(nil), "google.protobuf.Int64Value")
137-
RegisterType((*knownpb.UInt64Value)(nil), "google.protobuf.UInt64Value")
138-
RegisterType((*knownpb.Int32Value)(nil), "google.protobuf.Int32Value")
139-
RegisterType((*knownpb.UInt32Value)(nil), "google.protobuf.UInt32Value")
140-
RegisterType((*knownpb.BoolValue)(nil), "google.protobuf.BoolValue")
141-
RegisterType((*knownpb.StringValue)(nil), "google.protobuf.StringValue")
142-
RegisterType((*knownpb.BytesValue)(nil), "google.protobuf.BytesValue")
143+
RegisterType((*wrapperspb.DoubleValue)(nil), "google.protobuf.DoubleValue")
144+
RegisterType((*wrapperspb.FloatValue)(nil), "google.protobuf.FloatValue")
145+
RegisterType((*wrapperspb.Int64Value)(nil), "google.protobuf.Int64Value")
146+
RegisterType((*wrapperspb.UInt64Value)(nil), "google.protobuf.UInt64Value")
147+
RegisterType((*wrapperspb.Int32Value)(nil), "google.protobuf.Int32Value")
148+
RegisterType((*wrapperspb.UInt32Value)(nil), "google.protobuf.UInt32Value")
149+
RegisterType((*wrapperspb.BoolValue)(nil), "google.protobuf.BoolValue")
150+
RegisterType((*wrapperspb.StringValue)(nil), "google.protobuf.StringValue")
151+
RegisterType((*wrapperspb.BytesValue)(nil), "google.protobuf.BytesValue")
143152
}

‎proto/registry_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import (
1010

1111
"github.com/golang/protobuf/proto"
1212

13-
descriptorpb "google.golang.org/protobuf/types/descriptor"
13+
"google.golang.org/protobuf/types/descriptorpb"
1414
)
1515

1616
func TestRegistry(t *testing.T) {

0 commit comments

Comments
 (0)