release 5.2.4

Author: Vitalii.Chornobryvyi

README.md

@@ -49,6 +49,10 @@ Check out all the resources and all the Java code examples in the [Official Docu
 
 ## Release notes
 
+v5.2.4
+- add ability to attach the file into request
+- fix for uploading CSV file through the DATA API
+
 v5.2.3
 - update dependency versions
 
@@ -88,7 +92,7 @@ Add the following in your `pom.xml`
         <dependency>
             <groupId>com.mailjet</groupId>
             <artifactId>mailjet-client</artifactId>
-            <version>5.2.3</version>
+            <version>5.2.4</version>
         </dependency>
     </dependencies>
 ```

pom.xml

@@ -6,7 +6,7 @@
     <!--General configuration -->
     <groupId>com.mailjet</groupId>
     <artifactId>mailjet-client</artifactId>
-    <version>5.2.3</version>
+    <version>5.2.4</version>
     <packaging>jar</packaging>
     <name>Mailjet Client</name>
     <description>A Mailjet API Client</description>
@@ -27,7 +27,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>[email protected]:mailjet/mailjet-apiv3-java.git</url>
-        <tag>mailjet-client-5.2.3</tag>
+        <tag>mailjet-client-5.2.4</tag>
     </scm>
     <!--License-->
     <licenses>

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

@@ -16,9 +16,11 @@
 
 package com.mailjet.client;
 
+import java.io.File;
 import java.io.IOException;
 import java.io.UnsupportedEncodingException;
 import java.nio.charset.StandardCharsets;
+import java.util.Objects;
 import java.util.concurrent.CompletableFuture;
 
 import com.mailjet.client.errors.MailjetClientCommunicationException;
@@ -38,7 +40,7 @@ public class MailjetClient {
     private ClientOptions _options;
     private OkHttpClient _client;
 
-    private static final String userAgent = "mailjet-apiv3-java/v5.2.3";
+    private static final String userAgent = "mailjet-apiv3-java/v5.2.4";
 
     /**
      * Deprecated - please, use MailjetClient(ClientOptions clientOptions) ctor instead
@@ -160,11 +162,16 @@ public CompletableFuture<MailjetResponse> postAsync(MailjetRequest request) {
     }
 
     private Call getPostCall(MailjetRequest request) throws MailjetException {
-
-        final byte[] bodyContent = request.getBody().getBytes(StandardCharsets.UTF_8);
-
-        final RequestBody requestBody = RequestBody.create(
-                MediaType.parse(request.getContentType()), bodyContent);
+		final File attachment = request.getAttachment();
+		final RequestBody requestBody;
+		final MediaType mediaType = MediaType.parse(request.getContentType());
+		final byte[] bodyContent = request.getBody().getBytes(StandardCharsets.UTF_8);
+
+		if (Objects.nonNull(attachment)) {
+			requestBody = RequestBody.create(mediaType, attachment);
+		} else {
+			requestBody = RequestBody.create(mediaType, bodyContent);
+		}
 
         final Request okHttpRequest = getPreconfiguredRequestBuilder(request)
                 .post(requestBody)

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

@@ -18,6 +18,7 @@
 
 import static com.mailjet.client.MailjetRequestUtil.decodeDecimals;
 
+import java.io.File;
 import java.io.IOException;
 import java.io.UnsupportedEncodingException;
 import java.net.URLEncoder;
@@ -71,6 +72,9 @@ public class MailjetRequest {
 
     private String _data;
 
+	@Getter
+	private File attachment;
+
     @Getter
     private final ApiVersion apiVersion;
 
@@ -102,7 +106,7 @@ public class MailjetRequest {
      * @param res
      */
     public MailjetRequest(Resource res) {
-        this._path = "/REST";
+        this._path = definePath(res);
         _configuration = 1;
         resource = res.getResource();
         _action = res.getAction();
@@ -123,7 +127,7 @@ public MailjetRequest(Resource res) {
      * @param id
      */
     public MailjetRequest(Resource res, long id) {
-        this._path = "/REST";
+        this._path = definePath(res);
         resource = res.getResource();
         _action = res.getAction();
 		_withoutNamespace = res.getWithoutNamespace();
@@ -144,7 +148,7 @@ public MailjetRequest(Resource res, long id) {
      * @param id
      */
     public MailjetRequest(Resource res, String id) {
-        this._path = "/REST";
+        this._path = definePath(res);
         resource = res.getResource();
         _action = res.getAction();
 		_withoutNamespace = res.getWithoutNamespace();
@@ -166,7 +170,7 @@ public MailjetRequest(Resource res, String id) {
      * @param actionid the resource action ID
      */
     public MailjetRequest(Resource res, long id, long actionid) {
-        this._path = "/REST";
+        this._path = definePath(res);
         resource = res.getResource();
         _action = res.getAction();
 		_withoutNamespace = res.getWithoutNamespace();
@@ -184,6 +188,11 @@ public MailjetRequest setData(String path) throws IOException {
         return this;
     }
 
+	public MailjetRequest attachFile(File file) {
+		this.attachment = file;
+		return this;
+	}
+
     /**
      * Pass a String formatted json as the request body
      * @param json
@@ -236,7 +245,7 @@ public JSONObject getBodyJSON() {
      */
     public String getContentType() {
         if ("csvdata".equals(_action))
-            return "text:csv";
+            return "text/plain";
         if ("csverror".equals(_action))
             return "text/plain";
         else
@@ -263,6 +272,8 @@ public String buildUrl(String baseApiUrl) throws UnsupportedEncodingException {
             url = base + '/' + _action;
         else if (_action.equals("managemanycontacts") && id != null)
             url = base + '/' + _action + '/' + id;
+		else if (_action.equals("csvdata"))
+			url = base + '/' + id + '/' + _action + '/' + "text:plain";
         else if (_configuration == 1)
             url = base;
         else if (_configuration == 2)
@@ -359,4 +370,11 @@ public String toString() {
                 .put("Body", _body.toString())
                 .toString();
     }
+
+	private String definePath(Resource res) {
+		if (res.getAction().equals("csvdata")) {
+			return "/DATA";
+		}
+		return "/REST";
+	}
 }

src/main/java/com/mailjet/client/resource/Contactslist.java

@@ -16,6 +16,7 @@
 public class Contactslist {
 
     public static Resource resource = new Resource("contactslist", "", ApiVersion.V3, ApiAuthenticationType.Basic);
+    public static Resource csvDataResource = new Resource("contactslist", "csvdata", ApiVersion.V3, ApiAuthenticationType.Basic);
 
 	public static String ADDRESS = "Address";
 	public static String CREATEDAT = "CreatedAt";

src/main/java/com/mailjet/client/resource/Csvimport.java

@@ -19,6 +19,7 @@ public class Csvimport {
 
 	public static String ALIVEAT = "AliveAt";
 	public static String CONTACTSLIST = "ContactsList";
+	public static String CONTACTSLISTID = "ContactsListID";
 	public static String COUNT = "Count";
 	public static String CURRENT = "Current";
 	public static String DATAID = "DataID";