Skip to content

Commit

Permalink
Version 3.23.9
Browse files Browse the repository at this point in the history
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
  • Loading branch information
zzq996 committed Sep 27, 2023
1 parent 1b8a70d commit d4c9589
Show file tree
Hide file tree
Showing 37 changed files with 1,897 additions and 222 deletions.
10 changes: 10 additions & 0 deletions README-Android.md
Original file line number Diff line number Diff line change
@@ -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
Expand Down
10 changes: 10 additions & 0 deletions README-Java.md
Original file line number Diff line number Diff line change
@@ -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
Expand Down
10 changes: 10 additions & 0 deletions README.MD
Original file line number Diff line number Diff line change
@@ -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
Expand Down
10 changes: 10 additions & 0 deletions README_CN.MD
Original file line number Diff line number Diff line change
@@ -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. 新增双写桶能力
Expand Down
66 changes: 66 additions & 0 deletions app/src/main/java/com/obs/services/AbstractBucketClient.java
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
/*
Expand Down Expand Up @@ -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);
}
});

}
}
14 changes: 14 additions & 0 deletions app/src/main/java/com/obs/services/IObsClient.java
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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.
*
Expand Down
Loading

0 comments on commit d4c9589

Please sign in to comment.