add retryStrategy to ClientConfiguration.

Author: liyanzhang505

src/main/java/com/aliyun/oss/ClientConfiguration.java

@@ -32,6 +32,7 @@
 import com.aliyun.oss.common.auth.RequestSigner;
 import com.aliyun.oss.common.comm.IdleConnectionReaper;
 import com.aliyun.oss.common.comm.Protocol;
+import com.aliyun.oss.common.comm.RetryStrategy;
 import com.aliyun.oss.common.comm.SignVersion;
 import com.aliyun.oss.common.utils.ResourceManager;
 import com.aliyun.oss.common.utils.VersionInfoUtils;
@@ -102,6 +103,8 @@ public class ClientConfiguration {
 
     protected long tickOffset = 0;
 
+    private RetryStrategy retryStrategy;
+
     public ClientConfiguration() {
         super();
         AppendDefaultExcludeList(this.cnameExcludeList);
@@ -699,4 +702,26 @@ public void setTickOffset(long epochTicks) {
         long localTime = new Date().getTime();
         this.tickOffset = epochTicks - localTime;
     }
+
+    /**
+     * Gets the retry strategy
+     *
+     * @return {@link RetryStrategy} object.
+     */
+    public RetryStrategy getRetryStrategy() {
+        return retryStrategy;
+    }
+
+    /**
+     * Sets the retry strategy.
+     *
+     * @param retryStrategy
+     *          The retryStrategy is used to check whether to retry request or not.
+     *          If it has been specified, the client will prefer this retryStrategy
+     *          than its private strategy {@link DefaultRetryStrategy}.
+     */
+    public void setRetryStrategy(RetryStrategy retryStrategy) {
+        this.retryStrategy = retryStrategy;
+    }
+
 }

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

@@ -169,6 +169,11 @@ protected ExecutionContext createDefaultContext(HttpMethod method, String bucket
         if (method == HttpMethod.POST) {
             context.setRetryStrategy(noRetryStrategy);
         }
+
+        if (client.getClientConfiguration().getRetryStrategy() != null) {
+            context.setRetryStrategy(client.getClientConfiguration().getRetryStrategy());
+        }
+
         context.setCredentials(credentials);
         return context;
     }

src/test/java/com/aliyun/oss/OSSClientConfigurationTest.java

@@ -21,6 +21,8 @@
 
 import com.aliyun.oss.common.auth.RequestSigner;
 import com.aliyun.oss.common.comm.RequestMessage;
+import com.aliyun.oss.common.comm.ResponseMessage;
+import com.aliyun.oss.common.comm.RetryStrategy;
 import junit.framework.Assert;
 import org.junit.Test;
 
@@ -66,4 +68,24 @@ public void testTimeoutClientEnable() {
         Assert.assertTrue(configuration.isRequestTimeoutEnabled());
     }
 
+    @Test
+    public void testUserRetryStrategy() {
+        ClientConfiguration configuration = new ClientConfiguration();
+        Assert.assertNull(configuration.getRetryStrategy());
+
+        configuration.setRetryStrategy(new TestRetryStrategy());
+        Assert.assertNotNull(configuration.getRetryStrategy());
+        Assert.assertTrue(configuration.getRetryStrategy().shouldRetry(null, null, null, 1));
+        Assert.assertFalse(configuration.getRetryStrategy().shouldRetry(null, null, null, 2));
+    }
+
 }
+
+
+class TestRetryStrategy extends RetryStrategy {
+
+    @Override
+    public boolean shouldRetry(Exception ex, RequestMessage request, ResponseMessage response, int retries) {
+        return retries < 2 ? true : false;
+    }
+}