Merge pull request #245 from tencentyun/dev/error_code_retry

Tag Filter of post bucket inventory

Author: Dzkol

CHANGELOG.md

@@ -5,6 +5,9 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [5.6.246.3]
+- Tag Filter of post bucket inventory 
+
 ## [5.6.246.2]
 - post bucket inventory
 

pom.xml

@@ -4,7 +4,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.qcloud</groupId>
     <artifactId>cos_api</artifactId>
-    <version>5.6.246.2</version>
+    <version>5.6.246.3</version>
     <packaging>jar</packaging>
     <name>cos-java-sdk</name>
     <description>java sdk for qcloud cos</description>

src/main/java/com/qcloud/cos/COSClient.java

@@ -140,11 +140,11 @@
 import com.qcloud.cos.model.fetch.PutAsyncFetchTaskResultHandler;
 import com.qcloud.cos.model.fetch.PutAsyncFetchTaskSerializer;
 import com.qcloud.cos.model.inventory.InventoryConfiguration;
+import com.qcloud.cos.model.inventory.PostBucketInventoryConfigurationResult;
 import com.qcloud.cos.model.transform.ObjectTaggingXmlFactory;
 import com.qcloud.cos.region.Region;
 import com.qcloud.cos.retry.RetryUtils;
 import com.qcloud.cos.utils.*;
-import com.qcloud.cos.http.TimeOutCosHttpClient;
 
 import com.qcloud.cos.utils.Base64;
 import org.apache.commons.codec.DecoderException;

src/main/java/com/qcloud/cos/demo/BucketInventoryDemo.java

@@ -9,7 +9,7 @@
 import com.qcloud.cos.model.ListBucketInventoryConfigurationsResult;
 import com.qcloud.cos.model.SetBucketInventoryConfigurationRequest;
 import com.qcloud.cos.model.DeleteBucketInventoryConfigurationRequest;
-import com.qcloud.cos.model.PostBucketInventoryConfigurationResult;
+import com.qcloud.cos.model.inventory.PostBucketInventoryConfigurationResult;
 import com.qcloud.cos.model.inventory.InventoryConfiguration;
 import com.qcloud.cos.model.inventory.InventoryCosBucketDestination;
 import com.qcloud.cos.model.inventory.InventoryFrequency;
@@ -18,11 +18,14 @@
 import com.qcloud.cos.model.inventory.InventoryDestination;
 import com.qcloud.cos.model.inventory.InventorySchedule;
 import com.qcloud.cos.model.inventory.InventoryPrefixPredicate;
+import com.qcloud.cos.model.inventory.InventoryAndPredicate;
 import com.qcloud.cos.model.inventory.InventoryFilter;
 import com.qcloud.cos.model.inventory.InventoryIncludedObjectVersions;
 import com.qcloud.cos.model.inventory.InventoryOptionalField;
+import com.qcloud.cos.model.Tag.Tag;
 import com.qcloud.cos.region.Region;
 
+import java.util.ArrayList;
 import java.util.LinkedList;
 import java.util.List;
 
@@ -172,16 +175,29 @@ private static void postBucketInventoryDemo() {
         inventoryDestination.setCosBucketDestination(inventoryCosBucketDestination);
         inventoryConfiguration.setDestination(inventoryDestination);
 
-        // 设置清单的调度周期，扫描前缀和id等
-        inventoryConfiguration.setId("4");
+        // 设置清单，扫描前缀和id等
+        inventoryConfiguration.setId("1");
+        // prefix filter
         InventoryPrefixPredicate inventoryFilter = new InventoryPrefixPredicate("test/");
         inventoryConfiguration.setInventoryFilter(new InventoryFilter(inventoryFilter));
+
+        // and Filter
+//        InventoryAndPredicate inventoryAndPredicate = new InventoryAndPredicate();
+//        inventoryAndPredicate.setPrefix("bbb");
+//        List<Tag> filterTags = new ArrayList<>();
+//        filterTags.add(new Tag("Testkey1", "value1"));
+//        filterTags.add(new Tag("Testkey2", "value2"));
+//        inventoryAndPredicate.setTags(filterTags);
+//        inventoryConfiguration.setInventoryFilter(new InventoryFilter(inventoryAndPredicate));
+
         inventoryConfiguration.setIncludedObjectVersions(InventoryIncludedObjectVersions.All);
         // 设置可选的输出字段
         List<String> optionalFields = new LinkedList<String>();
         optionalFields.add(InventoryOptionalField.Size.toString());
         optionalFields.add(InventoryOptionalField.LastModifiedDate.toString());
+        optionalFields.add(InventoryOptionalField.Tag.toString());
         inventoryConfiguration.setOptionalFields(optionalFields);
+
         SetBucketInventoryConfigurationRequest setBucketInventoryConfigurationRequest = new SetBucketInventoryConfigurationRequest();
         setBucketInventoryConfigurationRequest.setBucketName(bucketName);
         setBucketInventoryConfigurationRequest.setInventoryConfiguration(inventoryConfiguration);

src/main/java/com/qcloud/cos/internal/Unmarshallers.java

@@ -71,6 +71,7 @@
 import com.qcloud.cos.model.ciModel.workflow.MediaWorkflowExecutionsResponse;
 import com.qcloud.cos.model.ciModel.workflow.MediaWorkflowListResponse;
 import com.qcloud.cos.model.ciModel.workflow.MediaWorkflowResponse;
+import com.qcloud.cos.model.inventory.PostBucketInventoryConfigurationResult;
 
 /*** Collection of unmarshallers for COS XML responses. */
 

src/main/java/com/qcloud/cos/internal/XmlResponsesSaxParser.java

@@ -74,7 +74,6 @@
 import com.qcloud.cos.model.ciModel.auditing.LibResult;
 import com.qcloud.cos.model.ciModel.auditing.ListResult;
 import com.qcloud.cos.model.ciModel.auditing.ObjectResults;
-import com.qcloud.cos.model.ciModel.auditing.OcrResults;
 import com.qcloud.cos.model.ciModel.auditing.SectionInfo;
 import com.qcloud.cos.model.ciModel.auditing.SnapshotInfo;
 import com.qcloud.cos.model.ciModel.auditing.TextAuditingResponse;
@@ -163,6 +162,7 @@
 import com.qcloud.cos.model.inventory.InventoryPrefixPredicate;
 import com.qcloud.cos.model.inventory.InventorySchedule;
 import com.qcloud.cos.model.inventory.ServerSideEncryptionCOS;
+import com.qcloud.cos.model.inventory.PostBucketInventoryConfigurationResult;
 import com.qcloud.cos.model.lifecycle.LifecycleAndOperator;
 import com.qcloud.cos.model.lifecycle.LifecycleFilter;
 import com.qcloud.cos.model.lifecycle.LifecycleFilterPredicate;

src/main/java/com/qcloud/cos/model/BucketConfigurationXmlFactory.java

@@ -40,6 +40,7 @@
 import com.qcloud.cos.model.inventory.InventoryPrefixPredicate;
 import com.qcloud.cos.model.inventory.InventorySchedule;
 import com.qcloud.cos.model.inventory.ServerSideEncryptionCOS;
+import com.qcloud.cos.model.inventory.InventoryAndPredicate;
 import com.qcloud.cos.model.lifecycle.LifecycleAndOperator;
 import com.qcloud.cos.model.lifecycle.LifecycleFilter;
 import com.qcloud.cos.model.lifecycle.LifecycleFilterPredicate;
@@ -234,6 +235,18 @@ private void writeInventoryFilterPredicate(XmlWriter xml, InventoryFilterPredica
         if (predicate instanceof InventoryPrefixPredicate) {
             writePrefix(xml, ((InventoryPrefixPredicate) predicate).getPrefix());
         }
+
+        if (predicate instanceof InventoryAndPredicate) {
+            xml.start("And");
+            writePrefix(xml, ((InventoryAndPredicate) predicate).getPrefix());
+            List<Tag> tags = ((InventoryAndPredicate) predicate).getTags();
+            if (tags != null && !tags.isEmpty()) {
+                for (Tag tag : tags) {
+                    writeTag(xml, tag);
+                }
+            }
+            xml.end();
+        }
     }
 
     private void addInventorySchedule(XmlWriter xml, InventorySchedule schedule) {

src/main/java/com/qcloud/cos/model/inventory/InventoryAndPredicate.java

@@ -0,0 +1,31 @@
+package com.qcloud.cos.model.inventory;
+
+import com.qcloud.cos.model.Tag.Tag;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class InventoryAndPredicate extends InventoryFilterPredicate {
+    private String prefix;
+
+    private List<Tag> tags = new ArrayList<>();
+
+    public String getPrefix() {
+        return prefix;
+    }
+
+    public void setPrefix(String prefix) {
+        this.prefix = prefix;
+    }
+
+    public void setTags(List<Tag> tags) {
+        this.tags = tags;
+    }
+
+    public List<Tag> getTags() {
+        return tags;
+    }
+
+    @Override
+    public void accept(InventoryPredicateVisitor inventoryPredicateVisitor) {}
+}

src/main/java/com/qcloud/cos/model/inventory/InventoryOptionalField.java

@@ -33,6 +33,8 @@ public enum InventoryOptionalField {
 
     ReplicationStatus("ReplicationStatus"),
 
+    Tag("Tag"),
+
     ;
 
     private final String field;

src/main/java/com/qcloud/cos/model/PostBucketInventoryConfigurationResult.java renamed to src/main/java/com/qcloud/cos/model/inventory/PostBucketInventoryConfigurationResult.java

@@ -1,4 +1,6 @@
-package com.qcloud.cos.model;
+package com.qcloud.cos.model.inventory;
+
+import com.qcloud.cos.model.CosServiceResult;
 
 public class PostBucketInventoryConfigurationResult extends CosServiceResult {
     private String jobId;