First pass cleaning and simplifying module-info's.

Signed-off-by: Santiago Pericas-Geertsen <santiago.pericasgeertsen@oracle.com>
helidon-io · Jun 18, 2024 · efbc4c9 · efbc4c9
1 parent 79f8819
commit efbc4c9
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 19 deletions.
diff --git a/grpc/core/src/main/java/module-info.java b/grpc/core/src/main/java/module-info.java
@@ -19,12 +19,12 @@
  */
 module io.helidon.grpc.core {
 
-    requires java.logging;
-
     requires io.helidon.common;
     requires io.helidon.http;
     requires io.helidon.common.context;
 
+    requires java.logging;
+
     requires transitive io.grpc;
     requires transitive io.grpc.stub;
     requires transitive com.google.protobuf;

diff --git a/microprofile/grpc/core/src/main/java/module-info.java b/microprofile/grpc/core/src/main/java/module-info.java
@@ -18,17 +18,18 @@
  * gRPC microprofile core module
  */
 module io.helidon.microprofile.grpc.core {
-    exports io.helidon.microprofile.grpc.core;
 
     requires io.helidon.common;
-    requires transitive io.helidon.grpc.core;
-    requires transitive io.helidon.microprofile.config;
+    requires io.helidon.microprofile.config;
 
+    requires transitive io.helidon.grpc.core;
     requires transitive jakarta.cdi;
 
     requires java.logging;
     requires jakarta.inject;
 
+    exports io.helidon.microprofile.grpc.core;
+
     uses io.helidon.microprofile.grpc.core.MethodHandlerSupplier;
     uses io.helidon.grpc.core.MarshallerSupplier;
 

diff --git a/microprofile/grpc/server/src/main/java/module-info.java b/microprofile/grpc/server/src/main/java/module-info.java
@@ -29,12 +29,6 @@
 )
 @Aot(false)
 module io.helidon.microprofile.grpc.server {
-    exports io.helidon.microprofile.grpc.server;
-    exports io.helidon.microprofile.grpc.server.spi;
-
-    requires transitive io.helidon.grpc.core;
-    requires transitive io.helidon.webserver.grpc;
-    requires transitive io.helidon.microprofile.grpc.core;
 
     requires io.helidon.common;
     requires io.helidon.common.configurable;
@@ -44,7 +38,9 @@
     requires io.helidon.config.objectmapping;
     requires io.helidon.config;
     requires io.helidon.config.metadata;
+    requires io.helidon.microprofile.grpc.core;
     requires io.helidon.microprofile.server;
+    requires io.helidon.webserver.grpc;
 
     requires io.grpc;
     requires io.grpc.inprocess;
@@ -55,6 +51,9 @@
 
     requires microprofile.health.api;
 
+    exports io.helidon.microprofile.grpc.server;
+    exports io.helidon.microprofile.grpc.server.spi;
+
     uses io.helidon.microprofile.grpc.server.spi.GrpcMpExtension;
 
     provides jakarta.enterprise.inject.spi.Extension with GrpcMpCdiExtension;

diff --git a/webserver/grpc/src/main/java/module-info.java b/webserver/grpc/src/main/java/module-info.java
@@ -27,21 +27,17 @@
          in = HelidonFlavor.SE,
          path = {"WebServer", "GRPC"}
 )
-@SuppressWarnings({ "requires-automatic", "requires-transitive-automatic" })
+@SuppressWarnings({ "requires-automatic"})
 module io.helidon.webserver.grpc {
 
-    requires io.grpc.protobuf.lite;
     requires io.helidon.builder.api;
     requires io.helidon.webserver.http2;
     requires io.helidon.tracing;
-    requires io.helidon.grpc.core;
+    requires io.helidon.common.config;
 
-    requires static io.helidon.common.features.api;
+    requires transitive io.helidon.grpc.core;
 
-    requires transitive com.google.protobuf;
-    requires transitive io.grpc;
-    requires transitive io.grpc.stub;
-    requires transitive io.helidon.common.config;
+    requires static io.helidon.common.features.api;
 
     exports io.helidon.webserver.grpc;