3.1.0

Author: Guillaume Badi

.gitignore

@@ -2,3 +2,4 @@
 
 # Package Files #
 *.DS_Store
+/target/

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

@@ -18,6 +18,7 @@
 
 import com.mailjet.client.errors.MailjetException;
 import com.turbomanage.httpclient.BasicHttpClient;
+import com.turbomanage.httpclient.BasicRequestHandler;
 import com.turbomanage.httpclient.ConsoleRequestLogger;
 import com.turbomanage.httpclient.HttpResponse;
 import com.turbomanage.httpclient.ParameterMap;
@@ -41,6 +42,7 @@ public class MailjetClient {
 
     private String _baseUrl = "https://api.mailjet.com/v3";
     private BasicHttpClient _client;
+    private BasicRequestHandler _handler;
 
     private String _apiKey;
     private String _apiSecret;
@@ -85,7 +87,7 @@ public void logResponse(HttpResponse hr) {}
 
         _client
               .addHeader("Accept", "application/json")
-              .addHeader("user-agent", "mailjet-apiv3-java/v3.0.0")
+              .addHeader("user-agent", "mailjet-apiv3-java/v3.1.0")
               .addHeader("Authorization", "Basic " + authEncBytes);
     }
 
@@ -121,6 +123,7 @@ public MailjetResponse get(MailjetRequest request) throws MailjetException {
             ParameterMap p = new ParameterMap();
             p.putAll(request._filters);
             HttpResponse response = _client.get(url, p);
+            
             return new MailjetResponse(
                     response.getStatus(),
                     new JSONObject(response.getBodyAsString())
@@ -152,7 +155,7 @@ public MailjetResponse post(MailjetRequest request) throws MailjetException {
             HttpResponse response;
             String json;
 
-            response = _client.post(_baseUrl + url, request.getContentType(), request.getBody().getBytes());
+            response = _client.post(_baseUrl + url, request.getContentType(), request.getBody().getBytes("UTF8"));
             json = (response.getBodyAsString() != null ? response.getBodyAsString() : "{}");
             return new MailjetResponse(response.getStatus(), new JSONObject(json));
         } catch (MalformedURLException ex) {
@@ -174,7 +177,7 @@ public MailjetResponse put(MailjetRequest request) throws MailjetException {
 
             HttpResponse response;
 
-            response = _client.put(_baseUrl + url, request.getContentType(), request.getBody().getBytes());
+            response = _client.put(_baseUrl + url, request.getContentType(), request.getBody().getBytes("UTF8"));
             return new MailjetResponse(response.getStatus(), new JSONObject(response.getBodyAsString()));
         } catch (MalformedURLException ex) {
             throw new MailjetException("Internal Exception: Malformed Url");

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

@@ -17,6 +17,7 @@
 package com.mailjet.client;
 
 import com.mailjet.client.errors.MailjetException;
+import com.mailjet.client.resource.Contact;
 import com.mailjet.client.resource.Email;
 import org.json.JSONArray;
 import org.json.JSONObject;
@@ -28,28 +29,24 @@
 public class Main {
 
     public static void main(String[] args) throws MailjetException {
-        MailjetClient client;
-        MailjetRequest request;
-        MailjetResponse response;
-        client = new MailjetClient("", "");
-        client.setDebug(MailjetClient.VERBOSE_DEBUG);
-        request = new MailjetRequest(Email.resource)
-                          .property(Email.FROMEMAIL, "gbadi@student.42.fr")
-                          .property(Email.FROMNAME, "Mailjet Pilot")
-                          .property(Email.SUBJECT, "Your email flight plan2!")
-                          .property(Email.TEXTPART, "Dear passenger, welcome to Mailjet! May the delivery force be with you!")
-                          .property(Email.HTMLPART, "<h3>Dear passenger, welcome to <img src=\"cid:logo.gif\">Mailjet!</h3><br />May the delivery force be with you!")
-                          .property(Email.RECIPIENTS, new JSONArray()
-                  .put(new JSONObject()
-                      .put("Email", "gbadi@mailjet.com")))
-                          .property(Email.INLINE_ATTACHMENTS, new JSONArray()
-                  .put(new JSONObject()
-                      .put("Content-type", "image/gif")
-                      .put("Filename", "logo.gif")
-                      .put("content", "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")));
-        response = client.post(request);
-        System.out.println(response);
-        System.out.println(response.getStatus());
-        System.out.println(response.getData());
+        MailjetClient client = new MailjetClient("85480869a17b7d13ef8bd393283d40d9", "f961d94099350d269f661d92e3cc195f");
+
+            MailjetRequest email;
+            JSONArray recipients;
+            MailjetResponse response;
+
+            recipients = new JSONArray()
+                    .put(new JSONObject().put(Contact.EMAIL, "gbadi@mailjet.com"));
+
+            email = new MailjetRequest(Email.resource)
+                        .property(Email.FROMNAME, "Teste")
+                        .property(Email.FROMEMAIL, "gbadi@student.42.fr")
+                        .property(Email.SUBJECT, "Testçndo")
+                        .property(Email.HTMLPART, "<html> <body> <h1>Tesçte</h1> <p>Lorem ipsum..</p></body> </html>")
+                        .property(Email.RECIPIENTS, recipients)
+                        .property(Email.MJCUSTOMID, "JAVA-Email");
+
+            response = client.post(email);
+    
     }
 }

target/classes/com/mailjet/client/Base64.class

@@ -1,5 +1,5 @@
 #Generated by Maven
-#Mon Feb 29 14:05:44 CET 2016
+#Wed Mar 02 09:54:03 CET 2016
 version=3.0.0
 groupId=com.mailjet
 artifactId=client

target/classes/com/mailjet/client/MailjetClient$1.class

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<testsuite tests="1" failures="0" name="com.mailjet.client.MJEasyClientTest" time="0.012" errors="0" skipped="0">
+<testsuite tests="1" failures="0" name="com.mailjet.client.MJEasyClientTest" time="0.015" errors="0" skipped="0">
   <properties>
     <property name="java.runtime.name" value="Java(TM) SE Runtime Environment"/>
     <property name="sun.boot.library.path" value="/Library/Java/JavaVirtualMachines/jdk1.8.0_73.jdk/Contents/Home/jre/lib"/>
@@ -63,5 +63,5 @@
     <property name="ftp.nonProxyHosts" value="local|*.local|169.254/16|*.169.254/16"/>
     <property name="sun.cpu.isalist" value=""/>
   </properties>
-  <testcase classname="com.mailjet.client.MJEasyClientTest" name="testEmailSend" time="0.011"/>
+  <testcase classname="com.mailjet.client.MJEasyClientTest" name="testEmailSend" time="0.015"/>
 </testsuite>

target/classes/com/mailjet/client/MailjetClient.class

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<testsuite tests="3" failures="0" name="com.mailjet.client.MailjetClientTest" time="0.247" errors="0" skipped="0">
+<testsuite tests="3" failures="0" name="com.mailjet.client.MailjetClientTest" time="0.159" errors="0" skipped="0">
   <properties>
     <property name="java.runtime.name" value="Java(TM) SE Runtime Environment"/>
     <property name="sun.boot.library.path" value="/Library/Java/JavaVirtualMachines/jdk1.8.0_73.jdk/Contents/Home/jre/lib"/>
@@ -63,7 +63,7 @@
     <property name="ftp.nonProxyHosts" value="local|*.local|169.254/16|*.169.254/16"/>
     <property name="sun.cpu.isalist" value=""/>
   </properties>
-  <testcase classname="com.mailjet.client.MailjetClientTest" name="testSimpleGet" time="0.074"/>
+  <testcase classname="com.mailjet.client.MailjetClientTest" name="testSimpleGet" time="0.028"/>
   <testcase classname="com.mailjet.client.MailjetClientTest" name="testFilteringGet" time="0"/>
   <testcase classname="com.mailjet.client.MailjetClientTest" name="testActionGet" time="0"/>
 </testsuite>

target/classes/com/mailjet/client/MailjetRequest.class

@@ -1,4 +1,4 @@
 -------------------------------------------------------------------------------
 Test set: com.mailjet.client.MJEasyClientTest
 -------------------------------------------------------------------------------
-Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.011 sec
+Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.016 sec

target/classes/com/mailjet/client/MailjetResponse.class

@@ -1,4 +1,4 @@
 -------------------------------------------------------------------------------
 Test set: com.mailjet.client.MailjetClientTest
 -------------------------------------------------------------------------------
-Tests run: 3, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.247 sec
+Tests run: 3, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.159 sec