Merge pull request GoogleCloudPlatform#394 from GoogleCloudPlatform/mailjet

tswast · web-flow · commit 08dce86a0f71 · 2016-11-03T16:42:26.000-07:00
Update mailjet samples to new version.
diff --git a/appengine/mailjet/pom.xml b/appengine/mailjet/pom.xml
@@ -25,13 +25,14 @@
     <version>1.0.0</version>
     <relativePath>../..</relativePath>
   </parent>
+  <properties>
+    <mailjet.version>4.0.5</mailjet.version>
+  </properties>
   <dependencies>
     <dependency>
       <groupId>com.mailjet</groupId>
       <artifactId>mailjet-client</artifactId>
-      <version>4.0.4</version>
-      <scope>system</scope>
-      <systemPath>${project.basedir}/src/main/webapp/WEB-INF/lib/client-3.1.1-jar-with-dependencies.jar</systemPath>
+      <version>${mailjet.version}</version>
     </dependency>
     <dependency>
       <groupId>javax.servlet</groupId>
diff --git a/appengine/mailjet/src/main/java/com/example/appengine/mailjet/MailjetServlet.java b/appengine/mailjet/src/main/java/com/example/appengine/mailjet/MailjetServlet.java
@@ -20,6 +20,7 @@
 import com.mailjet.client.MailjetRequest;
 import com.mailjet.client.MailjetResponse;
 import com.mailjet.client.errors.MailjetException;
+import com.mailjet.client.errors.MailjetSocketTimeoutException;
 import com.mailjet.client.resource.Email;
 // [END mailjet_imports]
 
@@ -64,6 +65,8 @@ public void doPost(HttpServletRequest req, HttpServletResponse resp) throws IOEx
       resp.getWriter().print(response.getData());
     } catch (MailjetException e) {
       throw new ServletException("Mailjet Exception", e);
+    } catch (MailjetSocketTimeoutException e) {
+      throw new ServletException("Mailjet socket timed out", e);
     }
   }
 }
diff --git a/compute/mailjet/pom.xml b/compute/mailjet/pom.xml
@@ -26,6 +26,10 @@
     <relativePath>../..</relativePath>
   </parent>
 
+  <properties>
+    <mailjet.version>4.0.5</mailjet.version>
+  </properties>
+
   <dependencies>
     <dependency>
       <groupId>junit</groupId>
@@ -50,7 +54,7 @@
     <dependency>
       <groupId>com.mailjet</groupId>
       <artifactId>mailjet-client</artifactId>
-      <version>4.0.5</version>
+      <version>${mailjet.version}</version>
     </dependency>
     <!-- [END dependencies] -->
   </dependencies>
diff --git a/flexible/mailjet/pom.xml b/flexible/mailjet/pom.xml
@@ -33,6 +33,7 @@
     <maven-war-plugin-version>3.0.0</maven-war-plugin-version>
     <gcloud-maven-plugin-version>2.0.9.121.v20160815</gcloud-maven-plugin-version>
     <jetty-maven-plugin-version>9.3.7.v20160115</jetty-maven-plugin-version>
+    <mailjet-version>4.0.5</mailjet-version>
   </properties>
 
   <dependencies>
@@ -47,7 +48,7 @@
     <dependency>
       <groupId>com.mailjet</groupId>
       <artifactId>mailjet-client</artifactId>
-      <version>4.0.1</version>
+      <version>${mailjet-version}</version>
     </dependency>
     <!-- [END dependencies] -->
   </dependencies>
diff --git a/flexible/mailjet/src/main/java/com/example/managedvms/mailjet/MailjetServlet.java b/flexible/mailjet/src/main/java/com/example/managedvms/mailjet/MailjetServlet.java
@@ -21,6 +21,7 @@
 import com.mailjet.client.MailjetRequest;
 import com.mailjet.client.MailjetResponse;
 import com.mailjet.client.errors.MailjetException;
+import com.mailjet.client.errors.MailjetSocketTimeoutException;
 import com.mailjet.client.resource.Email;
 // [END mailjet_imports]
 
@@ -67,6 +68,8 @@ public void doPost(HttpServletRequest req, HttpServletResponse resp) throws IOEx
       resp.getWriter().print(response.getData());
     } catch (MailjetException e) {
       throw new ServletException("Mailjet Exception", e);
+    } catch (MailjetSocketTimeoutException e) {
+      throw new ServletException("Mailjet socket timed out", e);
     }
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -20,6 +20,7 @@`
`20`	`20`	`import com.mailjet.client.MailjetRequest;`
`21`	`21`	`import com.mailjet.client.MailjetResponse;`
`22`	`22`	`import com.mailjet.client.errors.MailjetException;`
	`23`	`+import com.mailjet.client.errors.MailjetSocketTimeoutException;`
`23`	`24`	`import com.mailjet.client.resource.Email;`
`24`	`25`	`// [END mailjet_imports]`
`25`	`26`
`@@ -64,6 +65,8 @@ public void doPost(HttpServletRequest req, HttpServletResponse resp) throws IOEx`
`64`	`65`	`resp.getWriter().print(response.getData());`
`65`	`66`	`} catch (MailjetException e) {`
`66`	`67`	`throw new ServletException("Mailjet Exception", e);`
	`68`	`+ } catch (MailjetSocketTimeoutException e) {`
	`69`	`+ throw new ServletException("Mailjet socket timed out", e);`
`67`	`70`	`}`
`68`	`71`	`}`
`69`	`72`	`}`
Original file line number	Diff line number	Diff line change
`@@ -21,6 +21,7 @@`
`21`	`21`	`import com.mailjet.client.MailjetRequest;`
`22`	`22`	`import com.mailjet.client.MailjetResponse;`
`23`	`23`	`import com.mailjet.client.errors.MailjetException;`
	`24`	`+import com.mailjet.client.errors.MailjetSocketTimeoutException;`
`24`	`25`	`import com.mailjet.client.resource.Email;`
`25`	`26`	`// [END mailjet_imports]`
`26`	`27`
`@@ -67,6 +68,8 @@ public void doPost(HttpServletRequest req, HttpServletResponse resp) throws IOEx`
`67`	`68`	`resp.getWriter().print(response.getData());`
`68`	`69`	`} catch (MailjetException e) {`
`69`	`70`	`throw new ServletException("Mailjet Exception", e);`
	`71`	`+ } catch (MailjetSocketTimeoutException e) {`
	`72`	`+ throw new ServletException("Mailjet socket timed out", e);`
`70`	`73`	`}`
`71`	`74`	`}`
`72`	`75`	`}`