From b2117223b6d6d6469bfe4600223e03a821ea101b Mon Sep 17 00:00:00 2001
From: Renovate Bot <bot@renovateapp.com>
Date: Tue, 8 Dec 2020 05:56:46 +0000
Subject: [PATCH 1/3] chore(deps): update dependency com.mailjet:mailjet-client
 to v5

---
 flexible/mailjet/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/flexible/mailjet/pom.xml b/flexible/mailjet/pom.xml
index f30d05e21ca..6a1d8424b85 100644
--- a/flexible/mailjet/pom.xml
+++ b/flexible/mailjet/pom.xml
@@ -39,7 +39,7 @@
     <appengine.maven.plugin>2.4.0</appengine.maven.plugin>
     <jetty>9.4.35.v20201120</jetty>
 
-    <mailjet-version>4.6.0</mailjet-version>
+    <mailjet-version>5.0.0</mailjet-version>
   </properties>
 
   <dependencies>

From 14099b2e107b21143067c2fb901947031b1d027f Mon Sep 17 00:00:00 2001
From: averikitsch <akitsch@google.com>
Date: Tue, 8 Dec 2020 08:25:04 -0800
Subject: [PATCH 2/3] Update ClientOptions

---
 .../com/example/mailjet/MailjetServlet.java   | 45 +++++++++++--------
 1 file changed, 26 insertions(+), 19 deletions(-)

diff --git a/flexible/mailjet/src/main/java/com/example/mailjet/MailjetServlet.java b/flexible/mailjet/src/main/java/com/example/mailjet/MailjetServlet.java
index f24875662e6..ff9d640a5eb 100644
--- a/flexible/mailjet/src/main/java/com/example/mailjet/MailjetServlet.java
+++ b/flexible/mailjet/src/main/java/com/example/mailjet/MailjetServlet.java
@@ -41,30 +41,37 @@
 public class MailjetServlet extends HttpServlet {
   private static final String MAILJET_API_KEY = System.getenv("MAILJET_API_KEY");
   private static final String MAILJET_SECRET_KEY = System.getenv("MAILJET_SECRET_KEY");
-  private MailjetClient client =
-      new MailjetClient(MAILJET_API_KEY, MAILJET_SECRET_KEY, new ClientOptions("v3.1"));
+  ClientOptions options =
+      ClientOptions.builder().apiKey(MAILJET_API_KEY).apiSecretKey(MAILJET_SECRET_KEY).build();
+  MailjetClient client = new MailjetClient(options);
 
   @Override
-  public void doPost(HttpServletRequest req, HttpServletResponse resp) throws IOException,
-      ServletException {
+  public void doPost(HttpServletRequest req, HttpServletResponse resp)
+      throws IOException, ServletException {
     String recipient = req.getParameter("to");
     String sender = req.getParameter("from");
 
-    MailjetRequest email = new MailjetRequest(Emailv31.resource)
-        .property(Emailv31.MESSAGES, new JSONArray()
-        .put(new JSONObject()
-          .put(Emailv31.Message.FROM, new JSONObject()
-            .put("Email", sender)
-            .put("Name", "Mailjet Pilot"))
-          .put(Emailv31.Message.TO, new JSONArray()
-            .put(new JSONObject()
-              .put("Email", recipient)))
-          .put(Emailv31.Message.SUBJECT, "Your email flight plan!")
-          .put(Emailv31.Message.TEXTPART,
-              "Dear passenger, welcome to Mailjet! May the delivery force be with you!")
-          .put(Emailv31.Message.HTMLPART,
-              "<h3>Dear passenger, welcome to Mailjet!</h3><br />"
-                  + "May the delivery force be with you!")));
+    MailjetRequest email =
+        new MailjetRequest(Emailv31.resource)
+            .property(
+                Emailv31.MESSAGES,
+                new JSONArray()
+                    .put(
+                        new JSONObject()
+                            .put(
+                                Emailv31.Message.FROM,
+                                new JSONObject().put("Email", sender).put("Name", "Mailjet Pilot"))
+                            .put(
+                                Emailv31.Message.TO,
+                                new JSONArray().put(new JSONObject().put("Email", recipient)))
+                            .put(Emailv31.Message.SUBJECT, "Your email flight plan!")
+                            .put(
+                                Emailv31.Message.TEXTPART,
+                                "Dear passenger, welcome to Mailjet! May the delivery force be with you!")
+                            .put(
+                                Emailv31.Message.HTMLPART,
+                                "<h3>Dear passenger, welcome to Mailjet!</h3><br />"
+                                    + "May the delivery force be with you!")));
 
     try {
       // trigger the API call

From 088eb7dc5d7e5b81e9b6e2af730435f73cfbcde1 Mon Sep 17 00:00:00 2001
From: Averi Kitsch <akitsch@google.com>
Date: Tue, 8 Dec 2020 08:31:02 -0800
Subject: [PATCH 3/3] lint

---
 .../src/main/java/com/example/mailjet/MailjetServlet.java    | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/flexible/mailjet/src/main/java/com/example/mailjet/MailjetServlet.java b/flexible/mailjet/src/main/java/com/example/mailjet/MailjetServlet.java
index ff9d640a5eb..cd5b02146d2 100644
--- a/flexible/mailjet/src/main/java/com/example/mailjet/MailjetServlet.java
+++ b/flexible/mailjet/src/main/java/com/example/mailjet/MailjetServlet.java
@@ -67,11 +67,12 @@ public void doPost(HttpServletRequest req, HttpServletResponse resp)
                             .put(Emailv31.Message.SUBJECT, "Your email flight plan!")
                             .put(
                                 Emailv31.Message.TEXTPART,
-                                "Dear passenger, welcome to Mailjet! May the delivery force be with you!")
+                                "Dear passenger, welcome to Mailjet!"
+                                + "May the delivery force be with you!")
                             .put(
                                 Emailv31.Message.HTMLPART,
                                 "<h3>Dear passenger, welcome to Mailjet!</h3><br />"
-                                    + "May the delivery force be with you!")));
+                                + "May the delivery force be with you!")));
 
     try {
       // trigger the API call