@@ -118,10 +118,6 @@ func (g *grpc) Generate(file *generator.FileDescriptor) {
118
118
g .P ("var _ " , contextPkg , ".Context" )
119
119
g .P ("var _ " , grpcPkg , ".ClientConn" )
120
120
g .P ()
121
- g .P ("func errUnimplemented(methodName string) error {" )
122
- g .P ("\t return " , errorPkg , ".Errorf(codes.Unimplemented, \" method %s not implemented\" , methodName)" )
123
- g .P ("}" )
124
- g .P ()
125
121
126
122
// Assert version compatibility.
127
123
g .P ("// This is a compile-time assertion to ensure that this generated file" )
@@ -294,23 +290,22 @@ func (g *grpc) generateUnimplementedServer(servName string, service *pb.ServiceD
294
290
g .P ()
295
291
// Unimplemented<service_name>Server's concrete methods
296
292
for _ , method := range service .Method {
297
- g .P ( g . generateServerMethodConcrete (servName , method ) )
293
+ g .generateServerMethodConcrete (servName , method )
298
294
}
299
295
g .P ()
300
296
}
301
297
302
298
// generateServerMethodConcrete returns unimplemented methods which ensure forward compatibility
303
- func (g * grpc ) generateServerMethodConcrete (servName string , method * pb.MethodDescriptorProto ) string {
299
+ func (g * grpc ) generateServerMethodConcrete (servName string , method * pb.MethodDescriptorProto ) {
304
300
header := g .generateServerSignatureWithParamNames (servName , method )
305
- implementation := fmt . Sprintf ("func (*Unimplemented%sServer) %s { \n " , servName , header )
306
- implementation += fmt . Sprintf ( " \t return " )
301
+ g . P ("func (*Unimplemented" , servName , "Server) " , header , " {" )
302
+ var nilArg string
307
303
if ! method .GetServerStreaming () && ! method .GetClientStreaming () {
308
- implementation + = "nil, "
304
+ nilArg = "nil, "
309
305
}
310
- origMethName := method .GetName ()
311
- methName := generator .CamelCase (origMethName )
312
- implementation += fmt .Sprintf ("errUnimplemented(%q)\n }" , methName )
313
- return implementation
306
+ methName := generator .CamelCase (method .GetName ())
307
+ g .P ("return " , nilArg , errorPkg , `.Errorf(codes.Unimplemented, "method ` , methName , ` not implemented")` )
308
+ g .P ("}" )
314
309
}
315
310
316
311
// generateClientSignature returns the client-side signature for a method.
0 commit comments