You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lens.apache.org by am...@apache.org on 2014/11/19 13:30:36 UTC

incubator-lens git commit: LENS-36 : Allows giving multiple comma separated values in email cc config (Rajat Khandelwal via amareshwari)

Repository: incubator-lens
Updated Branches:
  refs/heads/master 3468ad918 -> 7bee6bceb


LENS-36 : Allows giving multiple comma separated values in email cc config (Rajat Khandelwal via amareshwari)


Project: http://git-wip-us.apache.org/repos/asf/incubator-lens/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-lens/commit/7bee6bce
Tree: http://git-wip-us.apache.org/repos/asf/incubator-lens/tree/7bee6bce
Diff: http://git-wip-us.apache.org/repos/asf/incubator-lens/diff/7bee6bce

Branch: refs/heads/master
Commit: 7bee6bceba0bc2cea8d821a3513c8d0717e5e439
Parents: 3468ad9
Author: Amareshwari Sriramdasu <am...@inmobi.com>
Authored: Wed Nov 19 18:00:29 2014 +0530
Committer: Amareshwari Sriramdasu <am...@inmobi.com>
Committed: Wed Nov 19 18:00:29 2014 +0530

----------------------------------------------------------------------
 .../java/org/apache/lens/server/query/QueryEndNotifier.java  | 8 ++++++--
 .../java/org/apache/lens/server/query/TestQueryService.java  | 4 +++-
 2 files changed, 9 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/7bee6bce/lens-server/src/main/java/org/apache/lens/server/query/QueryEndNotifier.java
----------------------------------------------------------------------
diff --git a/lens-server/src/main/java/org/apache/lens/server/query/QueryEndNotifier.java b/lens-server/src/main/java/org/apache/lens/server/query/QueryEndNotifier.java
index 7e779f1..d4a7106 100644
--- a/lens-server/src/main/java/org/apache/lens/server/query/QueryEndNotifier.java
+++ b/lens-server/src/main/java/org/apache/lens/server/query/QueryEndNotifier.java
@@ -192,9 +192,13 @@ public class QueryEndNotifier extends AsyncEventListener<QueryEnded> {
     try {
       MimeMessage message = new MimeMessage(session);
       message.setFrom(new InternetAddress(from));
-      message.setRecipient(Message.RecipientType.TO, new InternetAddress(to));
+      for(String recipient: to.trim().split("\\s*,\\s*")) {
+        message.addRecipients(Message.RecipientType.TO, InternetAddress.parse(recipient));
+      }
       if (cc != null && cc.length() > 0) {
-        message.setRecipient(Message.RecipientType.CC, new InternetAddress(cc));
+        for(String recipient: cc.trim().split("\\s*,\\s*")) {
+          message.addRecipients(Message.RecipientType.CC, InternetAddress.parse(recipient));
+        }
       }
       message.setSubject(subject);
       message.setSentDate(new Date());

http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/7bee6bce/lens-server/src/test/java/org/apache/lens/server/query/TestQueryService.java
----------------------------------------------------------------------
diff --git a/lens-server/src/test/java/org/apache/lens/server/query/TestQueryService.java b/lens-server/src/test/java/org/apache/lens/server/query/TestQueryService.java
index 8334d95..38e7d89 100644
--- a/lens-server/src/test/java/org/apache/lens/server/query/TestQueryService.java
+++ b/lens-server/src/test/java/org/apache/lens/server/query/TestQueryService.java
@@ -782,6 +782,7 @@ public class TestQueryService extends LensJerseyTest {
     LensConf conf = new LensConf();
     conf.addProperty(LensConfConstants.QUERY_PERSISTENT_RESULT_INDRIVER, "false");
     conf.addProperty(LensConfConstants.QUERY_MAIL_NOTIFY, "true");
+    conf.addProperty(LensConfConstants.QUERY_RESULT_EMAIL_CC, "foo1@localhost,foo2@localhost,foo3@localhost");
     mp2.bodyPart(new FormDataBodyPart(FormDataContentDisposition.name("sessionid").build(), lensSessionId,
         MediaType.APPLICATION_XML_TYPE));
     mp2.bodyPart(new FormDataBodyPart(FormDataContentDisposition.name("query").build(), "select ID, IDSTR from "
@@ -816,7 +817,8 @@ public class TestQueryService extends LensJerseyTest {
       }
       Thread.sleep(10000);
     }
-    Assert.assertEquals(messages.size(), 1);
+
+    Assert.assertEquals(messages.size(), 4);
     Assert.assertTrue(messages.get(0).toString().contains(handle.toString()));
     wiser.stop();
   }