Skip to content

Commit ffa9f47

Browse files
committed
[grid] Removing grid-model flag. Is not being used.
It is also misleading because someone might think that it is implemented, and it is not. In addition, no user has requested to provide their own GridModel implementation.
1 parent 797a859 commit ffa9f47

2 files changed

Lines changed: 3 additions & 10 deletions

File tree

java/src/org/openqa/selenium/grid/distributor/config/DistributorFlags.java

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,10 @@
1818
package org.openqa.selenium.grid.distributor.config;
1919

2020

21-
import com.beust.jcommander.Parameter;
2221
import com.google.auto.service.AutoService;
22+
23+
import com.beust.jcommander.Parameter;
24+
2325
import org.openqa.selenium.grid.config.ConfigValue;
2426
import org.openqa.selenium.grid.config.HasRoles;
2527
import org.openqa.selenium.grid.config.Role;
@@ -30,7 +32,6 @@
3032

3133
import static org.openqa.selenium.grid.config.StandardGridRoles.DISTRIBUTOR_ROLE;
3234
import static org.openqa.selenium.grid.distributor.config.DistributorOptions.DEFAULT_DISTRIBUTOR_IMPLEMENTATION;
33-
import static org.openqa.selenium.grid.distributor.config.DistributorOptions.DEFAULT_GRID_MODEL_IMPLEMENTATION;
3435
import static org.openqa.selenium.grid.distributor.config.DistributorOptions.DEFAULT_HEALTHCHECK_INTERVAL;
3536
import static org.openqa.selenium.grid.distributor.config.DistributorOptions.DEFAULT_REJECT_UNSUPPORTED_CAPS;
3637
import static org.openqa.selenium.grid.distributor.config.DistributorOptions.DEFAULT_SLOT_MATCHER;
@@ -66,12 +67,6 @@ public class DistributorFlags implements HasRoles {
6667
example = DEFAULT_DISTRIBUTOR_IMPLEMENTATION)
6768
private String implementation = DEFAULT_DISTRIBUTOR_IMPLEMENTATION;
6869

69-
@Parameter(
70-
names = {"--grid-model"},
71-
description = "Full classname of non-default grid model. This is used to store states of the all the registered Nodes.")
72-
@ConfigValue(section = DISTRIBUTOR_SECTION, name = "grid-model", example = DEFAULT_GRID_MODEL_IMPLEMENTATION)
73-
private String gridModel = DEFAULT_GRID_MODEL_IMPLEMENTATION;
74-
7570
@Parameter(
7671
names = {"--slot-matcher"},
7772
description = "Full classname of non-default slot matcher to use. This is used to determine whether a Node can support a particular session.")

java/src/org/openqa/selenium/grid/distributor/config/DistributorOptions.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,6 @@ public class DistributorOptions {
3737
static final String DEFAULT_SLOT_MATCHER = "org.openqa.selenium.grid.data.DefaultSlotMatcher";
3838
static final String DEFAULT_SLOT_SELECTOR_IMPLEMENTATION =
3939
"org.openqa.selenium.grid.distributor.selector.DefaultSlotSelector";
40-
static final String DEFAULT_GRID_MODEL_IMPLEMENTATION =
41-
"org.openqa.selenium.grid.distributor.GridModel";
4240
static final boolean DEFAULT_REJECT_UNSUPPORTED_CAPS = false;
4341
private final Config config;
4442

0 commit comments

Comments
 (0)