@@ -142,7 +142,7 @@ public void sendMessageStreaming(MessageSendParams request, Consumer<StreamingEv
142142 public Task getTask (TaskQueryParams request , @ Nullable ClientCallContext context ) throws A2AClientException {
143143 checkNotNullParam ("request" , request );
144144 io .a2a .grpc .GetTaskRequest .Builder requestBuilder = io .a2a .grpc .GetTaskRequest .newBuilder ();
145- requestBuilder .setName ( "tasks/" + request .id ());
145+ requestBuilder .setId ( request .id ());
146146 if (request .historyLength () != null ) {
147147 requestBuilder .setHistoryLength (request .historyLength ());
148148 }
@@ -164,7 +164,7 @@ public Task cancelTask(TaskIdParams request, @Nullable ClientCallContext context
164164 checkNotNullParam ("request" , request );
165165
166166 io .a2a .grpc .CancelTaskRequest cancelTaskRequest = io .a2a .grpc .CancelTaskRequest .newBuilder ()
167- .setName ( "tasks/" + request .id ())
167+ .setId ( request .id ())
168168 .setTenant (resolveTenant (request .tenant ()))
169169 .build ();
170170 PayloadAndHeaders payloadAndHeaders = applyInterceptors (CANCEL_TASK_METHOD , cancelTaskRequest , agentCard , context );
@@ -230,13 +230,13 @@ public ListTasksResult listTasks(ListTasksParams request, @Nullable ClientCallCo
230230
231231 @ Override
232232 public TaskPushNotificationConfig createTaskPushNotificationConfiguration (TaskPushNotificationConfig request ,
233- @ Nullable ClientCallContext context ) throws A2AClientException {
233+ @ Nullable ClientCallContext context ) throws A2AClientException {
234234 checkNotNullParam ("request" , request );
235235
236236 String configId = request .pushNotificationConfig ().id ();
237237 io .a2a .grpc .CreateTaskPushNotificationConfigRequest grpcRequest = io .a2a .grpc .CreateTaskPushNotificationConfigRequest .newBuilder ()
238- .setParent ( "tasks/" + request .taskId ())
239- .setConfig (ToProto .taskPushNotificationConfig (request ))
238+ .setTaskId ( request .taskId ())
239+ .setConfig (ToProto .taskPushNotificationConfig (request ). getPushNotificationConfig () )
240240 .setConfigId (configId != null ? configId : request .taskId ())
241241 .setTenant (resolveTenant (request .tenant ()))
242242 .build ();
@@ -251,14 +251,18 @@ public TaskPushNotificationConfig createTaskPushNotificationConfiguration(TaskPu
251251 }
252252
253253 @ Override
254- public TaskPushNotificationConfig getTaskPushNotificationConfiguration (
255- GetTaskPushNotificationConfigParams request ,
254+ public TaskPushNotificationConfig getTaskPushNotificationConfiguration (GetTaskPushNotificationConfigParams request ,
256255 @ Nullable ClientCallContext context ) throws A2AClientException {
257256 checkNotNullParam ("request" , request );
257+ checkNotNullParam ("taskId" , request .id ());
258+ if (request .pushNotificationConfigId () == null ) {
259+ throw new IllegalArgumentException ("Id must not be null" );
260+ }
258261
259262 io .a2a .grpc .GetTaskPushNotificationConfigRequest grpcRequest = io .a2a .grpc .GetTaskPushNotificationConfigRequest .newBuilder ()
260- .setName ( getTaskPushNotificationConfigName ( request ))
263+ .setTaskId ( request . id ( ))
261264 .setTenant (resolveTenant (request .tenant ()))
265+ .setId (request .pushNotificationConfigId ())
262266 .build ();
263267 PayloadAndHeaders payloadAndHeaders = applyInterceptors (GET_TASK_PUSH_NOTIFICATION_CONFIG_METHOD , grpcRequest , agentCard , context );
264268
@@ -277,7 +281,7 @@ public ListTaskPushNotificationConfigResult listTaskPushNotificationConfiguratio
277281 checkNotNullParam ("request" , request );
278282
279283 io .a2a .grpc .ListTaskPushNotificationConfigRequest grpcRequest = io .a2a .grpc .ListTaskPushNotificationConfigRequest .newBuilder ()
280- .setParent ( "tasks/" + request .id ())
284+ .setTaskId ( request .id ())
281285 .setTenant (resolveTenant (request .tenant ()))
282286 .setPageSize (request .pageSize ())
283287 .setPageToken (request .pageToken ())
@@ -300,7 +304,8 @@ public void deleteTaskPushNotificationConfigurations(DeleteTaskPushNotificationC
300304 checkNotNullParam ("request" , request );
301305
302306 io .a2a .grpc .DeleteTaskPushNotificationConfigRequest grpcRequest = io .a2a .grpc .DeleteTaskPushNotificationConfigRequest .newBuilder ()
303- .setName (getTaskPushNotificationConfigName (request .id (), request .pushNotificationConfigId ()))
307+ .setTaskId (request .id ())
308+ .setId (request .pushNotificationConfigId ())
304309 .setTenant (resolveTenant (request .tenant ()))
305310 .build ();
306311 PayloadAndHeaders payloadAndHeaders = applyInterceptors (DELETE_TASK_PUSH_NOTIFICATION_CONFIG_METHOD , grpcRequest , agentCard , context );
@@ -314,14 +319,14 @@ public void deleteTaskPushNotificationConfigurations(DeleteTaskPushNotificationC
314319 }
315320
316321 @ Override
317- public void resubscribe (TaskIdParams request , Consumer <StreamingEventKind > eventConsumer ,
322+ public void subscribeToTask (TaskIdParams request , Consumer <StreamingEventKind > eventConsumer ,
318323 Consumer <Throwable > errorConsumer , @ Nullable ClientCallContext context ) throws A2AClientException {
319324 checkNotNullParam ("request" , request );
320325 checkNotNullParam ("eventConsumer" , eventConsumer );
321326
322327 io .a2a .grpc .SubscribeToTaskRequest grpcRequest = io .a2a .grpc .SubscribeToTaskRequest .newBuilder ()
323328 .setTenant (resolveTenant (request .tenant ()))
324- .setName ( "tasks/" + request .id ())
329+ .setId ( request .id ())
325330 .build ();
326331 PayloadAndHeaders payloadAndHeaders = applyInterceptors (SUBSCRIBE_TO_TASK_METHOD , grpcRequest , agentCard , context );
327332
@@ -331,12 +336,13 @@ public void resubscribe(TaskIdParams request, Consumer<StreamingEventKind> event
331336 A2AServiceStub stubWithMetadata = createAsyncStubWithMetadata (context , payloadAndHeaders );
332337 stubWithMetadata .subscribeToTask (grpcRequest , streamObserver );
333338 } catch (StatusRuntimeException e ) {
334- throw GrpcErrorMapper .mapGrpcError (e , "Failed to resubscribe task push notification config: " );
339+ throw GrpcErrorMapper .mapGrpcError (e , "Failed to subscribe task push notification config: " );
335340 }
336341 }
337342
338343 /**
339344 * Ensure tenant is set, using agent default if not provided in request
345+ *
340346 * @param request the initial request.
341347 * @return the updated request with the tenant set.
342348 */
@@ -447,24 +453,6 @@ private A2AServiceStub createAsyncStubWithMetadata(@Nullable ClientCallContext c
447453 return asyncStub .withInterceptors (MetadataUtils .newAttachHeadersInterceptor (metadata ));
448454 }
449455
450- private String getTaskPushNotificationConfigName (GetTaskPushNotificationConfigParams params ) {
451- return getTaskPushNotificationConfigName (params .id (), params .pushNotificationConfigId ());
452- }
453-
454- private String getTaskPushNotificationConfigName (String taskId , @ Nullable String pushNotificationConfigId ) {
455- StringBuilder name = new StringBuilder ();
456- name .append ("tasks/" );
457- name .append (taskId );
458- if (pushNotificationConfigId != null ) {
459- name .append ("/pushNotificationConfigs/" );
460- name .append (pushNotificationConfigId );
461- }
462- //name.append("/pushNotificationConfigs/");
463- // Use taskId as default config ID if none provided
464- //name.append(pushNotificationConfigId != null ? pushNotificationConfigId : taskId);
465- return name .toString ();
466- }
467-
468456 private PayloadAndHeaders applyInterceptors (String methodName , Object payload ,
469457 AgentCard agentCard , @ Nullable ClientCallContext clientCallContext ) {
470458 PayloadAndHeaders payloadAndHeaders = new PayloadAndHeaders (payload ,
0 commit comments