Add timeout, connect_timeout and connection_request_timeout to HTTP43 Api.

Author: Amir Tocker

cloudinary-http43/src/main/java/com/cloudinary/http43/ApiStrategy.java

@@ -33,6 +33,9 @@
 import java.util.List;
 import java.util.Map;
 
+import static com.cloudinary.http43.ApiUtils.prepareParams;
+import static com.cloudinary.http43.ApiUtils.setTimeouts;
+
 public class ApiStrategy extends com.cloudinary.strategies.AbstractApiStrategy {
 
     private CloseableHttpClient client = null;
@@ -85,7 +88,7 @@ public ApiResponse callApi(HttpMethod method, Iterable<String> uri, Map<String,
         for (String component : uri) {
             apiUrl = apiUrl + "/" + component;
         }
-        HttpUriRequest request = prepareRequest(method, apiUrl, params);
+        HttpUriRequest request = prepareRequest(method, apiUrl, params, options);
 
         request.setHeader("Authorization", "Basic " + Base64Coder.encodeString(apiKey + ":" + apiSecret));
 
@@ -131,11 +134,11 @@ public ApiResponse callApi(HttpMethod method, Iterable<String> uri, Map<String,
      * @throws URISyntaxException
      * @throws UnsupportedEncodingException
      */
-    private HttpUriRequest prepareRequest(HttpMethod method, String apiUrl, Map<String, ?> params) throws URISyntaxException, UnsupportedEncodingException {
+    private HttpUriRequest prepareRequest(HttpMethod method, String apiUrl, Map<String, ?> params, Map options) throws URISyntaxException, UnsupportedEncodingException {
         URI apiUri;
         URIBuilder apiUrlBuilder = new URIBuilder(apiUrl);
         List<NameValuePair> parameters;
-        HttpUriRequest request;
+        HttpRequestBase request;
         parameters = prepareParams(params);
         if(method == HttpMethod.GET) {
             apiUrlBuilder.setParameters(parameters);
@@ -158,22 +161,10 @@ private HttpUriRequest prepareRequest(HttpMethod method, String apiUrl, Map<Stri
             }
             ((HttpEntityEnclosingRequestBase) request).setEntity(new UrlEncodedFormEntity(parameters));
         }
+
+        setTimeouts(request, options);
         return request;
     }
 
-    private List<NameValuePair> prepareParams(Map<String, ?> params) {
-        List<NameValuePair> requestParams = new ArrayList<NameValuePair>(params.size());
-        for (Map.Entry<String, ?> param : params.entrySet()) {
-            if (param.getValue() instanceof Iterable) {
-                for (Object single : (Iterable<?>) param.getValue()) {
-                    requestParams.add(new BasicNameValuePair(param.getKey() + "[]", ObjectUtils.asString(single)));
-                }
-            } else {
-                requestParams.add(new BasicNameValuePair(param.getKey(), ObjectUtils.asString(param.getValue())));
-            }
-        }
-
 
-        return requestParams;
-    }
 }

cloudinary-http43/src/main/java/com/cloudinary/http43/ApiUtils.java

@@ -0,0 +1,53 @@
+package com.cloudinary.http43;
+
+import com.cloudinary.utils.ObjectUtils;
+import org.apache.http.NameValuePair;
+import org.apache.http.client.config.RequestConfig;
+import org.apache.http.client.methods.HttpRequestBase;
+import org.apache.http.message.BasicNameValuePair;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+public class ApiUtils {
+
+    public static void setTimeouts(HttpRequestBase request, Map options) {
+        RequestConfig config= request.getConfig();
+        final RequestConfig.Builder builder;
+        if (config != null) {
+            builder = RequestConfig.copy(config);
+        } else {
+            builder = RequestConfig.custom();
+        }
+        Integer timeout = (Integer) options.get("timeout");
+        if(timeout != null) {
+                builder.setSocketTimeout(timeout);
+        }
+        Integer connectionRequestTimeout = (Integer) options.get("connection_request_timeout");
+        if(connectionRequestTimeout != null) {
+            builder.setConnectionRequestTimeout(connectionRequestTimeout);
+        }
+        Integer connectTimeout = (Integer) options.get("connect_timeout");
+        if(connectTimeout != null) {
+            builder.setConnectTimeout(connectTimeout);
+        }
+        request.setConfig(builder.build());
+    }
+
+    static List<NameValuePair> prepareParams(Map<String, ?> params) {
+        List<NameValuePair> requestParams = new ArrayList<NameValuePair>(params.size());
+        for (Map.Entry<String, ?> param : params.entrySet()) {
+            if (param.getValue() instanceof Iterable) {
+                for (Object single : (Iterable<?>) param.getValue()) {
+                    requestParams.add(new BasicNameValuePair(param.getKey() + "[]", ObjectUtils.asString(single)));
+                }
+            } else {
+                requestParams.add(new BasicNameValuePair(param.getKey(), ObjectUtils.asString(param.getValue())));
+            }
+        }
+
+
+        return requestParams;
+    }
+}

cloudinary-http43/src/main/java/com/cloudinary/http43/UploaderStrategy.java

@@ -71,6 +71,7 @@ public Map callApi(String action, Map<String, Object> params, Map options, Objec
         String apiUrl = uploader.cloudinary().cloudinaryApiUrl(action, options);
 
         HttpPost postMethod = new HttpPost(apiUrl);
+        ApiUtils.setTimeouts(postMethod, options);
 
         Map<String, String> extraHeaders = (Map<String, String>) options.get("extra_headers");
         if (extraHeaders != null) {

cloudinary-http43/src/test/java/com/cloudinary/test/ApiTest.java

@@ -1,4 +1,31 @@
 package com.cloudinary.test;
 
+import com.cloudinary.api.ApiResponse;
+import com.cloudinary.utils.ObjectUtils;
+import org.apache.http.conn.ConnectTimeoutException;
+import org.junit.Test;
+
+import java.net.SocketTimeoutException;
+import java.util.Map;
+
 public class ApiTest extends AbstractApiTest {
+
+    @Test(expected = ConnectTimeoutException.class)
+    public void testConnectTimeoutParameter() throws Exception {
+        // should allow listing resources
+        Map options = ObjectUtils.asMap(
+                "max_results", 500,
+                "connect_timeout", 1);
+        ApiResponse result = cloudinary.api().resources(options);
+    }
+
+    @Test(expected = SocketTimeoutException.class)
+    public void testTimeoutParameter() throws Exception {
+        // should allow listing resources
+        Map options = ObjectUtils.asMap(
+                "max_results", 500,
+                "timeout", 1);
+        ApiResponse result = cloudinary.api().resources(options);
+    }
+
 }

cloudinary-http43/src/test/java/com/cloudinary/test/UploaderTest.java

@@ -1,5 +1,31 @@
 package com.cloudinary.test;
 
+import com.cloudinary.api.ApiResponse;
+import com.cloudinary.utils.ObjectUtils;
+import org.apache.http.conn.ConnectTimeoutException;
+import org.junit.Test;
+
+import java.net.SocketTimeoutException;
+import java.util.Map;
+
 public class UploaderTest extends AbstractUploaderTest {
 
+    @Test(expected = ConnectTimeoutException.class)
+    public void testConnectTimeoutParameter() throws Exception {
+        // should allow listing resources
+        Map options = ObjectUtils.asMap(
+                "max_results", 500,
+                "connect_timeout", 1);
+        ApiResponse result = cloudinary.api().resources(options);
+    }
+
+    @Test(expected = SocketTimeoutException.class)
+    public void testTimeoutParameter() throws Exception {
+        // should allow listing resources
+        Map options = ObjectUtils.asMap(
+                "max_results", 500,
+                "timeout", 1);
+        ApiResponse result = cloudinary.api().resources(options);
+    }
+
 }