Merge pull request #288 from NigelWu95/dev

Dev

Author: 吴炳亨

pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>com.qiniu</groupId>
     <artifactId>qsuits</artifactId>
-    <version>8.3.10</version>
+    <version>8.3.11</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/CommonParams.java

@@ -1249,6 +1249,8 @@ private void setSavePath() throws IOException {
             savePath = "local".equals(source) ? (path.endsWith(FileUtils.pathSeparator) ?
                     path.substring(0, path.length() - 1) : path) + "-result" : bucket;
             savePath = savePath.substring(savePath.lastIndexOf(FileUtils.pathSeparator) + 1);
+        } else {
+            savePath = FileUtils.convertToRealPath(savePath);
         }
         if (CloudApiUtils.isFileSource(source) && FileUtils.convertToRealPath(path).equals(FileUtils.convertToRealPath(savePath))) {
             throw new IOException(String.format("the save-path \"%s\" can not be same as path.", savePath));

src/main/java/com/qiniu/process/filtration/FilterProcess.java

@@ -125,7 +125,8 @@ public FilterProcess<T> clone() throws CloneNotSupportedException {
     @Override
     public void changeSaveOrder(String order) throws IOException {
         try {
-            this.fileSaveMapper.changePrefixAndSuffix(processName, order);
+            if (nextProcessor != null) nextProcessor.changeSaveOrder(order);
+            else fileSaveMapper.changePrefixAndSuffix(processName, order);
         } catch (NullPointerException e) {
             throw new IOException("instance without savePath can not call changeSaveOrder method.");
         }
@@ -148,7 +149,7 @@ public String processLine(T line) throws IOException {
             } else if (filter == null) { // 如果是关闭了那么 filter 应该为 null
                 throw new IOException("input is empty or the processor may be already closed.");
             } else {
-                throw new IOException("instance without savePath can not call this batch process method.");
+                throw new IOException(e.getMessage());
             }
         } catch (IOException e) {
             throw e;
@@ -182,8 +183,22 @@ public void processLine(List<T> list) throws IOException {
         // 默认在不进行进一步处理的情况下直接保存结果，如果需要进一步处理则不保存过滤的结果。
         if (nextProcessor == null) {
             List<String> writeList = typeConverter.convertToVList(filterList);
-            if (writeList.size() > 0) fileSaveMapper.writeSuccess(String.join("\n", writeList), false);
-            if (typeConverter.errorSize() > 0) fileSaveMapper.writeError(typeConverter.errorLines(), false);
+            try {
+                if (writeList.size() > 0) fileSaveMapper.writeSuccess(String.join("\n", writeList), false);
+                if (typeConverter.errorSize() > 0) fileSaveMapper.writeError(typeConverter.errorLines(), false);
+            } catch (NullPointerException e) {
+                if (canceled) {
+    //                // nothing to do
+                } else if (filter == null) { // 如果是关闭了那么 filter 应该为 null
+                    throw new IOException("input is empty or the processor may be already closed.");
+                } else {
+                    throw new IOException("instance without savePath can not call this batch process method.");
+                }
+            } catch (IOException e) {
+                throw e;
+            } catch (Exception e) {
+                throw new IOException(e.getMessage());
+            }
         } else {
             nextProcessor.processLine(filterList);
         }
@@ -194,6 +209,7 @@ public void closeResource() {
         filter = null;
         if (nextProcessor != null) nextProcessor.closeResource();
         savePath = null;
+        saveIndex = null;
         if (fileSaveMapper != null) fileSaveMapper.closeWriters();
         fileSaveMapper = null;
         typeConverter = null;

src/test/java/com/qiniu/process/aws/PrivateUrlTest.java

@@ -20,7 +20,7 @@ public void testProcessLine() throws Exception {
         String bucket = "7zmz4b";
         String region = "cn-east-1";
         String endpoint = "http://s3-cn-east-1.qiniucs.com";
-        PrivateUrl privateUrl = new PrivateUrl(accessKeyId, accessKeySecret, bucket, endpoint, region, 3600000, null, "~/Downloads");
+        PrivateUrl privateUrl = new PrivateUrl(accessKeyId, accessKeySecret, bucket, endpoint, region, false, 3600000, null, "~/Downloads");
         String result = privateUrl.singleResult(new HashMap<String, String>(){{
             put("key", "0000021");
         }});

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

@@ -1,6 +1,7 @@
 package com.qiniu.process.qiniu;
 
 import com.qiniu.config.PropertiesFile;
+import com.qiniu.storage.Configuration;
 import org.junit.Test;
 
 import java.io.IOException;
@@ -17,7 +18,7 @@ public void testSingleRefresh() throws IOException {
         PropertiesFile propertiesFile = new PropertiesFile("resources/.application.properties");
         String accessKey = propertiesFile.getValue("ak");
         String secretKey = propertiesFile.getValue("sk");
-        CdnUrlProcess cdnUrlProcess = new CdnUrlProcess(accessKey, secretKey, null, null, "url", false, false);
+        CdnUrlProcess cdnUrlProcess = new CdnUrlProcess(accessKey, secretKey, new Configuration(), null, null, "url", false, false);
         String result = cdnUrlProcess.singleResult(new HashMap<String, String>(){{
             put("url", "http://xxx.cn/upload/24790f63-0936-44c4-8695-a6d6b1dd8d91.jpg");
         }});
@@ -30,7 +31,7 @@ public void testBatchRefresh() throws IOException {
         PropertiesFile propertiesFile = new PropertiesFile("resources/.application.properties");
         String accessKey = propertiesFile.getValue("ak");
         String secretKey = propertiesFile.getValue("sk");
-        CdnUrlProcess cdnUrlProcess = new CdnUrlProcess(accessKey, secretKey, null, null, "url", true, false,
+        CdnUrlProcess cdnUrlProcess = new CdnUrlProcess(accessKey, secretKey, new Configuration(), null, null, "url", true, false,
                 "/Users/wubingheng/Downloads/refresh");
         List<Map<String, String>> list = new ArrayList<>();
 //        list.add(new HashMap<String, String>(){{
@@ -64,7 +65,7 @@ public void testBatchPrefetch() throws IOException {
         PropertiesFile propertiesFile = new PropertiesFile("resources/.application.properties");
         String accessKey = propertiesFile.getValue("ak");
         String secretKey = propertiesFile.getValue("sk");
-        CdnUrlProcess cdnUrlProcess = new CdnUrlProcess(accessKey, secretKey, null, null, "url", false, true,
+        CdnUrlProcess cdnUrlProcess = new CdnUrlProcess(accessKey, secretKey, new Configuration(), null, null, "url", false, true,
                 "/Users/wubingheng/Downloads/refresh");
         List<Map<String, String>> list = new ArrayList<>();
         list.add(new HashMap<String, String>(){{
@@ -85,7 +86,7 @@ public void testClone() throws IOException, CloneNotSupportedException {
         PropertiesFile propertiesFile = new PropertiesFile("resources/.application.properties");
         String accessKey = propertiesFile.getValue("ak");
         String secretKey = propertiesFile.getValue("sk");
-        CdnUrlProcess cdnUrlProcess = new CdnUrlProcess(accessKey, secretKey, null, null, "url", false, true,
+        CdnUrlProcess cdnUrlProcess = new CdnUrlProcess(accessKey, secretKey, new Configuration(), null, null, "url", false, true,
                 "/Users/wubingheng/Downloads/refresh");
         System.out.println(cdnUrlProcess);
         CdnUrlProcess cdnUrlProcess1 = cdnUrlProcess.clone();

src/test/java/com/qiniu/process/tencent/PrivateUrlTest.java

@@ -19,7 +19,7 @@ public void testProcessLine() throws Exception {
         String accessKeySecret = propertiesFile.getValue("ten-secret");
         String bucket = propertiesFile.getValue("bucket");
         String region = "ap-shanghai";
-        PrivateUrl privateUrl = new PrivateUrl(accessKeyId, accessKeySecret, bucket, region, 3600, null, "~/Downloads");
+        PrivateUrl privateUrl = new PrivateUrl(accessKeyId, accessKeySecret, bucket, region, false, 3600, null, "~/Downloads");
         String result = privateUrl.singleResult(new HashMap<String, String>(){{
             put("key", "24790f63-0936-44c4-8695-a6d6b1dd8d91.jpg");
         }});

version.properties

@@ -1 +1 @@
-version=8.3.10
+version=8.3.11