Update Proxy#toString().

webmagic-core/src/main/java/us/codecraft/webmagic/proxy/Proxy.java

@@ -1,5 +1,13 @@
 package us.codecraft.webmagic.proxy;
 
+import java.io.UnsupportedEncodingException;
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.net.URLEncoder;
+import java.nio.charset.StandardCharsets;
+
+import org.apache.commons.lang3.StringUtils;
+
 public class Proxy {
 
     private String scheme;
@@ -53,6 +61,28 @@ public class Proxy {
         return password;
     }
 
+    public URI toURI() throws URISyntaxException {
+        final StringBuilder userInfoBuffer = new StringBuilder();
+        if (username != null) {
+            userInfoBuffer.append(urlencode(username));
+        }
+        if (password != null) {
+            userInfoBuffer.append(":").append(urlencode(password));
+        }
+        final String userInfo = StringUtils.defaultIfEmpty(userInfoBuffer.toString(), null);
+        final URI uri = new URI(scheme, userInfo, host, port, null, null, null);
+        return uri;
+    }
+
+    private String urlencode(String s) {
+        String enc = StandardCharsets.UTF_8.name();
+        try {
+            return URLEncoder.encode(s, enc);
+        } catch (UnsupportedEncodingException e) {
+            throw new IllegalArgumentException(e);
+        }
+    }
+
     @Override
     public boolean equals(Object o) {
         if (this == o) return true;
@@ -79,8 +109,11 @@ public class Proxy {
 
     @Override
     public String toString() {
-        return String.format("Proxy{scheme='%1$s', host='%2$s', port=%3$d, username='%4$s', password='%5$s'}",
-            scheme, host, port, username, password);
+        try {
+            return this.toURI().toString();
+        } catch (URISyntaxException e) {
+            throw new IllegalArgumentException(e);
+        }
     }
 
 }

webmagic-core/src/test/java/us/codecraft/webmagic/proxy/ProxyTest.java

@@ -1,11 +1,14 @@
 package us.codecraft.webmagic.proxy;
 
-import org.apache.http.HttpHost;
-import org.junit.BeforeClass;
+import static org.junit.Assert.assertEquals;
 
 import java.util.ArrayList;
 import java.util.List;
 
+import org.apache.http.HttpHost;
+import org.junit.BeforeClass;
+import org.junit.Test;
+
 /**
  * @author yxssfxwzy@sina.com May 30, 2014
  * 
@@ -42,4 +45,13 @@ public class ProxyTest {
 		}
 	}
 
+	@Test
+	public void testToString() {
+		assertEquals("//127.0.0.1:8080", new Proxy("127.0.0.1", 8080).toString());
+		assertEquals("http://127.0.0.1:8080", new Proxy("127.0.0.1", 8080, "http").toString());
+		assertEquals("//username:password@127.0.0.1:8080", new Proxy("127.0.0.1", 8080, "username", "password").toString());
+		assertEquals("//username@127.0.0.1:8080", new Proxy("127.0.0.1", 8080, "username", null).toString());
+		assertEquals("//:password@127.0.0.1:8080", new Proxy("127.0.0.1", 8080, null, "password").toString());
+	}
+
 }