Merge branch 'master' into code-gen

# Conflicts:
#	src/main/java/com/qiniu/storage/Api.java
#	src/test/java/test/com/qiniu/processing/PfopTest.java

Author: YangSen-qn

src/main/java/com/qiniu/processing/OperationManager.java

@@ -217,10 +217,10 @@ public String pfop(String bucket, String key, String fops, String pipeline, Stri
      * @throws QiniuException 触发失败异常，包含错误响应等信息
      *                        <a href="http://developer.qiniu.com/dora/api/persistent-data-processing-pfop"> 相关链接 </a>
      */
-    public String pfop(String bucket, String key, String fops, String pipeline, String notifyURL, String type, boolean force)
+    public String pfop(String bucket, String key, String fops, String pipeline, String notifyURL, Integer type, boolean force)
             throws QiniuException {
         StringMap params = new StringMap()
-                .putNotEmpty("type", type)
+                .putNotNull("type", type)
                 .putNotEmpty("pipeline", pipeline)
                 .putNotEmpty("notifyURL", notifyURL)
                 .putWhen("force", 1, force);

src/main/java/com/qiniu/processing/OperationStatus.java

@@ -45,7 +45,7 @@ public class OperationStatus {
      * 0：非闲时任务
      * 1：显示任务
      */
-    public String type;
+    public Integer type;
 
     /**
      * 任务创建时间

src/test/java/test/com/qiniu/processing/PfopTest.java

@@ -141,7 +141,7 @@ private void testPfopIsSuccess(String jobid) {
 
     @Test
     @Tag("IntegrationTest")
-    void testPfopA() {
+    void testPfopWithType() {
         try {
             Auth auth = TestConfig.testAuth;
             Map<String, Region> bucketKeyMap = new HashMap<String, Region>();
@@ -155,13 +155,13 @@ void testPfopA() {
 
                 Configuration cfg = new Configuration(region);
                 OperationManager operationManager = new OperationManager(auth, cfg);
-                String jobID = operationManager.pfop(bucket, TestConfig.testMp4FileKey, "avinfo", "", "", "1", true);
+                String jobID = operationManager.pfop(bucket, TestConfig.testMp4FileKey, "avinfo", "", "", 1, true);
 
                 OperationStatus status = operationManager.prefop(bucket, jobID);
                 assertNotNull(status, "1. prefop type error");
                 assertNotNull(status.creationDate, "1. prefop type error");
                 assertTrue(status.code == 0 || status.code == 1 || status.code == 3, "2. prefop type error");
-                assertEquals("1", status.type, "3. prefop type error");
+                assertEquals(1, (int) status.type, "3. prefop type error");
             }
 
         } catch (QiniuException ex) {