[grid] Remove deprecated "GridRegistry.getHttpClientFactory" method

Author: shs96c

java/server/src/org/openqa/grid/internal/BaseGridRegistry.java

@@ -19,19 +19,18 @@
 
 import org.openqa.grid.web.Hub;
 import org.openqa.selenium.remote.http.HttpClient;
-import org.openqa.selenium.remote.internal.ApacheHttpClient;
-import org.openqa.selenium.remote.internal.HttpClientFactory;
+import org.openqa.selenium.remote.internal.OkHttpClient;
 
 import java.net.URL;
 
 public abstract class BaseGridRegistry implements GridRegistry {
-  protected final HttpClientFactory httpClientFactory;
+  protected final HttpClient.Factory httpClientFactory;
 
   // The following needs to be volatile because we expose a public setters
   protected volatile Hub hub;
 
   public BaseGridRegistry(Hub hub) {
-    this.httpClientFactory = new HttpClientFactory();
+    this.httpClientFactory = new OkHttpClient.Factory();
     this.hub = hub;
   }
 
@@ -49,17 +48,8 @@ public void setHub(Hub hub) {
     this.hub = hub;
   }
 
-  /**
-   * @see GridRegistry#getHttpClientFactory()
-   * @deprecated Use {@link #getHttpClient(URL)}.
-   */
-  @Deprecated
-  public HttpClientFactory getHttpClientFactory() {
-    return httpClientFactory;
-  }
-
   @Override
   public HttpClient getHttpClient(URL url) {
-    return new ApacheHttpClient.Factory(httpClientFactory).createClient(url);
+    return httpClientFactory.createClient(url);
   }
 }

java/server/src/org/openqa/grid/internal/BaseRemoteProxy.java

@@ -38,7 +38,6 @@
 import org.openqa.selenium.remote.http.HttpClient;
 import org.openqa.selenium.remote.http.HttpRequest;
 import org.openqa.selenium.remote.http.HttpResponse;
-import org.openqa.selenium.remote.internal.HttpClientFactory;
 import org.openqa.selenium.remote.server.jmx.ManagedAttribute;
 
 import java.lang.reflect.Constructor;
@@ -431,11 +430,6 @@ public int getTimeOut() {
     return config.timeout * 1000;
   }
 
-
-  public HttpClientFactory getHttpClientFactory() {
-    return getRegistry().getHttpClientFactory();
-  }
-
   public HttpClient getHttpClient(URL url) {
     return getRegistry().getHttpClient(url);
   }

java/server/src/org/openqa/grid/internal/DefaultGridRegistry.java

@@ -205,8 +205,6 @@ public void stop() {
     matcherThread.interrupt();
     newSessionQueue.stop();
     proxies.teardown();
-    httpClientFactory.close();
-
   }
 
   /**

java/server/src/org/openqa/grid/internal/GridRegistry.java

@@ -17,12 +17,10 @@
 
 package org.openqa.grid.internal;
 
-import org.openqa.grid.internal.utils.configuration.GridHubConfiguration;
 import org.openqa.grid.web.Hub;
 import org.openqa.grid.web.servlet.handler.RequestHandler;
 import org.openqa.selenium.remote.DesiredCapabilities;
 import org.openqa.selenium.remote.http.HttpClient;
-import org.openqa.selenium.remote.internal.HttpClientFactory;
 
 import java.net.URL;
 import java.util.List;
@@ -155,12 +153,6 @@ public interface GridRegistry {
    */
   void stop();
 
-  /**
-   * @return the {@link HttpClientFactory} to use
-   * @deprecated Use {@link #getHttpClient(URL)}
-   */
-  HttpClientFactory getHttpClientFactory();
-
   /**
     * @return the {@link HttpClient.Factory} to use.
    */
@@ -170,7 +162,6 @@ public interface GridRegistry {
    * Remove a new session request from the registry
    *
    * @param requestHandler the {@link RequestHandler}
-   * @return
    */
   boolean removeNewSessionRequest(RequestHandler requestHandler);
 

java/server/src/org/openqa/grid/internal/RemoteProxy.java

@@ -24,6 +24,7 @@
 import org.openqa.grid.internal.utils.CapabilityMatcher;
 import org.openqa.grid.internal.utils.HtmlRenderer;
 import org.openqa.grid.internal.utils.configuration.GridNodeConfiguration;
+import org.openqa.selenium.remote.http.HttpClient;
 import org.openqa.selenium.remote.internal.HttpClientFactory;
 
 import java.net.URL;
@@ -159,11 +160,9 @@ default TestSlot createTestSlot(SeleniumProtocol protocol, Map<String, Object> c
   int getTimeOut();
 
   /**
-   * Retrieves the global factory for creating HTTP clients.
-   *
-   * @return The thread-safe HTTP client factory.
+   * @return an {@link }HttpClient} for a particular {@link URL}.
    */
-  HttpClientFactory getHttpClientFactory();
+  HttpClient getHttpClient(URL url);
 
   /**
    * Renders the status of the node as JSON.  Useful for APIs.

java/server/src/org/openqa/grid/internal/TestSession.java

@@ -40,7 +40,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.remote.server.jmx.ManagedAttribute;
 import org.openqa.selenium.remote.server.jmx.ManagedService;
 
@@ -210,9 +209,7 @@ private HttpClient getClient(URL url) {
       browserTimeout *=2; // Lets not let this happen too often
     }
 
-    return new ApacheHttpClient(
-        slot.getProxy().getHttpClientFactory().getGridHttpClient((int) browserTimeout, (int) browserTimeout),
-        url);
+    return slot.getProxy().getHttpClient(url);
   }
 
   /*