Merge branch 'trunk' into proxy

Author: RenderMichael

java/src/org/openqa/selenium/chromium/ChromiumDriver.java

@@ -147,7 +147,7 @@ protected ChromiumDriver(
 
     try {
       try {
-        cdpUri = client.flatMap(httpClient -> CdpEndpointFinder.getCdpEndPoint(httpClient));
+        cdpUri = client.flatMap(CdpEndpointFinder::getCdpEndPoint);
       } catch (Exception e) {
         try {
           client.ifPresent(HttpClient::close);

java/src/org/openqa/selenium/devtools/SeleniumCdpConnection.java

@@ -77,7 +77,7 @@ public static Optional<Connection> create(
       client = reportedUri.map(uri -> CdpEndpointFinder.getHttpClient(clientFactory, uri));
 
       try {
-        cdpUri = client.flatMap(httpClient -> CdpEndpointFinder.getCdpEndPoint(httpClient));
+        cdpUri = client.flatMap(CdpEndpointFinder::getCdpEndPoint);
       } catch (Exception e) {
         try {
           client.ifPresent(HttpClient::close);
@@ -87,7 +87,7 @@ public static Optional<Connection> create(
         throw e;
       }
 
-      if (!cdpUri.isPresent()) {
+      if (cdpUri.isEmpty()) {
         try {
           client.ifPresent(HttpClient::close);
         } catch (Exception e) {

java/src/org/openqa/selenium/firefox/FirefoxDriver.java

@@ -176,7 +176,7 @@ private FirefoxDriver(
     Optional<URI> cdpUri;
 
     try {
-      cdpUri = client.flatMap(httpClient -> CdpEndpointFinder.getCdpEndPoint(httpClient));
+      cdpUri = client.flatMap(CdpEndpointFinder::getCdpEndPoint);
     } catch (Exception e) {
       try {
         client.ifPresent(HttpClient::close);

java/src/org/openqa/selenium/remote/RemoteWebDriver.java

@@ -1247,7 +1247,7 @@ public void addCredential(Credential credential) {
           Stream.concat(
                   credential.toMap().entrySet().stream(),
                   Stream.of(Map.entry("authenticatorId", id)))
-              .collect(Collectors.toUnmodifiableMap((e) -> e.getKey(), (e) -> e.getValue())));
+              .collect(Collectors.toUnmodifiableMap(Map.Entry::getKey, Map.Entry::getValue)));
     }
 
     @Override

java/test/org/openqa/selenium/NoSuchShadowRootTest.java

@@ -34,6 +34,6 @@ public void getNoSuchShadowRoot() {
     driver.get(pages.shadowRootPage);
     WebElement nonExistentShadowRootElement = driver.findElement(By.id("noShadowRoot"));
     assertThatExceptionOfType(NoSuchShadowRootException.class)
-        .isThrownBy(() -> nonExistentShadowRootElement.getShadowRoot());
+        .isThrownBy(nonExistentShadowRootElement::getShadowRoot);
   }
 }

java/test/org/openqa/selenium/grid/node/relay/RelayOptionsTest.java

@@ -137,10 +137,7 @@ void protocolVersionThrowsConfigException() {
     Config config = new TomlConfig(new StringReader(String.join("\n", rawConfig)));
     RelayOptions relayOptions = new RelayOptions(config);
     assertThatExceptionOfType(ConfigException.class)
-        .isThrownBy(
-            () -> {
-              relayOptions.getServiceProtocolVersion();
-            })
+        .isThrownBy(relayOptions::getServiceProtocolVersion)
         .withMessageContaining("Unsupported protocol version provided: HTTP/0.9");
   }
 

java/test/org/openqa/selenium/grid/server/BaseServerOptionsTest.java

@@ -52,12 +52,7 @@ void externalUriFailsForNonUriStrings() {
     BaseServerOptions options =
         new BaseServerOptions(new MapConfig(Map.of("server", Map.of("external-url", "not a URL"))));
 
-    Exception exception =
-        assertThrows(
-            RuntimeException.class,
-            () -> {
-              options.getExternalUri();
-            });
+    Exception exception = assertThrows(RuntimeException.class, options::getExternalUri);
 
     assertThat(exception.getMessage())
         .as("External URI must be parseable as URI.")