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 <dneil@google.com>

go.mod

@@ -2,4 +2,4 @@ module github.com/golang/protobuf
 
 go 1.9
 
-require google.golang.org/protobuf v0.0.0-20190516201745-40b83d67fc75
+require google.golang.org/protobuf v0.0.0-20190516215540-a95b29fbf623

go.sum

@@ -1,8 +1,10 @@
 github.com/golang/protobuf v1.2.1-0.20190514181236-7800af189d76/go.mod h1:Zfz6qcDoDBESdv6JsKsGpgNHnkvwJAJwcA9eL+mOkgc=
 github.com/golang/protobuf v1.2.1-0.20190515194842-7574ba03306e/go.mod h1:GjgUz9uwrRQmdPBBrFqiVbojAmlpy6ryM6DCzC+20rE=
+github.com/golang/protobuf v1.2.1-0.20190516201927-a2cd3ac1b343/go.mod h1:PScGDF2x230A126tLt9Ol9RjhXzbiPJrt/CogooD2mE=
 github.com/google/go-cmp v0.3.0 h1:crn/baboCvb5fXaQ0IJ1SGTsTVrWpDsCWC8EGETZijY=
 github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
 google.golang.org/protobuf v0.0.0-20190514172829-e89e6244e0e8/go.mod h1:791zQGC15vDqjpmPRn1uGPu5oHy/Jzw/Q1n5JsgIIcY=
 google.golang.org/protobuf v0.0.0-20190514231807-cdb777356907/go.mod h1:HeRLsKXv4+wE27dOIGwnqcOgq6a1O/GJ7mGhiEPnBrU=
-google.golang.org/protobuf v0.0.0-20190516201745-40b83d67fc75 h1:A9hovAkRmyzyLP+RCw0M+tVW0Ku3SZlCPLiABrEQJW0=
 google.golang.org/protobuf v0.0.0-20190516201745-40b83d67fc75/go.mod h1:jf+u8AHuKtkib+0J4/bQXPNzCmT3V9a02hVzYKtatuw=
+google.golang.org/protobuf v0.0.0-20190516215540-a95b29fbf623 h1:66BSNYPKX6AuAowxFl47l/DSyZ/ZekFylmbpjDMScDQ=
+google.golang.org/protobuf v0.0.0-20190516215540-a95b29fbf623/go.mod h1:cWWmz5lsCWIcqGLROrKq5Lu231IJw2PzqOZ8cgspbfY=

internal/cmd/generate-alias/main.go

@@ -22,9 +22,14 @@ import (
 	"google.golang.org/protobuf/reflect/protodesc"
 	"google.golang.org/protobuf/reflect/protoreflect"
 
-	descriptorpb "google.golang.org/protobuf/types/descriptor"
-	knownpb "google.golang.org/protobuf/types/known"
-	pluginpb "google.golang.org/protobuf/types/plugin"
+	"google.golang.org/protobuf/types/descriptorpb"
+	"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"
+	"google.golang.org/protobuf/types/pluginpb"
 )
 
 func main() {
@@ -43,22 +48,22 @@ func main() {
 		pbDesc: pluginpb.File_google_protobuf_compiler_plugin_proto,
 	}, {
 		goPkg:  "github.com/golang/protobuf/ptypes/any;any",
-		pbDesc: knownpb.File_google_protobuf_any_proto,
+		pbDesc: anypb.File_google_protobuf_any_proto,
 	}, {
 		goPkg:  "github.com/golang/protobuf/ptypes/duration;duration",
-		pbDesc: knownpb.File_google_protobuf_duration_proto,
+		pbDesc: durationpb.File_google_protobuf_duration_proto,
 	}, {
 		goPkg:  "github.com/golang/protobuf/ptypes/timestamp;timestamp",
-		pbDesc: knownpb.File_google_protobuf_timestamp_proto,
+		pbDesc: timestamppb.File_google_protobuf_timestamp_proto,
 	}, {
 		goPkg:  "github.com/golang/protobuf/ptypes/wrappers;wrappers",
-		pbDesc: knownpb.File_google_protobuf_wrappers_proto,
+		pbDesc: wrapperspb.File_google_protobuf_wrappers_proto,
 	}, {
 		goPkg:  "github.com/golang/protobuf/ptypes/struct;structpb",
-		pbDesc: knownpb.File_google_protobuf_struct_proto,
+		pbDesc: structpb.File_google_protobuf_struct_proto,
 	}, {
 		goPkg:  "github.com/golang/protobuf/ptypes/empty;empty",
-		pbDesc: knownpb.File_google_protobuf_empty_proto,
+		pbDesc: emptypb.File_google_protobuf_empty_proto,
 	}}
 
 	// For each package, construct a proto file that public imports the package.

internal/proto/registry.go

@@ -22,7 +22,7 @@ import (
 	"google.golang.org/protobuf/runtime/protoimpl"
 	"google.golang.org/protobuf/runtime/protolegacy"
 
-	descriptorpb "google.golang.org/protobuf/types/descriptor"
+	"google.golang.org/protobuf/types/descriptorpb"
 )
 
 // filePath is the path to the proto source file.

proto/hooks_disabled.go

@@ -10,8 +10,17 @@ import (
 	"io"
 	"reflect"
 
-	descriptorpb "google.golang.org/protobuf/types/descriptor"
-	knownpb "google.golang.org/protobuf/types/known"
+	"google.golang.org/protobuf/types/descriptorpb"
+	"google.golang.org/protobuf/types/known/anypb"
+	"google.golang.org/protobuf/types/known/apipb"
+	"google.golang.org/protobuf/types/known/durationpb"
+	"google.golang.org/protobuf/types/known/emptypb"
+	"google.golang.org/protobuf/types/known/fieldmaskpb"
+	"google.golang.org/protobuf/types/known/sourcecontextpb"
+	"google.golang.org/protobuf/types/known/structpb"
+	"google.golang.org/protobuf/types/known/timestamppb"
+	"google.golang.org/protobuf/types/known/typepb"
+	"google.golang.org/protobuf/types/known/wrapperspb"
 )
 
 var (
@@ -92,52 +101,52 @@ func init() {
 	RegisterType((*descriptorpb.GeneratedCodeInfo_Annotation)(nil), "google.protobuf.GeneratedCodeInfo.Annotation")
 
 	// any.proto
-	RegisterType((*knownpb.Any)(nil), "google.protobuf.Any")
+	RegisterType((*anypb.Any)(nil), "google.protobuf.Any")
 
 	// api.proto
-	RegisterType((*knownpb.Api)(nil), "google.protobuf.Api")
-	RegisterType((*knownpb.Method)(nil), "google.protobuf.Method")
-	RegisterType((*knownpb.Mixin)(nil), "google.protobuf.Mixin")
+	RegisterType((*apipb.Api)(nil), "google.protobuf.Api")
+	RegisterType((*apipb.Method)(nil), "google.protobuf.Method")
+	RegisterType((*apipb.Mixin)(nil), "google.protobuf.Mixin")
 
 	// duration.proto
-	RegisterType((*knownpb.Duration)(nil), "google.protobuf.Duration")
+	RegisterType((*durationpb.Duration)(nil), "google.protobuf.Duration")
 
 	// empty.proto
-	RegisterType((*knownpb.Empty)(nil), "google.protobuf.Empty")
+	RegisterType((*emptypb.Empty)(nil), "google.protobuf.Empty")
 
 	// field_mask.proto
-	RegisterType((*knownpb.FieldMask)(nil), "google.protobuf.FieldMask")
+	RegisterType((*fieldmaskpb.FieldMask)(nil), "google.protobuf.FieldMask")
 
 	// source_context.proto
-	RegisterType((*knownpb.SourceContext)(nil), "google.protobuf.SourceContext")
+	RegisterType((*sourcecontextpb.SourceContext)(nil), "google.protobuf.SourceContext")
 
 	// struct.proto
-	RegisterEnum("google.protobuf.NullValue", knownpb.NullValue_name, knownpb.NullValue_value)
-	RegisterType((*knownpb.Struct)(nil), "google.protobuf.Struct")
-	RegisterType((*knownpb.Value)(nil), "google.protobuf.Value")
-	RegisterType((*knownpb.ListValue)(nil), "google.protobuf.ListValue")
+	RegisterEnum("google.protobuf.NullValue", structpb.NullValue_name, structpb.NullValue_value)
+	RegisterType((*structpb.Struct)(nil), "google.protobuf.Struct")
+	RegisterType((*structpb.Value)(nil), "google.protobuf.Value")
+	RegisterType((*structpb.ListValue)(nil), "google.protobuf.ListValue")
 
 	// timestamp.proto
-	RegisterType((*knownpb.Timestamp)(nil), "google.protobuf.Timestamp")
+	RegisterType((*timestamppb.Timestamp)(nil), "google.protobuf.Timestamp")
 
 	// type.proto
-	RegisterEnum("google.protobuf.Syntax", knownpb.Syntax_name, knownpb.Syntax_value)
-	RegisterEnum("google.protobuf.Field_Kind", knownpb.Field_Kind_name, knownpb.Field_Kind_value)
-	RegisterEnum("google.protobuf.Field_Cardinality", knownpb.Field_Cardinality_name, knownpb.Field_Cardinality_value)
-	RegisterType((*knownpb.Type)(nil), "google.protobuf.Type")
-	RegisterType((*knownpb.Field)(nil), "google.protobuf.Field")
-	RegisterType((*knownpb.Enum)(nil), "google.protobuf.Enum")
-	RegisterType((*knownpb.EnumValue)(nil), "google.protobuf.EnumValue")
-	RegisterType((*knownpb.Option)(nil), "google.protobuf.Option")
+	RegisterEnum("google.protobuf.Syntax", typepb.Syntax_name, typepb.Syntax_value)
+	RegisterEnum("google.protobuf.Field_Kind", typepb.Field_Kind_name, typepb.Field_Kind_value)
+	RegisterEnum("google.protobuf.Field_Cardinality", typepb.Field_Cardinality_name, typepb.Field_Cardinality_value)
+	RegisterType((*typepb.Type)(nil), "google.protobuf.Type")
+	RegisterType((*typepb.Field)(nil), "google.protobuf.Field")
+	RegisterType((*typepb.Enum)(nil), "google.protobuf.Enum")
+	RegisterType((*typepb.EnumValue)(nil), "google.protobuf.EnumValue")
+	RegisterType((*typepb.Option)(nil), "google.protobuf.Option")
 
 	// wrapper.proto
-	RegisterType((*knownpb.DoubleValue)(nil), "google.protobuf.DoubleValue")
-	RegisterType((*knownpb.FloatValue)(nil), "google.protobuf.FloatValue")
-	RegisterType((*knownpb.Int64Value)(nil), "google.protobuf.Int64Value")
-	RegisterType((*knownpb.UInt64Value)(nil), "google.protobuf.UInt64Value")
-	RegisterType((*knownpb.Int32Value)(nil), "google.protobuf.Int32Value")
-	RegisterType((*knownpb.UInt32Value)(nil), "google.protobuf.UInt32Value")
-	RegisterType((*knownpb.BoolValue)(nil), "google.protobuf.BoolValue")
-	RegisterType((*knownpb.StringValue)(nil), "google.protobuf.StringValue")
-	RegisterType((*knownpb.BytesValue)(nil), "google.protobuf.BytesValue")
+	RegisterType((*wrapperspb.DoubleValue)(nil), "google.protobuf.DoubleValue")
+	RegisterType((*wrapperspb.FloatValue)(nil), "google.protobuf.FloatValue")
+	RegisterType((*wrapperspb.Int64Value)(nil), "google.protobuf.Int64Value")
+	RegisterType((*wrapperspb.UInt64Value)(nil), "google.protobuf.UInt64Value")
+	RegisterType((*wrapperspb.Int32Value)(nil), "google.protobuf.Int32Value")
+	RegisterType((*wrapperspb.UInt32Value)(nil), "google.protobuf.UInt32Value")
+	RegisterType((*wrapperspb.BoolValue)(nil), "google.protobuf.BoolValue")
+	RegisterType((*wrapperspb.StringValue)(nil), "google.protobuf.StringValue")
+	RegisterType((*wrapperspb.BytesValue)(nil), "google.protobuf.BytesValue")
 }

proto/registry_test.go

@@ -10,7 +10,7 @@ import (
 
 	"github.com/golang/protobuf/proto"
 
-	descriptorpb "google.golang.org/protobuf/types/descriptor"
+	"google.golang.org/protobuf/types/descriptorpb"
 )
 
 func TestRegistry(t *testing.T) {

protoc-gen-go/descriptor/descriptor.pb.go

@@ -7,7 +7,7 @@ import (
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoregistry "google.golang.org/protobuf/reflect/protoregistry"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
-	descriptor "google.golang.org/protobuf/types/descriptor"
+	descriptorpb "google.golang.org/protobuf/types/descriptorpb"
 	sync "sync"
 )
 
@@ -15,142 +15,142 @@ const _ = protoimpl.EnforceVersion(protoimpl.Version - 0)
 
 // Symbols defined in public import of google/protobuf/descriptor.proto
 
-type FieldDescriptorProto_Type = descriptor.FieldDescriptorProto_Type
+type FieldDescriptorProto_Type = descriptorpb.FieldDescriptorProto_Type
 
-const FieldDescriptorProto_TYPE_DOUBLE = descriptor.FieldDescriptorProto_TYPE_DOUBLE
-const FieldDescriptorProto_TYPE_FLOAT = descriptor.FieldDescriptorProto_TYPE_FLOAT
-const FieldDescriptorProto_TYPE_INT64 = descriptor.FieldDescriptorProto_TYPE_INT64
-const FieldDescriptorProto_TYPE_UINT64 = descriptor.FieldDescriptorProto_TYPE_UINT64
-const FieldDescriptorProto_TYPE_INT32 = descriptor.FieldDescriptorProto_TYPE_INT32
-const FieldDescriptorProto_TYPE_FIXED64 = descriptor.FieldDescriptorProto_TYPE_FIXED64
-const FieldDescriptorProto_TYPE_FIXED32 = descriptor.FieldDescriptorProto_TYPE_FIXED32
-const FieldDescriptorProto_TYPE_BOOL = descriptor.FieldDescriptorProto_TYPE_BOOL
-const FieldDescriptorProto_TYPE_STRING = descriptor.FieldDescriptorProto_TYPE_STRING
-const FieldDescriptorProto_TYPE_GROUP = descriptor.FieldDescriptorProto_TYPE_GROUP
-const FieldDescriptorProto_TYPE_MESSAGE = descriptor.FieldDescriptorProto_TYPE_MESSAGE
-const FieldDescriptorProto_TYPE_BYTES = descriptor.FieldDescriptorProto_TYPE_BYTES
-const FieldDescriptorProto_TYPE_UINT32 = descriptor.FieldDescriptorProto_TYPE_UINT32
-const FieldDescriptorProto_TYPE_ENUM = descriptor.FieldDescriptorProto_TYPE_ENUM
-const FieldDescriptorProto_TYPE_SFIXED32 = descriptor.FieldDescriptorProto_TYPE_SFIXED32
-const FieldDescriptorProto_TYPE_SFIXED64 = descriptor.FieldDescriptorProto_TYPE_SFIXED64
-const FieldDescriptorProto_TYPE_SINT32 = descriptor.FieldDescriptorProto_TYPE_SINT32
-const FieldDescriptorProto_TYPE_SINT64 = descriptor.FieldDescriptorProto_TYPE_SINT64
+const FieldDescriptorProto_TYPE_DOUBLE = descriptorpb.FieldDescriptorProto_TYPE_DOUBLE
+const FieldDescriptorProto_TYPE_FLOAT = descriptorpb.FieldDescriptorProto_TYPE_FLOAT
+const FieldDescriptorProto_TYPE_INT64 = descriptorpb.FieldDescriptorProto_TYPE_INT64
+const FieldDescriptorProto_TYPE_UINT64 = descriptorpb.FieldDescriptorProto_TYPE_UINT64
+const FieldDescriptorProto_TYPE_INT32 = descriptorpb.FieldDescriptorProto_TYPE_INT32
+const FieldDescriptorProto_TYPE_FIXED64 = descriptorpb.FieldDescriptorProto_TYPE_FIXED64
+const FieldDescriptorProto_TYPE_FIXED32 = descriptorpb.FieldDescriptorProto_TYPE_FIXED32
+const FieldDescriptorProto_TYPE_BOOL = descriptorpb.FieldDescriptorProto_TYPE_BOOL
+const FieldDescriptorProto_TYPE_STRING = descriptorpb.FieldDescriptorProto_TYPE_STRING
+const FieldDescriptorProto_TYPE_GROUP = descriptorpb.FieldDescriptorProto_TYPE_GROUP
+const FieldDescriptorProto_TYPE_MESSAGE = descriptorpb.FieldDescriptorProto_TYPE_MESSAGE
+const FieldDescriptorProto_TYPE_BYTES = descriptorpb.FieldDescriptorProto_TYPE_BYTES
+const FieldDescriptorProto_TYPE_UINT32 = descriptorpb.FieldDescriptorProto_TYPE_UINT32
+const FieldDescriptorProto_TYPE_ENUM = descriptorpb.FieldDescriptorProto_TYPE_ENUM
+const FieldDescriptorProto_TYPE_SFIXED32 = descriptorpb.FieldDescriptorProto_TYPE_SFIXED32
+const FieldDescriptorProto_TYPE_SFIXED64 = descriptorpb.FieldDescriptorProto_TYPE_SFIXED64
+const FieldDescriptorProto_TYPE_SINT32 = descriptorpb.FieldDescriptorProto_TYPE_SINT32
+const FieldDescriptorProto_TYPE_SINT64 = descriptorpb.FieldDescriptorProto_TYPE_SINT64
 
-var FieldDescriptorProto_Type_name = descriptor.FieldDescriptorProto_Type_name
-var FieldDescriptorProto_Type_value = descriptor.FieldDescriptorProto_Type_value
+var FieldDescriptorProto_Type_name = descriptorpb.FieldDescriptorProto_Type_name
+var FieldDescriptorProto_Type_value = descriptorpb.FieldDescriptorProto_Type_value
 
-type FieldDescriptorProto_Label = descriptor.FieldDescriptorProto_Label
+type FieldDescriptorProto_Label = descriptorpb.FieldDescriptorProto_Label
 
-const FieldDescriptorProto_LABEL_OPTIONAL = descriptor.FieldDescriptorProto_LABEL_OPTIONAL
-const FieldDescriptorProto_LABEL_REQUIRED = descriptor.FieldDescriptorProto_LABEL_REQUIRED
-const FieldDescriptorProto_LABEL_REPEATED = descriptor.FieldDescriptorProto_LABEL_REPEATED
+const FieldDescriptorProto_LABEL_OPTIONAL = descriptorpb.FieldDescriptorProto_LABEL_OPTIONAL
+const FieldDescriptorProto_LABEL_REQUIRED = descriptorpb.FieldDescriptorProto_LABEL_REQUIRED
+const FieldDescriptorProto_LABEL_REPEATED = descriptorpb.FieldDescriptorProto_LABEL_REPEATED
 
-var FieldDescriptorProto_Label_name = descriptor.FieldDescriptorProto_Label_name
-var FieldDescriptorProto_Label_value = descriptor.FieldDescriptorProto_Label_value
+var FieldDescriptorProto_Label_name = descriptorpb.FieldDescriptorProto_Label_name
+var FieldDescriptorProto_Label_value = descriptorpb.FieldDescriptorProto_Label_value
 
-type FileOptions_OptimizeMode = descriptor.FileOptions_OptimizeMode
+type FileOptions_OptimizeMode = descriptorpb.FileOptions_OptimizeMode
 
-const FileOptions_SPEED = descriptor.FileOptions_SPEED
-const FileOptions_CODE_SIZE = descriptor.FileOptions_CODE_SIZE
-const FileOptions_LITE_RUNTIME = descriptor.FileOptions_LITE_RUNTIME
+const FileOptions_SPEED = descriptorpb.FileOptions_SPEED
+const FileOptions_CODE_SIZE = descriptorpb.FileOptions_CODE_SIZE
+const FileOptions_LITE_RUNTIME = descriptorpb.FileOptions_LITE_RUNTIME
 
-var FileOptions_OptimizeMode_name = descriptor.FileOptions_OptimizeMode_name
-var FileOptions_OptimizeMode_value = descriptor.FileOptions_OptimizeMode_value
+var FileOptions_OptimizeMode_name = descriptorpb.FileOptions_OptimizeMode_name
+var FileOptions_OptimizeMode_value = descriptorpb.FileOptions_OptimizeMode_value
 
-type FieldOptions_CType = descriptor.FieldOptions_CType
+type FieldOptions_CType = descriptorpb.FieldOptions_CType
 
-const FieldOptions_STRING = descriptor.FieldOptions_STRING
-const FieldOptions_CORD = descriptor.FieldOptions_CORD
-const FieldOptions_STRING_PIECE = descriptor.FieldOptions_STRING_PIECE
+const FieldOptions_STRING = descriptorpb.FieldOptions_STRING
+const FieldOptions_CORD = descriptorpb.FieldOptions_CORD
+const FieldOptions_STRING_PIECE = descriptorpb.FieldOptions_STRING_PIECE
 
-var FieldOptions_CType_name = descriptor.FieldOptions_CType_name
-var FieldOptions_CType_value = descriptor.FieldOptions_CType_value
+var FieldOptions_CType_name = descriptorpb.FieldOptions_CType_name
+var FieldOptions_CType_value = descriptorpb.FieldOptions_CType_value
 
-type FieldOptions_JSType = descriptor.FieldOptions_JSType
+type FieldOptions_JSType = descriptorpb.FieldOptions_JSType
 
-const FieldOptions_JS_NORMAL = descriptor.FieldOptions_JS_NORMAL
-const FieldOptions_JS_STRING = descriptor.FieldOptions_JS_STRING
-const FieldOptions_JS_NUMBER = descriptor.FieldOptions_JS_NUMBER
+const FieldOptions_JS_NORMAL = descriptorpb.FieldOptions_JS_NORMAL
+const FieldOptions_JS_STRING = descriptorpb.FieldOptions_JS_STRING
+const FieldOptions_JS_NUMBER = descriptorpb.FieldOptions_JS_NUMBER
 
-var FieldOptions_JSType_name = descriptor.FieldOptions_JSType_name
-var FieldOptions_JSType_value = descriptor.FieldOptions_JSType_value
+var FieldOptions_JSType_name = descriptorpb.FieldOptions_JSType_name
+var FieldOptions_JSType_value = descriptorpb.FieldOptions_JSType_value
 
-type MethodOptions_IdempotencyLevel = descriptor.MethodOptions_IdempotencyLevel
+type MethodOptions_IdempotencyLevel = descriptorpb.MethodOptions_IdempotencyLevel
 
-const MethodOptions_IDEMPOTENCY_UNKNOWN = descriptor.MethodOptions_IDEMPOTENCY_UNKNOWN
-const MethodOptions_NO_SIDE_EFFECTS = descriptor.MethodOptions_NO_SIDE_EFFECTS
-const MethodOptions_IDEMPOTENT = descriptor.MethodOptions_IDEMPOTENT
+const MethodOptions_IDEMPOTENCY_UNKNOWN = descriptorpb.MethodOptions_IDEMPOTENCY_UNKNOWN
+const MethodOptions_NO_SIDE_EFFECTS = descriptorpb.MethodOptions_NO_SIDE_EFFECTS
+const MethodOptions_IDEMPOTENT = descriptorpb.MethodOptions_IDEMPOTENT
 
-var MethodOptions_IdempotencyLevel_name = descriptor.MethodOptions_IdempotencyLevel_name
-var MethodOptions_IdempotencyLevel_value = descriptor.MethodOptions_IdempotencyLevel_value
+var MethodOptions_IdempotencyLevel_name = descriptorpb.MethodOptions_IdempotencyLevel_name
+var MethodOptions_IdempotencyLevel_value = descriptorpb.MethodOptions_IdempotencyLevel_value
 
-type FileDescriptorSet = descriptor.FileDescriptorSet
-type FileDescriptorProto = descriptor.FileDescriptorProto
-type DescriptorProto = descriptor.DescriptorProto
-type ExtensionRangeOptions = descriptor.ExtensionRangeOptions
-type FieldDescriptorProto = descriptor.FieldDescriptorProto
-type OneofDescriptorProto = descriptor.OneofDescriptorProto
-type EnumDescriptorProto = descriptor.EnumDescriptorProto
-type EnumValueDescriptorProto = descriptor.EnumValueDescriptorProto
-type ServiceDescriptorProto = descriptor.ServiceDescriptorProto
-type MethodDescriptorProto = descriptor.MethodDescriptorProto
+type FileDescriptorSet = descriptorpb.FileDescriptorSet
+type FileDescriptorProto = descriptorpb.FileDescriptorProto
+type DescriptorProto = descriptorpb.DescriptorProto
+type ExtensionRangeOptions = descriptorpb.ExtensionRangeOptions
+type FieldDescriptorProto = descriptorpb.FieldDescriptorProto
+type OneofDescriptorProto = descriptorpb.OneofDescriptorProto
+type EnumDescriptorProto = descriptorpb.EnumDescriptorProto
+type EnumValueDescriptorProto = descriptorpb.EnumValueDescriptorProto
+type ServiceDescriptorProto = descriptorpb.ServiceDescriptorProto
+type MethodDescriptorProto = descriptorpb.MethodDescriptorProto
 
-const Default_MethodDescriptorProto_ClientStreaming = descriptor.Default_MethodDescriptorProto_ClientStreaming
-const Default_MethodDescriptorProto_ServerStreaming = descriptor.Default_MethodDescriptorProto_ServerStreaming
+const Default_MethodDescriptorProto_ClientStreaming = descriptorpb.Default_MethodDescriptorProto_ClientStreaming
+const Default_MethodDescriptorProto_ServerStreaming = descriptorpb.Default_MethodDescriptorProto_ServerStreaming
 
-type FileOptions = descriptor.FileOptions
+type FileOptions = descriptorpb.FileOptions
 
-const Default_FileOptions_JavaMultipleFiles = descriptor.Default_FileOptions_JavaMultipleFiles
-const Default_FileOptions_JavaStringCheckUtf8 = descriptor.Default_FileOptions_JavaStringCheckUtf8
-const Default_FileOptions_OptimizeFor = descriptor.Default_FileOptions_OptimizeFor
-const Default_FileOptions_CcGenericServices = descriptor.Default_FileOptions_CcGenericServices
-const Default_FileOptions_JavaGenericServices = descriptor.Default_FileOptions_JavaGenericServices
-const Default_FileOptions_PyGenericServices = descriptor.Default_FileOptions_PyGenericServices
-const Default_FileOptions_PhpGenericServices = descriptor.Default_FileOptions_PhpGenericServices
-const Default_FileOptions_Deprecated = descriptor.Default_FileOptions_Deprecated
-const Default_FileOptions_CcEnableArenas = descriptor.Default_FileOptions_CcEnableArenas
+const Default_FileOptions_JavaMultipleFiles = descriptorpb.Default_FileOptions_JavaMultipleFiles
+const Default_FileOptions_JavaStringCheckUtf8 = descriptorpb.Default_FileOptions_JavaStringCheckUtf8
+const Default_FileOptions_OptimizeFor = descriptorpb.Default_FileOptions_OptimizeFor
+const Default_FileOptions_CcGenericServices = descriptorpb.Default_FileOptions_CcGenericServices
+const Default_FileOptions_JavaGenericServices = descriptorpb.Default_FileOptions_JavaGenericServices
+const Default_FileOptions_PyGenericServices = descriptorpb.Default_FileOptions_PyGenericServices
+const Default_FileOptions_PhpGenericServices = descriptorpb.Default_FileOptions_PhpGenericServices
+const Default_FileOptions_Deprecated = descriptorpb.Default_FileOptions_Deprecated
+const Default_FileOptions_CcEnableArenas = descriptorpb.Default_FileOptions_CcEnableArenas
 
-type MessageOptions = descriptor.MessageOptions
+type MessageOptions = descriptorpb.MessageOptions
 
-const Default_MessageOptions_MessageSetWireFormat = descriptor.Default_MessageOptions_MessageSetWireFormat
-const Default_MessageOptions_NoStandardDescriptorAccessor = descriptor.Default_MessageOptions_NoStandardDescriptorAccessor
-const Default_MessageOptions_Deprecated = descriptor.Default_MessageOptions_Deprecated
+const Default_MessageOptions_MessageSetWireFormat = descriptorpb.Default_MessageOptions_MessageSetWireFormat
+const Default_MessageOptions_NoStandardDescriptorAccessor = descriptorpb.Default_MessageOptions_NoStandardDescriptorAccessor
+const Default_MessageOptions_Deprecated = descriptorpb.Default_MessageOptions_Deprecated
 
-type FieldOptions = descriptor.FieldOptions
+type FieldOptions = descriptorpb.FieldOptions
 
-const Default_FieldOptions_Ctype = descriptor.Default_FieldOptions_Ctype
-const Default_FieldOptions_Jstype = descriptor.Default_FieldOptions_Jstype
-const Default_FieldOptions_Lazy = descriptor.Default_FieldOptions_Lazy
-const Default_FieldOptions_Deprecated = descriptor.Default_FieldOptions_Deprecated
-const Default_FieldOptions_Weak = descriptor.Default_FieldOptions_Weak
+const Default_FieldOptions_Ctype = descriptorpb.Default_FieldOptions_Ctype
+const Default_FieldOptions_Jstype = descriptorpb.Default_FieldOptions_Jstype
+const Default_FieldOptions_Lazy = descriptorpb.Default_FieldOptions_Lazy
+const Default_FieldOptions_Deprecated = descriptorpb.Default_FieldOptions_Deprecated
+const Default_FieldOptions_Weak = descriptorpb.Default_FieldOptions_Weak
 
-type OneofOptions = descriptor.OneofOptions
-type EnumOptions = descriptor.EnumOptions
+type OneofOptions = descriptorpb.OneofOptions
+type EnumOptions = descriptorpb.EnumOptions
 
-const Default_EnumOptions_Deprecated = descriptor.Default_EnumOptions_Deprecated
+const Default_EnumOptions_Deprecated = descriptorpb.Default_EnumOptions_Deprecated
 
-type EnumValueOptions = descriptor.EnumValueOptions
+type EnumValueOptions = descriptorpb.EnumValueOptions
 
-const Default_EnumValueOptions_Deprecated = descriptor.Default_EnumValueOptions_Deprecated
+const Default_EnumValueOptions_Deprecated = descriptorpb.Default_EnumValueOptions_Deprecated
 
-type ServiceOptions = descriptor.ServiceOptions
+type ServiceOptions = descriptorpb.ServiceOptions
 
-const Default_ServiceOptions_Deprecated = descriptor.Default_ServiceOptions_Deprecated
+const Default_ServiceOptions_Deprecated = descriptorpb.Default_ServiceOptions_Deprecated
 
-type MethodOptions = descriptor.MethodOptions
+type MethodOptions = descriptorpb.MethodOptions
 
-const Default_MethodOptions_Deprecated = descriptor.Default_MethodOptions_Deprecated
-const Default_MethodOptions_IdempotencyLevel = descriptor.Default_MethodOptions_IdempotencyLevel
+const Default_MethodOptions_Deprecated = descriptorpb.Default_MethodOptions_Deprecated
+const Default_MethodOptions_IdempotencyLevel = descriptorpb.Default_MethodOptions_IdempotencyLevel
 
-type UninterpretedOption = descriptor.UninterpretedOption
-type SourceCodeInfo = descriptor.SourceCodeInfo
-type GeneratedCodeInfo = descriptor.GeneratedCodeInfo
-type DescriptorProto_ExtensionRange = descriptor.DescriptorProto_ExtensionRange
-type DescriptorProto_ReservedRange = descriptor.DescriptorProto_ReservedRange
-type EnumDescriptorProto_EnumReservedRange = descriptor.EnumDescriptorProto_EnumReservedRange
-type UninterpretedOption_NamePart = descriptor.UninterpretedOption_NamePart
-type SourceCodeInfo_Location = descriptor.SourceCodeInfo_Location
-type GeneratedCodeInfo_Annotation = descriptor.GeneratedCodeInfo_Annotation
+type UninterpretedOption = descriptorpb.UninterpretedOption
+type SourceCodeInfo = descriptorpb.SourceCodeInfo
+type GeneratedCodeInfo = descriptorpb.GeneratedCodeInfo
+type DescriptorProto_ExtensionRange = descriptorpb.DescriptorProto_ExtensionRange
+type DescriptorProto_ReservedRange = descriptorpb.DescriptorProto_ReservedRange
+type EnumDescriptorProto_EnumReservedRange = descriptorpb.EnumDescriptorProto_EnumReservedRange
+type UninterpretedOption_NamePart = descriptorpb.UninterpretedOption_NamePart
+type SourceCodeInfo_Location = descriptorpb.SourceCodeInfo_Location
+type GeneratedCodeInfo_Annotation = descriptorpb.GeneratedCodeInfo_Annotation
 
 var File_github_com_golang_protobuf_protoc_gen_go_descriptor_descriptor_proto protoreflect.FileDescriptor
 

protoc-gen-go/plugin/plugin.pb.go

@@ -7,7 +7,7 @@ import (
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoregistry "google.golang.org/protobuf/reflect/protoregistry"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
-	plugin "google.golang.org/protobuf/types/plugin"
+	pluginpb "google.golang.org/protobuf/types/pluginpb"
 	sync "sync"
 )
 
@@ -15,10 +15,10 @@ const _ = protoimpl.EnforceVersion(protoimpl.Version - 0)
 
 // Symbols defined in public import of google/protobuf/compiler/plugin.proto
 
-type Version = plugin.Version
-type CodeGeneratorRequest = plugin.CodeGeneratorRequest
-type CodeGeneratorResponse = plugin.CodeGeneratorResponse
-type CodeGeneratorResponse_File = plugin.CodeGeneratorResponse_File
+type Version = pluginpb.Version
+type CodeGeneratorRequest = pluginpb.CodeGeneratorRequest
+type CodeGeneratorResponse = pluginpb.CodeGeneratorResponse
+type CodeGeneratorResponse_File = pluginpb.CodeGeneratorResponse_File
 
 var File_github_com_golang_protobuf_protoc_gen_go_plugin_plugin_proto protoreflect.FileDescriptor
 

ptypes/any/any.pb.go

@@ -7,7 +7,7 @@ import (
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoregistry "google.golang.org/protobuf/reflect/protoregistry"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
-	known "google.golang.org/protobuf/types/known"
+	anypb "google.golang.org/protobuf/types/known/anypb"
 	sync "sync"
 )
 
@@ -15,7 +15,7 @@ const _ = protoimpl.EnforceVersion(protoimpl.Version - 0)
 
 // Symbols defined in public import of google/protobuf/any.proto
 
-type Any = known.Any
+type Any = anypb.Any
 
 var File_github_com_golang_protobuf_ptypes_any_any_proto protoreflect.FileDescriptor
 

ptypes/duration/duration.pb.go

@@ -7,7 +7,7 @@ import (
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoregistry "google.golang.org/protobuf/reflect/protoregistry"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
-	known "google.golang.org/protobuf/types/known"
+	durationpb "google.golang.org/protobuf/types/known/durationpb"
 	sync "sync"
 )
 
@@ -15,7 +15,7 @@ const _ = protoimpl.EnforceVersion(protoimpl.Version - 0)
 
 // Symbols defined in public import of google/protobuf/duration.proto
 
-type Duration = known.Duration
+type Duration = durationpb.Duration
 
 var File_github_com_golang_protobuf_ptypes_duration_duration_proto protoreflect.FileDescriptor
 

ptypes/empty/empty.pb.go

@@ -7,7 +7,7 @@ import (
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoregistry "google.golang.org/protobuf/reflect/protoregistry"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
-	known "google.golang.org/protobuf/types/known"
+	emptypb "google.golang.org/protobuf/types/known/emptypb"
 	sync "sync"
 )
 
@@ -15,7 +15,7 @@ const _ = protoimpl.EnforceVersion(protoimpl.Version - 0)
 
 // Symbols defined in public import of google/protobuf/empty.proto
 
-type Empty = known.Empty
+type Empty = emptypb.Empty
 
 var File_github_com_golang_protobuf_ptypes_empty_empty_proto protoreflect.FileDescriptor
 

ptypes/struct/struct.pb.go

@@ -7,7 +7,7 @@ import (
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoregistry "google.golang.org/protobuf/reflect/protoregistry"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
-	known "google.golang.org/protobuf/types/known"
+	structpb "google.golang.org/protobuf/types/known/structpb"
 	sync "sync"
 )
 
@@ -15,22 +15,22 @@ const _ = protoimpl.EnforceVersion(protoimpl.Version - 0)
 
 // Symbols defined in public import of google/protobuf/struct.proto
 
-type NullValue = known.NullValue
+type NullValue = structpb.NullValue
 
-const NullValue_NULL_VALUE = known.NullValue_NULL_VALUE
+const NullValue_NULL_VALUE = structpb.NullValue_NULL_VALUE
 
-var NullValue_name = known.NullValue_name
-var NullValue_value = known.NullValue_value
+var NullValue_name = structpb.NullValue_name
+var NullValue_value = structpb.NullValue_value
 
-type Struct = known.Struct
-type Value = known.Value
-type Value_NullValue = known.Value_NullValue
-type Value_NumberValue = known.Value_NumberValue
-type Value_StringValue = known.Value_StringValue
-type Value_BoolValue = known.Value_BoolValue
-type Value_StructValue = known.Value_StructValue
-type Value_ListValue = known.Value_ListValue
-type ListValue = known.ListValue
+type Struct = structpb.Struct
+type Value = structpb.Value
+type Value_NullValue = structpb.Value_NullValue
+type Value_NumberValue = structpb.Value_NumberValue
+type Value_StringValue = structpb.Value_StringValue
+type Value_BoolValue = structpb.Value_BoolValue
+type Value_StructValue = structpb.Value_StructValue
+type Value_ListValue = structpb.Value_ListValue
+type ListValue = structpb.ListValue
 
 var File_github_com_golang_protobuf_ptypes_struct_struct_proto protoreflect.FileDescriptor
 

ptypes/timestamp/timestamp.pb.go

@@ -7,7 +7,7 @@ import (
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoregistry "google.golang.org/protobuf/reflect/protoregistry"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
-	known "google.golang.org/protobuf/types/known"
+	timestamppb "google.golang.org/protobuf/types/known/timestamppb"
 	sync "sync"
 )
 
@@ -15,7 +15,7 @@ const _ = protoimpl.EnforceVersion(protoimpl.Version - 0)
 
 // Symbols defined in public import of google/protobuf/timestamp.proto
 
-type Timestamp = known.Timestamp
+type Timestamp = timestamppb.Timestamp
 
 var File_github_com_golang_protobuf_ptypes_timestamp_timestamp_proto protoreflect.FileDescriptor
 

ptypes/wrappers/wrappers.pb.go

@@ -7,7 +7,7 @@ import (
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoregistry "google.golang.org/protobuf/reflect/protoregistry"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
-	known "google.golang.org/protobuf/types/known"
+	wrapperspb "google.golang.org/protobuf/types/known/wrapperspb"
 	sync "sync"
 )
 
@@ -15,15 +15,15 @@ const _ = protoimpl.EnforceVersion(protoimpl.Version - 0)
 
 // Symbols defined in public import of google/protobuf/wrappers.proto
 
-type DoubleValue = known.DoubleValue
-type FloatValue = known.FloatValue
-type Int64Value = known.Int64Value
-type UInt64Value = known.UInt64Value
-type Int32Value = known.Int32Value
-type UInt32Value = known.UInt32Value
-type BoolValue = known.BoolValue
-type StringValue = known.StringValue
-type BytesValue = known.BytesValue
+type DoubleValue = wrapperspb.DoubleValue
+type FloatValue = wrapperspb.FloatValue
+type Int64Value = wrapperspb.Int64Value
+type UInt64Value = wrapperspb.UInt64Value
+type Int32Value = wrapperspb.Int32Value
+type UInt32Value = wrapperspb.UInt32Value
+type BoolValue = wrapperspb.BoolValue
+type StringValue = wrapperspb.StringValue
+type BytesValue = wrapperspb.BytesValue
 
 var File_github_com_golang_protobuf_ptypes_wrappers_wrappers_proto protoreflect.FileDescriptor