Improve proxy address formatting in ConfigFetcher and update related tests

Author: novalisdenahi

src/main/java/com/configcat/ConfigFetcher.java

@@ -5,6 +5,7 @@
 
 import java.io.Closeable;
 import java.io.IOException;
+import java.net.InetSocketAddress;
 import java.net.Proxy;
 import java.net.SocketTimeoutException;
 import java.util.UUID;
@@ -282,8 +283,11 @@ private String getProxyAddress() {
         if (proxy == null || proxy.type() == Proxy.Type.DIRECT) {
             return null;
         }
-
-        return proxy.toString();
+        if (proxy.address() instanceof InetSocketAddress) {
+            InetSocketAddress addr = (InetSocketAddress) proxy.address();
+            return proxy.type() + " @ " + addr.getHostString() + ":" + addr.getPort();
+        }
+        return proxy.type() + " @ " + proxy.address();
     }
 
     private Result<Config> deserializeConfig(String json, String cfRayId) {

src/test/java/com/configcat/ConfigFetcherTest.java

@@ -512,7 +512,7 @@ public void getProxyUriWhenProxyIsHTTPReturnsFormattedHttpProxyUri() throws IOEx
 
         String result = getProxyUriUsingReflection(fetcher);
 
-        assertEquals("HTTP @ proxy.example.com/<unresolved>:8080", result);
+        assertEquals("HTTP @ proxy.example.com:8080", result);
         fetcher.close();
     }
 
@@ -525,7 +525,7 @@ public void getProxyUriWhenProxyIsSOCKSReturnsFormattedSocks5ProxyUri() throws I
 
         String result = getProxyUriUsingReflection(fetcher);
 
-        assertEquals("SOCKS @ socks.example.com/<unresolved>:1080", result);
+        assertEquals("SOCKS @ socks.example.com:1080", result);
         fetcher.close();
     }