[java] Fix setting default server URL if it is not passed to RemoteWebDriver constructor

Author: barancev

java/client/src/org/openqa/selenium/remote/HttpCommandExecutor.java

@@ -33,10 +33,8 @@
 import org.openqa.selenium.remote.http.HttpResponse;
 
 import java.io.IOException;
-import java.net.MalformedURLException;
 import java.net.URL;
 import java.util.Map;
-import java.util.Optional;
 
 import static java.util.Collections.emptyMap;
 import static org.openqa.selenium.json.Json.JSON_UTF_8;
@@ -58,20 +56,14 @@ public class HttpCommandExecutor implements CommandExecutor, NeedsLocalLogs {
 
   private LocalLogs logs = LocalLogs.getNullLogger();
 
-  private static URL getDefaultServerURL() {
-    try {
-      return new URL(System.getProperty("webdriver.remote.server", "http://localhost:4444/"));
-    } catch (MalformedURLException e) {
-      throw new WebDriverException(e);
-    }
-  }
-
   public HttpCommandExecutor(URL addressOfRemoteServer) {
-    this(emptyMap(), addressOfRemoteServer);
+    this(emptyMap(), Require.nonNull("Server URL", addressOfRemoteServer));
   }
 
   public HttpCommandExecutor(ClientConfig config) {
-    this(emptyMap(), config, defaultClientFactory);
+    this(emptyMap(),
+         Require.nonNull("HTTP client configuration", config),
+         defaultClientFactory);
   }
 
   /**
@@ -85,7 +77,9 @@ public HttpCommandExecutor(
     Map<String, CommandInfo> additionalCommands,
     URL addressOfRemoteServer)
   {
-    this(additionalCommands, addressOfRemoteServer, defaultClientFactory);
+    this(Require.nonNull("Additional commands", additionalCommands),
+         Require.nonNull("Server URL", addressOfRemoteServer),
+         defaultClientFactory);
   }
 
   public HttpCommandExecutor(
@@ -95,8 +89,7 @@ public HttpCommandExecutor(
   {
     this(additionalCommands,
          ClientConfig.defaultConfig()
-           .baseUrl(Optional.ofNullable(addressOfRemoteServer)
-                      .orElseGet(HttpCommandExecutor::getDefaultServerURL)),
+           .baseUrl(Require.nonNull("Server URL", addressOfRemoteServer)),
          httpClientFactory);
   }
 
@@ -105,12 +98,9 @@ public HttpCommandExecutor(
     ClientConfig config,
     HttpClient.Factory httpClientFactory)
   {
-    if (config.baseUri() == null) {
-      config = config.baseUrl(getDefaultServerURL());
-    }
-    remoteServer = config.baseUrl();
-    this.additionalCommands = additionalCommands;
-    this.httpClientFactory = httpClientFactory;
+    remoteServer = Require.nonNull("HTTP client configuration", config).baseUrl();
+    this.additionalCommands = Require.nonNull("Additional commands", additionalCommands);
+    this.httpClientFactory = Require.nonNull("HTTP client factory", httpClientFactory);
     this.client = this.httpClientFactory.createClient(config);
   }
 

java/client/src/org/openqa/selenium/remote/RemoteWebDriver.java

@@ -69,6 +69,7 @@
 import org.openqa.selenium.virtualauthenticator.VirtualAuthenticator;
 import org.openqa.selenium.virtualauthenticator.VirtualAuthenticatorOptions;
 
+import java.net.MalformedURLException;
 import java.net.URL;
 import java.time.Duration;
 import java.util.Base64;
@@ -134,12 +135,22 @@ protected RemoteWebDriver() {
     this.capabilities = init(new ImmutableCapabilities());
   }
 
+  private static URL getDefaultServerURL() {
+    try {
+      return new URL(System.getProperty("webdriver.remote.server", "http://localhost:4444/"));
+    } catch (MalformedURLException e) {
+      throw new WebDriverException(e);
+    }
+  }
+
   public RemoteWebDriver(Capabilities capabilities) {
-    this((URL) null, capabilities);
+    this(getDefaultServerURL(),
+         Require.nonNull("Capabilities", capabilities));
   }
 
   public RemoteWebDriver(URL remoteAddress, Capabilities capabilities) {
-    this(createTracedExecutorWithTracedHttpClient(remoteAddress), capabilities);
+    this(createTracedExecutorWithTracedHttpClient(Require.nonNull("Server URL", remoteAddress)),
+         Require.nonNull("Capabilities", capabilities));
   }
 
   private static CommandExecutor createTracedExecutorWithTracedHttpClient(URL remoteAddress) {
@@ -152,11 +163,7 @@ private static CommandExecutor createTracedExecutorWithTracedHttpClient(URL remo
   }
 
   public RemoteWebDriver(CommandExecutor executor, Capabilities capabilities) {
-    if (executor == null) {
-      throw new IllegalArgumentException("RemoteWebDriver cannot work without a command executor");
-    }
-    this.executor = executor;
-
+    this.executor = Require.nonNull("Command executor", executor);
     capabilities = init(capabilities);
 
     if (executor instanceof NeedsLocalLogs) {

java/client/test/org/openqa/selenium/remote/RemoteWebDriverInitializationTest.java

@@ -72,7 +72,7 @@ public void testQuitsIfStartSessionFails() {
   public void constructorShouldThrowIfExecutorIsNull() {
     assertThatExceptionOfType(IllegalArgumentException.class)
       .isThrownBy(() -> new RemoteWebDriver((CommandExecutor) null, new ImmutableCapabilities()))
-      .withMessage("RemoteWebDriver cannot work without a command executor");
+      .withMessage("Command executor must be set");
   }
 
   @Test
@@ -206,7 +206,8 @@ public void canPassClientConfig() throws MalformedURLException {
 
     CommandExecutor executor = new HttpCommandExecutor(
       emptyMap(),
-      ClientConfig.defaultConfig().readTimeout(Duration.ofSeconds(1)),
+      ClientConfig.defaultConfig()
+        .baseUrl(new URL("http://localhost:4444/")).readTimeout(Duration.ofSeconds(1)),
       factory);
 
     RemoteWebDriver driver = new RemoteWebDriver(executor, new ImmutableCapabilities());