enable LeanCloud#setNetworkTimeout(seconds) method

Author: jwfing

core/src/main/java/cn/leancloud/core/AppConfiguration.java

@@ -20,7 +20,7 @@ public class AppConfiguration {
   public interface SchedulerCreator{
     Scheduler create();
   }
-  public static final int DEFAULT_NETWORK_TIMEOUT = 30;
+  public static final int DEFAULT_NETWORK_TIMEOUT = 10;
 
   private static LCACL defaultACL;
   private static int networkTimeout = DEFAULT_NETWORK_TIMEOUT;
@@ -49,8 +49,11 @@ public interface SchedulerCreator{
   private static final String DEFAULT_USER_AGENT = "LeanCloud-Java-SDK/" + SDK_VERSION;
 
   public static void setNetworkTimeout(int seconds) {
-    networkTimeout = seconds;
+    if (seconds > 0) {
+      networkTimeout = seconds;
+    }
   }
+
   public static int getNetworkTimeout() {
     return networkTimeout;
   }

core/src/main/java/cn/leancloud/core/PaasClient.java

@@ -26,9 +26,9 @@ public class PaasClient {
   public static OkHttpClient getGlobalOkHttpClient() {
     if (null == globalHttpClient) {
       globalHttpClient = new OkHttpClient.Builder()
-              .connectTimeout(15, TimeUnit.SECONDS)
-              .readTimeout(10, TimeUnit.SECONDS)
-              .writeTimeout(10, TimeUnit.SECONDS)
+              .connectTimeout(AppConfiguration.getNetworkTimeout(), TimeUnit.SECONDS)
+              .readTimeout(AppConfiguration.getNetworkTimeout(), TimeUnit.SECONDS)
+              .writeTimeout(AppConfiguration.getNetworkTimeout(), TimeUnit.SECONDS)
               .addInterceptor(new RequestPaddingInterceptor())
               .addInterceptor(new LoggingInterceptor())
               .dns(new DNSDetoxicant())
@@ -91,4 +91,13 @@ public static PushClient getPushClient() {
     }
     return pushClient;
   }
+
+  // add method for unit tests in LeanCloudTest.java
+  static void cleanup() {
+	  apiService = null;
+	  storageClient = null;
+	  pushService = null;
+	  pushClient = null;
+	  globalHttpClient = null;
+  }
 }

core/src/test/java/cn/leancloud/core/LeanCloudTest.java

@@ -5,6 +5,9 @@
 import io.reactivex.Observer;
 import io.reactivex.disposables.Disposable;
 import junit.framework.TestCase;
+import okhttp3.OkHttpClient;
+import okhttp3.Request;
+import okhttp3.Response;
 
 import java.util.concurrent.CountDownLatch;
 
@@ -14,7 +17,6 @@ public class LeanCloudTest extends TestCase {
 
   public LeanCloudTest(String name) {
     super(name);
-    Configure.initializeRuntime();
   }
 
   @Override
@@ -23,7 +25,67 @@ protected void setUp() throws Exception {
     testSucceed = false;
   }
 
+  public void testNetworkTimeout() throws Exception {
+	  PaasClient.cleanup();
+	  LeanCloud.setNetworkTimeout(10); // recover to default value.
+    Configure.initializeRuntime();
+	  OkHttpClient okhttpClient = PaasClient.getGlobalOkHttpClient();
+
+	  Request request = new Request.Builder().url("https://httpbin.org/delay/15").build();
+	  try {
+	      okhttpClient.newCall(request).execute();
+	  } catch (Exception ex) {
+		  System.out.println("failed to get response, due to time-out");
+		  ex.printStackTrace();
+		  testSucceed = true;
+	  }
+	  assertTrue(testSucceed);
+
+	  request = new Request.Builder().url("https://httpbin.org/delay/5").build();
+	  try {
+		  Response response = okhttpClient.newCall(request).execute();
+	      System.out.println("Succeed to get response...." + response.body().string());
+		  testSucceed = true;
+	  } catch (Exception ex) {
+		  ex.printStackTrace();
+		  testSucceed = false;
+	  }
+	  assertTrue(testSucceed);
+  }
+
+  public void testNetworkTimeoutWithSpecifiedValue() throws Exception {
+	  PaasClient.cleanup();
+	  LeanCloud.setNetworkTimeout(6);
+	  Configure.initializeRuntime();
+	  OkHttpClient okhttpClient = PaasClient.getGlobalOkHttpClient();
+
+	  Request request = new Request.Builder().url("https://httpbin.org/delay/8").build();
+	  try {
+		  Response response = okhttpClient.newCall(request).execute();
+	      System.out.println("Succeed to get response...." + response.body().string());
+	  } catch (Exception ex) {
+		  System.out.println("failed to get response, due to time-out");
+		  ex.printStackTrace();
+		  testSucceed = true;
+	  }
+	  assertTrue(testSucceed);
+
+	  request = new Request.Builder().url("https://httpbin.org/delay/5").build();
+	  try {
+		  Response response = okhttpClient.newCall(request).execute();
+	      System.out.println("Succeed to get response...." + response.body().string());
+		  testSucceed = true;
+	  } catch (Exception ex) {
+		  ex.printStackTrace();
+		  testSucceed = false;
+	  }
+	  assertTrue(testSucceed);
+  }
+
   public void testServerDate() throws Exception {
+	  PaasClient.cleanup();
+	  LeanCloud.setNetworkTimeout(10); // recover to default value.
+    Configure.initializeRuntime();
     LeanCloud.getServerDateInBackground().subscribe(new Observer<LCDate>() {
       @Override
       public void onSubscribe(Disposable disposable) {