Skip to content

Commit 247ddfd

Browse files
zzq996zzq996
authored
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
2 parents 1b8a70d + d4c9589 commit 247ddfd

37 files changed

+1897
-222
lines changed

‎README-Android.md

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,13 @@
1+
Version 3.23.9
2+
New features:
3+
1. Allow you set\get\list\delete bucket inventory configuration
4+
2. Added client side encryption feature
5+
3. Allow you config AbortIncompleteMultipartUpload in LifecycleConfiguration
6+
7+
Third-party dependence:
8+
1. Replace okio 3.5.0 with okio 2.10.0
9+
2. Replace okhttp 4.11.0 with okhttp 4.10.0
10+
-----------------------------------------------------------------------------------
111
Version 3.23.5
212
New features:
313
1. Allow you put Object in two Buckets by calling putObjectInTwoBucket

‎README-Java.md

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,13 @@
1+
Version 3.23.9
2+
New features:
3+
1. Allow you set\get\list\delete bucket inventory configuration
4+
2. Added client side encryption feature
5+
3. Allow you config AbortIncompleteMultipartUpload in LifecycleConfiguration
6+
7+
Third-party dependence:
8+
1. Replace okio 3.5.0 with okio 2.10.0
9+
2. Replace okhttp 4.11.0 with okhttp 4.10.0
10+
-----------------------------------------------------------------------------------
111
Version 3.23.5
212
New features:
313
1. Allow you put Object in two Buckets by calling putObjectInTwoBucket

‎README.MD

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,13 @@
1+
Version 3.23.9
2+
New features:
3+
1. Allow you set\get\list\delete bucket inventory configuration
4+
2. Added client side encryption feature
5+
3. Allow you config AbortIncompleteMultipartUpload in LifecycleConfiguration
6+
7+
Third-party dependence:
8+
1. Replace okio 3.5.0 with okio 2.10.0
9+
2. Replace okhttp 4.11.0 with okhttp 4.10.0
10+
-----------------------------------------------------------------------------------
111
Version 3.23.5
212
New features:
313
1. Allow you put Object in two Buckets by calling putObjectInTwoBucket

‎README_CN.MD

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,13 @@
1+
Version 3.23.9
2+
New features:
3+
1. 新增配置桶清单接口
4+
2. 新增客户端加密
5+
3. 支持在生命周期规则中配置碎片过期时间
6+
7+
Third-party dependence:
8+
1. 使用 okio 3.5.0 替代 okio 2.10.0
9+
2. 使用 okhttp 4.11.0 替代 okhttp 4.10.0
10+
-----------------------------------------------------------------------------------
111
Version 3.23.5
212
New features:
313
1. 新增双写桶能力

‎app/src/main/java/com/obs/services/AbstractBucketClient.java

Lines changed: 66 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,12 @@
5353
import com.obs.services.model.SetBucketRequestPaymentRequest;
5454
import com.obs.services.model.SetBucketStoragePolicyRequest;
5555
import com.obs.services.model.SetBucketVersioningRequest;
56+
import com.obs.services.model.inventory.SetInventoryConfigurationRequest;
57+
import com.obs.services.model.inventory.GetInventoryConfigurationRequest;
58+
import com.obs.services.model.inventory.DeleteInventoryConfigurationRequest;
59+
import com.obs.services.model.inventory.ListInventoryConfigurationRequest;
60+
import com.obs.services.model.inventory.GetInventoryConfigurationResult;
61+
import com.obs.services.model.inventory.ListInventoryConfigurationResult;
5662

5763
public abstract class AbstractBucketClient extends AbstractDeprecatedBucketClient {
5864
/*
@@ -917,4 +923,64 @@ public HeaderResponse action() throws ServiceException {
917923
}
918924
});
919925
}
926+
927+
@Override
928+
public HeaderResponse setInventoryConfiguration(SetInventoryConfigurationRequest request) throws ObsException {
929+
ServiceUtils.assertParameterNotNull(request, "request is null");
930+
ServiceUtils.assertParameterNotNull(request.getBucketName(), "bucketName is null");
931+
ServiceUtils.assertParameterNotNull(request.getInventoryConfiguration(), "inventoryConfiguration is null");
932+
933+
return this.doActionWithResult("setInventoryConfiguration", request.getBucketName(),
934+
new ActionCallbackWithResult<HeaderResponse>() {
935+
@Override
936+
public HeaderResponse action() throws ServiceException {
937+
return AbstractBucketClient.this.setInventoryConfigurationImpl(request);
938+
}
939+
});
940+
}
941+
942+
@Override
943+
public GetInventoryConfigurationResult getInventoryConfiguration(GetInventoryConfigurationRequest request) throws ObsException {
944+
ServiceUtils.assertParameterNotNull(request, "request is null");
945+
ServiceUtils.assertParameterNotNull2(request.getBucketName(), "bucketName is null");
946+
ServiceUtils.assertParameterNotNull2(request.getConfigurationId(), "configurationId is null");
947+
948+
return this.doActionWithResult("getInventoryConfiguration", request.getBucketName(),
949+
new ActionCallbackWithResult<GetInventoryConfigurationResult>() {
950+
@Override
951+
public GetInventoryConfigurationResult action() throws ServiceException {
952+
return AbstractBucketClient.this.getInventoryConfigurationImpl(request);
953+
}
954+
});
955+
}
956+
957+
@Override
958+
public ListInventoryConfigurationResult listInventoryConfiguration(ListInventoryConfigurationRequest request) throws ObsException {
959+
ServiceUtils.assertParameterNotNull(request, "request is null");
960+
ServiceUtils.assertParameterNotNull2(request.getBucketName(), "bucketName is null");
961+
962+
return this.doActionWithResult("listInventoryConfiguration", request.getBucketName(),
963+
new ActionCallbackWithResult<ListInventoryConfigurationResult>() {
964+
@Override
965+
public ListInventoryConfigurationResult action() throws ServiceException {
966+
return AbstractBucketClient.this.listInventoryConfigurationImpl(request);
967+
}
968+
});
969+
}
970+
971+
@Override
972+
public HeaderResponse deleteInventoryConfiguration(DeleteInventoryConfigurationRequest request) throws ObsException {
973+
ServiceUtils.assertParameterNotNull(request, "request is null");
974+
ServiceUtils.assertParameterNotNull2(request.getBucketName(), "bucketName is null");
975+
ServiceUtils.assertParameterNotNull2(request.getConfigurationId(), "configurationId is null");
976+
977+
return this.doActionWithResult("deleteInventoryConfiguration", request.getBucketName(),
978+
new ActionCallbackWithResult<HeaderResponse>() {
979+
@Override
980+
public HeaderResponse action() throws ServiceException {
981+
return AbstractBucketClient.this.deleteInventoryConfigurationImpl(request);
982+
}
983+
});
984+
985+
}
920986
}

‎app/src/main/java/com/obs/services/IObsClient.java

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -125,6 +125,12 @@
125125
import com.obs.services.model.WebsiteConfiguration;
126126
import com.obs.services.model.crr.GetCrrProgressRequest;
127127
import com.obs.services.model.crr.GetCrrProgressResult;
128+
import com.obs.services.model.inventory.SetInventoryConfigurationRequest;
129+
import com.obs.services.model.inventory.GetInventoryConfigurationRequest;
130+
import com.obs.services.model.inventory.DeleteInventoryConfigurationRequest;
131+
import com.obs.services.model.inventory.ListInventoryConfigurationRequest;
132+
import com.obs.services.model.inventory.GetInventoryConfigurationResult;
133+
import com.obs.services.model.inventory.ListInventoryConfigurationResult;
128134
import com.obs.services.model.select.SelectObjectRequest;
129135
import com.obs.services.model.select.SelectObjectResult;
130136
import com.obs.services.model.ObjectTagResult;
@@ -2293,6 +2299,14 @@ UploadPartResult uploadPart(String bucketName, String objectKey, String uploadId
22932299
*/
22942300
HeaderResponse deleteBucketDirectColdAccess(BaseBucketRequest request) throws ObsException;
22952301

2302+
HeaderResponse setInventoryConfiguration(SetInventoryConfigurationRequest request) throws ObsException;
2303+
2304+
GetInventoryConfigurationResult getInventoryConfiguration(GetInventoryConfigurationRequest request) throws ObsException;
2305+
2306+
ListInventoryConfigurationResult listInventoryConfiguration(ListInventoryConfigurationRequest request) throws ObsException;
2307+
2308+
HeaderResponse deleteInventoryConfiguration(DeleteInventoryConfigurationRequest request) throws ObsException;
2309+
22962310
/**
22972311
* Close ObsClient and release connection resources.
22982312
*

0 commit comments

Comments
 (0)