Simplify the remote build file

Author: shs96c

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

@@ -3,58 +3,18 @@ load("//common:defs.bzl", "copy_file")
 load("//java:defs.bzl", "java_dist_zip", "java_export", "java_library")
 load("//java:version.bzl", "SE_VERSION")
 
-java_library(
-    name = "api",
-    srcs = [
-        "Augmentable.java",
-        "Command.java",
-        "CommandExecutor.java",
-        "CommandPayload.java",
-        "ErrorCodes.java",
-        "Response.java",
-        "ScreenshotException.java",
-        "SessionId.java",
-    ],
-    visibility = [
-        "//java/client/src/org/openqa/selenium/json:__pkg__",
-    ],
-    deps = [
-        "//java/client/src/org/openqa/selenium:core",
-        "//java/client/src/org/openqa/selenium/json",
-        artifact("com.google.guava:guava"),
-    ],
-)
-
-java_library(
-    name = "capabilities",
-    srcs = [
-        "BrowserType.java",
-        "CapabilityType.java",
-        "DesiredCapabilities.java",
-    ],
-    visibility = [
-        "//java/client/src/org/openqa/selenium/remote/session:__pkg__",
-    ],
-    deps = [
-        "//java/client/src/org/openqa/selenium:core",
-    ],
-)
-
-java_library(
-    name = "http-session-id",
-    srcs = ["HttpSessionId.java"],
-)
-
 java_export(
     name = "remote",
-    srcs = [
-        "RemoteTags.java",
-    ],
+    srcs = glob(["**/*.java"]),
     hides = [
         "org.openqa.selenium.remote.internal",
     ],
     maven_coordinates = "org.seleniumhq.selenium:selenium-remote-driver:%s" % SE_VERSION,
     pom_template = "//java/client/src/org/openqa/selenium:template-pom",
+    resources = [
+        ":get-attribute",
+        ":is-displayed",
+    ],
     uses = [
         "org.openqa.selenium.remote.AugmenterProvider",
         "org.openqa.selenium.remote.session.CapabilitiesFilter",
@@ -63,10 +23,6 @@ java_export(
     ],
     visibility = ["//visibility:public"],
     exports = [
-        ":api",
-        ":capabilities",
-        ":http-session-id",
-        ":remote-lib",
         "//java/client/src/org/openqa/selenium:core",
         "//java/client/src/org/openqa/selenium/io",
         "//java/client/src/org/openqa/selenium/os",
@@ -75,100 +31,17 @@ java_export(
         "//java/client/src/org/openqa/selenium/remote/tracing",
         "//java/client/src/org/openqa/selenium/remote/tracing/opentelemetry",
     ],
-    runtime_deps = [
-        ":api",
-        ":capabilities",
-        ":remote-lib",
+    deps = [
         "//java/client/src/org/openqa/selenium:core",
         "//java/client/src/org/openqa/selenium/io",
+        "//java/client/src/org/openqa/selenium/json",
         "//java/client/src/org/openqa/selenium/os",
         "//java/client/src/org/openqa/selenium/remote/http/netty",
         "//java/client/src/org/openqa/selenium/remote/http/reactor",
         "//java/client/src/org/openqa/selenium/remote/tracing",
         artifact("com.google.guava:guava"),
         artifact("net.bytebuddy:byte-buddy"),
     ],
-    deps = [
-        "//java/client/src/org/openqa/selenium:core",
-        "//java/client/src/org/openqa/selenium/remote:api",
-        "//java/client/src/org/openqa/selenium/remote/tracing",
-    ],
-)
-
-java_library(
-    name = "remote-lib",
-    srcs = [
-        "AbstractDriverOptions.java",
-        "AcceptedW3CCapabilityKeys.java",
-        "AddWebDriverSpecHeaders.java",
-        "AddRotatable.java",
-        "Augmenter.java",
-        "AugmenterProvider.java",
-        "CommandCodec.java",
-        "CommandInfo.java",
-        "Dialect.java",
-        "DriverCommand.java",
-        "ErrorCodec.java",
-        "ErrorFilter.java",
-        "ErrorHandler.java",
-        "ExecuteMethod.java",
-        "FileDetector.java",
-        "HandshakeResponse.java",
-        "HttpCommandExecutor.java",
-        "InitialHandshakeResponse.java",
-        "JsonToWebElementConverter.java",
-        "JsonWireProtocolResponse.java",
-        "LocalFileDetector.java",
-        "NewSessionPayload.java",
-        "ProtocolHandshake.java",
-        "RemoteExecuteMethod.java",
-        "RemoteKeyboard.java",
-        "RemoteLogs.java",
-        "RemoteMouse.java",
-        "RemoteRotatable.java",
-        "RemoteStatus.java",
-        "RemoteTouchScreen.java",
-        "RemoteWebDriver.java",
-        "RemoteWebDriverBuilder.java",
-        "RemoteWebElement.java",
-        "ResponseCodec.java",
-        "UnreachableBrowserException.java",
-        "UselessFileDetector.java",
-        "W3CHandshakeResponse.java",
-        "html5/AddApplicationCache.java",
-        "html5/AddLocationContext.java",
-        "html5/AddWebStorage.java",
-        "html5/RemoteApplicationCache.java",
-        "html5/RemoteLocalStorage.java",
-        "html5/RemoteLocationContext.java",
-        "html5/RemoteSessionStorage.java",
-        "html5/RemoteWebStorage.java",
-        "mobile/AddNetworkConnection.java",
-        "mobile/RemoteNetworkConnection.java",
-    ] + glob([
-        "codec/*.java",
-        "codec/jwp/*.java",
-        "codec/w3c/*.java",
-        "internal/*.java",
-        "service/*.java",
-    ]),
-    resources = [
-        ":get-attribute",
-        ":is-displayed",
-    ],
-    deps = [
-        ":api",
-        ":capabilities",
-        ":http-session-id",
-        "//java/client/src/org/openqa/selenium:core",
-        "//java/client/src/org/openqa/selenium/io",
-        "//java/client/src/org/openqa/selenium/json",
-        "//java/client/src/org/openqa/selenium/os",
-        "//java/client/src/org/openqa/selenium/remote/http",
-        "//java/client/src/org/openqa/selenium/remote/session",
-        artifact("com.google.guava:guava"),
-        artifact("net.bytebuddy:byte-buddy"),
-    ],
 )
 
 copy_file(