issue #553 add support for Proxy selectors

Author: ryber

unirest-bdd-tests/src/test/java/BehaviorTests/ProxyTest.java

@@ -31,6 +31,14 @@
 import org.junit.jupiter.api.Test;
 import kong.unirest.core.Unirest;
 
+import java.io.IOException;
+import java.net.InetSocketAddress;
+import java.net.ProxySelector;
+import java.net.SocketAddress;
+import java.net.URI;
+import java.util.List;
+
+import static java.net.Proxy.Type.HTTP;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
 @Disabled // The Janky Proxy is pretty janky and isn't entirely stable in CI
@@ -72,6 +80,31 @@ void canUseNonAuthProxyWithEasyMethod() {
         assertTrue(JankyProxy.wasUsed());
     }
 
+    @Test
+    void canUseSelector() {
+        JankyProxy.runServer("localhost", 4567, 7777);
+
+        Unirest.config().proxy(new ProxySelector(){
+            @Override
+            public List<java.net.Proxy> select(URI uri) {
+                var address = InetSocketAddress.createUnresolved("localhost", 7777);
+                return List.of(new java.net.Proxy(HTTP, address));
+            }
+
+            @Override
+            public void connectFailed(URI uri, SocketAddress sa, IOException ioe) {
+                throw new RuntimeException(ioe);
+            }
+        });
+
+        Unirest.get(MockServer.GET)
+                .asObject(RequestCapture.class)
+                .getBody()
+                .assertStatus(200);
+
+        assertTrue(JankyProxy.wasUsed());
+    }
+
     @Test
     void canSetAuthenticatedProxy(){
         JankyProxy.runServer("localhost", 4567, 7777);

unirest/src/main/java/kong/unirest/core/Config.java

@@ -31,6 +31,7 @@
 import javax.net.ssl.SSLContext;
 import java.io.InputStream;
 import java.net.Authenticator;
+import java.net.ProxySelector;
 import java.net.http.*;
 import java.net.http.HttpRequest;
 import java.net.http.HttpResponse;
@@ -76,6 +77,7 @@ public class Config {
     private HttpClient.Version version = HttpClient.Version.HTTP_2;
     private RetryStrategy retry;
     private Authenticator authenticator;
+    private ProxySelector proxySelector;
 
     public Config() {
         setDefaults();
@@ -104,6 +106,7 @@ private void setDefaults() {
         objectMapper = () -> CoreFactory.getCore().getObjectMapper();
         version = HttpClient.Version.HTTP_2;
         authenticator = null;
+        proxySelector = null;
 
         try {
             clientBuilder = JavaClient::new;
@@ -151,16 +154,32 @@ public Config executor(Executor executor){
 
     /**
      * Set a proxy
+     * This will set any ProxySelector object already set to null and take over all proxy work
      *
      * @param value Proxy settings object.
      * @return this config object
      */
     public Config proxy(Proxy value) {
         validateClientsNotRunning();
+        this.proxySelector = null;
         this.proxy = value;
         return this;
     }
 
+    /**
+     * Set a proxy selector.
+     * This will set any Proxy object already set to null and take over all proxy work
+     *
+     * @param value ProxySelector object.
+     * @return this config object
+     */
+    public Config proxy(ProxySelector value) {
+        validateClientsNotRunning();
+        this.proxy = null;
+        this.proxySelector = value;
+        return this;
+    }
+
     /**
      * Set a proxy
      *
@@ -933,4 +952,11 @@ public Config authenticator(Authenticator auth) {
     public Authenticator getAuthenticator(){
         return authenticator;
     }
+
+    /**
+     * @return the ProxySelector
+     */
+    public ProxySelector getProxySelector(){
+        return proxySelector;
+    }
 }

unirest/src/main/java/kong/unirest/core/java/JavaClientBuilder.java

@@ -59,6 +59,9 @@ public HttpClient apply(Config config) {
         if(config.getProxy() != null){
             createProxy(builder, config.getProxy());
         }
+        if(config.getProxySelector() != null){
+            builder = builder.proxy(config.getProxySelector());
+        }
         if(config.useSystemProperties()){
             builder.proxy(ProxySelector.getDefault());
         }