new BucketManager.Batch()

Author: sxci

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

@@ -137,14 +137,10 @@ private Response post(String url, byte[] body) throws QiniuException {
         return client.post(url, body, headers, Client.FormMime);
     }
 
-    public static Batch createBatch() {
-        return new Batch();
-    }
-
     public static class Batch {
         private ArrayList<String> ops;
 
-        private Batch() {
+        public Batch() {
             this.ops = new ArrayList<String>();
         }
 
@@ -184,6 +180,11 @@ public byte[] toBody() {
             String body = StringUtils.join(ops, "&op=", "op=");
             return StringUtils.utf8Bytes(body);
         }
+
+        public Batch merge(Batch batch) {
+            this.ops.addAll(batch.ops);
+            return this;
+        }
     }
 
     public class FileListIterator implements Iterator<FileInfo[]> {

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

@@ -158,7 +158,7 @@ public void testFetch() {
     @Test
     public void testBatchCopy() {
         String key = "copyTo" + Math.random();
-        BucketManager.Batch ops = BucketManager.createBatch().
+        BucketManager.Batch ops = new BucketManager.Batch().
                 copy(TestConfig.bucket, TestConfig.key, TestConfig.bucket, key);
         try {
             Response r = bucketManager.batch(ops);
@@ -168,7 +168,7 @@ public void testBatchCopy() {
             e.printStackTrace();
             fail();
         }
-        ops = BucketManager.createBatch().delete(TestConfig.bucket, key);
+        ops = new BucketManager.Batch().delete(TestConfig.bucket, key);
         try {
             Response r = bucketManager.batch(ops);
             BatchStatus[] bs = r.jsonToObject(BatchStatus[].class);
@@ -189,7 +189,7 @@ public void testBatchMove() {
         }
         String key2 = key + "to";
         StringMap x = new StringMap().put(key, key2);
-        BucketManager.Batch ops = BucketManager.createBatch().move(TestConfig.bucket,
+        BucketManager.Batch ops = new BucketManager.Batch().move(TestConfig.bucket,
                 key, TestConfig.bucket, key2);
         try {
             Response r = bucketManager.batch(ops);
@@ -217,7 +217,7 @@ public void testBatchRename() {
             fail();
         }
         String key2 = key + "to";
-        BucketManager.Batch ops = BucketManager.createBatch().rename(TestConfig.bucket, key, key2);
+        BucketManager.Batch ops = new BucketManager.Batch().rename(TestConfig.bucket, key, key2);
         try {
             Response r = bucketManager.batch(ops);
             BatchStatus[] bs = r.jsonToObject(BatchStatus[].class);
@@ -237,7 +237,7 @@ public void testBatchRename() {
     @Test
     public void testBatchStat() {
         String[] array = {"java-sdk.html"};
-        BucketManager.Batch ops = BucketManager.createBatch().stat(TestConfig.bucket, array);
+        BucketManager.Batch ops = new BucketManager.Batch().stat(TestConfig.bucket, array);
         try {
             Response r = bucketManager.batch(ops);
             BatchStatus[] bs = r.jsonToObject(BatchStatus[].class);
@@ -267,7 +267,7 @@ public void testBatch() {
             fail();
         }
 
-        BucketManager.Batch ops = BucketManager.createBatch()
+        BucketManager.Batch ops = new BucketManager.Batch()
                 .copy(TestConfig.bucket, TestConfig.key, TestConfig.bucket, key)
                 .move(TestConfig.bucket, key1, TestConfig.bucket, key2)
                 .rename(TestConfig.bucket, key3, key4)