本地检测不通过、程序抛异常, 状态码设置为 0

sxci · sxci · commit 19f9e7e2ee69 · 2014-05-29T15:01:58.000+08:00
diff --git a/src/main/java/com/qiniu/api/config/Config.java b/src/main/java/com/qiniu/api/config/Config.java
@@ -6,6 +6,8 @@
  */
 public class Config {
 	public static final String CHARSET = "utf-8";
+	/**本地检测不通过、程序抛异常，设置 CallRet 的 statusCode 为此错误码*/
+	public static final int ERROR_CODE = 0;
 	
 	public static String USER_AGENT="qiniu java-sdk v6.0.0";
 	
diff --git a/src/main/java/com/qiniu/api/io/IoApi.java b/src/main/java/com/qiniu/api/io/IoApi.java
@@ -30,7 +30,7 @@ private static PutRet put(String uptoken, String key, File file,
 			PutExtra extra) {
 		
 		if (!file.exists() || !file.canRead()) {
-			return new PutRet(new CallRet(400, new Exception(
+			return new PutRet(new CallRet(Config.ERROR_CODE, new Exception(
 					"File does not exist or not readable.")));
 		}
 		MultipartEntity requestEntity = new MultipartEntity();
@@ -42,7 +42,7 @@ private static PutRet put(String uptoken, String key, File file,
 			setParam(requestEntity, extra.params);
 			if (extra.checkCrc != NO_CRC32) {
 				if (extra.crc32 == 0) {
-					return new PutRet(new CallRet(400, new Exception("no crc32 specified!")));
+					return new PutRet(new CallRet(Config.ERROR_CODE, new Exception("no crc32 specified!")));
 				}
 				requestEntity.addPart("crc32", new StringBody(extra.crc32 + ""));
 			}
@@ -54,7 +54,7 @@ private static PutRet put(String uptoken, String key, File file,
 			}
 		} catch (Exception e) {
 			e.printStackTrace();
-			return new PutRet(new CallRet(400, e));
+			return new PutRet(new CallRet(Config.ERROR_CODE, e));
 		}
 
 		String url = Config.UP_HOST;
@@ -95,13 +95,13 @@ private static PutRet putStream(String uptoken, String key, InputStream reader,P
 			setParam(requestEntity, extra.params);
 			if (extra.checkCrc != NO_CRC32) {
 				if (extra.crc32 == 0) {
-					return new PutRet(new CallRet(400, new Exception("no crc32 specified!")));
+					return new PutRet(new CallRet(Config.ERROR_CODE, new Exception("no crc32 specified!")));
 				}
 				requestEntity.addPart("crc32", new StringBody(extra.crc32 + ""));
 			}
 		} catch (Exception e) {
 			e.printStackTrace();
-			return new PutRet(new CallRet(400, e));
+			return new PutRet(new CallRet(Config.ERROR_CODE, e));
 		}
 
 		String url = Config.UP_HOST;
@@ -138,7 +138,7 @@ public static PutRet putFile(String uptoken, String key, String fileName, PutExt
 			try {
 				extra.crc32 = getCRC32(file);
 			} catch (Exception e) {
-				return new PutRet(new CallRet(400, e));
+				return new PutRet(new CallRet(Config.ERROR_CODE, e));
 			}
 		}
 		return put(uptoken, key, file, extra);
diff --git a/src/main/java/com/qiniu/api/net/Client.java b/src/main/java/com/qiniu/api/net/Client.java
@@ -51,7 +51,7 @@ public CallRet call(String url) {
 			return handleResult(response);
 		} catch (Exception e) {
 			e.printStackTrace();
-			return new CallRet(400, e);
+			return new CallRet(Config.ERROR_CODE, e);
 		}
 	}
 
@@ -78,7 +78,7 @@ public CallRet call(String url, List<NameValuePair> nvps) {
 			return handleResult(response);
 		} catch (Exception e) {
 			e.printStackTrace();
-			return new CallRet(400, e);
+			return new CallRet(Config.ERROR_CODE, e);
 		}
 	}
 
@@ -99,7 +99,7 @@ public CallRet callWithBinary(String url, AbstractHttpEntity entity) {
 			return handleResult(response);
 		} catch (Exception e) {
 			e.printStackTrace();
-			return new CallRet(400, e);
+			return new CallRet(Config.ERROR_CODE, e);
 		}
 	}
 
@@ -142,7 +142,7 @@ public CallRet callWithMultiPart(String url, MultipartEntity requestEntity) {
 			return handleResult(response);
 		} catch (Exception e) {
 			e.printStackTrace();
-			return new CallRet(400, e);
+			return new CallRet(Config.ERROR_CODE, e);
 		}
 	}
 
@@ -155,19 +155,19 @@ public CallRet callWithMultiPart(String url, MultipartEntity requestEntity) {
 	 */
 	private CallRet handleResult(HttpResponse response) {
 		if (response == null || response.getStatusLine() == null) {
-			return new CallRet(400, "No response");
+			return new CallRet(Config.ERROR_CODE, "No response");
 		}
 
 		String responseBody;
 		try {
 			responseBody = EntityUtils.toString(response.getEntity(),"UTF-8");
 		} catch (Exception e) {
 			e.printStackTrace();
-			return new CallRet(400, e);
+			return new CallRet(Config.ERROR_CODE, e);
 		}
 
 		StatusLine status = response.getStatusLine();
-		int statusCode = (status == null) ? 400 : status.getStatusCode();
+		int statusCode = (status == null) ? Config.ERROR_CODE : status.getStatusCode();
 		return new CallRet(statusCode, responseBody);
 	}
 
diff --git a/src/main/java/com/qiniu/api/resumableio/UploadBlock.java b/src/main/java/com/qiniu/api/resumableio/UploadBlock.java
@@ -5,6 +5,8 @@
 import org.apache.http.client.HttpClient;
 import org.apache.http.client.methods.HttpPost;
 
+import com.qiniu.api.config.Config;
+
 
 public abstract class UploadBlock  {
     public static int CHUNK_SIZE = 1024 * 256;
@@ -78,7 +80,7 @@ private ChunkUploadCallRet upload(String url, int start,int len, int time)  {
             
             return checkAndRetryUpload(url, start, len, time, ret);
 		} catch (Exception e) {
-			return new ChunkUploadCallRet(400, e);
+			return new ChunkUploadCallRet(Config.ERROR_CODE, e);
 		}
     }
 
diff --git a/src/main/java/com/qiniu/api/resumableio/Util.java b/src/main/java/com/qiniu/api/resumableio/Util.java
@@ -26,7 +26,7 @@ public static CallRet handleResult(HttpResponse response) {
                     response.getEntity(), "utf-8");
             return new CallRet(statusCode, responseBody);
         } catch (Exception e) {
-            CallRet ret = new CallRet(400, "can not load response.");
+            CallRet ret = new CallRet(Config.ERROR_CODE, "can not load response.");
             ret.exception = e;
             return ret;
         }

Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,7 @@ private static PutRet put(String uptoken, String key, File file,`
`30`	`30`	`PutExtra extra) {`
`31`	`31`
`32`	`32`	`if (!file.exists() \|\| !file.canRead()) {`
`33`		`- return new PutRet(new CallRet(400, new Exception(`
	`33`	`+ return new PutRet(new CallRet(Config.ERROR_CODE, new Exception(`
`34`	`34`	`"File does not exist or not readable.")));`
`35`	`35`	`}`
`36`	`36`	`MultipartEntity requestEntity = new MultipartEntity();`
`@@ -42,7 +42,7 @@ private static PutRet put(String uptoken, String key, File file,`
`42`	`42`	`setParam(requestEntity, extra.params);`
`43`	`43`	`if (extra.checkCrc != NO_CRC32) {`
`44`	`44`	`if (extra.crc32 == 0) {`
`45`		`- return new PutRet(new CallRet(400, new Exception("no crc32 specified!")));`
	`45`	`+ return new PutRet(new CallRet(Config.ERROR_CODE, new Exception("no crc32 specified!")));`
`46`	`46`	`}`
`47`	`47`	`requestEntity.addPart("crc32", new StringBody(extra.crc32 + ""));`
`48`	`48`	`}`
`@@ -54,7 +54,7 @@ private static PutRet put(String uptoken, String key, File file,`
`54`	`54`	`}`
`55`	`55`	`} catch (Exception e) {`
`56`	`56`	`e.printStackTrace();`
`57`		`- return new PutRet(new CallRet(400, e));`
	`57`	`+ return new PutRet(new CallRet(Config.ERROR_CODE, e));`
`58`	`58`	`}`
`59`	`59`
`60`	`60`	`String url = Config.UP_HOST;`
`@@ -95,13 +95,13 @@ private static PutRet putStream(String uptoken, String key, InputStream reader,P`
`95`	`95`	`setParam(requestEntity, extra.params);`
`96`	`96`	`if (extra.checkCrc != NO_CRC32) {`
`97`	`97`	`if (extra.crc32 == 0) {`
`98`		`- return new PutRet(new CallRet(400, new Exception("no crc32 specified!")));`
	`98`	`+ return new PutRet(new CallRet(Config.ERROR_CODE, new Exception("no crc32 specified!")));`
`99`	`99`	`}`
`100`	`100`	`requestEntity.addPart("crc32", new StringBody(extra.crc32 + ""));`
`101`	`101`	`}`
`102`	`102`	`} catch (Exception e) {`
`103`	`103`	`e.printStackTrace();`
`104`		`- return new PutRet(new CallRet(400, e));`
	`104`	`+ return new PutRet(new CallRet(Config.ERROR_CODE, e));`
`105`	`105`	`}`
`106`	`106`
`107`	`107`	`String url = Config.UP_HOST;`
`@@ -138,7 +138,7 @@ public static PutRet putFile(String uptoken, String key, String fileName, PutExt`
`138`	`138`	`try {`
`139`	`139`	`extra.crc32 = getCRC32(file);`
`140`	`140`	`} catch (Exception e) {`
`141`		`- return new PutRet(new CallRet(400, e));`
	`141`	`+ return new PutRet(new CallRet(Config.ERROR_CODE, e));`
`142`	`142`	`}`
`143`	`143`	`}`
`144`	`144`	`return put(uptoken, key, file, extra);`
Original file line number	Diff line number	Diff line change
`@@ -51,7 +51,7 @@ public CallRet call(String url) {`
`51`	`51`	`return handleResult(response);`
`52`	`52`	`} catch (Exception e) {`
`53`	`53`	`e.printStackTrace();`
`54`		`- return new CallRet(400, e);`
	`54`	`+ return new CallRet(Config.ERROR_CODE, e);`
`55`	`55`	`}`
`56`	`56`	`}`
`57`	`57`
`@@ -78,7 +78,7 @@ public CallRet call(String url, List<NameValuePair> nvps) {`
`78`	`78`	`return handleResult(response);`
`79`	`79`	`} catch (Exception e) {`
`80`	`80`	`e.printStackTrace();`
`81`		`- return new CallRet(400, e);`
	`81`	`+ return new CallRet(Config.ERROR_CODE, e);`
`82`	`82`	`}`
`83`	`83`	`}`
`84`	`84`
`@@ -99,7 +99,7 @@ public CallRet callWithBinary(String url, AbstractHttpEntity entity) {`
`99`	`99`	`return handleResult(response);`
`100`	`100`	`} catch (Exception e) {`
`101`	`101`	`e.printStackTrace();`
`102`		`- return new CallRet(400, e);`
	`102`	`+ return new CallRet(Config.ERROR_CODE, e);`
`103`	`103`	`}`
`104`	`104`	`}`
`105`	`105`
`@@ -142,7 +142,7 @@ public CallRet callWithMultiPart(String url, MultipartEntity requestEntity) {`
`142`	`142`	`return handleResult(response);`
`143`	`143`	`} catch (Exception e) {`
`144`	`144`	`e.printStackTrace();`
`145`		`- return new CallRet(400, e);`
	`145`	`+ return new CallRet(Config.ERROR_CODE, e);`
`146`	`146`	`}`
`147`	`147`	`}`
`148`	`148`
`@@ -155,19 +155,19 @@ public CallRet callWithMultiPart(String url, MultipartEntity requestEntity) {`
`155`	`155`	`*/`
`156`	`156`	`private CallRet handleResult(HttpResponse response) {`
`157`	`157`	`if (response == null \|\| response.getStatusLine() == null) {`
`158`		`- return new CallRet(400, "No response");`
	`158`	`+ return new CallRet(Config.ERROR_CODE, "No response");`
`159`	`159`	`}`
`160`	`160`
`161`	`161`	`String responseBody;`
`162`	`162`	`try {`
`163`	`163`	`responseBody = EntityUtils.toString(response.getEntity(),"UTF-8");`
`164`	`164`	`} catch (Exception e) {`
`165`	`165`	`e.printStackTrace();`
`166`		`- return new CallRet(400, e);`
	`166`	`+ return new CallRet(Config.ERROR_CODE, e);`
`167`	`167`	`}`
`168`	`168`
`169`	`169`	`StatusLine status = response.getStatusLine();`
`170`		`- int statusCode = (status == null) ? 400 : status.getStatusCode();`
	`170`	`+ int statusCode = (status == null) ? Config.ERROR_CODE : status.getStatusCode();`
`171`	`171`	`return new CallRet(statusCode, responseBody);`
`172`	`172`	`}`
`173`	`173`
Original file line number	Diff line number	Diff line change
`@@ -5,6 +5,8 @@`
`5`	`5`	`import org.apache.http.client.HttpClient;`
`6`	`6`	`import org.apache.http.client.methods.HttpPost;`
`7`	`7`
	`8`	`+import com.qiniu.api.config.Config;`
	`9`	`+`
`8`	`10`
`9`	`11`	`public abstract class UploadBlock {`
`10`	`12`	`public static int CHUNK_SIZE = 1024 * 256;`
`@@ -78,7 +80,7 @@ private ChunkUploadCallRet upload(String url, int start,int len, int time) {`
`78`	`80`
`79`	`81`	`return checkAndRetryUpload(url, start, len, time, ret);`
`80`	`82`	`} catch (Exception e) {`
`81`		`- return new ChunkUploadCallRet(400, e);`
	`83`	`+ return new ChunkUploadCallRet(Config.ERROR_CODE, e);`
`82`	`84`	`}`
`83`	`85`	`}`
`84`	`86`
Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@ public static CallRet handleResult(HttpResponse response) {`
`26`	`26`	`response.getEntity(), "utf-8");`
`27`	`27`	`return new CallRet(statusCode, responseBody);`
`28`	`28`	`} catch (Exception e) {`
`29`		`- CallRet ret = new CallRet(400, "can not load response.");`
	`29`	`+ CallRet ret = new CallRet(Config.ERROR_CODE, "can not load response.");`
`30`	`30`	`ret.exception = e;`
`31`	`31`	`return ret;`
`32`	`32`	`}`