Rename external-uri to external-url.

#12508 (review)

Fixes #12491

Author: utamas

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

@@ -34,12 +34,12 @@ public class BaseServerFlags implements HasRoles {
   private static final String SERVER_SECTION = "server";
 
   @Parameter(
-      names = {"--external-uri"},
-      description = "External URI where component is generally available. " +
+      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.")
-  @ConfigValue(section = SERVER_SECTION, name = "external-uri", example = "http://10.0.1.1:33333")
-  private String externalUri;
+  @ConfigValue(section = SERVER_SECTION, name = "external-url", example = "http://10.0.1.1:33333")
+  private String externalUrl;
 
   @Parameter(
       names = {"--host"},

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

@@ -84,7 +84,7 @@ public int getMaxServerThreads() {
 
   @ManagedAttribute(name = "Uri")
   public URI getExternalUri() {
-    return config.get(SERVER_SECTION, "external-uri")
+    return config.get(SERVER_SECTION, "external-url")
       .map(url -> {
         try {
           return new URI(url);

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

@@ -50,13 +50,13 @@ void serverConfigBindsToHostByDefault() {
   @Test
   void externalUriFailsForNonUriStrings() {
     BaseServerOptions options =
-      new BaseServerOptions(new MapConfig(Map.of("server", Map.of("external-uri", "not a uri"))));
+      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 uri");
+    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
@@ -65,7 +65,7 @@ void externalUriTakesPriorityOverDefaults() throws URISyntaxException {
 
     BaseServerOptions options =
       new BaseServerOptions(new MapConfig(Map.of("server", Map.of(
-        "external-uri", expected.toString(),
+        "external-url", expected.toString(),
         "host", "localhost",
         "port", 5555
       ))));