Skip to content

Commit 5527365

Browse files
committed
[grid] Switch to an immutable grid model
1 parent f293014 commit 5527365

16 files changed

Lines changed: 591 additions & 517 deletions

File tree

java/server/src/org/openqa/selenium/grid/data/NodeStatus.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ public NodeStatus(
6969
}
7070

7171
public boolean hasCapacity() {
72-
return slots.stream().anyMatch(slot -> slot.getSession().isPresent());
72+
return slots.stream().anyMatch(slot -> !slot.getSession().isPresent());
7373
}
7474

7575
public boolean hasCapacity(Capabilities caps) {
@@ -103,7 +103,7 @@ public Availability getAvailability() {
103103

104104
public float getLoad() {
105105
float inUse = slots.parallelStream()
106-
.filter(slot -> !slot.getSession().isPresent())
106+
.filter(slot -> slot.getSession().isPresent())
107107
.count();
108108

109109
return (inUse / (float) maxSessionCount) * 100f;

java/server/src/org/openqa/selenium/grid/distributor/BUILD.bazel

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,13 @@ java_library(
88
"//java/server/test/org/openqa/selenium/grid:__subpackages__",
99
],
1010
exports = [
11-
"//java/server/src/org/openqa/selenium/grid/distributor/model",
1211
"//java/server/src/org/openqa/selenium/status",
1312
],
1413
deps = [
1514
"//java/client/src/org/openqa/selenium:core",
1615
"//java/client/src/org/openqa/selenium/json",
1716
"//java/client/src/org/openqa/selenium/remote",
1817
"//java/server/src/org/openqa/selenium/grid/data",
19-
"//java/server/src/org/openqa/selenium/grid/distributor/model",
2018
"//java/server/src/org/openqa/selenium/grid/distributor/selector",
2119
"//java/server/src/org/openqa/selenium/grid/node",
2220
"//java/server/src/org/openqa/selenium/grid/node/remote",

java/server/src/org/openqa/selenium/grid/distributor/local/BUILD.bazel

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ java_library(
1616
"//java/server/src/org/openqa/selenium/grid/config",
1717
"//java/server/src/org/openqa/selenium/grid/data",
1818
"//java/server/src/org/openqa/selenium/grid/distributor",
19-
"//java/server/src/org/openqa/selenium/grid/distributor/model",
2019
"//java/server/src/org/openqa/selenium/grid/distributor/selector",
2120
"//java/server/src/org/openqa/selenium/grid/log",
2221
"//java/server/src/org/openqa/selenium/grid/node",

0 commit comments

Comments
 (0)