Add a default retry strategy to InitiateMultipartUploadRequest.

Author: huiguangjun

src/main/java/com/aliyun/oss/internal/OSSMultipartOperation.java

@@ -86,6 +86,7 @@
 import com.aliyun.oss.model.UploadPartResult;
 import com.aliyun.oss.model.Payer;
 import com.aliyun.oss.model.VoidResult;
+import com.aliyun.oss.model.WebServiceRequest;
 
 /**
  * Multipart operation.
@@ -100,6 +101,14 @@ public OSSMultipartOperation(ServiceClient client, CredentialsProvider credsProv
         super(client, credsProvider);
     }
 
+    @Override
+    protected boolean isRetryablePostRequest(WebServiceRequest request) {
+        if (request instanceof InitiateMultipartUploadRequest) {
+            return true;
+        }
+        return super.isRetryablePostRequest(request);
+    }
+
     /**
      * Abort multipart upload.
      */

src/main/java/com/aliyun/oss/internal/OSSOperation.java

@@ -114,7 +114,7 @@ protected <T> T doOperation(RequestMessage request, ResponseParser<T> parser, St
         request.getHeaders().putAll(originalRequest.getHeaders());
         request.getParameters().putAll(originalRequest.getParameters());
 
-        ExecutionContext context = createDefaultContext(request.getMethod(), bucketName, key);
+        ExecutionContext context = createDefaultContext(request.getMethod(), bucketName, key, originalRequest);
 
         if (context.getCredentials().useSecurityToken() && !request.isUseUrlSignature()) {
             request.addHeader(OSSHeaders.OSS_SECURITY_TOKEN, context.getCredentials().getSecurityToken());
@@ -163,14 +163,14 @@ private static RequestSigner createSigner(HttpMethod method, String bucketName,
         return new OSSRequestSigner(method.toString(), resourcePath, creds, signatureVersion);
     }
 
-    protected ExecutionContext createDefaultContext(HttpMethod method, String bucketName, String key) {
+    protected ExecutionContext createDefaultContext(HttpMethod method, String bucketName, String key, WebServiceRequest originalRequest) {
         ExecutionContext context = new ExecutionContext();
 		Credentials credentials = credsProvider.getCredentials();
         assertParameterNotNull(credentials, "credentials");
         context.setCharset(DEFAULT_CHARSET_NAME);
         context.setSigner(createSigner(method, bucketName, key, credentials, client.getClientConfiguration().getSignatureVersion()));
         context.addResponseHandler(errorResponseHandler);
-        if (method == HttpMethod.POST) {
+        if (method == HttpMethod.POST && !isRetryablePostRequest(originalRequest)) {
             context.setRetryStrategy(noRetryStrategy);
         }
 
@@ -182,12 +182,19 @@ protected ExecutionContext createDefaultContext(HttpMethod method, String bucket
         return context;
     }
 
+    protected ExecutionContext createDefaultContext(HttpMethod method, String bucketName, String key) {
+        return this.createDefaultContext(method, bucketName, key, null);
+    }
+
     protected ExecutionContext createDefaultContext(HttpMethod method, String bucketName) {
-        return this.createDefaultContext(method, bucketName, null);
+        return this.createDefaultContext(method, bucketName, null, null);
     }
 
     protected ExecutionContext createDefaultContext(HttpMethod method) {
-        return this.createDefaultContext(method, null, null);
+        return this.createDefaultContext(method, null, null, null);
     }
 
+    protected boolean isRetryablePostRequest(WebServiceRequest request) {
+        return false;
+    }
 }

src/test/java/com/aliyun/oss/common/NoCreationClassTest.java

@@ -19,13 +19,21 @@
 
 package com.aliyun.oss.common;
 
+import com.aliyun.oss.ClientConfiguration;
+import com.aliyun.oss.HttpMethod;
+import com.aliyun.oss.common.auth.CredentialsProvider;
+import com.aliyun.oss.common.auth.DefaultCredentialProvider;
+import com.aliyun.oss.common.comm.DefaultServiceClient;
+import com.aliyun.oss.common.comm.ExecutionContext;
+import com.aliyun.oss.common.comm.NoRetryStrategy;
+import com.aliyun.oss.common.comm.ServiceClient;
 import com.aliyun.oss.common.utils.AuthUtils;
 import com.aliyun.oss.common.utils.VersionInfoUtils;
-import com.aliyun.oss.internal.Mimetypes;
-import com.aliyun.oss.internal.OSSConstants;
-import com.aliyun.oss.internal.RequestParameters;
-import com.aliyun.oss.internal.SignParameters;
+import com.aliyun.oss.internal.*;
+import com.aliyun.oss.model.AbortMultipartUploadRequest;
+import com.aliyun.oss.model.InitiateMultipartUploadRequest;
 import com.aliyun.oss.model.LocationConstraint;
+import com.aliyun.oss.model.WebServiceRequest;
 import org.junit.Assert;
 import org.junit.Test;
 
@@ -64,4 +72,86 @@ public void testMimetypesClass() {
         }
 
     }
+
+    static class TestOSSOperation extends OSSOperation {
+        public TestOSSOperation(ServiceClient client, CredentialsProvider credsProvider) {
+            super(client, credsProvider);
+        }
+
+        @Override
+        protected boolean isRetryablePostRequest(WebServiceRequest request) {
+            return super.isRetryablePostRequest(request);
+        }
+
+        @Override
+        public ExecutionContext createDefaultContext(HttpMethod method, String bucketName, String key, WebServiceRequest originalRequest) {
+            return super.createDefaultContext(method, bucketName, key, originalRequest);
+        }
+    }
+
+    static class TestOSSMultipartOperation extends  OSSMultipartOperation {
+        public TestOSSMultipartOperation(ServiceClient client, CredentialsProvider credsProvider) {
+            super(client, credsProvider);
+        }
+
+        @Override
+        protected boolean isRetryablePostRequest(WebServiceRequest request) {
+            return super.isRetryablePostRequest(request);
+        }
+
+        @Override
+        public ExecutionContext createDefaultContext(HttpMethod method, String bucketName, String key, WebServiceRequest originalRequest) {
+            return super.createDefaultContext(method, bucketName, key, originalRequest);
+        }
+    }
+
+    @Test
+    public void testOSSOperationClass() {
+        ClientConfiguration config = new ClientConfiguration();
+        ServiceClient client = new DefaultServiceClient(config);
+        CredentialsProvider cred = new DefaultCredentialProvider("ak", "sk");
+        TestOSSOperation operation = new TestOSSOperation(client, cred);
+        InitiateMultipartUploadRequest request = new InitiateMultipartUploadRequest("bucket", "key");
+        Assert.assertEquals(operation.isRetryablePostRequest(request), false);
+
+        Assert.assertEquals(operation.isRetryablePostRequest(null), false);
+
+        ExecutionContext context = null;
+        context = operation.createDefaultContext(HttpMethod.POST, "bucket", "key", request);
+        Assert.assertTrue(context.getRetryStrategy() instanceof NoRetryStrategy);
+
+        context = operation.createDefaultContext(HttpMethod.GET, "bucket", "key", request);
+        Assert.assertEquals(context.getRetryStrategy(), null);
+        Assert.assertFalse(context.getRetryStrategy() instanceof NoRetryStrategy);
+    }
+
+    @Test
+    public void testTestOSSMultipartOperationClass() {
+        ClientConfiguration config = new ClientConfiguration();
+        ServiceClient client = new DefaultServiceClient(config);
+        CredentialsProvider cred = new DefaultCredentialProvider("ak", "sk");
+        TestOSSMultipartOperation operation = new TestOSSMultipartOperation(client, cred);
+        InitiateMultipartUploadRequest request = new InitiateMultipartUploadRequest("bucket", "key");
+        Assert.assertEquals(operation.isRetryablePostRequest(request), true);
+
+        Assert.assertEquals(operation.isRetryablePostRequest(null), false);
+
+        ExecutionContext context = null;
+        context = operation.createDefaultContext(HttpMethod.POST, "bucket", "key", request);
+        Assert.assertEquals(context.getRetryStrategy(), null);
+        Assert.assertFalse(context.getRetryStrategy() instanceof NoRetryStrategy);
+
+        context = operation.createDefaultContext(HttpMethod.POST, "bucket", "key", null);
+        Assert.assertNotNull(context.getRetryStrategy());
+        Assert.assertTrue(context.getRetryStrategy() instanceof NoRetryStrategy);
+
+        context = operation.createDefaultContext(HttpMethod.POST, "bucket", "key",
+                new AbortMultipartUploadRequest("bucket", "key", "id"));
+        Assert.assertNotNull(context.getRetryStrategy());
+        Assert.assertTrue(context.getRetryStrategy() instanceof NoRetryStrategy);
+
+        context = operation.createDefaultContext(HttpMethod.GET, "bucket", "key",
+                new AbortMultipartUploadRequest("bucket", "key", "id"));
+        Assert.assertEquals(context.getRetryStrategy(), null);
+    }
 }