fix: Add tenant parameter to REST push notification config endpoints

- Add tenant parameter to RestHandler.getTaskPushNotificationConfiguration to match other push notification methods
- Add route with trailing slash to distinguish GET (single config) from LIST in A2AServerRoutes
- Update RestTransport to use trailing slash when configId is null
- Update tests to use new method signatures

This ensures consistent tenant handling across all push notification endpoints and fixes routing ambiguity between GET and LIST operations.

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude Sonnet 4.5 <[email protected]>

Author: ehsavoie

client/transport/rest/src/main/java/io/a2a/client/transport/rest/RestTransport.java

@@ -320,7 +320,8 @@ public TaskPushNotificationConfig getTaskPushNotificationConfiguration(GetTaskPu
         if (configId != null && !configId.isEmpty()) {
             builder.setName(String.format("/tasks/%1s/pushNotificationConfigs/%2s", request.id(), configId));
         } else {
-            builder.setName(String.format("/tasks/%1s/pushNotificationConfigs", request.id()));
+            // Use trailing slash to distinguish GET from LIST
+            builder.setName(String.format("/tasks/%1s/pushNotificationConfigs/", request.id()));
         }
         PayloadAndHeaders payloadAndHeaders = applyInterceptors(GetTaskPushNotificationConfigRequest.METHOD, builder,
                 agentCard, context);
@@ -329,7 +330,8 @@ public TaskPushNotificationConfig getTaskPushNotificationConfiguration(GetTaskPu
             if (configId != null && !configId.isEmpty()) {
                 url = buildBaseUrl(request.tenant()) + String.format("/tasks/%1s/pushNotificationConfigs/%2s", request.id(), configId);
             } else {
-                url = buildBaseUrl(request.tenant()) + String.format("/tasks/%1s/pushNotificationConfigs", request.id());
+                // Trailing slash distinguishes GET from LIST
+                url = buildBaseUrl(request.tenant()) + String.format("/tasks/%1s/pushNotificationConfigs/", request.id());
             }
             A2AHttpClient.GetBuilder getBuilder = httpClient.createGet().url(url);
             if (payloadAndHeaders.getHeaders() != null) {

reference/rest/src/main/java/io/a2a/server/rest/quarkus/A2AServerRoutes.java

@@ -265,7 +265,7 @@ public void setTaskPushNotificationConfiguration(@Body String body, RoutingConte
         }
     }
 
-    @Route(regex = "^\\/(?<tenant>[^\\/]*\\/?)tasks\\/(?<id>[^/]+)\\/pushNotificationConfigs\\/(?<configId>[^\\/]+)", order = 1, methods = {Route.HttpMethod.GET}, type = Route.HandlerType.BLOCKING)
+    @Route(regex = "^\\/(?<tenant>[^\\/]*\\/?)tasks\\/(?<id>[^/]+)\\/pushNotificationConfigs\\/(?<configId>[^\\/]+)", order = 2, methods = {Route.HttpMethod.GET}, type = Route.HandlerType.BLOCKING)
     public void getTaskPushNotificationConfiguration(RoutingContext rc) {
         String taskId = rc.pathParam("id");
         String configId = rc.pathParam("configId");
@@ -275,7 +275,7 @@ public void getTaskPushNotificationConfiguration(RoutingContext rc) {
             if (taskId == null || taskId.isEmpty()) {
                 response = jsonRestHandler.createErrorResponse(new InvalidParamsError("bad task id"));
             } else {
-                response = jsonRestHandler.getTaskPushNotificationConfiguration(taskId, configId, context);
+                response = jsonRestHandler.getTaskPushNotificationConfiguration(taskId, configId, extractTenant(rc), context);
             }
         } catch (Throwable t) {
             response = jsonRestHandler.createErrorResponse(new InternalError(t.getMessage()));
@@ -284,7 +284,26 @@ public void getTaskPushNotificationConfiguration(RoutingContext rc) {
         }
     }
 
-    @Route(regex = "^\\/(?<tenant>[^\\/]*\\/?)tasks\\/(?<id>[^/]+)\\/pushNotificationConfigs", order = 1, methods = {Route.HttpMethod.GET}, type = Route.HandlerType.BLOCKING)
+    @Route(regex = "^\\/(?<tenant>[^\\/]*\\/?)tasks\\/(?<id>[^/]+)\\/pushNotificationConfigs\\/$", order = 1, methods = {Route.HttpMethod.GET}, type = Route.HandlerType.BLOCKING)
+    public void getTaskPushNotificationConfigurationWithoutId(RoutingContext rc) {
+        String taskId = rc.pathParam("id");
+        ServerCallContext context = createCallContext(rc, GetTaskPushNotificationConfigRequest.METHOD);
+        HTTPRestResponse response = null;
+        try {
+            if (taskId == null || taskId.isEmpty()) {
+                response = jsonRestHandler.createErrorResponse(new InvalidParamsError("bad task id"));
+            } else {
+                // Call get with null configId - trailing slash distinguishes this from list
+                response = jsonRestHandler.getTaskPushNotificationConfiguration(taskId, null, extractTenant(rc), context);
+            }
+        } catch (Throwable t) {
+            response = jsonRestHandler.createErrorResponse(new InternalError(t.getMessage()));
+        } finally {
+            sendResponse(rc, response);
+        }
+    }
+
+    @Route(regex = "^\\/(?<tenant>[^\\/]*\\/?)tasks\\/(?<id>[^/]+)\\/pushNotificationConfigs", order = 3, methods = {Route.HttpMethod.GET}, type = Route.HandlerType.BLOCKING)
     public void listTaskPushNotificationConfigurations(RoutingContext rc) {
         String taskId = rc.pathParam("id");
         ServerCallContext context = createCallContext(rc, ListTaskPushNotificationConfigRequest.METHOD);

reference/rest/src/test/java/io/a2a/server/rest/quarkus/A2AServerRoutesTest.java

@@ -229,7 +229,7 @@ public void testGetTaskPushNotificationConfiguration_MethodNameSetInContext() {
         when(mockHttpResponse.getStatusCode()).thenReturn(200);
         when(mockHttpResponse.getContentType()).thenReturn("application/json");
         when(mockHttpResponse.getBody()).thenReturn("{}");
-        when(mockRestHandler.getTaskPushNotificationConfiguration(anyString(), anyString(),
+        when(mockRestHandler.getTaskPushNotificationConfiguration(anyString(), anyString(), anyString(),
                 any(ServerCallContext.class))).thenReturn(mockHttpResponse);
 
         ArgumentCaptor<ServerCallContext> contextCaptor = ArgumentCaptor.forClass(ServerCallContext.class);
@@ -238,7 +238,7 @@ public void testGetTaskPushNotificationConfiguration_MethodNameSetInContext() {
         routes.getTaskPushNotificationConfiguration(mockRoutingContext);
 
         // Assert
-        verify(mockRestHandler).getTaskPushNotificationConfiguration(eq("task123"), eq("config456"),
+        verify(mockRestHandler).getTaskPushNotificationConfiguration(eq("task123"), eq("config456"), anyString(),
                 contextCaptor.capture());
         ServerCallContext capturedContext = contextCaptor.getValue();
         assertNotNull(capturedContext);

transport/rest/src/main/java/io/a2a/transport/rest/handler/RestHandler.java

@@ -236,12 +236,12 @@ public HTTPRestResponse listTasks(@Nullable String contextId, @Nullable String s
         }
     }
 
-    public HTTPRestResponse getTaskPushNotificationConfiguration(String taskId, @Nullable String configId, ServerCallContext context) {
+    public HTTPRestResponse getTaskPushNotificationConfiguration(String taskId, @Nullable String configId, String tenant, ServerCallContext context) {
         try {
             if (!agentCard.capabilities().pushNotifications()) {
                 throw new PushNotificationNotSupportedError();
             }
-            GetTaskPushNotificationConfigParams params = new GetTaskPushNotificationConfigParams(taskId, configId);
+            GetTaskPushNotificationConfigParams params = new GetTaskPushNotificationConfigParams(taskId, configId, tenant);
             TaskPushNotificationConfig config = requestHandler.onGetTaskPushNotificationConfig(params, context);
             return createSuccessResponse(200, io.a2a.grpc.TaskPushNotificationConfig.newBuilder(ProtoUtils.ToProto.taskPushNotificationConfig(config)));
         } catch (JSONRPCError e) {

transport/rest/src/test/java/io/a2a/transport/rest/handler/RestHandlerTest.java

@@ -283,7 +283,7 @@ public void testGetPushNotificationConfig() {
         Assertions.assertEquals(201, response.getStatusCode(), response.toString());
         Assertions.assertEquals("application/json", response.getContentType());
         // Now get it
-        response = handler.getTaskPushNotificationConfiguration(MINIMAL_TASK.getId(), "default-config-id", callContext);
+        response = handler.getTaskPushNotificationConfiguration(MINIMAL_TASK.getId(), "default-config-id", "", callContext);
         Assertions.assertEquals(200, response.getStatusCode(), response.toString());
         Assertions.assertEquals("application/json", response.getContentType());
     }