Support nonProxyHosts and proxyType settings for clients

Author: jmartisk

client/implementation-vertx/src/main/java/io/smallrye/graphql/client/vertx/VertxClientOptionsHelper.java

@@ -9,6 +9,7 @@
 import io.vertx.core.net.JksOptions;
 import io.vertx.core.net.KeyCertOptions;
 import io.vertx.core.net.ProxyOptions;
+import io.vertx.core.net.ProxyType;
 import io.vertx.core.net.SSLOptions;
 import io.vertx.core.net.TrustOptions;
 
@@ -51,6 +52,12 @@ public static void applyConfigToVertxOptions(HttpClientOptions options, GraphQLC
             proxyOptions.setPort(configuration.getProxyPort());
             proxyOptions.setUsername(configuration.getProxyUsername());
             proxyOptions.setPassword(configuration.getProxyPassword());
+            proxyOptions.setType(toVertxProxyType(configuration.getProxyType()));
+            if (configuration.getNonProxyHosts() != null) {
+                for (String nonProxyHost : configuration.getNonProxyHosts()) {
+                    options.addNonProxyHost(nonProxyHost);
+                }
+            }
             options.setProxyOptions(proxyOptions);
         }
 
@@ -59,6 +66,17 @@ public static void applyConfigToVertxOptions(HttpClientOptions options, GraphQLC
         }
     }
 
+    private static ProxyType toVertxProxyType(GraphQLClientConfiguration.ProxyType proxyType) {
+        if (proxyType == null) {
+            return ProxyType.HTTP;
+        }
+        return switch (proxyType) {
+            case HTTP -> ProxyType.HTTP;
+            case SOCKS4 -> ProxyType.SOCKS4;
+            case SOCKS5 -> ProxyType.SOCKS5;
+        };
+    }
+
     private static void configure(HttpClientOptions options, GraphQLClientConfiguration graphQLClientConfiguration) {
         options.setForceSni(graphQLClientConfiguration.usesSni() != null && graphQLClientConfiguration.usesSni());
         if (graphQLClientConfiguration.getHostnameVerificationAlgorithm() == null

client/implementation/src/main/java/io/smallrye/graphql/client/impl/GraphQLClientConfiguration.java

@@ -124,6 +124,13 @@ public class GraphQLClientConfiguration {
      */
     private String proxyPassword;
 
+    /**
+     * Type of proxy to use. The default is HTTP.
+     */
+    private ProxyType proxyType;
+
+    private List<String> nonProxyHosts;
+
     /**
      * Maximum number of redirects to follow.
      */
@@ -336,6 +343,22 @@ public Object getSslOptions() {
         return sslOptions;
     }
 
+    public ProxyType getProxyType() {
+        return proxyType;
+    }
+
+    public void setProxyType(ProxyType proxyType) {
+        this.proxyType = proxyType;
+    }
+
+    public List<String> getNonProxyHosts() {
+        return nonProxyHosts;
+    }
+
+    public void setNonProxyHosts(List<String> nonProxyHosts) {
+        this.nonProxyHosts = nonProxyHosts;
+    }
+
     public void setSslOptions(Object sslOptions) {
         this.sslOptions = sslOptions;
     }
@@ -408,6 +431,9 @@ public GraphQLClientConfiguration merge(GraphQLClientConfiguration other) {
         if (other.proxyPassword != null) {
             this.proxyPassword = other.proxyPassword;
         }
+        if (other.proxyType != null) {
+            this.proxyType = other.proxyType;
+        }
         if (other.maxRedirects != null) {
             this.maxRedirects = other.maxRedirects;
         }
@@ -434,4 +460,11 @@ public GraphQLClientConfiguration merge(GraphQLClientConfiguration other) {
         }
         return this;
     }
+
+    public enum ProxyType {
+        HTTP,
+        SOCKS4,
+        SOCKS5
+    }
+
 }