From 356e20440b4347428138406fc750f8877b78bca0 Mon Sep 17 00:00:00 2001 From: Vasiliy Tolstov Date: Tue, 14 Jan 2025 19:02:57 +0300 Subject: [PATCH] regen Signed-off-by: Vasiliy Tolstov --- client/drpc/proto/test.pb.go | 2 +- client/drpc/proto/test_micro.pb.go | 2 +- client/drpc/proto/test_micro_rpc.pb.go | 3 +-- client/grpc/gproto/test_micro.pb.go | 5 +++- client/grpc/gproto/test_micro_rpc.pb.go | 24 ++++++++++++++++--- client/grpc/proto/test.pb.go | 2 +- client/grpc/proto/test_grpc.pb.go | 2 +- client/http/proto/github.pb.go | 2 +- client/http/proto/github_micro.pb.go | 2 +- client/http/proto/github_micro_http.pb.go | 5 ++-- codec/proto/test.pb.go | 2 +- codec/proto/test_micro.pb.go | 2 +- codec/proto/test_micro_http.pb.go | 9 +------ codec/segmentio/proto/test.pb.go | 2 +- codec/segmentio/proto/test_micro.pb.go | 2 +- codec/segmentio/proto/test_micro_http.pb.go | 9 +------ flow/proto/test.pb.go | 2 +- flow/proto/test_micro.pb.go | 2 +- flow/proto/test_micro_http.pb.go | 5 ++-- proto/test.pb.go | 2 +- protoc-gen-go-micro/proto/test.pb.go | 2 +- protoc-gen-go-micro/proto/test_micro.pb.go | 2 +- .../proto/test_micro_http.pb.go | 5 ++-- server/combo/mgpb/proto_micro.pb.go | 2 +- server/combo/mgpb/proto_micro_grpc.pb.go | 3 +-- server/combo/mhpb/proto_micro.pb.go | 2 +- server/combo/mhpb/proto_micro_http.pb.go | 5 ++-- server/combo/ngpb/ngpb.pb.go | 2 +- server/combo/ngpb/ngpb_grpc.pb.go | 2 +- server/combo/proto/proto.pb.go | 2 +- server/grpc/gproto/test_micro.pb.go | 5 +++- server/grpc/gproto/test_micro_grpc.pb.go | 24 ++++++++++++++++--- server/grpc/proto/test.pb.go | 2 +- server/grpc/proto/test_grpc.pb.go | 2 +- server/http/proto/test.pb.go | 2 +- server/http/proto/test_micro.pb.go | 2 +- server/http/proto/test_micro_http.pb.go | 12 ++++------ util/reflect/proto/test.pb.go | 2 +- 38 files changed, 92 insertions(+), 72 deletions(-) diff --git a/client/drpc/proto/test.pb.go b/client/drpc/proto/test.pb.go index f36b914..a37a779 100644 --- a/client/drpc/proto/test.pb.go +++ b/client/drpc/proto/test.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.26.0 -// protoc v5.28.3 +// protoc v5.29.2 // source: test.proto package pb diff --git a/client/drpc/proto/test_micro.pb.go b/client/drpc/proto/test_micro.pb.go index addefd9..3fd04f6 100644 --- a/client/drpc/proto/test_micro.pb.go +++ b/client/drpc/proto/test_micro.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go-micro. DO NOT EDIT. // versions: // - protoc-gen-go-micro v3.10.4 -// - protoc v5.28.3 +// - protoc v5.29.2 // source: test.proto package pb diff --git a/client/drpc/proto/test_micro_rpc.pb.go b/client/drpc/proto/test_micro_rpc.pb.go index 44089a3..03d0581 100644 --- a/client/drpc/proto/test_micro_rpc.pb.go +++ b/client/drpc/proto/test_micro_rpc.pb.go @@ -58,6 +58,5 @@ func RegisterTestServiceServer(s server.Server, sh TestServiceServer, opts ...se testService } h := &testServiceServer{sh} - var nopts []server.HandlerOption - return s.Handle(s.NewHandler(&TestService{h}, append(nopts, opts...)...)) + return s.Handle(s.NewHandler(&TestService{h}, opts...)) } diff --git a/client/grpc/gproto/test_micro.pb.go b/client/grpc/gproto/test_micro.pb.go index 381a665..ba7de72 100644 --- a/client/grpc/gproto/test_micro.pb.go +++ b/client/grpc/gproto/test_micro.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go-micro. DO NOT EDIT. // versions: // - protoc-gen-go-micro v3.10.4 -// - protoc v5.28.3 +// - protoc v5.29.2 // source: test.proto package helloworld @@ -26,6 +26,8 @@ type Test_StreamClient interface { Context() context.Context SendMsg(msg interface{}) error RecvMsg(msg interface{}) error + CloseAndRecv() (*proto.Response, error) + CloseSend() error Close() error Header() metadata.Metadata Send(msg *proto.Request) error @@ -41,6 +43,7 @@ type Test_StreamStream interface { Context() context.Context SendMsg(msg interface{}) error RecvMsg(msg interface{}) error + SendAndClose(msg *proto.Response) error Close() error Recv() (*proto.Request, error) Send(msg *proto.Response) error diff --git a/client/grpc/gproto/test_micro_rpc.pb.go b/client/grpc/gproto/test_micro_rpc.pb.go index c51fdca..847a3eb 100644 --- a/client/grpc/gproto/test_micro_rpc.pb.go +++ b/client/grpc/gproto/test_micro_rpc.pb.go @@ -30,7 +30,7 @@ func (c *testClient) Call(ctx context.Context, req *proto.Request, opts ...clien return rsp, nil } -func (c *testClient) Stream(ctx context.Context, opts ...client.CallOption) (Test_StreamClient, error) { +func (c *testClient) Stream(ctx context.Context, opts ...client.CallOption) (proto.Test_StreamClient, error) { stream, err := c.c.Stream(ctx, c.c.NewRequest(c.name, "Test.Stream", &proto.Request{}), opts...) if err != nil { return nil, err @@ -42,6 +42,18 @@ type testClientStream struct { stream client.Stream } +func (s *testClientStream) CloseAndRecv() (*proto.Response, error) { + msg := &proto.Response{} + err := s.RecvMsg(msg) + if err == nil { + err = s.Close() + } + if err != nil { + return nil, err + } + return msg, nil +} + func (s *testClientStream) Close() error { return s.stream.Close() } @@ -94,6 +106,13 @@ type testStreamStream struct { stream server.Stream } +func (s *testStreamStream) SendAndClose(msg *proto.Response) error { + err := s.SendMsg(msg) + if err == nil { + err = s.stream.Close() + } + return err +} func (s *testStreamStream) Close() error { return s.stream.Close() } @@ -131,6 +150,5 @@ func RegisterTestServer(s server.Server, sh proto.TestServer, opts ...server.Han test } h := &testServer{sh} - var nopts []server.HandlerOption - return s.Handle(s.NewHandler(&Test{h}, append(nopts, opts...)...)) + return s.Handle(s.NewHandler(&Test{h}, opts...)) } diff --git a/client/grpc/proto/test.pb.go b/client/grpc/proto/test.pb.go index 838bb68..d58bf1f 100644 --- a/client/grpc/proto/test.pb.go +++ b/client/grpc/proto/test.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.26.0 -// protoc v5.28.3 +// protoc v5.29.2 // source: test.proto package helloworld diff --git a/client/grpc/proto/test_grpc.pb.go b/client/grpc/proto/test_grpc.pb.go index 58cd436..8c45920 100644 --- a/client/grpc/proto/test_grpc.pb.go +++ b/client/grpc/proto/test_grpc.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go-grpc. DO NOT EDIT. // versions: // - protoc-gen-go-grpc v1.5.1 -// - protoc v5.28.3 +// - protoc v5.29.2 // source: test.proto package helloworld diff --git a/client/http/proto/github.pb.go b/client/http/proto/github.pb.go index 71b28fb..b9dffb3 100644 --- a/client/http/proto/github.pb.go +++ b/client/http/proto/github.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.26.0 -// protoc v5.28.3 +// protoc v5.29.2 // source: github.proto package pb diff --git a/client/http/proto/github_micro.pb.go b/client/http/proto/github_micro.pb.go index 59de2a5..5dbc67e 100644 --- a/client/http/proto/github_micro.pb.go +++ b/client/http/proto/github_micro.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go-micro. DO NOT EDIT. // versions: // - protoc-gen-go-micro v3.10.4 -// - protoc v5.28.3 +// - protoc v5.29.2 // source: github.proto package pb diff --git a/client/http/proto/github_micro_http.pb.go b/client/http/proto/github_micro_http.pb.go index 614d554..1ce7182 100644 --- a/client/http/proto/github_micro_http.pb.go +++ b/client/http/proto/github_micro_http.pb.go @@ -98,7 +98,6 @@ func RegisterGithubServer(s server.Server, sh GithubServer, opts ...server.Handl github } h := &githubServer{sh} - var nopts []server.HandlerOption - nopts = append(nopts, v3.HandlerEndpoints(GithubServerEndpoints)) - return s.Handle(s.NewHandler(&Github{h}, append(nopts, opts...)...)) + opts = append(opts, v3.HandlerEndpoints(GithubServerEndpoints)) + return s.Handle(s.NewHandler(&Github{h}, opts...)) } diff --git a/codec/proto/test.pb.go b/codec/proto/test.pb.go index fbb2791..e334e94 100644 --- a/codec/proto/test.pb.go +++ b/codec/proto/test.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.26.0 -// protoc v5.28.3 +// protoc v5.29.2 // source: test.proto package pb diff --git a/codec/proto/test_micro.pb.go b/codec/proto/test_micro.pb.go index d48f614..7ae3aa3 100644 --- a/codec/proto/test_micro.pb.go +++ b/codec/proto/test_micro.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go-micro. DO NOT EDIT. // versions: // - protoc-gen-go-micro v3.10.4 -// - protoc v5.28.3 +// - protoc v5.29.2 // source: test.proto package pb diff --git a/codec/proto/test_micro_http.pb.go b/codec/proto/test_micro_http.pb.go index 7a9d4d5..a1ad360 100644 --- a/codec/proto/test_micro_http.pb.go +++ b/codec/proto/test_micro_http.pb.go @@ -7,16 +7,11 @@ package pb import ( context "context" _ "go.unistack.org/micro-client-http/v3" - v3 "go.unistack.org/micro-server-http/v3" client "go.unistack.org/micro/v3/client" codec "go.unistack.org/micro/v3/codec" server "go.unistack.org/micro/v3/server" ) -var ( - TestServerEndpoints = []v3.EndpointMetadata{} -) - type testClient struct { c client.Client name string @@ -51,7 +46,5 @@ func RegisterTestServer(s server.Server, sh TestServer, opts ...server.HandlerOp test } h := &testServer{sh} - var nopts []server.HandlerOption - nopts = append(nopts, v3.HandlerEndpoints(TestServerEndpoints)) - return s.Handle(s.NewHandler(&Test{h}, append(nopts, opts...)...)) + return s.Handle(s.NewHandler(&Test{h}, opts...)) } diff --git a/codec/segmentio/proto/test.pb.go b/codec/segmentio/proto/test.pb.go index 3f96620..3752226 100644 --- a/codec/segmentio/proto/test.pb.go +++ b/codec/segmentio/proto/test.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.26.0 -// protoc v5.28.3 +// protoc v5.29.2 // source: test.proto package pb diff --git a/codec/segmentio/proto/test_micro.pb.go b/codec/segmentio/proto/test_micro.pb.go index 425b1e7..5921a85 100644 --- a/codec/segmentio/proto/test_micro.pb.go +++ b/codec/segmentio/proto/test_micro.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go-micro. DO NOT EDIT. // versions: // - protoc-gen-go-micro v3.10.4 -// - protoc v5.28.3 +// - protoc v5.29.2 // source: test.proto package pb diff --git a/codec/segmentio/proto/test_micro_http.pb.go b/codec/segmentio/proto/test_micro_http.pb.go index 763148d..0b1a9aa 100644 --- a/codec/segmentio/proto/test_micro_http.pb.go +++ b/codec/segmentio/proto/test_micro_http.pb.go @@ -7,15 +7,10 @@ package pb import ( context "context" _ "go.unistack.org/micro-client-http/v3" - v3 "go.unistack.org/micro-server-http/v3" client "go.unistack.org/micro/v3/client" server "go.unistack.org/micro/v3/server" ) -var ( - TestServerEndpoints = []v3.EndpointMetadata{} -) - type testClient struct { c client.Client name string @@ -50,7 +45,5 @@ func RegisterTestServer(s server.Server, sh TestServer, opts ...server.HandlerOp test } h := &testServer{sh} - var nopts []server.HandlerOption - nopts = append(nopts, v3.HandlerEndpoints(TestServerEndpoints)) - return s.Handle(s.NewHandler(&Test{h}, append(nopts, opts...)...)) + return s.Handle(s.NewHandler(&Test{h}, opts...)) } diff --git a/flow/proto/test.pb.go b/flow/proto/test.pb.go index 190f02b..b5c33ef 100644 --- a/flow/proto/test.pb.go +++ b/flow/proto/test.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.26.0 -// protoc v5.28.3 +// protoc v5.29.2 // source: test.proto package pb diff --git a/flow/proto/test_micro.pb.go b/flow/proto/test_micro.pb.go index fbaf094..3dd7535 100644 --- a/flow/proto/test_micro.pb.go +++ b/flow/proto/test_micro.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go-micro. DO NOT EDIT. // versions: // - protoc-gen-go-micro v3.10.4 -// - protoc v5.28.3 +// - protoc v5.29.2 // source: test.proto package pb diff --git a/flow/proto/test_micro_http.pb.go b/flow/proto/test_micro_http.pb.go index 586cecd..e9f7698 100644 --- a/flow/proto/test_micro_http.pb.go +++ b/flow/proto/test_micro_http.pb.go @@ -185,7 +185,6 @@ func RegisterTestServiceServer(s server.Server, sh TestServiceServer, opts ...se testService } h := &testServiceServer{sh} - var nopts []server.HandlerOption - nopts = append(nopts, v3.HandlerEndpoints(TestServiceServerEndpoints)) - return s.Handle(s.NewHandler(&TestService{h}, append(nopts, opts...)...)) + opts = append(opts, v3.HandlerEndpoints(TestServiceServerEndpoints)) + return s.Handle(s.NewHandler(&TestService{h}, opts...)) } diff --git a/proto/test.pb.go b/proto/test.pb.go index a73b7bb..2265628 100644 --- a/proto/test.pb.go +++ b/proto/test.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.26.0 -// protoc v5.28.3 +// protoc v5.29.2 // source: test.proto package pb diff --git a/protoc-gen-go-micro/proto/test.pb.go b/protoc-gen-go-micro/proto/test.pb.go index f5b9361..9e1b454 100644 --- a/protoc-gen-go-micro/proto/test.pb.go +++ b/protoc-gen-go-micro/proto/test.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.26.0 -// protoc v5.28.3 +// protoc v5.29.2 // source: test.proto package pb diff --git a/protoc-gen-go-micro/proto/test_micro.pb.go b/protoc-gen-go-micro/proto/test_micro.pb.go index bcd6e10..b6208ab 100644 --- a/protoc-gen-go-micro/proto/test_micro.pb.go +++ b/protoc-gen-go-micro/proto/test_micro.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go-micro. DO NOT EDIT. // versions: // - protoc-gen-go-micro v3.10.4 -// - protoc v5.28.3 +// - protoc v5.29.2 // source: test.proto package pb diff --git a/protoc-gen-go-micro/proto/test_micro_http.pb.go b/protoc-gen-go-micro/proto/test_micro_http.pb.go index 9171387..7838bd7 100644 --- a/protoc-gen-go-micro/proto/test_micro_http.pb.go +++ b/protoc-gen-go-micro/proto/test_micro_http.pb.go @@ -198,7 +198,6 @@ func RegisterTestServiceServer(s server.Server, sh TestServiceServer, opts ...se testService } h := &testServiceServer{sh} - var nopts []server.HandlerOption - nopts = append(nopts, v3.HandlerEndpoints(TestServiceServerEndpoints)) - return s.Handle(s.NewHandler(&TestService{h}, append(nopts, opts...)...)) + opts = append(opts, v3.HandlerEndpoints(TestServiceServerEndpoints)) + return s.Handle(s.NewHandler(&TestService{h}, opts...)) } diff --git a/server/combo/mgpb/proto_micro.pb.go b/server/combo/mgpb/proto_micro.pb.go index 1925b3d..cd56188 100644 --- a/server/combo/mgpb/proto_micro.pb.go +++ b/server/combo/mgpb/proto_micro.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go-micro. DO NOT EDIT. // versions: // - protoc-gen-go-micro v3.10.4 -// - protoc v5.28.3 +// - protoc v5.29.2 // source: proto.proto package pb diff --git a/server/combo/mgpb/proto_micro_grpc.pb.go b/server/combo/mgpb/proto_micro_grpc.pb.go index 55181c9..b9447e7 100644 --- a/server/combo/mgpb/proto_micro_grpc.pb.go +++ b/server/combo/mgpb/proto_micro_grpc.pb.go @@ -45,6 +45,5 @@ func RegisterTestServer(s server.Server, sh proto.TestServer, opts ...server.Han test } h := &testServer{sh} - var nopts []server.HandlerOption - return s.Handle(s.NewHandler(&Test{h}, append(nopts, opts...)...)) + return s.Handle(s.NewHandler(&Test{h}, opts...)) } diff --git a/server/combo/mhpb/proto_micro.pb.go b/server/combo/mhpb/proto_micro.pb.go index 1925b3d..cd56188 100644 --- a/server/combo/mhpb/proto_micro.pb.go +++ b/server/combo/mhpb/proto_micro.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go-micro. DO NOT EDIT. // versions: // - protoc-gen-go-micro v3.10.4 -// - protoc v5.28.3 +// - protoc v5.29.2 // source: proto.proto package pb diff --git a/server/combo/mhpb/proto_micro_http.pb.go b/server/combo/mhpb/proto_micro_http.pb.go index 18ce51f..40ed968 100644 --- a/server/combo/mhpb/proto_micro_http.pb.go +++ b/server/combo/mhpb/proto_micro_http.pb.go @@ -70,7 +70,6 @@ func RegisterTestServer(s server.Server, sh proto.TestServer, opts ...server.Han test } h := &testServer{sh} - var nopts []server.HandlerOption - nopts = append(nopts, v3.HandlerEndpoints(TestServerEndpoints)) - return s.Handle(s.NewHandler(&Test{h}, append(nopts, opts...)...)) + opts = append(opts, v3.HandlerEndpoints(TestServerEndpoints)) + return s.Handle(s.NewHandler(&Test{h}, opts...)) } diff --git a/server/combo/ngpb/ngpb.pb.go b/server/combo/ngpb/ngpb.pb.go index ab3fcee..f68e702 100644 --- a/server/combo/ngpb/ngpb.pb.go +++ b/server/combo/ngpb/ngpb.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.26.0 -// protoc v5.28.3 +// protoc v5.29.2 // source: ngpb.proto package pb diff --git a/server/combo/ngpb/ngpb_grpc.pb.go b/server/combo/ngpb/ngpb_grpc.pb.go index 543f4b6..28643cc 100644 --- a/server/combo/ngpb/ngpb_grpc.pb.go +++ b/server/combo/ngpb/ngpb_grpc.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go-grpc. DO NOT EDIT. // versions: // - protoc-gen-go-grpc v1.5.1 -// - protoc v5.28.3 +// - protoc v5.29.2 // source: ngpb.proto package pb diff --git a/server/combo/proto/proto.pb.go b/server/combo/proto/proto.pb.go index b376826..7ee0c78 100644 --- a/server/combo/proto/proto.pb.go +++ b/server/combo/proto/proto.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.26.0 -// protoc v5.28.3 +// protoc v5.29.2 // source: proto.proto package pb diff --git a/server/grpc/gproto/test_micro.pb.go b/server/grpc/gproto/test_micro.pb.go index 58caede..0232c0c 100644 --- a/server/grpc/gproto/test_micro.pb.go +++ b/server/grpc/gproto/test_micro.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go-micro. DO NOT EDIT. // versions: // - protoc-gen-go-micro v3.10.4 -// - protoc v5.28.3 +// - protoc v5.29.2 // source: test.proto package helloworld @@ -26,6 +26,8 @@ type Test_StreamCallClient interface { Context() context.Context SendMsg(msg interface{}) error RecvMsg(msg interface{}) error + CloseAndRecv() (*proto.Response, error) + CloseSend() error Close() error Header() metadata.Metadata Send(msg *proto.Request) error @@ -41,6 +43,7 @@ type Test_StreamCallStream interface { Context() context.Context SendMsg(msg interface{}) error RecvMsg(msg interface{}) error + SendAndClose(msg *proto.Response) error Close() error Recv() (*proto.Request, error) Send(msg *proto.Response) error diff --git a/server/grpc/gproto/test_micro_grpc.pb.go b/server/grpc/gproto/test_micro_grpc.pb.go index 1a659cb..9467395 100644 --- a/server/grpc/gproto/test_micro_grpc.pb.go +++ b/server/grpc/gproto/test_micro_grpc.pb.go @@ -30,7 +30,7 @@ func (c *testClient) Call(ctx context.Context, req *proto.Request, opts ...clien return rsp, nil } -func (c *testClient) StreamCall(ctx context.Context, opts ...client.CallOption) (Test_StreamCallClient, error) { +func (c *testClient) StreamCall(ctx context.Context, opts ...client.CallOption) (proto.Test_StreamCallClient, error) { stream, err := c.c.Stream(ctx, c.c.NewRequest(c.name, "Test.StreamCall", &proto.Request{}), opts...) if err != nil { return nil, err @@ -42,6 +42,18 @@ type testClientStreamCall struct { stream client.Stream } +func (s *testClientStreamCall) CloseAndRecv() (*proto.Response, error) { + msg := &proto.Response{} + err := s.RecvMsg(msg) + if err == nil { + err = s.Close() + } + if err != nil { + return nil, err + } + return msg, nil +} + func (s *testClientStreamCall) Close() error { return s.stream.Close() } @@ -94,6 +106,13 @@ type testStreamCallStream struct { stream server.Stream } +func (s *testStreamCallStream) SendAndClose(msg *proto.Response) error { + err := s.SendMsg(msg) + if err == nil { + err = s.stream.Close() + } + return err +} func (s *testStreamCallStream) Close() error { return s.stream.Close() } @@ -131,6 +150,5 @@ func RegisterTestServer(s server.Server, sh proto.TestServer, opts ...server.Han test } h := &testServer{sh} - var nopts []server.HandlerOption - return s.Handle(s.NewHandler(&Test{h}, append(nopts, opts...)...)) + return s.Handle(s.NewHandler(&Test{h}, opts...)) } diff --git a/server/grpc/proto/test.pb.go b/server/grpc/proto/test.pb.go index a3560fa..ad2ec0b 100644 --- a/server/grpc/proto/test.pb.go +++ b/server/grpc/proto/test.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.26.0 -// protoc v5.28.3 +// protoc v5.29.2 // source: test.proto package helloworld diff --git a/server/grpc/proto/test_grpc.pb.go b/server/grpc/proto/test_grpc.pb.go index f747f68..58eed31 100644 --- a/server/grpc/proto/test_grpc.pb.go +++ b/server/grpc/proto/test_grpc.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go-grpc. DO NOT EDIT. // versions: // - protoc-gen-go-grpc v1.5.1 -// - protoc v5.28.3 +// - protoc v5.29.2 // source: test.proto package helloworld diff --git a/server/http/proto/test.pb.go b/server/http/proto/test.pb.go index 523d039..fc0de48 100644 --- a/server/http/proto/test.pb.go +++ b/server/http/proto/test.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.26.0 -// protoc v5.28.3 +// protoc v5.29.2 // source: test.proto package pb diff --git a/server/http/proto/test_micro.pb.go b/server/http/proto/test_micro.pb.go index 8413bac..104da56 100644 --- a/server/http/proto/test_micro.pb.go +++ b/server/http/proto/test_micro.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go-micro. DO NOT EDIT. // versions: // - protoc-gen-go-micro v3.10.4 -// - protoc v5.28.3 +// - protoc v5.29.2 // source: test.proto package pb diff --git a/server/http/proto/test_micro_http.pb.go b/server/http/proto/test_micro_http.pb.go index ce7ca96..d84d248 100644 --- a/server/http/proto/test_micro_http.pb.go +++ b/server/http/proto/test_micro_http.pb.go @@ -76,9 +76,8 @@ func RegisterTestDoubleServer(s server.Server, sh TestDoubleServer, opts ...serv testDouble } h := &testDoubleServer{sh} - var nopts []server.HandlerOption - nopts = append(nopts, v3.HandlerEndpoints(TestDoubleServerEndpoints)) - return s.Handle(s.NewHandler(&TestDouble{h}, append(nopts, opts...)...)) + opts = append(opts, v3.HandlerEndpoints(TestDoubleServerEndpoints)) + return s.Handle(s.NewHandler(&TestDouble{h}, opts...)) } var ( @@ -235,8 +234,8 @@ func (h *testServer) Call(ctx context.Context, req *CallReq, rsp *CallRsp) error ctx, cancel = context.WithTimeout(ctx, td) defer cancel() v3.FillRequest(ctx, req, - v3.Header("Clientid", "true"), v3.Cookie("Csrftoken", "true"), + v3.Header("Clientid", "true"), ) return h.TestServer.Call(ctx, req, rsp) } @@ -256,7 +255,6 @@ func RegisterTestServer(s server.Server, sh TestServer, opts ...server.HandlerOp test } h := &testServer{sh} - var nopts []server.HandlerOption - nopts = append(nopts, v3.HandlerEndpoints(TestServerEndpoints)) - return s.Handle(s.NewHandler(&Test{h}, append(nopts, opts...)...)) + opts = append(opts, v3.HandlerEndpoints(TestServerEndpoints)) + return s.Handle(s.NewHandler(&Test{h}, opts...)) } diff --git a/util/reflect/proto/test.pb.go b/util/reflect/proto/test.pb.go index 53ac0aa..1918ca5 100644 --- a/util/reflect/proto/test.pb.go +++ b/util/reflect/proto/test.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.26.0 -// protoc v5.28.3 +// protoc v5.29.2 // source: test.proto package pb