update batch image auditing api

markjrzhang · markjrzhang · commit 96bed81136eb · 2021-09-09T16:45:59.000+08:00
diff --git a/src/main/java/com/qcloud/cos/COSClient.java b/src/main/java/com/qcloud/cos/COSClient.java
@@ -3840,10 +3840,13 @@ public ImageAuditingResponse imageAuditing(ImageAuditingRequest imageAuditingReq
                 "The imageAuditingRequest parameter must be specified setting the object tags");
         rejectNull(imageAuditingRequest.getBucketName(),
                 "The bucketName parameter must be specified setting the object tags");
-        rejectNull(imageAuditingRequest.getDetectType(), "The detectType parameter must be specified setting the object tags");
+        String detectType = imageAuditingRequest.getDetectType();
+        rejectNull(detectType, "The detectType parameter must be specified setting the object tags");
         CosHttpRequest<ImageAuditingRequest> request = createRequest(imageAuditingRequest.getBucketName(), imageAuditingRequest.getObjectKey(), imageAuditingRequest, HttpMethodName.GET);
         request.addParameter("ci-process", "sensitive-content-recognition");
-        addParameterIfNotNull(request, "detect-type", imageAuditingRequest.getDetectType());
+        if ("all".equalsIgnoreCase(detectType))
+            detectType = "porn,terrorist,politics,ads";
+        addParameterIfNotNull(request, "detect-type", detectType);
         addParameterIfNotNull(request, "interval", Integer.toString(imageAuditingRequest.getInterval()));
         addParameterIfNotNull(request, "max-frames", Integer.toString(imageAuditingRequest.getMaxFrames()));
         addParameterIfNotNull(request, "biz-type", imageAuditingRequest.getBizType());
diff --git a/src/main/java/com/qcloud/cos/demo/ci/ImageAuditingDemo.java b/src/main/java/com/qcloud/cos/demo/ci/ImageAuditingDemo.java
@@ -4,8 +4,8 @@
 import com.qcloud.cos.model.ciModel.auditing.AuditingInfo;
 import com.qcloud.cos.model.ciModel.auditing.ImageAuditingRequest;
 import com.qcloud.cos.model.ciModel.auditing.ImageAuditingResponse;
-import com.qcloud.cos.model.ciModel.image.ImageLabelRequest;
-import com.qcloud.cos.transfer.CIPostJob;
+import com.qcloud.cos.transfer.ImageAuditingImpl;
+import com.qcloud.cos.transfer.MultipleImageAuditingImpl;
 import com.qcloud.cos.transfer.TransferManager;
 
 import java.util.ArrayList;
@@ -18,11 +18,12 @@
  */
 public class ImageAuditingDemo {
 
-    public static void main(String[] args) {
+    public static void main(String[] args) throws InterruptedException {
         // 1 初始化用户身份信息（secretId, secretKey）。
         COSClient client = ClientUtils.getTestClient();
         // 2 调用要使用的方法。
-        imageAuditing(client);
+//        imageAuditing(client);
+        batchPostImageAuditing(client);
     }
 
     /**
@@ -35,37 +36,61 @@ public static void imageAuditing(COSClient client) {
         ImageAuditingRequest request = new ImageAuditingRequest();
         //2.添加请求参数 参数详情请见api接口文档
         //2.1设置请求bucket
-        request.setBucketName("demo-123456789");
+        request.setBucketName("markjrzhang-1251704708");
         //2.2设置审核类型
         request.setDetectType("porn");
         //2.3设置bucket中的图片位置
-        request.setObjectKey("1.png");
+        request.setObjectKey("1.jpg");
         //3.调用接口,获取任务响应对象
         ImageAuditingResponse response = client.imageAuditing(request);
         //4调用工具类，获取各审核类型详情集合 (也可自行根据业务解析)
         List<AuditingInfo> imageInfoList = AuditingResultUtil.getImageInfoList(response);
+        System.out.println(response);
     }
 
     /**
      * 批量获取图片标签
      */
-    protected static void batchPostImageAuditing(COSClient client) {
+    public static void batchPostImageAuditing(COSClient client) throws InterruptedException {
         List<ImageAuditingRequest> requestList = new ArrayList<>();
         ImageAuditingRequest request = new ImageAuditingRequest();
-        request.setBucketName("demo-123456789");
+        request.setBucketName("markjrzhang-1251704708");
         request.setObjectKey("1.png");
+        request.setDetectType("all");
+        requestList.add(request);
+
+        request = new ImageAuditingRequest();
+        request.setBucketName("markjrzhang-1251704708");
+        request.setObjectKey("1.jpg");
+        request.setDetectType("all");
+        requestList.add(request);
+
+        request = new ImageAuditingRequest();
+        request.setBucketName("markjrzhang-1251704708");
+        request.setObjectKey("1.jpg");
+        request.setDetectType("all");
         requestList.add(request);
 
         request = new ImageAuditingRequest();
-        request.setBucketName("demo-123456789");
-        request.setObjectKey("2.png");
+        request.setBucketName("markjrzhang-1251704708");
+        request.setObjectKey("1.jpg");
+        request.setDetectType("all");
         requestList.add(request);
 
-        ExecutorService threadPool = Executors.newFixedThreadPool(16);
+        long start = System.currentTimeMillis();
+        ExecutorService threadPool = Executors.newFixedThreadPool(4);
         // 传入一个threadpool, 若不传入线程池, 默认TransferManager中会生成一个单线程的线程池。
         TransferManager transferManager = new TransferManager(client, threadPool);
-        CIPostJob ciPostJob = transferManager.batchPostImageAuditing(requestList);
-        // 或者阻塞等待完成
-        ciPostJob.waitForCompletion();
+        MultipleImageAuditingImpl multipleImageAuditing = transferManager.batchPostImageAuditing(requestList);
+        multipleImageAuditing.waitForCompletion();
+        List<ImageAuditingImpl> imageAuditingList = multipleImageAuditing.getImageAuditingList();
+        for (ImageAuditingImpl imageAuditing : imageAuditingList) {
+            System.out.println(imageAuditing.getState());
+            System.out.println(imageAuditing.getResponse());
+            System.out.println(imageAuditing.getErrMsg());
+        }
+        System.out.println(System.currentTimeMillis() - start);
+        transferManager.shutdownNow();
+        client.shutdown();
     }
 }
diff --git a/src/main/java/com/qcloud/cos/transfer/ImageAuditingCallable.java b/src/main/java/com/qcloud/cos/transfer/ImageAuditingCallable.java
@@ -11,7 +11,7 @@
  * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
  * express or implied. See the License for the specific language governing
  * permissions and limitations under the License.
- 
+
  * According to cos feature, we modify some class，comment, field name, etc.
  */
 
@@ -37,7 +37,7 @@ final class ImageAuditingCallable implements Callable<ImageAuditingResponse> {
     private final ImageAuditingImpl imageAuditing;
 
     ImageAuditingCallable(COS cos, CountDownLatch latch, ImageAuditingRequest request, ImageAuditingImpl imageAuditing) {
-        if (cos == null || latch == null || imageAuditing == null )
+        if (cos == null || latch == null || imageAuditing == null)
             throw new IllegalArgumentException();
         this.cos = cos;
         this.latch = latch;
@@ -48,32 +48,31 @@ final class ImageAuditingCallable implements Callable<ImageAuditingResponse> {
     /**
      * This method must return a non-null object, or else the existing implementation in
      * {@link AbstractTransfer#waitForCompletion()} would block forever.
-     * 
+     *
      * @return the ImageAuditingResponse
      */
     @Override
     public ImageAuditingResponse call() throws Exception {
+        ImageAuditingResponse imageAuditingResponse = null;
         try {
             latch.await();
             imageAuditing.setState(TransferState.InProgress);
-            ImageAuditingResponse imageAuditingResponse = cos.imageAuditing(req);
+            imageAuditingResponse = cos.imageAuditing(req);
 
             if (imageAuditingResponse == null) {
                 imageAuditing.setState(TransferState.Canceled);
                 imageAuditing.setMonitor(new ImageAuditingMonitor(imageAuditing, null));
             } else {
+                imageAuditing.setResponse(imageAuditingResponse);
                 imageAuditing.setState(TransferState.Completed);
             }
             return imageAuditingResponse;
         } catch (Throwable t) {
-            // Downloads aren't allowed to move from canceled to failed
             if (imageAuditing.getState() != TransferState.Canceled) {
                 imageAuditing.setState(TransferState.Failed);
             }
-            if (t instanceof Exception)
-                throw (Exception) t;
-            else
-                throw (Error) t;
+            imageAuditing.setErrMsg(t.getMessage());
+            return new ImageAuditingResponse();
         }
     }
 }
diff --git a/src/main/java/com/qcloud/cos/transfer/ImageAuditingImpl.java b/src/main/java/com/qcloud/cos/transfer/ImageAuditingImpl.java
@@ -30,6 +30,7 @@ public class ImageAuditingImpl extends AbstractTransfer implements CIPostJob {
 
     private ImageAuditingRequest request;
     private ImageAuditingResponse response;
+    private String errMsg;
 
     public ImageAuditingImpl(String description, TransferProgress transferProgress,
                              ProgressListenerChain progressListenerChain,
@@ -47,7 +48,6 @@ public ImageAuditingImpl(String description, TransferProgress transferProgress,
      * @throws IOException
      */
     public synchronized void abort() throws IOException {
-
         this.monitor.getFuture().cancel(true);
         setState(TransferState.Canceled);
     }
@@ -80,4 +80,12 @@ public ImageAuditingResponse getResponse() {
     public void setResponse(ImageAuditingResponse response) {
         this.response = response;
     }
+
+    public String getErrMsg() {
+        return errMsg;
+    }
+
+    public void setErrMsg(String errMsg) {
+        this.errMsg = errMsg;
+    }
 }
diff --git a/src/main/java/com/qcloud/cos/transfer/MultipleImageAuditingImpl.java b/src/main/java/com/qcloud/cos/transfer/MultipleImageAuditingImpl.java
@@ -0,0 +1,73 @@
+/*
+ * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *  http://aws.amazon.com/apache2.0
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+
+ * According to cos feature, we modify some class，comment, field name, etc.
+ */
+
+
+package com.qcloud.cos.transfer;
+
+import com.qcloud.cos.exception.CosClientException;
+import com.qcloud.cos.exception.CosServiceException;
+
+import java.io.IOException;
+import java.util.List;
+
+/**
+ * Multiple file download when downloading an entire virtual directory.
+ */
+public class MultipleImageAuditingImpl extends MultipleFileTransfer<ImageAuditingImpl>  {
+
+    private List<ImageAuditingImpl> imageAuditingList;
+    public MultipleImageAuditingImpl(String description, TransferProgress transferProgress,
+                                     List<ImageAuditingImpl> imageAuditingList) {
+        super(description, transferProgress, null, imageAuditingList);
+        this.imageAuditingList = imageAuditingList;
+    }
+
+    /**
+     * Waits for this transfer to complete. This is a blocking call; the current
+     * thread is suspended until this transfer completes.
+     *
+     * @throws CosClientException   If any errors were encountered in the client while making the
+     *                              request or handling the response.
+     * @throws CosServiceException  If any errors occurred in Qcloud COS while processing the
+     *                              request.
+     * @throws InterruptedException If this thread is interrupted while waiting for the transfer
+     *                              to complete.
+     */
+    @Override
+    public void waitForCompletion()
+            throws CosClientException, CosServiceException, InterruptedException {
+        if (subTransfers.isEmpty())
+            return;
+        super.waitForCompletion();
+    }
+
+    /**
+     * Aborts all outstanding downloads.
+     */
+    public void abort() throws IOException {
+        for (ImageAuditingImpl subTransfer : subTransfers) {
+            subTransfer.monitor.getFuture().cancel(true);
+            subTransfer.setState(TransferState.Canceled);
+        }
+        setState(TransferState.Canceled);
+    }
+
+    public List<ImageAuditingImpl> getImageAuditingList() {
+        return imageAuditingList;
+    }
+
+}
diff --git a/src/main/java/com/qcloud/cos/transfer/TransferManager.java b/src/main/java/com/qcloud/cos/transfer/TransferManager.java
@@ -11,7 +11,7 @@
  * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
  * express or implied. See the License for the specific language governing
  * permissions and limitations under the License.
- 
+
  * According to cos feature, we modify some class，comment, field name, etc.
  */
 
@@ -128,7 +128,7 @@
  * Transfers can be paused and resumed at a later time. It can also survive JVM crash, provided the
  * information that is required to resume the transfer is given as input to the resume operation.
  * For more information on pause and resume,
- * 
+ *
  * @see Upload#pause()
  * @see Download#pause()
  * @see TransferManager#resumeUpload(PersistableUpload)
@@ -1111,16 +1111,33 @@ public void abortMultipartUploads(String bucketName, Date date)
         } while (uploadListing.isTruncated());
     }
 
-    public CIPostJob batchPostImageAuditing(List<ImageAuditingRequest> requestList) {
+    public MultipleImageAuditingImpl batchPostImageAuditing(List<ImageAuditingRequest> requestList) {
+        String description = "Send image auditing jobs in bulk";
+        TransferProgress transferProgress = new TransferProgress();
         List<ImageAuditingImpl> imageAuditingList = new ArrayList<>();
+        final MultipleImageAuditingImpl multipleImageAuditing =
+                new MultipleImageAuditingImpl(description, transferProgress, imageAuditingList);
+        multipleImageAuditing
+                .setMonitor(new MultipleFileTransferMonitor(multipleImageAuditing, imageAuditingList));
+        final CountDownLatch latch = new CountDownLatch(1);
+        MultipleFileTransferStateChangeListener transferListener =
+                new MultipleFileTransferStateChangeListener(latch, multipleImageAuditing);
+
         for (ImageAuditingRequest imageAuditingRequest : requestList) {
-            imageAuditingList.add(doImageAuditing());
+            imageAuditingList.add(doImageAuditing(imageAuditingRequest,transferListener));
         }
-        return new ImageAuditingImpl();
+        latch.countDown();
+        return multipleImageAuditing;
     }
 
-    private ImageAuditingImpl doImageAuditing(ImageAuditingRequest request) {
-        ImageAuditingImpl imageAuditing = new ImageAuditingImpl();
+    private ImageAuditingImpl doImageAuditing(ImageAuditingRequest request, MultipleFileTransferStateChangeListener transferListener) {
+        appendImageAuditingUserAgent(request);
+        String description = "send image auditing job ";
+        TransferProgress transferProgress = new TransferProgress();
+        COSProgressListenerChain listenerChain = new COSProgressListenerChain(
+                new TransferProgressUpdatingListener(transferProgress),
+                request.getGeneralProgressListener());
+        ImageAuditingImpl imageAuditing = new ImageAuditingImpl(description,transferProgress,listenerChain,transferListener,request);
         final CountDownLatch latch = new CountDownLatch(1);
         Future<?> future = threadPool.submit(new ImageAuditingCallable(cos, latch, request,
                 imageAuditing));
@@ -1188,10 +1205,17 @@ public static <X extends CosServiceRequest> X appendMultipartUserAgent(X request
         return request;
     }
 
+    public static <X extends CosServiceRequest> X appendImageAuditingUserAgent(X request) {
+        request.getRequestClientOptions().appendUserAgent(USER_AGENT_MULTIPART);
+        return request;
+    }
+
     private static final String USER_AGENT =
             TransferManager.class.getName() + "/" + VersionInfoUtils.getVersion();
     private static final String USER_AGENT_MULTIPART =
             TransferManager.class.getName() + "_multipart/" + VersionInfoUtils.getVersion();
+    private static final String USER_AGENT_IMAGE_AUDITING_JOB =
+            TransferManager.class.getName() + "_ImageAuditing/" + VersionInfoUtils.getVersion();
 
 
     private static final String DEFAULT_DELIMITER = "/";
@@ -1429,7 +1453,7 @@ public Download resumeDownload(PersistableDownload persistableDownload) {
      * source & destination buckets are in different regions, use the
      * {@link #copy(CopyObjectRequest, COS, TransferStateChangeListener)} method.
      * </p>
-     * 
+     *
      * @param sourceBucketName The name of the bucket from where the object is to be copied.
      * @param sourceKey The name of the COS object.
      * @param destinationBucketName The name of the bucket to where the COS object has to be copied.
@@ -1550,13 +1574,13 @@ public Copy copy(final CopyObjectRequest copyObjectRequest,
      * If resources are available, the copy request will begin immediately. Otherwise, the copy is
      * scheduled and started as soon as resources become available.
      * </p>
-     * 
+     *
      * <p>
      * <b>Note:</b> If the {@link TransferManager} is created with a regional COS client and the
      * source & destination buckets are in different regions, use the
      * {@link #copy(CopyObjectRequest, COS, TransferStateChangeListener)} method.
      * </p>
-     * 
+     *
      * @param copyObjectRequest The request containing all the parameters for the copy.
      * @param srcCOS An COS client constructed for the region in which the source object's bucket is
      *        located.
