Remove the apache-backed httpclient

SeleniumHQ · Sep 26, 2018 · f671fd2 · f671fd2 · diemol · Sep 26, 2018
1 parent a0a7d82
commit f671fd2
Show file tree

Hide file tree

Showing 9 changed files with 0 additions and 666 deletions.
diff --git a/java/client/src/org/openqa/selenium/remote/BUCK b/java/client/src/org/openqa/selenium/remote/BUCK
@@ -118,8 +118,6 @@ java_library(name = 'remote-lib',
     'http/JsonHttpResponseCodec.java',
     'http/W3CHttpCommandCodec.java',
     'http/W3CHttpResponseCodec.java',
-    'internal/ApacheHttpClient.java',
-    'internal/HttpClientFactory.java',
     'internal/HttpUrlBuilder.java',
     'internal/OkHttpClient.java',
     'internal/JsonToWebElementConverter.java',
@@ -137,7 +135,6 @@ java_library(name = 'remote-lib',
     ':capabilities',
     '//java/client/src/org/openqa/selenium/json:json',
     '//java/client/src/org/openqa/selenium/remote/session:session',
-    '//third_party/java/httpcomponents:httpclient',
     '//third_party/java/okhttp3:okhttp',
   ],
   deps = [

diff --git a/java/client/src/org/openqa/selenium/remote/http/HttpClient.java b/java/client/src/org/openqa/selenium/remote/http/HttpClient.java
@@ -24,7 +24,6 @@
 
 import org.openqa.selenium.BuildInfo;
 import org.openqa.selenium.Platform;
-import org.openqa.selenium.remote.internal.ApacheHttpClient;
 import org.openqa.selenium.remote.internal.OkHttpClient;
 
 import java.io.IOException;
@@ -63,9 +62,6 @@ interface Factory {
     static Factory createDefault() {
       String defaultFactory = System.getProperty("webdriver.http.factory", "okhttp");
       switch (defaultFactory) {
-        case "apache":
-          return new ApacheHttpClient.Factory();
-
         case "okhttp":
         default:
           return new OkHttpClient.Factory();

diff --git a/java/client/src/org/openqa/selenium/remote/internal/ApacheHttpClient.java b/java/client/src/org/openqa/selenium/remote/internal/ApacheHttpClient.java