Tighten visibility of rules in the support package

shs96c · shs96c · commit fac1ac2ee19c · 2022-08-26T10:35:46.000+02:00
Because we create maven jars, we want to ensure that access
to targets is done via the `java_export` targets rather than
by referencing things directly. If we don't do this, there
is a risk that we'll include the same class in more than
one maven jar, leading to a "split package" and chaos.
diff --git a/java/src/org/openqa/selenium/support/events/BUILD.bazel b/java/src/org/openqa/selenium/support/events/BUILD.bazel
@@ -4,7 +4,9 @@ load("//java:defs.bzl", "java_library")
 java_library(
     name = "events",
     srcs = glob(["**/*.java"]),
-    visibility = ["//visibility:public"],
+    visibility = [
+        "//java/src/org/openqa/selenium/support:__subpackages__",
+    ],
     deps = [
         "//java/src/org/openqa/selenium:core",
         "//java/src/org/openqa/selenium/support/decorators",
diff --git a/java/src/org/openqa/selenium/support/ui/BUILD.bazel b/java/src/org/openqa/selenium/support/ui/BUILD.bazel
@@ -6,7 +6,10 @@ java_library(
     srcs = [
         "Sleeper.java",
     ],
-    visibility = ["//visibility:public"],
+    visibility = [
+        "//java/src/org/openqa/selenium/support:__subpackages__",
+        "//java/test/org/openqa/selenium/support:__subpackages__",
+    ],
     deps = [
         artifact("com.google.guava:guava"),
     ],
@@ -18,7 +21,9 @@ java_library(
         "LoadableComponent.java",
         "SlowLoadableComponent.java",
     ],
-    visibility = ["//visibility:public"],
+    visibility = [
+        "//java/src/org/openqa/selenium/support:__subpackages__",
+    ],
 )
 
 java_library(
@@ -29,7 +34,9 @@ java_library(
         "Select.java",
         "UnexpectedTagNameException.java",
     ],
-    visibility = ["//visibility:public"],
+    visibility = [
+        "//java/src/org/openqa/selenium/support:__subpackages__",
+    ],
     deps = [
         "//java/src/org/openqa/selenium:core",
     ],
@@ -44,7 +51,9 @@ java_library(
         "Wait.java",
         "WebDriverWait.java",
     ],
-    visibility = ["//visibility:public"],
+    visibility = [
+        "//java/src/org/openqa/selenium/support:__subpackages__",
+    ],
     deps = [
         ":clock",
         "//java/src/org/openqa/selenium:core",
diff --git a/java/test/org/openqa/selenium/grid/gridui/BUILD.bazel b/java/test/org/openqa/selenium/grid/gridui/BUILD.bazel
@@ -23,7 +23,7 @@ java_selenium_test_suite(
         "//java/src/org/openqa/selenium/json",
         "//java/src/org/openqa/selenium/remote",
         "//java/src/org/openqa/selenium/remote/http",
-        "//java/src/org/openqa/selenium/support/ui:wait",
+        "//java/src/org/openqa/selenium/support",
         "//java/test/org/openqa/selenium/testing:test-base",
         "//java/test/org/openqa/selenium/testing/drivers",
         artifact("com.google.guava:guava"),
diff --git a/java/test/org/openqa/selenium/testing/BUILD.bazel b/java/test/org/openqa/selenium/testing/BUILD.bazel
@@ -53,7 +53,7 @@ java_library(
         ":annotations",
         "//java/src/org/openqa/selenium:core",
         "//java/src/org/openqa/selenium/remote",
-        "//java/src/org/openqa/selenium/support/ui:wait",
+        "//java/src/org/openqa/selenium/support",
         "//java/test/org/openqa/selenium/build",
         "//java/test/org/openqa/selenium/environment",
         "//java/test/org/openqa/selenium/testing/drivers",
