Merge branch 'develop' of github.com:Adyen/adyen-java-api-library into develop

Author: rkewlani

src/main/java/com/adyen/Client.java

@@ -63,6 +63,30 @@ public Client(String username, String password, Environment environment, String
         this.config.setApplicationName(applicationName);
     }
 
+    public Client(String username, String password, Environment environment, int connectionTimeoutMillis) {
+
+        this.config = new Config();
+        this.config.setUsername(username);
+        this.config.setPassword(password);
+        this.setEnvironment(environment);
+        this.config.setConnectionTimeoutMillis(connectionTimeoutMillis);
+    }
+
+    public Client(String apiKey, Environment environment) {
+
+        this.config = new Config();
+        this.config.setApiKey(apiKey);
+        this.setEnvironment(environment);
+    }
+
+    public Client(String apiKey, Environment environment, int connectionTimeoutMillis) {
+
+        this.config = new Config();
+        this.config.setApiKey(apiKey);
+        this.setEnvironment(environment);
+        this.config.setConnectionTimeoutMillis(connectionTimeoutMillis);
+    }
+
     public void setEnvironment(Environment environment) {
 
         if (environment.equals(Environment.TEST)) {

src/main/java/com/adyen/Config.java

@@ -31,6 +31,7 @@ public class Config {
     protected String marketPayEndpoint;
     protected String applicationName;
     protected String apiKey;
+    protected int connectionTimeoutMillis;
 
     //HPP specific
     protected String hppEndpoint;
@@ -141,5 +142,13 @@ public void setCheckoutEndpoint(String checkoutEndpoint) {
         this.checkoutEndpoint = checkoutEndpoint;
     }
 
+    public int getConnectionTimeoutMillis() {
+        return connectionTimeoutMillis;
+    }
+
+    public void setConnectionTimeoutMillis(int connectionTimeoutMillis) {
+        this.connectionTimeoutMillis = connectionTimeoutMillis;
+    }
+
 
 }

src/main/java/com/adyen/httpclient/HttpURLConnectionClient.java

@@ -56,16 +56,18 @@ public String request(String requestUrl, String requestBody, Config config) thro
     public String request(String requestUrl, String requestBody, Config config, boolean isApiKeyRequired) throws IOException, HTTPClientException {
         HttpURLConnection httpConnection = createRequest(requestUrl, config.getApplicationName());
         String apiKey = config.getApiKey();
+        int connectionTimeoutMillis = config.getConnectionTimeoutMillis();
         // Use Api key if required or if provided
         if (isApiKeyRequired || (apiKey != null && !apiKey.isEmpty())) {
             setApiKey(httpConnection, apiKey);
         } else {
             setBasicAuthentication(httpConnection, config.getUsername(), config.getPassword());
         }
+
+        httpConnection.setConnectTimeout(connectionTimeoutMillis);
         setContentType(httpConnection, "application/json");
-        String response = doPostRequest(httpConnection, requestBody);
 
-        return response;
+        return doPostRequest(httpConnection, requestBody);
     }
 
     private static String getResponseBody(InputStream responseStream) throws IOException {