Skip to content

Commit

Permalink
examples: add Unimplemented___Server to all example servers (#3071)
Browse files Browse the repository at this point in the history
  • Loading branch information
dfawley committed Oct 4, 2019
1 parent dcd1c97 commit 50c4579
Show file tree
Hide file tree
Showing 19 changed files with 101 additions and 219 deletions.
22 changes: 8 additions & 14 deletions examples/features/authentication/server/main.go
Expand Up @@ -32,10 +32,11 @@ import (
"google.golang.org/grpc"
"google.golang.org/grpc/codes"
"google.golang.org/grpc/credentials"
ecpb "google.golang.org/grpc/examples/features/proto/echo"
"google.golang.org/grpc/metadata"
"google.golang.org/grpc/status"
"google.golang.org/grpc/testdata"

pb "google.golang.org/grpc/examples/features/proto/echo"
)

var (
Expand All @@ -62,7 +63,7 @@ func main() {
grpc.Creds(credentials.NewServerTLSFromCert(&cert)),
}
s := grpc.NewServer(opts...)
ecpb.RegisterEchoServer(s, &ecServer{})
pb.RegisterEchoServer(s, &ecServer{})
lis, err := net.Listen("tcp", fmt.Sprintf(":%d", *port))
if err != nil {
log.Fatalf("failed to listen: %v", err)
Expand All @@ -72,19 +73,12 @@ func main() {
}
}

type ecServer struct{}

func (s *ecServer) UnaryEcho(ctx context.Context, req *ecpb.EchoRequest) (*ecpb.EchoResponse, error) {
return &ecpb.EchoResponse{Message: req.Message}, nil
}
func (s *ecServer) ServerStreamingEcho(*ecpb.EchoRequest, ecpb.Echo_ServerStreamingEchoServer) error {
return status.Errorf(codes.Unimplemented, "not implemented")
type ecServer struct {
pb.UnimplementedEchoServer
}
func (s *ecServer) ClientStreamingEcho(ecpb.Echo_ClientStreamingEchoServer) error {
return status.Errorf(codes.Unimplemented, "not implemented")
}
func (s *ecServer) BidirectionalStreamingEcho(ecpb.Echo_BidirectionalStreamingEchoServer) error {
return status.Errorf(codes.Unimplemented, "not implemented")

func (s *ecServer) UnaryEcho(ctx context.Context, req *pb.EchoRequest) (*pb.EchoResponse, error) {
return &pb.EchoResponse{Message: req.Message}, nil
}

// valid validates the authorization.
Expand Down
18 changes: 3 additions & 15 deletions examples/features/cancellation/server/main.go
Expand Up @@ -20,33 +20,21 @@
package main

import (
"context"
"flag"
"fmt"
"io"
"log"
"net"

"google.golang.org/grpc"
"google.golang.org/grpc/codes"

pb "google.golang.org/grpc/examples/features/proto/echo"
"google.golang.org/grpc/status"
)

var port = flag.Int("port", 50051, "the port to serve on")

type server struct{}

func (s *server) UnaryEcho(ctx context.Context, in *pb.EchoRequest) (*pb.EchoResponse, error) {
return nil, status.Error(codes.Unimplemented, "not implemented")
}

func (s *server) ServerStreamingEcho(in *pb.EchoRequest, stream pb.Echo_ServerStreamingEchoServer) error {
return status.Error(codes.Unimplemented, "not implemented")
}

func (s *server) ClientStreamingEcho(stream pb.Echo_ClientStreamingEchoServer) error {
return status.Error(codes.Unimplemented, "not implemented")
type server struct {
pb.UnimplementedEchoServer
}

func (s *server) BidirectionalStreamingEcho(stream pb.Echo_BidirectionalStreamingEchoServer) error {
Expand Down
22 changes: 5 additions & 17 deletions examples/features/compression/server/main.go
Expand Up @@ -27,34 +27,22 @@ import (
"net"

"google.golang.org/grpc"
"google.golang.org/grpc/codes"
pb "google.golang.org/grpc/examples/features/proto/echo"
"google.golang.org/grpc/status"

_ "google.golang.org/grpc/encoding/gzip" // Install the gzip compressor

pb "google.golang.org/grpc/examples/features/proto/echo"
)

var port = flag.Int("port", 50051, "the port to serve on")

type server struct{}
type server struct {
pb.UnimplementedEchoServer
}

func (s *server) UnaryEcho(ctx context.Context, in *pb.EchoRequest) (*pb.EchoResponse, error) {
fmt.Printf("UnaryEcho called with message %q\n", in.GetMessage())
return &pb.EchoResponse{Message: in.Message}, nil
}

func (s *server) ServerStreamingEcho(in *pb.EchoRequest, stream pb.Echo_ServerStreamingEchoServer) error {
return status.Error(codes.Unimplemented, "not implemented")
}

func (s *server) ClientStreamingEcho(stream pb.Echo_ClientStreamingEchoServer) error {
return status.Error(codes.Unimplemented, "not implemented")
}

func (s *server) BidirectionalStreamingEcho(stream pb.Echo_BidirectionalStreamingEchoServer) error {
return status.Error(codes.Unimplemented, "not implemented")
}

func main() {
flag.Parse()

Expand Down
12 changes: 3 additions & 9 deletions examples/features/deadline/server/main.go
Expand Up @@ -31,14 +31,16 @@ import (

"google.golang.org/grpc"
"google.golang.org/grpc/codes"
pb "google.golang.org/grpc/examples/features/proto/echo"
"google.golang.org/grpc/status"

pb "google.golang.org/grpc/examples/features/proto/echo"
)

var port = flag.Int("port", 50052, "port number")

// server is used to implement EchoServer.
type server struct {
pb.UnimplementedEchoServer
client pb.EchoClient
cc *grpc.ClientConn
}
Expand All @@ -58,14 +60,6 @@ func (s *server) UnaryEcho(ctx context.Context, req *pb.EchoRequest) (*pb.EchoRe
return &pb.EchoResponse{Message: req.Message}, nil
}

func (s *server) ServerStreamingEcho(req *pb.EchoRequest, stream pb.Echo_ServerStreamingEchoServer) error {
return status.Error(codes.Unimplemented, "RPC unimplemented")
}

func (s *server) ClientStreamingEcho(stream pb.Echo_ClientStreamingEchoServer) error {
return status.Error(codes.Unimplemented, "RPC unimplemented")
}

func (s *server) BidirectionalStreamingEcho(stream pb.Echo_BidirectionalStreamingEchoServer) error {
for {
req, err := stream.Recv()
Expand Down
7 changes: 5 additions & 2 deletions examples/features/debugging/server/main.go
Expand Up @@ -27,16 +27,19 @@ import (
"golang.org/x/net/context"
"google.golang.org/grpc"
"google.golang.org/grpc/channelz/service"
pb "google.golang.org/grpc/examples/helloworld/helloworld"
"google.golang.org/grpc/internal/grpcrand"

pb "google.golang.org/grpc/examples/helloworld/helloworld"
)

var (
ports = []string{":10001", ":10002", ":10003"}
)

// server is used to implement helloworld.GreeterServer.
type server struct{}
type server struct {
pb.UnimplementedGreeterServer
}

// SayHello implements helloworld.GreeterServer
func (s *server) SayHello(ctx context.Context, in *pb.HelloRequest) (*pb.HelloReply, error) {
Expand Down
25 changes: 7 additions & 18 deletions examples/features/encryption/ALTS/server/main.go
Expand Up @@ -27,30 +27,19 @@ import (
"net"

"google.golang.org/grpc"
"google.golang.org/grpc/codes"
"google.golang.org/grpc/credentials/alts"
ecpb "google.golang.org/grpc/examples/features/proto/echo"
"google.golang.org/grpc/status"

pb "google.golang.org/grpc/examples/features/proto/echo"
)

var port = flag.Int("port", 50051, "the port to serve on")

type ecServer struct{}

func (s *ecServer) UnaryEcho(ctx context.Context, req *ecpb.EchoRequest) (*ecpb.EchoResponse, error) {
return &ecpb.EchoResponse{Message: req.Message}, nil
}

func (s *ecServer) ServerStreamingEcho(*ecpb.EchoRequest, ecpb.Echo_ServerStreamingEchoServer) error {
return status.Errorf(codes.Unimplemented, "not implemented")
}

func (s *ecServer) ClientStreamingEcho(ecpb.Echo_ClientStreamingEchoServer) error {
return status.Errorf(codes.Unimplemented, "not implemented")
type ecServer struct {
pb.UnimplementedEchoServer
}

func (s *ecServer) BidirectionalStreamingEcho(ecpb.Echo_BidirectionalStreamingEchoServer) error {
return status.Errorf(codes.Unimplemented, "not implemented")
func (s *ecServer) UnaryEcho(ctx context.Context, req *pb.EchoRequest) (*pb.EchoResponse, error) {
return &pb.EchoResponse{Message: req.Message}, nil
}

func main() {
Expand All @@ -66,7 +55,7 @@ func main() {
s := grpc.NewServer(grpc.Creds(altsTC))

// Register EchoServer on the server.
ecpb.RegisterEchoServer(s, &ecServer{})
pb.RegisterEchoServer(s, &ecServer{})

if err := s.Serve(lis); err != nil {
log.Fatalf("failed to serve: %v", err)
Expand Down
25 changes: 7 additions & 18 deletions examples/features/encryption/TLS/server/main.go
Expand Up @@ -27,31 +27,20 @@ import (
"net"

"google.golang.org/grpc"
"google.golang.org/grpc/codes"
"google.golang.org/grpc/credentials"
ecpb "google.golang.org/grpc/examples/features/proto/echo"
"google.golang.org/grpc/status"
"google.golang.org/grpc/testdata"

pb "google.golang.org/grpc/examples/features/proto/echo"
)

var port = flag.Int("port", 50051, "the port to serve on")

type ecServer struct{}

func (s *ecServer) UnaryEcho(ctx context.Context, req *ecpb.EchoRequest) (*ecpb.EchoResponse, error) {
return &ecpb.EchoResponse{Message: req.Message}, nil
}

func (s *ecServer) ServerStreamingEcho(*ecpb.EchoRequest, ecpb.Echo_ServerStreamingEchoServer) error {
return status.Errorf(codes.Unimplemented, "not implemented")
}

func (s *ecServer) ClientStreamingEcho(ecpb.Echo_ClientStreamingEchoServer) error {
return status.Errorf(codes.Unimplemented, "not implemented")
type ecServer struct {
pb.UnimplementedEchoServer
}

func (s *ecServer) BidirectionalStreamingEcho(ecpb.Echo_BidirectionalStreamingEchoServer) error {
return status.Errorf(codes.Unimplemented, "not implemented")
func (s *ecServer) UnaryEcho(ctx context.Context, req *pb.EchoRequest) (*pb.EchoResponse, error) {
return &pb.EchoResponse{Message: req.Message}, nil
}

func main() {
Expand All @@ -71,7 +60,7 @@ func main() {
s := grpc.NewServer(grpc.Creds(creds))

// Register EchoServer on the server.
ecpb.RegisterEchoServer(s, &ecServer{})
pb.RegisterEchoServer(s, &ecServer{})

if err := s.Serve(lis); err != nil {
log.Fatalf("failed to serve: %v", err)
Expand Down
6 changes: 4 additions & 2 deletions examples/features/errors/server/main.go
Expand Up @@ -27,17 +27,19 @@ import (
"net"
"sync"

epb "google.golang.org/genproto/googleapis/rpc/errdetails"
"google.golang.org/grpc"
"google.golang.org/grpc/codes"
pb "google.golang.org/grpc/examples/helloworld/helloworld"
"google.golang.org/grpc/status"

epb "google.golang.org/genproto/googleapis/rpc/errdetails"
pb "google.golang.org/grpc/examples/helloworld/helloworld"
)

var port = flag.Int("port", 50052, "port number")

// server is used to implement helloworld.GreeterServer.
type server struct {
pb.UnimplementedGreeterServer
mu sync.Mutex
count map[string]int
}
Expand Down
25 changes: 10 additions & 15 deletions examples/features/interceptor/server/main.go
Expand Up @@ -32,10 +32,11 @@ import (
"google.golang.org/grpc"
"google.golang.org/grpc/codes"
"google.golang.org/grpc/credentials"
ecpb "google.golang.org/grpc/examples/features/proto/echo"
"google.golang.org/grpc/metadata"
"google.golang.org/grpc/status"
"google.golang.org/grpc/testdata"

pb "google.golang.org/grpc/examples/features/proto/echo"
)

var (
Expand All @@ -50,22 +51,16 @@ func logger(format string, a ...interface{}) {
fmt.Printf("LOG:\t"+format+"\n", a...)
}

type server struct{}

func (s *server) UnaryEcho(ctx context.Context, in *ecpb.EchoRequest) (*ecpb.EchoResponse, error) {
fmt.Printf("unary echoing message %q\n", in.Message)
return &ecpb.EchoResponse{Message: in.Message}, nil
}

func (s *server) ServerStreamingEcho(in *ecpb.EchoRequest, stream ecpb.Echo_ServerStreamingEchoServer) error {
return status.Error(codes.Unimplemented, "not implemented")
type server struct {
pb.UnimplementedEchoServer
}

func (s *server) ClientStreamingEcho(stream ecpb.Echo_ClientStreamingEchoServer) error {
return status.Error(codes.Unimplemented, "not implemented")
func (s *server) UnaryEcho(ctx context.Context, in *pb.EchoRequest) (*pb.EchoResponse, error) {
fmt.Printf("unary echoing message %q\n", in.Message)
return &pb.EchoResponse{Message: in.Message}, nil
}

func (s *server) BidirectionalStreamingEcho(stream ecpb.Echo_BidirectionalStreamingEchoServer) error {
func (s *server) BidirectionalStreamingEcho(stream pb.Echo_BidirectionalStreamingEchoServer) error {
for {
in, err := stream.Recv()
if err != nil {
Expand All @@ -76,7 +71,7 @@ func (s *server) BidirectionalStreamingEcho(stream ecpb.Echo_BidirectionalStream
return err
}
fmt.Printf("bidi echoing message %q\n", in.Message)
stream.Send(&ecpb.EchoResponse{Message: in.Message})
stream.Send(&pb.EchoResponse{Message: in.Message})
}
}

Expand Down Expand Up @@ -162,7 +157,7 @@ func main() {
s := grpc.NewServer(grpc.Creds(creds), grpc.UnaryInterceptor(unaryInterceptor), grpc.StreamInterceptor(streamInterceptor))

// Register EchoServer on the server.
ecpb.RegisterEchoServer(s, &server{})
pb.RegisterEchoServer(s, &server{})

if err := s.Serve(lis); err != nil {
log.Fatalf("failed to serve: %v", err)
Expand Down
21 changes: 5 additions & 16 deletions examples/features/keepalive/server/main.go
Expand Up @@ -28,10 +28,9 @@ import (
"time"

"google.golang.org/grpc"
"google.golang.org/grpc/codes"
pb "google.golang.org/grpc/examples/features/proto/echo"
"google.golang.org/grpc/keepalive"
"google.golang.org/grpc/status"

pb "google.golang.org/grpc/examples/features/proto/echo"
)

var port = flag.Int("port", 50052, "port number")
Expand All @@ -50,24 +49,14 @@ var kasp = keepalive.ServerParameters{
}

// server implements EchoServer.
type server struct{}
type server struct {
pb.UnimplementedEchoServer
}

func (s *server) UnaryEcho(ctx context.Context, req *pb.EchoRequest) (*pb.EchoResponse, error) {
return &pb.EchoResponse{Message: req.Message}, nil
}

func (s *server) ServerStreamingEcho(req *pb.EchoRequest, stream pb.Echo_ServerStreamingEchoServer) error {
return status.Error(codes.Unimplemented, "RPC unimplemented")
}

func (s *server) ClientStreamingEcho(stream pb.Echo_ClientStreamingEchoServer) error {
return status.Error(codes.Unimplemented, "RPC unimplemented")
}

func (s *server) BidirectionalStreamingEcho(stream pb.Echo_BidirectionalStreamingEchoServer) error {
return status.Error(codes.Unimplemented, "RPC unimplemented")
}

func main() {
flag.Parse()

Expand Down

0 comments on commit 50c4579

Please sign in to comment.