parse-community#498 extends Parse.Configuration with means to specify default socketTimeout and max number of retries

Author: Tsvetan Nachev

Parse/src/main/java/com/parse/Parse.java

@@ -53,8 +53,20 @@ public static final class Builder {
       private String clientKey;
       private String server = "https://api.parse.com/1/";
       private boolean localDataStoreEnabled;
+        private int socketTimeout = 10 * 1000; //10 seconds
+        private int maxRetries = 4;
       private List<ParseNetworkInterceptor> interceptors;
 
+        public Builder socketTimeout(int socketTimeout) {
+            this.socketTimeout = socketTimeout;
+            return this;
+        }
+
+        public Builder maxRetries(int maxRetries) {
+            this.maxRetries = maxRetries;
+            return this;
+        }
+
       /**
        * Initialize a bulider with a given context.
        *
@@ -210,13 +222,17 @@ public Configuration build() {
     /* package for tests */ final String server;
     /* package for tests */ final boolean localDataStoreEnabled;
     /* package for tests */ final List<ParseNetworkInterceptor> interceptors;
+      /* package for tests */ final int socketTimeout;
+      /* package for tests */ final int maxRetries;
 
     private Configuration(Builder builder) {
       this.context = builder.context;
       this.applicationId = builder.applicationId;
       this.clientKey = builder.clientKey;
       this.server = builder.server;
       this.localDataStoreEnabled = builder.localDataStoreEnabled;
+        this.socketTimeout = builder.socketTimeout;
+        this.maxRetries = builder.maxRetries;
       this.interceptors = builder.interceptors != null ?
         Collections.unmodifiableList(new ArrayList<>(builder.interceptors)) :
         null;
@@ -382,6 +398,9 @@ public static void initialize(Configuration configuration) {
     // isLocalDataStoreEnabled() to perform additional behavior.
     isLocalDatastoreEnabled = configuration.localDataStoreEnabled;
 
+      ParsePlugins.socketOperationTimeout = configuration.socketTimeout;
+      ParseRequest.maxNetworkRetries = configuration.maxRetries;
+
     ParsePlugins.Android.initialize(configuration.context, configuration.applicationId, configuration.clientKey);
 
     try {

Parse/src/main/java/com/parse/ParsePlugins.java

@@ -65,6 +65,8 @@
   /* package */ File cacheDir;
   /* package */ File filesDir;
 
+    /* package */ static int socketOperationTimeout = 10 * 1000; //10 seconds
+
   private ParsePlugins(String applicationId, String clientKey) {
     this.applicationId = applicationId;
     this.clientKey = clientKey;
@@ -79,9 +81,8 @@ private ParsePlugins(String applicationId, String clientKey) {
   }
 
   /* package */ ParseHttpClient newHttpClient() {
-    int socketOperationTimeout = 10 * 1000; // 10 seconds
     return ParseHttpClient.createClient(
-        socketOperationTimeout,
+            socketOperationTimeout,
         null);
   }
 
@@ -171,7 +172,6 @@ private Android(Context context, String applicationId, String clientKey) {
     @Override
     public ParseHttpClient newHttpClient() {
       SSLSessionCache sslSessionCache = new SSLSessionCache(applicationContext);
-      int socketOperationTimeout = 10 * 1000; // 10 seconds
       return ParseHttpClient.createClient(
           socketOperationTimeout,
           sslSessionCache);

Parse/src/main/java/com/parse/ParseRESTCommand.java

@@ -188,7 +188,7 @@ public static ParseRESTCommand fromJSONObject(JSONObject jsonObject) {
 
   // TODO(grantland): But we don't disable retries by default...
   /* package */ void enableRetrying() {
-    setMaxRetries(DEFAULT_MAX_RETRIES);
+    setMaxRetries(ParseRequest.maxNetworkRetries);
   }
 
   private static String createUrl(String httpPath) {

Parse/src/main/java/com/parse/ParseRequest.java

@@ -67,6 +67,7 @@ private static ThreadPoolExecutor newThreadPoolExecutor(int corePoolSize, int ma
       new LinkedBlockingQueue<Runnable>(MAX_QUEUE_SIZE), sThreadFactory);
 
   protected static final int DEFAULT_MAX_RETRIES = 4;
+    /* package */ static int maxNetworkRetries = DEFAULT_MAX_RETRIES;
   /* package */ static final long DEFAULT_INITIAL_RETRY_DELAY = 1000L;
 
   private static long defaultInitialRetryDelay = DEFAULT_INITIAL_RETRY_DELAY;
@@ -78,7 +79,11 @@ public static long getDefaultInitialRetryDelay() {
     return defaultInitialRetryDelay;
   }
 
-  private int maxRetries = DEFAULT_MAX_RETRIES;
+    /**
+     * Use maxNetworkRetries as default value for each request.
+     * This allows the value to be configured when Parse is initialized, rather then using a hardcoded value
+     */
+    private int maxRetries = ParseRequest.maxNetworkRetries;
 
   /* package */ ParseHttpRequest.Method method;
   /* package */ String url;