Extract HttpClient creation to factory method

Author: jpomykala

src/main/java/io/simplelocalize/cli/client/HttpClientFactory.java

@@ -0,0 +1,83 @@
+package io.simplelocalize.cli.client;
+
+import io.simplelocalize.cli.client.dto.ProxyConfiguration;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.net.Authenticator;
+import java.net.InetSocketAddress;
+import java.net.PasswordAuthentication;
+import java.net.ProxySelector;
+import java.net.http.HttpClient;
+import java.time.Duration;
+
+public class HttpClientFactory
+{
+  private static final Logger log = LoggerFactory.getLogger(HttpClientFactory.class);
+
+  private HttpClientFactory()
+  {
+  }
+
+  public static HttpClient createHttpClient()
+  {
+    HttpClient.Builder builder = HttpClient
+            .newBuilder()
+            .connectTimeout(Duration.ofMinutes(5));
+
+    String httpProxyValue = getSystemProxyVariable();
+    if (httpProxyValue == null || httpProxyValue.isEmpty())
+    {
+      return builder.build();
+    }
+
+    ProxyConfiguration proxyConfigOptional = SystemProxySelector.getHttpProxyValueOrNull(httpProxyValue);
+    if (proxyConfigOptional != null)
+    {
+      log.info("Using proxy: {}", proxyConfigOptional);
+      ProxySelector proxySelector = getProxySelector(proxyConfigOptional);
+      builder.proxy(proxySelector);
+
+      String proxyUsername = proxyConfigOptional.getUsername();
+      String proxyPassword = proxyConfigOptional.getPassword();
+      boolean hasProxyAuthentication = proxyUsername != null && proxyPassword != null;
+      if (hasProxyAuthentication)
+      {
+        Authenticator authenticator = getAuthenticator(proxyUsername, proxyPassword);
+        builder.authenticator(authenticator);
+      }
+    }
+
+    return builder.build();
+  }
+
+  private static String getSystemProxyVariable()
+  {
+    String systemProxyVariable = System.getenv("http_proxy");
+    if (systemProxyVariable == null)
+    {
+      systemProxyVariable = System.getenv("https_proxy");
+    }
+    return systemProxyVariable;
+  }
+
+  private static ProxySelector getProxySelector(ProxyConfiguration proxyConfigOptional)
+  {
+    String host = proxyConfigOptional.getHost();
+    Integer port = proxyConfigOptional.getPort();
+    InetSocketAddress proxyAddress = new InetSocketAddress(host, port);
+    return ProxySelector.of(proxyAddress);
+  }
+
+  private static Authenticator getAuthenticator(String proxyUsername, String proxyPassword)
+  {
+    return new Authenticator()
+    {
+      @Override
+      protected PasswordAuthentication getPasswordAuthentication()
+      {
+        return new PasswordAuthentication(proxyUsername, proxyPassword.toCharArray());
+      }
+    };
+  }
+}

src/main/java/io/simplelocalize/cli/client/SimpleLocalizeClient.java

@@ -3,20 +3,22 @@
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.jayway.jsonpath.JsonPath;
 import com.jayway.jsonpath.Option;
-import io.simplelocalize.cli.client.dto.*;
+import io.simplelocalize.cli.client.dto.DownloadRequest;
+import io.simplelocalize.cli.client.dto.DownloadableFile;
+import io.simplelocalize.cli.client.dto.ExportResponse;
+import io.simplelocalize.cli.client.dto.UploadRequest;
 import io.simplelocalize.cli.exception.ApiRequestException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import java.io.IOException;
-import java.net.*;
+import java.net.URI;
 import java.net.http.HttpClient;
 import java.net.http.HttpRequest;
 import java.net.http.HttpResponse;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.StandardOpenOption;
-import java.time.Duration;
 import java.util.Collection;
 import java.util.List;
 import java.util.Objects;
@@ -44,38 +46,7 @@ public SimpleLocalizeClient(String baseUrl, String apiKey)
     this.uriFactory = new SimpleLocalizeUriFactory(baseUrl);
     this.httpRequestFactory = new SimpleLocalizeHttpRequestFactory(apiKey);
     this.objectMapper = new ObjectMapper();
-    HttpClient.Builder builder = HttpClient
-            .newBuilder()
-            .connectTimeout(Duration.ofMinutes(5));
-
-    String httpProxyValue = System.getenv("http_proxy");
-    ProxyConfiguration proxyConfigOptional = SystemProxySelector.getHttpProxyValueOrNull(httpProxyValue);
-    if (proxyConfigOptional != null)
-    {
-      log.info("Using proxy: {}", proxyConfigOptional);
-      String host = proxyConfigOptional.getHost();
-      Integer port = proxyConfigOptional.getPort();
-      InetSocketAddress proxyAddress = new InetSocketAddress(host, port);
-      builder.proxy(ProxySelector.of(proxyAddress));
-
-      String proxyUsername = proxyConfigOptional.getUsername();
-      String proxyPassword = proxyConfigOptional.getPassword();
-      boolean hasAuthentication = proxyUsername != null && proxyPassword != null;
-      if (hasAuthentication)
-      {
-        Authenticator authenticator = new Authenticator()
-        {
-          @Override
-          protected PasswordAuthentication getPasswordAuthentication()
-          {
-            return new PasswordAuthentication(proxyUsername, proxyPassword.toCharArray());
-          }
-        };
-        builder.authenticator(authenticator);
-      }
-    }
-
-    this.httpClient = builder.build();
+    this.httpClient = HttpClientFactory.createHttpClient();
   }
 
   public static SimpleLocalizeClient create(String baseUrl, String apiKey)