Skip to content

Commit 4a33dfa

Browse files
committed
Make required parameters actually be required.
1 parent 92e51a0 commit 4a33dfa

File tree

2 files changed

+8
-3
lines changed

2 files changed

+8
-3
lines changed

java/client/src/org/openqa/selenium/firefox/FirefoxDriver.java

+6-2
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@
3333
import org.openqa.selenium.remote.service.DriverCommandExecutor;
3434
import org.openqa.selenium.remote.service.DriverService;
3535

36+
import java.util.Objects;
3637
import java.util.Set;
3738
import java.util.logging.Logger;
3839

@@ -100,11 +101,13 @@ public FirefoxDriver() {
100101
}
101102

102103
public FirefoxDriver(Capabilities desiredCapabilities) {
103-
this(new FirefoxOptions(desiredCapabilities));
104+
this(new FirefoxOptions(Objects.requireNonNull(desiredCapabilities, "No capabilities seen")));
104105
}
105106

106107
public FirefoxDriver(GeckoDriverService service, Capabilities desiredCapabilities) {
107-
this(service, new FirefoxOptions(desiredCapabilities));
108+
this(
109+
Objects.requireNonNull(service, "No geckodriver service provided"),
110+
new FirefoxOptions(desiredCapabilities));
108111
}
109112

110113
public FirefoxDriver(FirefoxOptions options) {
@@ -116,6 +119,7 @@ public FirefoxDriver(GeckoDriverService service, FirefoxOptions options) {
116119
}
117120

118121
private static CommandExecutor toExecutor(FirefoxOptions options) {
122+
Objects.requireNonNull(options, "No options to construct executor from");
119123
DriverService.Builder<?, ?> builder;
120124

121125
if (options.isLegacy()) {

java/client/src/org/openqa/selenium/remote/service/DriverCommandExecutor.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@
2929
import java.io.IOException;
3030
import java.net.ConnectException;
3131
import java.util.Map;
32+
import java.util.Objects;
3233

3334
/**
3435
* A specialized {@link HttpCommandExecutor} that will use a {@link DriverService} that lives
@@ -46,7 +47,7 @@ public class DriverCommandExecutor extends HttpCommandExecutor {
4647
* @param service The DriverService to send commands to.
4748
*/
4849
public DriverCommandExecutor(DriverService service) {
49-
super(service.getUrl());
50+
super(Objects.requireNonNull(service.getUrl(), "DriverService is required"));
5051
this.service = service;
5152
}
5253

0 commit comments

Comments
 (0)