Merge pull request #36 from kabir/align-with-final

Align with 0.3.2.Final

Author: kabir

examples/simple/client/pom.xml

@@ -54,6 +54,12 @@
             <groupId>com.google.guava</groupId>
             <artifactId>failureaccess</artifactId>
         </dependency>
+        <!-- SLF4J implementation for gRPC logging -->
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-simple</artifactId>
+            <version>2.0.17</version>
+        </dependency>
     </dependencies>
 
     <build>

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,24 +35,25 @@ public class GrpcBeanInitializer {
     @Inject
     Instance<CallContextFactory> callContextFactory;
 
+    @Inject
+    @Internal
+    Executor executor;
+
     /**
      * Observes the application startup event to eagerly initialize the gRPC cache.
      */
     public void onStartup(@Observes @Initialized(ApplicationScoped.class) Object init) {
-        System.out.println("*** GrpcBeanInitializer.onStartup() called - ApplicationScoped initialized ***");
         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);
         } catch (Exception e) {
-            System.err.println("*** GrpcBeanInitializer.onStartup() failed: " + e.getMessage());
             e.printStackTrace();
         }
     }
 
     @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

@@ -1,6 +1,11 @@
 package org.wildfly.extras.a2a.server.apps.grpc;
 
+import java.util.concurrent.Executor;
+
+import jakarta.inject.Inject;
+
 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;
 import io.a2a.transport.grpc.handler.GrpcHandler;
@@ -20,6 +25,7 @@ public class WildFlyGrpcHandler extends GrpcHandler {
     private static volatile AgentCard staticAgentCard;
     private static volatile RequestHandler staticRequestHandler;
     private static volatile CallContextFactory staticCallContextFactory;
+    private static volatile Executor staticExecutor;
 
     public WildFlyGrpcHandler() {
         // Default constructor - the only one used by WildFly gRPC subsystem
@@ -29,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
@@ -55,4 +62,12 @@ protected AgentCard getAgentCard() {
     protected CallContextFactory getCallContextFactory() {
         return staticCallContextFactory; // Can be null if not configured
     }
+
+    @Override
+    protected Executor getExecutor() {
+        if (staticExecutor == null) {
+            throw new RuntimeException("Executor not available. ApplicationStartup may not have run yet.");
+        }
+        return staticExecutor;
+    }
 }

impl/jsonrpc/src/main/java/org/wildfly/extras/a2a/server/apps/jakarta/A2AServerResource.java

@@ -2,9 +2,12 @@
 
 import java.io.IOException;
 import java.io.PrintWriter;
+import java.util.ArrayList;
 import java.util.Enumeration;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
+import java.util.Set;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.Executor;
 import java.util.concurrent.Flow;
@@ -31,10 +34,12 @@
 import com.fasterxml.jackson.core.JsonParseException;
 import com.fasterxml.jackson.databind.JsonMappingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
+import io.a2a.common.A2AHeaders;
 import io.a2a.server.ExtendedAgentCard;
 import io.a2a.server.ServerCallContext;
 import io.a2a.server.auth.UnauthenticatedUser;
 import io.a2a.server.auth.User;
+import io.a2a.server.extensions.A2AExtensions;
 import io.a2a.server.util.async.Internal;
 import io.a2a.spec.AgentCard;
 import io.a2a.spec.CancelTaskRequest;
@@ -333,7 +338,13 @@ public String getUsername() {
 
             state.put("headers", headers);
 
-            return new ServerCallContext(user, state);
+            Enumeration<String> en = request.getHeaders(A2AHeaders.X_A2A_EXTENSIONS);
+            List<String> extensionHeaderValues = new ArrayList<>();
+            while (en.hasMoreElements()) {
+                extensionHeaderValues.add(en.nextElement());
+            }
+            Set<String> requestedExtensions = A2AExtensions.getRequestedExtensions(extensionHeaderValues);
+            return new ServerCallContext(user, state, requestedExtensions);
         } else {
             CallContextFactory builder = callContextFactory.get();
             return builder.build(request);

impl/rest/src/main/java/org/wildfly/extras/a2a/server/apps/rest/A2ARestServerResource.java

@@ -5,9 +5,12 @@
 
 import java.io.IOException;
 import java.io.PrintWriter;
+import java.util.ArrayList;
 import java.util.Enumeration;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
+import java.util.Set;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.Executor;
 import java.util.concurrent.Flow;
@@ -25,10 +28,13 @@
 import jakarta.ws.rs.core.MediaType;
 import jakarta.ws.rs.core.Response;
 import jakarta.ws.rs.core.SecurityContext;
+
+import io.a2a.common.A2AHeaders;
 import io.a2a.server.ExtendedAgentCard;
 import io.a2a.server.ServerCallContext;
 import io.a2a.server.auth.UnauthenticatedUser;
 import io.a2a.server.auth.User;
+import io.a2a.server.extensions.A2AExtensions;
 import io.a2a.server.util.async.Internal;
 import io.a2a.spec.AgentCard;
 import io.a2a.spec.InvalidParamsError;
@@ -177,7 +183,7 @@ public Response getTask(@PathParam("taskId") String taskId, @QueryParam("history
         ServerCallContext context = createCallContext(httpRequest, securityContext);
         RestHandler.HTTPRestResponse response = null;
         try {
-            Integer historyLength = null;
+            int historyLength = 0;
             if (history_length != null) {
                 historyLength = Integer.valueOf(history_length);
             }
@@ -344,7 +350,13 @@ public String getUsername() {
 
             state.put("headers", headers);
 
-            return new ServerCallContext(user, state);
+            Enumeration<String> en = request.getHeaders(A2AHeaders.X_A2A_EXTENSIONS);
+            List<String> extensionHeaderValues = new ArrayList<>();
+            while (en.hasMoreElements()) {
+                extensionHeaderValues.add(en.nextElement());
+            }
+            Set<String> requestedExtensions = A2AExtensions.getRequestedExtensions(extensionHeaderValues);
+            return new ServerCallContext(user, state, requestedExtensions);
         } else {
             CallContextFactory builder = callContextFactory.get();
             return builder.build(request);

pom.xml

@@ -44,8 +44,8 @@
 
     <properties>
         <jboss.home>${project.build.directory}${file.separator}wildfly</jboss.home>
-        <version.wildfly>36.0.1.Final</version.wildfly>
-        <version.sdk>0.3.0.Beta2-SNAPSHOT</version.sdk>
+        <version.wildfly>38.0.0.Final</version.wildfly>
+        <version.sdk>0.3.2.Final</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) {