From 1680a479a2cfb3fa22b972af7e36d0a0fde47bf8 Mon Sep 17 00:00:00 2001 From: Menghan Li Date: Fri, 20 Sep 2019 16:43:18 -0700 Subject: [PATCH] protoc-gen-go: fix deprecated comment for grpc methods (#952) --- protoc-gen-go/grpc/grpc.go | 8 ++++++++ protoc-gen-go/testdata/deprecated/deprecated.pb.go | 4 ++++ 2 files changed, 12 insertions(+) diff --git a/protoc-gen-go/grpc/grpc.go b/protoc-gen-go/grpc/grpc.go index 5d1e3f0f61..b15456f35c 100644 --- a/protoc-gen-go/grpc/grpc.go +++ b/protoc-gen-go/grpc/grpc.go @@ -166,6 +166,10 @@ func (g *grpc) generateService(file *generator.FileDescriptor, service *pb.Servi g.P("type ", servName, "Client interface {") for i, method := range service.Method { g.gen.PrintComments(fmt.Sprintf("%s,2,%d", path, i)) // 2 means method in a service. + if method.GetOptions().GetDeprecated() { + g.P("//") + g.P(deprecationComment) + } g.P(g.generateClientSignature(servName, method)) } g.P("}") @@ -213,6 +217,10 @@ func (g *grpc) generateService(file *generator.FileDescriptor, service *pb.Servi g.P("type ", serverType, " interface {") for i, method := range service.Method { g.gen.PrintComments(fmt.Sprintf("%s,2,%d", path, i)) // 2 means method in a service. + if method.GetOptions().GetDeprecated() { + g.P("//") + g.P(deprecationComment) + } g.P(g.generateServerSignature(servName, method)) } g.P("}") diff --git a/protoc-gen-go/testdata/deprecated/deprecated.pb.go b/protoc-gen-go/testdata/deprecated/deprecated.pb.go index 2515c99eb9..1a7b03c8c0 100644 --- a/protoc-gen-go/testdata/deprecated/deprecated.pb.go +++ b/protoc-gen-go/testdata/deprecated/deprecated.pb.go @@ -207,6 +207,8 @@ const _ = grpc.SupportPackageIsVersion4 // Deprecated: Do not use. type DeprecatedServiceClient interface { // DeprecatedCall takes a DeprecatedRequest and returns a DeprecatedResponse. + // + // Deprecated: Do not use. DeprecatedCall(ctx context.Context, in *DeprecatedRequest, opts ...grpc.CallOption) (*DeprecatedResponse, error) } @@ -234,6 +236,8 @@ func (c *deprecatedServiceClient) DeprecatedCall(ctx context.Context, in *Deprec // Deprecated: Do not use. type DeprecatedServiceServer interface { // DeprecatedCall takes a DeprecatedRequest and returns a DeprecatedResponse. + // + // Deprecated: Do not use. DeprecatedCall(context.Context, *DeprecatedRequest) (*DeprecatedResponse, error) }