From 316144999f6a7933ccc9c05b62f08ad2c722faa4 Mon Sep 17 00:00:00 2001 From: Alex Date: Mon, 24 Jun 2024 14:26:10 +0700 Subject: [PATCH 1/6] RemoteWebDriver -> capabilities to protected --- java/src/org/openqa/selenium/remote/RemoteWebDriver.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java/src/org/openqa/selenium/remote/RemoteWebDriver.java b/java/src/org/openqa/selenium/remote/RemoteWebDriver.java index 3462231c7f17b..1427e745d05e8 100644 --- a/java/src/org/openqa/selenium/remote/RemoteWebDriver.java +++ b/java/src/org/openqa/selenium/remote/RemoteWebDriver.java @@ -114,7 +114,7 @@ public class RemoteWebDriver private Level level = Level.FINE; private ErrorHandler errorHandler = new ErrorHandler(); private CommandExecutor executor; - private Capabilities capabilities; + protected Capabilities capabilities; private SessionId sessionId; private FileDetector fileDetector = new UselessFileDetector(); private ExecuteMethod executeMethod; From 429541a25b10886490a7a1640c0a6e0b1ad611cb Mon Sep 17 00:00:00 2001 From: Alex Date: Mon, 24 Jun 2024 14:27:41 +0700 Subject: [PATCH 2/6] HttpCommandExecutor -> commandCodec to protected --- java/src/org/openqa/selenium/remote/HttpCommandExecutor.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java/src/org/openqa/selenium/remote/HttpCommandExecutor.java b/java/src/org/openqa/selenium/remote/HttpCommandExecutor.java index d636048364d0d..4d72ac2b77933 100644 --- a/java/src/org/openqa/selenium/remote/HttpCommandExecutor.java +++ b/java/src/org/openqa/selenium/remote/HttpCommandExecutor.java @@ -47,7 +47,7 @@ public class HttpCommandExecutor implements CommandExecutor, NeedsLocalLogs { private final HttpClient client; private final HttpClient.Factory httpClientFactory; private final Map additionalCommands; - private CommandCodec commandCodec; + protected CommandCodec commandCodec; private ResponseCodec responseCodec; private LocalLogs logs = LocalLogs.getNullLogger(); From 38dba15ff1a67668cfb6de432983fa2945433aaf Mon Sep 17 00:00:00 2001 From: Alex Date: Mon, 24 Jun 2024 14:28:06 +0700 Subject: [PATCH 3/6] HttpCommandExecutor -> responseCodec to protected --- java/src/org/openqa/selenium/remote/HttpCommandExecutor.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java/src/org/openqa/selenium/remote/HttpCommandExecutor.java b/java/src/org/openqa/selenium/remote/HttpCommandExecutor.java index 4d72ac2b77933..b211b610d45e9 100644 --- a/java/src/org/openqa/selenium/remote/HttpCommandExecutor.java +++ b/java/src/org/openqa/selenium/remote/HttpCommandExecutor.java @@ -48,7 +48,7 @@ public class HttpCommandExecutor implements CommandExecutor, NeedsLocalLogs { private final HttpClient.Factory httpClientFactory; private final Map additionalCommands; protected CommandCodec commandCodec; - private ResponseCodec responseCodec; + protected ResponseCodec responseCodec; private LocalLogs logs = LocalLogs.getNullLogger(); From a028df1262139fc1004a8a94c579b3d65a6c0c61 Mon Sep 17 00:00:00 2001 From: Alex Date: Mon, 24 Jun 2024 14:31:50 +0700 Subject: [PATCH 4/6] FluentWait fields protected modifier FluentWait -> clock FluentWait -> timeout FluentWait -> interval FluentWait -> sleeper FluentWait -> ignoredExceptions FluentWait -> messageSupplier FluentWait -> input --- .../org/openqa/selenium/support/ui/FluentWait.java | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/java/src/org/openqa/selenium/support/ui/FluentWait.java b/java/src/org/openqa/selenium/support/ui/FluentWait.java index b8bd205c8b961..2c02e5f424557 100644 --- a/java/src/org/openqa/selenium/support/ui/FluentWait.java +++ b/java/src/org/openqa/selenium/support/ui/FluentWait.java @@ -66,15 +66,15 @@ public class FluentWait implements Wait { private static final Duration DEFAULT_WAIT_DURATION = Duration.ofMillis(DEFAULT_SLEEP_TIMEOUT); - private final T input; - private final java.time.Clock clock; - private final Sleeper sleeper; + protected final T input; + protected final java.time.Clock clock; + protected final Sleeper sleeper; - private Duration timeout = DEFAULT_WAIT_DURATION; - private Duration interval = DEFAULT_WAIT_DURATION; - private Supplier messageSupplier = () -> null; + protected Duration timeout = DEFAULT_WAIT_DURATION; + protected Duration interval = DEFAULT_WAIT_DURATION; + protected Supplier messageSupplier = () -> null; - private final List> ignoredExceptions = new ArrayList<>(); + protected final List> ignoredExceptions = new ArrayList<>(); /** * @param input The input value to pass to the evaluated conditions. From 3f3db16376928f2cb25dfb6c0566cbb3ca00117d Mon Sep 17 00:00:00 2001 From: Alex Date: Mon, 24 Jun 2024 14:33:01 +0700 Subject: [PATCH 5/6] HttpCommandExecutor -> client to public --- java/src/org/openqa/selenium/remote/HttpCommandExecutor.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java/src/org/openqa/selenium/remote/HttpCommandExecutor.java b/java/src/org/openqa/selenium/remote/HttpCommandExecutor.java index b211b610d45e9..03fc84bc45b19 100644 --- a/java/src/org/openqa/selenium/remote/HttpCommandExecutor.java +++ b/java/src/org/openqa/selenium/remote/HttpCommandExecutor.java @@ -44,7 +44,7 @@ public class HttpCommandExecutor implements CommandExecutor, NeedsLocalLogs { private final URL remoteServer; - private final HttpClient client; + public final HttpClient client; private final HttpClient.Factory httpClientFactory; private final Map additionalCommands; protected CommandCodec commandCodec; From b6f89beab735fca18406ebe5f34edb14d4cf0ae1 Mon Sep 17 00:00:00 2001 From: Alex Date: Mon, 24 Jun 2024 14:35:20 +0700 Subject: [PATCH 6/6] DriverService.Builder -> exe to public --- java/src/org/openqa/selenium/remote/service/DriverService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java/src/org/openqa/selenium/remote/service/DriverService.java b/java/src/org/openqa/selenium/remote/service/DriverService.java index 90fb1f2ca127d..0e0c04f693d9c 100644 --- a/java/src/org/openqa/selenium/remote/service/DriverService.java +++ b/java/src/org/openqa/selenium/remote/service/DriverService.java @@ -355,7 +355,7 @@ private enum StartOrDie { public abstract static class Builder> { private int port = 0; - private File exe = null; + public File exe = null; private Map environment = emptyMap(); private File logFile; private Duration timeout;