Complete end-to-end gRPC MP test passing.

Signed-off-by: Santiago Pericas-Geertsen <[email protected]>

microprofile/grpc/server/pom.xml

@@ -38,10 +38,18 @@
             <groupId>io.helidon.webserver</groupId>
             <artifactId>helidon-webserver-grpc</artifactId>
         </dependency>
+        <dependency>
+            <groupId>io.helidon.webserver</groupId>
+            <artifactId>helidon-webserver-http2</artifactId>
+        </dependency>
         <dependency>
             <groupId>io.helidon.common</groupId>
             <artifactId>helidon-common</artifactId>
         </dependency>
+        <dependency>
+            <groupId>io.helidon.config</groupId>
+            <artifactId>helidon-config-yaml-mp</artifactId>
+        </dependency>
         <dependency>
             <groupId>io.helidon.config</groupId>
             <artifactId>helidon-config-object-mapping</artifactId>
@@ -63,6 +71,14 @@
             <groupId>io.helidon.microprofile.server</groupId>
             <artifactId>helidon-microprofile-server</artifactId>
         </dependency>
+        <dependency>
+            <groupId>io.helidon.logging</groupId>
+            <artifactId>helidon-logging-common</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.helidon.logging</groupId>
+            <artifactId>helidon-logging-jul</artifactId>
+        </dependency>
         <dependency>
             <groupId>io.grpc</groupId>
             <artifactId>grpc-inprocess</artifactId>
@@ -76,11 +92,6 @@
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-jdk14</artifactId>
         </dependency>
-        <dependency>
-            <groupId>io.helidon.microprofile.testing</groupId>
-            <artifactId>helidon-microprofile-testing-junit5</artifactId>
-            <scope>test</scope>
-        </dependency>
         <dependency>
             <groupId>org.junit.jupiter</groupId>
             <artifactId>junit-jupiter-api</artifactId>
@@ -112,6 +123,16 @@
             <scope>provided</scope>
             <optional>true</optional>
         </dependency>
+        <dependency>
+            <groupId>io.helidon.microprofile.testing</groupId>
+            <artifactId>helidon-microprofile-testing-junit5</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>io.helidon.webserver.testing.junit5</groupId>
+            <artifactId>helidon-webserver-testing-junit5-grpc</artifactId>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 
     <build>

microprofile/grpc/server/src/main/java/io/helidon/microprofile/grpc/server/GrpcMpCdiExtension.java

@@ -0,0 +1,119 @@
+/*
+ * Copyright (c) 2019, 2024 Oracle and/or its affiliates.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package io.helidon.microprofile.grpc.server;
+
+import java.lang.annotation.Annotation;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
+import io.grpc.BindableService;
+import io.helidon.microprofile.grpc.core.Grpc;
+import io.helidon.microprofile.server.ServerCdiExtension;
+import io.helidon.webserver.grpc.GrpcRouting;
+import io.helidon.webserver.grpc.GrpcService;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.context.Initialized;
+import jakarta.enterprise.event.Observes;
+import jakarta.enterprise.inject.Any;
+import jakarta.enterprise.inject.Instance;
+import jakarta.enterprise.inject.spi.Bean;
+import jakarta.enterprise.inject.spi.BeanManager;
+import jakarta.enterprise.inject.spi.Extension;
+
+/**
+ * A CDI extension that will discover and register gRPC routes.
+ */
+public class GrpcMpCdiExtension implements Extension {
+
+    private static final Logger LOGGER = Logger.getLogger(GrpcMpCdiExtension.class.getName());
+    private static final Logger STARTUP_LOGGER = Logger.getLogger("io.helidon.microprofile.startup.server");
+
+    private void discoverRoutes(@Observes @Initialized(ApplicationScoped.class) Object event, BeanManager beanManager) {
+        GrpcRouting.Builder routingBuilder = discoverGrpcRouting(beanManager);
+        ServerCdiExtension extension = beanManager.getExtension(ServerCdiExtension.class);
+        extension.addRouting(routingBuilder);
+    }
+
+    /**
+     * Discover the services and interceptors to use to configure the {@link GrpcRouting}.
+     *
+     * @param beanManager the CDI bean manager
+     * @return the {@link GrpcRouting} to use or {@code null} if no services
+     * or routing were discovered
+     */
+    private GrpcRouting.Builder discoverGrpcRouting(BeanManager beanManager) {
+        Instance<Object> instance = beanManager.createInstance();
+        GrpcRouting.Builder builder = GrpcRouting.builder();
+
+        // discover @Grpc annotated beans
+        // we use the bean manager to do this as we need the actual bean class
+        beanManager.getBeans(Object.class, Any.Literal.INSTANCE)
+                .stream()
+                .filter(this::hasGrpcQualifier)
+                .forEach(bean -> {
+                    Class<?> beanClass = bean.getBeanClass();
+                    Annotation[] qualifiers = bean.getQualifiers().toArray(new Annotation[0]);
+                    Object service = instance.select(beanClass, qualifiers).get();
+                    register(service, builder, beanClass, beanManager);
+                });
+
+        // discover beans of type GrpcService
+        beanManager.getBeans(GrpcService.class)
+                .forEach(bean -> {
+                    Class<?> beanClass = bean.getBeanClass();
+                    Annotation[] qualifiers = bean.getQualifiers().toArray(new Annotation[0]);
+                    Object service = instance.select(beanClass, qualifiers).get();
+                    builder.service((GrpcService) service);
+                });
+
+        // discover beans of type BindableService
+        beanManager.getBeans(BindableService.class)
+                .forEach(bean -> {
+                    Class<?> beanClass = bean.getBeanClass();
+                    Annotation[] qualifiers = bean.getQualifiers().toArray(new Annotation[0]);
+                    Object service = instance.select(beanClass, qualifiers).get();
+                    builder.service((BindableService) service);
+                });
+
+        return builder;
+    }
+
+    private boolean hasGrpcQualifier(Bean<?> bean) {
+        return bean.getQualifiers()
+                .stream()
+                .anyMatch(q -> Grpc.class.isAssignableFrom(q.annotationType()));
+    }
+
+    /**
+     * Register the service with the routing.
+     * <p>
+     * The service is actually a CDI proxy so the real service.
+     *
+     * @param service the service to register
+     * @param builder the gRPC routing
+     * @param beanManager the {@link BeanManager} to use to locate beans required by the service
+     */
+    private void register(Object service, GrpcRouting.Builder builder, Class<?> cls, BeanManager beanManager) {
+        GrpcServiceBuilder serviceBuilder = GrpcServiceBuilder.create(cls, () -> service, beanManager);
+        if (serviceBuilder.isAnnotatedService()) {
+            builder.service(serviceBuilder.build());
+        } else {
+            LOGGER.log(Level.WARNING,
+                    () -> "Discovered type is not a properly annotated gRPC service " + service.getClass());
+        }
+    }
+}