Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
45 changes: 39 additions & 6 deletions java/src/org/openqa/selenium/remote/http/ClientConfig.java
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,27 @@ public class ClientConfig {
private final SSLContext sslContext;
private final String version;

protected ClientConfig(
URI baseUri,
Duration connectionTimeout,
Duration readTimeout,
Filter filters,
Proxy proxy,
Credentials credentials,
SSLContext sslContext,
String version) {
this(
baseUri,
connectionTimeout,
readTimeout,
defaultWsTimeout(),
filters,
proxy,
credentials,
sslContext,
version);
}

protected ClientConfig(
URI baseUri,
Duration connectionTimeout,
Expand All @@ -66,19 +87,31 @@ protected ClientConfig(
public static ClientConfig defaultConfig() {
return new ClientConfig(
null,
Duration.ofSeconds(
Long.parseLong(System.getProperty("webdriver.httpclient.connectionTimeout", "10"))),
Duration.ofSeconds(
Long.parseLong(System.getProperty("webdriver.httpclient.readTimeout", "180"))),
Duration.ofSeconds(
Long.parseLong(System.getProperty("webdriver.httpclient.wsTimeout", "30"))),
defaultConnectionTimeout(),
defaultReadTimeout(),
defaultWsTimeout(),
DEFAULT_FILTER,
null,
null,
null,
System.getProperty("webdriver.httpclient.version", null));
}

private static Duration defaultWsTimeout() {
return Duration.ofSeconds(
Long.parseLong(System.getProperty("webdriver.httpclient.wsTimeout", "30")));
}

private static Duration defaultReadTimeout() {
return Duration.ofSeconds(
Long.parseLong(System.getProperty("webdriver.httpclient.readTimeout", "180")));
}

private static Duration defaultConnectionTimeout() {
return Duration.ofSeconds(
Long.parseLong(System.getProperty("webdriver.httpclient.connectionTimeout", "10")));
}

public ClientConfig baseUri(URI baseUri) {
return new ClientConfig(
Require.nonNull("Base URI", baseUri),
Expand Down