[grid] Remove "Registry.getConfiguration"

Author: shs96c

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

@@ -17,7 +17,6 @@
 
 package org.openqa.grid.internal;
 
-import org.openqa.grid.internal.utils.configuration.GridHubConfiguration;
 import org.openqa.grid.web.Hub;
 import org.openqa.selenium.remote.http.HttpClient;
 import org.openqa.selenium.remote.internal.ApacheHttpClient;
@@ -27,27 +26,13 @@
 
 public abstract class BaseGridRegistry implements GridRegistry {
   protected final HttpClientFactory httpClientFactory;
-  @Deprecated
-  protected GridHubConfiguration configuration;
 
   // 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.hub = hub;
-
-    this.configuration = (hub != null) ?
-       hub.getConfiguration() : new GridHubConfiguration();
-  }
-
-  /**
-   * @see GridRegistry#getConfiguration()
-   */
-  @Deprecated
-  public GridHubConfiguration getConfiguration() {
-    return (hub != null) ? hub.getConfiguration() :
-           (configuration != null) ? configuration : new GridHubConfiguration();
   }
 
   /**
@@ -62,9 +47,6 @@ public Hub getHub() {
    */
   public void setHub(Hub hub) {
     this.hub = hub;
-    if (hub != null) {
-      this.configuration = hub.getConfiguration();
-    }
   }
 
   /**

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

@@ -235,7 +235,9 @@ private void assignRequestToProxy() {
       try {
         testSessionAvailable.await(5, TimeUnit.SECONDS);
 
-        newSessionQueue.processQueue(this::takeRequestHandler, configuration.prioritizer);
+        newSessionQueue.processQueue(
+            this::takeRequestHandler,
+            getHub().getConfiguration().prioritizer);
         // Just make sure we delete anything that is logged on this thread from memory
         LoggingManager.perSessionLogHandler().clearThreadTempLogs();
       } catch (InterruptedException e) {

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

@@ -31,13 +31,6 @@
 public interface GridRegistry {
   String KEY = GridRegistry.class.getName();
 
-  /**
-   * @return the {@link GridHubConfiguration} for this registry
-   * @deprecated use #getHub() to access the {@link GridHubConfiguration} instead.
-   */
-  @Deprecated
-  GridHubConfiguration getConfiguration();
-
   /**
    * Ends this test session, releasing the resources in the registry. Resources should be released
    * on a separate thread so the call does not block. MUST honor listeners for the {@link TestSlot} which

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

@@ -204,7 +204,7 @@ public String toString() {
 
   private HttpClient getClient(URL url) {
     GridRegistry reg = slot.getProxy().getRegistry();
-    long browserTimeout = TimeUnit.SECONDS.toMillis(reg.getConfiguration().browserTimeout);
+    long browserTimeout = TimeUnit.SECONDS.toMillis(reg.getHub().getConfiguration().browserTimeout);
     if (browserTimeout > 0) {
       final long selenium_server_cleanup_cycle = browserTimeout / 10;
       browserTimeout += (selenium_server_cleanup_cycle + MAX_NETWORK_LATENCY);

java/server/src/org/openqa/grid/web/Hub.java

@@ -65,7 +65,7 @@ public class Hub implements Stoppable {
 
   private static final Logger log = Logger.getLogger(Hub.class.getName());
 
-  private GridHubConfiguration config;
+  private final GridHubConfiguration config;
   private final GridRegistry registry;
   private final Map<String, Class<? extends Servlet>> extraServlet = Maps.newHashMap();
 
@@ -85,7 +85,7 @@ public GridRegistry getRegistry() {
   }
 
   public Hub(GridHubConfiguration gridHubConfiguration) {
-    config = gridHubConfiguration;
+    config = gridHubConfiguration == null ? new GridHubConfiguration() : gridHubConfiguration;
 
     try {
       registry = (GridRegistry) Class.forName(config.registry).newInstance();

java/server/src/org/openqa/grid/web/servlet/HubStatusServlet.java

@@ -113,7 +113,7 @@ private Map<String, Object> getResponse(HttpServletRequest request) {
         }
 
         GridRegistry registry = getRegistry();
-        JsonElement config = registry.getConfiguration().toJson();
+        JsonElement config = registry.getHub().getConfiguration().toJson();
         for (Map.Entry<String, JsonElement> entry : config.getAsJsonObject().entrySet()) {
           if (keysToReturn == null || keysToReturn.isEmpty() || keysToReturn.contains(entry.getKey())) {
             res.put(entry.getKey(), entry.getValue());

java/server/src/org/openqa/grid/web/servlet/handler/RequestHandler.java

@@ -28,6 +28,7 @@
 import org.openqa.grid.internal.TestSession;
 import org.openqa.grid.internal.exception.NewSessionException;
 import org.openqa.grid.internal.listeners.TestSessionListener;
+import org.openqa.grid.internal.utils.configuration.GridHubConfiguration;
 import org.openqa.selenium.remote.DesiredCapabilities;
 import org.openqa.selenium.remote.NewSessionPayload;
 
@@ -188,8 +189,9 @@ private void beforeSessionEvent() throws NewSessionException {
   public void waitForSessionBound() throws InterruptedException, TimeoutException {
     // Maintain compatibility with Grid 1.x, which had the ability to
     // specify how long to wait before canceling a request.
-    Integer newSessionWaitTimeout = registry.getConfiguration().newSessionWaitTimeout != null ?
-                                    registry.getConfiguration().newSessionWaitTimeout : 0;
+    GridHubConfiguration configuration = getRegistry().getHub().getConfiguration();
+    Integer newSessionWaitTimeout = configuration.newSessionWaitTimeout != null ?
+                                    configuration.newSessionWaitTimeout : 0;
     if (newSessionWaitTimeout > 0) {
       if (!sessionAssigned.await(newSessionWaitTimeout.longValue(), TimeUnit.MILLISECONDS)) {
         throw new TimeoutException("Request timed out waiting for a node to become available.");
@@ -215,9 +217,11 @@ public HttpServletResponse getResponse() {
   }
 
   public int compareTo(RequestHandler o) {
-    if (registry.getConfiguration().prioritizer != null) {
-      return registry.getConfiguration().prioritizer.compareTo(this.getRequest().getDesiredCapabilities(), o.getRequest()
-          .getDesiredCapabilities());
+    GridHubConfiguration configuration = getRegistry().getHub().getConfiguration();
+    if (configuration.prioritizer != null) {
+      return configuration.prioritizer.compareTo(
+          this.getRequest().getDesiredCapabilities(),
+          o.getRequest().getDesiredCapabilities());
     }
     return 0;
   }

java/server/test/org/openqa/grid/internal/NewSessionRequestTimeout.java

@@ -46,7 +46,7 @@ public void setup() throws Exception {
     p1 = RemoteProxyFactory.getNewBasicRemoteProxy(ff, "http://machine1:4444", registry);
     registry.add(p1);
     // after 1 sec in the queue, request are kicked out.
-    registry.getConfiguration().newSessionWaitTimeout = 1000;
+    registry.getHub().getConfiguration().newSessionWaitTimeout = 1000;
   }
 
   @Test(timeout = 5000)

java/server/test/org/openqa/grid/internal/SessionTimesOutTest.java

@@ -237,8 +237,8 @@ public void stupidConfig() throws InterruptedException {
         req.getConfiguration().cleanUpCycle = cycle;
         req.getConfiguration().host = "localhost";
 
-        registry.getConfiguration().cleanUpCycle = cycle;
-        registry.getConfiguration().timeout = timeout;
+        registry.getHub().getConfiguration().cleanUpCycle = cycle;
+        registry.getHub().getConfiguration().timeout = timeout;
 
         final MyStupidConfig proxy = new MyStupidConfig(req, registry);
         proxy.setupTimeoutListener();

java/server/test/org/openqa/grid/internal/listener/CommandListenerTest.java

@@ -17,24 +17,12 @@
 
 package org.openqa.grid.internal.listener;
 
-import static org.mockito.Mockito.any;
-import static org.mockito.Mockito.anyInt;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
-import org.apache.http.Header;
-import org.apache.http.HttpEntity;
-import org.apache.http.HttpHost;
-import org.apache.http.HttpRequest;
-import org.apache.http.HttpResponse;
-import org.apache.http.StatusLine;
-import org.apache.http.client.HttpClient;
-import org.apache.http.protocol.HttpContext;
 import org.junit.Before;
 import org.junit.Test;
-import org.mockito.invocation.InvocationOnMock;
-import org.mockito.stubbing.Answer;
 import org.openqa.grid.common.RegistrationRequest;
 import org.openqa.grid.internal.BaseRemoteProxy;
 import org.openqa.grid.internal.DefaultGridRegistry;
@@ -50,10 +38,8 @@
 import org.openqa.grid.web.servlet.handler.SeleniumBasedResponse;
 import org.openqa.selenium.remote.CapabilityType;
 import org.openqa.selenium.remote.DesiredCapabilities;
-import org.openqa.selenium.remote.internal.HttpClientFactory;
 
 import java.io.IOException;
-import java.io.InputStream;
 import java.net.MalformedURLException;
 import java.net.URL;
 import java.util.Collections;
@@ -96,49 +82,49 @@ public URL getRemoteHost() {
       return null;
     }
 
-    @Override
-    public HttpClientFactory getHttpClientFactory() {
-      // Create mocks for network traffic
-      HttpClientFactory factory = mock(HttpClientFactory.class);
-      HttpClient client = mock(HttpClient.class);
-      HttpResponse response = mock(HttpResponse.class);
-      HttpEntity entity = mock(HttpEntity.class);
-      InputStream stream = mock(InputStream.class);
-      StatusLine line = mock(StatusLine.class);
-
-      when(line.getStatusCode()).thenReturn(200);
-      when(response.getStatusLine()).thenReturn(line);
-      when(response.getAllHeaders()).thenReturn(new Header[0]);
-      when(response.getEntity()).thenReturn(entity);
-      try {
-        // Create a fake stream that will only return the a single number
-        Answer<Integer> answer = new Answer<Integer>() {
-          boolean hasBeenRead = false;
-          @Override
-          public Integer answer(InvocationOnMock invocation) {
-            if (hasBeenRead) {
-              return -1;
-            }
-            hasBeenRead = true;
-            return 1;
-          }
-        };
-
-        // Have all the methods return mocks so client.execute returns our
-        // mocked objects
-        when(stream.read(any(byte[].class))).thenAnswer(answer);
-        when(entity.getContent()).thenReturn(stream);
-        when(client.execute(
-            any(HttpHost.class),
-            any(HttpRequest.class), any(
-            HttpContext.class))).thenReturn(response);
-        when(factory.getGridHttpClient(anyInt(), anyInt())).thenReturn(client);
-      } catch (Exception e) {
-        e.printStackTrace();
-      }
-
-      return factory;
-    }
+//    @Override
+//    public HttpClientFactory getHttpClientFactory() {
+//      // Create mocks for network traffic
+//      HttpClientFactory factory = mock(HttpClientFactory.class);
+//      HttpClient client = mock(HttpClient.class);
+//      HttpResponse response = mock(HttpResponse.class);
+//      HttpEntity entity = mock(HttpEntity.class);
+//      InputStream stream = mock(InputStream.class);
+//      StatusLine line = mock(StatusLine.class);
+//
+//      when(line.getStatusCode()).thenReturn(200);
+//      when(response.getStatusLine()).thenReturn(line);
+//      when(response.getAllHeaders()).thenReturn(new Header[0]);
+//      when(response.getEntity()).thenReturn(entity);
+//      try {
+//        // Create a fake stream that will only return the a single number
+//        Answer<Integer> answer = new Answer<Integer>() {
+//          boolean hasBeenRead = false;
+//          @Override
+//          public Integer answer(InvocationOnMock invocation) {
+//            if (hasBeenRead) {
+//              return -1;
+//            }
+//            hasBeenRead = true;
+//            return 1;
+//          }
+//        };
+//
+//        // Have all the methods return mocks so client.execute returns our
+//        // mocked objects
+//        when(stream.read(any(byte[].class))).thenAnswer(answer);
+//        when(entity.getContent()).thenReturn(stream);
+//        when(client.execute(
+//            any(HttpHost.class),
+//            any(HttpRequest.class), any(
+//            HttpContext.class))).thenReturn(response);
+//        when(factory.getGridHttpClient(anyInt(), anyInt())).thenReturn(client);
+//      } catch (Exception e) {
+//        e.printStackTrace();
+//      }
+//
+//      return factory;
+//    }
   }
 
   private RegistrationRequest req = null;