Provide mechanism for getting the default HttpClient.Factory implmentation

Author: shs96c

java/client/src/org/openqa/selenium/remote/HttpCommandExecutor.java

@@ -46,20 +46,7 @@
 
 public class HttpCommandExecutor implements CommandExecutor, NeedsLocalLogs {
 
-  private final static HttpClient.Factory defaultClientFactory;
-  static {
-    String defaultFactory = System.getProperty("webdriver.http.factory", "okhttp");
-    switch (defaultFactory) {
-      case "okhttp":
-        defaultClientFactory = new OkHttpClient.Factory();
-        break;
-
-      case "apache":
-      default:
-        defaultClientFactory = new ApacheHttpClient.Factory();
-        break;
-    }
-  }
+  private final static HttpClient.Factory defaultClientFactory = HttpClient.Factory.createDefault();
 
   private final URL remoteServer;
   private final HttpClient client;

java/client/src/org/openqa/selenium/remote/http/HttpClient.java

@@ -17,6 +17,9 @@
 
 package org.openqa.selenium.remote.http;
 
+import org.openqa.selenium.remote.internal.ApacheHttpClient;
+import org.openqa.selenium.remote.internal.OkHttpClient;
+
 import java.io.IOException;
 import java.net.URL;
 
@@ -58,6 +61,18 @@ public interface HttpClient {
 
   interface Factory {
 
+    static Factory createDefault() {
+      String defaultFactory = System.getProperty("webdriver.http.factory", "okhttp");
+      switch (defaultFactory) {
+        case "okhttp":
+          return new OkHttpClient.Factory();
+
+        case "apache":
+        default:
+          return new ApacheHttpClient.Factory();
+      }
+    }
+
     /**
      * Creates a HTTP client that will send requests to the given URL.
      *

java/client/test/org/openqa/selenium/environment/webserver/JettyAppServer.java

@@ -33,7 +33,6 @@
 import org.openqa.selenium.remote.http.HttpMethod;
 import org.openqa.selenium.remote.http.HttpRequest;
 import org.openqa.selenium.remote.http.HttpResponse;
-import org.openqa.selenium.remote.internal.ApacheHttpClient;
 import org.openqa.selenium.testing.InProject;
 import org.seleniumhq.jetty9.http.HttpVersion;
 import org.seleniumhq.jetty9.http.MimeTypes;
@@ -206,7 +205,7 @@ public String create(Page page) {
       converted.addProperty("content", page.toString());
       byte[] data = converted.toString().getBytes(UTF_8);
 
-      HttpClient client = new ApacheHttpClient.Factory().createClient(new URL(whereIs("/")));
+      HttpClient client = HttpClient.Factory.createDefault().createClient(new URL(whereIs("/")));
       HttpRequest request = new HttpRequest(HttpMethod.POST, "/common/createPage");
       request.setHeader(CONTENT_TYPE, JSON_UTF_8.toString());
       request.setContent(data);

java/client/test/org/openqa/selenium/testing/drivers/GridSupplier.java

@@ -27,7 +27,6 @@
 import org.openqa.selenium.remote.http.HttpMethod;
 import org.openqa.selenium.remote.http.HttpRequest;
 import org.openqa.selenium.remote.http.HttpResponse;
-import org.openqa.selenium.remote.internal.ApacheHttpClient;
 import org.openqa.selenium.support.ui.FluentWait;
 import org.openqa.selenium.support.ui.Wait;
 
@@ -82,7 +81,7 @@ private synchronized void startServers() {
     }
 
     // Keep polling the status page of the hub until it claims to be ready
-    HttpClient client = new ApacheHttpClient.Factory().createClient(hub.getWebDriverUrl());
+    HttpClient client = HttpClient.Factory.createDefault().createClient(hub.getWebDriverUrl());
     Json json = new Json();
     Wait<HttpClient> wait = new FluentWait<>(client)
         .ignoring(RuntimeException.class)

java/server/src/org/openqa/selenium/remote/server/ProtocolConverter.java

@@ -29,13 +29,29 @@
 import org.openqa.selenium.remote.http.HttpResponse;
 import org.openqa.selenium.remote.internal.ApacheHttpClient;
 import org.openqa.selenium.remote.internal.JsonToWebElementConverter;
+import org.openqa.selenium.remote.internal.OkHttpClient;
 
 import java.io.IOException;
 import java.net.URL;
 import java.util.Map;
 
 class ProtocolConverter implements SessionCodec {
 
+  private final static HttpClient.Factory defaultClientFactory;
+  static {
+    String defaultFactory = System.getProperty("webdriver.http.factory", "okhttp");
+    switch (defaultFactory) {
+      case "okhttp":
+        defaultClientFactory = new OkHttpClient.Factory();
+        break;
+
+      case "apache":
+      default:
+        defaultClientFactory = new ApacheHttpClient.Factory();
+        break;
+    }
+  }
+
   private final static ImmutableSet<String> IGNORED_REQ_HEADERS = ImmutableSet.<String>builder()
       .add("connection")
       .add("keep-alive")
@@ -66,7 +82,7 @@ public ProtocolConverter(
     this.downstreamResponse = downstreamResponse;
     this.upstreamResponse = upstreamResponse;
 
-    client = new ApacheHttpClient.Factory().createClient(upstreamUrl);
+    client = HttpClient.Factory.createDefault().createClient(upstreamUrl);
     converter = new JsonToWebElementConverter(null);
   }
 

java/server/src/org/openqa/selenium/remote/server/RemoteSession.java

@@ -45,7 +45,6 @@
 import org.openqa.selenium.remote.http.JsonHttpResponseCodec;
 import org.openqa.selenium.remote.http.W3CHttpCommandCodec;
 import org.openqa.selenium.remote.http.W3CHttpResponseCodec;
-import org.openqa.selenium.remote.internal.ApacheHttpClient;
 
 import java.io.File;
 import java.io.IOException;
@@ -136,7 +135,7 @@ protected Optional<ActiveSession> performHandshake(
         Set<Dialect> downstreamDialects,
         Capabilities capabilities) {
       try {
-        HttpClient client = new ApacheHttpClient.Factory().createClient(url);
+        HttpClient client = HttpClient.Factory.createDefault().createClient(url);
 
         Command command = new Command(
             null,