This is an automated email from the ASF dual-hosted git repository. btellier pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/james-project.git
commit 238e09ab727f2dff352c3056f15cf437f02b7830 Author: Benoit Tellier <[email protected]> AuthorDate: Fri Mar 15 11:02:30 2019 +0700 JAMES-2687 Remove unused methods from MessageManagerTestSystem --- .../inmemory/InMemoryMessageManagerTestSystem.java | 33 ---------------------- .../mailbox/store/MessageManagerTestSystem.java | 20 ------------- 2 files changed, 53 deletions(-) diff --git a/mailbox/memory/src/test/java/org/apache/james/mailbox/inmemory/InMemoryMessageManagerTestSystem.java b/mailbox/memory/src/test/java/org/apache/james/mailbox/inmemory/InMemoryMessageManagerTestSystem.java index 7a2c98b..3aa9e19 100644 --- a/mailbox/memory/src/test/java/org/apache/james/mailbox/inmemory/InMemoryMessageManagerTestSystem.java +++ b/mailbox/memory/src/test/java/org/apache/james/mailbox/inmemory/InMemoryMessageManagerTestSystem.java @@ -22,12 +22,9 @@ import java.io.IOException; import java.nio.charset.StandardCharsets; import java.util.Optional; -import javax.mail.Flags; - import org.apache.james.mailbox.MailboxManager; import org.apache.james.mailbox.MailboxSession; import org.apache.james.mailbox.MessageManager; -import org.apache.james.mailbox.MessageUid; import org.apache.james.mailbox.exception.MailboxException; import org.apache.james.mailbox.model.MailboxId; import org.apache.james.mailbox.model.MailboxMetaData; @@ -39,7 +36,6 @@ import org.apache.james.mailbox.store.MessageManagerTestSystem; import org.apache.james.mailbox.store.mail.model.Mailbox; import org.apache.james.mailbox.store.mail.model.impl.SimpleMailbox; import org.apache.james.mime4j.dom.Message; -import org.apache.james.mime4j.message.DefaultMessageWriter; public class InMemoryMessageManagerTestSystem extends MessageManagerTestSystem { @@ -73,26 +69,6 @@ public class InMemoryMessageManagerTestSystem extends MessageManagerTestSystem { } @Override - public MessageId persist(MailboxId mailboxId, MessageUid uid, Flags flags, MailboxSession session) { - try { - MessageManager messageManager = mailboxManager.getMailbox(mailboxId, session); - MessageId messageId = messageManager.appendMessage(MessageManager.AppendCommand.builder() - .withFlags(flags) - .build(message), session) - .getMessageId(); - lastMessageIdUsed = Optional.of(messageId); - return messageId; - } catch (MailboxException | IOException e) { - throw new RuntimeException(e); - } - } - - @Override - public MessageId createNotUsedMessageId() { - return InMemoryMessageId.of(Long.valueOf(lastMessageIdUsed.orElse(FIRST_MESSAGE_ID).serialize()) + ONE_HUNDRED); - } - - @Override public void deleteMailbox(final MailboxId mailboxId, MailboxSession session) { try { Optional<MailboxMetaData> mailbox = retrieveMailbox(mailboxId, session); @@ -113,13 +89,4 @@ public class InMemoryMessageManagerTestSystem extends MessageManagerTestSystem { .filter(mailboxMetaData -> mailboxMetaData.getId().equals(mailboxId)) .findFirst(); } - - @Override - public int getConstantMessageSize() { - try { - return DefaultMessageWriter.asBytes(message).length; - } catch (IOException e) { - throw new RuntimeException(e); - } - } } diff --git a/mailbox/store/src/test/java/org/apache/james/mailbox/store/MessageManagerTestSystem.java b/mailbox/store/src/test/java/org/apache/james/mailbox/store/MessageManagerTestSystem.java index f1715d6..32ec2b9 100644 --- a/mailbox/store/src/test/java/org/apache/james/mailbox/store/MessageManagerTestSystem.java +++ b/mailbox/store/src/test/java/org/apache/james/mailbox/store/MessageManagerTestSystem.java @@ -19,15 +19,11 @@ package org.apache.james.mailbox.store; -import javax.mail.Flags; - import org.apache.james.mailbox.MailboxManager; import org.apache.james.mailbox.MailboxSession; -import org.apache.james.mailbox.MessageUid; import org.apache.james.mailbox.exception.MailboxException; import org.apache.james.mailbox.model.MailboxId; import org.apache.james.mailbox.model.MailboxPath; -import org.apache.james.mailbox.model.MessageId; import org.apache.james.mailbox.store.mail.model.Mailbox; public abstract class MessageManagerTestSystem { @@ -44,21 +40,5 @@ public abstract class MessageManagerTestSystem { public abstract Mailbox createMailbox(MailboxPath mailboxPath, MailboxSession session) throws MailboxException; - /** - * Should take care of find returning the MailboxMessage - * Should take care of findMailboxes returning the mailbox the message is in - * Should persist flags - * Should keep track of flag state for setFlags - * - * @param mailboxId - * @param flags - * @return the id of persisted message - */ - public abstract MessageId persist(MailboxId mailboxId, MessageUid uid, Flags flags, MailboxSession session); - - public abstract MessageId createNotUsedMessageId(); - public abstract void deleteMailbox(MailboxId mailboxId, MailboxSession session); - - public abstract int getConstantMessageSize(); } --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
