refactor: rename PostTasksActionRoute to TaskActionRoute

Author: JakubWorek

a2acompat/a2av0/rest_server.go

@@ -56,8 +56,8 @@ func NewRESTHandler(handler a2asrv.RequestHandler, opts ...a2asrv.TransportOptio
 	mux.HandleFunc("POST "+paths.SendMessage(), h.handleSendMessage)
 	mux.HandleFunc("POST "+paths.StreamMessage(), h.handleStreamMessage)
 	mux.HandleFunc("GET "+paths.ListTasks(), h.handleListTasks)
-	mux.HandleFunc("GET "+paths.PostTasksActionRoute(), h.handleGETTasks)
-	mux.HandleFunc("POST "+paths.PostTasksActionRoute(), h.handlePOSTTasks)
+	mux.HandleFunc("GET "+paths.TaskActionRoute(), h.handleGetOrSubscribeTask)
+	mux.HandleFunc("POST "+paths.TaskActionRoute(), h.handleCancelOrSubscribeTask)
 	mux.HandleFunc("POST "+paths.CreatePushConfig("{id}"), h.handleCreateTaskPushConfig)
 	mux.HandleFunc("GET "+paths.ListPushConfigs("{id}"), h.handleListTaskPushConfigs)
 	mux.HandleFunc("GET "+paths.GetPushConfig("{id}", "{configId}"), h.handleGetTaskPushConfig)
@@ -139,7 +139,7 @@ func (h *restCompatHandler) handleGetTask(taskID string, rw http.ResponseWriter,
 	writeJSON(ctx, rw, data)
 }
 
-func (h *restCompatHandler) handlePOSTTasks(rw http.ResponseWriter, req *http.Request) {
+func (h *restCompatHandler) handleCancelOrSubscribeTask(rw http.ResponseWriter, req *http.Request) {
 	ctx := req.Context()
 	idAndAction := req.PathValue("idAndAction")
 	if idAndAction == "" {
@@ -151,22 +151,26 @@ func (h *restCompatHandler) handlePOSTTasks(rw http.ResponseWriter, req *http.Re
 		return
 	}
 	if before, ok := strings.CutSuffix(idAndAction, ":subscribe"); ok {
-		h.handleStreamingRequest(h.handler.SubscribeToTask(ctx, &a2a.SubscribeToTaskRequest{ID: a2a.TaskID(before)}), rw, req)
+		h.handleSubscribeToTask(before, rw, req)
 		return
 	}
 	writeRESTCompatError(ctx, rw, a2a.ErrInvalidRequest, a2a.TaskID(""))
 }
 
-func (h *restCompatHandler) handleGETTasks(rw http.ResponseWriter, req *http.Request) {
-	ctx := req.Context()
+func (h *restCompatHandler) handleGetOrSubscribeTask(rw http.ResponseWriter, req *http.Request) {
 	idAndAction := req.PathValue("idAndAction")
 	if before, ok := strings.CutSuffix(idAndAction, ":subscribe"); ok {
-		h.handleStreamingRequest(h.handler.SubscribeToTask(ctx, &a2a.SubscribeToTaskRequest{ID: a2a.TaskID(before)}), rw, req)
+		h.handleSubscribeToTask(before, rw, req)
 		return
 	}
 	h.handleGetTask(idAndAction, rw, req)
 }
 
+func (h *restCompatHandler) handleSubscribeToTask(taskID string, rw http.ResponseWriter, req *http.Request) {
+	ctx := req.Context()
+	h.handleStreamingRequest(h.handler.SubscribeToTask(ctx, &a2a.SubscribeToTaskRequest{ID: a2a.TaskID(taskID)}), rw, req)
+}
+
 func (h *restCompatHandler) handleCancelTask(taskID string, rw http.ResponseWriter, req *http.Request) {
 	ctx := req.Context()
 	result, err := h.handler.CancelTask(ctx, &a2a.CancelTaskRequest{ID: a2a.TaskID(taskID)})

internal/rest/rest.go

@@ -99,9 +99,9 @@ func (p PathBuilder) DeletePushConfig(taskID, configID string) string {
 	return p.prefix + "/tasks/" + taskID + "/pushNotificationConfigs/" + configID
 }
 
-// PostTasksActionRoute returns the mux route pattern for handling any
-// POST /tasks/{id}:action verb (e.g. :cancel, :subscribe).
-func (p PathBuilder) PostTasksActionRoute() string {
+// TaskActionRoute returns the mux route pattern for handling any
+// /tasks/{id}:action verb (e.g. :cancel, :subscribe).
+func (p PathBuilder) TaskActionRoute() string {
 	return p.prefix + "/tasks/{idAndAction}"
 }
 

internal/rest/rest_test.go

@@ -51,7 +51,7 @@ func TestPathBuilder(t *testing.T) {
 		{"v1 ListPushConfigs", PathBuilder{}, PathBuilder{}.ListPushConfigs("t1"), "/tasks/t1/pushNotificationConfigs"},
 		{"v1 DeletePushConfig", PathBuilder{}, PathBuilder{}.DeletePushConfig("t1", "c1"), "/tasks/t1/pushNotificationConfigs/c1"},
 		{"v1 GetExtendedAgentCard", PathBuilder{}, PathBuilder{}.GetExtendedAgentCard(), "/extendedAgentCard"},
-		{"v1 PostTasksActionRoute", PathBuilder{}, PathBuilder{}.PostTasksActionRoute(), "/tasks/{idAndAction}"},
+		{"v1 TaskActionRoute", PathBuilder{}, PathBuilder{}.TaskActionRoute(), "/tasks/{idAndAction}"},
 
 		{"v03 ListTasks", NewPathBuilder("/v1"), NewPathBuilder("/v1").ListTasks(), "/v1/tasks"},
 		{"v03 SendMessage", NewPathBuilder("/v1"), NewPathBuilder("/v1").SendMessage(), "/v1/message:send"},
@@ -64,7 +64,7 @@ func TestPathBuilder(t *testing.T) {
 		{"v03 ListPushConfigs", NewPathBuilder("/v1"), NewPathBuilder("/v1").ListPushConfigs("t1"), "/v1/tasks/t1/pushNotificationConfigs"},
 		{"v03 DeletePushConfig", NewPathBuilder("/v1"), NewPathBuilder("/v1").DeletePushConfig("t1", "c1"), "/v1/tasks/t1/pushNotificationConfigs/c1"},
 		{"v03 GetExtendedAgentCard", NewPathBuilder("/v1"), NewPathBuilder("/v1").GetExtendedAgentCard(), "/v1/extendedAgentCard"},
-		{"v03 PostTasksActionRoute", NewPathBuilder("/v1"), NewPathBuilder("/v1").PostTasksActionRoute(), "/v1/tasks/{idAndAction}"},
+		{"v03 TaskActionRoute", NewPathBuilder("/v1"), NewPathBuilder("/v1").TaskActionRoute(), "/v1/tasks/{idAndAction}"},
 	}
 	for _, tc := range tests {
 		t.Run(tc.name, func(t *testing.T) {