Fix cicd pipeline issues .

Author: misselvexu

client/src/main/java/io/a2a/client/A2ACardResolver.java

@@ -56,11 +56,13 @@ public A2ACardResolver(A2AHttpClient httpClient, String baseUrl, String agentCar
                            Map<String, String> authHeaders) throws A2AClientError {
         this.httpClient = httpClient;
         agentCardPath = agentCardPath == null || agentCardPath.isEmpty() ? DEFAULT_AGENT_CARD_PATH : agentCardPath;
-        try {
-            this.url = new URI(baseUrl).resolve(agentCardPath).toString();
-        } catch (URISyntaxException e) {
-            throw new A2AClientError("Invalid agent URL", e);
+        if (baseUrl.endsWith("/")) {
+            baseUrl = baseUrl.substring(0, baseUrl.length() - 1);
+        }
+        if (!agentCardPath.startsWith("/")) {
+            agentCardPath = "/" + agentCardPath;
         }
+        this.url = baseUrl + agentCardPath;
         this.authHeaders = authHeaders;
     }
 

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

@@ -153,13 +153,10 @@ private void testGetTask(String mediaType) throws Exception {
     public void testGetTaskNotFound() throws Exception {
         assertTrue(getTaskFromTaskStore("non-existent-task") == null);
         try {
-            GetTaskResponse response = client.getTask("1", new TaskQueryParams("non-existent-task"));
-            assertEquals("1", response.getId());
-            assertInstanceOf(JSONRPCError.class, response.getError());
-            assertEquals(new TaskNotFoundError().getCode(), response.getError().getCode());
-            assertNull(response.getResult());
+            client.getTask("1", new TaskQueryParams("non-existent-task"));
+            fail("Expected A2AServerException to be thrown");
         } catch (A2AServerException e) {
-            fail("Unexpected exception during getTask for non-existent task: " + e.getMessage(), e);
+            assertInstanceOf(TaskNotFoundError.class, e.getCause());
         }
     }
 
@@ -184,13 +181,10 @@ public void testCancelTaskSuccess() throws Exception {
     public void testCancelTaskNotSupported() throws Exception {
         saveTaskInTaskStore(CANCEL_TASK_NOT_SUPPORTED);
         try {
-            CancelTaskResponse response = client.cancelTask("1", new TaskIdParams(CANCEL_TASK_NOT_SUPPORTED.getId()));
-            assertNull(response.getResult());
-            assertEquals("1", response.getId());
-            assertInstanceOf(JSONRPCError.class, response.getError());
-            assertEquals(new UnsupportedOperationError().getCode(), response.getError().getCode());
+            client.cancelTask("1", new TaskIdParams(CANCEL_TASK_NOT_SUPPORTED.getId()));
+            fail("Expected A2AServerException to be thrown");
         } catch (A2AServerException e) {
-            fail("Unexpected exception during cancel task not supported test: " + e.getMessage(), e);
+            assertInstanceOf(UnsupportedOperationError.class, e.getCause());
         } finally {
             deleteTaskInTaskStore(CANCEL_TASK_NOT_SUPPORTED.getId());
         }
@@ -199,13 +193,10 @@ public void testCancelTaskNotSupported() throws Exception {
     @Test
     public void testCancelTaskNotFound() {
         try {
-            CancelTaskResponse response = client.cancelTask("1", new TaskIdParams("non-existent-task"));
-            assertEquals("1", response.getId());
-            assertNull(response.getResult());
-            assertInstanceOf(JSONRPCError.class, response.getError());
-            assertEquals(new TaskNotFoundError().getCode(), response.getError().getCode());
+            client.cancelTask("1", new TaskIdParams("non-existent-task"));
+            fail("Expected A2AServerException to be thrown");
         } catch (A2AServerException e) {
-            fail("Unexpected exception during cancel task not found test: " + e.getMessage(), e);
+            assertInstanceOf(TaskNotFoundError.class, e.getCause());
         }
     }
 
@@ -315,15 +306,12 @@ public void testError() {
                 .contextId(SEND_MESSAGE_NOT_SUPPORTED.getContextId())
                 .build();
         MessageSendParams messageSendParams = new MessageSendParams(message, null, null);
-        
+
         try {
-            SendMessageResponse response = client.sendMessage("1", messageSendParams);
-            assertEquals("1", response.getId());
-            assertNull(response.getResult());
-            assertInstanceOf(JSONRPCError.class, response.getError());
-            assertEquals(new UnsupportedOperationError().getCode(), response.getError().getCode());
+            client.sendMessage("1", messageSendParams);
+            fail("Expected A2AServerException to be thrown");
         } catch (A2AServerException e) {
-            fail("Unexpected exception during error handling test: " + e.getMessage(), e);
+            assertInstanceOf(UnsupportedOperationError.class, e.getCause());
         }
     }