Merge branch 'main' into issue_727

Author: ehsavoie

transport/grpc/src/main/java/io/a2a/transport/grpc/handler/GrpcHandler.java

@@ -546,6 +546,10 @@ public void onComplete() {
     public void getExtendedAgentCard(io.a2a.grpc.GetExtendedAgentCardRequest request,
                            StreamObserver<io.a2a.grpc.AgentCard> responseObserver) {
         try {
+            if (!getAgentCard().capabilities().extendedAgentCard()) {
+                handleError(responseObserver, new UnsupportedOperationError());
+                return;
+            }
             AgentCard extendedAgentCard = getExtendedAgentCard();
             if (extendedAgentCard != null) {
                 responseObserver.onNext(ToProto.agentCard(extendedAgentCard));

transport/jsonrpc/src/main/java/io/a2a/transport/jsonrpc/handler/JSONRPCHandler.java

@@ -47,6 +47,7 @@
 import io.a2a.spec.EventKind;
 import io.a2a.spec.InternalError;
 import io.a2a.spec.InvalidRequestError;
+import io.a2a.spec.UnsupportedOperationError;
 import io.a2a.spec.ListTaskPushNotificationConfigResult;
 import io.a2a.spec.PushNotificationNotSupportedError;
 import io.a2a.spec.StreamingEventKind;
@@ -667,7 +668,10 @@ public DeleteTaskPushNotificationConfigResponse deletePushNotificationConfig(
     // TODO: Add authentication (https://github.com/a2aproject/a2a-java/issues/77)
     public GetExtendedAgentCardResponse onGetExtendedCardRequest(
             GetExtendedAgentCardRequest request, ServerCallContext context) {
-        if (!agentCard.capabilities().extendedAgentCard() || extendedAgentCard == null || !extendedAgentCard.isResolvable()) {
+        if (!agentCard.capabilities().extendedAgentCard()) {
+            return new GetExtendedAgentCardResponse(request.getId(), new UnsupportedOperationError());
+        }
+        if (extendedAgentCard == null || !extendedAgentCard.isResolvable()) {
             return new GetExtendedAgentCardResponse(request.getId(),
                     new ExtendedAgentCardNotConfiguredError(null, "Extended Card not configured", null));
         }

transport/jsonrpc/src/test/java/io/a2a/transport/jsonrpc/handler/JSONRPCHandlerTest.java

@@ -1541,7 +1541,7 @@ public void testOnGetExtendedAgentCard() throws Exception {
         GetExtendedAgentCardRequest request = new GetExtendedAgentCardRequest("1");
         GetExtendedAgentCardResponse response = handler.onGetExtendedCardRequest(request, callContext);
         assertEquals(request.getId(), response.getId());
-        assertInstanceOf(ExtendedAgentCardNotConfiguredError.class, response.getError());
+        assertInstanceOf(UnsupportedOperationError.class, response.getError());
         assertNull(response.getResult());
     }
 

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

@@ -871,7 +871,10 @@ private static String mapErrorToURI(A2AError error) {
      */
     public HTTPRestResponse getExtendedAgentCard(ServerCallContext context, String tenant) {
         try {
-            if (!agentCard.capabilities().extendedAgentCard() || extendedAgentCard == null || !extendedAgentCard.isResolvable()) {
+            if (!agentCard.capabilities().extendedAgentCard()) {
+                throw new UnsupportedOperationError();
+            }
+            if (extendedAgentCard == null || !extendedAgentCard.isResolvable()) {
                 throw new ExtendedAgentCardNotConfiguredError(null, "Extended Card not configured", null);
             }
             return new HTTPRestResponse(200, APPLICATION_JSON, JsonUtil.toJson(extendedAgentCard.get()));