Merge pull request #293 from NigelWu95/dev

add notifyURL and force parameters for qiniu pfop process and release…

Author: 吴炳亨

Makefile

@@ -1,4 +1,4 @@
-version=8.3.15
+version=8.3.16
 
 package_no_test:
 	mvn package -Dmaven.test.skip=true

docs/pfop.md

@@ -15,6 +15,8 @@ sk=
 bucket=
 indexes=
 pipeline=
+notifyURL=
+force=
 force-public=
 fops-index=
 pfop-config=
@@ -28,7 +30,9 @@ pfop-config=
 |bucket| 字符串| 操作的资源原空间，当数据源为 qiniu 时无需再设置|  
 |indexes|字符串| 设置输入行中 key 字段的下标（有默认值），参考[数据源 indexes 设置](datasource.md#1-公共参数)|  
 |pipeline| 字符串| 进行持久化数据处理的队列名称|  
-|force-public| true/false| 是否强制使用共有队列（会有性能影响）|  
+|notifyURL| URL 字符串| 进行持久化结果回调的服务器通知地址，接受七牛的 POST 回调请求|  
+|force| true/false| 持久化生成的文件名如果空间中已存在是否进行强制覆盖，默认为 false|  
+|force-public| true/false| 是否强制使用共有队列（会有性能影响），未指定 pipeline 的情况需要设置为 true|  
 |fops-index| 字符串| 转码命令索引（下标），pfop 操作时指定，明确指定文件名对应的转码命令，建议命令中携带 saveas 重命名指令否则使用默认名|  
 |pfop-config| 文件路径字符串| 进行转码和另存规则设置的 json 配置文件路径，可设置多个转码条件和指令，该配置会覆盖 fops-index 设置的转码命令，[配置写法](#pfop-config-配置文件)|  
 |cmd| 字符串| pfop 命令，如 avthumb/mp4，和 pfop-config 中的 cmd 相同，如果不想设置 pfop-config 配置文件则可采用 cmd + saveas 设置的方式|  

pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>com.qiniu</groupId>
     <artifactId>qsuits</artifactId>
-    <version>8.3.15</version>
+    <version>8.3.16</version>
     <name>qsuits</name>
     <description>qiniu-suits is a efficient tools for qiniu api implemented by java8.</description>
     <url>https://github.com/NigelWu95/qiniu-suits-java</url>

src/main/java/com/qiniu/entry/QSuitsEntry.java

@@ -689,7 +689,7 @@ private ILineProcess<Map<String, String>> getPfopCommand(Map<String, String> ind
         String size = entryParam.getValue("size", "false").trim();
         ParamsUtils.checked(size, "size", "(true|false)");
         String combine = entryParam.getValue("combine", "true").trim();
-        ParamsUtils.checked(size, "combine", "(true|false)");
+        ParamsUtils.checked(combine, "combine", "(true|false)");
         String configJson = entryParam.getValue("pfop-config", "").trim();
         List<JsonObject> pfopConfigs = commonParams.getPfopConfigs();
         return single ? new PfopCommand(getNewQiniuConfig(), avinfoIndex, Boolean.parseBoolean(duration), Boolean.parseBoolean(size),
@@ -700,6 +700,9 @@ private ILineProcess<Map<String, String>> getPfopCommand(Map<String, String> ind
 
     private ILineProcess<Map<String, String>> getPfop(Map<String, String> indexMap, boolean single) throws IOException {
         String pipeline = entryParam.getValue("pipeline", "").trim();
+        String notifyURL = entryParam.getValue("notifyURL", "").trim();
+        String force = entryParam.getValue("force", "false").trim();
+        ParamsUtils.checked(force, "force", "(true|false)");
         String forcePublic = entryParam.getValue("force-public", "false").trim();
         if (pipeline.isEmpty() && !"true".equals(forcePublic)) {
             throw new IOException("please set pipeline, if you don't want to use" +
@@ -708,10 +711,10 @@ private ILineProcess<Map<String, String>> getPfop(Map<String, String> indexMap,
         String configJson = entryParam.getValue("pfop-config", "").trim();
         List<JsonObject> pfopConfigs = commonParams.getPfopConfigs();
         String fopsIndex = indexMap.containsValue("fops") ? "fops" : null;
-        return single ? new QiniuPfop(qiniuAccessKey, qiniuSecretKey, getQiniuConfig(), bucket, pipeline, configJson,
-                pfopConfigs, fopsIndex)
-                : new QiniuPfop(qiniuAccessKey, qiniuSecretKey, getQiniuConfig(), bucket, pipeline, configJson, pfopConfigs,
-                fopsIndex, savePath);
+        return single ? new QiniuPfop(qiniuAccessKey, qiniuSecretKey, getQiniuConfig(), bucket, pipeline, notifyURL,
+                Boolean.parseBoolean(force), configJson, pfopConfigs, fopsIndex)
+                : new QiniuPfop(qiniuAccessKey, qiniuSecretKey, getQiniuConfig(), bucket, pipeline, notifyURL,
+                Boolean.parseBoolean(force), configJson, pfopConfigs, fopsIndex, savePath);
     }
 
     private ILineProcess<Map<String, String>> getPfopResult(Map<String, String> indexMap, boolean single) throws IOException {

src/main/java/com/qiniu/process/qiniu/QiniuPfop.java

@@ -23,32 +23,37 @@ public class QiniuPfop extends Base<Map<String, String>> {
     private OperationManager operationManager;
 
     public QiniuPfop(String accessKey, String secretKey, Configuration configuration, String bucket, String pipeline,
-                     String pfopJsonPath, List<JsonObject> pfopConfigs, String fopsIndex) throws IOException {
+                     String notifyURL, boolean force, String pfopJsonPath, List<JsonObject> pfopConfigs,
+                     String fopsIndex) throws IOException {
         super("pfop", accessKey, secretKey, bucket);
-        set(configuration, pipeline, pfopJsonPath, pfopConfigs, fopsIndex);
+        set(configuration, pipeline, notifyURL, force, pfopJsonPath, pfopConfigs, fopsIndex);
         this.operationManager = new OperationManager(Auth.create(accessKey, secretKey), configuration.clone());
         CloudApiUtils.checkQiniu(accessKey, secretKey, configuration, bucket);
     }
 
     public QiniuPfop(String accessKey, String secretKey, Configuration configuration, String bucket, String pipeline,
-                     String pfopJsonPath, List<JsonObject> pfopConfigs, String fopsIndex, String savePath,
-                     int saveIndex) throws IOException {
+                     String notifyURL, boolean force, String pfopJsonPath, List<JsonObject> pfopConfigs,
+                     String fopsIndex, String savePath, int saveIndex) throws IOException {
         super("pfop", accessKey, secretKey, bucket, savePath, saveIndex);
-        set(configuration, pipeline, pfopJsonPath, pfopConfigs, fopsIndex);
+        set(configuration, pipeline, notifyURL, force, pfopJsonPath, pfopConfigs, fopsIndex);
         this.operationManager = new OperationManager(Auth.create(accessKey, secretKey), configuration.clone());
         CloudApiUtils.checkQiniu(accessKey, secretKey, configuration, bucket);
     }
 
     public QiniuPfop(String accessKey, String secretKey, Configuration configuration, String bucket, String pipeline,
-                     String pfopJsonPath, List<JsonObject> pfopConfigs, String fopsIndex, String savePath)
-            throws IOException {
-        this(accessKey, secretKey, configuration, bucket, pipeline, pfopJsonPath, pfopConfigs, fopsIndex, savePath, 0);
+                     String notifyURL, boolean force, String pfopJsonPath, List<JsonObject> pfopConfigs,
+                     String fopsIndex, String savePath) throws IOException {
+        this(accessKey, secretKey, configuration, bucket, pipeline, notifyURL, force, pfopJsonPath, pfopConfigs,
+                fopsIndex, savePath, 0);
     }
 
-    private void set(Configuration configuration, String pipeline, String pfopJsonPath, List<JsonObject> pfopConfigs,
-                     String fopsIndex) throws IOException {
+    private void set(Configuration configuration, String pipeline, String notifyURL, boolean force, String pfopJsonPath,
+                     List<JsonObject> pfopConfigs, String fopsIndex) throws IOException {
         this.configuration = configuration;
-        this.pfopParams = new StringMap().putNotEmpty("pipeline", pipeline);
+        this.pfopParams = new StringMap()
+                .putNotEmpty("pipeline", pipeline)
+                .putNotEmpty("notifyURL", notifyURL)
+                .putWhen("force", 1, force);
         if (pfopConfigs != null && pfopConfigs.size() > 0) {
             this.pfopConfigs = pfopConfigs;
         } else if (pfopJsonPath != null && !"".equals(pfopJsonPath)) {

src/test/java/com/qiniu/process/qiniu/ProcessTest.java

@@ -25,7 +25,7 @@ public void init() throws IOException {
 //                propertiesFile.getValue("bucket");
         moveFile = new MoveFile(accessKey, secretKey, new Configuration(), bucket, bucket, "to-key", null, null, true);
         statFile = new StatFile(accessKey, secretKey, new Configuration(), bucket, "tab", "\t", null);
-        qiniuPfop = new QiniuPfop(accessKey, secretKey, new Configuration(), bucket, null, null, null, "1");
+        qiniuPfop = new QiniuPfop(accessKey, secretKey, new Configuration(), bucket, null, null, false, null, null, "1");
     }
 
     @Test

version.properties

@@ -1 +1 @@
-version=8.3.15
+version=8.3.16