From 417b6d7f504d40e5200230cd4ce499915dd08c08 Mon Sep 17 00:00:00 2001 From: "sudesh.shetty" Date: Mon, 24 Feb 2020 14:21:25 -0500 Subject: [PATCH] refactor: command names matching REST endpoints - closes #1334 Signed-off-by: sudesh.shetty --- pkg/controller/command/messaging/command.go | 48 +++++++++---------- .../command/messaging/command_test.go | 46 +++++++++--------- pkg/controller/command/route/command.go | 10 ++-- pkg/controller/command/route/command_test.go | 4 +- pkg/controller/rest/messaging/operation.go | 48 +++++++++---------- .../rest/messaging/operation_test.go | 12 ++--- pkg/controller/rest/route/operation.go | 8 ++-- 7 files changed, 88 insertions(+), 88 deletions(-) diff --git a/pkg/controller/command/messaging/command.go b/pkg/controller/command/messaging/command.go index bd9483549..cc1d1279b 100644 --- a/pkg/controller/command/messaging/command.go +++ b/pkg/controller/command/messaging/command.go @@ -45,12 +45,12 @@ const ( errMsgIDEmpty = "empty message ID" // command methods - registeredServicesCommandMethod = "RegisteredServices" - registerMessageServiceCommandMethod = "RegisterMessageService" - unregisterMessageServiceCommandMethod = "UnregisterMessageService" - registerHTTPMessageServiceCommandMethod = "RegisterHTTPMessageService" - sendNewMessageCommandMethod = "SendNewMessage" - sendReplyMessageCommandMethod = "SendReplyMessage" + registeredServicesCommandMethod = "Services" + registerMessageServiceCommandMethod = "RegisterService" + unregisterMessageServiceCommandMethod = "UnregisterService" + registerHTTPMessageServiceCommandMethod = "RegisterHTTPService" + sendNewMessageCommandMethod = "Send" + sendReplyMessageCommandMethod = "Reply" // log constants connectionIDString = "connectionID" @@ -113,17 +113,17 @@ func New(ctx provider, registrar command.MessageHandler, notifier webhook.Notifi // GetHandlers returns list of all commands supported by this controller command func (o *Command) GetHandlers() []command.Handler { return []command.Handler{ - cmdutil.NewCommandHandler(commandName, registeredServicesCommandMethod, o.RegisteredServices), - cmdutil.NewCommandHandler(commandName, registerMessageServiceCommandMethod, o.RegisterMessageService), - cmdutil.NewCommandHandler(commandName, unregisterMessageServiceCommandMethod, o.UnregisterMessageService), - cmdutil.NewCommandHandler(commandName, registerHTTPMessageServiceCommandMethod, o.RegisterHTTPMessageService), - cmdutil.NewCommandHandler(commandName, sendNewMessageCommandMethod, o.SendNewMessage), - cmdutil.NewCommandHandler(commandName, sendReplyMessageCommandMethod, o.SendReplyMessage), + cmdutil.NewCommandHandler(commandName, registeredServicesCommandMethod, o.Services), + cmdutil.NewCommandHandler(commandName, registerMessageServiceCommandMethod, o.RegisterService), + cmdutil.NewCommandHandler(commandName, unregisterMessageServiceCommandMethod, o.UnregisterService), + cmdutil.NewCommandHandler(commandName, registerHTTPMessageServiceCommandMethod, o.RegisterHTTPService), + cmdutil.NewCommandHandler(commandName, sendNewMessageCommandMethod, o.Send), + cmdutil.NewCommandHandler(commandName, sendReplyMessageCommandMethod, o.Reply), } } -// RegisterMessageService registers new message service to message handler registrar -func (o *Command) RegisterMessageService(rw io.Writer, req io.Reader) command.Error { +// RegisterService registers new message service to message handler registrar +func (o *Command) RegisterService(rw io.Writer, req io.Reader) command.Error { var request RegisterMsgSvcArgs err := json.NewDecoder(req).Decode(&request) @@ -135,8 +135,8 @@ func (o *Command) RegisterMessageService(rw io.Writer, req io.Reader) command.Er return o.registerMessageService(&request) } -// UnregisterMessageService unregisters given message service handler registrar -func (o *Command) UnregisterMessageService(rw io.Writer, req io.Reader) command.Error { +// UnregisterService unregisters given message service handler registrar +func (o *Command) UnregisterService(rw io.Writer, req io.Reader) command.Error { var request UnregisterMsgSvcArgs err := json.NewDecoder(req).Decode(&request) @@ -164,8 +164,8 @@ func (o *Command) UnregisterMessageService(rw io.Writer, req io.Reader) command. return nil } -// RegisteredServices returns list of registered service names -func (o *Command) RegisteredServices(rw io.Writer, req io.Reader) command.Error { +// Services returns list of registered service names +func (o *Command) Services(rw io.Writer, req io.Reader) command.Error { names := []string{} for _, svc := range o.msgRegistrar.Services() { names = append(names, svc.Name()) @@ -178,8 +178,8 @@ func (o *Command) RegisteredServices(rw io.Writer, req io.Reader) command.Error return nil } -// SendNewMessage sends new message to destination provided -func (o *Command) SendNewMessage(rw io.Writer, req io.Reader) command.Error { +// Send sends new message to destination provided +func (o *Command) Send(rw io.Writer, req io.Reader) command.Error { var request SendNewMessageArgs err := json.NewDecoder(req).Decode(&request) @@ -224,8 +224,8 @@ func (o *Command) SendNewMessage(rw io.Writer, req io.Reader) command.Error { return o.sendMessageToDestination(request.MessageBody, request.ServiceEndpointDestination) } -// SendReplyMessage sends reply to existing message -func (o *Command) SendReplyMessage(rw io.Writer, req io.Reader) command.Error { +// Reply sends reply to existing message +func (o *Command) Reply(rw io.Writer, req io.Reader) command.Error { var request SendReplyMessageArgs err := json.NewDecoder(req).Decode(&request) @@ -249,8 +249,8 @@ func (o *Command) SendReplyMessage(rw io.Writer, req io.Reader) command.Error { return command.NewExecuteError(SendMsgReplyError, fmt.Errorf("to be implemented")) } -// RegisterHTTPMessageService registers new http over didcomm service to message handler registrar -func (o *Command) RegisterHTTPMessageService(rw io.Writer, req io.Reader) command.Error { +// RegisterHTTPService registers new http over didcomm service to message handler registrar +func (o *Command) RegisterHTTPService(rw io.Writer, req io.Reader) command.Error { var request RegisterHTTPMsgSvcArgs err := json.NewDecoder(req).Decode(&request) diff --git a/pkg/controller/command/messaging/command_test.go b/pkg/controller/command/messaging/command_test.go index ab60b6bd4..1faa8d51d 100644 --- a/pkg/controller/command/messaging/command_test.go +++ b/pkg/controller/command/messaging/command_test.go @@ -50,7 +50,7 @@ func TestNew(t *testing.T) { }) } -func TestCommand_RegisterMessageService(t *testing.T) { +func TestCommand_RegisterService(t *testing.T) { t.Run("Successful Register Message Service", func(t *testing.T) { msgRegistrar := msghandler.NewMockMsgServiceProvider() cmd, err := New(&protocol.MockProvider{}, msgRegistrar, webhook.NewMockWebhookNotifier()) @@ -64,7 +64,7 @@ func TestCommand_RegisterMessageService(t *testing.T) { }` var b bytes.Buffer - cmdErr := cmd.RegisterMessageService(&b, bytes.NewBufferString(jsonStr)) + cmdErr := cmd.RegisterService(&b, bytes.NewBufferString(jsonStr)) require.NoError(t, cmdErr) require.Empty(t, b.String()) @@ -114,7 +114,7 @@ func TestCommand_RegisterMessageService(t *testing.T) { require.NotNil(t, cmd) var b bytes.Buffer - cmdErr := cmd.RegisterMessageService(&b, bytes.NewBufferString(tc.json)) + cmdErr := cmd.RegisterService(&b, bytes.NewBufferString(tc.json)) require.Error(t, cmdErr) require.Empty(t, b.String()) require.Equal(t, cmdErr.Type(), command.ValidationError) @@ -140,7 +140,7 @@ func TestCommand_RegisterMessageService(t *testing.T) { }` var b bytes.Buffer - cmdErr := cmd.RegisterMessageService(&b, bytes.NewBufferString(jsonStr)) + cmdErr := cmd.RegisterService(&b, bytes.NewBufferString(jsonStr)) require.Error(t, cmdErr) require.Empty(t, b.String()) require.Equal(t, cmdErr.Type(), command.ExecuteError) @@ -149,7 +149,7 @@ func TestCommand_RegisterMessageService(t *testing.T) { }) } -func TestCommand_RegisterHTTPMessageService(t *testing.T) { +func TestCommand_RegisterHTTPService(t *testing.T) { t.Run("Successful Register HTTP Message Service", func(t *testing.T) { msgRegistrar := msghandler.NewMockMsgServiceProvider() cmd, err := New(&protocol.MockProvider{}, msgRegistrar, webhook.NewMockWebhookNotifier()) @@ -162,7 +162,7 @@ func TestCommand_RegisterHTTPMessageService(t *testing.T) { }` var b bytes.Buffer - cmdErr := cmd.RegisterHTTPMessageService(&b, bytes.NewBufferString(jsonStr)) + cmdErr := cmd.RegisterHTTPService(&b, bytes.NewBufferString(jsonStr)) require.NoError(t, cmdErr) // verify if new service is registered @@ -205,7 +205,7 @@ func TestCommand_RegisterHTTPMessageService(t *testing.T) { require.NotNil(t, cmd) var b bytes.Buffer - cmdErr := cmd.RegisterHTTPMessageService(&b, bytes.NewBufferString(tc.json)) + cmdErr := cmd.RegisterHTTPService(&b, bytes.NewBufferString(tc.json)) require.Error(t, cmdErr) require.Empty(t, b.String()) require.Equal(t, cmdErr.Type(), command.ValidationError) @@ -230,7 +230,7 @@ func TestCommand_RegisterHTTPMessageService(t *testing.T) { }` var b bytes.Buffer - cmdErr := cmd.RegisterHTTPMessageService(&b, bytes.NewBufferString(jsonStr)) + cmdErr := cmd.RegisterHTTPService(&b, bytes.NewBufferString(jsonStr)) require.Error(t, cmdErr) require.Empty(t, b.String()) require.Equal(t, cmdErr.Type(), command.ExecuteError) @@ -239,7 +239,7 @@ func TestCommand_RegisterHTTPMessageService(t *testing.T) { }) } -func TestCommand_UnregisterMessageService(t *testing.T) { +func TestCommand_UnregisterService(t *testing.T) { t.Run("Unregistering non existing message service", func(t *testing.T) { cmd, err := New(&protocol.MockProvider{}, msghandler.NewMockMsgServiceProvider(), webhook.NewMockWebhookNotifier()) require.NoError(t, err) @@ -248,7 +248,7 @@ func TestCommand_UnregisterMessageService(t *testing.T) { var jsonStr = `{"name":"json-msg-01"}` var b bytes.Buffer - cmdErr := cmd.UnregisterMessageService(&b, bytes.NewBufferString(jsonStr)) + cmdErr := cmd.UnregisterService(&b, bytes.NewBufferString(jsonStr)) require.Error(t, cmdErr) require.Empty(t, b.String()) require.Equal(t, cmdErr.Type(), command.ExecuteError) @@ -262,7 +262,7 @@ func TestCommand_UnregisterMessageService(t *testing.T) { require.NotNil(t, cmd) var b bytes.Buffer - cmdErr := cmd.UnregisterMessageService(&b, bytes.NewBufferString(`{"name":""}`)) + cmdErr := cmd.UnregisterService(&b, bytes.NewBufferString(`{"name":""}`)) require.Error(t, cmdErr) require.Empty(t, b.String()) require.Equal(t, cmdErr.Type(), command.ValidationError) @@ -287,7 +287,7 @@ func TestCommand_UnregisterMessageService(t *testing.T) { const jsonStr = `{"name":"%s"}` for _, svcName := range svcNames { var b bytes.Buffer - cmdErr := cmd.UnregisterMessageService(&b, bytes.NewBufferString(fmt.Sprintf(jsonStr, svcName))) + cmdErr := cmd.UnregisterService(&b, bytes.NewBufferString(fmt.Sprintf(jsonStr, svcName))) require.NoError(t, cmdErr) require.Empty(t, b.String()) } @@ -301,7 +301,7 @@ func TestCommand_UnregisterMessageService(t *testing.T) { require.NotNil(t, cmd) var b bytes.Buffer - cmdErr := cmd.UnregisterMessageService(&b, bytes.NewBufferString(`{--`)) + cmdErr := cmd.UnregisterService(&b, bytes.NewBufferString(`{--`)) require.Error(t, cmdErr) require.Empty(t, b.String()) require.Equal(t, cmdErr.Type(), command.ValidationError) @@ -310,7 +310,7 @@ func TestCommand_UnregisterMessageService(t *testing.T) { }) } -func TestCommand_RegisteredServices(t *testing.T) { +func TestCommand_Services(t *testing.T) { msgRegistrar := msghandler.NewMockMsgServiceProvider() cmd, err := New(&protocol.MockProvider{}, msgRegistrar, webhook.NewMockWebhookNotifier()) require.NoError(t, err) @@ -326,7 +326,7 @@ func TestCommand_RegisteredServices(t *testing.T) { } var b bytes.Buffer - cmdErr := cmd.RegisteredServices(&b, bytes.NewBufferString(``)) + cmdErr := cmd.Services(&b, bytes.NewBufferString(``)) require.NoError(t, cmdErr) verifyResponse(&b, 0) @@ -341,12 +341,12 @@ func TestCommand_RegisteredServices(t *testing.T) { require.NoError(t, err) b.Reset() - cmdErr = cmd.RegisteredServices(&b, bytes.NewBufferString(``)) + cmdErr = cmd.Services(&b, bytes.NewBufferString(``)) require.NoError(t, cmdErr) verifyResponse(&b, len(testMsgSvcs)) } -func TestCommand_SendNewMessage(t *testing.T) { +func TestCommand_Send(t *testing.T) { t.Run("Test input args validation", func(t *testing.T) { tests := []struct { name string @@ -402,7 +402,7 @@ func TestCommand_SendNewMessage(t *testing.T) { require.NotNil(t, cmd) var b bytes.Buffer - cmdErr := cmd.SendNewMessage(&b, bytes.NewBufferString(tc.requestJSON)) + cmdErr := cmd.Send(&b, bytes.NewBufferString(tc.requestJSON)) require.Error(t, cmdErr) require.Empty(t, b.String()) require.Equal(t, cmdErr.Type(), command.ValidationError) @@ -455,7 +455,7 @@ func TestCommand_SendNewMessage(t *testing.T) { require.NotNil(t, cmd) var b bytes.Buffer - cmdErr := cmd.SendNewMessage(&b, bytes.NewBufferString(tc.requestJSON)) + cmdErr := cmd.Send(&b, bytes.NewBufferString(tc.requestJSON)) require.NoError(t, cmdErr) require.Empty(t, b.String()) }) @@ -542,7 +542,7 @@ func TestCommand_SendNewMessage(t *testing.T) { require.NotNil(t, cmd) var b bytes.Buffer - cmdErr := cmd.SendNewMessage(&b, bytes.NewBufferString(tc.requestJSON)) + cmdErr := cmd.Send(&b, bytes.NewBufferString(tc.requestJSON)) require.Error(t, cmdErr) require.Empty(t, b.String()) require.Equal(t, cmdErr.Type(), command.ExecuteError) @@ -553,7 +553,7 @@ func TestCommand_SendNewMessage(t *testing.T) { }) } -func TestOperation_SendReplyMessage(t *testing.T) { +func TestOperation_Reply(t *testing.T) { t.Run("Test input args validation", func(t *testing.T) { tests := []struct { name string @@ -597,7 +597,7 @@ func TestOperation_SendReplyMessage(t *testing.T) { require.NotNil(t, cmd) var b bytes.Buffer - cmdErr := cmd.SendReplyMessage(&b, bytes.NewBufferString(tc.requestJSON)) + cmdErr := cmd.Reply(&b, bytes.NewBufferString(tc.requestJSON)) require.Error(t, cmdErr) require.Empty(t, b.String()) require.Equal(t, cmdErr.Type(), command.ValidationError) @@ -614,7 +614,7 @@ func TestOperation_SendReplyMessage(t *testing.T) { require.NotNil(t, cmd) var b bytes.Buffer - cmdErr := cmd.SendReplyMessage(&b, bytes.NewBufferString(jsonMsg)) + cmdErr := cmd.Reply(&b, bytes.NewBufferString(jsonMsg)) require.Error(t, cmdErr) require.Empty(t, b.String()) require.Equal(t, cmdErr.Type(), command.ExecuteError) diff --git a/pkg/controller/command/route/command.go b/pkg/controller/command/route/command.go index 2a9ce2c94..b199f0b12 100644 --- a/pkg/controller/command/route/command.go +++ b/pkg/controller/command/route/command.go @@ -35,7 +35,7 @@ const ( // UnregisterRouterErrorCode for unregister router error UnregisterRouterErrorCode - // GetConnection for get connection id error + // Connection for get connection id error GetConnectionIDErrorCode ) @@ -46,7 +46,7 @@ const ( // command methods registerCommandMethod = "Register" unregisterCommandMethod = "Unregister" - getConnectionIDCommandMethod = "GetConnection" + getConnectionIDCommandMethod = "Connection" // log constants connectionID = "connectionID" @@ -80,7 +80,7 @@ func (o *Command) GetHandlers() []command.Handler { return []command.Handler{ cmdutil.NewCommandHandler(commandName, registerCommandMethod, o.Register), cmdutil.NewCommandHandler(commandName, unregisterCommandMethod, o.Unregister), - cmdutil.NewCommandHandler(commandName, getConnectionIDCommandMethod, o.GetConnection), + cmdutil.NewCommandHandler(commandName, getConnectionIDCommandMethod, o.Connection), } } @@ -130,8 +130,8 @@ func (o *Command) Unregister(rw io.Writer, req io.Reader) command.Error { return nil } -// GetConnection returns the connectionID of the router. -func (o *Command) GetConnection(rw io.Writer, req io.Reader) command.Error { +// Connection returns the connectionID of the router. +func (o *Command) Connection(rw io.Writer, req io.Reader) command.Error { connectionID, err := o.routeClient.GetConnection() if err != nil { logutil.LogError(logger, commandName, getConnectionIDCommandMethod, err.Error()) diff --git a/pkg/controller/command/route/command_test.go b/pkg/controller/command/route/command_test.go index 602540779..525cf52a6 100644 --- a/pkg/controller/command/route/command_test.go +++ b/pkg/controller/command/route/command_test.go @@ -158,7 +158,7 @@ func TestGetConnectionID(t *testing.T) { require.NotNil(t, cmd) var b bytes.Buffer - err = cmd.GetConnection(&b, nil) + err = cmd.Connection(&b, nil) require.NoError(t, err) response := RegisterRoute{} @@ -179,7 +179,7 @@ func TestGetConnectionID(t *testing.T) { require.NotNil(t, cmd) var b bytes.Buffer - err = cmd.GetConnection(&b, nil) + err = cmd.Connection(&b, nil) require.Error(t, err) require.Contains(t, err.Error(), "get router connectionID") }) diff --git a/pkg/controller/rest/messaging/operation.go b/pkg/controller/rest/messaging/operation.go index 441fbe51d..d88d36ef4 100644 --- a/pkg/controller/rest/messaging/operation.go +++ b/pkg/controller/rest/messaging/operation.go @@ -71,72 +71,72 @@ func (o *Operation) GetRESTHandlers() []rest.Handler { func (o *Operation) registerHandler() { // Add more protocol endpoints here to expose them as controller API endpoints o.handlers = []rest.Handler{ - cmdutil.NewHTTPHandler(registerMsgService, http.MethodPost, o.RegisterMessageService), - cmdutil.NewHTTPHandler(unregisterMsgService, http.MethodPost, o.UnregisterMessageService), - cmdutil.NewHTTPHandler(msgServiceList, http.MethodGet, o.RegisteredServices), - cmdutil.NewHTTPHandler(sendNewMsg, http.MethodPost, o.SendNewMessage), - cmdutil.NewHTTPHandler(sendReplyMsg, http.MethodPost, o.SendReplyMessage), - cmdutil.NewHTTPHandler(registerHTTPOverDIDCommService, http.MethodPost, o.RegisterHTTPMessageService), + cmdutil.NewHTTPHandler(registerMsgService, http.MethodPost, o.RegisterService), + cmdutil.NewHTTPHandler(unregisterMsgService, http.MethodPost, o.UnregisterService), + cmdutil.NewHTTPHandler(msgServiceList, http.MethodGet, o.Services), + cmdutil.NewHTTPHandler(sendNewMsg, http.MethodPost, o.Send), + cmdutil.NewHTTPHandler(sendReplyMsg, http.MethodPost, o.Reply), + cmdutil.NewHTTPHandler(registerHTTPOverDIDCommService, http.MethodPost, o.RegisterHTTPService), } } -// RegisterMessageService swagger:route POST /message/register-service message registerMsgSvc +// RegisterService swagger:route POST /message/register-service message registerMsgSvc // // registers new message service to message handler registrar // // Responses: // default: genericError -func (o *Operation) RegisterMessageService(rw http.ResponseWriter, req *http.Request) { - rest.Execute(o.command.RegisterMessageService, rw, req.Body) +func (o *Operation) RegisterService(rw http.ResponseWriter, req *http.Request) { + rest.Execute(o.command.RegisterService, rw, req.Body) } -// UnregisterMessageService swagger:route POST /message/unregister-service message http-over-didcomm unregisterMsgSvc +// UnregisterService swagger:route POST /message/unregister-service message http-over-didcomm unregisterMsgSvc // // unregisters given message service handler registrar // // Responses: // default: genericError -func (o *Operation) UnregisterMessageService(rw http.ResponseWriter, req *http.Request) { - rest.Execute(o.command.UnregisterMessageService, rw, req.Body) +func (o *Operation) UnregisterService(rw http.ResponseWriter, req *http.Request) { + rest.Execute(o.command.UnregisterService, rw, req.Body) } -// RegisteredServices swagger:route GET /message/services message http-over-didcomm services +// Services swagger:route GET /message/services message http-over-didcomm services // // returns list of registered service names // // Responses: // default: genericError // 200: registeredServicesResponse -func (o *Operation) RegisteredServices(rw http.ResponseWriter, req *http.Request) { - rest.Execute(o.command.RegisteredServices, rw, req.Body) +func (o *Operation) Services(rw http.ResponseWriter, req *http.Request) { + rest.Execute(o.command.Services, rw, req.Body) } -// SendNewMessage swagger:route POST /message/send message sendNewMessage +// Send swagger:route POST /message/send message sendNewMessage // // sends new message to destination provided // // Responses: // default: genericError -func (o *Operation) SendNewMessage(rw http.ResponseWriter, req *http.Request) { - rest.Execute(o.command.SendNewMessage, rw, req.Body) +func (o *Operation) Send(rw http.ResponseWriter, req *http.Request) { + rest.Execute(o.command.Send, rw, req.Body) } -// SendReplyMessage swagger:route POST /message/reply message sendReplyMessage +// Reply swagger:route POST /message/reply message sendReplyMessage // // sends reply to existing message // // Responses: // default: genericError -func (o *Operation) SendReplyMessage(rw http.ResponseWriter, req *http.Request) { - rest.Execute(o.command.SendReplyMessage, rw, req.Body) +func (o *Operation) Reply(rw http.ResponseWriter, req *http.Request) { + rest.Execute(o.command.Reply, rw, req.Body) } -// RegisterHTTPMessageService swagger:route POST /http-over-didcomm/register http-over-didcomm registerHttpMsgSvc +// RegisterHTTPService swagger:route POST /http-over-didcomm/register http-over-didcomm registerHttpMsgSvc // // registers new http over didcomm service to message handler registrar // // Responses: // default: genericError -func (o *Operation) RegisterHTTPMessageService(rw http.ResponseWriter, req *http.Request) { - rest.Execute(o.command.RegisterHTTPMessageService, rw, req.Body) +func (o *Operation) RegisterHTTPService(rw http.ResponseWriter, req *http.Request) { + rest.Execute(o.command.RegisterHTTPService, rw, req.Body) } diff --git a/pkg/controller/rest/messaging/operation_test.go b/pkg/controller/rest/messaging/operation_test.go index 96b2ad7f8..de261cf2f 100644 --- a/pkg/controller/rest/messaging/operation_test.go +++ b/pkg/controller/rest/messaging/operation_test.go @@ -68,7 +68,7 @@ func TestOperation_GetAPIHandlers(t *testing.T) { }) } -func TestOperation_RegisterMessageService(t *testing.T) { +func TestOperation_RegisterService(t *testing.T) { t.Run("Successful Register Message Service", func(t *testing.T) { mhandler := msghandler.NewMockMsgServiceProvider() svc, err := New(&protocol.MockProvider{}, mhandler, webhook.NewMockWebhookNotifier()) @@ -165,7 +165,7 @@ func TestOperation_RegisterMessageService(t *testing.T) { }) } -func TestOperation_RegisterHTTPMessageService(t *testing.T) { +func TestOperation_RegisterHTTPService(t *testing.T) { t.Run("Successful Register HTTP Message Service", func(t *testing.T) { mhandler := msghandler.NewMockMsgServiceProvider() svc, err := New(&protocol.MockProvider{}, mhandler, webhook.NewMockWebhookNotifier()) @@ -254,7 +254,7 @@ func TestOperation_RegisterHTTPMessageService(t *testing.T) { }) } -func TestOperation_UnregisterMessageService(t *testing.T) { +func TestOperation_UnregisterService(t *testing.T) { t.Run("Unregistering non existing message service", func(t *testing.T) { svc, err := New(&protocol.MockProvider{}, msghandler.NewMockMsgServiceProvider(), webhook.NewMockWebhookNotifier()) require.NoError(t, err) @@ -328,7 +328,7 @@ func TestOperation_UnregisterMessageService(t *testing.T) { }) } -func TestOperation_RegisteredServices(t *testing.T) { +func TestOperation_Services(t *testing.T) { msgRegistrar := msghandler.NewMockMsgServiceProvider() svc, err := New(&protocol.MockProvider{}, msgRegistrar, webhook.NewMockWebhookNotifier()) require.NoError(t, err) @@ -363,7 +363,7 @@ func TestOperation_RegisteredServices(t *testing.T) { verifyResponse(buf, len(testMsgSvcs)) } -func TestOperation_SendNewMessage(t *testing.T) { +func TestOperation_Send(t *testing.T) { t.Run("Test request param validation", func(t *testing.T) { tests := []struct { name string @@ -581,7 +581,7 @@ func TestOperation_SendNewMessage(t *testing.T) { }) } -func TestOperation_SendReplyMessage(t *testing.T) { +func TestOperation_Reply(t *testing.T) { t.Run("Test request param validation", func(t *testing.T) { tests := []struct { name string diff --git a/pkg/controller/rest/route/operation.go b/pkg/controller/rest/route/operation.go index e17d7f43d..0cf759338 100644 --- a/pkg/controller/rest/route/operation.go +++ b/pkg/controller/rest/route/operation.go @@ -58,7 +58,7 @@ func (o *Operation) registerHandler() { o.handlers = []rest.Handler{ cmdutil.NewHTTPHandler(registerPath, http.MethodPost, o.Register), cmdutil.NewHTTPHandler(unregisterPath, http.MethodDelete, o.Unregister), - cmdutil.NewHTTPHandler(getConnectionPath, http.MethodGet, o.GetConnection), + cmdutil.NewHTTPHandler(getConnectionPath, http.MethodGet, o.Connection), } } @@ -83,13 +83,13 @@ func (o *Operation) Unregister(rw http.ResponseWriter, req *http.Request) { rest.Execute(o.command.Unregister, rw, req.Body) } -// GetConnection swagger:route GET /route/connection route routerConnection +// Connection swagger:route GET /route/connection route routerConnection // // Retrieves the router connection id. // // Responses: // default: genericError // 200: getConnectionResponse -func (o *Operation) GetConnection(rw http.ResponseWriter, req *http.Request) { - rest.Execute(o.command.GetConnection, rw, req.Body) +func (o *Operation) Connection(rw http.ResponseWriter, req *http.Request) { + rest.Execute(o.command.Connection, rw, req.Body) }