Merge pull request #170 from simon-liubin/fix/entity

 entry除了fetch接口外，其它都包含分号:

Author: longbai

src/main/java/com/qiniu/storage/BucketManager.java

@@ -37,9 +37,24 @@ public BucketManager(Auth auth) {
      * @return urlsafe_base64_encode(Bucket:Key)
      */
     public static String entry(String bucket, String key) {
-        String en = bucket;
-        if (key != null) {
-            en = bucket + ":" + key;
+        return entry(bucket, key, true);
+    }
+
+
+    /**
+     * EncodedEntryURI格式
+     * 当 mustHaveKey 为 false， 且 key 为 null 时，返回 urlsafe_base64_encode(Bucket);
+     * 其它条件下返回  urlsafe_base64_encode(Bucket:Key)
+     *
+     * @param bucket
+     * @param key
+     * @param mustHaveKey
+     * @return urlsafe_base64_encode(entry)
+     */
+    public static String entry(String bucket, String key, boolean mustHaveKey) {
+        String en = bucket + ":" + key;
+        if (!mustHaveKey && (key == null)) {
+            en = bucket;
         }
         return UrlSafeBase64.encodeToString(en);
     }
@@ -207,7 +222,7 @@ public DefaultPutRet fetch(String url, String bucket) throws QiniuException {
      */
     public DefaultPutRet fetch(String url, String bucket, String key) throws QiniuException {
         String resource = UrlSafeBase64.encodeToString(url);
-        String to = entry(bucket, key);
+        String to = entry(bucket, key, false);
         String path = "/fetch/" + resource + "/to/" + to;
         Response r = ioPost(path);
         return r.jsonToObject(DefaultPutRet.class);

src/test/java/com/qiniu/storage/BucketTest.java

@@ -79,6 +79,13 @@ public void testStat() {
             assertEquals(612, e.code());
         }
 
+        try {
+            bucketManager.stat(TestConfig.bucket, null);
+            fail();
+        } catch (QiniuException e) {
+            assertEquals(612, e.code());
+        }
+
         try {
             bucketManager.stat("noBucket", "noFile");
             fail();
@@ -95,6 +102,20 @@ public void testDelete() {
         } catch (QiniuException e) {
             assertEquals(612, e.code());
         }
+
+        try {
+            bucketManager.delete(TestConfig.bucket, null);
+            fail();
+        } catch (QiniuException e) {
+            assertEquals(612, e.code());
+        }
+
+        try {
+            bucketManager.delete("noBucket", null);
+            fail();
+        } catch (QiniuException e) {
+            assertEquals(631, e.code());
+        }
     }
 
     @Test
@@ -149,7 +170,6 @@ public void testFetch() {
             bucketManager.fetch("http://developer.qiniu.com/docs/v6/sdk/java-sdk.html",
                     TestConfig.bucket, "fetch.html");
         } catch (QiniuException e) {
-            e.printStackTrace();
             fail();
         }
     }