FIxing issues with configId on TaskPushNotificationConfig.

Signed-off-by: Emmanuel Hugonnet <[email protected]>

Author: ehsavoie

client/transport/jsonrpc/src/test/java/io/a2a/client/transport/jsonrpc/JsonMessages.java

@@ -391,7 +391,7 @@ public class JsonMessages {
               "jsonrpc":"2.0",
               "method":"GetTaskPushNotificationConfig",
               "params":{
-                "name":"tasks/de38c76d-d54c-436c-8b9f-4c2703648d64/pushNotificationConfigs"
+                "name":"tasks/de38c76d-d54c-436c-8b9f-4c2703648d64"
               }
             }""";
 

spec-grpc/src/main/java/io/a2a/grpc/mapper/ResourceNameParser.java

@@ -74,9 +74,9 @@ public static String[] parseGetTaskPushNotificationConfigName(String resourceNam
         return new String[]{taskId, configId};
     }
     public static String defineGetTaskPushNotificationConfigName(String taskId, String configId) {
-        String name= "tasks/" + taskId + "/pushNotificationConfigs";
+        String name= "tasks/" + taskId ;
         if(configId != null && !configId.isBlank()) {
-            name = name + '/' + configId;
+            name = name + "/pushNotificationConfigs/" + configId;
         }
         return name;
     }

spec-grpc/src/main/java/io/a2a/grpc/mapper/SetTaskPushNotificationConfigMapper.java

@@ -13,9 +13,9 @@
  * <p>
  * <b>Resource Name Handling:</b>
  * <ul>
- *   <li>Extracts taskId from parent resource name (format: "tasks/{task_id}")</li>
- *   <li>Fallback: Extracts from config.name if parent is blank</li>
- *   <li>Overrides PushNotificationConfig.id with config_id from request</li>
+ * <li>Extracts taskId from parent resource name (format: "tasks/{task_id}")</li>
+ * <li>Fallback: Extracts from config.name if parent is blank</li>
+ * <li>Overrides PushNotificationConfig.id with config_id from request</li>
  * </ul>
  * <p>
  * <b>Compile-Time Safety:</b> If the proto changes fields, MapStruct will fail to compile.
@@ -38,7 +38,7 @@ public interface SetTaskPushNotificationConfigMapper {
     @Mapping(target = "pushNotificationConfig", expression = "java(mapPushNotificationConfigWithId(request))")
     TaskPushNotificationConfig fromProto(SetTaskPushNotificationConfigRequest request);
 
-        /**
+    /**
      * Converts SetTaskPushNotificationConfigRequest to domain TaskPushNotificationConfig.
      * <p>
      * Extracts taskId from parent resource name and maps PushNotificationConfig with
@@ -48,9 +48,10 @@ public interface SetTaskPushNotificationConfigMapper {
      * @return proto SetTaskPushNotificationConfigRequest
      */
     @Mapping(target = "parent", expression = "java(ResourceNameParser.defineTaskName(config.taskId()))")
-    @Mapping(target = "configId", expression = "java(config.pushNotificationConfig().id())")
+    @Mapping(target = "configId", expression = "java(extractConfigId(config))")
     @Mapping(target = "config", expression = "java(mapPushNotificationConfig(config))")
     SetTaskPushNotificationConfigRequest toProto(TaskPushNotificationConfig config);
+
     /**
      * Extracts the task ID from the parent resource name.
      * <p>
@@ -72,6 +73,19 @@ default String extractTaskId(SetTaskPushNotificationConfigRequest request) {
         return ResourceNameParser.extractParentId(parent);
     }
 
+    /**
+     * Extracts the config ID from the configuration. If it is not defined, the task ID is used.
+     *
+     * @param config the TaskPushNotificationConfig
+     * @return the extracted config ID
+     */
+    default String extractConfigId(TaskPushNotificationConfig config) {
+        if (config.pushNotificationConfig() != null && config.pushNotificationConfig().id() != null && !config.pushNotificationConfig().id().isBlank()) {
+            return config.pushNotificationConfig().id();
+        }
+        return config.taskId();
+    }
+
     /**
      * Maps the protobuf PushNotificationConfig to domain, injecting config_id from request.
      * <p>
@@ -82,26 +96,26 @@ default String extractTaskId(SetTaskPushNotificationConfigRequest request) {
      */
     default PushNotificationConfig mapPushNotificationConfigWithId(SetTaskPushNotificationConfigRequest request) {
         // Check if config and push_notification_config exist
-        if (!request.hasConfig() ||
-            !request.getConfig().hasPushNotificationConfig() ||
-            request.getConfig().getPushNotificationConfig()
-                .equals(io.a2a.grpc.PushNotificationConfig.getDefaultInstance())) {
+        if (!request.hasConfig()
+                || !request.getConfig().hasPushNotificationConfig()
+                || request.getConfig().getPushNotificationConfig()
+                        .equals(io.a2a.grpc.PushNotificationConfig.getDefaultInstance())) {
             return null;
         }
 
         // Map the proto PushNotificationConfig
         PushNotificationConfig result = PushNotificationConfigMapper.INSTANCE.fromProto(
-            request.getConfig().getPushNotificationConfig()
+                request.getConfig().getPushNotificationConfig()
         );
 
         // Override ID with config_id from request
         String configId = request.getConfigId();
         if (configId != null && !configId.isEmpty() && !configId.equals(result.id())) {
             return new PushNotificationConfig(
-                result.url(),
-                result.token(),
-                result.authentication(),
-                configId
+                    result.url(),
+                    result.token(),
+                    result.authentication(),
+                    configId
             );
         }
 

spec-grpc/src/main/java/io/a2a/grpc/utils/JSONRPCUtils.java

@@ -294,6 +294,10 @@ protected static void parseRequestBody(JsonElement jsonRpc, com.google.protobuf.
 
     public static void parseJsonString(String body, com.google.protobuf.Message.Builder builder) throws JSONRPCError {
         try {
+            System.out.println("****************************************");
+            System.out.println("Converting to " + builder.toString());
+            System.out.println(body);
+            System.out.println("****************************************");
             JsonFormat.parser().merge(body, builder);
         } catch (InvalidProtocolBufferException e) {
             log.log(Level.SEVERE, "Error parsing JSON request body: {0}", body);

tests/server-common/src/test/java/io/a2a/server/apps/common/AbstractA2AServerTest.java

@@ -534,6 +534,7 @@ public void testSetPushNotificationSuccess() throws Exception {
             assertEquals(MINIMAL_TASK.getId(), config.taskId());
             assertEquals("http://example.com", config.pushNotificationConfig().url());
         } catch (A2AClientException e) {
+            e.printStackTrace();;
             fail("Unexpected exception during set push notification test: " + e.getMessage(), e);
         } finally {
             deletePushNotificationConfigInStore(MINIMAL_TASK.getId(), MINIMAL_TASK.getId());
@@ -1334,7 +1335,7 @@ private void testInvalidParams(String invalidParamsRequest) {
                 .as(JSONRPCErrorResponse.class);
         assertNotNull(response.getError());
         assertEquals(new InvalidParamsError().getCode(), response.getError().getCode());
-        assertEquals("1", response.getId());
+        assertEquals("1", response.getId().toString());
     }
 
     @Test