[java] remove netty http client and use native java client by default

SeleniumHQ · Sep 30, 2023 · 7c14bff · 7c14bff
1 parent 05281bd
commit 7c14bff
Show file tree

Hide file tree

Showing 11 changed files with 9 additions and 805 deletions.
diff --git a/java/src/org/openqa/selenium/remote/BUILD.bazel b/java/src/org/openqa/selenium/remote/BUILD.bazel
@@ -55,7 +55,7 @@ java_library(
         "//java/src/org/openqa/selenium/json",
         "//java/src/org/openqa/selenium/manager",
         "//java/src/org/openqa/selenium/os",
-        "//java/src/org/openqa/selenium/remote/http/netty",
+        "//java/src/org/openqa/selenium/remote/http/jdk",
         "//java/src/org/openqa/selenium/remote/tracing",
         "//java/src/org/openqa/selenium/remote/tracing/opentelemetry",
         "//java/src/org/openqa/selenium/support/decorators",

diff --git a/java/src/org/openqa/selenium/remote/http/HttpClient.java b/java/src/org/openqa/selenium/remote/http/HttpClient.java
@@ -71,7 +71,7 @@ static Factory create(String name) {
      * <p>{@see create}
      */
     static Factory createDefault() {
-      return create(System.getProperty("webdriver.http.factory", "netty"));
+      return create("jdk-http-client");
     }
 
     /**

diff --git a/java/src/org/openqa/selenium/remote/http/jdk/BUILD.bazel b/java/src/org/openqa/selenium/remote/http/jdk/BUILD.bazel
@@ -1,17 +1,12 @@
-load("//java:defs.bzl", "java_export")
-load("//java:version.bzl", "SE_VERSION")
+load("@rules_jvm_external//:defs.bzl", "artifact")
+load("//java:defs.bzl", "java_library")
 
-java_export(
+java_library(
     name = "jdk",
     srcs = glob(["*.java"]),
-    javacopts = [
-        "--release",
-        "11",  # Deliberately targeting Java 11 for widest possible support
-    ],
-    maven_coordinates = "org.seleniumhq.selenium:selenium-http-jdk-client:%s" % SE_VERSION,
-    pom_template = "//java/src/org/openqa/selenium:template-pom",
     visibility = [
-        "//visibility:public",
+        "//java/src/org/openqa/selenium/remote:__pkg__",
+        "//java/test/org/openqa/selenium/remote/http:__subpackages__",
     ],
     deps = [
         "//java:auto-service",

diff --git a/java/src/org/openqa/selenium/remote/http/netty/BUILD.bazel b/java/src/org/openqa/selenium/remote/http/netty/BUILD.bazel
diff --git a/java/src/org/openqa/selenium/remote/http/netty/NettyClient.java b/java/src/org/openqa/selenium/remote/http/netty/NettyClient.java