Fixing module-info.java files so that gRPC works when using Java modules (helidon-io#4235)

Author: thegridman

config/config/src/main/java/module-info.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2021 Oracle and/or its affiliates.
+ * Copyright (c) 2017, 2022 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.
@@ -47,4 +47,6 @@
 
     provides io.helidon.config.spi.ConfigParser with PropertiesConfigParser;
 
+    // needed when running with modules - to make private methods accessible
+    opens io.helidon.config to weld.core.impl, io.helidon.microprofile.cdi;
 }

dependencies/pom.xml

@@ -137,6 +137,7 @@
         <version.lib.opentracing>0.33.0</version.lib.opentracing>
         <version.lib.opentracing.grpc>0.2.1</version.lib.opentracing.grpc>
         <version.lib.opentracing.tracerresolver>0.1.8</version.lib.opentracing.tracerresolver>
+        <version.lib.perfmark-api>0.23.0</version.lib.perfmark-api>
         <version.lib.postgresql>42.3.3</version.lib.postgresql>
         <version.lib.prometheus>0.9.0</version.lib.prometheus>
         <version.lib.slf4j>1.7.32</version.lib.slf4j>
@@ -494,6 +495,12 @@
                 <artifactId>gson</artifactId>
                 <version>${version.lib.gson}</version>
             </dependency>
+            <!-- Dependency convergence. Should align with version used by io.grpc -->
+            <dependency>
+              <groupId>io.perfmark</groupId>
+              <artifactId>perfmark-api</artifactId>
+              <version>${version.lib.perfmark-api}</version>
+            </dependency>
 
             <dependency>
               <groupId>io.opentracing.contrib</groupId>

grpc/io.grpc/pom.xml

@@ -45,6 +45,33 @@
             <groupId>io.grpc</groupId>
             <artifactId>grpc-context</artifactId>
         </dependency>
+
+        <dependency>
+          <groupId>com.google.guava</groupId>
+          <artifactId>guava</artifactId>
+          <exclusions>
+            <exclusion>
+              <artifactId>jsr305</artifactId>
+              <groupId>com.google.code.findbugs</groupId>
+            </exclusion>
+            <exclusion>
+              <artifactId>error_prone_annotations</artifactId>
+              <groupId>com.google.errorprone</groupId>
+            </exclusion>
+            <exclusion>
+              <artifactId>j2objc-annotations</artifactId>
+              <groupId>com.google.j2objc</groupId>
+            </exclusion>
+          </exclusions>
+        </dependency>
+        <dependency>
+          <groupId>com.google.code.gson</groupId>
+          <artifactId>gson</artifactId>
+        </dependency>
+        <dependency>
+          <groupId>io.perfmark</groupId>
+          <artifactId>perfmark-api</artifactId>
+        </dependency>
     </dependencies>
 
     <build>

grpc/io.grpc/src/main/java/io/grpc/util/SecretRoundRobinLoadBalancerProvider.java

@@ -0,0 +1,36 @@
+/*
+ * Copyright (c) 2022 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.grpc.util;
+
+import io.grpc.LoadBalancerProvider;
+
+/**
+ * A dummy class to allow the re-packaging of grpc-java
+ * with a module-info.java file to work.
+ * <p>
+ * This file will be replaced by the real implementation from grpc-java
+ * as part of the re-packaging process.
+ */
+public class SecretRoundRobinLoadBalancerProvider {
+    /**
+     * A dummy {@link LoadBalancerProvider} implementation to allow
+     * the provides statement to be added to the module-info file.
+     */
+    public static class Provider
+            extends LoadBalancerProvider {
+    }
+}

grpc/io.grpc/src/main/java/module-info.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, 2020 Oracle and/or its affiliates.
+ * Copyright (c) 2019, 2022 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.
@@ -23,12 +23,22 @@
     exports io.grpc.internal;
     exports io.grpc.util;
 
+    requires com.google.common;
+    requires com.google.gson;
     requires java.logging;
     requires java.naming;
+    requires perfmark.api;
 
     uses io.grpc.ManagedChannelProvider;
     uses io.grpc.NameResolverProvider;
     uses io.grpc.ServerProvider;
     uses io.grpc.internal.BinaryLogProvider;
     uses io.grpc.LoadBalancerProvider;
+
+    provides io.grpc.LoadBalancerProvider
+            with io.grpc.internal.PickFirstLoadBalancerProvider,
+                 io.grpc.util.SecretRoundRobinLoadBalancerProvider.Provider;
+
+    provides io.grpc.NameResolverProvider
+            with io.grpc.internal.DnsNameResolverProvider;
 }

microprofile/grpc/client/src/main/java/module-info.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, 2020 Oracle and/or its affiliates.
+ * Copyright (c) 2019, 2022 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.
@@ -29,4 +29,7 @@
 
     provides jakarta.enterprise.inject.spi.Extension
             with io.helidon.microprofile.grpc.client.GrpcClientCdiExtension;
+
+    // needed when running with modules - to make private methods accessible
+    opens io.helidon.microprofile.grpc.client to weld.core.impl, io.helidon.microprofile.cdi;
 }

microprofile/grpc/server/src/main/java/module-info.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, 2021 Oracle and/or its affiliates.
+ * Copyright (c) 2019, 2022 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.
@@ -33,9 +33,13 @@
 
     requires java.logging;
 
+    uses io.helidon.microprofile.grpc.server.spi.GrpcMpExtension;
     uses io.helidon.microprofile.grpc.server.GrpcServerCdiExtension;
     uses io.helidon.microprofile.grpc.server.AnnotatedServiceConfigurer;
 
     provides jakarta.enterprise.inject.spi.Extension
             with io.helidon.microprofile.grpc.server.GrpcServerCdiExtension;
+
+    // needed when running with modules - to make private methods accessible
+    opens io.helidon.microprofile.grpc.server to weld.core.impl, io.helidon.microprofile.cdi;
 }