11_2_HW10_JMS_attach

JavaWebinar · JavaWebinar · commit 507a765b171b · 2017-12-26T02:26:58.000+03:00
diff --git a/services/mail-api/src/main/java/ru/javaops/masterjava/service/mail/MailWSClient.java b/services/mail-api/src/main/java/ru/javaops/masterjava/service/mail/MailWSClient.java
@@ -1,8 +1,5 @@
 package ru.javaops.masterjava.service.mail;
 
-import com.google.common.base.Splitter;
-import com.google.common.collect.ImmutableSet;
-import com.google.common.collect.Iterables;
 import com.google.common.io.Resources;
 import lombok.extern.slf4j.Slf4j;
 import ru.javaops.masterjava.web.WebStateException;
@@ -44,11 +41,6 @@ private static MailService getPort() {
         return WS_CLIENT.getPort(new MTOMFeature(1024));
     }
 
-    public static Set<Addressee> split(String addressees) {
-        Iterable<String> split = Splitter.on(',').trimResults().omitEmptyStrings().split(addressees);
-        return ImmutableSet.copyOf(Iterables.transform(split, Addressee::new));
-    }
-
     public static WsClient.HostConfig getHostConfig() {
         return WS_CLIENT.getHostConfig();
     }
diff --git a/services/mail-api/src/main/java/ru/javaops/masterjava/service/mail/util/Attachments.java b/services/mail-api/src/main/java/ru/javaops/masterjava/service/mail/util/Attachments.java
diff --git a/services/mail-api/src/main/java/ru/javaops/masterjava/service/mail/util/MailUtils.java b/services/mail-api/src/main/java/ru/javaops/masterjava/service/mail/util/MailUtils.java
@@ -0,0 +1,70 @@
+package ru.javaops.masterjava.service.mail.util;
+
+import com.google.common.base.Splitter;
+import com.google.common.collect.ImmutableSet;
+import com.google.common.collect.Iterables;
+import com.sun.istack.NotNull;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import org.apache.commons.io.IOUtils;
+import org.apache.commons.io.input.CloseShieldInputStream;
+import ru.javaops.masterjava.service.mail.Addressee;
+import ru.javaops.masterjava.service.mail.Attachment;
+
+import javax.activation.DataHandler;
+import javax.activation.DataSource;
+import java.io.*;
+import java.util.Set;
+
+public class MailUtils {
+
+    public static Set<Addressee> split(String addressees) {
+        Iterable<String> split = Splitter.on(',').trimResults().omitEmptyStrings().split(addressees);
+        return ImmutableSet.copyOf(Iterables.transform(split, Addressee::new));
+    }
+
+    @Data
+    @AllArgsConstructor
+    public static class MailObject implements Serializable {
+        private @NotNull String users;
+        private String subject;
+        private @NotNull String body;
+        private String attachName;
+        private byte[] attachData;
+    }
+
+    public static MailObject getMailObject(String users, String subject, String body, String name, InputStream is) {
+        try {
+            return new MailObject(users, subject, body, name, is == null ? null : IOUtils.toByteArray(is));
+        } catch (IOException e) {
+            throw new IllegalStateException(e);
+        }
+    }
+
+    public static Attachment getAttachment(String name, byte[] attachData) {
+        return new Attachment(name, new DataHandler((ProxyDataSource) () -> new ByteArrayInputStream(attachData)));
+    }
+
+    public static Attachment getAttachment(String name, InputStream inputStream) {
+        //    http://stackoverflow.com/questions/2830561/how-to-convert-an-inputstream-to-a-datahandler
+        //    http://stackoverflow.com/a/5924019/548473
+        return new Attachment(name, new DataHandler((ProxyDataSource) () -> new CloseShieldInputStream(inputStream)));
+    }
+
+    public interface ProxyDataSource extends DataSource {
+        @Override
+        default OutputStream getOutputStream() throws IOException {
+            throw new UnsupportedOperationException("Not implemented");
+        }
+
+        @Override
+        default String getContentType() {
+            return "application/octet-stream";
+        }
+
+        @Override
+        default String getName() {
+            return "";
+        }
+    }
+}
diff --git a/services/mail-service/src/main/java/ru/javaops/masterjava/service/mail/MailServiceExecutor.java b/services/mail-service/src/main/java/ru/javaops/masterjava/service/mail/MailServiceExecutor.java
@@ -1,8 +1,11 @@
 package ru.javaops.masterjava.service.mail;
 
+import com.google.common.collect.ImmutableList;
 import lombok.extern.slf4j.Slf4j;
 import one.util.streamex.StreamEx;
 import ru.javaops.masterjava.ExceptionType;
+import ru.javaops.masterjava.service.mail.util.MailUtils;
+import ru.javaops.masterjava.service.mail.util.MailUtils.MailObject;
 import ru.javaops.masterjava.web.WebStateException;
 import ru.javaops.masterjava.web.WsClient;
 
@@ -69,4 +72,18 @@ private void cancel(String cause, Throwable t) throws WebStateException {
             }
         }.call();
     }
+
+    public static void sendAsync(MailObject mailObject) {
+        Set<Addressee> addressees = MailUtils.split(mailObject.getUsers());
+        addressees.forEach(addressee ->
+                mailExecutor.submit(() -> {
+                    try {
+                        MailSender.sendTo(addressee, mailObject.getSubject(), mailObject.getBody(),
+                                ImmutableList.of(MailUtils.getAttachment(mailObject.getAttachName(), mailObject.getAttachData())));
+                    } catch (WebStateException e) {
+                        // already logged
+                    }
+                })
+        );
+    }
 }
diff --git a/services/mail-service/src/main/java/ru/javaops/masterjava/service/mail/listeners/JmsMailListener.java b/services/mail-service/src/main/java/ru/javaops/masterjava/service/mail/listeners/JmsMailListener.java
@@ -1,6 +1,9 @@
 package ru.javaops.masterjava.service.mail.listeners;
 
 import lombok.extern.slf4j.Slf4j;
+import org.apache.activemq.ActiveMQConnectionFactory;
+import ru.javaops.masterjava.service.mail.MailServiceExecutor;
+import ru.javaops.masterjava.service.mail.util.MailUtils;
 
 import javax.jms.*;
 import javax.naming.InitialContext;
@@ -18,8 +21,9 @@ public class JmsMailListener implements ServletContextListener {
     public void contextInitialized(ServletContextEvent sce) {
         try {
             InitialContext initCtx = new InitialContext();
-            QueueConnectionFactory connectionFactory =
-                    (QueueConnectionFactory) initCtx.lookup("java:comp/env/jms/ConnectionFactory");
+            ActiveMQConnectionFactory connectionFactory =
+                    (ActiveMQConnectionFactory) initCtx.lookup("java:comp/env/jms/ConnectionFactory");
+            connectionFactory.setTrustAllPackages(true);
             connection = connectionFactory.createQueueConnection();
             QueueSession queueSession = connection.createQueueSession(false, Session.AUTO_ACKNOWLEDGE);
             Queue queue = (Queue) initCtx.lookup("java:comp/env/jms/queue/MailQueue");
@@ -30,11 +34,11 @@ public void contextInitialized(ServletContextEvent sce) {
                 try {
                     while (!Thread.interrupted()) {
                         Message m = receiver.receive();
-                        // TODO implement mail sending
-                        if (m instanceof TextMessage) {
-                            TextMessage tm = (TextMessage) m;
-                            String text = tm.getText();
-                            log.info("Received TextMessage with text '{}'", text);
+                        if (m instanceof ObjectMessage) {
+                            ObjectMessage om = (ObjectMessage) m;
+                            MailUtils.MailObject mailObject = (MailUtils.MailObject) om.getObject();
+                            log.info("Received MailObject {}", mailObject);
+                            MailServiceExecutor.sendAsync(mailObject);
                         }
                     }
                 } catch (Exception e) {
diff --git a/services/mail-service/src/main/java/ru/javaops/masterjava/service/mail/rest/MailRS.java b/services/mail-service/src/main/java/ru/javaops/masterjava/service/mail/rest/MailRS.java
@@ -9,8 +9,7 @@
 import ru.javaops.masterjava.service.mail.Attachment;
 import ru.javaops.masterjava.service.mail.GroupResult;
 import ru.javaops.masterjava.service.mail.MailServiceExecutor;
-import ru.javaops.masterjava.service.mail.MailWSClient;
-import ru.javaops.masterjava.service.mail.util.Attachments;
+import ru.javaops.masterjava.service.mail.util.MailUtils;
 import ru.javaops.masterjava.web.WebStateException;
 
 import javax.activation.DataHandler;
@@ -47,11 +46,11 @@ public GroupResult send(@NotBlank @FormDataParam("users") String users,
                 String utf8name = new String(attachName.getBytes("ISO8859_1"), "UTF-8");
                 BodyPartEntity bodyPartEntity = ((BodyPartEntity) attachBodyPart.getEntity());
 
-                attachments = ImmutableList.of(new Attachment(utf8name, new DataHandler((Attachments.ProxyDataSource) bodyPartEntity::getInputStream)));
+                attachments = ImmutableList.of(new Attachment(utf8name, new DataHandler((MailUtils.ProxyDataSource) bodyPartEntity::getInputStream)));
             } catch (UnsupportedEncodingException e) {
                 throw new IllegalStateException(e);
             }
         }
-        return MailServiceExecutor.sendBulk(MailWSClient.split(users), subject, body, attachments);
+        return MailServiceExecutor.sendBulk(MailUtils.split(users), subject, body, attachments);
     }
 }
diff --git a/web/webapp/src/main/java/ru/javaops/masterjava/webapp/JmsSendServlet.java b/web/webapp/src/main/java/ru/javaops/masterjava/webapp/JmsSendServlet.java
@@ -1,20 +1,25 @@
 package ru.javaops.masterjava.webapp;
 
 import lombok.extern.slf4j.Slf4j;
+import ru.javaops.masterjava.service.mail.util.MailUtils;
+import ru.javaops.masterjava.service.mail.util.MailUtils.MailObject;
 
 import javax.jms.*;
 import javax.naming.InitialContext;
 import javax.servlet.ServletConfig;
 import javax.servlet.ServletException;
+import javax.servlet.annotation.MultipartConfig;
 import javax.servlet.annotation.WebServlet;
 import javax.servlet.http.HttpServlet;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+import javax.servlet.http.Part;
 import java.io.IOException;
 import java.lang.IllegalStateException;
 
 @WebServlet("/sendJms")
 @Slf4j
+@MultipartConfig
 public class JmsSendServlet extends HttpServlet {
     private Connection connection;
     private Session session;
@@ -46,16 +51,22 @@ public void destroy() {
     }
 
     @Override
-    protected void doPost(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException {
+    protected void doPost(HttpServletRequest req, HttpServletResponse resp) throws IOException {
         String result;
         try {
             log.info("Start sending");
             req.setCharacterEncoding("UTF-8");
             resp.setCharacterEncoding("UTF-8");
-            String users = req.getParameter("users");
-            String subject = req.getParameter("subject");
-            String body = req.getParameter("body");
-            result = sendJms(users, subject, body);
+            Part filePart = req.getPart("attach");
+
+            MailObject mailObject = MailUtils.getMailObject(
+                    req.getParameter("users"),
+                    req.getParameter("subject"),
+                    req.getParameter("body"),
+                    filePart == null ? null : filePart.getSubmittedFileName(),
+                    filePart == null ? null : filePart.getInputStream());
+
+            result = sendJms(mailObject);
             log.info("Processing finished with result: {}", result);
         } catch (Exception e) {
             log.error("Processing failed", e);
@@ -64,10 +75,10 @@ protected void doPost(HttpServletRequest req, HttpServletResponse resp) throws S
         resp.getWriter().write(result);
     }
 
-    private synchronized String sendJms(String users, String subject, String body) throws JMSException {
-        TextMessage testMessage = session.createTextMessage();
-        testMessage.setText(subject);
-        producer.send(testMessage);
+    private synchronized String sendJms(MailObject mailObject) throws JMSException {
+        ObjectMessage om = session.createObjectMessage();
+        om.setObject(mailObject);
+        producer.send(om);
         return "Successfully sent JMS message";
     }
 }
diff --git a/web/webapp/src/main/java/ru/javaops/masterjava/webapp/SoapSendServlet.java b/web/webapp/src/main/java/ru/javaops/masterjava/webapp/SoapSendServlet.java
@@ -4,9 +4,8 @@
 import lombok.extern.slf4j.Slf4j;
 import ru.javaops.masterjava.service.mail.GroupResult;
 import ru.javaops.masterjava.service.mail.MailWSClient;
-import ru.javaops.masterjava.service.mail.util.Attachments;
+import ru.javaops.masterjava.service.mail.util.MailUtils;
 
-import javax.servlet.ServletException;
 import javax.servlet.annotation.MultipartConfig;
 import javax.servlet.annotation.WebServlet;
 import javax.servlet.http.HttpServlet;
@@ -20,7 +19,7 @@
 @MultipartConfig
 public class SoapSendServlet extends HttpServlet {
     @Override
-    protected void doPost(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException {
+    protected void doPost(HttpServletRequest req, HttpServletResponse resp) throws IOException {
         String result;
         try {
             log.info("Start sending");
@@ -30,9 +29,9 @@ protected void doPost(HttpServletRequest req, HttpServletResponse resp) throws S
             String subject = req.getParameter("subject");
             String body = req.getParameter("body");
             Part filePart = req.getPart("attach");
-            GroupResult groupResult = MailWSClient.sendBulk(MailWSClient.split(users), subject, body,
+            GroupResult groupResult = MailWSClient.sendBulk(MailUtils.split(users), subject, body,
                     filePart == null ? null :
-                            ImmutableList.of(Attachments.getAttachment(filePart.getSubmittedFileName(), filePart.getInputStream())));
+                            ImmutableList.of(MailUtils.getAttachment(filePart.getSubmittedFileName(), filePart.getInputStream())));
             result = groupResult.toString();
             log.info("Processing finished with result: {}", result);
         } catch (Exception e) {
diff --git a/web/webapp/src/main/webapp/WEB-INF/templates/users.html b/web/webapp/src/main/webapp/WEB-INF/templates/users.html

Original file line number	Diff line number	Diff line change
`@@ -9,8 +9,7 @@`
`9`	`9`	`import ru.javaops.masterjava.service.mail.Attachment;`
`10`	`10`	`import ru.javaops.masterjava.service.mail.GroupResult;`
`11`	`11`	`import ru.javaops.masterjava.service.mail.MailServiceExecutor;`
`12`		`-import ru.javaops.masterjava.service.mail.MailWSClient;`
`13`		`-import ru.javaops.masterjava.service.mail.util.Attachments;`
	`12`	`+import ru.javaops.masterjava.service.mail.util.MailUtils;`
`14`	`13`	`import ru.javaops.masterjava.web.WebStateException;`
`15`	`14`
`16`	`15`	`import javax.activation.DataHandler;`
`@@ -47,11 +46,11 @@ public GroupResult send(@NotBlank @FormDataParam("users") String users,`
`47`	`46`	`String utf8name = new String(attachName.getBytes("ISO8859_1"), "UTF-8");`
`48`	`47`	`BodyPartEntity bodyPartEntity = ((BodyPartEntity) attachBodyPart.getEntity());`
`49`	`48`
`50`		`- attachments = ImmutableList.of(new Attachment(utf8name, new DataHandler((Attachments.ProxyDataSource) bodyPartEntity::getInputStream)));`
	`49`	`+ attachments = ImmutableList.of(new Attachment(utf8name, new DataHandler((MailUtils.ProxyDataSource) bodyPartEntity::getInputStream)));`
`51`	`50`	`} catch (UnsupportedEncodingException e) {`
`52`	`51`	`throw new IllegalStateException(e);`
`53`	`52`	`}`
`54`	`53`	`}`
`55`		`- return MailServiceExecutor.sendBulk(MailWSClient.split(users), subject, body, attachments);`
	`54`	`+ return MailServiceExecutor.sendBulk(MailUtils.split(users), subject, body, attachments);`
`56`	`55`	`}`
`57`	`56`	`}`