Skip to content

Commit 2765805

Browse files
shs96cshs96c
committed
[grid] Move HealthCheck to the grid node package
1 parent 88a42bc commit 2765805

10 files changed

Lines changed: 10 additions & 14 deletions

File tree

‎java/server/src/org/openqa/selenium/grid/distributor/model/Host.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
import org.openqa.selenium.Capabilities;
3232
import org.openqa.selenium.SessionNotCreatedException;
3333
import org.openqa.selenium.events.EventBus;
34-
import org.openqa.selenium.grid.component.HealthCheck;
34+
import org.openqa.selenium.grid.node.HealthCheck;
3535
import org.openqa.selenium.grid.data.CreateSessionRequest;
3636
import org.openqa.selenium.grid.data.CreateSessionResponse;
3737
import org.openqa.selenium.grid.data.DistributorStatus;

java/server/src/org/openqa/selenium/grid/component/HealthCheck.java renamed to java/server/src/org/openqa/selenium/grid/node/HealthCheck.java

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
// specific language governing permissions and limitations
1616
// under the License.
1717

18-
package org.openqa.selenium.grid.component;
18+
package org.openqa.selenium.grid.node;
1919

2020
import org.openqa.selenium.internal.Require;
2121

@@ -30,9 +30,7 @@ class Result {
3030
private final String registrationSecret;
3131

3232
public Result(boolean isAlive, String message) {
33-
this.isAlive = isAlive;
34-
this.message = Require.nonNull("Message", message);
35-
this.registrationSecret = null;
33+
this(isAlive, message, null);
3634
}
3735

3836
public Result(boolean isAlive, String message, String registrationSecret) {

‎java/server/src/org/openqa/selenium/grid/node/Node.java‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919

2020
import org.openqa.selenium.Capabilities;
2121
import org.openqa.selenium.NoSuchSessionException;
22-
import org.openqa.selenium.grid.component.HealthCheck;
2322
import org.openqa.selenium.grid.data.CreateSessionRequest;
2423
import org.openqa.selenium.grid.data.CreateSessionResponse;
2524
import org.openqa.selenium.grid.data.NodeStatus;
@@ -28,7 +27,6 @@
2827
import org.openqa.selenium.io.TemporaryFilesystem;
2928
import org.openqa.selenium.json.Json;
3029
import org.openqa.selenium.remote.SessionId;
31-
import org.openqa.selenium.remote.http.HttpHandler;
3230
import org.openqa.selenium.remote.http.HttpRequest;
3331
import org.openqa.selenium.remote.http.HttpResponse;
3432
import org.openqa.selenium.remote.http.Routable;

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
import org.openqa.selenium.cli.CliCommand;
2727
import org.openqa.selenium.events.EventBus;
2828
import org.openqa.selenium.grid.TemplateGridCommand;
29-
import org.openqa.selenium.grid.component.HealthCheck;
29+
import org.openqa.selenium.grid.node.HealthCheck;
3030
import org.openqa.selenium.grid.config.Config;
3131
import org.openqa.selenium.grid.config.Role;
3232
import org.openqa.selenium.grid.data.NodeStatusEvent;

‎java/server/src/org/openqa/selenium/grid/node/k8s/OneShotNode.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
import org.openqa.selenium.WebDriver;
2626
import org.openqa.selenium.WebDriverInfo;
2727
import org.openqa.selenium.events.EventBus;
28-
import org.openqa.selenium.grid.component.HealthCheck;
28+
import org.openqa.selenium.grid.node.HealthCheck;
2929
import org.openqa.selenium.grid.config.Config;
3030
import org.openqa.selenium.grid.config.ConfigException;
3131
import org.openqa.selenium.grid.data.CreateSessionRequest;

‎java/server/src/org/openqa/selenium/grid/node/local/LocalNode.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
import org.openqa.selenium.WebDriverException;
3333
import org.openqa.selenium.concurrent.Regularly;
3434
import org.openqa.selenium.events.EventBus;
35-
import org.openqa.selenium.grid.component.HealthCheck;
35+
import org.openqa.selenium.grid.node.HealthCheck;
3636
import org.openqa.selenium.grid.data.CreateSessionRequest;
3737
import org.openqa.selenium.grid.data.CreateSessionResponse;
3838
import org.openqa.selenium.grid.data.NodeStatus;

‎java/server/src/org/openqa/selenium/grid/node/remote/RemoteNode.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
import com.google.common.collect.ImmutableSet;
2222
import org.openqa.selenium.Capabilities;
2323
import org.openqa.selenium.NoSuchSessionException;
24-
import org.openqa.selenium.grid.component.HealthCheck;
24+
import org.openqa.selenium.grid.node.HealthCheck;
2525
import org.openqa.selenium.grid.data.CreateSessionRequest;
2626
import org.openqa.selenium.grid.data.CreateSessionResponse;
2727
import org.openqa.selenium.grid.data.NodeStatus;

‎java/server/test/org/openqa/selenium/grid/distributor/AddingNodesTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
import org.openqa.selenium.NoSuchSessionException;
2727
import org.openqa.selenium.events.EventBus;
2828
import org.openqa.selenium.events.local.GuavaEventBus;
29-
import org.openqa.selenium.grid.component.HealthCheck;
29+
import org.openqa.selenium.grid.node.HealthCheck;
3030
import org.openqa.selenium.grid.data.CreateSessionRequest;
3131
import org.openqa.selenium.grid.data.CreateSessionResponse;
3232
import org.openqa.selenium.grid.data.DistributorStatus;

‎java/server/test/org/openqa/selenium/grid/distributor/DistributorTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
import org.openqa.selenium.events.EventBus;
3131
import org.openqa.selenium.events.Type;
3232
import org.openqa.selenium.events.local.GuavaEventBus;
33-
import org.openqa.selenium.grid.component.HealthCheck;
33+
import org.openqa.selenium.grid.node.HealthCheck;
3434
import org.openqa.selenium.grid.data.CreateSessionRequest;
3535
import org.openqa.selenium.grid.data.DistributorStatus;
3636
import org.openqa.selenium.grid.data.NodeStatus;

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
import org.openqa.selenium.ImmutableCapabilities;
2424
import org.openqa.selenium.events.EventBus;
2525
import org.openqa.selenium.events.local.GuavaEventBus;
26-
import org.openqa.selenium.grid.component.HealthCheck;
26+
import org.openqa.selenium.grid.node.HealthCheck;
2727
import org.openqa.selenium.grid.data.Session;
2828
import org.openqa.selenium.grid.distributor.Distributor;
2929
import org.openqa.selenium.grid.distributor.local.LocalDistributor;

0 commit comments

Comments
 (0)