From 2f1864953c6c6901c109c735b411cf0c815cc13b Mon Sep 17 00:00:00 2001 From: Dennis Oelkers Date: Fri, 10 Jan 2025 14:30:04 +0100 Subject: [PATCH 1/4] Allow sending DevTools command with custom timeout. --- java/src/org/openqa/selenium/devtools/DevTools.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/java/src/org/openqa/selenium/devtools/DevTools.java b/java/src/org/openqa/selenium/devtools/DevTools.java index 4e8a331ffcc11..c9478dc479ff4 100644 --- a/java/src/org/openqa/selenium/devtools/DevTools.java +++ b/java/src/org/openqa/selenium/devtools/DevTools.java @@ -66,8 +66,12 @@ public void disconnectSession() { } public X send(Command command) { - Require.nonNull("Command to send", command); - return connection.sendAndWait(cdpSession, command, timeout); + return sendWithTimeout(command, this.timeout); + } + + public X sendWithTimeout(Command command, Duration timeout) { + Require.nonNull("Command to send", command); + return connection.sendAndWait(cdpSession, command, timeout); } public void addListener(Event event, Consumer handler) { From aafdb812fede7967739d880a24dcab073a2f563e Mon Sep 17 00:00:00 2001 From: Dennis Oelkers Date: Wed, 15 Jan 2025 09:30:55 +0100 Subject: [PATCH 2/4] Renaming method to `send`. --- java/src/org/openqa/selenium/devtools/DevTools.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java/src/org/openqa/selenium/devtools/DevTools.java b/java/src/org/openqa/selenium/devtools/DevTools.java index 2e720206ee4e9..39a648d518f63 100644 --- a/java/src/org/openqa/selenium/devtools/DevTools.java +++ b/java/src/org/openqa/selenium/devtools/DevTools.java @@ -89,7 +89,7 @@ public X send(Command command) { return sendWithTimeout(command, this.timeout); } - public X sendWithTimeout(Command command, Duration timeout) { + public X send(Command command, Duration timeout) { Require.nonNull("Command to send", command); return connection.sendAndWait(cdpSession, command, timeout); } From a56f32d3b70fd1365105ec13605a0588cde7c286 Mon Sep 17 00:00:00 2001 From: Dennis Oelkers Date: Wed, 15 Jan 2025 09:48:50 +0100 Subject: [PATCH 3/4] Using correct method in default `send`. --- java/src/org/openqa/selenium/devtools/DevTools.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java/src/org/openqa/selenium/devtools/DevTools.java b/java/src/org/openqa/selenium/devtools/DevTools.java index 39a648d518f63..c743147bf1e30 100644 --- a/java/src/org/openqa/selenium/devtools/DevTools.java +++ b/java/src/org/openqa/selenium/devtools/DevTools.java @@ -86,7 +86,7 @@ public void disconnectSession() { } public X send(Command command) { - return sendWithTimeout(command, this.timeout); + return send(command, this.timeout); } public X send(Command command, Duration timeout) { From 91a01dc131c049304d3b6bd191b74676a28c523c Mon Sep 17 00:00:00 2001 From: Dennis Oelkers Date: Wed, 15 Jan 2025 10:06:06 +0100 Subject: [PATCH 4/4] Fixing formatting. --- java/src/org/openqa/selenium/devtools/DevTools.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/java/src/org/openqa/selenium/devtools/DevTools.java b/java/src/org/openqa/selenium/devtools/DevTools.java index c743147bf1e30..fd3469b129c8b 100644 --- a/java/src/org/openqa/selenium/devtools/DevTools.java +++ b/java/src/org/openqa/selenium/devtools/DevTools.java @@ -90,8 +90,8 @@ public X send(Command command) { } public X send(Command command, Duration timeout) { - Require.nonNull("Command to send", command); - return connection.sendAndWait(cdpSession, command, timeout); + Require.nonNull("Command to send", command); + return connection.sendAndWait(cdpSession, command, timeout); } /**