azkaban-aplcache

diff --git a/azkaban-common/src/main/java/azkaban/utils/AbstractMailer.java b/azkaban-common/src/main/java/azkaban/utils/AbstractMailer.java
index ee2ef1a..e85d141 100644
--- a/azkaban-common/src/main/java/azkaban/utils/AbstractMailer.java
+++ b/azkaban-common/src/main/java/azkaban/utils/AbstractMailer.java
@@ -22,9 +22,6 @@ public class AbstractMailer {
 
   public static final int DEFAULT_SMTP_PORT = 25;
   private static final int MB_IN_BYTES = 1048576;
-  private final String clientHostname;
-  private final int clientPort;
-  private final boolean usesSSL;
   private final boolean usesAuth;
 
   private final String mailHost;
@@ -35,8 +32,6 @@ public class AbstractMailer {
   private final String azkabanName;
   private final String tls;
 
-  private final String referenceURL;
-
   private final long attachmentMazSizeInByte;
 
   public AbstractMailer(final Props props) {
@@ -53,24 +48,6 @@ public class AbstractMailer {
 
     this.mailSender = props.getString("mail.sender", "");
     this.usesAuth = props.getBoolean("mail.useAuth", true);
-
-    this.clientHostname = props.get("server.hostname");
-    this.clientPort = props.getInt("server.port");
-    this.usesSSL = props.getBoolean("server.useSSL");
-
-    if (this.usesSSL) {
-      this.referenceURL =
-          "https://" + this.clientHostname
-              + (this.clientPort == 443 ? "/" : ":" + this.clientPort + "/");
-    } else {
-      this.referenceURL =
-          "http://" + this.clientHostname
-              + (this.clientPort == 80 ? "/" : ":" + this.clientPort + "/");
-    }
-  }
-
-  public String getReferenceURL() {
-    return this.referenceURL;
   }
 
   protected EmailMessage createEmailMessage(final String subject, final String mimetype,

diff --git a/azkaban-common/src/main/java/azkaban/utils/Emailer.java b/azkaban-common/src/main/java/azkaban/utils/Emailer.java
index f99825b..ecdb645 100644
--- a/azkaban-common/src/main/java/azkaban/utils/Emailer.java
+++ b/azkaban-common/src/main/java/azkaban/utils/Emailer.java
@@ -18,6 +18,7 @@ package azkaban.utils;
 
 import static java.util.Objects.requireNonNull;
 
+import azkaban.Constants;
 import azkaban.alert.Alerter;
 import azkaban.executor.ExecutableFlow;
 import azkaban.executor.ExecutableNode;
@@ -77,10 +78,12 @@ public class Emailer extends AbstractMailer implements Alerter {
 
     if (props.getBoolean("jetty.use.ssl", true)) {
       this.scheme = HTTPS;
-      this.clientPortNumber = props.getString("jetty.ssl.port");
+      this.clientPortNumber = Integer.toString(props.getInt("jetty.ssl.port",
+          Constants.DEFAULT_SSL_PORT_NUMBER));
     } else {
       this.scheme = HTTP;
-      this.clientPortNumber = props.getString("jetty.port");
+      this.clientPortNumber = Integer.toString(props.getInt("jetty.port",
+          Constants.DEFAULT_PORT_NUMBER));
     }
 
     this.testMode = props.getBoolean("test.mode", false);

diff --git a/azkaban-exec-server/src/test/java/azkaban/execapp/AzkabanExecutorServerTest.java b/azkaban-exec-server/src/test/java/azkaban/execapp/AzkabanExecutorServerTest.java
index 137f7ed..49c3404 100644
--- a/azkaban-exec-server/src/test/java/azkaban/execapp/AzkabanExecutorServerTest.java
+++ b/azkaban-exec-server/src/test/java/azkaban/execapp/AzkabanExecutorServerTest.java
@@ -25,6 +25,8 @@ import azkaban.AzkabanCommonModule;
 import azkaban.Constants;
 import azkaban.database.AzkabanDatabaseSetup;
 import azkaban.database.AzkabanDatabaseUpdater;
+import azkaban.executor.AlerterHolder;
+import azkaban.utils.Emailer;
 import azkaban.utils.Props;
 import com.google.inject.Guice;
 import com.google.inject.Injector;
@@ -88,5 +90,7 @@ public class AzkabanExecutorServerTest {
     );
 
     assertNotNull(injector.getInstance(AzkabanExecutorServer.class));
+    assertNotNull(injector.getInstance(Emailer.class));
+    assertNotNull(injector.getInstance(AlerterHolder.class));
   }
 }