Merge pull request #55 from izumin5210/izumin5210/register-funcs

Split register funcs from genrated foo_server.go
izumin5210 · Apr 13, 2018 · 4201514 · 4201514
2 parents 37ab2a3 + 447abde
commit 4201514
Show file tree

Hide file tree

Showing 26 changed files with 253 additions and 153 deletions.
diff --git a/_tests/integration/main_test.go b/_tests/integration/main_test.go
@@ -224,24 +224,12 @@ func updateServerImpl(t *testing.T, fs afero.Fs, rootPath string) {
 								Value: strconv.Quote("context"),
 							},
 						},
-						&ast.ImportSpec{
-							Path: &ast.BasicLit{
-								Kind:  token.STRING,
-								Value: strconv.Quote("github.com/grpc-ecosystem/grpc-gateway/runtime"),
-							},
-						},
 						&ast.ImportSpec{
 							Path: &ast.BasicLit{
 								Kind:  token.STRING,
 								Value: strconv.Quote("github.com/izumin5210/grapi/pkg/grapiserver"),
 							},
 						},
-						&ast.ImportSpec{
-							Path: &ast.BasicLit{
-								Kind:  token.STRING,
-								Value: strconv.Quote("google.golang.org/grpc"),
-							},
-						},
 						&ast.ImportSpec{
 							Name: &ast.Ident{Name: "api_pb"},
 							Path: &ast.BasicLit{

diff --git a/.../.snapshots/Test_ServiceGenerator-book#01-Generate_without_test-app-server-book_server.go b/.../.snapshots/Test_ServiceGenerator-book#01-Generate_without_test-app-server-book_server.go
@@ -3,9 +3,7 @@ package server
 import (
 	"context"
 
-	"github.com/grpc-ecosystem/grpc-gateway/runtime"
 	"github.com/izumin5210/grapi/pkg/grapiserver"
-	"google.golang.org/grpc"
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/status"
 
@@ -23,13 +21,3 @@ func NewBookServiceServer() interface {
 type bookServiceServerImpl struct {
 }
 
-// RegisterWithServer implements grapiserver.Server.RegisterWithServer.
-func (s *bookServiceServerImpl) RegisterWithServer(grpcSvr *grpc.Server) {
-	api_pb.RegisterBookServiceServer(grpcSvr, s)
-}
-
-// RegisterWithHandler implements grapiserver.Server.RegisterWithHandler.
-func (s *bookServiceServerImpl) RegisterWithHandler(ctx context.Context, mux *runtime.ServeMux, conn *grpc.ClientConn) error {
-	return api_pb.RegisterBookServiceHandler(ctx, mux, conn)
-}
-
diff --git a/...t_ServiceGenerator-book#01-Generate_without_test-app-server-book_server_register_funcs.go b/...t_ServiceGenerator-book#01-Generate_without_test-app-server-book_server_register_funcs.go
@@ -0,0 +1,21 @@
+package server
+
+import (
+	"context"
+
+	"github.com/grpc-ecosystem/grpc-gateway/runtime"
+	"google.golang.org/grpc"
+
+	api_pb "testapp/api"
+)
+
+// RegisterWithServer implements grapiserver.Server.RegisterWithServer.
+func (s *bookServiceServerImpl) RegisterWithServer(grpcSvr *grpc.Server) {
+	api_pb.RegisterBookServiceServer(grpcSvr, s)
+}
+
+// RegisterWithHandler implements grapiserver.Server.RegisterWithHandler.
+func (s *bookServiceServerImpl) RegisterWithHandler(ctx context.Context, mux *runtime.ServeMux, conn *grpc.ClientConn) error {
+	return api_pb.RegisterBookServiceHandler(ctx, mux, conn)
+}
+
diff --git a/...module/generator/.snapshots/Test_ServiceGenerator-book-Scaffold-app-server-book_server.go b/...module/generator/.snapshots/Test_ServiceGenerator-book-Scaffold-app-server-book_server.go
@@ -4,9 +4,7 @@ import (
 	"context"
 
 	"github.com/golang/protobuf/ptypes/empty"
-	"github.com/grpc-ecosystem/grpc-gateway/runtime"
 	"github.com/izumin5210/grapi/pkg/grapiserver"
-	"google.golang.org/grpc"
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/status"
 
@@ -24,16 +22,6 @@ func NewBookServiceServer() interface {
 type bookServiceServerImpl struct {
 }
 
-// RegisterWithServer implements grapiserver.Server.RegisterWithServer.
-func (s *bookServiceServerImpl) RegisterWithServer(grpcSvr *grpc.Server) {
-	api_pb.RegisterBookServiceServer(grpcSvr, s)
-}
-
-// RegisterWithHandler implements grapiserver.Server.RegisterWithHandler.
-func (s *bookServiceServerImpl) RegisterWithHandler(ctx context.Context, mux *runtime.ServeMux, conn *grpc.ClientConn) error {
-	return api_pb.RegisterBookServiceHandler(ctx, mux, conn)
-}
-
 func (s *bookServiceServerImpl) ListBooks(ctx context.Context, req *api_pb.ListBooksRequest) (*api_pb.ListBooksResponse, error) {
 	// TODO: Not yet implemented.
 	return nil, status.Error(codes.Unimplemented, "TODO: You should implement it!")

diff --git a/...r/.snapshots/Test_ServiceGenerator-book-Scaffold-app-server-book_server_register_funcs.go b/...r/.snapshots/Test_ServiceGenerator-book-Scaffold-app-server-book_server_register_funcs.go
@@ -0,0 +1,21 @@
+package server
+
+import (
+	"context"
+
+	"github.com/grpc-ecosystem/grpc-gateway/runtime"
+	"google.golang.org/grpc"
+
+	api_pb "testapp/api"
+)
+
+// RegisterWithServer implements grapiserver.Server.RegisterWithServer.
+func (s *bookServiceServerImpl) RegisterWithServer(grpcSvr *grpc.Server) {
+	api_pb.RegisterBookServiceServer(grpcSvr, s)
+}
+
+// RegisterWithHandler implements grapiserver.Server.RegisterWithHandler.
+func (s *bookServiceServerImpl) RegisterWithHandler(ctx context.Context, mux *runtime.ServeMux, conn *grpc.ClientConn) error {
+	return api_pb.RegisterBookServiceHandler(ctx, mux, conn)
+}
+
diff --git a/...l/module/generator/.snapshots/Test_ServiceGenerator-foo-Generate-app-server-foo_server.go b/...l/module/generator/.snapshots/Test_ServiceGenerator-foo-Generate-app-server-foo_server.go
@@ -3,9 +3,7 @@ package server
 import (
 	"context"
 
-	"github.com/grpc-ecosystem/grpc-gateway/runtime"
 	"github.com/izumin5210/grapi/pkg/grapiserver"
-	"google.golang.org/grpc"
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/status"
 
@@ -23,13 +21,3 @@ func NewFooServiceServer() interface {
 type fooServiceServerImpl struct {
 }
 
-// RegisterWithServer implements grapiserver.Server.RegisterWithServer.
-func (s *fooServiceServerImpl) RegisterWithServer(grpcSvr *grpc.Server) {
-	api_pb.RegisterFooServiceServer(grpcSvr, s)
-}
-
-// RegisterWithHandler implements grapiserver.Server.RegisterWithHandler.
-func (s *fooServiceServerImpl) RegisterWithHandler(ctx context.Context, mux *runtime.ServeMux, conn *grpc.ClientConn) error {
-	return api_pb.RegisterFooServiceHandler(ctx, mux, conn)
-}
-
diff --git a/...tor/.snapshots/Test_ServiceGenerator-foo-Generate-app-server-foo_server_register_funcs.go b/...tor/.snapshots/Test_ServiceGenerator-foo-Generate-app-server-foo_server_register_funcs.go
@@ -0,0 +1,21 @@
+package server
+
+import (
+	"context"
+
+	"github.com/grpc-ecosystem/grpc-gateway/runtime"
+	"google.golang.org/grpc"
+
+	api_pb "testapp/api"
+)
+
+// RegisterWithServer implements grapiserver.Server.RegisterWithServer.
+func (s *fooServiceServerImpl) RegisterWithServer(grpcSvr *grpc.Server) {
+	api_pb.RegisterFooServiceServer(grpcSvr, s)
+}
+
+// RegisterWithHandler implements grapiserver.Server.RegisterWithHandler.
+func (s *fooServiceServerImpl) RegisterWithHandler(ctx context.Context, mux *runtime.ServeMux, conn *grpc.ClientConn) error {
+	return api_pb.RegisterFooServiceHandler(ctx, mux, conn)
+}
+
diff --git a/.../generator/.snapshots/Test_ServiceGenerator-foo-bar-Generate-app-server-foo-bar_server.go b/.../generator/.snapshots/Test_ServiceGenerator-foo-bar-Generate-app-server-foo-bar_server.go
@@ -3,9 +3,7 @@ package foo
 import (
 	"context"
 
-	"github.com/grpc-ecosystem/grpc-gateway/runtime"
 	"github.com/izumin5210/grapi/pkg/grapiserver"
-	"google.golang.org/grpc"
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/status"
 
@@ -23,13 +21,3 @@ func NewBarServiceServer() interface {
 type barServiceServerImpl struct {
 }
 
-// RegisterWithServer implements grapiserver.Server.RegisterWithServer.
-func (s *barServiceServerImpl) RegisterWithServer(grpcSvr *grpc.Server) {
-	foo_pb.RegisterBarServiceServer(grpcSvr, s)
-}
-
-// RegisterWithHandler implements grapiserver.Server.RegisterWithHandler.
-func (s *barServiceServerImpl) RegisterWithHandler(ctx context.Context, mux *runtime.ServeMux, conn *grpc.ClientConn) error {
-	return foo_pb.RegisterBarServiceHandler(ctx, mux, conn)
-}
-
diff --git a/...pshots/Test_ServiceGenerator-foo-bar-Generate-app-server-foo-bar_server_register_funcs.go b/...pshots/Test_ServiceGenerator-foo-bar-Generate-app-server-foo-bar_server_register_funcs.go
@@ -0,0 +1,21 @@
+package foo
+
+import (
+	"context"
+
+	"github.com/grpc-ecosystem/grpc-gateway/runtime"
+	"google.golang.org/grpc"
+
+	foo_pb "testapp/api/foo"
+)
+
+// RegisterWithServer implements grapiserver.Server.RegisterWithServer.
+func (s *barServiceServerImpl) RegisterWithServer(grpcSvr *grpc.Server) {
+	foo_pb.RegisterBarServiceServer(grpcSvr, s)
+}
+
+// RegisterWithHandler implements grapiserver.Server.RegisterWithHandler.
+func (s *barServiceServerImpl) RegisterWithHandler(ctx context.Context, mux *runtime.ServeMux, conn *grpc.ClientConn) error {
+	return foo_pb.RegisterBarServiceHandler(ctx, mux, conn)
+}
+
diff --git a/...or/.snapshots/Test_ServiceGenerator-foo-bar-baz-Generate-app-server-foo-bar_baz_server.go b/...or/.snapshots/Test_ServiceGenerator-foo-bar-baz-Generate-app-server-foo-bar_baz_server.go
@@ -3,9 +3,7 @@ package foo
 import (
 	"context"
 
-	"github.com/grpc-ecosystem/grpc-gateway/runtime"
 	"github.com/izumin5210/grapi/pkg/grapiserver"
-	"google.golang.org/grpc"
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/status"
 
@@ -23,13 +21,3 @@ func NewBarBazServiceServer() interface {
 type barBazServiceServerImpl struct {
 }
 
-// RegisterWithServer implements grapiserver.Server.RegisterWithServer.
-func (s *barBazServiceServerImpl) RegisterWithServer(grpcSvr *grpc.Server) {
-	foo_pb.RegisterBarBazServiceServer(grpcSvr, s)
-}
-
-// RegisterWithHandler implements grapiserver.Server.RegisterWithHandler.
-func (s *barBazServiceServerImpl) RegisterWithHandler(ctx context.Context, mux *runtime.ServeMux, conn *grpc.ClientConn) error {
-	return foo_pb.RegisterBarBazServiceHandler(ctx, mux, conn)
-}
-
diff --git a/...est_ServiceGenerator-foo-bar-baz-Generate-app-server-foo-bar_baz_server_register_funcs.go b/...est_ServiceGenerator-foo-bar-baz-Generate-app-server-foo-bar_baz_server_register_funcs.go
@@ -0,0 +1,21 @@
+package foo
+
+import (
+	"context"
+
+	"github.com/grpc-ecosystem/grpc-gateway/runtime"
+	"google.golang.org/grpc"
+
+	foo_pb "testapp/api/foo"
+)
+
+// RegisterWithServer implements grapiserver.Server.RegisterWithServer.
+func (s *barBazServiceServerImpl) RegisterWithServer(grpcSvr *grpc.Server) {
+	foo_pb.RegisterBarBazServiceServer(grpcSvr, s)
+}
+
+// RegisterWithHandler implements grapiserver.Server.RegisterWithHandler.
+func (s *barBazServiceServerImpl) RegisterWithHandler(ctx context.Context, mux *runtime.ServeMux, conn *grpc.ClientConn) error {
+	return foo_pb.RegisterBarBazServiceHandler(ctx, mux, conn)
+}
+
diff --git a/...ceGenerator-foo-bar-baz_with_list,create,delete-Generate-app-server-foo-bar_baz_server.go b/...ceGenerator-foo-bar-baz_with_list,create,delete-Generate-app-server-foo-bar_baz_server.go
@@ -4,9 +4,7 @@ import (
 	"context"
 
 	"github.com/golang/protobuf/ptypes/empty"
-	"github.com/grpc-ecosystem/grpc-gateway/runtime"
 	"github.com/izumin5210/grapi/pkg/grapiserver"
-	"google.golang.org/grpc"
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/status"
 
@@ -24,16 +22,6 @@ func NewBarBazServiceServer() interface {
 type barBazServiceServerImpl struct {
 }
 
-// RegisterWithServer implements grapiserver.Server.RegisterWithServer.
-func (s *barBazServiceServerImpl) RegisterWithServer(grpcSvr *grpc.Server) {
-	foo_pb.RegisterBarBazServiceServer(grpcSvr, s)
-}
-
-// RegisterWithHandler implements grapiserver.Server.RegisterWithHandler.
-func (s *barBazServiceServerImpl) RegisterWithHandler(ctx context.Context, mux *runtime.ServeMux, conn *grpc.ClientConn) error {
-	return foo_pb.RegisterBarBazServiceHandler(ctx, mux, conn)
-}
-
 func (s *barBazServiceServerImpl) ListBarBazs(ctx context.Context, req *foo_pb.ListBarBazsRequest) (*foo_pb.ListBarBazsResponse, error) {
 	// TODO: Not yet implemented.
 	return nil, status.Error(codes.Unimplemented, "TODO: You should implement it!")

diff --git a/...-bar-baz_with_list,create,delete-Generate-app-server-foo-bar_baz_server_register_funcs.go b/...-bar-baz_with_list,create,delete-Generate-app-server-foo-bar_baz_server_register_funcs.go
@@ -0,0 +1,21 @@
+package foo
+
+import (
+	"context"
+
+	"github.com/grpc-ecosystem/grpc-gateway/runtime"
+	"google.golang.org/grpc"
+
+	foo_pb "testapp/api/foo"
+)
+
+// RegisterWithServer implements grapiserver.Server.RegisterWithServer.
+func (s *barBazServiceServerImpl) RegisterWithServer(grpcSvr *grpc.Server) {
+	foo_pb.RegisterBarBazServiceServer(grpcSvr, s)
+}
+
+// RegisterWithHandler implements grapiserver.Server.RegisterWithHandler.
+func (s *barBazServiceServerImpl) RegisterWithHandler(ctx context.Context, mux *runtime.ServeMux, conn *grpc.ClientConn) error {
+	return foo_pb.RegisterBarBazServiceHandler(ctx, mux, conn)
+}
+
diff --git a/...ar-baz_with_list,create,rename,delete,move_move-Generate-app-server-foo-bar_baz_server.go b/...ar-baz_with_list,create,rename,delete,move_move-Generate-app-server-foo-bar_baz_server.go
@@ -4,9 +4,7 @@ import (
 	"context"
 
 	"github.com/golang/protobuf/ptypes/empty"
-	"github.com/grpc-ecosystem/grpc-gateway/runtime"
 	"github.com/izumin5210/grapi/pkg/grapiserver"
-	"google.golang.org/grpc"
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/status"
 
@@ -24,16 +22,6 @@ func NewBarBazServiceServer() interface {
 type barBazServiceServerImpl struct {
 }
 
-// RegisterWithServer implements grapiserver.Server.RegisterWithServer.
-func (s *barBazServiceServerImpl) RegisterWithServer(grpcSvr *grpc.Server) {
-	foo_pb.RegisterBarBazServiceServer(grpcSvr, s)
-}
-
-// RegisterWithHandler implements grapiserver.Server.RegisterWithHandler.
-func (s *barBazServiceServerImpl) RegisterWithHandler(ctx context.Context, mux *runtime.ServeMux, conn *grpc.ClientConn) error {
-	return foo_pb.RegisterBarBazServiceHandler(ctx, mux, conn)
-}
-
 func (s *barBazServiceServerImpl) ListBarBazs(ctx context.Context, req *foo_pb.ListBarBazsRequest) (*foo_pb.ListBarBazsResponse, error) {
 	// TODO: Not yet implemented.
 	return nil, status.Error(codes.Unimplemented, "TODO: You should implement it!")

diff --git a/...t,create,rename,delete,move_move-Generate-app-server-foo-bar_baz_server_register_funcs.go b/...t,create,rename,delete,move_move-Generate-app-server-foo-bar_baz_server_register_funcs.go
@@ -0,0 +1,21 @@
+package foo
+
+import (
+	"context"
+
+	"github.com/grpc-ecosystem/grpc-gateway/runtime"
+	"google.golang.org/grpc"
+
+	foo_pb "testapp/api/foo"
+)
+
+// RegisterWithServer implements grapiserver.Server.RegisterWithServer.
+func (s *barBazServiceServerImpl) RegisterWithServer(grpcSvr *grpc.Server) {
+	foo_pb.RegisterBarBazServiceServer(grpcSvr, s)
+}
+
+// RegisterWithHandler implements grapiserver.Server.RegisterWithHandler.
+func (s *barBazServiceServerImpl) RegisterWithHandler(ctx context.Context, mux *runtime.ServeMux, conn *grpc.ClientConn) error {
+	return foo_pb.RegisterBarBazServiceHandler(ctx, mux, conn)
+}
+
diff --git a/...or/.snapshots/Test_ServiceGenerator-foo-bar_baz-Generate-app-server-foo-bar_baz_server.go b/...or/.snapshots/Test_ServiceGenerator-foo-bar_baz-Generate-app-server-foo-bar_baz_server.go
@@ -3,9 +3,7 @@ package foo
 import (
 	"context"
 
-	"github.com/grpc-ecosystem/grpc-gateway/runtime"
 	"github.com/izumin5210/grapi/pkg/grapiserver"
-	"google.golang.org/grpc"
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/status"
 
@@ -23,13 +21,3 @@ func NewBarBazServiceServer() interface {
 type barBazServiceServerImpl struct {
 }
 
-// RegisterWithServer implements grapiserver.Server.RegisterWithServer.
-func (s *barBazServiceServerImpl) RegisterWithServer(grpcSvr *grpc.Server) {
-	foo_pb.RegisterBarBazServiceServer(grpcSvr, s)
-}
-
-// RegisterWithHandler implements grapiserver.Server.RegisterWithHandler.
-func (s *barBazServiceServerImpl) RegisterWithHandler(ctx context.Context, mux *runtime.ServeMux, conn *grpc.ClientConn) error {
-	return foo_pb.RegisterBarBazServiceHandler(ctx, mux, conn)
-}
-