From 17999e2149de0bb2e8cc2e1ceab3f1302f0e2a65 Mon Sep 17 00:00:00 2001 From: Neil Alexander Date: Wed, 29 Apr 2020 10:32:38 +0100 Subject: [PATCH] Rename Input to Perform --- federationsender/api/api.go | 12 +++---- federationsender/api/input.go | 53 ------------------------------- federationsender/api/perform.go | 53 +++++++++++++++++++++++++++++++ federationsender/query/api.go | 16 +++++----- federationsender/query/input.go | 25 --------------- federationsender/query/perform.go | 25 +++++++++++++++ 6 files changed, 92 insertions(+), 92 deletions(-) delete mode 100644 federationsender/api/input.go create mode 100644 federationsender/api/perform.go delete mode 100644 federationsender/query/input.go create mode 100644 federationsender/query/perform.go diff --git a/federationsender/api/api.go b/federationsender/api/api.go index 163ac1a46..1340179e1 100644 --- a/federationsender/api/api.go +++ b/federationsender/api/api.go @@ -25,16 +25,16 @@ type FederationSenderInternalAPI interface { response *QueryJoinedHostServerNamesInRoomResponse, ) error // Handle an instruction to make_join & send_join with a remote server. - InputJoinRequest( + PerformJoinRequest( ctx context.Context, - request *InputJoinRequest, - response *InputJoinResponse, + request *PerformJoinRequest, + response *PerformJoinResponse, ) error // Handle an instruction to make_leave & send_leave with a remote server. - InputLeaveRequest( + PerformLeaveRequest( ctx context.Context, - request *InputLeaveRequest, - response *InputLeaveResponse, + request *PerformLeaveRequest, + response *PerformLeaveResponse, ) error } diff --git a/federationsender/api/input.go b/federationsender/api/input.go deleted file mode 100644 index 0e680242e..000000000 --- a/federationsender/api/input.go +++ /dev/null @@ -1,53 +0,0 @@ -package api - -import ( - "context" - - commonHTTP "github.com/matrix-org/dendrite/common/http" - "github.com/opentracing/opentracing-go" -) - -const ( - FederationSenderInputJoinRequestPath = "/api/federationsender/inputJoinRequest" - FederationSenderInputLeaveRequestPath = "/api/federationsender/inputLeaveRequest" -) - -type InputJoinRequest struct { - RoomID string `json:"room_id"` -} - -type InputJoinResponse struct { -} - -// Handle an instruction to make_join & send_join with a remote server. -func (h *httpFederationSenderInternalAPI) InputJoinRequest( - ctx context.Context, - request *InputJoinRequest, - response *InputJoinResponse, -) error { - span, ctx := opentracing.StartSpanFromContext(ctx, "InputJoinRequest") - defer span.Finish() - - apiURL := h.federationSenderURL + FederationSenderInputJoinRequestPath - return commonHTTP.PostJSON(ctx, span, h.httpClient, apiURL, request, response) -} - -type InputLeaveRequest struct { - RoomID string `json:"room_id"` -} - -type InputLeaveResponse struct { -} - -// Handle an instruction to make_leave & send_leave with a remote server. -func (h *httpFederationSenderInternalAPI) InputLeaveRequest( - ctx context.Context, - request *InputLeaveRequest, - response *InputLeaveResponse, -) error { - span, ctx := opentracing.StartSpanFromContext(ctx, "InputLeaveRequest") - defer span.Finish() - - apiURL := h.federationSenderURL + FederationSenderInputLeaveRequestPath - return commonHTTP.PostJSON(ctx, span, h.httpClient, apiURL, request, response) -} diff --git a/federationsender/api/perform.go b/federationsender/api/perform.go new file mode 100644 index 000000000..c07710278 --- /dev/null +++ b/federationsender/api/perform.go @@ -0,0 +1,53 @@ +package api + +import ( + "context" + + commonHTTP "github.com/matrix-org/dendrite/common/http" + "github.com/opentracing/opentracing-go" +) + +const ( + FederationSenderPerformJoinRequestPath = "/api/federationsender/inputJoinRequest" + FederationSenderPerformLeaveRequestPath = "/api/federationsender/inputLeaveRequest" +) + +type PerformJoinRequest struct { + RoomID string `json:"room_id"` +} + +type PerformJoinResponse struct { +} + +// Handle an instruction to make_join & send_join with a remote server. +func (h *httpFederationSenderInternalAPI) PerformJoinRequest( + ctx context.Context, + request *PerformJoinRequest, + response *PerformJoinResponse, +) error { + span, ctx := opentracing.StartSpanFromContext(ctx, "PerformJoinRequest") + defer span.Finish() + + apiURL := h.federationSenderURL + FederationSenderPerformJoinRequestPath + return commonHTTP.PostJSON(ctx, span, h.httpClient, apiURL, request, response) +} + +type PerformLeaveRequest struct { + RoomID string `json:"room_id"` +} + +type PerformLeaveResponse struct { +} + +// Handle an instruction to make_leave & send_leave with a remote server. +func (h *httpFederationSenderInternalAPI) PerformLeaveRequest( + ctx context.Context, + request *PerformLeaveRequest, + response *PerformLeaveResponse, +) error { + span, ctx := opentracing.StartSpanFromContext(ctx, "PerformLeaveRequest") + defer span.Finish() + + apiURL := h.federationSenderURL + FederationSenderPerformLeaveRequestPath + return commonHTTP.PostJSON(ctx, span, h.httpClient, apiURL, request, response) +} diff --git a/federationsender/query/api.go b/federationsender/query/api.go index bfb2db14d..e90bf3135 100644 --- a/federationsender/query/api.go +++ b/federationsender/query/api.go @@ -56,27 +56,27 @@ func (f *FederationSenderInternalAPI) SetupHTTP(servMux *http.ServeMux) { return util.JSONResponse{Code: http.StatusOK, JSON: &response} }), ) - servMux.Handle(api.FederationSenderInputJoinRequestPath, + servMux.Handle(api.FederationSenderPerformJoinRequestPath, common.MakeInternalAPI("inputJoinRequest", func(req *http.Request) util.JSONResponse { - var request api.InputJoinRequest - var response api.InputJoinResponse + var request api.PerformJoinRequest + var response api.PerformJoinResponse if err := json.NewDecoder(req.Body).Decode(&request); err != nil { return util.MessageResponse(http.StatusBadRequest, err.Error()) } - if err := f.InputJoinRequest(req.Context(), &request, &response); err != nil { + if err := f.PerformJoinRequest(req.Context(), &request, &response); err != nil { return util.ErrorResponse(err) } return util.JSONResponse{Code: http.StatusOK, JSON: &response} }), ) - servMux.Handle(api.FederationSenderInputLeaveRequestPath, + servMux.Handle(api.FederationSenderPerformLeaveRequestPath, common.MakeInternalAPI("inputLeaveRequest", func(req *http.Request) util.JSONResponse { - var request api.InputLeaveRequest - var response api.InputLeaveResponse + var request api.PerformLeaveRequest + var response api.PerformLeaveResponse if err := json.NewDecoder(req.Body).Decode(&request); err != nil { return util.MessageResponse(http.StatusBadRequest, err.Error()) } - if err := f.InputLeaveRequest(req.Context(), &request, &response); err != nil { + if err := f.PerformLeaveRequest(req.Context(), &request, &response); err != nil { return util.ErrorResponse(err) } return util.JSONResponse{Code: http.StatusOK, JSON: &response} diff --git a/federationsender/query/input.go b/federationsender/query/input.go deleted file mode 100644 index 6687c7e57..000000000 --- a/federationsender/query/input.go +++ /dev/null @@ -1,25 +0,0 @@ -package query - -import ( - "context" - - "github.com/matrix-org/dendrite/federationsender/api" -) - -// InputJoinRequest implements api.FederationSenderInternalAPI -func (r *FederationSenderInternalAPI) InputJoinRequest( - ctx context.Context, - request *api.InputJoinRequest, - response *api.InputJoinResponse, -) (err error) { - return nil -} - -// InputLeaveRequest implements api.FederationSenderInternalAPI -func (r *FederationSenderInternalAPI) InputLeaveRequest( - ctx context.Context, - request *api.InputLeaveRequest, - response *api.InputLeaveResponse, -) (err error) { - return nil -} diff --git a/federationsender/query/perform.go b/federationsender/query/perform.go new file mode 100644 index 000000000..2486873c2 --- /dev/null +++ b/federationsender/query/perform.go @@ -0,0 +1,25 @@ +package query + +import ( + "context" + + "github.com/matrix-org/dendrite/federationsender/api" +) + +// PerformJoinRequest implements api.FederationSenderInternalAPI +func (r *FederationSenderInternalAPI) PerformJoinRequest( + ctx context.Context, + request *api.PerformJoinRequest, + response *api.PerformJoinResponse, +) (err error) { + return nil +} + +// PerformLeaveRequest implements api.FederationSenderInternalAPI +func (r *FederationSenderInternalAPI) PerformLeaveRequest( + ctx context.Context, + request *api.PerformLeaveRequest, + response *api.PerformLeaveResponse, +) (err error) { + return nil +}