Skip to content

Commit 7c35218

Browse files
committed
refactor(remote/command): Merge overload's business logic
1 parent 05bce9b commit 7c35218

File tree

2 files changed

+217
-255
lines changed

2 files changed

+217
-255
lines changed

java/src/org/openqa/selenium/remote/DriverCommand.java

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -163,8 +163,7 @@ public interface DriverCommand {
163163
String DELETE_DOWNLOADABLE_FILES = "deleteDownloadableFiles";
164164

165165
static CommandPayload NEW_SESSION(Capabilities capabilities) {
166-
Require.nonNull("Capabilities", capabilities);
167-
return new CommandPayload(NEW_SESSION, Map.of("capabilities", singleton(capabilities)));
166+
return NEW_SESSION(singleton(capabilities));
168167
}
169168

170169
static CommandPayload NEW_SESSION(Collection<Capabilities> capabilities) {
@@ -346,8 +345,7 @@ static CommandPayload PRINT_PAGE(PrintOptions options) {
346345

347346
@Deprecated
348347
static CommandPayload SET_IMPLICIT_WAIT_TIMEOUT(long time, TimeUnit unit) {
349-
return new CommandPayload(
350-
SET_TIMEOUT, Map.of("implicit", TimeUnit.MILLISECONDS.convert(time, unit)));
348+
return SET_IMPLICIT_WAIT_TIMEOUT(Duration.ofMillis(unit.toMillis(time)));
351349
}
352350

353351
static CommandPayload SET_IMPLICIT_WAIT_TIMEOUT(Duration duration) {
@@ -356,8 +354,7 @@ static CommandPayload SET_IMPLICIT_WAIT_TIMEOUT(Duration duration) {
356354

357355
@Deprecated
358356
static CommandPayload SET_SCRIPT_TIMEOUT(long time, TimeUnit unit) {
359-
return new CommandPayload(
360-
SET_TIMEOUT, Map.of("script", TimeUnit.MILLISECONDS.convert(time, unit)));
357+
return SET_SCRIPT_TIMEOUT(Duration.ofMillis(unit.toMillis(time)));
361358
}
362359

363360
static CommandPayload SET_SCRIPT_TIMEOUT(Duration duration) {
@@ -366,8 +363,7 @@ static CommandPayload SET_SCRIPT_TIMEOUT(Duration duration) {
366363

367364
@Deprecated
368365
static CommandPayload SET_PAGE_LOAD_TIMEOUT(long time, TimeUnit unit) {
369-
return new CommandPayload(
370-
SET_TIMEOUT, Map.of("pageLoad", TimeUnit.MILLISECONDS.convert(time, unit)));
366+
return SET_PAGE_LOAD_TIMEOUT(Duration.ofMillis(unit.toMillis(time)));
371367
}
372368

373369
static CommandPayload SET_PAGE_LOAD_TIMEOUT(Duration duration) {

0 commit comments

Comments
 (0)