Merge pull request #124 from cweidenkeller/timeout_to_client_options

Add timeout to ClientOptions Object

Author: cweidenkeller

.gitignore

@@ -4,3 +4,6 @@ target/*
 /.settings/org.eclipse.core.resources.prefs
 /.settings/org.eclipse.jdt.core.prefs
 /.settings/org.eclipse.m2e.core.prefs
+/bin/
+/.idea
+mailjet-client.iml

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.4.0</version>
         </dependency>
     </dependencies>
 ```

pom.xml

@@ -3,7 +3,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.mailjet</groupId>
     <artifactId>mailjet-client</artifactId>
-    <version>4.2.1-SNAPSHOT</version>
+    <version>4.4.0</version>
     <packaging>jar</packaging>
     <name>Mailjet Client</name>
     <description>A Mailjet API Client</description>
@@ -22,7 +22,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.2.1</tag>
+        <tag>v4.4.0</tag>
     </scm>
     <licenses>
         <license>
@@ -52,7 +52,7 @@
         <dependency>
           <groupId>org.json</groupId>
           <artifactId>json</artifactId>
-          <version>20140107</version>
+          <version>20190722</version>
         </dependency>
         <dependency>
             <groupId>junit</groupId>
@@ -98,6 +98,7 @@
             <plugin>
               <groupId>org.apache.maven.plugins</groupId>
               <artifactId>maven-source-plugin</artifactId>
+              <version>3.0.0</version>
               <executions>
                 <execution>
                   <id>attach-sources</id>

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

@@ -13,31 +13,66 @@ 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 String getBaseUrl() {
     return this.baseUrl;
   }
+  
+  public void setBaseUrl(String baseUrl) {
+	  this.baseUrl = baseUrl;
+  }
 
   public String getVersion() {
     return this.version;
   }
+  
+  public void setVersion(String version) {
+	  this.version = version;
+  }
+  
+  public Integer getTimeout() {
+	  return this.timeout;
+  }
+  
+  public void setTimeout(Integer timeout) {
+	  this.timeout = timeout;
+  }
 
 }

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

@@ -52,6 +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 int _debug = 0;
 
     /**
@@ -154,7 +155,7 @@ private void initBasicAuth(String apiKey, String apiSecret) {
 
         _client
               .addHeader("Accept", "application/json")
-              .addHeader("user-agent", "mailjet-apiv3-java/v4.2.1")
+              .addHeader("User-Agent", this.userAgent)
               .addHeader("Authorization", "Basic " + authEncBytes);
 
     }
@@ -164,7 +165,7 @@ private void initTokenAuth(String token) {
 
         _client
               .addHeader("Accept", "application/json")
-              .addHeader("user-agent", "mailjet-apiv3-java/v4.2.1")
+              .addHeader("User-Agent", this.userAgent)
               .addHeader("Authorization", "Bearer " + token);
 
     }
@@ -353,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() {