Merge pull request qiniu#14 from hughlv/master

Fixed the encodeParams missing issue.

Author: xushiwei

src/main/java/com/qiniu/qbox/auth/Client.java

@@ -1,6 +1,9 @@
 package com.qiniu.qbox.auth;
 
+import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map.Entry;
 
 import org.apache.commons.codec.binary.Base64;
 import org.apache.http.HttpResponse;
@@ -9,9 +12,12 @@
 import org.apache.http.client.HttpClient;
 import org.apache.http.client.entity.UrlEncodedFormEntity;
 import org.apache.http.client.methods.HttpPost;
+import org.apache.http.client.utils.URLEncodedUtils;
+import org.apache.http.entity.AbstractHttpEntity;
 import org.apache.http.entity.ByteArrayEntity;
 import org.apache.http.entity.StringEntity;
 import org.apache.http.impl.client.DefaultHttpClient;
+import org.apache.http.message.BasicNameValuePair;
 import org.apache.http.util.EntityUtils;
 
 public abstract class Client {
@@ -53,14 +59,7 @@ public CallRet call(String url, List<NameValuePair> nvps) {
 		}
 	}
 
-	public CallRet callWithBinary(String url, String contentType, byte[] body, long bodyLength) {
-
-		ByteArrayEntity entity = new ByteArrayEntity(body);
-
-		if (contentType == null || contentType.length() == 0) {
-			contentType = "application/octet-stream";
-		}
-		entity.setContentType(contentType);
+	public CallRet callWithBinary(String url, AbstractHttpEntity entity) {
 
 		HttpPost postMethod = new HttpPost(url);
 
@@ -80,6 +79,18 @@ public CallRet callWithBinary(String url, String contentType, byte[] body, long
 		}
 	}
 
+	public CallRet callWithBinary(String url, String contentType, byte[] body, long bodyLength) {
+
+		ByteArrayEntity entity = new ByteArrayEntity(body);
+
+		if (contentType == null || contentType.isEmpty()) {
+			contentType = "application/octet-stream";
+		}
+		entity.setContentType(contentType);
+
+		return callWithBinary(url, entity);
+	}
+
 	private CallRet handleResult(HttpResponse response) {
 
 		if (response == null || response.getStatusLine() == null) {
@@ -100,19 +111,6 @@ private CallRet handleResult(HttpResponse response) {
 		return new CallRet(statusCode, responseBody);
 	}
 
-	private static byte[] encodeBase64Ex(byte[] src) {
-		byte[] b64 = Base64.encodeBase64(src); // urlsafe version is not supported in version 1.4 or lower.
-
-		for (int i = 0; i < b64.length; i++) {
-			if (b64[i] == '/') {
-				b64[i] = '_';
-			} else if (b64[i] == '+') {
-				b64[i] = '-';
-			}
-		}
-		return b64;
-	}
-
 	public static byte[] urlsafeEncodeBytes(byte[] src) {
 		if (src.length % 3 == 0) {
 			return encodeBase64Ex(src);//, false, true);
@@ -140,4 +138,33 @@ public static String urlsafeEncodeString(byte[] src) {
 	public static String urlsafeEncode(String text) {
 		return new String(urlsafeEncodeBytes(text.getBytes()));
 	}
+
+	private static byte[] encodeBase64Ex(byte[] src) {
+		byte[] b64 = Base64.encodeBase64(src); // urlsafe version is not supported in version 1.4 or lower.
+
+		for (int i = 0; i < b64.length; i++) {
+			if (b64[i] == '/') {
+				b64[i] = '_';
+			} else if (b64[i] == '+') {
+				b64[i] = '-';
+			}
+		}
+		return b64;
+	}
+
+	@SuppressWarnings("unchecked")
+	public static String encodeParams(Object params1) {
+		if (params1 instanceof String) {
+			return (String)params1;
+		}
+		if (params1 instanceof HashMap<?, ?>) {
+			HashMap<String, String> params = (HashMap<String, String>)params1;
+			ArrayList<NameValuePair> list = new ArrayList<NameValuePair>();
+			for (Entry<String, String> entry : params.entrySet()) {
+				list.add(new BasicNameValuePair(entry.getKey(), entry.getValue()));
+			}
+			return URLEncodedUtils.format(list, "UTF-8");
+		}
+		return null;
+	}
 }