Skip to content

Commit 6e2d8a3

Browse files
committed
applied format.sh
1 parent 815bc89 commit 6e2d8a3

File tree

2 files changed

+27
-27
lines changed

2 files changed

+27
-27
lines changed

java/src/org/openqa/selenium/remote/http/jdk/JdkHttpClient.java

Lines changed: 14 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ public class JdkHttpClient implements HttpClient {
8484

8585
JdkHttpClient(ClientConfig config) {
8686
Objects.requireNonNull(config, "Client config must be set");
87-
87+
8888
this.config = config;
8989
this.messages = new JdkHttpMessages(config);
9090
this.readTimeout = config.readTimeout();
@@ -111,7 +111,7 @@ public class JdkHttpClient implements HttpClient {
111111
Credentials credentials = config.credentials();
112112
String info = config.baseUri().getUserInfo();
113113
URI baseUri = config.baseUri();
114-
114+
115115
if (info != null && !info.trim().isEmpty()) {
116116
String[] parts = info.split(":", 2);
117117
String username = parts[0];
@@ -125,17 +125,20 @@ protected PasswordAuthentication getPasswordAuthentication() {
125125
}
126126
};
127127
builder = builder.authenticator(authenticator);
128-
128+
129129
// Remove credentials from URL
130130
try {
131-
config = ClientConfig.defaultConfig().baseUri(new URI(
132-
config.baseUri().getScheme(),
133-
null,
134-
config.baseUri().getHost(),
135-
config.baseUri().getPort(),
136-
config.baseUri().getPath(),
137-
config.baseUri().getQuery(),
138-
config.baseUri().getFragment()));
131+
config =
132+
ClientConfig.defaultConfig()
133+
.baseUri(
134+
new URI(
135+
config.baseUri().getScheme(),
136+
null,
137+
config.baseUri().getHost(),
138+
config.baseUri().getPort(),
139+
config.baseUri().getPath(),
140+
config.baseUri().getQuery(),
141+
config.baseUri().getFragment()));
139142
} catch (URISyntaxException e) {
140143
LOG.log(Level.WARNING, "Could not strip credentials from URI", e);
141144
}

java/test/org/openqa/selenium/remote/http/jdk/JdkHttpClientTest.java

Lines changed: 13 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -17,15 +17,13 @@
1717

1818
package org.openqa.selenium.remote.http.jdk;
1919

20-
import org.openqa.selenium.remote.http.HttpClient;
21-
import org.openqa.selenium.remote.internal.HttpClientTestBase;
22-
import org.junit.Test;
2320
import static org.hamcrest.MatcherAssert.assertThat;
24-
import static org.hamcrest.Matchers.is;
25-
import static org.hamcrest.Matchers.isNull;
2621

2722
import java.net.URI;
2823
import java.net.URISyntaxException;
24+
import org.junit.Test;
25+
import org.openqa.selenium.remote.http.HttpClient;
26+
import org.openqa.selenium.remote.internal.HttpClientTestBase;
2927

3028
class JdkHttpClientTest extends HttpClientTestBase {
3129

@@ -38,12 +36,12 @@ protected HttpClient.Factory createFactory() {
3836
void shouldStripCredentialsFromUrl() throws URISyntaxException {
3937
URI originalUri = new URI("http://admin:password@localhost:4444/wd/hub");
4038
ClientConfig config = ClientConfig.defaultConfig().baseUri(originalUri);
41-
39+
4240
JdkHttpClient client = new JdkHttpClient(config);
43-
41+
4442
// Get the modified URI from the client's config
4543
URI modifiedUri = client.getBaseUri();
46-
44+
4745
assertThat(modifiedUri.getUserInfo()).isNull();
4846
assertThat(modifiedUri.getHost()).isEqualTo("localhost");
4947
assertThat(modifiedUri.getPort()).isEqualTo(4444);
@@ -54,24 +52,23 @@ void shouldStripCredentialsFromUrl() throws URISyntaxException {
5452
void shouldHandleUrlWithoutCredentials() throws URISyntaxException {
5553
URI originalUri = new URI("http://localhost:4444/wd/hub");
5654
ClientConfig config = ClientConfig.defaultConfig().baseUri(originalUri);
57-
55+
5856
JdkHttpClient client = new JdkHttpClient(config);
59-
57+
6058
URI modifiedUri = client.getBaseUri();
61-
59+
6260
assertThat(modifiedUri).isEqualTo(originalUri);
6361
}
6462

6563
@Test
6664
void shouldPreserveUrlComponentsExceptCredentials() throws URISyntaxException {
67-
URI originalUri = new URI(
68-
"https://admin:password@localhost:4444/wd/hub?debug=true#fragment");
65+
URI originalUri = new URI("https://admin:password@localhost:4444/wd/hub?debug=true#fragment");
6966
ClientConfig config = ClientConfig.defaultConfig().baseUri(originalUri);
70-
67+
7168
JdkHttpClient client = new JdkHttpClient(config);
72-
69+
7370
URI modifiedUri = client.getBaseUri();
74-
71+
7572
assertThat(modifiedUri.getScheme()).isEqualTo("https");
7673
assertThat(modifiedUri.getUserInfo()).isNull();
7774
assertThat(modifiedUri.getHost()).isEqualTo("localhost");

0 commit comments

Comments
 (0)