Starting updating the server side

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

Author: ehsavoie

client/src/main/java/io/a2a/client/transport/JSONRestTransport.java

@@ -67,8 +67,7 @@ public JSONRestTransport(A2AHttpClient httpClient, AgentCard agentCard,
     public EventKind sendMessage(MessageSendParams messageSendParams, ClientCallContext context) throws A2AClientException {
         checkNotNullParam("messageSendParams", messageSendParams);
         io.a2a.grpc.SendMessageRequest.Builder builder = io.a2a.grpc.SendMessageRequest.newBuilder(ProtoUtils.ToProto.sendMessageRequest(messageSendParams));
-        PayloadAndHeaders payloadAndHeaders = applyInterceptors(io.a2a.spec.SendMessageRequest.METHOD, builder.getRequestOrBuilder(),
-                agentCard, context);
+        PayloadAndHeaders payloadAndHeaders = applyInterceptors(io.a2a.spec.SendMessageRequest.METHOD, builder, agentCard, context);
         try {
             String httpResponseBody = sendPostRequest(agentUrl + "/v1/message:send", payloadAndHeaders);
             io.a2a.grpc.SendMessageResponse.Builder responseBuilder = io.a2a.grpc.SendMessageResponse.newBuilder();

client/src/test/java/io/a2a/client/transport/JsonRestMessages.java

@@ -8,13 +8,16 @@ public class JsonRestMessages {
 
     static final String SEND_MESSAGE_TEST_REQUEST = """
             {
-              "messageId": "message-1234",
-              "contextId": "context-1234",
-              "role": "ROLE_USER",
-              "content": [{
-                "text": "tell me a joke"
-              }],
-              "metadata": {
+              "message":
+                {
+                  "messageId": "message-1234",
+                  "contextId": "context-1234",
+                  "role": "ROLE_USER",
+                  "content": [{
+                    "text": "tell me a joke"
+                  }],
+                  "metadata": {
+                  }
               }
             }""";
 
@@ -629,7 +632,7 @@ public class JsonRestMessages {
                   }
                 ],
                 "messageId": "message-1234",
-                "contextId": "context-1234",
+                "contextId": "context-1234"
               },
               "configuration": {
                 "acceptedOutputModes": ["text"]

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

@@ -13,6 +13,7 @@
 import com.google.protobuf.ByteString;
 import com.google.protobuf.Struct;
 import com.google.protobuf.Value;
+import io.a2a.grpc.ListTaskPushNotificationConfigResponse;
 
 import io.a2a.grpc.StreamResponse;
 import io.a2a.spec.APIKeySecurityScheme;
@@ -530,6 +531,15 @@ private static io.a2a.grpc.AuthorizationCodeOAuthFlow authorizationCodeOAuthFlow
             return builder.build();
         }
 
+        public static io.a2a.grpc.ListTaskPushNotificationConfigResponse listTaskPushNotificationConfigResponse(List<TaskPushNotificationConfig> configs) {
+            List<io.a2a.grpc.TaskPushNotificationConfig> confs = new ArrayList<>(configs.size());
+            ListTaskPushNotificationConfigResponse.Builder response = ListTaskPushNotificationConfigResponse.newBuilder();
+            for(TaskPushNotificationConfig config: configs) {
+                confs.add(taskPushNotificationConfig(config));
+            }
+            return io.a2a.grpc.ListTaskPushNotificationConfigResponse.newBuilder().addAllConfigs(confs).build();
+        }
+
         private static io.a2a.grpc.ClientCredentialsOAuthFlow clientCredentialsOAuthFlow(ClientCredentialsOAuthFlow clientCredentialsOAuthFlow) {
             io.a2a.grpc.ClientCredentialsOAuthFlow.Builder builder = io.a2a.grpc.ClientCredentialsOAuthFlow.newBuilder();
             if (clientCredentialsOAuthFlow.refreshUrl() != null) {
@@ -699,17 +709,31 @@ public static MessageSendParams messageSendParams(io.a2a.grpc.SendMessageRequest
         }
 
         public static TaskPushNotificationConfig taskPushNotificationConfig(io.a2a.grpc.CreateTaskPushNotificationConfigRequestOrBuilder request) {
-            return taskPushNotificationConfig(request.getConfig());
+            return taskPushNotificationConfig(request.getConfig(), true);
         }
 
         public static TaskPushNotificationConfig taskPushNotificationConfig(io.a2a.grpc.TaskPushNotificationConfigOrBuilder config) {
+            return taskPushNotificationConfig(config, false);
+        }
+
+        private static TaskPushNotificationConfig taskPushNotificationConfig(io.a2a.grpc.TaskPushNotificationConfigOrBuilder config, boolean create) {
             String name = config.getName(); // "tasks/{id}/pushNotificationConfigs/{push_id}"
             String[] parts = name.split("/");
-            if (parts.length < 4) {
-                throw new IllegalArgumentException("Invalid name format for TaskPushNotificationConfig: " + name);
+            String configId = "";
+            if (create) {
+                if (parts.length < 3) {
+                    throw new IllegalArgumentException("Invalid name format for TaskPushNotificationConfig: " + name);
+                }
+                if (parts.length == 4) {
+                    configId = parts[3];
+                }
+            } else {
+                if (parts.length < 4) {
+                    throw new IllegalArgumentException("Invalid name format for TaskPushNotificationConfig: " + name);
+                }
+                configId = parts[3];
             }
             String taskId = parts[1];
-            String configId = parts[3];
             PushNotificationConfig pnc = pushNotification(config.getPushNotificationConfig(), configId);
             return new TaskPushNotificationConfig(taskId, pnc);
         }
@@ -730,13 +754,12 @@ public static TaskIdParams taskIdParams(io.a2a.grpc.TaskSubscriptionRequestOrBui
             String id = name.substring(name.lastIndexOf('/') + 1);
             return new TaskIdParams(id);
         }
-        
-        
+
         public static List<TaskPushNotificationConfig> listTaskPushNotificationConfigParams(io.a2a.grpc.ListTaskPushNotificationConfigResponseOrBuilder response) {
             List<io.a2a.grpc.TaskPushNotificationConfig> configs = response.getConfigsList();
             List<TaskPushNotificationConfig> result = new ArrayList<>(configs.size());
             for(io.a2a.grpc.TaskPushNotificationConfig config : configs) {
-                result.add(taskPushNotificationConfig(config));
+                result.add(taskPushNotificationConfig(config, false));
             }
             return result;
         }

transport/httprest/pom.xml

@@ -48,6 +48,16 @@
             <groupId>com.fasterxml.jackson.datatype</groupId>
             <artifactId>jackson-datatype-jsr310</artifactId>
         </dependency>
+        <dependency>
+            <groupId>com.google.protobuf</groupId>
+            <artifactId>protobuf-java-util</artifactId>
+            <type>jar</type>
+        </dependency>
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-jdk14</artifactId>
+            <scope>test</scope>
+        </dependency>
 
     </dependencies>