Merge pull request #150 from mailjet/transactional-email-builder-variables

fixes adding additional quotes to string variables, closes #149

Author: sdiakovskyi-gd

src/main/java/com/mailjet/client/helpers/StringMapSerializer.java

@@ -1,8 +1,6 @@
 package com.mailjet.client.transactional;
 
-import com.google.gson.annotations.JsonAdapter;
 import com.google.gson.annotations.SerializedName;
-import com.mailjet.client.helpers.StringMapSerializer;
 import lombok.Builder;
 import lombok.Singular;
 
@@ -179,20 +177,16 @@ public class TransactionalEmail {
 
     /**
      * Additional email headers.
-     * If the passed value type is not String, it will be serialized as a String with JSON representation of the passed object
      */
     @Singular
-    @JsonAdapter(StringMapSerializer.class)
     private Map<String, Object> headers;
 
     /**
      * Adds variable used to modify the content of your email.
      * Specified as {var_name}:{var_value} pairs.
-     * If the passed value type is not String, it will be serialized as a String with JSON representation of the passed object
      * Enter the information in the template text / HTML part by using the [[var:{var_name}]] format.
      * Equivalent of using X-MJ-Vars header through SMTP.
      */
     @Singular
-    @JsonAdapter(StringMapSerializer.class)
     private Map<String, Object> variables;
 }

src/main/java/com/mailjet/client/transactional/TransactionalEmail.java

@@ -45,6 +45,8 @@ public void SendEmailsRequest_SendsMessage() throws MailjetException, IOExceptio
                 .attachment(Attachment.fromFile(attachmentPath))
                 .header("test-header-key", "test-value")
                 .variable("test-vars-array", new String[] {"a", "b", "c"})
+                .variable("test-vars-string", "abc")
+                .variable("test-vars-primitive", 123)
                 .customID("custom-id-value")
                 .build();
 

src/test/java/com/mailjet/client/TransactionalEmailBuilderIT.java

@@ -0,0 +1,88 @@
+package com.mailjet.client;
+
+import com.mailjet.client.errors.MailjetException;
+import com.mailjet.client.resource.*;
+import com.mailjet.client.resource.sms.SmsSend;
+import com.mailjet.client.transactional.*;
+import com.mailjet.client.transactional.response.SendEmailsResponse;
+import okhttp3.mockwebserver.MockResponse;
+import okhttp3.mockwebserver.MockWebServer;
+import okhttp3.mockwebserver.RecordedRequest;
+import org.json.JSONArray;
+import org.json.JSONObject;
+import org.junit.AfterClass;
+import org.junit.BeforeClass;
+import org.junit.Test;
+
+import java.io.IOException;
+import java.util.HashMap;
+import java.util.Map;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
+public class TransactionalEmailBuilderTest {
+
+    private static MailjetClient client;
+    private static MockWebServer mockWebServer;
+
+    @BeforeClass
+    public static void initialize() throws IOException {
+        mockWebServer = new MockWebServer();
+        mockWebServer.start();
+
+        final ClientOptions clientOptions = ClientOptions
+                .builder()
+                .baseUrl(mockWebServer.url("/").toString())
+                .apiSecretKey("secret-key")
+                .apiKey("api-key")
+                .bearerAccessToken("bearer-token")
+                .build();
+
+        client = new MailjetClient(clientOptions);
+    }
+
+    @Test
+    public void transactionalEmail_WithVariables_ShouldCorrectlyPassVariables() throws MailjetException, InterruptedException {
+
+        // arrange
+        String expectedBody = "{\"Messages\":[{\"Cc\":[],\"TrackClicks\":\"enabled\",\"Bcc\":[],\"Priority\":3,\"Headers\":{},\"From\":{\"Email\":\"xxxxxxxx@xxxxxxx.com\",\"Name\":\"xxxxxxxx xxxxxxxxxx\"},\"Attachments\":[],\"TemplateLanguage\":true,\"TrackOpens\":\"enabled\",\"Variables\":{\"E_DATE\":\"a string text\",\"E_ARRAY\":[\"val1\",\"val2\"],\"E_MAIL_ID\":123},\"CustomID\":\"8c0725fa-403c-496e-ac7e-xxxxxxxxx\",\"InlinedAttachments\":[],\"To\":[{\"Email\":\"xxxxxxxx@xxxxxxx.com\",\"Name\":\"xxxxxxxx xxxxxxxxxx\"}],\"TemplateID\":1234567}]}";
+
+        mockWebServer.enqueue(new MockResponse().setResponseCode(201).setBody("{}"));
+
+        Map<String, Object> variables = new HashMap<>();
+        variables.put("E_DATE", "a string text");
+        variables.put("E_ARRAY", new String[]{"val1", "val2"});
+        variables.put("E_MAIL_ID", 123);
+
+        TransactionalEmail message = TransactionalEmail
+                .builder()
+                .to(new SendContact("xxxxxxxx@xxxxxxx.com", "xxxxxxxx xxxxxxxxxx"))
+                .from(new SendContact("xxxxxxxx@xxxxxxx.com", "xxxxxxxx xxxxxxxxxx"))
+                .templateID(1234567L)
+                .templateLanguage(true)
+                .priority(3)
+                .customID("8c0725fa-403c-496e-ac7e-xxxxxxxxx")
+                .variables(variables)
+                .trackOpens(TrackOpens.ENABLED)
+                .trackClicks(TrackClicks.ENABLED)
+                .build();
+
+        SendEmailsRequest request = SendEmailsRequest.builder()
+                .message(message)
+                .build();
+
+        // act
+        SendEmailsResponse response = request.sendWith(client);
+
+        // assert
+        RecordedRequest recordedRequest = mockWebServer.takeRequest();
+
+        assertEquals(expectedBody, recordedRequest.getBody().readUtf8());
+    }
+
+    @AfterClass
+    public static void tearDown() throws IOException {
+        mockWebServer.shutdown();
+    }
+}