Merge pull request #58 from kabir/align-main

Align with latest a2a-java SNAPSHOT

Author: kabir

impl/jsonrpc/src/main/java/org/wildfly/extras/a2a/server/apps/jsonrpc/A2AServerResource.java

@@ -6,6 +6,9 @@
 
 import java.io.IOException;
 import java.io.PrintWriter;
+import java.time.ZoneId;
+import java.time.ZonedDateTime;
+import java.time.format.DateTimeFormatter;
 import java.util.ArrayList;
 import java.util.Enumeration;
 import java.util.HashMap;
@@ -148,10 +151,7 @@ public Response handleNonStreamingRequests(
         // Serialize response using protobuf conversion
         String serialized = serializeResponse(response);
 
-        // Set Content-Type according to A2A spec: application/problem+json for errors, application/json for success
-        String contentType = response.getError() != null
-            ? io.a2a.common.MediaType.APPLICATION_PROBLEM_JSON
-            : io.a2a.common.MediaType.APPLICATION_JSON;
+        String contentType = io.a2a.common.MediaType.APPLICATION_JSON;
 
         // Return Response with explicit content-type header
         return Response.status(Response.Status.OK)
@@ -233,15 +233,36 @@ public void handleStreamingRequests(
 
     /**
      * Handles incoming GET requests to the agent card endpoint.
-     * Returns the agent card in JSON format.
+     * Returns the agent card in JSON format with appropriate caching headers.
      *
-     * @return the agent card
+     * <p>Per A2A specification section 8.6, Agent Card HTTP endpoints SHOULD include:
+     * <ul>
+     *   <li>Cache-Control header with max-age directive (CARD-CACHE-001)</li>
+     *   <li>ETag header for conditional request support (CARD-CACHE-002)</li>
+     *   <li>Last-Modified header in RFC 1123 format (CARD-CACHE-003)</li>
+     * </ul>
+     *
+     * @return the agent card with caching headers
      */
     @GET
     @Path("/.well-known/agent-card.json")
     @Produces(MediaType.APPLICATION_JSON)
-    public AgentCard getAgentCard() {
-        return jsonRpcHandler.getAgentCard();
+    public Response getAgentCard() {
+        AgentCard agentCard = jsonRpcHandler.getAgentCard();
+
+        // Generate ETag based on agent card content hash
+        String etag = "\"" + Integer.toHexString(agentCard.hashCode()) + "\"";
+
+        // Set Last-Modified to current time in RFC 1123 format
+        // In production, this should reflect actual last modification time
+        ZonedDateTime now = ZonedDateTime.now(ZoneId.of("GMT"));
+        String lastModified = now.format(DateTimeFormatter.RFC_1123_DATE_TIME);
+
+        return Response.ok(agentCard)
+                .header(HttpHeaders.CACHE_CONTROL, "max-age=3600")
+                .header(HttpHeaders.ETAG, etag)
+                .header("Last-Modified", lastModified)
+                .build();
     }
 
     private A2AResponse<?> processNonStreamingRequest(NonStreamingJSONRPCRequest<?> request,

impl/rest/src/main/java/org/wildfly/extras/a2a/server/apps/rest/A2ARestServerResource.java

@@ -8,6 +8,9 @@
 
 import java.io.IOException;
 import java.io.PrintWriter;
+import java.time.ZoneId;
+import java.time.ZonedDateTime;
+import java.time.format.DateTimeFormatter;
 import java.util.ArrayList;
 import java.util.Enumeration;
 import java.util.HashMap;
@@ -153,17 +156,36 @@ public void resubscribeTask(@PathParam("taskId") String taskId, @Context HttpSer
 
     /**
      * Handles incoming GET requests to the agent card endpoint.
-     * Returns the agent card in JSON format.
+     * Returns the agent card in JSON format with appropriate caching headers.
      *
-     * @return the agent card
+     * <p>Per A2A specification section 8.6, Agent Card HTTP endpoints SHOULD include:
+     * <ul>
+     *   <li>Cache-Control header with max-age directive (CARD-CACHE-001)</li>
+     *   <li>ETag header for conditional request support (CARD-CACHE-002)</li>
+     *   <li>Last-Modified header in RFC 1123 format (CARD-CACHE-003)</li>
+     * </ul>
+     *
+     * @return the agent card with caching headers
      */
     @GET
     @Path(".well-known/agent-card.json")
     @Consumes(MediaType.APPLICATION_JSON)
     public Response getAgentCard() {
         RestHandler.HTTPRestResponse response = jsonRestHandler.getAgentCard();
+
+        // Generate ETag based on response body content hash
+        String etag = "\"" + Integer.toHexString(response.getBody().hashCode()) + "\"";
+
+        // Set Last-Modified to current time in RFC 1123 format
+        // In production, this should reflect actual last modification time
+        ZonedDateTime now = ZonedDateTime.now(ZoneId.of("GMT"));
+        String lastModified = now.format(DateTimeFormatter.RFC_1123_DATE_TIME);
+
         return Response.status(response.getStatusCode())
                 .header(CONTENT_TYPE, response.getContentType())
+                .header("Cache-Control", "max-age=3600")
+                .header("ETag", etag)
+                .header("Last-Modified", lastModified)
                 .entity(response.getBody())
                 .build();
     }

tests/grpc/src/test/java/org/wildfly/extras/a2a/test/server/grpc/WildFlyA2AGrpcTestCase.java

@@ -135,6 +135,12 @@ static JavaArchive getJarForClass(Class<?> clazz) throws Exception {
         return ShrinkWrap.createFromZipFile(JavaArchive.class, f);
     }
 
+    @Override
+    public void testAgentCardHeaders() {
+        // Skip - gRPC doesn't use HTTP caching headers for Agent Card
+        // The A2A spec section 8.6 caching requirements apply only to HTTP endpoints
+    }
+
     @AfterAll
     public static void closeChannel() {
         channel.shutdownNow();

tests/jsonrpc/src/test/java/org/wildfly/extras/a2a/test/server/apps/jsonrpc/JakartaA2AServerTest.java

@@ -148,7 +148,7 @@ public void testErrorResponseContentType() {
         // Validate content-type header
         String contentType = response.getContentType();
         assertNotNull(contentType, "Content-Type header should be present");
-        assertEquals(MediaType.APPLICATION_PROBLEM_JSON, contentType,
+        assertEquals(MediaType.APPLICATION_JSON, contentType,
                 "Error responses must use application/problem+json content-type");
 
         // Validate it's actually an error response

tests/rest/src/test/java/org/wildfly/extras/a2a/test/server/apps/rest/JakartaA2AServerTest.java

@@ -145,7 +145,7 @@ public void testErrorResponseContentType() {
             // Validate content-type header for error responses
             String contentType = response.getContentType();
             assertNotNull(contentType, "Content-Type header should be present on error responses");
-            assertEquals(MediaType.APPLICATION_PROBLEM_JSON, contentType,
+            assertEquals(MediaType.APPLICATION_JSON, contentType,
                     "Error responses must use application/problem+json content-type");
         }
     }