Add support for proxy https

Author: jpomykala

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

@@ -15,7 +15,9 @@ public static ProxyConfiguration getHttpProxyValueOrNull(String httpProxyValue)
       return null;
     }
 
-    boolean isHttpOrHttps = httpProxyValue.startsWith("http://") || httpProxyValue.startsWith("https://");
+    final boolean isHttp = httpProxyValue.startsWith("http://");
+    final boolean isHttps = httpProxyValue.startsWith("https://");
+    final boolean isHttpOrHttps = isHttp || isHttps;
     if (isHttpOrHttps)
     {
       httpProxyValue = httpProxyValue
@@ -28,7 +30,7 @@ public static ProxyConfiguration getHttpProxyValueOrNull(String httpProxyValue)
 
     String addressUrl;
     String authenticationString = "";
-    boolean hasAuthentication = httpProxyValue.contains("@");
+    final boolean hasAuthentication = httpProxyValue.contains("@");
     if (hasAuthentication)
     {
       String[] authenticationAndAddress = httpProxyValue.split("@");
@@ -40,8 +42,8 @@ public static ProxyConfiguration getHttpProxyValueOrNull(String httpProxyValue)
     }
 
     String host;
-    int port = 80;
-    boolean hasHostnameAndPort = addressUrl.contains(":");
+    int port = isHttp ? 80 : 443;
+    final boolean hasHostnameAndPort = addressUrl.contains(":");
     if (hasHostnameAndPort)
     {
       String[] hostAndPortParts = addressUrl.split(":");
@@ -54,7 +56,7 @@ public static ProxyConfiguration getHttpProxyValueOrNull(String httpProxyValue)
 
     String username = null;
     String password = null;
-    boolean hasUsernameAndPassword = authenticationString.contains(":");
+    final boolean hasUsernameAndPassword = authenticationString.contains(":");
     if (hasUsernameAndPassword)
     {
       String[] usernameAndPassword = authenticationString.split(":");

src/test/java/io/simplelocalize/cli/client/SystemProxySelectorTest.java

@@ -19,9 +19,13 @@ private static Stream<Arguments> provideArguments()
   {
     return Stream.of(
             of("http://123.456.789.000", new ProxyConfiguration().setHost("123.456.789.000").setPort(80).setUsername(null).setPassword(null)),
+            of("https://123.456.789.000", new ProxyConfiguration().setHost("123.456.789.000").setPort(443).setUsername(null).setPassword(null)),
             of("http://123.456.789.000:8080", new ProxyConfiguration().setHost("123.456.789.000").setPort(8080).setUsername(null).setPassword(null)),
+            of("https://123.456.789.000:8080", new ProxyConfiguration().setHost("123.456.789.000").setPort(8080).setUsername(null).setPassword(null)),
             of("http://foo:[email protected]", new ProxyConfiguration().setHost("123.456.789.000").setPort(80).setUsername("foo").setPassword("bar")),
-            of("http://foo:[email protected]:8080", new ProxyConfiguration().setHost("123.456.789.000").setPort(8080).setUsername("foo").setPassword("bar"))
+            of("https://foo:[email protected]", new ProxyConfiguration().setHost("123.456.789.000").setPort(443).setUsername("foo").setPassword("bar")),
+            of("http://foo:[email protected]:8080", new ProxyConfiguration().setHost("123.456.789.000").setPort(8080).setUsername("foo").setPassword("bar")),
+            of("https://foo:[email protected]:8080", new ProxyConfiguration().setHost("123.456.789.000").setPort(8080).setUsername("foo").setPassword("bar"))
     );
   }