Squashable commit; addressing PR feedback

ljnelson · ljnelson · commit 3cb5be0e56a9 · 2025-10-28T18:15:07.000-07:00
Signed-off-by: Laird Nelson &lt;laird.nelson@oracle.com&gt;
diff --git a/webclient/discovery/pom.xml b/webclient/discovery/pom.xml
@@ -29,39 +29,53 @@
 
     <properties>
         <java.util.logging.config.file>src/test/resources/logging.properties</java.util.logging.config.file>
+        <javadoc.fail-on-warnings>true</javadoc.fail-on-warnings>
         <spotbugs.exclude>etc/spotbugs/exclude.xml</spotbugs.exclude>
     </properties>
 
     <dependencies>
+
+        <!-- Directly-used compile-scoped dependencies. -->
         <dependency>
             <groupId>io.helidon.builder</groupId>
             <artifactId>helidon-builder-api</artifactId>
         </dependency>
+        <dependency>
+            <groupId>io.helidon.common</groupId>
+            <artifactId>helidon-common-config</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.helidon.common</groupId>
+            <artifactId>helidon-common-uri</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.helidon.discovery</groupId>
+            <artifactId>helidon-discovery</artifactId>
+        </dependency>
         <dependency>
             <groupId>io.helidon.webclient</groupId>
             <artifactId>helidon-webclient-api</artifactId>
         </dependency>
+
+        <!-- Compile-scoped dependencies required by usage of Helidon Builder in generated code, etc. -->
         <dependency>
             <groupId>io.helidon.common</groupId>
             <artifactId>helidon-common</artifactId>
         </dependency>
         <dependency>
-            <groupId>io.helidon.config</groupId>
-            <artifactId>helidon-config</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>io.helidon.discovery</groupId>
-            <artifactId>helidon-discovery</artifactId>
+            <groupId>io.helidon.common</groupId>
+            <artifactId>helidon-common-types</artifactId>
         </dependency>
         <dependency>
-            <groupId>io.helidon.http</groupId>
-            <artifactId>helidon-http</artifactId>
+            <groupId>io.helidon.config</groupId>
+            <artifactId>helidon-config</artifactId>
         </dependency>
         <dependency>
             <groupId>io.helidon.service</groupId>
             <artifactId>helidon-service-registry</artifactId>
         </dependency>
 
+        <!-- Test-scoped dependencies. -->
         <dependency>
             <groupId>io.helidon.config</groupId>
             <artifactId>helidon-config-yaml</artifactId>
@@ -73,13 +87,13 @@
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>org.junit.jupiter</groupId>
-            <artifactId>junit-jupiter-api</artifactId>
+            <groupId>org.hamcrest</groupId>
+            <artifactId>hamcrest-all</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>org.hamcrest</groupId>
-            <artifactId>hamcrest-all</artifactId>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-api</artifactId>
             <scope>test</scope>
         </dependency>
     </dependencies>
@@ -122,6 +136,9 @@
                             <version>${helidon.version}</version>
                         </path>
                     </annotationProcessorPaths>
+                    <compilerArgs>
+                        <arg>-Xlint:all</arg>
+                    </compilerArgs>
                 </configuration>
                 <dependencies>
                     <dependency>
@@ -151,6 +168,20 @@
                     </dependency>
                 </dependencies>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-dependency-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>check-dependencies</id>
+                        <phase>verify</phase>
+                        <configuration>
+                            <ignoredNonTestScopedDependencies>io.helidon.common:helidon-common-parameters</ignoredNonTestScopedDependencies>
+                            <ignoredUsedUndeclaredDependencies>io.helidon.common:helidon-common-parameters</ignoredUsedUndeclaredDependencies>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
             <plugin>
                 <artifactId>maven-surefire-plugin</artifactId>
                 <configuration>
diff --git a/webclient/discovery/src/main/java/io/helidon/webclient/discovery/DefaultWebClientDiscovery.java b/webclient/discovery/src/main/java/io/helidon/webclient/discovery/DefaultWebClientDiscovery.java
@@ -98,8 +98,7 @@ public WebClientDiscoveryConfig prototype() {
     public WebClientServiceResponse handle(Chain chain, WebClientServiceRequest request) {
         ClientUri clientUri = request.uri();
         if (LOGGER.isLoggable(DEBUG)) {
-            LOGGER.log(DEBUG, "Initial ClientUri: " + clientUri);
-            LOGGER.log(DEBUG, "Properties: " + request.properties());
+            LOGGER.log(DEBUG, "Initial ClientUri: " + clientUri + "; properties: " + request.properties());
         }
 
         DiscoveryRequest discoveryRequest = DiscoveryRequest.of(request.properties(), request.uri()).orElse(null);
diff --git a/webclient/discovery/src/main/java/io/helidon/webclient/discovery/WebClientDiscoveryProvider.java b/webclient/discovery/src/main/java/io/helidon/webclient/discovery/WebClientDiscoveryProvider.java
@@ -55,10 +55,10 @@ public String configKey() {
      * java.net.URI) discover} URIs.
      *
      * @param config a {@link Config}
-     * @param name a service name; normally {@code discovery}; ignored
+     * @param name a service name; normally {@code discovery}
      * @return a new, non-{@code null} {@link WebClientDiscovery} implementation enabling discovery for its affiliated
      * {@link io.helidon.webclient.api.WebClient} instance
-     * @exception NullPointerException if {@code config} is {@code null}
+     * @exception NullPointerException if {@code config} or {@code name} is {@code null}
      * @see WebClientDiscovery#handle(io.helidon.webclient.spi.WebClientService.Chain,
      * io.helidon.webclient.api.WebClientServiceRequest)
      * @see WebClientDiscoveryConfig#builder()
@@ -68,6 +68,7 @@ public String configKey() {
     public WebClientDiscovery create(Config config, String name) {
         return WebClientDiscoveryConfig.builder()
             .config(config)
+            .name(name) // after config(config) so that the name argument is always honored
             .build();
     }
 
diff --git a/webclient/discovery/src/main/java/module-info.java b/webclient/discovery/src/main/java/module-info.java
@@ -22,20 +22,8 @@
  */
 module io.helidon.webclient.discovery {
 
-    requires io.helidon.webclient.api;
-
-    requires io.helidon.builder.api;
-
-    requires io.helidon.common;
-
-    requires io.helidon.config;
-
-    requires io.helidon.discovery;
-
-    requires io.helidon.http;
-
-    requires io.helidon.service.registry;
-
+    requires transitive io.helidon.discovery;
+    requires transitive io.helidon.webclient.api;
     exports io.helidon.webclient.discovery;
 
     provides io.helidon.webclient.spi.WebClientServiceProvider
diff --git a/webclient/discovery/src/test/java/io/helidon/webclient/discovery/ClientUriTest.java b/webclient/discovery/src/test/java/io/helidon/webclient/discovery/ClientUriTest.java
@@ -33,9 +33,9 @@
 import static org.hamcrest.Matchers.isEmptyString;
 import static org.hamcrest.Matchers.nullValue;
 
-class TestClientUri {
+class ClientUriTest {
 
-    private TestClientUri() {
+    private ClientUriTest() {
         super();
     }
 
diff --git a/webclient/discovery/src/test/java/io/helidon/webclient/discovery/DiscoveryRequestTest.java b/webclient/discovery/src/test/java/io/helidon/webclient/discovery/DiscoveryRequestTest.java
@@ -34,17 +34,18 @@
 import static java.util.HashMap.newHashMap;
 import static java.util.logging.Level.FINER;
 import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.containsString;
 import static org.hamcrest.Matchers.instanceOf;
 import static org.hamcrest.Matchers.is;
 
-class TestDiscoveryRequest {
+class DiscoveryRequestTest {
 
-    private TestDiscoveryRequest() {
+    private DiscoveryRequestTest() {
         super();
     }
 
     @Test
-    void testDiscoveryRequest() {
+    void discoveryRequestTest() {
         Map<String, String> m = newHashMap(7);
         m.put("helidon-discovery-ids", " prod  ,, test ");
         m.put("helidon-discovery-prod-prefix-uri", "http://example.com/prod/");
@@ -112,7 +113,7 @@ public void publish(LogRecord r) {
             l.setLevel(level);
         }
         // see src/test/resources/application.yaml
-        assertThat(uris[0], is("http://prod.example.com:80/foo/foo"));
+        assertThat(uris[0], containsString("http://prod.example.com:80/foo/foo"));
         assertThat(uris[1], is("http://prod.example.com:80/foo"));
     }
 
diff --git a/webclient/discovery/src/test/java/io/helidon/webclient/discovery/URITest.java b/webclient/discovery/src/test/java/io/helidon/webclient/discovery/URITest.java
@@ -25,9 +25,9 @@
 import static org.hamcrest.Matchers.nullValue;
 import static org.hamcrest.Matchers.sameInstance;
 
-class TestURI {
+class URITest {
 
-    private TestURI() {
+    private URITest() {
         super();
     }
 
diff --git a/webclient/discovery/src/test/java/io/helidon/webclient/discovery/UriEncodingTest.java b/webclient/discovery/src/test/java/io/helidon/webclient/discovery/UriEncodingTest.java
@@ -25,9 +25,9 @@
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.is;
 
-class TestUriEncoding {
+class UriEncodingTest {
 
-    private TestUriEncoding() {
+    private UriEncodingTest() {
         super();
     }
 
diff --git a/webclient/discovery/src/test/java/io/helidon/webclient/discovery/WebClientConfigTest.java b/webclient/discovery/src/test/java/io/helidon/webclient/discovery/WebClientConfigTest.java
@@ -29,9 +29,9 @@
 import static org.hamcrest.Matchers.hasEntry;
 import static org.hamcrest.Matchers.is;
 
-class TestWebClientConfig {
+class WebClientConfigTest {
 
-    private TestWebClientConfig() {
+    private WebClientConfigTest() {
         super();
     }
 
diff --git a/webclient/discovery/src/test/java/io/helidon/webclient/discovery/WebClientTest.java b/webclient/discovery/src/test/java/io/helidon/webclient/discovery/WebClientTest.java
@@ -20,9 +20,9 @@
 
 import static org.junit.jupiter.api.Assertions.assertThrows;
 
-class TestWebClient {
+class WebClientTest {
 
-    private TestWebClient() {
+    private WebClientTest() {
         super();
     }
 
diff --git a/webclient/discovery/src/test/resources/application.yaml b/webclient/discovery/src/test/resources/application.yaml
@@ -14,18 +14,18 @@
 # limitations under the License.
 #
 
-TestWebClientConfig-testPropertiesFromConfig:
+WebClientConfigTest-testPropertiesFromConfig:
   base-uri: http://prod.example.com/foo
   properties:
     helidon-discovery-TEST-prefix-uri: http://test.example.com/
     helidon-discovery-PROD-prefix-uri: http://prod.example.com/
 
-TestDiscoveryRequest-testCustomDiscoveryNames:
+DiscoveryRequestTest-testCustomDiscoveryNames:
   base-uri: http://prod.example.com/foo # ClientUri internals will add ":80" to the authority!
   properties:
     helidon-discovery-ids: prod, test
     helidon-discovery-prod-name: PROD # optional; prod by default
-    helidon-discovery-prod-prefix-uri: ${TestDiscoveryRequest-testCustomDiscoveryNames.base-uri}
+    helidon-discovery-prod-prefix-uri: ${DiscoveryRequestTest-testCustomDiscoveryNames.base-uri}
     helidon-discovery-test-name: TEST
     helidon-discovery-test-prefix-uri: http://test.example.com/foo
 

Original file line number	Diff line number	Diff line change
`@@ -98,8 +98,7 @@ public WebClientDiscoveryConfig prototype() {`
`98`	`98`	`public WebClientServiceResponse handle(Chain chain, WebClientServiceRequest request) {`
`99`	`99`	`ClientUri clientUri = request.uri();`
`100`	`100`	`if (LOGGER.isLoggable(DEBUG)) {`
`101`		`- LOGGER.log(DEBUG, "Initial ClientUri: " + clientUri);`
`102`		`- LOGGER.log(DEBUG, "Properties: " + request.properties());`
	`101`	`+ LOGGER.log(DEBUG, "Initial ClientUri: " + clientUri + "; properties: " + request.properties());`
`103`	`102`	`}`
`104`	`103`
`105`	`104`	`DiscoveryRequest discoveryRequest = DiscoveryRequest.of(request.properties(), request.uri()).orElse(null);`
Original file line number	Diff line number	Diff line change
`@@ -33,9 +33,9 @@`
`33`	`33`	`import static org.hamcrest.Matchers.isEmptyString;`
`34`	`34`	`import static org.hamcrest.Matchers.nullValue;`
`35`	`35`
`36`		`-class TestClientUri {`
	`36`	`+class ClientUriTest {`
`37`	`37`
`38`		`- private TestClientUri() {`
	`38`	`+ private ClientUriTest() {`
`39`	`39`	`super();`
`40`	`40`	`}`
`41`	`41`
Original file line number	Diff line number	Diff line change
`@@ -25,9 +25,9 @@`
`25`	`25`	`import static org.hamcrest.Matchers.nullValue;`
`26`	`26`	`import static org.hamcrest.Matchers.sameInstance;`
`27`	`27`
`28`		`-class TestURI {`
	`28`	`+class URITest {`
`29`	`29`
`30`		`- private TestURI() {`
	`30`	`+ private URITest() {`
`31`	`31`	`super();`
`32`	`32`	`}`
`33`	`33`
Original file line number	Diff line number	Diff line change
`@@ -29,9 +29,9 @@`
`29`	`29`	`import static org.hamcrest.Matchers.hasEntry;`
`30`	`30`	`import static org.hamcrest.Matchers.is;`
`31`	`31`
`32`		`-class TestWebClientConfig {`
	`32`	`+class WebClientConfigTest {`
`33`	`33`
`34`		`- private TestWebClientConfig() {`
	`34`	`+ private WebClientConfigTest() {`
`35`	`35`	`super();`
`36`	`36`	`}`
`37`	`37`
Original file line number	Diff line number	Diff line change
`@@ -20,9 +20,9 @@`
`20`	`20`
`21`	`21`	`import static org.junit.jupiter.api.Assertions.assertThrows;`
`22`	`22`
`23`		`-class TestWebClient {`
	`23`	`+class WebClientTest {`
`24`	`24`
`25`		`- private TestWebClient() {`
	`25`	`+ private WebClientTest() {`
`26`	`26`	`super();`
`27`	`27`	`}`
`28`	`28`