Merge pull request #128 from mailjet/add_timeout

Add read timeout

Author: cweidenkeller

README.md

@@ -59,7 +59,7 @@ Add the following in your `pom.xml`
         <dependency>
             <groupId>com.mailjet</groupId>
             <artifactId>mailjet-client</artifactId>
-            <version>4.2.0</version>
+            <version>4.5.0</version>
         </dependency>
     </dependencies>
 ```

pom.xml

@@ -5,7 +5,7 @@
     <!--General configuration -->
     <groupId>com.mailjet</groupId>
     <artifactId>mailjet-client</artifactId>
-    <version>4.4.0</version>
+    <version>4.5.0</version>
     <packaging>jar</packaging>
     <name>Mailjet Client</name>
     <description>A Mailjet API Client</description>
@@ -26,7 +26,7 @@
         <connection>scm:git:https://github.com/mailjet/mailjet-apiv3-java.git</connection>
         <developerConnection>scm:git:https://github.com/mailjet/mailjet-apiv3-java.git</developerConnection>
         <url>git@github.com:mailjet/mailjet-apiv3-java.git</url>
-        <tag>mailjet-client-4.4.0</tag>
+        <tag>mailjet-client-4.5.0</tag>
     </scm>
     <!--License-->
     <licenses>

src/main/java/com/mailjet/client/ClientOptions.java

@@ -13,31 +13,63 @@ public class ClientOptions {
 
   private static String defaultBaseURL = "https://api.mailjet.com";
   private static String defaultVersion = "v3";
+  private static Integer defaultTimeout = 10;
 
   private String baseUrl;
   private String version;
+  private Integer timeout;
 
   public ClientOptions() {
     this.baseUrl = ClientOptions.defaultBaseURL;
     this.version = ClientOptions.defaultVersion;
+    this.timeout = ClientOptions.defaultTimeout;
+  }
+
+  public ClientOptions(String version, String baseUrl, Integer timeout) {
+    this.baseUrl = baseUrl;
+    this.version = version;
+    this.timeout = timeout;
+  }
+
+  public ClientOptions(Integer timeout) {
+    this.baseUrl = ClientOptions.defaultBaseURL;
+    this.version = ClientOptions.defaultVersion;
+    this.timeout = timeout;
   }
 
   public ClientOptions(String version, String baseUrl) {
     this.baseUrl = baseUrl;
     this.version = version;
+    this.timeout = ClientOptions.defaultTimeout;
   }
 
   public ClientOptions(String version) {
     this.baseUrl = ClientOptions.defaultBaseURL;
     this.version = version;
+    this.timeout = ClientOptions.defaultTimeout;
+  }
+
+  public void setBaseUrl(String baseUrl) {
+    this.baseUrl = baseUrl;
   }
 
   public String getBaseUrl() {
     return this.baseUrl;
   }
 
+  public void setVersion(String version) {
+    this.version = version;
+  }
+
   public String getVersion() {
     return this.version;
   }
 
+  public void setTimeout(Integer timeout) {
+    this.timeout = timeout;
+  }
+
+  public Integer getTimeout() {
+    return this.timeout;
+  }
 }

src/main/java/com/mailjet/client/MailjetClient.java

@@ -52,7 +52,7 @@ public class MailjetClient {
     private String _apiKey;
     private String _apiSecret;
     private String _token;
-    private static final String userAgent = "mailjet-apiv3-java/v4.4.0";
+    private static final String userAgent = "mailjet-apiv3-java/v4.5.0";
     private int _debug = 0;
 
     /**
@@ -354,6 +354,7 @@ public MailjetResponse delete(MailjetRequest request) throws MailjetException, M
 
     private void setOptions(ClientOptions options) {
         this._options = options;
+        this._client.setReadTimeout(options.getTimeout());
     }
 
     private String createUrl() {