fix: Apply Gemini suggestions

Author: fjuma

client/base/src/main/java/io/a2a/client/Client.java

@@ -45,38 +45,14 @@ public Client(AgentCard agentCard, ClientConfig clientConfig, ClientTransport cl
 
     @Override
     public void sendMessage(Message request, ClientCallContext context) throws A2AClientException {
-        MessageSendConfiguration messageSendConfiguration = new MessageSendConfiguration.Builder()
-                .acceptedOutputModes(clientConfig.getAcceptedOutputModes())
-                .blocking(clientConfig.isPolling())
-                .historyLength(clientConfig.getHistoryLength())
-                .pushNotification(clientConfig.getPushNotificationConfig())
-                .build();
-
-        MessageSendParams messageSendParams = new MessageSendParams.Builder()
-                .message(request)
-                .configuration(messageSendConfiguration)
-                .metadata(clientConfig.getMetadata())
-                .build();
-
+        MessageSendParams messageSendParams = getMessageSendParams(request, clientConfig);
         sendMessage(messageSendParams, null, null, context);
     }
 
     @Override
     public void sendMessage(Message request, List<BiConsumer<ClientEvent, AgentCard>> consumers,
                             Consumer<Throwable> streamingErrorHandler, ClientCallContext context) throws A2AClientException {
-        MessageSendConfiguration messageSendConfiguration = new MessageSendConfiguration.Builder()
-                .acceptedOutputModes(clientConfig.getAcceptedOutputModes())
-                .blocking(clientConfig.isPolling())
-                .historyLength(clientConfig.getHistoryLength())
-                .pushNotification(clientConfig.getPushNotificationConfig())
-                .build();
-
-        MessageSendParams messageSendParams = new MessageSendParams.Builder()
-                .message(request)
-                .configuration(messageSendConfiguration)
-                .metadata(clientConfig.getMetadata())
-                .build();
-
+        MessageSendParams messageSendParams = getMessageSendParams(request, clientConfig);
         sendMessage(messageSendParams, consumers, streamingErrorHandler, context);
     }
 
@@ -240,4 +216,19 @@ private void consume(ClientEvent clientEvent, AgentCard agentCard, List<BiConsum
             consume(clientEvent, agentCard);
         }
     }
+
+    private MessageSendParams getMessageSendParams(Message request, ClientConfig clientConfig) {
+        MessageSendConfiguration messageSendConfiguration = new MessageSendConfiguration.Builder()
+                .acceptedOutputModes(clientConfig.getAcceptedOutputModes())
+                .blocking(clientConfig.isPolling())
+                .historyLength(clientConfig.getHistoryLength())
+                .pushNotification(clientConfig.getPushNotificationConfig())
+                .build();
+
+        return new MessageSendParams.Builder()
+                .message(request)
+                .configuration(messageSendConfiguration)
+                .metadata(clientConfig.getMetadata())
+                .build();
+    }
 }

client/base/src/main/java/io/a2a/client/ClientTaskManager.java

@@ -70,18 +70,15 @@ public Task saveTaskEvent(TaskStatusUpdateEvent taskStatusUpdateEvent) throws A2
             if (task.getHistory() == null) {
                 taskBuilder.history(taskStatusUpdateEvent.getStatus().message());
             } else {
-                List<Message> history = task.getHistory();
+                List<Message> history = new ArrayList<>(task.getHistory());
                 history.add(taskStatusUpdateEvent.getStatus().message());
                 taskBuilder.history(history);
             }
         }
         if (taskStatusUpdateEvent.getMetadata() != null) {
-            Map<String, Object> metadata = taskStatusUpdateEvent.getMetadata();
-            if (metadata == null) {
-                metadata = new HashMap<>();
-            }
-            metadata.putAll(taskStatusUpdateEvent.getMetadata());
-            taskBuilder.metadata(metadata);
+            Map<String, Object> newMetadata = task.getMetadata() != null ? new HashMap<>(task.getMetadata()) : new HashMap<>();
+            newMetadata.putAll(taskStatusUpdateEvent.getMetadata());
+            taskBuilder.metadata(newMetadata);
         }
         taskBuilder.status(taskStatusUpdateEvent.getStatus());
         currentTask = taskBuilder.build();