fix linting issues

Author: titusfortner

java/src/org/openqa/selenium/grid/server/BaseServerFlags.java

@@ -35,9 +35,10 @@ public class BaseServerFlags implements HasRoles {
 
   @Parameter(
       names = {"--external-url"},
-      description = "External URL where component is generally available. " +
-        "Useful on complex network topologies when components are on different networks " +
-        "and proxy servers are involved.")
+      description =
+          "External URL where component is generally available. "
+              + "Useful on complex network topologies when components are on different networks "
+              + "and proxy servers are involved.")
   @ConfigValue(section = SERVER_SECTION, name = "external-url", example = "http://10.0.1.1:33333")
   private String externalUrl;
 

java/src/org/openqa/selenium/grid/server/BaseServerOptions.java

@@ -84,38 +84,48 @@ public int getMaxServerThreads() {
 
   @ManagedAttribute(name = "Uri")
   public URI getExternalUri() {
-    return config.get(SERVER_SECTION, "external-url")
-      .map(url -> {
-        try {
-          return new URI(url);
-        } catch (URISyntaxException e) {
-          throw new RuntimeException("Supplied external URI is invalid: " + e.getMessage(), e);
-        }
-      })
-      .orElseGet(() -> {
-        // Assume the host given is addressable if it's been set
-        String host =
-          getHostname()
-            .orElseGet(
-              () -> {
-                try {
-                  return new NetworkUtils().getNonLoopbackAddressOfThisMachine();
-                } catch (WebDriverException e) {
-                  String name = HostIdentifier.getHostName();
-                  LOG.info("No network connection, guessing name: " + name);
-                  return name;
-                }
-              });
-
-        int port = getPort();
-
-        try {
-          return new URI(
-            (isSecure() || isSelfSigned()) ? "https" : "http", null, host, port, null, null, null);
-        } catch (URISyntaxException e) {
-          throw new ConfigException("Cannot determine external URI: " + e.getMessage());
-        }
-      });
+    return config
+        .get(SERVER_SECTION, "external-url")
+        .map(
+            url -> {
+              try {
+                return new URI(url);
+              } catch (URISyntaxException e) {
+                throw new RuntimeException(
+                    "Supplied external URI is invalid: " + e.getMessage(), e);
+              }
+            })
+        .orElseGet(
+            () -> {
+              // Assume the host given is addressable if it's been set
+              String host =
+                  getHostname()
+                      .orElseGet(
+                          () -> {
+                            try {
+                              return new NetworkUtils().getNonLoopbackAddressOfThisMachine();
+                            } catch (WebDriverException e) {
+                              String name = HostIdentifier.getHostName();
+                              LOG.info("No network connection, guessing name: " + name);
+                              return name;
+                            }
+                          });
+
+              int port = getPort();
+
+              try {
+                return new URI(
+                    (isSecure() || isSelfSigned()) ? "https" : "http",
+                    null,
+                    host,
+                    port,
+                    null,
+                    null,
+                    null);
+              } catch (URISyntaxException e) {
+                throw new ConfigException("Cannot determine external URI: " + e.getMessage());
+              }
+            });
   }
 
   public boolean getAllowCORS() {

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

@@ -50,38 +50,49 @@ void serverConfigBindsToHostByDefault() {
   @Test
   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();
-    });
-
-    assertThat(exception.getMessage()).as("External URI must be parseable as URI.").isEqualTo("Supplied external URI is invalid: Illegal character in path at index 3: not a URL");
+        new BaseServerOptions(new MapConfig(Map.of("server", Map.of("external-url", "not a URL"))));
+
+    Exception exception =
+        assertThrows(
+            RuntimeException.class,
+            () -> {
+              options.getExternalUri();
+            });
+
+    assertThat(exception.getMessage())
+        .as("External URI must be parseable as URI.")
+        .isEqualTo(
+            "Supplied external URI is invalid: Illegal character in path at index 3: not a URL");
   }
 
   @Test
   void externalUriTakesPriorityOverDefaults() throws URISyntaxException {
     URI expected = new URI("http://10.0.1.1:33333");
 
     BaseServerOptions options =
-      new BaseServerOptions(new MapConfig(Map.of("server", Map.of(
-        "external-url", expected.toString(),
-        "host", "localhost",
-        "port", 5555
-      ))));
+        new BaseServerOptions(
+            new MapConfig(
+                Map.of(
+                    "server",
+                    Map.of(
+                        "external-url", expected.toString(), "host", "localhost", "port", 5555))));
 
     assertThat(options.getExternalUri()).isEqualTo(expected);
   }
 
   @Test
-  void externalUriDefaultsToValueDerivedFromHostnameAndPortWhenNotDefined() throws URISyntaxException {
+  void externalUriDefaultsToValueDerivedFromHostnameAndPortWhenNotDefined()
+      throws URISyntaxException {
     URI expected = new URI("http://localhost:5555");
 
     BaseServerOptions options =
-      new BaseServerOptions(new MapConfig(Map.of("server", Map.of(
-        "host", expected.getHost(),
-        "port", expected.getPort()
-      ))));
+        new BaseServerOptions(
+            new MapConfig(
+                Map.of(
+                    "server",
+                    Map.of(
+                        "host", expected.getHost(),
+                        "port", expected.getPort()))));
 
     assertThat(options.getExternalUri()).isEqualTo(expected);
   }