Moving ConsoleServlet to a more appropriate package, it's not beta al…

…ready
SeleniumHQ · Feb 14, 2018 · c640d73 · c640d73
1 parent 5925677
commit c640d73
Show file tree

Hide file tree

Showing 10 changed files with 17 additions and 20 deletions.
diff --git a/java/server/src/org/openqa/grid/selenium/proxy/DefaultRemoteProxy.java b/java/server/src/org/openqa/grid/selenium/proxy/DefaultRemoteProxy.java
@@ -29,7 +29,7 @@
 import org.openqa.grid.internal.listeners.TestSessionListener;
 import org.openqa.grid.internal.listeners.TimeoutListener;
 import org.openqa.grid.internal.utils.HtmlRenderer;
-import org.openqa.grid.web.servlet.beta.WebProxyHtmlRendererBeta;
+import org.openqa.grid.web.servlet.console.DefaultProxyHtmlRenderer;
 import org.openqa.selenium.remote.server.jmx.JMXHelper;
 import org.openqa.selenium.remote.server.jmx.ManagedAttribute;
 import org.openqa.selenium.remote.server.jmx.ManagedService;
@@ -97,7 +97,7 @@ public void beforeCommand(TestSession session, HttpServletRequest request, HttpS
     session.put("lastCommand", request.getMethod() + " - " + request.getPathInfo() + " executing ...");
   }
 
-  private final HtmlRenderer renderer = new WebProxyHtmlRendererBeta(this);
+  private final HtmlRenderer renderer = new DefaultProxyHtmlRenderer(this);
 
   @Override
   public HtmlRenderer getHtmlRender() {

diff --git a/java/server/src/org/openqa/grid/web/Hub.java b/java/server/src/org/openqa/grid/web/Hub.java
@@ -33,7 +33,7 @@
 import org.openqa.grid.web.servlet.RegistrationServlet;
 import org.openqa.grid.web.servlet.ResourceServlet;
 import org.openqa.grid.web.servlet.TestSessionStatusServlet;
-import org.openqa.grid.web.servlet.beta.ConsoleServlet;
+import org.openqa.grid.web.servlet.console.ConsoleServlet;
 import org.openqa.grid.web.utils.ExtraServletUtil;
 import org.openqa.selenium.json.Json;
 import org.openqa.selenium.net.NetworkUtils;

diff --git a/java/server/src/org/openqa/grid/web/servlet/DisplayHelpServlet.java b/java/server/src/org/openqa/grid/web/servlet/DisplayHelpServlet.java
@@ -21,7 +21,7 @@
 import com.google.gson.GsonBuilder;
 
 import org.openqa.grid.common.GridRole;
-import org.openqa.grid.web.servlet.beta.ConsoleServlet;
+import org.openqa.grid.web.servlet.console.ConsoleServlet;
 import org.openqa.selenium.internal.BuildInfo;
 
 import java.io.BufferedReader;

diff --git a/...grid/web/servlet/beta/ConsoleServlet.java → ...d/web/servlet/console/ConsoleServlet.java b/...grid/web/servlet/beta/ConsoleServlet.java → ...d/web/servlet/console/ConsoleServlet.java
@@ -15,7 +15,7 @@
 // specific language governing permissions and limitations
 // under the License.
 
-package org.openqa.grid.web.servlet.beta;
+package org.openqa.grid.web.servlet.console;
 
 import com.google.common.io.ByteStreams;
 
@@ -212,7 +212,7 @@ private String getConfigInfo(boolean verbose) {
 
     StringBuilder builder = new StringBuilder();
 
-    GridHubConfiguration config = getRegistry().getConfiguration();
+    GridHubConfiguration config = getRegistry().getHub().getConfiguration();
     builder.append("<div  id='hub-config'>");
     builder.append("<b>Config for the hub :</b><br/>");
     builder.append(prettyHtmlPrint(config));

diff --git a/...ervlet/beta/WebProxyHtmlRendererBeta.java → ...let/console/DefaultProxyHtmlRenderer.java b/...ervlet/beta/WebProxyHtmlRendererBeta.java → ...let/console/DefaultProxyHtmlRenderer.java
@@ -15,7 +15,7 @@
 // specific language governing permissions and limitations
 // under the License.
 
-package org.openqa.grid.web.servlet.beta;
+package org.openqa.grid.web.servlet.console;
 
 import com.google.gson.JsonObject;
 
@@ -28,14 +28,14 @@
 import org.openqa.selenium.Platform;
 import org.openqa.selenium.remote.CapabilityType;
 
-public class WebProxyHtmlRendererBeta implements HtmlRenderer {
+public class DefaultProxyHtmlRenderer implements HtmlRenderer {
 
   private RemoteProxy proxy;
 
   @SuppressWarnings("unused")
-  private WebProxyHtmlRendererBeta() {}
+  private DefaultProxyHtmlRenderer() {}
 
-  public WebProxyHtmlRendererBeta(RemoteProxy proxy) {
+  public DefaultProxyHtmlRenderer(RemoteProxy proxy) {
     this.proxy = proxy;
   }
 

diff --git a/...grid/web/servlet/beta/MiniCapability.java → ...d/web/servlet/console/MiniCapability.java b/...grid/web/servlet/beta/MiniCapability.java → ...d/web/servlet/console/MiniCapability.java
@@ -15,7 +15,7 @@
 // specific language governing permissions and limitations
 // under the License.
 
-package org.openqa.grid.web.servlet.beta;
+package org.openqa.grid.web.servlet.console;
 
 import org.openqa.grid.internal.TestSlot;
 import org.openqa.selenium.remote.BrowserType;

diff --git a/...nqa/grid/web/servlet/beta/SlotsLines.java → .../grid/web/servlet/console/SlotsLines.java b/...nqa/grid/web/servlet/beta/SlotsLines.java → .../grid/web/servlet/console/SlotsLines.java
@@ -15,11 +15,12 @@
 // specific language governing permissions and limitations
 // under the License.
 
-package org.openqa.grid.web.servlet.beta;
+package org.openqa.grid.web.servlet.console;
 
 import org.openqa.grid.internal.TestSlot;
 
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -30,11 +31,7 @@ class SlotsLines {
 
   public void add(TestSlot slot) {
     MiniCapability c = new MiniCapability(slot);
-    List<TestSlot> l = slots.get(c);
-    if (l == null) {
-      l = new ArrayList<>();
-      slots.put(c, l);
-    }
+    List<TestSlot> l = slots.computeIfAbsent(c, k -> new ArrayList<>());
     l.add(slot);
   }
 

diff --git a/java/server/src/org/openqa/selenium/remote/server/SeleniumServer.java b/java/server/src/org/openqa/selenium/remote/server/SeleniumServer.java
@@ -28,7 +28,7 @@
 import org.openqa.grid.selenium.node.FirefoxMutator;
 import org.openqa.grid.shared.GridNodeServer;
 import org.openqa.grid.web.servlet.DisplayHelpServlet;
-import org.openqa.grid.web.servlet.beta.ConsoleServlet;
+import org.openqa.grid.web.servlet.console.ConsoleServlet;
 import org.openqa.selenium.ImmutableCapabilities;
 import org.openqa.selenium.remote.server.jmx.JMXHelper;
 import org.openqa.selenium.remote.server.jmx.ManagedService;

diff --git a/java/server/test/org/openqa/grid/web/servlet/ConsoleServletTest.java b/java/server/test/org/openqa/grid/web/servlet/ConsoleServletTest.java
@@ -27,7 +27,7 @@
 import org.junit.runners.JUnit4;
 import org.openqa.grid.internal.DefaultGridRegistry;
 import org.openqa.grid.internal.GridRegistry;
-import org.openqa.grid.web.servlet.beta.ConsoleServlet;
+import org.openqa.grid.web.servlet.console.ConsoleServlet;
 import org.openqa.testing.FakeHttpServletResponse;
 import org.seleniumhq.jetty9.server.handler.ContextHandler;
 

diff --git a/java/server/test/org/openqa/grid/web/servlet/DisplayHelpServletTest.java b/java/server/test/org/openqa/grid/web/servlet/DisplayHelpServletTest.java
@@ -25,7 +25,7 @@
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.JUnit4;
-import org.openqa.grid.web.servlet.beta.ConsoleServlet;
+import org.openqa.grid.web.servlet.console.ConsoleServlet;
 import org.openqa.testing.FakeHttpServletResponse;
 import org.seleniumhq.jetty9.server.handler.ContextHandler;