Skip to content

Commit f259d63

Browse files
chore(deps): update dependency com.mailjet:mailjet-client to v5 (GoogleCloudPlatform#4378)
* chore(deps): update dependency com.mailjet:mailjet-client to v5 * Update ClientOptions * lint Co-authored-by: averikitsch <akitsch@google.com>
1 parent 2e2915e commit f259d63

2 files changed

Lines changed: 28 additions & 20 deletions

File tree

flexible/mailjet/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
<appengine.maven.plugin>2.4.0</appengine.maven.plugin>
4040
<jetty>9.4.35.v20201120</jetty>
4141

42-
<mailjet-version>4.6.0</mailjet-version>
42+
<mailjet-version>5.0.0</mailjet-version>
4343
</properties>
4444

4545
<dependencies>

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

Lines changed: 27 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -41,30 +41,38 @@
4141
public class MailjetServlet extends HttpServlet {
4242
private static final String MAILJET_API_KEY = System.getenv("MAILJET_API_KEY");
4343
private static final String MAILJET_SECRET_KEY = System.getenv("MAILJET_SECRET_KEY");
44-
private MailjetClient client =
45-
new MailjetClient(MAILJET_API_KEY, MAILJET_SECRET_KEY, new ClientOptions("v3.1"));
44+
ClientOptions options =
45+
ClientOptions.builder().apiKey(MAILJET_API_KEY).apiSecretKey(MAILJET_SECRET_KEY).build();
46+
MailjetClient client = new MailjetClient(options);
4647

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

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

6977
try {
7078
// trigger the API call

0 commit comments

Comments
 (0)