Skip to content

Commit e36f065

Browse files
committed
Add read timeout
1 parent 6ead852 commit e36f065

4 files changed

Lines changed: 37 additions & 4 deletions

File tree

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ Add the following in your `pom.xml`
5959
<dependency>
6060
<groupId>com.mailjet</groupId>
6161
<artifactId>mailjet-client</artifactId>
62-
<version>4.2.0</version>
62+
<version>4.5.0</version>
6363
</dependency>
6464
</dependencies>
6565
```

pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<!--General configuration -->
66
<groupId>com.mailjet</groupId>
77
<artifactId>mailjet-client</artifactId>
8-
<version>4.4.0</version>
8+
<version>4.5.0</version>
99
<packaging>jar</packaging>
1010
<name>Mailjet Client</name>
1111
<description>A Mailjet API Client</description>
@@ -26,7 +26,7 @@
2626
<connection>scm:git:https://github.com/mailjet/mailjet-apiv3-java.git</connection>
2727
<developerConnection>scm:git:https://github.com/mailjet/mailjet-apiv3-java.git</developerConnection>
2828
<url>git@github.com:mailjet/mailjet-apiv3-java.git</url>
29-
<tag>mailjet-client-4.4.0</tag>
29+
<tag>mailjet-client-4.5.0</tag>
3030
</scm>
3131
<!--License-->
3232
<licenses>

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

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,31 +13,63 @@ public class ClientOptions {
1313

1414
private static String defaultBaseURL = "https://api.mailjet.com";
1515
private static String defaultVersion = "v3";
16+
private static Integer defaultTimeout = 10;
1617

1718
private String baseUrl;
1819
private String version;
20+
private Integer timeout;
1921

2022
public ClientOptions() {
2123
this.baseUrl = ClientOptions.defaultBaseURL;
2224
this.version = ClientOptions.defaultVersion;
25+
this.timeout = ClientOptions.defaultTimeout;
26+
}
27+
28+
public ClientOptions(String version, String baseUrl, Integer timeout) {
29+
this.baseUrl = baseUrl;
30+
this.version = version;
31+
this.timeout = timeout;
32+
}
33+
34+
public ClientOptions(Integer timeout) {
35+
this.baseUrl = ClientOptions.defaultBaseURL;
36+
this.version = ClientOptions.defaultVersion;
37+
this.timeout = timeout;
2338
}
2439

2540
public ClientOptions(String version, String baseUrl) {
2641
this.baseUrl = baseUrl;
2742
this.version = version;
43+
this.timeout = ClientOptions.defaultTimeout;
2844
}
2945

3046
public ClientOptions(String version) {
3147
this.baseUrl = ClientOptions.defaultBaseURL;
3248
this.version = version;
49+
this.timeout = ClientOptions.defaultTimeout;
50+
}
51+
52+
public void setBaseUrl(String baseUrl) {
53+
this.baseUrl = baseUrl;
3354
}
3455

3556
public String getBaseUrl() {
3657
return this.baseUrl;
3758
}
3859

60+
public void setVersion(String version) {
61+
this.version = version;
62+
}
63+
3964
public String getVersion() {
4065
return this.version;
4166
}
4267

68+
public void setTimeout(Integer timeout) {
69+
this.timeout = timeout;
70+
}
71+
72+
public Integer getTimeout() {
73+
return this.timeout;
74+
}
4375
}

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ public class MailjetClient {
5252
private String _apiKey;
5353
private String _apiSecret;
5454
private String _token;
55-
private static final String userAgent = "mailjet-apiv3-java/v4.4.0";
55+
private static final String userAgent = "mailjet-apiv3-java/v4.5.0";
5656
private int _debug = 0;
5757

5858
/**
@@ -354,6 +354,7 @@ public MailjetResponse delete(MailjetRequest request) throws MailjetException, M
354354

355355
private void setOptions(ClientOptions options) {
356356
this._options = options;
357+
this._client.setReadTimeout(options.getTimeout());
357358
}
358359

359360
private String createUrl() {

0 commit comments

Comments
 (0)