Don't use annotations in the GrpcHandler

Author: kabir

reference/grpc/src/main/java/io/a2a/server/grpc/quarkus/QuarkusGrpcHandler.java

@@ -1,18 +1,31 @@
 package io.a2a.server.grpc.quarkus;
 
+import jakarta.enterprise.inject.Instance;
 import jakarta.inject.Inject;
 
 import io.a2a.server.PublicAgentCard;
 import io.a2a.grpc.handler.GrpcHandler;
+import io.a2a.server.requesthandlers.CallContextFactory;
 import io.a2a.server.requesthandlers.RequestHandler;
 import io.a2a.spec.AgentCard;
 import io.quarkus.grpc.GrpcService;
 
 @GrpcService
 public class QuarkusGrpcHandler extends GrpcHandler {
 
+    @Inject
+    Instance<CallContextFactory> callContextFactory;
+
     @Inject
     public QuarkusGrpcHandler(@PublicAgentCard AgentCard agentCard, RequestHandler requestHandler) {
         super(agentCard, requestHandler);
     }
+
+    @Override
+    protected CallContextFactory getCallContextFactory() {
+        if (callContextFactory != null && !callContextFactory.isUnsatisfied()) {
+            return callContextFactory.get();
+        }
+        return null;
+    }
 }

transport/grpc/src/main/java/io/a2a/grpc/handler/GrpcHandler.java

@@ -3,18 +3,17 @@
 import static io.a2a.grpc.utils.ProtoUtils.FromProto;
 import static io.a2a.grpc.utils.ProtoUtils.ToProto;
 
-import jakarta.enterprise.context.ApplicationScoped;
-import jakarta.enterprise.inject.Instance;
-import jakarta.inject.Inject;
-
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.Flow;
 
+import jakarta.inject.Inject;
+
 import com.google.protobuf.Empty;
 import io.a2a.grpc.A2AServiceGrpc;
 import io.a2a.grpc.StreamResponse;
-import io.a2a.server.PublicAgentCard;
 import io.a2a.server.ServerCallContext;
 import io.a2a.server.auth.UnauthenticatedUser;
 import io.a2a.server.auth.User;
@@ -46,10 +45,6 @@
 import io.grpc.Status;
 import io.grpc.stub.StreamObserver;
 
-import java.util.HashMap;
-import java.util.Map;
-
-@ApplicationScoped
 public class GrpcHandler extends A2AServiceGrpc.A2AServiceImplBase {
 
     private AgentCard agentCard;
@@ -59,14 +54,11 @@ public class GrpcHandler extends A2AServiceGrpc.A2AServiceImplBase {
     // Without this we get intermittent failures
     private static volatile Runnable streamingSubscribedRunnable;
 
-    @Inject
-    Instance<CallContextFactory> callContextFactory;
-
     protected GrpcHandler() {
     }
 
     @Inject
-    public GrpcHandler(@PublicAgentCard AgentCard agentCard, RequestHandler requestHandler) {
+    public GrpcHandler(AgentCard agentCard, RequestHandler requestHandler) {
         this.agentCard = agentCard;
         this.requestHandler = requestHandler;
     }
@@ -317,7 +309,8 @@ public void deleteTaskPushNotificationConfig(io.a2a.grpc.DeleteTaskPushNotificat
     }
 
     private <V> ServerCallContext createCallContext(StreamObserver<V> responseObserver) {
-        if (callContextFactory == null || callContextFactory.isUnsatisfied()) {
+        CallContextFactory callContextFactory = getCallContextFactory();
+        if (callContextFactory == null ) {
             // Default implementation when no custom CallContextFactory is provided
             // This handles both CDI injection scenarios and test scenarios where callContextFactory is null
             User user = UnauthenticatedUser.INSTANCE;
@@ -335,10 +328,9 @@ private <V> ServerCallContext createCallContext(StreamObserver<V> responseObserv
 
             return new ServerCallContext(user, state);
         } else {
-            CallContextFactory factory = callContextFactory.get();
             // TODO: CallContextFactory interface expects ServerCall + Metadata, but we only have StreamObserver
             // This is another manifestation of the architectural limitation mentioned above
-            return factory.create(responseObserver); // Fall back to basic create() method for now
+            return callContextFactory.create(responseObserver); // Fall back to basic create() method for now
         }
     }
 
@@ -393,4 +385,7 @@ public static void setStreamingSubscribedRunnable(Runnable runnable) {
         streamingSubscribedRunnable = runnable;
     }
 
+    protected CallContextFactory getCallContextFactory() {
+        return null;
+    }
 }