[bazel] Allow packages to be opened in modules

Author: shs96c

java/buildtools/src/dev/selenium/tools/modules/ModuleGenerator.java

@@ -77,10 +77,7 @@
 import java.util.zip.ZipOutputStream;
 
 import static com.github.javaparser.ParseStart.COMPILATION_UNIT;
-import static net.bytebuddy.jar.asm.Opcodes.ACC_MANDATED;
-import static net.bytebuddy.jar.asm.Opcodes.ACC_MODULE;
-import static net.bytebuddy.jar.asm.Opcodes.ACC_OPEN;
-import static net.bytebuddy.jar.asm.Opcodes.ACC_TRANSITIVE;
+import static net.bytebuddy.jar.asm.Opcodes.*;
 
 public class ModuleGenerator {
 
@@ -277,7 +274,7 @@ public FileVisitResult visitFile(Path file, BasicFileAttributes attrs) {
     ModuleVisitor moduleVisitor = classWriter.visitModule(moduleName, isOpen ? ACC_OPEN : 0, null);
     moduleVisitor.visitRequire("java.base", ACC_MANDATED, null);
 
-    moduleDeclaration.accept(new MyModuleVisitor(classLoader, hides, moduleVisitor), null);
+    moduleDeclaration.accept(new MyModuleVisitor(classLoader, exportedPackages, hides, moduleVisitor), null);
 
     moduleVisitor.visitEnd();
 
@@ -360,13 +357,16 @@ private static Set<String> inferPackages(Path inJar) {
   private static class MyModuleVisitor extends VoidVisitorAdapter<Void> {
 
     private final ClassLoader classLoader;
-    private Set<String> seenExports;
+    private final Set<String> seenExports;
+    private final Set<String> packages;
     private final ModuleVisitor byteBuddyVisitor;
 
-    MyModuleVisitor(ClassLoader classLoader, Set<String> excluded, ModuleVisitor byteBuddyVisitor) {
+    MyModuleVisitor(ClassLoader classLoader, Set<String> packages, Set<String> excluded, ModuleVisitor byteBuddyVisitor) {
       this.classLoader = classLoader;
       this.byteBuddyVisitor = byteBuddyVisitor;
+
       // Set is modifiable
+      this.packages = new HashSet<>(packages);
       this.seenExports = new HashSet<>(excluded);
     }
 
@@ -408,7 +408,8 @@ public void visit(ModuleUsesDirective n, Void arg) {
 
     @Override
     public void visit(ModuleOpensDirective n, Void arg) {
-      throw new UnsupportedOperationException(n.toString());
+//      packages.forEach(pkg -> byteBuddyVisitor.visitOpen(pkg, ACC_MANDATED | ACC_SYNTHETIC, n.getNameAsString()));
+      packages.forEach(pkg -> byteBuddyVisitor.visitOpen(pkg.replace('.', '/'), 0, n.getNameAsString()));
     }
 
     private int getByteBuddyModifier(NodeList<Modifier> modifiers) {

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

@@ -31,6 +31,9 @@ java_export(
         "org.openqa.selenium.interactions.internal",
         "org.openqa.selenium.internal",
     ],
+    opens_to = [
+        "org.openqa.selenium.json",
+    ],
     maven_coordinates = "org.seleniumhq.selenium:selenium-api:%s" % SE_VERSION,
     pom_template = ":template-pom",
     visibility = ["//visibility:public"],

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

@@ -55,6 +55,9 @@ java_export(
     exports = [
         ":devtools-prototypes",
     ],
+    opens_to = [
+        "org.openqa.selenium.json",
+    ],
     deps = [
         ":devtools-prototypes",
         "//java:auto-service",

java/client/src/org/openqa/selenium/devtools/v86/BUILD.bazel

@@ -14,6 +14,9 @@ java_export(
     exports = [
         ":cdp",
     ],
+    opens_to = [
+        "org.openqa.selenium.json",
+    ],
     deps = [
         ":cdp",
         "//java:auto-service",

java/client/src/org/openqa/selenium/devtools/v87/BUILD.bazel

@@ -16,6 +16,9 @@ java_export(
     exports = [
         ":cdp",
     ],
+    opens_to = [
+        "org.openqa.selenium.json",
+    ],
     deps = [
         ":cdp",
         "//java:auto-service",

java/client/src/org/openqa/selenium/devtools/v88/BUILD.bazel

@@ -16,6 +16,9 @@ java_export(
     exports = [
         ":cdp",
     ],
+    opens_to = [
+        "org.openqa.selenium.json",
+    ],
     deps = [
         ":cdp",
         "//java:auto-service",

java/client/src/org/openqa/selenium/devtools/v89/BUILD.bazel

@@ -16,6 +16,9 @@ java_export(
     exports = [
         ":cdp",
     ],
+    opens_to = [
+        "org.openqa.selenium.json",
+    ],
     deps = [
         ":cdp",
         "//java:auto-service",

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

@@ -15,6 +15,9 @@ java_export(
         ":get-attribute",
         ":is-displayed",
     ],
+    opens_to = [
+        "org.openqa.selenium.json",
+    ],
     uses = [
         "org.openqa.selenium.remote.AugmenterProvider",
         "org.openqa.selenium.remote.session.CapabilitiesFilter",

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

@@ -22,6 +22,9 @@ java_export(
         "//java/client/src/org/openqa/selenium/support/ui:elements",
         "//java/client/src/org/openqa/selenium/support/ui:wait",
     ],
+    opens_to = [
+        "org.openqa.selenium.json",
+    ],
     deps = [
         ":page-factory",
         "//java/client/src/org/openqa/selenium:core",

java/private/export.bzl

@@ -13,6 +13,7 @@ def java_export(
         pom_template = None,
         hides = [],
         uses = [],
+        opens_to = [],
         exports = [],
         tags = [],
         visibility = None,
@@ -56,6 +57,7 @@ def java_export(
        target = "%s-project" % name,
        deps = kwargs.get("deps", []) + kwargs.get("runtime_deps", []),
        exports = exports,
+       opens_to = opens_to,
        tags = tags,
     )
 

java/private/module.bzl

@@ -105,17 +105,16 @@ def _java_module_impl(ctx):
     module_info_jar = ctx.actions.declare_file("%s-module-info.jar" % ctx.attr.name)
     args = ctx.actions.args()
     args.add_all(["--module-name", name])
-#    args.add_all(["--in", raw_merged_jar])
     args.add_all(["--in", ctx.file.target])
     args.add_all(["--output", module_info_jar])
     args.add_all(ctx.attr.hides, before_each = "--hides")
     args.add_all(ctx.attr.uses, before_each = "--uses")
     args.add_all(module_path_jars, before_each = "--module-path")
+    args.add_all(ctx.attr.opens_to, before_each = "--open-to")
 
     ctx.actions.run(
         executable = ctx.executable._module_generator,
         outputs = [module_info_jar],
-#        inputs = depset([raw_merged_jar], transitive = [info.module_path for info in all_infos]),
         inputs = depset([ctx.file.target], transitive = [info.module_path for info in all_infos]),
         arguments = [args],
     )
@@ -211,6 +210,10 @@ java_module = rule(
             doc = "List of package names to hide",
             default = [],
         ),
+        "opens_to": attr.string_list(
+            doc = "List of modules this module is open to",
+            default = [],
+        ),
         "uses": attr.string_list(
             doc = "List of classnames that the module uses",
             default = [],

java/server/src/org/openqa/selenium/grid/BUILD.bazel

@@ -60,6 +60,9 @@ java_export(
         "org.openqa.selenium.remote.locators.CustomLocator",
         "org.openqa.selenium.remote.service.DriverService$Builder",
     ],
+    opens_to = [
+        "org.openqa.selenium.json",
+    ],
     visibility = [
         "//visibility:public",
     ],