polishing

Author: chillaq

client/src/main/java/io/split/client/SplitClientConfig.java

@@ -1142,7 +1142,7 @@ private void verifyProxy() {
             if (_proxyConfiguration == null)
                 return;
 
-            if (!_proxyHost.equals("localhost")) {
+            if (_proxyPort != -1) {
                 _log.warn("Both the deprecated proxy configuration methods (`proxyHost`, `proxyPort`, `proxyUsername`, or `proxyPassword`) " +
                         "and the new `ProxyConfiguration` builder are being used. `ProxyConfiguration` will take precedence.");
             }

client/src/main/java/io/split/client/SplitFactoryImpl.java

@@ -636,49 +636,48 @@ private static HttpClientBuilder setupProxy(HttpClientBuilder httpClientbuilder,
     }
 
     private static HttpClientBuilder useLegacyProxyConfiguration(HttpClientBuilder httpClientbuilder, SplitClientConfig config) {
-        HttpHost proxyHost;
-        String userName = null;
-        String password = null;
-        proxyHost = config.proxy();
+        HttpHost proxyHost = config.proxy();
+        httpClientbuilder = addProxyHost(httpClientbuilder, proxyHost);
         if (config.proxyUsername() != null && config.proxyPassword() != null) {
-            userName = config.proxyUsername();
-            password = config.proxyPassword();
+            return addProxyBasicAuth(httpClientbuilder, proxyHost, config.proxyUsername(), config.proxyPassword());
         }
-        return addProxyParams(httpClientbuilder, proxyHost, userName, password);
+        
+        return httpClientbuilder;
     }
 
     private static HttpClientBuilder useProxyConfiguration(HttpClientBuilder httpClientbuilder, SplitClientConfig config) {
-        HttpHost proxyHost;
-        String userName = null;
-        String password = null;
-        proxyHost = config.proxyConfiguration().getHost();
-        if (config.proxyConfiguration().getProxyCredentialsProvider() != null) {
-            if (config.proxyConfiguration().getProxyCredentialsProvider() instanceof io.split.client.dtos.BasicCredentialsProvider) {
-                io.split.client.dtos.BasicCredentialsProvider basicAuth =
-                        (io.split.client.dtos.BasicCredentialsProvider) config.proxyConfiguration().getProxyCredentialsProvider();
-                userName = basicAuth.getUsername();
-                password = basicAuth.getPassword();
-            } else if (config.proxyConfiguration().getProxyCredentialsProvider() instanceof io.split.client.dtos.BearerCredentialsProvider) {
-                _log.debug("Proxy setup using Bearer token");
-                httpClientbuilder.setDefaultCredentialsProvider(new HttpClientDynamicCredentials(
-                        (BearerCredentialsProvider) config.proxyConfiguration().getProxyCredentialsProvider()));
-            }
+        HttpHost proxyHost = config.proxyConfiguration().getHost();
+        httpClientbuilder = addProxyHost(httpClientbuilder, proxyHost);
+        if (config.proxyConfiguration().getProxyCredentialsProvider() == null) {
+            return httpClientbuilder;
         }
-        return addProxyParams(httpClientbuilder, proxyHost, userName, password);
+
+        if (config.proxyConfiguration().getProxyCredentialsProvider() instanceof io.split.client.dtos.BasicCredentialsProvider) {
+            io.split.client.dtos.BasicCredentialsProvider basicAuth =
+                    (io.split.client.dtos.BasicCredentialsProvider) config.proxyConfiguration().getProxyCredentialsProvider();
+            return addProxyBasicAuth(httpClientbuilder, proxyHost, basicAuth.getUsername(), basicAuth.getPassword());
+        }
+
+        _log.debug("Proxy setup using Bearer token");
+        httpClientbuilder.setDefaultCredentialsProvider(new HttpClientDynamicCredentials(
+                    (BearerCredentialsProvider) config.proxyConfiguration().getProxyCredentialsProvider()));
+        return httpClientbuilder;
     }
 
-    private static HttpClientBuilder addProxyParams(HttpClientBuilder httpClientbuilder, HttpHost proxyHost, String userName, String password) {
+    private static HttpClientBuilder addProxyHost(HttpClientBuilder httpClientbuilder, HttpHost proxyHost) {
         DefaultProxyRoutePlanner routePlanner = new DefaultProxyRoutePlanner(proxyHost);
         httpClientbuilder.setRoutePlanner(routePlanner);
-        if (userName != null && password != null) {
-            _log.debug("Proxy setup using Basic authentication");
-            BasicCredentialsProvider credsProvider = new BasicCredentialsProvider();
-            AuthScope siteScope = new AuthScope(proxyHost.getHostName(), proxyHost.getPort());
-            Credentials siteCreds = new UsernamePasswordCredentials(userName,
-                    password.toCharArray());
-            credsProvider.setCredentials(siteScope, siteCreds);
-            httpClientbuilder.setDefaultCredentialsProvider(credsProvider);
-        }
+        return httpClientbuilder;
+    }
+
+    private static HttpClientBuilder addProxyBasicAuth(HttpClientBuilder httpClientbuilder, HttpHost proxyHost, String userName, String password) {
+        _log.debug("Proxy setup using Basic authentication");
+        BasicCredentialsProvider credsProvider = new BasicCredentialsProvider();
+        AuthScope siteScope = new AuthScope(proxyHost.getHostName(), proxyHost.getPort());
+        Credentials siteCreds = new UsernamePasswordCredentials(userName,
+                password.toCharArray());
+        credsProvider.setCredentials(siteScope, siteCreds);
+        httpClientbuilder.setDefaultCredentialsProvider(credsProvider);
         return httpClientbuilder;
     }