Allowing to customise how the proxy is rendered by using the existing…

… getHtmlRender() Signed-off-by: Alexei Barantsev <barancev@gmail.com>
SeleniumHQ · Dec 22, 2017 · 773e4ae · 773e4ae · mach6 · Jan 9, 2018
1 parent f2eec92
commit 773e4ae
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 106 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,6 +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.selenium.remote.server.jmx.JMXHelper;
 import org.openqa.selenium.remote.server.jmx.ManagedAttribute;
 import org.openqa.selenium.remote.server.jmx.ManagedService;
@@ -96,7 +97,7 @@ public void beforeCommand(TestSession session, HttpServletRequest request, HttpS
     session.put("lastCommand", request.getMethod() + " - " + request.getPathInfo() + " executing ...");
   }
 
-  private final HtmlRenderer renderer = new WebProxyHtmlRenderer(this);
+  private final HtmlRenderer renderer = new WebProxyHtmlRendererBeta(this);
 
   @Override
   public HtmlRenderer getHtmlRender() {

diff --git a/java/server/src/org/openqa/grid/selenium/proxy/WebProxyHtmlRenderer.java b/java/server/src/org/openqa/grid/selenium/proxy/WebProxyHtmlRenderer.java
diff --git a/java/server/src/org/openqa/grid/web/servlet/beta/ConsoleServlet.java b/java/server/src/org/openqa/grid/web/servlet/beta/ConsoleServlet.java
@@ -34,7 +34,6 @@
 import java.util.List;
 import java.util.logging.Logger;
 
-import javax.servlet.ServletException;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
@@ -57,13 +56,13 @@ public ConsoleServlet(GridRegistry registry) {
 
   @Override
   protected void doGet(HttpServletRequest request, HttpServletResponse response)
-      throws ServletException, IOException {
+      throws IOException {
     process(request, response);
   }
 
   @Override
   protected void doPost(HttpServletRequest request, HttpServletResponse response)
-      throws ServletException, IOException {
+      throws IOException {
     process(request, response);
   }
 
@@ -122,7 +121,7 @@ protected void process(HttpServletRequest request, HttpServletResponse response)
     // TODO freynaud : registry to return a copy of proxies ?
     List<String> nodes = new ArrayList<>();
     for (RemoteProxy proxy : getRegistry().getAllProxies()) {
-      HtmlRenderer beta = new WebProxyHtmlRendererBeta(proxy);
+      HtmlRenderer beta = proxy.getHtmlRender();
       nodes.add(beta.renderSummary());
     }