fix: Apply Gemini fixes

Author: fjuma

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

@@ -71,10 +71,10 @@ public EventKind sendMessage(MessageSendParams messageSendParams) throws A2AServ
             } else if (response.hasTask()) {
                 return FromProto.task(response.getTask());
             } else {
-                throw new A2AServerException("Failed to send message: ");
+                throw new A2AServerException("Server response did not contain a message or task");
             }
         } catch (StatusRuntimeException e) {
-            throw new A2AServerException("Failed to send message: " + e, e.getCause());
+            throw new A2AServerException("Failed to send message: " + e, e);
         }
     }
 
@@ -95,7 +95,7 @@ public Task getTask(TaskQueryParams taskQueryParams) throws A2AServerException {
         try {
             return FromProto.task(blockingStub.getTask(getTaskRequest));
         } catch (StatusRuntimeException e) {
-            throw new A2AServerException("Failed to get task: " + e, e.getCause());
+            throw new A2AServerException("Failed to get task: " + e, e);
         }
     }
 
@@ -113,7 +113,7 @@ public Task cancelTask(TaskIdParams taskIdParams) throws A2AServerException {
         try {
             return FromProto.task(blockingStub.cancelTask(cancelTaskRequest));
         } catch (StatusRuntimeException e) {
-            throw new A2AServerException("Failed to cancel task: " + e, e.getCause());
+            throw new A2AServerException("Failed to cancel task: " + e, e);
         }
     }
 
@@ -125,13 +125,16 @@ public Task cancelTask(TaskIdParams taskIdParams) throws A2AServerException {
      * @throws A2AServerException if setting the push notification configuration fails for any reason
      */
     public TaskPushNotificationConfig setTaskPushNotificationConfig(TaskPushNotificationConfig taskPushNotificationConfig) throws A2AServerException {
+        String configId = taskPushNotificationConfig.pushNotificationConfig().id();
         CreateTaskPushNotificationConfigRequest request = CreateTaskPushNotificationConfigRequest.newBuilder()
+                .setParent("tasks/" + taskPushNotificationConfig.taskId())
                 .setConfig(ToProto.taskPushNotificationConfig(taskPushNotificationConfig))
+                .setConfigId(configId == null ? "" : configId)
                 .build();
         try {
             return FromProto.taskPushNotificationConfig(blockingStub.createTaskPushNotificationConfig(request));
         } catch (StatusRuntimeException e) {
-            throw new A2AServerException("Failed to set the task push notification config: " + e, e.getCause());
+            throw new A2AServerException("Failed to set the task push notification config: " + e, e);
         }
     }
 
@@ -149,7 +152,7 @@ public TaskPushNotificationConfig getTaskPushNotificationConfig(GetTaskPushNotif
         try {
             return FromProto.taskPushNotificationConfig(blockingStub.getTaskPushNotificationConfig(getTaskPushNotificationConfigRequest));
         } catch (StatusRuntimeException e) {
-            throw new A2AServerException("Failed to get the task push notification config: " + e, e.getCause());
+            throw new A2AServerException("Failed to get the task push notification config: " + e, e);
         }
     }
 
@@ -168,7 +171,7 @@ public void sendMessageStreaming(MessageSendParams messageSendParams, Consumer<S
         try {
             asyncStub.sendStreamingMessage(request, streamObserver);
         } catch (StatusRuntimeException e) {
-            throw new A2AServerException("Failed to send streaming message: " + e, e.getCause());
+            throw new A2AServerException("Failed to send streaming message: " + e, e);
         }
     }
 
@@ -189,7 +192,7 @@ private String getTaskPushNotificationConfigName(GetTaskPushNotificationConfigPa
         name.append("tasks/");
         name.append(getTaskPushNotificationConfigParams.id());
         if (getTaskPushNotificationConfigParams.pushNotificationConfigId() != null) {
-            name.append("pushNotification/");
+            name.append("/pushNotificationConfigs/");
             name.append(getTaskPushNotificationConfigParams.pushNotificationConfigId());
         }
         return name.toString();

client/src/main/java/io/a2a/client/sse/SSEStreamObserver.java

@@ -24,17 +24,23 @@ public SSEStreamObserver(Consumer<StreamingEventKind> eventHandler, Consumer<Thr
     @Override
     public void onNext(StreamResponse response) {
         StreamingEventKind event;
-        if (response.hasMsg()) {
-            event = FromProto.message(response.getMsg());
-        } else if (response.hasTask()) {
-            event = FromProto.task(response.getTask());
-        } else if (response.hasStatusUpdate()) {
-            event = FromProto.taskStatusUpdateEvent(response.getStatusUpdate());
-        } else if (response.hasArtifactUpdate()) {
-            event = FromProto.taskArtifactUpdateEvent(response.getArtifactUpdate());
-        } else {
-            log.warning("Invalid stream response " + response);
-            return;
+        switch (response.getPayloadCase()) {
+            case MSG:
+                event = FromProto.message(response.getMsg());
+                break;
+            case TASK:
+                event = FromProto.task(response.getTask());
+                break;
+            case STATUS_UPDATE:
+                event = FromProto.taskStatusUpdateEvent(response.getStatusUpdate());
+                break;
+            case ARTIFACT_UPDATE:
+                event = FromProto.taskArtifactUpdateEvent(response.getArtifactUpdate());
+                break;
+            default:
+                log.warning("Invalid stream response " + response.getPayloadCase());
+                errorHandler.accept(new IllegalStateException("Invalid stream response from server: " + response.getPayloadCase()));
+                return;
         }
         eventHandler.accept(event);
     }

grpc/pom.xml

@@ -36,4 +36,4 @@
         </dependency>
     </dependencies>
 
-</project>
+</project>