Fix Http client 5.0 init (#369)

Author: adimiz1

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

@@ -8,15 +8,20 @@
 import com.cloudinary.strategies.AbstractApiStrategy;
 import com.cloudinary.utils.ObjectUtils;
 import org.apache.hc.client5.http.classic.methods.*;
+import org.apache.hc.client5.http.config.RequestConfig;
 import org.apache.hc.client5.http.entity.UrlEncodedFormEntity;
 import org.apache.hc.client5.http.impl.classic.CloseableHttpClient;
 import org.apache.hc.client5.http.impl.classic.CloseableHttpResponse;
+import org.apache.hc.client5.http.impl.classic.HttpClientBuilder;
 import org.apache.hc.client5.http.impl.classic.HttpClients;
+import org.apache.hc.client5.http.io.HttpClientConnectionManager;
 import org.apache.hc.core5.http.HttpEntity;
+import org.apache.hc.core5.http.HttpHost;
 import org.apache.hc.core5.http.NameValuePair;
 import org.apache.hc.core5.http.io.entity.EntityUtils;
 import org.apache.hc.core5.http.io.entity.StringEntity;
 import org.apache.hc.core5.net.URIBuilder;
+import org.apache.hc.core5.util.Timeout;
 import org.cloudinary.json.JSONException;
 import org.cloudinary.json.JSONObject;
 
@@ -36,15 +41,42 @@ public class ApiStrategy extends AbstractApiStrategy {
 
     private CloseableHttpClient client;
 
-    @Override
     public void init(Api api) {
         super.init(api);
 
-        this.client = HttpClients.custom()
-                .setUserAgent(this.api.cloudinary.getUserAgent() + " ApacheHttpClient/" + APACHE_HTTP_CLIENT_VERSION)
+        HttpClientBuilder clientBuilder = HttpClients.custom();
+        clientBuilder.useSystemProperties().setUserAgent(this.api.cloudinary.getUserAgent() + " ApacheHttpClient/" + APACHE_HTTP_CLIENT_VERSION);
+
+        HttpClientConnectionManager connectionManager = (HttpClientConnectionManager) api.cloudinary.config.properties.get("connectionManager");
+        if (connectionManager != null) {
+            clientBuilder.setConnectionManager(connectionManager);
+        }
+
+        RequestConfig requestConfig = buildRequestConfig();
+
+        client = clientBuilder
+                .setDefaultRequestConfig(requestConfig)
                 .build();
     }
 
+    public RequestConfig buildRequestConfig() {
+        RequestConfig.Builder requestConfigBuilder = RequestConfig.custom();
+
+        if (api.cloudinary.config.proxyHost != null && api.cloudinary.config.proxyPort != 0) {
+            HttpHost proxy = new HttpHost(api.cloudinary.config.proxyHost, api.cloudinary.config.proxyPort);
+            requestConfigBuilder.setProxy(proxy);
+        }
+
+        int timeout = this.api.cloudinary.config.timeout;
+        if (timeout > 0) {
+            requestConfigBuilder.setResponseTimeout(Timeout.ofSeconds(timeout))
+                    .setConnectionRequestTimeout(Timeout.ofSeconds(timeout))
+                    .setConnectTimeout(Timeout.ofSeconds(timeout));
+        }
+
+        return requestConfigBuilder.build();
+    }
+
     @SuppressWarnings({"rawtypes", "unchecked"})
     public ApiResponse callApi(Api.HttpMethod method, String apiUrl, Map<String, ?> params, Map options, String autorizationHeader) throws Exception {
         HttpUriRequestBase request = prepareRequest(method, apiUrl, params, options);

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

@@ -1,15 +1,50 @@
 package com.cloudinary.test;
 
+import com.cloudinary.Cloudinary;
 import com.cloudinary.api.ApiResponse;
+import com.cloudinary.http5.ApiStrategy;
 import com.cloudinary.utils.ObjectUtils;
+import org.apache.hc.client5.http.config.RequestConfig;
+import org.apache.hc.core5.http.HttpHost;
 import org.apache.hc.core5.util.Timeout;
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
+
 import java.util.Map;
 
 
 public class ApiTest extends AbstractApiTest {
 
+    @Test
+    public void testBuildRequestConfig_withProxyAndTimeout() {
+        Cloudinary cloudinary = new Cloudinary("cloudinary://test:test@test.com");
+        cloudinary.config.proxyHost = "127.0.0.1";
+        cloudinary.config.proxyPort = 8080;
+        cloudinary.config.timeout = 15;
+
+        RequestConfig requestConfig = ((ApiStrategy)cloudinary.api().getStrategy()).buildRequestConfig();
+
+        assert(requestConfig.getProxy() != null);
+        HttpHost proxy = requestConfig.getProxy();
+        assert("127.0.0.1" == proxy.getHostName());
+        assert(8080 == proxy.getPort());
+
+        assert(15000 == requestConfig.getConnectionRequestTimeout().toMilliseconds());
+        assert(15000 == requestConfig.getResponseTimeout().toMilliseconds());
+    }
+
+    @Test
+    public void testBuildRequestConfig_withoutProxy() {
+        Cloudinary cloudinary = new Cloudinary("cloudinary://test:test@test.com");
+        cloudinary.config.timeout = 10;
+
+        RequestConfig requestConfig = ((ApiStrategy)cloudinary.api().getStrategy()).buildRequestConfig();
+
+        assert(requestConfig.getProxy() == null);
+        assert(10000 == requestConfig.getConnectionRequestTimeout().toMilliseconds());
+        assert(10000 == requestConfig.getResponseTimeout().toMilliseconds());
+    }
+
     @Category(TimeoutTest.class)
     @Test(expected = Exception.class)
     public void testConnectTimeoutParameter() throws Exception {
@@ -41,5 +76,4 @@ public void testTimeoutParameter() throws Exception {
             throw new Exception("Socket timeout");
         }
     }
-}
-
+}