Skip to content

Commit 3c2313f

Browse files
diemoldiemol
committed
[java] Formatting files.
1 parent aaf6c27 commit 3c2313f

12 files changed

Lines changed: 68 additions & 78 deletions

File tree

‎java/src/org/openqa/selenium/bidi/BrowsingContextInspector.java‎

Lines changed: 37 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,13 @@
1717

1818
package org.openqa.selenium.bidi;
1919

20+
import java.io.StringReader;
21+
import java.util.Collections;
22+
import java.util.HashSet;
23+
import java.util.Map;
24+
import java.util.Set;
25+
import java.util.function.Consumer;
26+
import java.util.function.Function;
2027
import org.openqa.selenium.WebDriver;
2128
import org.openqa.selenium.bidi.browsingcontext.BrowsingContextInfo;
2229
import org.openqa.selenium.bidi.browsingcontext.NavigationInfo;
@@ -26,14 +33,6 @@
2633
import org.openqa.selenium.json.Json;
2734
import org.openqa.selenium.json.JsonInput;
2835

29-
import java.io.StringReader;
30-
import java.util.Collections;
31-
import java.util.HashSet;
32-
import java.util.Map;
33-
import java.util.Set;
34-
import java.util.function.Consumer;
35-
import java.util.function.Function;
36-
3736
public class BrowsingContextInspector implements AutoCloseable {
3837

3938
private static final Json JSON = new Json();
@@ -43,48 +42,48 @@ public class BrowsingContextInspector implements AutoCloseable {
4342
private final BiDi bidi;
4443

4544
private final Function<Map<String, Object>, BrowsingContextInfo> browsingContextInfoMapper =
46-
params -> {
47-
try (
48-
StringReader reader = new StringReader(JSON.toJson(params));
49-
JsonInput input = JSON.newInput(reader)) {
50-
return input.read(BrowsingContextInfo.class);
51-
}
52-
};
45+
params -> {
46+
try (StringReader reader = new StringReader(JSON.toJson(params));
47+
JsonInput input = JSON.newInput(reader)) {
48+
return input.read(BrowsingContextInfo.class);
49+
}
50+
};
5351

5452
private final Function<Map<String, Object>, NavigationInfo> navigationInfoMapper =
55-
params -> {
56-
try (
57-
StringReader reader = new StringReader(JSON.toJson(params));
58-
JsonInput input = JSON.newInput(reader)) {
59-
return input.read(NavigationInfo.class);
60-
}
61-
};
53+
params -> {
54+
try (StringReader reader = new StringReader(JSON.toJson(params));
55+
JsonInput input = JSON.newInput(reader)) {
56+
return input.read(NavigationInfo.class);
57+
}
58+
};
6259

6360
private final Event<BrowsingContextInfo> browsingContextCreated =
64-
new Event<>("browsingContext.contextCreated", browsingContextInfoMapper);
61+
new Event<>("browsingContext.contextCreated", browsingContextInfoMapper);
6562

6663
private final Event<BrowsingContextInfo> browsingContextDestroyed =
67-
new Event<>("browsingContext.contextDestroyed", browsingContextInfoMapper);
64+
new Event<>("browsingContext.contextDestroyed", browsingContextInfoMapper);
6865

6966
private final Event<UserPromptClosed> userPromptClosed =
70-
new Event<>("browsingContext.userPromptClosed", params -> {
71-
try (
72-
StringReader reader = new StringReader(JSON.toJson(params));
73-
JsonInput input = JSON.newInput(reader)) {
74-
return input.read(UserPromptClosed.class);
75-
}
76-
});
67+
new Event<>(
68+
"browsingContext.userPromptClosed",
69+
params -> {
70+
try (StringReader reader = new StringReader(JSON.toJson(params));
71+
JsonInput input = JSON.newInput(reader)) {
72+
return input.read(UserPromptClosed.class);
73+
}
74+
});
7775

7876
private final Set<Event<NavigationInfo>> navigationEventSet = new HashSet<>();
7977

8078
private final Event<UserPromptOpened> userPromptOpened =
81-
new Event<>("browsingContext.userPromptOpened", params -> {
82-
try (
83-
StringReader reader = new StringReader(JSON.toJson(params));
84-
JsonInput input = JSON.newInput(reader)) {
85-
return input.read(UserPromptOpened.class);
86-
}
87-
});
79+
new Event<>(
80+
"browsingContext.userPromptOpened",
81+
params -> {
82+
try (StringReader reader = new StringReader(JSON.toJson(params));
83+
JsonInput input = JSON.newInput(reader)) {
84+
return input.read(UserPromptOpened.class);
85+
}
86+
});
8887

8988
public BrowsingContextInspector(WebDriver driver) {
9089
this(new HashSet<>(), driver);

‎java/src/org/openqa/selenium/bidi/browsingcontext/NavigationInfo.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,9 @@
1919

2020
import static java.util.Collections.unmodifiableMap;
2121

22-
import org.openqa.selenium.json.JsonInput;
23-
2422
import java.util.Map;
2523
import java.util.TreeMap;
24+
import org.openqa.selenium.json.JsonInput;
2625

2726
public class NavigationInfo {
2827

@@ -34,7 +33,8 @@ public class NavigationInfo {
3433

3534
private final String url;
3635

37-
private NavigationInfo(String browsingContextId, String navigationId, long timestamp, String url) {
36+
private NavigationInfo(
37+
String browsingContextId, String navigationId, long timestamp, String url) {
3838
this.browsingContextId = browsingContextId;
3939
this.navigationId = navigationId;
4040
this.timestamp = timestamp;

‎java/src/org/openqa/selenium/bidi/browsingcontext/UserPromptClosed.java‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,10 @@
1919

2020
import static java.util.Collections.unmodifiableMap;
2121

22-
import org.openqa.selenium.json.JsonInput;
23-
2422
import java.util.Map;
2523
import java.util.Optional;
2624
import java.util.TreeMap;
25+
import org.openqa.selenium.json.JsonInput;
2726

2827
public class UserPromptClosed {
2928

@@ -39,7 +38,6 @@ private UserPromptClosed(String browsingContextId, boolean accepted, Optional<St
3938
this.userText = userText;
4039
}
4140

42-
4341
public static UserPromptClosed fromJson(JsonInput input) {
4442
String browsingContextId = null;
4543
boolean accepted = false;

‎java/src/org/openqa/selenium/bidi/browsingcontext/UserPromptOpened.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,9 @@
1919

2020
import static java.util.Collections.unmodifiableMap;
2121

22-
import org.openqa.selenium.json.JsonInput;
23-
2422
import java.util.Map;
2523
import java.util.TreeMap;
24+
import org.openqa.selenium.json.JsonInput;
2625

2726
public class UserPromptOpened {
2827

‎java/src/org/openqa/selenium/remote/service/DriverService.java‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -465,8 +465,9 @@ protected OutputStream getLogOutput(String logProperty) {
465465
}
466466

467467
if (logLocation == null) {
468-
LOG.info("Driver logs no longer sent to console by default; " +
469-
"https://www.selenium.dev/documentation/webdriver/drivers/service/#setting-log-output");
468+
LOG.info(
469+
"Driver logs no longer sent to console by default; "
470+
+ "https://www.selenium.dev/documentation/webdriver/drivers/service/#setting-log-output");
470471
return ByteStreams.nullOutputStream();
471472
}
472473

‎java/test/org/openqa/selenium/ReferrerTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ class ReferrerTest {
9898
public static void shouldTestBeRunAtAll() {
9999
assumeThat(Boolean.getBoolean("selenium.skiptest")).isFalse();
100100
}
101-
101+
102102
@BeforeAll
103103
public static void readContents() throws IOException {
104104
page1 = new String(Files.readAllBytes(locate("common/src/web/proxy" + PAGE_1)));

‎java/test/org/openqa/selenium/bidi/browsingcontext/BrowsingContextInspectorTest.java‎

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,10 @@
2020
import static org.assertj.core.api.AssertionsForClassTypes.assertThat;
2121
import static org.openqa.selenium.testing.Safely.safelyCall;
2222

23+
import java.util.concurrent.CompletableFuture;
24+
import java.util.concurrent.ExecutionException;
25+
import java.util.concurrent.TimeUnit;
26+
import java.util.concurrent.TimeoutException;
2327
import org.junit.jupiter.api.AfterEach;
2428
import org.junit.jupiter.api.BeforeEach;
2529
import org.junit.jupiter.api.Test;
@@ -30,11 +34,6 @@
3034
import org.openqa.selenium.firefox.FirefoxDriver;
3135
import org.openqa.selenium.firefox.FirefoxOptions;
3236

33-
import java.util.concurrent.CompletableFuture;
34-
import java.util.concurrent.ExecutionException;
35-
import java.util.concurrent.TimeUnit;
36-
import java.util.concurrent.TimeoutException;
37-
3837
class BrowsingContextInspectorTest {
3938

4039
private AppServer server;
@@ -53,7 +52,7 @@ public void setUp() {
5352

5453
@Test
5554
void canListenToWindowBrowsingContextCreatedEvent()
56-
throws ExecutionException, InterruptedException, TimeoutException {
55+
throws ExecutionException, InterruptedException, TimeoutException {
5756
try (BrowsingContextInspector inspector = new BrowsingContextInspector(driver)) {
5857
CompletableFuture<BrowsingContextInfo> future = new CompletableFuture<>();
5958

@@ -73,7 +72,7 @@ void canListenToWindowBrowsingContextCreatedEvent()
7372

7473
@Test
7574
void canListenToTabBrowsingContextCreatedEvent()
76-
throws ExecutionException, InterruptedException, TimeoutException {
75+
throws ExecutionException, InterruptedException, TimeoutException {
7776
try (BrowsingContextInspector inspector = new BrowsingContextInspector(driver)) {
7877
CompletableFuture<BrowsingContextInfo> future = new CompletableFuture<>();
7978
inspector.onBrowsingContextCreated(future::complete);
@@ -92,7 +91,7 @@ void canListenToTabBrowsingContextCreatedEvent()
9291

9392
@Test
9493
void canListenToDomContentLoadedEvent()
95-
throws ExecutionException, InterruptedException, TimeoutException {
94+
throws ExecutionException, InterruptedException, TimeoutException {
9695
try (BrowsingContextInspector inspector = new BrowsingContextInspector(driver)) {
9796
CompletableFuture<NavigationInfo> future = new CompletableFuture<>();
9897
inspector.onDomContentLoaded(future::complete);
@@ -108,7 +107,7 @@ void canListenToDomContentLoadedEvent()
108107

109108
@Test
110109
void canListenToBrowsingContextLoadedEvent()
111-
throws ExecutionException, InterruptedException, TimeoutException {
110+
throws ExecutionException, InterruptedException, TimeoutException {
112111
try (BrowsingContextInspector inspector = new BrowsingContextInspector(driver)) {
113112
CompletableFuture<NavigationInfo> future = new CompletableFuture<>();
114113
inspector.onBrowsingContextLoaded(future::complete);

‎java/test/org/openqa/selenium/chrome/ChromeDriverFunctionalTest.java‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,12 +24,10 @@
2424
import static org.assertj.core.api.Assumptions.assumeThat;
2525
import static org.openqa.selenium.testing.drivers.Browser.CHROME;
2626

27-
import com.google.common.collect.ImmutableMap;
2827
import com.google.common.util.concurrent.Uninterruptibles;
2928
import java.time.Duration;
3029
import java.util.List;
3130
import java.util.Map;
32-
3331
import org.assertj.core.api.Assumptions;
3432
import org.junit.jupiter.api.Test;
3533
import org.openqa.selenium.Capabilities;
@@ -47,7 +45,6 @@
4745
import org.openqa.selenium.testing.Ignore;
4846
import org.openqa.selenium.testing.JupiterTestBase;
4947
import org.openqa.selenium.testing.NoDriverBeforeTest;
50-
import org.openqa.selenium.testing.drivers.Browser;
5148

5249
class ChromeDriverFunctionalTest extends JupiterTestBase {
5350

@@ -87,7 +84,7 @@ public void driverOverridesDefaultClientConfig() {
8784
localDriver =
8885
new ChromeDriver(
8986
ChromeDriverService.createDefaultService(),
90-
(ChromeOptions) CHROME.getCapabilities(),
87+
(ChromeOptions) CHROME.getCapabilities(),
9188
clientConfig);
9289
})
9390
.isInstanceOf(SessionNotCreatedException.class);
@@ -96,7 +93,8 @@ public void driverOverridesDefaultClientConfig() {
9693
@Test
9794
void builderWithClientConfigThrowsException() {
9895
ClientConfig clientConfig = ClientConfig.defaultConfig().readTimeout(Duration.ofMinutes(1));
99-
RemoteWebDriverBuilder builder = ChromeDriver.builder().oneOf(CHROME.getCapabilities()).config(clientConfig);
96+
RemoteWebDriverBuilder builder =
97+
ChromeDriver.builder().oneOf(CHROME.getCapabilities()).config(clientConfig);
10098

10199
assertThatExceptionOfType(IllegalArgumentException.class)
102100
.isThrownBy(builder::build)

‎java/test/org/openqa/selenium/chrome/ChromeOptionsFunctionalTest.java‎

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

1818
package org.openqa.selenium.chrome;
1919

20+
import static org.assertj.core.api.Assertions.assertThat;
21+
import static org.openqa.selenium.remote.CapabilityType.ACCEPT_INSECURE_CERTS;
22+
2023
import com.google.common.collect.ImmutableMap;
24+
import java.io.IOException;
25+
import java.nio.file.Files;
26+
import java.util.Base64;
2127
import org.junit.jupiter.api.AfterAll;
2228
import org.junit.jupiter.api.Test;
2329
import org.openqa.selenium.By;
@@ -27,13 +33,6 @@
2733
import org.openqa.selenium.testing.NoDriverBeforeTest;
2834
import org.openqa.selenium.testing.drivers.Browser;
2935

30-
import java.io.IOException;
31-
import java.nio.file.Files;
32-
import java.util.Base64;
33-
34-
import static org.assertj.core.api.Assertions.assertThat;
35-
import static org.openqa.selenium.remote.CapabilityType.ACCEPT_INSECURE_CERTS;
36-
3736
class ChromeOptionsFunctionalTest extends JupiterTestBase {
3837

3938
private static final String EXT_PATH = "common/extensions/webextensions-selenium-example.crx";
@@ -107,6 +106,7 @@ public void canAddExtensionFromStringEncodedInBase64() throws IOException {
107106

108107
private ChromeOptions createChromeOptionsForExtensions() {
109108
ChromeOptions options = (ChromeOptions) Browser.CHROME.getCapabilities();
110-
return options.setExperimentalOption("prefs", ImmutableMap.of("extensions.ui.developer_mode", true));
109+
return options.setExperimentalOption(
110+
"prefs", ImmutableMap.of("extensions.ui.developer_mode", true));
111111
}
112112
}

‎java/test/org/openqa/selenium/testing/JupiterTestBase.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,8 @@ public void removeDriver() {
8484
public String toLocalUrl(String url) {
8585
try {
8686
URL original = new URL(url);
87-
return new URL(original.getProtocol(), "localhost", original.getPort(), original.getFile()).toString();
87+
return new URL(original.getProtocol(), "localhost", original.getPort(), original.getFile())
88+
.toString();
8889
} catch (MalformedURLException e) {
8990
throw new RuntimeException(e);
9091
}

0 commit comments

Comments
 (0)