Squashable commit; addressing PR feedback

Signed-off-by: Laird Nelson <[email protected]>

Author: ljnelson

docs/src/main/asciidoc/se/discovery.adoc

@@ -386,9 +386,9 @@ need to configure _prefix URIs_. URIs that match no prefix will not be subject t
 webclient:
   services:
     discovery:
-      properties:
-        helidon-discovery-EXAMPLE-prefix-uri: "https://example.com:443/" # <1>
-        helidon-discovery-TEST-prefix-uri: "https://test.example.com:443/" # <2> <3>
+      prefix-uris:
+        EXAMPLE: "https://example.com:443/" # <1>
+        TEST: "https://test.example.com:443/" # <2> <3>
 ----
 <1> Indicates that URIs starting with `https://example.com:443/` will be subject to discovery, using the discovery name
     of `EXAMPLE`
@@ -397,26 +397,6 @@ webclient:
 <3> URIs that begin with text other than `https://example.com:443/` or `https://test.example.com:443/` will not be
     subject to discovery
 
-===== Complicated Discovery Names
-
-To use complicated discovery names for certain prefix URIs, you can link them to specific prefix URIs as follows. This
-configuration strategy is primarily for cases where, for whatever reason, the discovery name is too long or complicated
-to appear in a property name:
-
-[source,yaml]
-.`application.yaml`
-----
-webclient:
-  services:
-    discovery:
-      properties:
-        helidon-discovery-EXAMPLE-prefix-uri: "https://example.com:443/" # <1>
-        helidon-discovery-EXAMPLE-name: "My Long Complicated Discovery Name" # <2>
-----
-<1> Indicates that URIs starting with `https://example.com:443/` will be subject to discovery
-<2> Indicates that the discovery name to use for prefix URIs identified by the
-    `helidon-discovery-EXAMPLE-prefix-uri` property name will be `My Long Complicated Discovery Name`
-
 == References
 
 * link:{discovery-javadoc-base-url}/module-summary.html[Discovery Javadoc]

webclient/discovery/pom.xml

@@ -21,7 +21,7 @@
     <parent>
         <groupId>io.helidon.webclient</groupId>
         <artifactId>helidon-webclient-project</artifactId>
-        <version>4.3.0-SNAPSHOT</version>
+        <version>4.4.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>helidon-webclient-discovery</artifactId>

webclient/discovery/src/main/java/io/helidon/webclient/discovery/DefaultWebClientDiscovery.java

@@ -15,6 +15,9 @@
  */
 package io.helidon.webclient.discovery;
 
+import java.net.URI;
+import java.util.Map;
+
 import io.helidon.builder.api.Option;
 import io.helidon.builder.api.Prototype;
 import io.helidon.discovery.Discovery;
@@ -39,6 +42,14 @@ interface WebClientDiscoveryConfigBlueprint extends Prototype.Factory<WebClientD
     @Option.RegistryService
     Discovery discovery();
 
+    /**
+     * A {@link Map} of {@link URI} prefixes indexed under discovery names.
+     *
+     * @return the {@link Map}
+     */
+    @Option.Configured
+    Map<String, URI> prefixUris();
+
     /**
      * The name to assign to the runtime type ({@code discovery} by default).
      *