Skip to content

Commit 879c4b0

Browse files
shs96cshs96c
committed
Rename BaseServer to JettyServer
1 parent e940e94 commit 879c4b0

File tree

10 files changed

+26
-26
lines changed

10 files changed

+26
-26
lines changed

‎java/server/src/org/openqa/selenium/grid/commands/Hub.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,12 +32,12 @@
3232
import org.openqa.selenium.grid.distributor.local.LocalDistributor;
3333
import org.openqa.selenium.grid.log.LoggingOptions;
3434
import org.openqa.selenium.grid.router.Router;
35-
import org.openqa.selenium.grid.server.BaseServer;
3635
import org.openqa.selenium.grid.server.BaseServerFlags;
3736
import org.openqa.selenium.grid.server.BaseServerOptions;
3837
import org.openqa.selenium.grid.server.EventBusConfig;
3938
import org.openqa.selenium.grid.server.EventBusFlags;
4039
import org.openqa.selenium.grid.server.HelpFlags;
40+
import org.openqa.selenium.grid.server.JettyServer;
4141
import org.openqa.selenium.grid.server.Server;
4242
import org.openqa.selenium.grid.sessionmap.SessionMap;
4343
import org.openqa.selenium.grid.sessionmap.local.LocalSessionMap;
@@ -121,7 +121,7 @@ public Executable configure(String... args) {
121121
handler.addHandler(distributor);
122122
Router router = new Router(clientFactory, sessions, distributor);
123123

124-
Server<?> server = new BaseServer<>(serverOptions);
124+
Server<?> server = new JettyServer(serverOptions);
125125
server.setHandler(router);
126126
server.start();
127127

‎java/server/src/org/openqa/selenium/grid/commands/Standalone.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,12 +38,12 @@
3838
import org.openqa.selenium.grid.node.config.NodeOptions;
3939
import org.openqa.selenium.grid.node.local.LocalNode;
4040
import org.openqa.selenium.grid.router.Router;
41-
import org.openqa.selenium.grid.server.BaseServer;
4241
import org.openqa.selenium.grid.server.BaseServerFlags;
4342
import org.openqa.selenium.grid.server.BaseServerOptions;
4443
import org.openqa.selenium.grid.server.EventBusConfig;
4544
import org.openqa.selenium.grid.server.EventBusFlags;
4645
import org.openqa.selenium.grid.server.HelpFlags;
46+
import org.openqa.selenium.grid.server.JettyServer;
4747
import org.openqa.selenium.grid.server.Server;
4848
import org.openqa.selenium.grid.sessionmap.SessionMap;
4949
import org.openqa.selenium.grid.sessionmap.local.LocalSessionMap;
@@ -158,7 +158,7 @@ public Executable configure(String... args) {
158158
combinedHandler.addHandler(node);
159159
distributor.add(node);
160160

161-
Server<?> server = new BaseServer<>(new BaseServerOptions(config));
161+
Server<?> server = new JettyServer(new BaseServerOptions(config));
162162
server.setHandler(router);
163163
server.start();
164164

‎java/server/src/org/openqa/selenium/grid/distributor/httpd/DistributorServer.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,12 +31,12 @@
3131
import org.openqa.selenium.grid.distributor.Distributor;
3232
import org.openqa.selenium.grid.distributor.local.LocalDistributor;
3333
import org.openqa.selenium.grid.log.LoggingOptions;
34-
import org.openqa.selenium.grid.server.BaseServer;
3534
import org.openqa.selenium.grid.server.BaseServerFlags;
3635
import org.openqa.selenium.grid.server.BaseServerOptions;
3736
import org.openqa.selenium.grid.server.EventBusConfig;
3837
import org.openqa.selenium.grid.server.EventBusFlags;
3938
import org.openqa.selenium.grid.server.HelpFlags;
39+
import org.openqa.selenium.grid.server.JettyServer;
4040
import org.openqa.selenium.grid.server.Server;
4141
import org.openqa.selenium.grid.sessionmap.SessionMap;
4242
import org.openqa.selenium.grid.sessionmap.config.SessionMapFlags;
@@ -116,7 +116,7 @@ public Executable configure(String... args) {
116116

117117
BaseServerOptions serverOptions = new BaseServerOptions(config);
118118

119-
Server<?> server = new BaseServer<>(serverOptions);
119+
Server<?> server = new JettyServer(serverOptions);
120120
server.setHandler(distributor);
121121
server.start();
122122

‎java/server/src/org/openqa/selenium/grid/node/httpd/NodeServer.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,12 +36,12 @@
3636
import org.openqa.selenium.grid.log.LoggingOptions;
3737
import org.openqa.selenium.grid.node.config.NodeOptions;
3838
import org.openqa.selenium.grid.node.local.LocalNode;
39-
import org.openqa.selenium.grid.server.BaseServer;
4039
import org.openqa.selenium.grid.server.BaseServerFlags;
4140
import org.openqa.selenium.grid.server.BaseServerOptions;
4241
import org.openqa.selenium.grid.server.EventBusConfig;
4342
import org.openqa.selenium.grid.server.EventBusFlags;
4443
import org.openqa.selenium.grid.server.HelpFlags;
44+
import org.openqa.selenium.grid.server.JettyServer;
4545
import org.openqa.selenium.grid.server.Server;
4646
import org.openqa.selenium.remote.http.HttpClient;
4747

@@ -124,7 +124,7 @@ public Executable configure(String... args) {
124124

125125
LocalNode node = builder.build();
126126

127-
Server<?> server = new BaseServer<>(serverOptions);
127+
Server<?> server = new JettyServer(serverOptions);
128128
server.setHandler(node);
129129
server.start();
130130

‎java/server/src/org/openqa/selenium/grid/router/httpd/RouterServer.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,10 +32,10 @@
3232
import org.openqa.selenium.grid.distributor.config.DistributorOptions;
3333
import org.openqa.selenium.grid.log.LoggingOptions;
3434
import org.openqa.selenium.grid.router.Router;
35-
import org.openqa.selenium.grid.server.BaseServer;
3635
import org.openqa.selenium.grid.server.BaseServerFlags;
3736
import org.openqa.selenium.grid.server.BaseServerOptions;
3837
import org.openqa.selenium.grid.server.HelpFlags;
38+
import org.openqa.selenium.grid.server.JettyServer;
3939
import org.openqa.selenium.grid.server.Server;
4040
import org.openqa.selenium.grid.sessionmap.SessionMap;
4141
import org.openqa.selenium.grid.sessionmap.config.SessionMapFlags;
@@ -111,7 +111,7 @@ public Executable configure(String... args) {
111111

112112
Router router = new Router(clientFactory, sessions, distributor);
113113

114-
Server<?> server = new BaseServer<>(serverOptions);
114+
Server<?> server = new JettyServer(serverOptions);
115115
server.setHandler(router);
116116
server.start();
117117

‎java/server/src/org/openqa/selenium/grid/server/BaseServer.java renamed to ‎java/server/src/org/openqa/selenium/grid/server/JettyServer.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -48,17 +48,17 @@
4848

4949
import static java.util.concurrent.TimeUnit.SECONDS;
5050

51-
public class BaseServer<T extends BaseServer> implements Server<T> {
51+
public class JettyServer<T extends JettyServer> implements Server<T> {
5252

53-
private static final Logger LOG = Logger.getLogger(BaseServer.class.getName());
53+
private static final Logger LOG = Logger.getLogger(JettyServer.class.getName());
5454
private static final int MAX_SHUTDOWN_RETRIES = 8;
5555

5656
private final org.eclipse.jetty.server.Server server;
5757
private final ServletContextHandler servletContextHandler;
5858
private final URL url;
5959
private HttpHandler handler;
6060

61-
public BaseServer(BaseServerOptions options) {
61+
public JettyServer(BaseServerOptions options) {
6262
int port = options.getPort() == 0 ? PortProber.findFreePort() : options.getPort();
6363

6464
String host = options.getHostname().orElseGet(() -> {

‎java/server/src/org/openqa/selenium/grid/sessionmap/httpd/SessionMapServer.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,12 +29,12 @@
2929
import org.openqa.selenium.grid.config.Config;
3030
import org.openqa.selenium.grid.config.EnvConfig;
3131
import org.openqa.selenium.grid.log.LoggingOptions;
32-
import org.openqa.selenium.grid.server.BaseServer;
3332
import org.openqa.selenium.grid.server.BaseServerFlags;
3433
import org.openqa.selenium.grid.server.BaseServerOptions;
3534
import org.openqa.selenium.grid.server.EventBusConfig;
3635
import org.openqa.selenium.grid.server.EventBusFlags;
3736
import org.openqa.selenium.grid.server.HelpFlags;
37+
import org.openqa.selenium.grid.server.JettyServer;
3838
import org.openqa.selenium.grid.server.Server;
3939
import org.openqa.selenium.grid.sessionmap.SessionMap;
4040
import org.openqa.selenium.grid.sessionmap.local.LocalSessionMap;
@@ -101,7 +101,7 @@ public Executable configure(String... args) {
101101

102102
BaseServerOptions serverOptions = new BaseServerOptions(config);
103103

104-
Server<?> server = new BaseServer<>(serverOptions);
104+
Server<?> server = new JettyServer(serverOptions);
105105
server.setHandler(sessions);
106106
server.start();
107107

‎java/server/src/org/openqa/selenium/remote/server/SeleniumServer.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
import com.beust.jcommander.JCommander;
2626

2727
import org.openqa.selenium.grid.config.AnnotatedConfig;
28-
import org.openqa.selenium.grid.server.BaseServer;
28+
import org.openqa.selenium.grid.server.JettyServer;
2929
import org.openqa.selenium.grid.server.BaseServerFlags;
3030
import org.openqa.selenium.grid.server.BaseServerOptions;
3131
import org.openqa.selenium.grid.server.HelpFlags;
@@ -49,7 +49,7 @@
4949
* Provides a server that can launch and manage selenium sessions.
5050
*/
5151
@ManagedService(objectName = "org.seleniumhq.server:type=SeleniumServer")
52-
public class SeleniumServer extends BaseServer {
52+
public class SeleniumServer extends JettyServer {
5353

5454
private final static Logger LOG = Logger.getLogger(SeleniumServer.class.getName());
5555

@@ -94,7 +94,7 @@ public HttpResponse execute(HttpRequest req) throws UncheckedIOException {
9494
}
9595

9696
@Override
97-
public BaseServer start() {
97+
public JettyServer start() {
9898
long inactiveSessionTimeoutSeconds = Long.MAX_VALUE / 1000;
9999

100100
NewSessionPipeline pipeline = DefaultPipeline.createDefaultPipeline().create();

‎java/server/test/org/openqa/selenium/grid/router/EndToEndTest.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,8 @@
3737
import org.openqa.selenium.grid.distributor.remote.RemoteDistributor;
3838
import org.openqa.selenium.grid.node.SessionFactory;
3939
import org.openqa.selenium.grid.node.local.LocalNode;
40-
import org.openqa.selenium.grid.server.BaseServer;
4140
import org.openqa.selenium.grid.server.BaseServerOptions;
41+
import org.openqa.selenium.grid.server.JettyServer;
4242
import org.openqa.selenium.grid.server.Server;
4343
import org.openqa.selenium.grid.sessionmap.SessionMap;
4444
import org.openqa.selenium.grid.sessionmap.local.LocalSessionMap;
@@ -188,7 +188,7 @@ private static Object[] createRemotes() throws URISyntaxException {
188188
LocalNode localNode = LocalNode.builder(bus, clientFactory, nodeUri)
189189
.add(CAPS, createFactory(nodeUri))
190190
.build();
191-
Server<?> nodeServer = new BaseServer<>(
191+
Server<?> nodeServer = new JettyServer<>(
192192
new BaseServerOptions(
193193
new MapConfig(ImmutableMap.of("server", ImmutableMap.of("port", port)))));
194194
nodeServer.setHandler(localNode);
@@ -206,7 +206,7 @@ private static Object[] createRemotes() throws URISyntaxException {
206206

207207
private static Server<?> createServer() {
208208
int port = PortProber.findFreePort();
209-
return new BaseServer<>(new BaseServerOptions(
209+
return new JettyServer(new BaseServerOptions(
210210
new MapConfig(ImmutableMap.of("server", ImmutableMap.of("port", port)))));
211211
}
212212

‎java/server/test/org/openqa/selenium/grid/server/BaseServerTest.java renamed to ‎java/server/test/org/openqa/selenium/grid/server/JettyServerTest.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -43,13 +43,13 @@
4343
import static org.openqa.selenium.remote.http.HttpMethod.GET;
4444
import static org.openqa.selenium.remote.http.Route.get;
4545

46-
public class BaseServerTest {
46+
public class JettyServerTest {
4747

4848
private BaseServerOptions emptyOptions = new BaseServerOptions(new MapConfig(ImmutableMap.of()));
4949

5050
@Test
5151
public void baseServerStartsAndDoesNothing() throws IOException {
52-
Server<?> server = new BaseServer<>(emptyOptions).setHandler(req -> new HttpResponse()).start();
52+
Server<?> server = new JettyServer(emptyOptions).setHandler(req -> new HttpResponse()).start();
5353

5454
URL url = server.getUrl();
5555
HttpClient client = HttpClient.Factory.createDefault().createClient(url);
@@ -64,7 +64,7 @@ public void baseServerStartsAndDoesNothing() throws IOException {
6464

6565
@Test
6666
public void shouldAllowAHandlerToBeRegistered() throws IOException {
67-
Server<?> server = new BaseServer<>(emptyOptions);
67+
Server<?> server = new JettyServer(emptyOptions);
6868
server.setHandler(get("/cheese").to(() -> req -> new HttpResponse().setContent(utf8String("cheddar"))));
6969

7070
server.start();
@@ -77,7 +77,7 @@ public void shouldAllowAHandlerToBeRegistered() throws IOException {
7777

7878
@Test
7979
public void addHandlersOnceServerIsStartedIsAnError() {
80-
Server<BaseServer> server = new BaseServer<>(emptyOptions);
80+
Server<?> server = new JettyServer(emptyOptions);
8181
server.setHandler(req -> new HttpResponse());
8282
server.start();
8383

@@ -87,7 +87,7 @@ public void addHandlersOnceServerIsStartedIsAnError() {
8787

8888
@Test
8989
public void exceptionsThrownByHandlersAreConvertedToAProperPayload() throws IOException {
90-
Server<BaseServer> server = new BaseServer<>(emptyOptions);
90+
Server<?> server = new JettyServer(emptyOptions);
9191
server.setHandler(req -> {
9292
throw new UnableToSetCookieException("Yowza");
9393
});

0 commit comments

Comments
 (0)