Set HTTP as default proxy type when specified via config in WebClient (helidon-io#3551)

* Set HTTP as default proxy type when specified via config and type isn't provided. Fix a few type related warnings.

Signed-off-by: Santiago Pericasgeertsen <santiago.pericasgeertsen@oracle.com>

* Fixed typo in comment.

Signed-off-by: Santiago Pericasgeertsen <santiago.pericasgeertsen@oracle.com>

Author: spericas

webclient/webclient/src/main/java/io/helidon/webclient/Proxy.java

@@ -147,6 +147,15 @@ Function<URI, Boolean> noProxyPredicate() {
         return noProxy;
     }
 
+    /**
+     * Get proxy type. For testing purposes.
+     *
+     * @return the proxy type
+     */
+    ProxyType type() {
+        return type;
+    }
+
     static Function<URI, Boolean> prepareNoProxy(Set<String> noProxyHosts) {
         if (noProxyHosts.isEmpty()) {
             // if no exceptions, then simple
@@ -473,7 +482,7 @@ public Proxy build() {
         public Builder config(Config config) {
             config.get("use-system-selector").asBoolean().ifPresent(this::useSystemSelector);
             if (this.type != ProxyType.SYSTEM) {
-                config.get("type").asString().map(ProxyType::valueOf).ifPresent(this::type);
+                config.get("type").asString().map(ProxyType::valueOf).ifPresentOrElse(this::type, () -> type(ProxyType.HTTP));
                 config.get("host").asString().ifPresent(this::host);
                 config.get("port").asInt().ifPresent(this::port);
                 config.get("username").asString().ifPresent(this::username);

webclient/webclient/src/main/java/io/helidon/webclient/WebClientConfiguration.java

@@ -116,17 +116,17 @@ class WebClientConfiguration {
      *
      * @return a new builder instance
      */
-    static Builder builder() {
-        return new Builder();
+    static Builder<?, ?> builder() {
+        return new Builder<>();
     }
 
     /**
      * Derives a new builder based on current instance of this class.
      *
      * @return a new builder instance
      */
-    Builder derive() {
-        return new Builder().update(this);
+    Builder<?, ?> derive() {
+        return new Builder<>().update(this);
     }
 
     Optional<SslContext> sslContext() {
@@ -319,6 +319,7 @@ static class Builder<B extends Builder<B, T>, T extends WebClientConfiguration>
         }
 
         @Override
+        @SuppressWarnings("unchecked")
         public T build() {
             return (T) new WebClientConfiguration(this);
         }

webclient/webclient/src/test/java/io/helidon/webclient/ProxyTest.java

@@ -79,6 +79,13 @@ void testNoProxyHandlingPredicate() {
                 is("/foo/bar"));
     }
 
+    @Test
+    void testDefaultProxyType() {
+        Config config = Config.create();
+        Proxy proxy = Proxy.create(config.get("proxy"));
+        assertThat(proxy.type(), is(Proxy.ProxyType.HTTP));
+    }
+
     private URI address(String host, int port) {
         return URI.create("http://" + host + ":" + port);
     }