Skip to content

Commit 994f5f8

Browse files
kabirkabir
authored
Merge pull request #5 from ehsavoie/api-cleanup
refactor: centralize A2A method names in A2AMethods interface
2 parents f408a68 + 2956a15 commit 994f5f8

File tree

24 files changed

+251
-236
lines changed

24 files changed

+251
-236
lines changed

‎client/transport/grpc/src/main/java/io/a2a/client/transport/grpc/GrpcTransport.java‎

Lines changed: 20 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,15 @@
11
package io.a2a.client.transport.grpc;
22

3+
import static io.a2a.spec.A2AMethods.CANCEL_TASK_METHOD;
4+
import static io.a2a.spec.A2AMethods.DELETE_TASK_PUSH_NOTIFICATION_CONFIG_METHOD;
5+
import static io.a2a.spec.A2AMethods.GET_TASK_METHOD;
6+
import static io.a2a.spec.A2AMethods.GET_TASK_PUSH_NOTIFICATION_CONFIG_METHOD;
7+
import static io.a2a.spec.A2AMethods.LIST_TASK_METHOD;
8+
import static io.a2a.spec.A2AMethods.LIST_TASK_PUSH_NOTIFICATION_CONFIG_METHOD;
9+
import static io.a2a.spec.A2AMethods.SEND_MESSAGE_METHOD;
10+
import static io.a2a.spec.A2AMethods.SEND_STREAMING_MESSAGE_METHOD;
11+
import static io.a2a.spec.A2AMethods.SET_TASK_PUSH_NOTIFICATION_CONFIG_METHOD;
12+
import static io.a2a.spec.A2AMethods.SUBSCRIBE_TO_TASK_METHOD;
313
import static io.a2a.util.Assert.checkNotNullParam;
414

515
import java.util.List;
@@ -18,17 +28,7 @@
1828
import io.a2a.grpc.A2AServiceGrpc.A2AServiceStub;
1929
import io.a2a.grpc.utils.ProtoUtils.FromProto;
2030
import io.a2a.grpc.utils.ProtoUtils.ToProto;
21-
import io.a2a.jsonrpc.common.wrappers.CancelTaskRequest;
22-
import io.a2a.jsonrpc.common.wrappers.DeleteTaskPushNotificationConfigRequest;
23-
import io.a2a.jsonrpc.common.wrappers.GetTaskPushNotificationConfigRequest;
24-
import io.a2a.jsonrpc.common.wrappers.GetTaskRequest;
25-
import io.a2a.jsonrpc.common.wrappers.ListTaskPushNotificationConfigRequest;
26-
import io.a2a.jsonrpc.common.wrappers.ListTasksRequest;
2731
import io.a2a.jsonrpc.common.wrappers.ListTasksResult;
28-
import io.a2a.jsonrpc.common.wrappers.SendMessageRequest;
29-
import io.a2a.jsonrpc.common.wrappers.SendStreamingMessageRequest;
30-
import io.a2a.jsonrpc.common.wrappers.SetTaskPushNotificationConfigRequest;
31-
import io.a2a.jsonrpc.common.wrappers.SubscribeToTaskRequest;
3232
import io.a2a.spec.A2AClientException;
3333
import io.a2a.spec.AgentCard;
3434
import io.a2a.spec.DeleteTaskPushNotificationConfigParams;
@@ -95,7 +95,7 @@ public EventKind sendMessage(MessageSendParams request, @Nullable ClientCallCont
9595
MessageSendParams tenantRequest = createRequestWithTenant(request);
9696

9797
io.a2a.grpc.SendMessageRequest sendMessageRequest = createGrpcSendMessageRequest(tenantRequest, context);
98-
PayloadAndHeaders payloadAndHeaders = applyInterceptors(SendMessageRequest.METHOD, sendMessageRequest,
98+
PayloadAndHeaders payloadAndHeaders = applyInterceptors(SEND_MESSAGE_METHOD, sendMessageRequest,
9999
agentCard, context);
100100

101101
try {
@@ -121,7 +121,7 @@ public void sendMessageStreaming(MessageSendParams request, Consumer<StreamingEv
121121
MessageSendParams tenantRequest = createRequestWithTenant(request);
122122

123123
io.a2a.grpc.SendMessageRequest grpcRequest = createGrpcSendMessageRequest(tenantRequest, context);
124-
PayloadAndHeaders payloadAndHeaders = applyInterceptors(SendStreamingMessageRequest.METHOD,
124+
PayloadAndHeaders payloadAndHeaders = applyInterceptors(SEND_STREAMING_MESSAGE_METHOD,
125125
grpcRequest, agentCard, context);
126126
StreamObserver<io.a2a.grpc.StreamResponse> streamObserver = new EventStreamObserver(eventConsumer, errorConsumer);
127127

@@ -143,7 +143,7 @@ public Task getTask(TaskQueryParams request, @Nullable ClientCallContext context
143143
}
144144
requestBuilder.setTenant(resolveTenant(request.tenant()));
145145
io.a2a.grpc.GetTaskRequest getTaskRequest = requestBuilder.build();
146-
PayloadAndHeaders payloadAndHeaders = applyInterceptors(GetTaskRequest.METHOD, getTaskRequest,
146+
PayloadAndHeaders payloadAndHeaders = applyInterceptors(GET_TASK_METHOD, getTaskRequest,
147147
agentCard, context);
148148

149149
try {
@@ -162,8 +162,7 @@ public Task cancelTask(TaskIdParams request, @Nullable ClientCallContext context
162162
.setName("tasks/" + request.id())
163163
.setTenant(resolveTenant(request.tenant()))
164164
.build();
165-
PayloadAndHeaders payloadAndHeaders = applyInterceptors(CancelTaskRequest.METHOD, cancelTaskRequest,
166-
agentCard, context);
165+
PayloadAndHeaders payloadAndHeaders = applyInterceptors(CANCEL_TASK_METHOD, cancelTaskRequest, agentCard, context);
167166

168167
try {
169168
A2AServiceBlockingV2Stub stubWithMetadata = createBlockingStubWithMetadata(context, payloadAndHeaders);
@@ -201,8 +200,7 @@ public ListTasksResult listTasks(ListTasksParams request, @Nullable ClientCallCo
201200
}
202201
requestBuilder.setTenant(resolveTenant(request.tenant()));
203202
io.a2a.grpc.ListTasksRequest listTasksRequest = requestBuilder.build();
204-
PayloadAndHeaders payloadAndHeaders = applyInterceptors(ListTasksRequest.METHOD, listTasksRequest,
205-
agentCard, context);
203+
PayloadAndHeaders payloadAndHeaders = applyInterceptors(LIST_TASK_METHOD, listTasksRequest, agentCard, context);
206204

207205
try {
208206
A2AServiceBlockingV2Stub stubWithMetadata = createBlockingStubWithMetadata(context, payloadAndHeaders);
@@ -233,8 +231,7 @@ public TaskPushNotificationConfig setTaskPushNotificationConfiguration(TaskPushN
233231
.setConfigId(configId != null ? configId : request.taskId())
234232
.setTenant(resolveTenant(request.tenant()))
235233
.build();
236-
PayloadAndHeaders payloadAndHeaders = applyInterceptors(SetTaskPushNotificationConfigRequest.METHOD,
237-
grpcRequest, agentCard, context);
234+
PayloadAndHeaders payloadAndHeaders = applyInterceptors(SET_TASK_PUSH_NOTIFICATION_CONFIG_METHOD, grpcRequest, agentCard, context);
238235

239236
try {
240237
A2AServiceBlockingV2Stub stubWithMetadata = createBlockingStubWithMetadata(context, payloadAndHeaders);
@@ -254,8 +251,7 @@ public TaskPushNotificationConfig getTaskPushNotificationConfiguration(
254251
.setName(getTaskPushNotificationConfigName(request))
255252
.setTenant(resolveTenant(request.tenant()))
256253
.build();
257-
PayloadAndHeaders payloadAndHeaders = applyInterceptors(GetTaskPushNotificationConfigRequest.METHOD,
258-
grpcRequest, agentCard, context);
254+
PayloadAndHeaders payloadAndHeaders = applyInterceptors(GET_TASK_PUSH_NOTIFICATION_CONFIG_METHOD, grpcRequest, agentCard, context);
259255

260256
try {
261257
A2AServiceBlockingV2Stub stubWithMetadata = createBlockingStubWithMetadata(context, payloadAndHeaders);
@@ -277,7 +273,7 @@ public ListTaskPushNotificationConfigResult listTaskPushNotificationConfiguratio
277273
.setPageSize(request.pageSize())
278274
.setPageToken(request.pageToken())
279275
.build();
280-
PayloadAndHeaders payloadAndHeaders = applyInterceptors(ListTaskPushNotificationConfigRequest.METHOD,
276+
PayloadAndHeaders payloadAndHeaders = applyInterceptors(LIST_TASK_PUSH_NOTIFICATION_CONFIG_METHOD,
281277
grpcRequest, agentCard, context);
282278

283279
try {
@@ -298,8 +294,7 @@ public void deleteTaskPushNotificationConfigurations(DeleteTaskPushNotificationC
298294
.setName(getTaskPushNotificationConfigName(request.id(), request.pushNotificationConfigId()))
299295
.setTenant(resolveTenant(request.tenant()))
300296
.build();
301-
PayloadAndHeaders payloadAndHeaders = applyInterceptors(DeleteTaskPushNotificationConfigRequest.METHOD,
302-
grpcRequest, agentCard, context);
297+
PayloadAndHeaders payloadAndHeaders = applyInterceptors(DELETE_TASK_PUSH_NOTIFICATION_CONFIG_METHOD, grpcRequest, agentCard, context);
303298

304299
try {
305300
A2AServiceBlockingV2Stub stubWithMetadata = createBlockingStubWithMetadata(context, payloadAndHeaders);
@@ -319,8 +314,7 @@ public void resubscribe(TaskIdParams request, Consumer<StreamingEventKind> event
319314
.setTenant(resolveTenant(request.tenant()))
320315
.setName("tasks/" + request.id())
321316
.build();
322-
PayloadAndHeaders payloadAndHeaders = applyInterceptors(SubscribeToTaskRequest.METHOD,
323-
grpcRequest, agentCard, context);
317+
PayloadAndHeaders payloadAndHeaders = applyInterceptors(SUBSCRIBE_TO_TASK_METHOD, grpcRequest, agentCard, context);
324318

325319
StreamObserver<io.a2a.grpc.StreamResponse> streamObserver = new EventStreamObserver(eventConsumer, errorConsumer);
326320

0 commit comments

Comments
 (0)