[grid] Add info and warn log while adding specific drivers to node (#9129)

Author: pujagani

java/server/src/org/openqa/selenium/grid/node/config/NodeOptions.java

@@ -48,6 +48,7 @@
 import java.util.Optional;
 import java.util.ServiceLoader;
 import java.util.function.Function;
+import java.util.logging.Level;
 import java.util.logging.Logger;
 import java.util.stream.Collectors;
 import java.util.stream.IntStream;
@@ -123,9 +124,9 @@ public Map<Capabilities, Collection<SessionFactory>> getSessionFactories(
       ImmutableMultimap.builder();
 
     addDriverFactoriesFromConfig(sessionFactories);
+    addDriverConfigs(factoryFactory, sessionFactories);
     addSpecificDrivers(allDrivers, sessionFactories);
     addDetectedDrivers(allDrivers, sessionFactories);
-    addDriverConfigs(factoryFactory, sessionFactories);
 
     return sessionFactories.build().asMap();
   }
@@ -277,13 +278,22 @@ private void addDetectedDrivers(
       .forEach(
         entry ->
           sessionFactories.putAll(entry.getKey().getCanonicalCapabilities(), entry.getValue()));
+
+    if (sessionFactories.build().size() == 0) {
+      String logMessage = "No drivers have been configured or have been found on PATH";
+      LOG.warning(logMessage);
+      throw new ConfigException(logMessage);
+    }
   }
 
   private void addSpecificDrivers(
     Map<WebDriverInfo, Collection<SessionFactory>> allDrivers,
     ImmutableMultimap.Builder<Capabilities, SessionFactory> sessionFactories) {
-    if (!config.getBool(NODE_SECTION, "detect-drivers").orElse(DEFAULT_DETECT_DRIVERS) &&
-        config.getAll(NODE_SECTION, "driver-implementation").isPresent()) {
+    if (!config.getAll(NODE_SECTION, "driver-implementation").isPresent()) {
+      return;
+    }
+
+    if (!config.getBool(NODE_SECTION, "detect-drivers").orElse(DEFAULT_DETECT_DRIVERS)) {
       String logMessage = "Specific drivers cannot be added if 'detect-drivers' is set to false";
       LOG.warning(logMessage);
       throw new ConfigException(logMessage);
@@ -292,9 +302,25 @@ private void addSpecificDrivers(
     List<String> drivers = config.getAll(NODE_SECTION, "driver-implementation")
       .orElse(new ArrayList<>())
       .stream()
+      .distinct()
       .map(String::toLowerCase)
+      .peek(driver -> {
+        boolean noneMatch = allDrivers
+          .entrySet()
+          .stream()
+          .noneMatch(entry -> entry.getKey().getDisplayName().equalsIgnoreCase(driver));
+        if (noneMatch) {
+          LOG.log(Level.WARNING, "Could not find {0} driver on PATH.", driver);
+        }
+      })
       .collect(Collectors.toList());
 
+    allDrivers.entrySet().stream()
+      .filter(entry -> drivers.contains(entry.getKey().getDisplayName().toLowerCase()))
+      .findFirst()
+      .orElseThrow(() ->
+                     new ConfigException("No drivers were found for %s", drivers.toString()));
+
     allDrivers.entrySet().stream()
       .filter(entry -> drivers.contains(entry.getKey().getDisplayName().toLowerCase()))
       .sorted(Comparator.comparing(entry -> entry.getKey().getDisplayName().toLowerCase()))
@@ -318,6 +344,8 @@ private Map<WebDriverInfo, Collection<SessionFactory>> discoverDrivers(
         .sorted(Comparator.comparing(info -> info.getDisplayName().toLowerCase()))
         .collect(Collectors.toList());
 
+    LOG.log(Level.INFO,"Discovered {0} driver(s)", infos.size());
+
     // Same
     List<DriverService.Builder<?, ?>> builders = new ArrayList<>();
     ServiceLoader.load(DriverService.Builder.class).forEach(builders::add);

java/server/test/org/openqa/selenium/grid/node/config/NodeOptionsTest.java

@@ -66,7 +66,7 @@ public void canConfigureNodeWithDriverDetection() {
     List<Capabilities> reported = new ArrayList<>();
     new NodeOptions(config).getSessionFactories(caps -> {
       reported.add(caps);
-      return Collections.emptySet();
+      return Collections.singleton(HelperFactory.create(config, caps));
     });
 
     ChromeDriverInfo chromeDriverInfo = new ChromeDriverInfo();
@@ -90,7 +90,7 @@ public void shouldDetectCorrectDriversOnWindows() {
     List<Capabilities> reported = new ArrayList<>();
     new NodeOptions(config).getSessionFactories(caps -> {
       reported.add(caps);
-      return Collections.emptySet();
+      return Collections.singleton(HelperFactory.create(config, caps));
     });
 
     assertThat(reported).is(supporting("chrome"));
@@ -112,7 +112,7 @@ public void shouldDetectCorrectDriversOnMac() {
     List<Capabilities> reported = new ArrayList<>();
     new NodeOptions(config).getSessionFactories(caps -> {
       reported.add(caps);
-      return Collections.emptySet();
+      return Collections.singleton(HelperFactory.create(config, caps));
     });
 
     // There may be more drivers available, but we know that these are meant to be here.
@@ -126,7 +126,7 @@ public void canConfigureNodeWithoutDriverDetection() {
     List<Capabilities> reported = new ArrayList<>();
     new NodeOptions(config).getSessionFactories(caps -> {
       reported.add(caps);
-      return Collections.emptySet();
+      return Collections.singleton(HelperFactory.create(config, caps));
     });
 
     assertThat(reported).isEmpty();
@@ -144,7 +144,7 @@ public void shouldThrowConfigExceptionIfDetectDriversIsFalseAndSpecificDriverIsA
     try {
       new NodeOptions(config).getSessionFactories(caps -> {
         reported.add(caps);
-        return Collections.emptySet();
+        return Collections.singleton(HelperFactory.create(config, caps));
       });
       fail("Should have not executed 'getSessionFactories' successfully");
     } catch (ConfigException e) {
@@ -161,7 +161,7 @@ public void detectDriversByDefault() {
     List<Capabilities> reported = new ArrayList<>();
     new NodeOptions(config).getSessionFactories(caps -> {
       reported.add(caps);
-      return Collections.emptySet();
+      return Collections.singleton(HelperFactory.create(config, caps));
     });
 
     assertThat(reported).isNotEmpty();
@@ -221,7 +221,7 @@ public void driversCanBeConfigured() {
     List<Capabilities> reported = new ArrayList<>();
     new NodeOptions(config).getSessionFactories(capabilities -> {
       reported.add(capabilities);
-      return Collections.emptySet();
+      return Collections.singleton(HelperFactory.create(config, capabilities));
     });
 
     assertThat(reported).is(supporting("chrome"));
@@ -269,7 +269,7 @@ public void driversConfigNeedsStereotypeField() {
     try {
       new NodeOptions(config).getSessionFactories(caps -> {
         reported.add(caps);
-        return Collections.emptySet();
+        return Collections.singleton(HelperFactory.create(config, caps));
       });
       fail("Should have not executed 'getSessionFactories' successfully because driver config " +
            "needs the stereotype field");
@@ -288,7 +288,6 @@ private Condition<? super List<? extends Capabilities>> supporting(String name)
   }
 
   public static class HelperFactory {
-
     public static SessionFactory create(Config config, Capabilities caps) {
       return new SessionFactory() {
         @Override