JAMES-2169 MailboxMetaData small refactoring for Java 8 style
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/2fdd0bff Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/2fdd0bff Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/2fdd0bff Branch: refs/heads/master Commit: 2fdd0bff7add441d3c28ea8370f2c2a7f53e9405 Parents: b8092bb Author: Matthieu Baechler <matth...@apache.org> Authored: Fri Sep 29 16:21:09 2017 +0200 Committer: benwa <btell...@linagora.com> Committed: Wed Oct 4 16:19:58 2017 +0700 ---------------------------------------------------------------------- .../james/mailbox/store/MailboxMetaData.java | 49 ++++++-------------- 1 file changed, 13 insertions(+), 36 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/james-project/blob/2fdd0bff/mailbox/store/src/main/java/org/apache/james/mailbox/store/MailboxMetaData.java ---------------------------------------------------------------------- diff --git a/mailbox/store/src/main/java/org/apache/james/mailbox/store/MailboxMetaData.java b/mailbox/store/src/main/java/org/apache/james/mailbox/store/MailboxMetaData.java index 8b002f0..7dbfa1c 100644 --- a/mailbox/store/src/main/java/org/apache/james/mailbox/store/MailboxMetaData.java +++ b/mailbox/store/src/main/java/org/apache/james/mailbox/store/MailboxMetaData.java @@ -21,6 +21,7 @@ package org.apache.james.mailbox.store; import java.util.ArrayList; import java.util.List; +import java.util.Optional; import javax.mail.Flags; @@ -48,14 +49,9 @@ public class MailboxMetaData implements MessageManager.MetaData { public MailboxMetaData(List<MessageUid> recent, Flags permanentFlags, long uidValidity, MessageUid uidNext, long highestModSeq, long messageCount, long unseenCount, MessageUid firstUnseen, boolean writeable, boolean modSeqPermanent, MailboxACL acl) { super(); - if (recent == null) { - this.recent = new ArrayList<>(); - } else { - this.recent = recent; - - } + this.recent = Optional.ofNullable(recent).orElseGet(ArrayList::new); this.highestModSeq = highestModSeq; - recentCount = this.recent.size(); + this.recentCount = this.recent.size(); this.permanentFlags = permanentFlags; this.uidValidity = uidValidity; @@ -68,16 +64,12 @@ public class MailboxMetaData implements MessageManager.MetaData { this.acl = acl; } - /** - * @see MailboxMetaData#countRecent() - */ + @Override public long countRecent() { return recentCount; } - /** - * @see MailboxMetaData#getPermanentFlags() - */ + @Override public Flags getPermanentFlags() { return permanentFlags; } @@ -87,61 +79,46 @@ public class MailboxMetaData implements MessageManager.MetaData { return recent; } - /** - * @see MailboxMetaData#getUidValidity() - */ + @Override public long getUidValidity() { return uidValidity; } + @Override public MessageUid getUidNext() { return nextUid; } - /** - * @see MailboxMetaData#getMessageCount() - */ + @Override public long getMessageCount() { return messageCount; } - /** - * @see MailboxMetaData#getUnseenCount() - */ + @Override public long getUnseenCount() { return unseenCount; } + @Override public MessageUid getFirstUnseen() { return firstUnseen; } - /** - * @see MailboxMetaData#isWriteable() - */ + @Override public boolean isWriteable() { return writeable; } - /** - * @see MailboxMetaData#getHighestModSeq() - */ + @Override public long getHighestModSeq() { return highestModSeq; } - /** - * @see MailboxMetaData#isModSeqPermanent() - */ + @Override public boolean isModSeqPermanent() { return modSeqPermanent; } - /* - * (non-Javadoc) - * - * @see org.apache.james.mailbox.MessageManager.MetaData#getACL() - */ @Override public MailboxACL getACL() { return acl; --------------------------------------------------------------------- To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org For additional commands, e-mail: server-dev-h...@james.apache.org
