From df9d43447813c028ec07d765bc05e2c58d7df131 Mon Sep 17 00:00:00 2001
From: Florian Leibert <flo@leibert.de>
Date: Tue, 19 Mar 2013 09:28:27 -0700
Subject: [PATCH] [build][core] removing scalacheck, adding context

---
 pom.xml                                       | 30 +------------------
 .../com/airbnb/notification/MailClient.scala  | 13 +++++---
 2 files changed, 10 insertions(+), 33 deletions(-)

diff --git a/pom.xml b/pom.xml
index 36a75aae3..be9912868 100644
--- a/pom.xml
+++ b/pom.xml
@@ -157,12 +157,6 @@
         </dependency>
 
         <!-- Test scope -->
-        <dependency>
-            <groupId>org.scalastyle</groupId>
-            <artifactId>scalastyle-maven-plugin</artifactId>
-            <version>0.2.0</version>
-            <scope>test</scope>
-        </dependency>
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
@@ -382,29 +376,7 @@
                     <scalaVersion>${scala.version}</scalaVersion>
                 </configuration>
             </plugin>
-
-            <plugin>
-                <groupId>org.scalastyle</groupId>
-                <artifactId>scalastyle-maven-plugin</artifactId>
-                <version>0.2.0</version>
-                <configuration>
-                    <verbose>false</verbose>
-                    <failOnViolation>true</failOnViolation>
-                    <includeTestSourceDirectory>true</includeTestSourceDirectory>
-                    <failOnWarning>false</failOnWarning>
-                    <sourceDirectory>${basedir}/src/main/scala</sourceDirectory>
-                    <testSourceDirectory>${basedir}/src/test/scala</testSourceDirectory>
-                    <configLocation>${basedir}/scalastyle_config.xml</configLocation>
-                </configuration>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>check</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-
+            <!-- TODO: Add maven/scalastyle-check -->
             <plugin>
                 <artifactId>maven-clean-plugin</artifactId>
                 <version>2.5</version>
diff --git a/src/main/scala/com/airbnb/notification/MailClient.scala b/src/main/scala/com/airbnb/notification/MailClient.scala
index 3c19be023..94f151d03 100644
--- a/src/main/scala/com/airbnb/notification/MailClient.scala
+++ b/src/main/scala/com/airbnb/notification/MailClient.scala
@@ -20,7 +20,6 @@ class MailClient(
   extends Actor {
 
   private[this] val log = Logger.getLogger(getClass.getName)
-  private[this] val dateFormat = new SimpleDateFormat
   private[this] val split = """(.*):([0-9]*)""".r
   private[this] val split(mailHost, mailPortStr) = mailServerString
 
@@ -29,17 +28,23 @@ class MailClient(
     val email = new SimpleEmail
     email.setHostName(mailHost)
 
-    if (!mailUser.isEmpty && !password.isEmpty)
+    if (!mailUser.isEmpty && !password.isEmpty) {
       email.setAuthenticator(new DefaultAuthenticator(mailUser.get, password.get))
+    }
 
     email.addTo(to)
     email.setFrom(fromUser)
 
     email.setSubject(subject)
-    if (!message.isEmpty) email.setMsg(message.get)
+
+    if (!message.isEmpty) {
+      email.setMsg(message.get)
+    }
+
     email.setSSL(true)
     email.setSmtpPort(mailPort)
-    log.info("Sending email, response:" + email.send())
+    val response = email.send
+    log.info("Sent email to '%s' with subject: '%s', got response '%s'".format(to, subject, response))
   }
 
   def act() {