removes unused serializer, adds tests for different types of variables

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

@@ -46,14 +46,14 @@ public static void initialize() throws IOException {
     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_YEAR\":\"another text\",\"E_MAIL_ID\":\"a last text example\"},\"CustomID\":\"8c0725fa-403c-496e-ac7e-xxxxxxxxx\",\"InlinedAttachments\":[],\"To\":[{\"Email\":\"xxxxxxxx@xxxxxxx.com\",\"Name\":\"xxxxxxxx xxxxxxxxxx\"}],\"TemplateID\":1234567}]}";
+        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, String> variables = new HashMap<>();
+        Map<String, Object> variables = new HashMap<>();
         variables.put("E_DATE", "a string text");
-        variables.put("E_YEAR", "another text");
-        variables.put("E_MAIL_ID", "a last text example");
+        variables.put("E_ARRAY", new String[]{"val1", "val2"});
+        variables.put("E_MAIL_ID", 123);
 
         TransactionalEmail message = TransactionalEmail
                 .builder()