Upgrade to latest a2a-java and get the tests passing

Author: kabir

impl/grpc/src/main/java/org/wildfly/extras/a2a/server/apps/grpc/GrpcBeanInitializer.java

@@ -1,5 +1,7 @@
 package org.wildfly.extras.a2a.server.apps.grpc;
 
+import java.util.concurrent.Executor;
+
 import jakarta.annotation.PreDestroy;
 import jakarta.enterprise.context.ApplicationScoped;
 import jakarta.enterprise.context.Initialized;
@@ -9,6 +11,7 @@
 
 import io.a2a.server.PublicAgentCard;
 import io.a2a.server.requesthandlers.RequestHandler;
+import io.a2a.server.util.async.Internal;
 import io.a2a.spec.AgentCard;
 import io.a2a.transport.grpc.handler.CallContextFactory;
 
@@ -32,6 +35,10 @@ public class GrpcBeanInitializer {
     @Inject
     Instance<CallContextFactory> callContextFactory;
 
+    @Inject
+    @Internal
+    Executor executor;
+
     /**
      * Observes the application startup event to eagerly initialize the gRPC cache.
      */
@@ -40,8 +47,8 @@ public void onStartup(@Observes @Initialized(ApplicationScoped.class) Object ini
         try {
             // Cache CDI beans for gRPC threads to use since CDI is not available on those threads
             CallContextFactory ccf = callContextFactory.isUnsatisfied() ? null : callContextFactory.get();
-            WildFlyGrpcHandler.setStaticBeans(agentCard, requestHandler, ccf);
-            System.out.println("*** GrpcBeanInitializer successfully cached beans: agentCard=" + agentCard + ", requestHandler=" + requestHandler + ", callContextFactory=" + ccf + " ***");
+            WildFlyGrpcHandler.setStaticBeans(agentCard, requestHandler, ccf, executor);
+            System.out.println("*** GrpcBeanInitializer successfully cached beans: agentCard=" + agentCard + ", requestHandler=" + requestHandler + ", callContextFactory=" + ccf + ", executor=" + executor + " ***");
         } catch (Exception e) {
             System.err.println("*** GrpcBeanInitializer.onStartup() failed: " + e.getMessage());
             e.printStackTrace();
@@ -50,6 +57,6 @@ public void onStartup(@Observes @Initialized(ApplicationScoped.class) Object ini
 
     @PreDestroy
     public void cleanup() {
-        WildFlyGrpcHandler.setStaticBeans(null, null, null);
+        WildFlyGrpcHandler.setStaticBeans(null, null, null, null);
     }
 }

impl/grpc/src/main/java/org/wildfly/extras/a2a/server/apps/grpc/WildFlyGrpcHandler.java

@@ -25,10 +25,7 @@ public class WildFlyGrpcHandler extends GrpcHandler {
     private static volatile AgentCard staticAgentCard;
     private static volatile RequestHandler staticRequestHandler;
     private static volatile CallContextFactory staticCallContextFactory;
-
-    @Inject
-    @Internal
-    protected Executor executor;
+    private static volatile Executor staticExecutor;
 
     public WildFlyGrpcHandler() {
         // Default constructor - the only one used by WildFly gRPC subsystem
@@ -38,10 +35,11 @@ public WildFlyGrpcHandler() {
      * Called by GrpcBeanInitializer during CDI initialization to cache beans
      * for use by gRPC threads where CDI is not available.
      */
-    static void setStaticBeans(AgentCard agentCard, RequestHandler requestHandler, CallContextFactory callContextFactory) {
+    static void setStaticBeans(AgentCard agentCard, RequestHandler requestHandler, CallContextFactory callContextFactory, Executor executor) {
         staticAgentCard = agentCard;
         staticRequestHandler = requestHandler;
         staticCallContextFactory = callContextFactory;
+        staticExecutor = executor;
     }
 
     @Override
@@ -67,6 +65,9 @@ protected CallContextFactory getCallContextFactory() {
 
     @Override
     protected Executor getExecutor() {
-        return executor;
+        if (staticExecutor == null) {
+            throw new RuntimeException("Executor not available. ApplicationStartup may not have run yet.");
+        }
+        return staticExecutor;
     }
 }

pom.xml

@@ -45,7 +45,7 @@
     <properties>
         <jboss.home>${project.build.directory}${file.separator}wildfly</jboss.home>
         <version.wildfly>38.0.0.Final</version.wildfly>
-        <version.sdk>0.3.0.Final</version.sdk>
+        <version.sdk>0.3.1.Beta1</version.sdk>
         <!-- This needs to be same version as used by the sdk -->
         <version.mutiny-zero>1.1.1</version.mutiny-zero>
         <!-- gRPC version matching the a2a-java-sdk -->

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

@@ -105,6 +105,14 @@ public Response getStreamingSubscribedCount() {
         return Response.ok(String.valueOf(streamingSubscribedCount.get()), TEXT_PLAIN).build();
     }
 
+    @GET
+    @Path("/queue/childCount/{taskId}")
+    @Produces(TEXT_PLAIN)
+    public Response getChildQueueCount(@PathParam("taskId") String taskId) {
+        int count = testUtilsBean.getChildQueueCount(taskId);
+        return Response.ok(String.valueOf(count), TEXT_PLAIN).build();
+    }
+
     @DELETE
     @Path("/task/{taskId}/config/{configId}")
     public Response deleteTaskPushNotificationConfig(@PathParam("taskId") String taskId, @PathParam("configId") String configId) {

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

@@ -107,6 +107,14 @@ public Response getStreamingSubscribedCount() {
         return Response.ok(String.valueOf(streamingSubscribedCount.get()), TEXT_PLAIN).build();
     }
 
+    @GET
+    @Path("/queue/childCount/{taskId}")
+    @Produces(TEXT_PLAIN)
+    public Response getChildQueueCount(@PathParam("taskId") String taskId) {
+        int count = testUtilsBean.getChildQueueCount(taskId);
+        return Response.ok(String.valueOf(count), TEXT_PLAIN).build();
+    }
+
     @DELETE
     @Path("/task/{taskId}/config/{configId}")
     public Response deleteTaskPushNotificationConfig(@PathParam("taskId") String taskId, @PathParam("configId") String configId) {

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

@@ -107,6 +107,14 @@ public Response getStreamingSubscribedCount() {
         return Response.ok(String.valueOf(streamingSubscribedCount.get()), TEXT_PLAIN).build();
     }
 
+    @GET
+    @Path("/queue/childCount/{taskId}")
+    @Produces(TEXT_PLAIN)
+    public Response getChildQueueCount(@PathParam("taskId") String taskId) {
+        int count = testUtilsBean.getChildQueueCount(taskId);
+        return Response.ok(String.valueOf(count), TEXT_PLAIN).build();
+    }
+
     @DELETE
     @Path("/task/{taskId}/config/{configId}")
     public Response deleteTaskPushNotificationConfig(@PathParam("taskId") String taskId, @PathParam("configId") String configId) {