[grid] Using max-sessions from Node when it was declared.

Fixes SeleniumHQ#12836
xdsswar · Jan 12, 2024 · 1b594ee · 1b594ee
1 parent ec523b2
commit 1b594ee
Showing 1 changed file with 7 additions and 8 deletions.
diff --git a/java/src/org/openqa/selenium/grid/node/config/NodeOptions.java b/java/src/org/openqa/selenium/grid/node/config/NodeOptions.java
@@ -117,7 +117,7 @@ public Optional<URI> getPublicGridUri() {
  }
 
  Optional<String> hubAddress = config.get(NODE_SECTION, "hub");
- if (!hubAddress.isPresent()) {
+ if (hubAddress.isEmpty()) {
  return Optional.empty();
  }
 
@@ -242,7 +242,7 @@ public Map<Capabilities, Collection<SessionFactory>> getSessionFactories(
  ImmutableMultimap.builder();
 
  addDriverFactoriesFromConfig(sessionFactories);
- addDriverConfigs(factoryFactory, sessionFactories);
+ addDriverConfigs(factoryFactory, sessionFactories, maxSessions);
  addSpecificDrivers(allDrivers, sessionFactories);
  addDetectedDrivers(allDrivers, sessionFactories);
 
@@ -358,7 +358,8 @@ private SessionFactory createSessionFactory(String clazz, Capabilities stereotyp
 
  private void addDriverConfigs(
  Function<ImmutableCapabilities, Collection<SessionFactory>> factoryFactory,
- ImmutableMultimap.Builder<Capabilities, SessionFactory> sessionFactories) {
+ ImmutableMultimap.Builder<Capabilities, SessionFactory> sessionFactories,
+ int maxSessions) {
 
  Multimap<WebDriverInfo, SessionFactory> driverConfigs = HashMultimap.create();
 
@@ -469,9 +470,7 @@ private void addDriverConfigs(
 
  int driverMaxSessions =
  Integer.parseInt(
- thisConfig.getOrDefault(
- "max-sessions",
- String.valueOf(info.getMaximumSimultaneousSessions())));
+ thisConfig.getOrDefault("max-sessions", String.valueOf(maxSessions)));
  Require.positive("Driver max sessions", driverMaxSessions);
 
  WebDriverInfo driverInfoConfig =
@@ -532,7 +531,7 @@ private void addDetectedDrivers(
  private void addSpecificDrivers(
  Map<WebDriverInfo, Collection<SessionFactory>> allDrivers,
  ImmutableMultimap.Builder<Capabilities, SessionFactory> sessionFactories) {
- if (!config.getAll(NODE_SECTION, "driver-implementation").isPresent()) {
+ if (config.getAll(NODE_SECTION, "driver-implementation").isEmpty()) {
  return;
  }
 
@@ -563,7 +562,7 @@ private void addSpecificDrivers(
  .filter(entry -> drivers.contains(entry.getKey().getDisplayName().toLowerCase()))
  .findFirst();
 
- if (!first.isPresent()) {
+ if (first.isEmpty()) {
  throw new ConfigException("No drivers were found for %s", drivers.toString());
  }