JAMES-2082 Introduce SimpleMailboxMessage builder

mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/MessageWithoutAttachment.java

@@ -37,20 +37,20 @@ public class MessageWithoutAttachment {
     private final MessageId messageId;
     private final Date internalDate;
     private final Long size;
-    private final Integer boduSize;
+    private final Integer bodySize;
     private final SharedByteArrayInputStream content;
     private final Flags flags;
     private final PropertyBuilder propertyBuilder;
     private final MailboxId mailboxId;
     private final MessageUid messageUid;
     private final long modSeq;
 
-    public MessageWithoutAttachment(MessageId messageId, Date internalDate, Long size, Integer boduSize, SharedByteArrayInputStream content,
+    public MessageWithoutAttachment(MessageId messageId, Date internalDate, Long size, Integer bodySize, SharedByteArrayInputStream content,
                                     Flags flags, PropertyBuilder propertyBuilder, MailboxId mailboxId, MessageUid messageUid, long modSeq) {
         this.messageId = messageId;
         this.internalDate = internalDate;
         this.size = size;
-        this.boduSize = boduSize;
+        this.bodySize = bodySize;
         this.content = content;
         this.flags = flags;
         this.propertyBuilder = propertyBuilder;
@@ -60,11 +60,19 @@ public MessageWithoutAttachment(MessageId messageId, Date internalDate, Long siz
     }
 
     public SimpleMailboxMessage toMailboxMessage(List<MessageAttachment> attachments) {
-        SimpleMailboxMessage simpleMailboxMessage = new SimpleMailboxMessage(messageId, internalDate, size, boduSize,
-                content, flags, propertyBuilder, mailboxId, attachments);
-        simpleMailboxMessage.setUid(messageUid);
-        simpleMailboxMessage.setModSeq(modSeq);
-        return simpleMailboxMessage;
+        return SimpleMailboxMessage.builder()
+            .messageId(messageId)
+            .mailboxId(mailboxId)
+            .uid(messageUid)
+            .modseq(modSeq)
+            .internalDate(internalDate)
+            .bodyStartOctet(bodySize)
+            .size(size)
+            .content(content)
+            .flags(flags)
+            .propertyBuilder(propertyBuilder)
+            .addAttachments(attachments)
+            .build();
     }
 
     public MailboxId getMailboxId() {

mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraMessageDAOTest.java

@@ -43,6 +43,7 @@
 import org.apache.james.mailbox.store.mail.model.impl.SimpleMailboxMessage;
 
 import com.github.steveash.guavate.Guavate;
+import com.google.common.base.Charsets;
 import com.google.common.collect.ImmutableList;
 
 import org.junit.After;
@@ -142,22 +143,24 @@ public void saveShouldStoreMessageWithAttachmentButNoCid() throws Exception {
     }
 
     private SimpleMailboxMessage createMessage(
-        MessageId messageId,
-        String content,
-        int bodyStart,
-        PropertyBuilder propertyBuilder,
-        List<MessageAttachment> attachments
-    ) {
-        return new SimpleMailboxMessage(
-            messageId,
-            new Date(),
-            content.length(),
-            bodyStart,
-            new SharedByteArrayInputStream(content.getBytes()),
-            new Flags(),
-            propertyBuilder,
-            MAILBOX_ID,
-            attachments);
+            MessageId messageId,
+            String content,
+            int bodyStart,
+            PropertyBuilder propertyBuilder,
+            List<MessageAttachment> attachments) {
+
+        return SimpleMailboxMessage.builder()
+            .messageId(messageId)
+            .mailboxId(MAILBOX_ID)
+            .uid(messageUid)
+            .internalDate(new Date())
+            .bodyStartOctet(bodyStart)
+            .size(content.length())
+            .content(new SharedByteArrayInputStream(content.getBytes(Charsets.UTF_8)))
+            .flags(new Flags())
+            .propertyBuilder(propertyBuilder)
+            .addAttachments(attachments)
+            .build();
     }
 
 }

mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraMessageDAOV2Test.java

@@ -167,9 +167,17 @@ public void saveShouldStoreMessageWithHeaderContent() throws Exception {
     }
 
     private SimpleMailboxMessage createMessage(MessageId messageId, String content, int bodyStart, PropertyBuilder propertyBuilder) {
-        return new SimpleMailboxMessage(messageId, new Date(), content.length(), bodyStart,
-            new SharedByteArrayInputStream(content.getBytes(Charsets.UTF_8)), new Flags(),
-            propertyBuilder, MAILBOX_ID);
+        return SimpleMailboxMessage.builder()
+            .messageId(messageId)
+            .mailboxId(MAILBOX_ID)
+            .uid(messageUid)
+            .internalDate(new Date())
+            .bodyStartOctet(bodyStart)
+            .size(content.length())
+            .content(new SharedByteArrayInputStream(content.getBytes(Charsets.UTF_8)))
+            .flags(new Flags())
+            .propertyBuilder(propertyBuilder)
+            .build();
     }
 
     private MessageWithoutAttachment toMessage(CompletableFuture<Stream<CassandraMessageDAOV2.MessageResult>> readOptional) throws InterruptedException, java.util.concurrent.ExecutionException {

mailbox/store/src/main/java/org/apache/james/mailbox/store/mail/model/impl/SimpleMailboxMessage.java

@@ -20,6 +20,7 @@
 package org.apache.james.mailbox.store.mail.model.impl;
 
 import java.io.IOException;
+import java.util.Collection;
 import java.util.Date;
 import java.util.List;
 
@@ -38,11 +39,112 @@
 
 import com.google.common.base.MoreObjects;
 import com.google.common.base.Objects;
+import com.google.common.base.Optional;
+import com.google.common.base.Preconditions;
 import com.google.common.collect.ImmutableList;
 import com.google.common.primitives.Ints;
 
 public class SimpleMailboxMessage extends DelegatingMailboxMessage {
 
+    public static Builder builder() {
+        return new Builder();
+    }
+
+    public static class Builder {
+        private MessageId messageId;
+        private Date internalDate;
+        private Long size;
+        private Integer bodyStartOctet;
+        private SharedInputStream content;
+        private Flags flags;
+        private PropertyBuilder propertyBuilder;
+        private MailboxId mailboxId;
+        private Optional<MessageUid> uid = Optional.absent();
+        private Optional<Long> modseq = Optional.absent();
+        private ImmutableList.Builder<MessageAttachment> attachments = ImmutableList.builder();
+
+        public Builder messageId(MessageId messageId) {
+            this.messageId = messageId;
+            return this;
+        }
+
+        public Builder uid(MessageUid messageUid) {
+            this.uid = Optional.of(messageUid);
+            return this;
+        }
+
+        public Builder modseq(long modseq) {
+            Preconditions.checkArgument(modseq >= 0, "modseq can not be negative");
+            this.modseq = Optional.of(modseq);
+            return this;
+        }
+
+        public Builder internalDate(Date internalDate) {
+            this.internalDate = internalDate;
+            return this;
+        }
+
+        public Builder size(long size) {
+            Preconditions.checkArgument(size >= 0, "size can not be negative");
+            this.size = size;
+            return this;
+        }
+
+        public Builder bodyStartOctet(int bodyStartOctet) {
+            Preconditions.checkArgument(bodyStartOctet >= 0, "bodyStartOctet can not be negative");
+            this.bodyStartOctet = bodyStartOctet;
+            return this;
+        }
+
+        public Builder content(SharedInputStream content) {
+            this.content = content;
+            return this;
+        }
+
+        public Builder flags(Flags flags) {
+            this.flags = flags;
+            return this;
+        }
+
+        public Builder propertyBuilder(PropertyBuilder propertyBuilder) {
+            this.propertyBuilder = propertyBuilder;
+            return this;
+        }
+
+        public Builder mailboxId(MailboxId mailboxId) {
+            this.mailboxId = mailboxId;
+            return this;
+        }
+
+        public Builder addAttachments(Collection<MessageAttachment> attachments) {
+            this.attachments.addAll(attachments);
+            return this;
+        }
+
+        public SimpleMailboxMessage build() {
+            Preconditions.checkNotNull(messageId, "messageId is required");
+            Preconditions.checkNotNull(internalDate, "internalDate is required");
+            Preconditions.checkNotNull(size, "size is required");
+            Preconditions.checkNotNull(bodyStartOctet, "bodyStartOctet is required");
+            Preconditions.checkNotNull(content, "content is required");
+            Preconditions.checkNotNull(flags, "flags is required");
+            Preconditions.checkNotNull(propertyBuilder, "propertyBuilder is required");
+            Preconditions.checkNotNull(mailboxId, "mailboxId is required");
+
+            SimpleMailboxMessage simpleMailboxMessage = new SimpleMailboxMessage(messageId, internalDate, size,
+                bodyStartOctet, content, flags, propertyBuilder, mailboxId, attachments.build());
+
+            if (uid.isPresent()) {
+                simpleMailboxMessage.setUid(uid.get());
+            }
+
+            if (modseq.isPresent()) {
+                simpleMailboxMessage.setModSeq(modseq.get());
+            }
+            return simpleMailboxMessage;
+        }
+    }
+
     public static SimpleMailboxMessage copy(MailboxId mailboxId, MailboxMessage original) throws MailboxException {
         return copy(mailboxId, original, original.getAttachments());
     }