Resolved some SonarLint warnings

[spring-ext/ozacc-mail.git] / src / main / java / com / ozacc / mail / fetch / ReceivedMail.java

diff --git a/src/main/java/com/ozacc/mail/fetch/ReceivedMail.java b/src/main/java/com/ozacc/mail/fetch/ReceivedMail.java
index 3d760cd..35005cc 100644 (file)
--- a/src/main/java/com/ozacc/mail/fetch/ReceivedMail.java
+++ b/src/main/java/com/ozacc/mail/fetch/ReceivedMail.java
@@ -33,7 +33,7 @@ public class ReceivedMail extends Mail {
 
        private int size;
 
-       private List receivedHeaders;
+       private List<ReceivedHeader> receivedHeaders;
 
        private MimeMessage message;
 
@@ -166,8 +166,9 @@ public class ReceivedMail extends Mail {
         * 
         * @see java.lang.Object#toString()
         */
+       @Override
        public String toString() {
-               StringBuffer buf = new StringBuffer(1000);
+               StringBuilder buf = new StringBuilder(1000);
                buf.append("Mail\n");
                buf.append("Return-Path: ").append(returnPath).append("\n");
                buf.append("Message-ID: ").append(messageId).append("\n");
@@ -181,9 +182,9 @@ public class ReceivedMail extends Mail {
                buf.append("Subject: ").append(subject).append("\n");
 
                if (headers != null) {
-                       for (Iterator itr = headers.keySet().iterator(); itr.hasNext();) {
-                               String header = (String)itr.next();
-                               String value = (String)headers.get(header);
+                       for (Iterator<String> itr = headers.keySet().iterator(); itr.hasNext();) {
+                               String header = itr.next();
+                               String value = headers.get(header);
                                buf.append(header).append(": ").append(value).append("\n");
                        }
                }
@@ -199,7 +200,7 @@ public class ReceivedMail extends Mail {
                if (isFileAttached()) {
                        buf.append("\n\nAttachments\n");
                        for (int i = 0, num = attachmentFiles.size(); i < num; i++) {
-                               AttachmentFile f = (AttachmentFile)attachmentFiles.get(i);
+                               AttachmentFile f = attachmentFiles.get(i);
                                buf.append("[").append(i + 1).append("] ").append(f.getName()).append("\n");
                        }
                }
@@ -317,18 +318,18 @@ public class ReceivedMail extends Mail {
                mail.setSubject(subject);
 
                // In-Reply-To, References
-               String messageId = getMessageId();
-               if (messageId != null && !"<>".equals(messageId)) {
+               String msgId = getMessageId();
+               if (msgId != null && !"<>".equals(msgId)) {
                        String references = getRefereces();
                        if (references != null) {
-                               references = messageId + " " + references;
+                               references = msgId + " " + references;
                        } else if (getInReplyTo() != null) {
-                               references = messageId + " " + getInReplyTo();
+                               references = msgId + " " + getInReplyTo();
                        } else {
-                               references = messageId;
+                               references = msgId;
                        }
                        mail.addHeader("References", references);
-                       mail.addHeader("In-Reply-To", messageId);
+                       mail.addHeader("In-Reply-To", msgId);
                }
 
                return mail;
@@ -341,7 +342,7 @@ public class ReceivedMail extends Mail {
         */
        public void addReceviedHeader(ReceivedHeader rh) {
                if (receivedHeaders == null) {
-                       receivedHeaders = new ArrayList();
+                       receivedHeaders = new ArrayList<>();
                }
                receivedHeaders.add(rh);
        }
@@ -357,7 +358,7 @@ public class ReceivedMail extends Mail {
                if (receivedHeaders == null) {
                        return new ReceivedHeader[0];
                }
-               return (ReceivedHeader[])receivedHeaders
+               return receivedHeaders
                                .toArray(new ReceivedHeader[receivedHeaders.size()]);
        }