Skip to content

Commit 513173a

Browse files
Atanas Damyanlievlesv
Atanas Damyanliev
authored and
lesv
committed
updating Mailjet code samples for Send API v3.1 (GoogleCloudPlatform#811)
* update MailjetServlet.java updating MailjetServlet.java to match Send API v3.1 configuration * update MailjetServlet.java updated MailjetServlet.java to match Send API v3.1 configuration * update MailjetServlet.java updated to match Send API v3.1 config * fixing spacing * fixing spacing * fixing spacing
1 parent c12ba10 commit 513173a

File tree

3 files changed

+46
-33
lines changed

3 files changed

+46
-33
lines changed

‎appengine/mailjet/src/main/java/com/example/appengine/mailjet/MailjetServlet.java

+15-11
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,9 @@
2020
import com.mailjet.client.MailjetRequest;
2121
import com.mailjet.client.MailjetResponse;
2222
import com.mailjet.client.errors.MailjetException;
23+
import com.mailjet.client.ClientOptions;
2324
import com.mailjet.client.errors.MailjetSocketTimeoutException;
24-
import com.mailjet.client.resource.Email;
25+
import com.mailjet.client.resource.Emailv31;
2526
// [END mailjet_imports]
2627

2728
import org.json.JSONArray;
@@ -39,23 +40,26 @@
3940
public class MailjetServlet extends HttpServlet {
4041
private static final String MAILJET_API_KEY = System.getenv("MAILJET_API_KEY");
4142
private static final String MAILJET_SECRET_KEY = System.getenv("MAILJET_SECRET_KEY");
42-
private MailjetClient client = new MailjetClient(MAILJET_API_KEY, MAILJET_SECRET_KEY);
43+
private MailjetClient client = new MailjetClient(MAILJET_API_KEY, MAILJET_SECRET_KEY, new ClientOptions("v3.1"));
4344

4445
@Override
4546
public void doPost(HttpServletRequest req, HttpServletResponse resp) throws IOException,
4647
ServletException {
4748
String recipient = req.getParameter("to");
4849
String sender = req.getParameter("from");
4950

50-
MailjetRequest email = new MailjetRequest(Email.resource)
51-
.property(Email.FROMEMAIL, sender)
52-
.property(Email.FROMNAME, "pandora")
53-
.property(Email.SUBJECT, "Your email flight plan!")
54-
.property(Email.TEXTPART,
55-
"Dear passenger, welcome to Mailjet! May the delivery force be with you!")
56-
.property(Email.HTMLPART,
57-
"<h3>Dear passenger, welcome to Mailjet!</h3><br/>May the delivery force be with you!")
58-
.property(Email.RECIPIENTS, new JSONArray().put(new JSONObject().put("Email", recipient)));
51+
MailjetRequest email = new MailjetRequest(Emailv31.resource)
52+
.property(Emailv31.MESSAGES, new JSONArray()
53+
.put(new JSONObject()
54+
.put(Emailv31.Message.FROM, new JSONObject()
55+
.put("Email", sender)
56+
.put("Name", "pandora"))
57+
.put(Emailv31.Message.TO, new JSONArray()
58+
.put(new JSONObject()
59+
.put("Email", recipient)))
60+
.put(Emailv31.Message.SUBJECT, "Your email flight plan!")
61+
.put(Emailv31.Message.TEXTPART, "Dear passenger, welcome to Mailjet! May the delivery force be with you!")
62+
.put(Emailv31.Message.HTMLPART, "<h3>Dear passenger, welcome to Mailjet!</h3><br />May the delivery force be with you!")));
5963

6064
try {
6165
// trigger the API call

‎compute/mailjet/src/main/java/com/example/compute/mailjet/MailjetSender.java

+16-11
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,9 @@
2121
import com.mailjet.client.MailjetRequest;
2222
import com.mailjet.client.MailjetResponse;
2323
import com.mailjet.client.errors.MailjetException;
24+
import com.mailjet.client.ClientOptions;
2425
import com.mailjet.client.errors.MailjetSocketTimeoutException;
25-
import com.mailjet.client.resource.Email;
26+
import com.mailjet.client.resource.Emailv31;
2627
// [END mailjet_imports]
2728

2829
import org.json.JSONArray;
@@ -34,23 +35,27 @@ public class MailjetSender{
3435
public static void main(String[] args) throws MailjetException, MailjetSocketTimeoutException {
3536
final String mailjetApiKey = "YOUR-MAILJET-API-KEY";
3637
final String mailjetSecretKey = "YOUR-MAILJET-SECRET-KEY";
37-
MailjetClient client = new MailjetClient(mailjetApiKey, mailjetSecretKey);
38+
MailjetClient client = new MailjetClient(mailjetApiKey, mailjetSecretKey, new ClientOptions("v3.1"));
3839

3940
MailjetSender sender = new MailjetSender();
4041
sender.sendMailjet(args[0], args[1], client);
4142
}
4243

4344
public MailjetResponse sendMailjet(String recipient, String sender, MailjetClient client)
4445
throws MailjetException, MailjetSocketTimeoutException {
45-
MailjetRequest email = new MailjetRequest(Email.resource)
46-
.property(Email.FROMEMAIL, sender)
47-
.property(Email.FROMNAME, "pandora")
48-
.property(Email.SUBJECT, "Your email flight plan!")
49-
.property(Email.TEXTPART,
50-
"Dear passenger, welcome to Mailjet! May the delivery force be with you!")
51-
.property(Email.HTMLPART,
52-
"<h3>Dear passenger, welcome to Mailjet!</h3><br/>May the delivery force be with you!")
53-
.property(Email.RECIPIENTS, new JSONArray().put(new JSONObject().put("Email", recipient)));
46+
MailjetRequest email = new MailjetRequest(Emailv31.resource)
47+
.property(Emailv31.MESSAGES, new JSONArray()
48+
.put(new JSONObject()
49+
.put(Emailv31.Message.FROM, new JSONObject()
50+
.put("Email", sender)
51+
.put("Name", "pandora"))
52+
.put(Emailv31.Message.TO, new JSONArray()
53+
.put(new JSONObject()
54+
.put("Email", recipient)))
55+
.put(Emailv31.Message.SUBJECT, "Your email flight plan!")
56+
.put(Emailv31.Message.TEXTPART, "Dear passenger, welcome to Mailjet! May the delivery force be with you!")
57+
.put(Emailv31.Message.HTMLPART, "<h3>Dear passenger, welcome to Mailjet!</h3><br />May the delivery force be with you!")));
58+
5459

5560
try {
5661
// trigger the API call

‎flexible/mailjet/src/main/java/com/example/mailjet/MailjetServlet.java

+15-11
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,8 @@
2222
import com.mailjet.client.MailjetResponse;
2323
import com.mailjet.client.errors.MailjetException;
2424
import com.mailjet.client.errors.MailjetSocketTimeoutException;
25-
import com.mailjet.client.resource.Email;
25+
import com.mailjet.client.ClientOptions;
26+
import com.mailjet.client.resource.Emailv31;
2627
// [END mailjet_imports]
2728

2829
import org.json.JSONArray;
@@ -42,23 +43,26 @@
4243
public class MailjetServlet extends HttpServlet {
4344
private static final String MAILJET_API_KEY = System.getenv("MAILJET_API_KEY");
4445
private static final String MAILJET_SECRET_KEY = System.getenv("MAILJET_SECRET_KEY");
45-
private MailjetClient client = new MailjetClient(MAILJET_API_KEY, MAILJET_SECRET_KEY);
46+
private MailjetClient client = new MailjetClient(MAILJET_API_KEY, MAILJET_SECRET_KEY, new ClientOptions("v3.1"));
4647

4748
@Override
4849
public void doPost(HttpServletRequest req, HttpServletResponse resp) throws IOException,
4950
ServletException {
5051
String recipient = req.getParameter("to");
5152
String sender = req.getParameter("from");
5253

53-
MailjetRequest email = new MailjetRequest(Email.resource)
54-
.property(Email.FROMEMAIL, sender)
55-
.property(Email.FROMNAME, "pandora")
56-
.property(Email.SUBJECT, "Your email flight plan!")
57-
.property(Email.TEXTPART,
58-
"Dear passenger, welcome to Mailjet! May the delivery force be with you!")
59-
.property(Email.HTMLPART,
60-
"<h3>Dear passenger, welcome to Mailjet!</h3><br/>May the delivery force be with you!")
61-
.property(Email.RECIPIENTS, new JSONArray().put(new JSONObject().put("Email", recipient)));
54+
MailjetRequest email = new MailjetRequest(Emailv31.resource)
55+
.property(Emailv31.MESSAGES, new JSONArray()
56+
.put(new JSONObject()
57+
.put(Emailv31.Message.FROM, new JSONObject()
58+
.put("Email", sender)
59+
.put("Name", "Mailjet Pilot"))
60+
.put(Emailv31.Message.TO, new JSONArray()
61+
.put(new JSONObject()
62+
.put("Email", recipient)))
63+
.put(Emailv31.Message.SUBJECT, "Your email flight plan!")
64+
.put(Emailv31.Message.TEXTPART, "Dear passenger, welcome to Mailjet! May the delivery force be with you!")
65+
.put(Emailv31.Message.HTMLPART, "<h3>Dear passenger, welcome to Mailjet!</h3><br />May the delivery force be with you!")));
6266

6367
try {
6468
// trigger the API call

0 commit comments

Comments
 (0)