Skip to content

Commit 773e4ae

Browse files
diemolbarancev
authored andcommitted
Allowing to customise how the proxy is rendered by using the existing getHtmlRender()
Signed-off-by: Alexei Barantsev <barancev@gmail.com>
1 parent f2eec92 commit 773e4ae

File tree

3 files changed

+5
-106
lines changed

3 files changed

+5
-106
lines changed

java/server/src/org/openqa/grid/selenium/proxy/DefaultRemoteProxy.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@
2929
import org.openqa.grid.internal.listeners.TestSessionListener;
3030
import org.openqa.grid.internal.listeners.TimeoutListener;
3131
import org.openqa.grid.internal.utils.HtmlRenderer;
32+
import org.openqa.grid.web.servlet.beta.WebProxyHtmlRendererBeta;
3233
import org.openqa.selenium.remote.server.jmx.JMXHelper;
3334
import org.openqa.selenium.remote.server.jmx.ManagedAttribute;
3435
import org.openqa.selenium.remote.server.jmx.ManagedService;
@@ -96,7 +97,7 @@ public void beforeCommand(TestSession session, HttpServletRequest request, HttpS
9697
session.put("lastCommand", request.getMethod() + " - " + request.getPathInfo() + " executing ...");
9798
}
9899

99-
private final HtmlRenderer renderer = new WebProxyHtmlRenderer(this);
100+
private final HtmlRenderer renderer = new WebProxyHtmlRendererBeta(this);
100101

101102
@Override
102103
public HtmlRenderer getHtmlRender() {

java/server/src/org/openqa/grid/selenium/proxy/WebProxyHtmlRenderer.java

Lines changed: 0 additions & 101 deletions
This file was deleted.

java/server/src/org/openqa/grid/web/servlet/beta/ConsoleServlet.java

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@
3434
import java.util.List;
3535
import java.util.logging.Logger;
3636

37-
import javax.servlet.ServletException;
3837
import javax.servlet.http.HttpServletRequest;
3938
import javax.servlet.http.HttpServletResponse;
4039

@@ -57,13 +56,13 @@ public ConsoleServlet(GridRegistry registry) {
5756

5857
@Override
5958
protected void doGet(HttpServletRequest request, HttpServletResponse response)
60-
throws ServletException, IOException {
59+
throws IOException {
6160
process(request, response);
6261
}
6362

6463
@Override
6564
protected void doPost(HttpServletRequest request, HttpServletResponse response)
66-
throws ServletException, IOException {
65+
throws IOException {
6766
process(request, response);
6867
}
6968

@@ -122,7 +121,7 @@ protected void process(HttpServletRequest request, HttpServletResponse response)
122121
// TODO freynaud : registry to return a copy of proxies ?
123122
List<String> nodes = new ArrayList<>();
124123
for (RemoteProxy proxy : getRegistry().getAllProxies()) {
125-
HtmlRenderer beta = new WebProxyHtmlRendererBeta(proxy);
124+
HtmlRenderer beta = proxy.getHtmlRender();
126125
nodes.add(beta.renderSummary());
127126
}
128127

0 commit comments

Comments
 (0)