Merge pull request #135 from zzq996/master

Version 3.23.9 New features: Allow you set\get\list\delete bucket inventory configuration Added client side encryption feature Allow you config AbortIncompleteMultipartUpload in LifecycleConfiguration Third-party dependence: Replace okio 3.5.0 with okio 2.10.0 Replace okhttp 4.11.0 with okhttp 4.10.0
huaweicloud · Sep 27, 2023 · 247ddfd · 247ddfd
2 parents 1b8a70d + d4c9589
commit 247ddfd
Show file tree

Hide file tree

Showing 37 changed files with 1,897 additions and 222 deletions.
diff --git a/README-Android.md b/README-Android.md
@@ -1,3 +1,13 @@
+Version 3.23.9
+New features:
+1. Allow you set\get\list\delete bucket inventory configuration
+2. Added client side encryption feature
+3. Allow you config AbortIncompleteMultipartUpload in LifecycleConfiguration
+
+Third-party dependence:
+1. Replace okio 3.5.0 with okio 2.10.0
+2. Replace okhttp 4.11.0 with okhttp 4.10.0
+-----------------------------------------------------------------------------------
 Version 3.23.5
 New features:
 1. Allow you put Object in two Buckets by calling putObjectInTwoBucket

diff --git a/README-Java.md b/README-Java.md
@@ -1,3 +1,13 @@
+Version 3.23.9
+New features:
+1. Allow you set\get\list\delete bucket inventory configuration
+2. Added client side encryption feature
+3. Allow you config AbortIncompleteMultipartUpload in LifecycleConfiguration
+
+Third-party dependence:
+1. Replace okio 3.5.0 with okio 2.10.0
+2. Replace okhttp 4.11.0 with okhttp 4.10.0
+-----------------------------------------------------------------------------------
 Version 3.23.5
 New features:
 1. Allow you put Object in two Buckets by calling putObjectInTwoBucket

diff --git a/README.MD b/README.MD
@@ -1,3 +1,13 @@
+Version 3.23.9
+New features:
+1. Allow you set\get\list\delete bucket inventory configuration
+2. Added client side encryption feature
+3. Allow you config AbortIncompleteMultipartUpload in LifecycleConfiguration
+
+Third-party dependence:
+1. Replace okio 3.5.0 with okio 2.10.0
+2. Replace okhttp 4.11.0 with okhttp 4.10.0
+-----------------------------------------------------------------------------------
 Version 3.23.5
 New features:
 1. Allow you put Object in two Buckets by calling putObjectInTwoBucket

diff --git a/README_CN.MD b/README_CN.MD
@@ -1,3 +1,13 @@
+Version 3.23.9
+New features:
+1. 新增配置桶清单接口
+2. 新增客户端加密
+3. 支持在生命周期规则中配置碎片过期时间
+
+Third-party dependence:
+1. 使用 okio 3.5.0 替代 okio 2.10.0
+2. 使用 okhttp 4.11.0 替代 okhttp 4.10.0
+-----------------------------------------------------------------------------------
 Version 3.23.5
 New features:
 1. 新增双写桶能力

diff --git a/app/src/main/java/com/obs/services/AbstractBucketClient.java b/app/src/main/java/com/obs/services/AbstractBucketClient.java
@@ -53,6 +53,12 @@
 import com.obs.services.model.SetBucketRequestPaymentRequest;
 import com.obs.services.model.SetBucketStoragePolicyRequest;
 import com.obs.services.model.SetBucketVersioningRequest;
+import com.obs.services.model.inventory.SetInventoryConfigurationRequest;
+import com.obs.services.model.inventory.GetInventoryConfigurationRequest;
+import com.obs.services.model.inventory.DeleteInventoryConfigurationRequest;
+import com.obs.services.model.inventory.ListInventoryConfigurationRequest;
+import com.obs.services.model.inventory.GetInventoryConfigurationResult;
+import com.obs.services.model.inventory.ListInventoryConfigurationResult;
 
 public abstract class AbstractBucketClient extends AbstractDeprecatedBucketClient {
     /*
@@ -917,4 +923,64 @@ public HeaderResponse action() throws ServiceException {
                     }
                 });
     }
+
+    @Override
+    public HeaderResponse setInventoryConfiguration(SetInventoryConfigurationRequest request) throws ObsException {
+        ServiceUtils.assertParameterNotNull(request, "request is null");
+        ServiceUtils.assertParameterNotNull(request.getBucketName(), "bucketName is null");
+        ServiceUtils.assertParameterNotNull(request.getInventoryConfiguration(), "inventoryConfiguration is null");
+
+        return this.doActionWithResult("setInventoryConfiguration", request.getBucketName(),
+                new ActionCallbackWithResult<HeaderResponse>() {
+                    @Override
+                    public HeaderResponse action() throws ServiceException {
+                        return AbstractBucketClient.this.setInventoryConfigurationImpl(request);
+                    }
+                });
+    }
+
+    @Override
+    public GetInventoryConfigurationResult getInventoryConfiguration(GetInventoryConfigurationRequest request) throws ObsException {
+        ServiceUtils.assertParameterNotNull(request, "request is null");
+        ServiceUtils.assertParameterNotNull2(request.getBucketName(), "bucketName is null");
+        ServiceUtils.assertParameterNotNull2(request.getConfigurationId(), "configurationId is null");
+
+        return this.doActionWithResult("getInventoryConfiguration", request.getBucketName(),
+                new ActionCallbackWithResult<GetInventoryConfigurationResult>() {
+                    @Override
+                    public GetInventoryConfigurationResult action() throws ServiceException {
+                        return AbstractBucketClient.this.getInventoryConfigurationImpl(request);
+                    }
+                });
+    }
+
+    @Override
+    public ListInventoryConfigurationResult listInventoryConfiguration(ListInventoryConfigurationRequest request) throws ObsException {
+        ServiceUtils.assertParameterNotNull(request, "request is null");
+        ServiceUtils.assertParameterNotNull2(request.getBucketName(), "bucketName is null");
+
+        return this.doActionWithResult("listInventoryConfiguration", request.getBucketName(),
+                new ActionCallbackWithResult<ListInventoryConfigurationResult>() {
+                    @Override
+                    public ListInventoryConfigurationResult action() throws ServiceException {
+                        return AbstractBucketClient.this.listInventoryConfigurationImpl(request);
+                    }
+                });
+    }
+
+    @Override
+    public HeaderResponse deleteInventoryConfiguration(DeleteInventoryConfigurationRequest request) throws ObsException {
+        ServiceUtils.assertParameterNotNull(request, "request is null");
+        ServiceUtils.assertParameterNotNull2(request.getBucketName(), "bucketName is null");
+        ServiceUtils.assertParameterNotNull2(request.getConfigurationId(), "configurationId is null");
+
+        return this.doActionWithResult("deleteInventoryConfiguration", request.getBucketName(),
+                new ActionCallbackWithResult<HeaderResponse>() {
+                    @Override
+                    public HeaderResponse action() throws ServiceException {
+                        return AbstractBucketClient.this.deleteInventoryConfigurationImpl(request);
+                    }
+                });
+
+    }
 }
diff --git a/app/src/main/java/com/obs/services/IObsClient.java b/app/src/main/java/com/obs/services/IObsClient.java
@@ -125,6 +125,12 @@
 import com.obs.services.model.WebsiteConfiguration;
 import com.obs.services.model.crr.GetCrrProgressRequest;
 import com.obs.services.model.crr.GetCrrProgressResult;
+import com.obs.services.model.inventory.SetInventoryConfigurationRequest;
+import com.obs.services.model.inventory.GetInventoryConfigurationRequest;
+import com.obs.services.model.inventory.DeleteInventoryConfigurationRequest;
+import com.obs.services.model.inventory.ListInventoryConfigurationRequest;
+import com.obs.services.model.inventory.GetInventoryConfigurationResult;
+import com.obs.services.model.inventory.ListInventoryConfigurationResult;
 import com.obs.services.model.select.SelectObjectRequest;
 import com.obs.services.model.select.SelectObjectResult;
 import com.obs.services.model.ObjectTagResult;
@@ -2293,6 +2299,14 @@ UploadPartResult uploadPart(String bucketName, String objectKey, String uploadId
      */
     HeaderResponse deleteBucketDirectColdAccess(BaseBucketRequest request) throws ObsException;
 
+    HeaderResponse setInventoryConfiguration(SetInventoryConfigurationRequest request) throws ObsException;
+
+    GetInventoryConfigurationResult getInventoryConfiguration(GetInventoryConfigurationRequest request) throws ObsException;
+
+    ListInventoryConfigurationResult listInventoryConfiguration(ListInventoryConfigurationRequest request) throws ObsException;
+
+    HeaderResponse deleteInventoryConfiguration(DeleteInventoryConfigurationRequest request) throws ObsException;
+
     /**
      * Close ObsClient and release connection resources.
      *