Cleaning up the code and reading correct attributes from .javamail

Arun Gupta · Arun Gupta · commit a76a19285586 · 2013-09-12T16:01:58.000-07:00
diff --git a/javamail/definition/src/main/java/org/javaee7/javamail/definition/Credentials.java b/javamail/definition/src/main/java/org/javaee7/javamail/definition/Credentials.java
@@ -52,7 +52,7 @@
 @ApplicationScoped
 public class Credentials {
 
-    private String username;
+    private String from;
     private String password;
     private String to;
 
@@ -62,7 +62,7 @@ public Credentials() {
             creds.load(new FileInputStream(System.getProperty("user.home")
                     + System.getProperty("file.separator")
                     + ".javamail"));
-            username = creds.getProperty("username");
+            from = creds.getProperty("from");
             password = creds.getProperty("password");
             to = creds.getProperty("to");
         } catch (IOException ex) {
@@ -71,12 +71,12 @@ public Credentials() {
 
     }
 
-    public String getUsername() {
-        return username;
+    public String getFrom() {
+        return from;
     }
 
-    public void setUsername(String username) {
-        this.username = username;
+    public void setFrom(String from) {
+        this.from = from;
     }
 
     public String getPassword() {
@@ -94,10 +94,10 @@ public String getTo() {
     public void setTo(String to) {
         this.to = to;
     }
-    
+
     @Override
     public String toString() {
-        return "username: " + username + ", password: " + password + ", to: " + to;
+        return "from: " + from + ", password: <HIDDEN>, to: " + to;
     }
 
 }
diff --git a/javamail/definition/src/main/java/org/javaee7/javamail/definition/ProgrammaticEmailServlet.java b/javamail/definition/src/main/java/org/javaee7/javamail/definition/ProgrammaticEmailServlet.java
@@ -88,6 +88,7 @@ protected void processRequest(HttpServletRequest request, HttpServletResponse re
 
             Properties props = new Properties();
             props.put("mail.smtp.host", "smtp.gmail.com");
+//            props.put("mail.smtp.host", "stbeehive.oracle.com");
             props.put("mail.smtp.ssl.enable", "true");
             props.put("mail.smtp.auth", "true");
             props.put("mail.transport.protocol", "smtp");
@@ -98,21 +99,21 @@ protected void processRequest(HttpServletRequest request, HttpServletResponse re
                     new javax.mail.Authenticator() {
                         @Override
                         protected PasswordAuthentication getPasswordAuthentication() {
-                            return new PasswordAuthentication(creds.getUsername(), creds.getPassword());
+                            return new PasswordAuthentication(creds.getFrom(), creds.getPassword());
                         }
                     });
 //            Session session = Session.getInstance(props);
 
             try {
 
                 out.println("Sending message from \"" 
-                        + creds.getUsername()
+                        + creds.getFrom()
                         + "\" to \"" 
                         + creds.getTo()
                         + "\"...<br>");
 
                 Message message = new MimeMessage(session);
-                message.setFrom(new InternetAddress(creds.getUsername()));
+                message.setFrom(new InternetAddress(creds.getFrom()));
                 message.setRecipients(Message.RecipientType.TO,
                         InternetAddress.parse(creds.getTo()));
                 message.setSubject("Sending message using Programmatic JavaMail " + Calendar.getInstance().getTime());
