Skip to content

Commit 64bcbd7

Browse files
committed
[java] set client config version as string and convert in Jdk Client
1 parent c1a74e7 commit 64bcbd7

File tree

2 files changed

+6
-7
lines changed

2 files changed

+6
-7
lines changed

Diff for: java/src/org/openqa/selenium/remote/http/ClientConfig.java

+4-5
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@
2323
import java.net.URI;
2424
import java.net.URISyntaxException;
2525
import java.net.URL;
26-
import java.net.http.HttpClient;
2726
import java.time.Duration;
2827
import javax.net.ssl.SSLContext;
2928
import org.openqa.selenium.Credentials;
@@ -40,7 +39,7 @@ public class ClientConfig {
4039
private final Proxy proxy;
4140
private final Credentials credentials;
4241
private final SSLContext sslContext;
43-
private HttpClient.Version version;
42+
private String version;
4443

4544
protected ClientConfig(
4645
URI baseUri,
@@ -50,7 +49,7 @@ protected ClientConfig(
5049
Proxy proxy,
5150
Credentials credentials,
5251
SSLContext sslContext,
53-
HttpClient.Version version) {
52+
String version) {
5453
this.baseUri = baseUri;
5554
this.connectionTimeout = Require.nonNegative("Connection timeout", connectionTimeout);
5655
this.readTimeout = Require.nonNegative("Read timeout", readTimeout);
@@ -214,7 +213,7 @@ public SSLContext sslContext() {
214213
return sslContext;
215214
}
216215

217-
public ClientConfig version(HttpClient.Version version) {
216+
public ClientConfig version(String version) {
218217
return new ClientConfig(
219218
baseUri,
220219
connectionTimeout,
@@ -226,7 +225,7 @@ public ClientConfig version(HttpClient.Version version) {
226225
Require.nonNull("Version", version));
227226
}
228227

229-
public HttpClient.Version version() {
228+
public String version() {
230229
return version;
231230
}
232231

Diff for: java/src/org/openqa/selenium/remote/http/jdk/JdkHttpClient.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -151,9 +151,9 @@ public void connectFailed(URI uri, SocketAddress sa, IOException ioe) {
151151
builder.sslContext(sslContext);
152152
}
153153

154-
Version version = config.version();
154+
String version = config.version();
155155
if (version != null) {
156-
builder.version(version);
156+
builder.version(Version.valueOf(version));
157157
}
158158

159159
this.client = builder.build();

0 commit comments

Comments
 (0)