azkaban-aplcache

Delete unused code in email-related classes (#1690) The

3/21/2018 5:57:47 PM

Details

diff --git a/azkaban-common/src/main/java/azkaban/utils/AbstractMailer.java b/azkaban-common/src/main/java/azkaban/utils/AbstractMailer.java
index e85d141..bd73eac 100644
--- a/azkaban-common/src/main/java/azkaban/utils/AbstractMailer.java
+++ b/azkaban-common/src/main/java/azkaban/utils/AbstractMailer.java
@@ -64,35 +64,10 @@ public class AbstractMailer {
     return message;
   }
 
-  public EmailMessage prepareEmailMessage(final String subject, final String mimetype,
-      final Collection<String> emailList) {
-    return createEmailMessage(subject, mimetype, emailList);
-  }
-
   public String getAzkabanName() {
     return this.azkabanName;
   }
 
-  public String getMailHost() {
-    return this.mailHost;
-  }
-
-  public String getMailUser() {
-    return this.mailUser;
-  }
-
-  public String getMailPassword() {
-    return this.mailPassword;
-  }
-
-  public String getMailSender() {
-    return this.mailSender;
-  }
-
-  public int getMailPort() {
-    return this.mailPort;
-  }
-
   /**
    * Attachment maximum size in bytes
    */
diff --git a/azkaban-common/src/main/java/azkaban/utils/Emailer.java b/azkaban-common/src/main/java/azkaban/utils/Emailer.java
index a79028c..bd7d52c 100644
--- a/azkaban-common/src/main/java/azkaban/utils/Emailer.java
+++ b/azkaban-common/src/main/java/azkaban/utils/Emailer.java
@@ -52,7 +52,7 @@ public class Emailer extends AbstractMailer implements Alerter {
   private final String mailSender;
   private final String azkabanName;
   private final String tls;
-  private boolean testMode = false;
+  private final boolean testMode;
 
   @Inject
   public Emailer(final Props props, final CommonMetrics commonMetrics) {
@@ -240,24 +240,22 @@ public class Emailer extends AbstractMailer implements Alerter {
   }
 
   @Override
-  public void alertOnSuccess(final ExecutableFlow exflow) throws Exception {
+  public void alertOnSuccess(final ExecutableFlow exflow) {
     sendSuccessEmail(exflow);
   }
 
   @Override
-  public void alertOnError(final ExecutableFlow exflow, final String... extraReasons)
-      throws Exception {
+  public void alertOnError(final ExecutableFlow exflow, final String... extraReasons) {
     sendErrorEmail(exflow, extraReasons);
   }
 
   @Override
-  public void alertOnFirstError(final ExecutableFlow exflow) throws Exception {
+  public void alertOnFirstError(final ExecutableFlow exflow) {
     sendFirstErrorMessage(exflow);
   }
 
   @Override
-  public void alertOnSla(final SlaOption slaOption, final String slaMessage)
-      throws Exception {
+  public void alertOnSla(final SlaOption slaOption, final String slaMessage) {
     sendSlaAlertEmail(slaOption, slaMessage);
   }
 }
diff --git a/azkaban-common/src/main/java/azkaban/utils/EmailMessage.java b/azkaban-common/src/main/java/azkaban/utils/EmailMessage.java
index 12d6b58..ca10a29 100644
--- a/azkaban-common/src/main/java/azkaban/utils/EmailMessage.java
+++ b/azkaban-common/src/main/java/azkaban/utils/EmailMessage.java
@@ -47,11 +47,10 @@ public class EmailMessage {
   private final Logger logger = Logger.getLogger(EmailMessage.class);
   private final List<String> _toAddress = new ArrayList<>();
   private final int _mailPort;
-  // GB
   private final ArrayList<BodyPart> _attachments = new ArrayList<>();
-  private String _mailHost;
-  private String _mailUser;
-  private String _mailPassword;
+  private final String _mailHost;
+  private final String _mailUser;
+  private final String _mailPassword;
   private String _subject;
   private String _fromAddress;
   private String _mimeType = "text/plain";
@@ -88,26 +87,11 @@ public class EmailMessage {
     _totalAttachmentMaxSizeInByte = sizeInBytes;
   }
 
-  public EmailMessage setMailHost(final String host) {
-    this._mailHost = host;
-    return this;
-  }
-
-  public EmailMessage setMailUser(final String user) {
-    this._mailUser = user;
-    return this;
-  }
-
   public EmailMessage enableAttachementEmbedment(final boolean toEnable) {
     this._enableAttachementEmbedment = toEnable;
     return this;
   }
 
-  public EmailMessage setMailPassword(final String password) {
-    this._mailPassword = password;
-    return this;
-  }
-
   public EmailMessage addAllToAddress(final Collection<? extends String> addresses) {
     this._toAddress.addAll(addresses);
     return this;