Skip to content

Commit 52debe6

Browse files
redabcredabc
committed
Update to 3.21.8
1 parent 27ae1f5 commit 52debe6

File tree

78 files changed

+2114
-4171
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

78 files changed

+2114
-4171
lines changed

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -124,6 +124,7 @@ private int restoreCurrentObject(RestoreObjectsRequest request, DefaultTaskProgr
124124
ListObjectsRequest listObjectsRequest = new ListObjectsRequest(request.getBucketName());
125125
listObjectsRequest.setRequesterPays(request.isRequesterPays());
126126
listObjectsRequest.setPrefix(request.getPrefix());
127+
listObjectsRequest.setEncodingType(request.getEncodingType());
127128
do {
128129
objectsResult = this.listObjects(listObjectsRequest);
129130
for (ObsObject o : objectsResult.getObjects()) {
@@ -163,6 +164,7 @@ private int restoreVersions(RestoreObjectsRequest request, DefaultTaskProgressSt
163164
ListVersionsResult versionResult;
164165
ListVersionsRequest listRequest = new ListVersionsRequest(request.getBucketName());
165166
listRequest.setRequesterPays(request.isRequesterPays());
167+
listRequest.setEncodingType(request.getEncodingType());
166168

167169
listRequest.setPrefix(request.getPrefix());
168170
do {

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

Lines changed: 65 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
import com.obs.services.model.AuthTypeEnum;
2525
import com.obs.services.model.BaseBucketRequest;
2626
import com.obs.services.model.BucketCors;
27+
import com.obs.services.model.BucketCustomDomainInfo;
2728
import com.obs.services.model.BucketLocationResponse;
2829
import com.obs.services.model.BucketLoggingConfiguration;
2930
import com.obs.services.model.BucketMetadataInfoRequest;
@@ -33,6 +34,8 @@
3334
import com.obs.services.model.BucketStoragePolicyConfiguration;
3435
import com.obs.services.model.BucketVersioningConfiguration;
3536
import com.obs.services.model.CreateBucketRequest;
37+
import com.obs.services.model.DeleteBucketCustomDomainRequest;
38+
import com.obs.services.model.GetBucketCustomDomainRequest;
3639
import com.obs.services.model.HeaderResponse;
3740
import com.obs.services.model.ListBucketsRequest;
3841
import com.obs.services.model.ListBucketsResult;
@@ -41,6 +44,7 @@
4144
import com.obs.services.model.RequestPaymentEnum;
4245
import com.obs.services.model.SetBucketAclRequest;
4346
import com.obs.services.model.SetBucketCorsRequest;
47+
import com.obs.services.model.SetBucketCustomDomainRequest;
4448
import com.obs.services.model.SetBucketLoggingRequest;
4549
import com.obs.services.model.SetBucketQuotaRequest;
4650
import com.obs.services.model.SetBucketRequestPaymentRequest;
@@ -791,4 +795,65 @@ public RequestPaymentConfiguration action() throws ServiceException {
791795
}
792796
});
793797
}
798+
799+
@Override
800+
public HeaderResponse deleteBucketCustomDomain(String bucketName, String domainName) throws ObsException {
801+
return deleteBucketCustomDomain(new DeleteBucketCustomDomainRequest(bucketName, domainName));
802+
}
803+
804+
@Override
805+
public HeaderResponse deleteBucketCustomDomain(DeleteBucketCustomDomainRequest request) throws ObsException {
806+
ServiceUtils.asserParameterNotNull(request, "request is null");
807+
ServiceUtils.asserParameterNotNull(request.getBucketName(), "bucketName is null");
808+
ServiceUtils.asserParameterNotNull2(request.getDomainName(), "domainName is null");
809+
810+
811+
return this.doActionWithResult("setBucketCustomDomain", request.getBucketName(),
812+
new ActionCallbackWithResult<HeaderResponse>() {
813+
@Override
814+
public HeaderResponse action() throws ServiceException {
815+
return AbstractBucketClient.this.deleteBucketCustomDomainImpl(request);
816+
}
817+
});
818+
}
819+
820+
@Override
821+
public BucketCustomDomainInfo getBucketCustomDomain(String bucketName) throws ObsException {
822+
return getBucketCustomDomain(new GetBucketCustomDomainRequest(bucketName));
823+
}
824+
825+
@Override
826+
public BucketCustomDomainInfo getBucketCustomDomain(final GetBucketCustomDomainRequest request)
827+
throws ObsException {
828+
ServiceUtils.asserParameterNotNull(request, "BaseBucketRequest is null");
829+
ServiceUtils.asserParameterNotNull2(request.getBucketName(), "bucketName is null");
830+
return this.doActionWithResult("getBucketCustomDomain", request.getBucketName(),
831+
new ActionCallbackWithResult<BucketCustomDomainInfo>() {
832+
833+
@Override
834+
public BucketCustomDomainInfo action() throws ServiceException {
835+
return AbstractBucketClient.this.getBucketCustomDomainImpl(request);
836+
}
837+
});
838+
}
839+
840+
@Override
841+
public HeaderResponse setBucketCustomDomain(String bucketName, String domainName) throws ObsException {
842+
return setBucketCustomDomain(new SetBucketCustomDomainRequest(bucketName, domainName));
843+
}
844+
845+
@Override
846+
public HeaderResponse setBucketCustomDomain(SetBucketCustomDomainRequest request) throws ObsException {
847+
ServiceUtils.asserParameterNotNull(request, "request is null");
848+
ServiceUtils.asserParameterNotNull(request.getBucketName(), "bucketName is null");
849+
ServiceUtils.asserParameterNotNull2(request.getDomainName(), "domainName is null");
850+
851+
return this.doActionWithResult("setBucketCustomDomain", request.getBucketName(),
852+
new ActionCallbackWithResult<HeaderResponse>() {
853+
@Override
854+
public HeaderResponse action() throws ServiceException {
855+
return AbstractBucketClient.this.setBucketCustomDomainImpl(request);
856+
}
857+
});
858+
}
794859
}

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

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@
3838
import com.obs.services.internal.security.ProviderCredentials;
3939
import com.obs.services.internal.utils.AccessLoggerUtils;
4040
import com.obs.services.internal.utils.ServiceUtils;
41+
import com.obs.services.internal.xml.OBSXMLBuilder;
4142
import com.obs.services.model.AuthTypeEnum;
4243
import com.obs.services.model.HttpMethodEnum;
4344
import com.obs.services.model.PolicyConditionItem;
@@ -62,7 +63,6 @@ protected void init(String accessKey, String secretKey, String securityToken, Ob
6263
credentials.setAuthType(config.getAuthType());
6364
this.obsProperties = obsProperties;
6465
this.credentials = credentials;
65-
this.obsProperties = obsProperties;
6666
this.keyManagerFactory = config.getKeyManagerFactory();
6767
this.trustManagerFactory = config.getTrustManagerFactory();
6868
if (this.isAuthTypeNegotiation()) {
@@ -72,6 +72,7 @@ protected void init(String accessKey, String secretKey, String securityToken, Ob
7272
this.segmentLock = new SegmentLock();
7373
}
7474
this.initHttpClient(config.getHttpDispatcher());
75+
OBSXMLBuilder.setXmlDocumentBuilderFactoryClass(config.getXmlDocumentBuilderFactoryClass());
7576
reqBean.setRespTime(new Date());
7677
reqBean.setResultCode(Constants.RESULTCODE_SUCCESS);
7778
if (ILOG.isInfoEnabled()) {
@@ -83,7 +84,7 @@ protected void init(String accessKey, String secretKey, String securityToken, Ob
8384
sb.append(Constants.OBS_SDK_VERSION);
8485
sb.append("];");
8586
sb.append("[Endpoint=");
86-
String ep = "";
87+
String ep;
8788
if (this.getHttpsOnly()) {
8889
ep = "https://" + this.getEndpoint() + ":" + this.getHttpsPort() + "/";
8990
} else {
@@ -222,9 +223,8 @@ public TemporarySignatureResponse createTemporarySignature(TemporarySignatureReq
222223
ServiceUtils.asserParameterNotNull(request, "TemporarySignatureRequest is null");
223224
InterfaceLogBean reqBean = new InterfaceLogBean("createTemporarySignature", this.getEndpoint(), "");
224225
try {
225-
TemporarySignatureResponse response = this.getProviderCredentials().getAuthType() == AuthTypeEnum.V4
226+
return this.getProviderCredentials().getAuthType() == AuthTypeEnum.V4
226227
? this.createV4TemporarySignature(request) : this.createTemporarySignatureResponse(request);
227-
return response;
228228
} catch (Exception e) {
229229
reqBean.setRespTime(new Date());
230230
if (ILOG.isErrorEnabled()) {
@@ -261,8 +261,7 @@ public TemporarySignatureResponse createGetTemporarySignature(String bucketName,
261261
PolicyTempSignatureRequest request = createPolicyGetRequest(bucketName, objectKey, prefix, headers,
262262
queryParams);
263263
request.setExpiryDate(expiryDate);
264-
TemporarySignatureResponse response = this.createTemporarySignatureResponse(request);
265-
return response;
264+
return this.createTemporarySignatureResponse(request);
266265
} catch (Exception e) {
267266
throw new ObsException(e.getMessage(), e);
268267
}
@@ -295,8 +294,7 @@ public TemporarySignatureResponse createGetTemporarySignature(String bucketName,
295294
PolicyTempSignatureRequest request = createPolicyGetRequest(bucketName, objectKey, prefix, headers,
296295
queryParams);
297296
request.setExpires(expires);
298-
TemporarySignatureResponse response = this.createTemporarySignatureResponse(request);
299-
return response;
297+
return this.createTemporarySignatureResponse(request);
300298
} catch (Exception e) {
301299
throw new ObsException(e.getMessage(), e);
302300
}

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -139,6 +139,7 @@ private boolean recurseFolders(DropFolderRequest dropRequest, String folders,
139139
request.setDelimiter("/");
140140
request.setPrefix(folders);
141141
request.setRequesterPays(dropRequest.isRequesterPays());
142+
request.setEncodingType(dropRequest.getEncodingType());
142143
ObjectListing result;
143144
boolean isDeleted = true;
144145
do {

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

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -52,14 +52,14 @@
5252

5353
public abstract class AbstractObjectClient extends AbstractBucketAdvanceClient {
5454
@Override
55-
public boolean doesObjectExist(final String buckeName, final String objectKey) throws ObsException {
56-
GetObjectMetadataRequest request = new GetObjectMetadataRequest(buckeName, objectKey);
55+
public boolean doesObjectExist(final String bucketName, final String objectKey) throws ObsException {
56+
GetObjectMetadataRequest request = new GetObjectMetadataRequest(bucketName, objectKey);
5757
return this.doesObjectExist(request);
5858
}
5959

6060
@Override
6161
public boolean doesObjectExist(final GetObjectMetadataRequest request) throws ObsException {
62-
ServiceUtils.asserParameterNotNull(request.getBucketName(), "bucke is null");
62+
ServiceUtils.asserParameterNotNull(request.getBucketName(), "bucket is null");
6363
ServiceUtils.asserParameterNotNull2(request.getObjectKey(), "objectKey is null");
6464
return doActionWithResult("doesObjectExist", request.getBucketName(), new ActionCallbackWithResult<Boolean>() {
6565
@Override
@@ -94,7 +94,6 @@ public Boolean action() throws ServiceException {
9494
* OBS SDK self-defined exception, thrown when the interface
9595
* fails to be called or access to OBS fails
9696
*/
97-
@Deprecated
9897
public OptionsInfoResult optionsObject(final String bucketName, final String objectKey,
9998
final OptionsInfoRequest optionInfo) throws ObsException {
10099
return this.doActionWithResult("optionsObject", bucketName, new ActionCallbackWithResult<OptionsInfoResult>() {

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

Lines changed: 21 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ public class HttpProxyConfiguration {
2525

2626
private String proxyUname;
2727

28-
private String userPaaswd;
28+
private String userPasswd;
2929

3030
private String domain;
3131

@@ -42,17 +42,17 @@ public HttpProxyConfiguration() {
4242
* Proxy port
4343
* @param proxyUname
4444
* Proxy username
45-
* @param userPaaswd
45+
* @param userPasswd
4646
* Proxy password
4747
* @param domain
4848
* Proxy domain
4949
*/
50-
public HttpProxyConfiguration(String proxyAddr, int proxyPort, String proxyUname, String userPaaswd,
50+
public HttpProxyConfiguration(String proxyAddr, int proxyPort, String proxyUname, String userPasswd,
5151
String domain) {
5252
this.proxyAddr = proxyAddr;
5353
this.proxyPort = proxyPort;
5454
this.proxyUname = proxyUname;
55-
this.userPaaswd = userPaaswd;
55+
this.userPasswd = userPasswd;
5656
this.domain = domain;
5757
this.workstation = this.proxyAddr;
5858
}
@@ -66,16 +66,16 @@ public HttpProxyConfiguration(String proxyAddr, int proxyPort, String proxyUname
6666
* Proxy port
6767
* @param proxyUname
6868
* Proxy username
69-
* @param userPaaswd
69+
* @param userPasswd
7070
* Proxy password
7171
* @param domain
7272
* Proxy domain
7373
* @param workstation
7474
* Workstation where the proxy is resides
7575
*/
76-
public HttpProxyConfiguration(String proxyAddr, int proxyPort, String proxyUname, String userPaaswd, String domain,
76+
public HttpProxyConfiguration(String proxyAddr, int proxyPort, String proxyUname, String userPasswd, String domain,
7777
String workstation) {
78-
this(proxyAddr, proxyPort, proxyUname, userPaaswd, domain);
78+
this(proxyAddr, proxyPort, proxyUname, userPasswd, domain);
7979
this.workstation = this.proxyAddr;
8080
}
8181

@@ -141,18 +141,28 @@ public void setProxyUName(String proxyUName) {
141141
*
142142
* @return Proxy password
143143
*/
144+
public String getUserPasswd() {
145+
return userPasswd;
146+
}
147+
148+
@Deprecated
144149
public String getUserPaaswd() {
145-
return userPaaswd;
150+
return getUserPasswd();
146151
}
147152

148153
/**
149154
* Set the proxy password.
150155
*
151-
* @param userPaaswd
156+
* @param userPasswd
152157
* Proxy password
153158
*/
154-
public void setUserPaaswd(String userPaaswd) {
155-
this.userPaaswd = userPaaswd;
159+
public void setUserPasswd(String userPasswd) {
160+
this.userPasswd = userPasswd;
161+
}
162+
163+
@Deprecated
164+
public void setUserPaaswd(String userPasswd) {
165+
setUserPasswd(userPasswd);
156166
}
157167

158168
/**

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

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -123,8 +123,8 @@
123123
* Basic OBS interface
124124
*/
125125
//CHECKSTYLE:OFF
126-
public interface IObsClient {
127-
126+
public interface IObsClient extends IObsBucketExtendClient {
127+
128128
/**
129129
*
130130
* Refresh the temporary access key.
@@ -1303,7 +1303,8 @@ HeaderResponse setBucketVersioning(String bucketName, BucketVersioningConfigurat
13031303
* @since 3.20.3
13041304
*/
13051305
HeaderResponse deleteBucketTagging(BaseBucketRequest request) throws ObsException;
1306-
1306+
1307+
13071308
/**
13081309
* Obtain bucket encryption configuration.
13091310
*

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

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -90,6 +90,8 @@ public class ObsConfiguration implements Cloneable {
9090
private HttpProtocolTypeEnum httpProtocolType;
9191

9292
private Dispatcher httpDispatcher;
93+
94+
private String xmlDocumentBuilderFactoryClass;
9395

9496
/**
9597
* Constructor
@@ -122,6 +124,7 @@ public ObsConfiguration() {
122124
this.cname = false;
123125
this.delimiter = "/";
124126
this.httpProtocolType = HttpProtocolTypeEnum.HTTP1_1;
127+
this.xmlDocumentBuilderFactoryClass = ObsConstraint.OBS_XML_DOC_BUILDER_FACTORY_CLASS;
125128
}
126129

127130
public String getDelimiter() {
@@ -867,4 +870,11 @@ public void setHttpDispatcher(Dispatcher httpDispatcher) {
867870
this.httpDispatcher = httpDispatcher;
868871
}
869872

873+
public String getXmlDocumentBuilderFactoryClass() {
874+
return xmlDocumentBuilderFactoryClass;
875+
}
876+
877+
public void setXmlDocumentBuilderFactoryClass(String xmlDocumentBuilderFactoryClass) {
878+
this.xmlDocumentBuilderFactoryClass = xmlDocumentBuilderFactoryClass;
879+
}
870880
}

0 commit comments

Comments
 (0)