[java] Adding information about used services to generated module info file

Author: barancev

java/client/src/org/openqa/selenium/remote/BUILD.bazel

@@ -60,6 +60,12 @@ java_export(
     ],
     maven_coordinates = "org.seleniumhq.selenium:selenium-remote-driver:%s" % SE_VERSION,
     pom_template = "//java/client/src/org/openqa/selenium:template-pom",
+    module_uses_services = [
+        "io.opentracing.Tracer",
+        "org.openqa.selenium.remote.session.CapabilitiesFilter",
+        "org.openqa.selenium.remote.session.CapabilityTransform",
+        "org.openqa.selenium.remote.service.DriverService$Builder",
+    ],
     visibility = ["//visibility:public"],
     exports = [
         ":api",
@@ -80,7 +86,6 @@ java_export(
         "//java/client/src/org/openqa/selenium/io",
         "//java/client/src/org/openqa/selenium/os",
         "//java/client/src/org/openqa/selenium/remote/http/okhttp",
-        "//java/client/src/org/openqa/selenium/remote/http/netty",
         "//third_party/java/bytebuddy:byte-buddy",
         "//third_party/java/guava",
     ],

java/client/src/org/openqa/selenium/tools/modules/ModuleGenerator.java

@@ -88,6 +88,7 @@ public static void main(String[] args) throws IOException {
     String modulePath = null;
     String coordinates = null;
     Set<Pattern> excludes = new HashSet<>();
+    Set<String> uses = new HashSet<>();
 
     for (int i = 0; i < args.length; i++) {
       String flag = args[i];
@@ -97,6 +98,10 @@ public static void main(String[] args) throws IOException {
           coordinates = next;
           break;
 
+        case "--uses":
+          uses.add(next);
+          break;
+
         case "--exclude":
           excludes.add(Pattern.compile(next));
           break;
@@ -190,7 +195,10 @@ public FileVisitResult visitFile(Path file, BasicFileAttributes attrs) {
     ModuleDeclaration moduleDeclaration = unit.getModule()
       .orElseThrow(() -> new RuntimeException("No module declaration in " + moduleInfo.get()));
 
-    moduleDeclaration = moduleDeclaration.setName(moduleName);
+    moduleDeclaration.setName(moduleName);
+
+    uses.forEach(
+        service -> moduleDeclaration.addDirective(new ModuleUsesDirective(new Name(service))));
 
     // Prepare a classloader to help us find classes.
     ClassLoader classLoader;

java/private/export.bzl

@@ -7,6 +7,7 @@ def java_export(
         name,
         maven_coordinates,
         pom_template,
+        module_uses_services = [],
         module_exclude_patterns = [
           ".*\\.internal.*",
         ],
@@ -26,6 +27,7 @@ def java_export(
         name = name,
         tags = actual_tags,
         maven_coordinates = maven_coordinates,
+        module_uses_services = module_uses_services,
         module_exclude_patterns = module_exclude_patterns,
         target = "%s-base-lib" % name,
         binjar = "%s-binary.jar" % name,

java/private/maven_artifacts.bzl

@@ -18,6 +18,8 @@ def _maven_artifacts_impl(ctx):
     args.add_all(["--coordinates", ctx.attr.maven_coordinates])
     args.add_all(["--in", temp_bin_jar.path])
     args.add_all(["--out", module_jar.path])
+    if len(ctx.attr.module_uses_services) > 0:
+        args.add_all(ctx.attr.module_uses_services, before_each = "--uses")
 
     paths = [file.path for file in target[GatheredJavaModuleInfo].module_jars.to_list()]
     if len(paths) > 0:
@@ -66,6 +68,9 @@ maven_artifacts = rule(
             aspects = [has_java_module_deps, has_maven_deps],
             providers = [GatheredJavaModuleInfo, JavaInfo],
         ),
+        "module_uses_services": attr.string_list(
+            default = [],
+        ),
         "module_exclude_patterns": attr.string_list(
             default = [],
         ),