You are viewing a plain text version of this content. The canonical link for it is here.
Posted to server-dev@james.apache.org by no...@apache.org on 2011/06/19 21:28:42 UTC
svn commit: r1137419 - in /james/mailbox/trunk:
memory/src/main/java/org/apache/james/mailbox/inmemory/
memory/src/main/java/org/apache/james/mailbox/inmemory/mail/
memory/src/main/java/org/apache/james/mailbox/inmemory/mail/model/
store/src/main/java/...
Author: norman
Date: Sun Jun 19 19:28:42 2011
New Revision: 1137419
URL: http://svn.apache.org/viewvc?rev=1137419&view=rev
Log:
More work on simplify mailbox store api. Part of MAILBOX-98
Removed:
james/mailbox/trunk/memory/src/main/java/org/apache/james/mailbox/inmemory/mail/model/SimpleMailboxMembership.java
Modified:
james/mailbox/trunk/memory/src/main/java/org/apache/james/mailbox/inmemory/InMemoryStoreMessageManager.java
james/mailbox/trunk/memory/src/main/java/org/apache/james/mailbox/inmemory/mail/InMemoryMessageMapper.java
james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/mail/model/SimpleMessage.java
Modified: james/mailbox/trunk/memory/src/main/java/org/apache/james/mailbox/inmemory/InMemoryStoreMessageManager.java
URL: http://svn.apache.org/viewvc/james/mailbox/trunk/memory/src/main/java/org/apache/james/mailbox/inmemory/InMemoryStoreMessageManager.java?rev=1137419&r1=1137418&r2=1137419&view=diff
==============================================================================
--- james/mailbox/trunk/memory/src/main/java/org/apache/james/mailbox/inmemory/InMemoryStoreMessageManager.java (original)
+++ james/mailbox/trunk/memory/src/main/java/org/apache/james/mailbox/inmemory/InMemoryStoreMessageManager.java Sun Jun 19 19:28:42 2011
@@ -19,21 +19,11 @@
package org.apache.james.mailbox.inmemory;
-import java.io.IOException;
-import java.util.Date;
-
-import javax.mail.Flags;
-import javax.mail.internet.SharedInputStream;
-
-import org.apache.commons.io.IOUtils;
import org.apache.james.mailbox.MailboxException;
-import org.apache.james.mailbox.inmemory.mail.model.SimpleMailboxMembership;
import org.apache.james.mailbox.store.MailboxEventDispatcher;
import org.apache.james.mailbox.store.MailboxSessionMapperFactory;
import org.apache.james.mailbox.store.StoreMessageManager;
import org.apache.james.mailbox.store.mail.model.Mailbox;
-import org.apache.james.mailbox.store.mail.model.Message;
-import org.apache.james.mailbox.store.mail.model.PropertyBuilder;
import org.apache.james.mailbox.store.search.MessageSearchIndex;
public class InMemoryStoreMessageManager extends StoreMessageManager<Long> {
@@ -41,20 +31,4 @@ public class InMemoryStoreMessageManager
public InMemoryStoreMessageManager(MailboxSessionMapperFactory<Long> mapperFactory, MessageSearchIndex<Long> index, MailboxEventDispatcher<Long> dispatcher, Mailbox<Long> mailbox) throws MailboxException {
super(mapperFactory, index, dispatcher,mailbox);
}
-
- @Override
- protected Message<Long> createMessage(Date internalDate, int size, int bodyStartOctet,
- SharedInputStream content, Flags flags, PropertyBuilder propertyBuilder) throws MailboxException {
-
- int headerEnd = bodyStartOctet -2;
- if (headerEnd < 0) {
- headerEnd = 0;
- }
- try {
- return new SimpleMailboxMembership(internalDate, size, bodyStartOctet, IOUtils.toByteArray(content.newStream(0, headerEnd)), IOUtils.toByteArray(content.newStream(bodyStartOctet, -1)), flags, propertyBuilder, getMailboxEntity().getMailboxId());
- } catch (IOException e) {
- throw new MailboxException("Unable to create message", e);
- }
- }
-
}
Modified: james/mailbox/trunk/memory/src/main/java/org/apache/james/mailbox/inmemory/mail/InMemoryMessageMapper.java
URL: http://svn.apache.org/viewvc/james/mailbox/trunk/memory/src/main/java/org/apache/james/mailbox/inmemory/mail/InMemoryMessageMapper.java?rev=1137419&r1=1137418&r2=1137419&view=diff
==============================================================================
--- james/mailbox/trunk/memory/src/main/java/org/apache/james/mailbox/inmemory/mail/InMemoryMessageMapper.java (original)
+++ james/mailbox/trunk/memory/src/main/java/org/apache/james/mailbox/inmemory/mail/InMemoryMessageMapper.java Sun Jun 19 19:28:42 2011
@@ -31,11 +31,11 @@ import org.apache.james.mailbox.MailboxE
import org.apache.james.mailbox.MailboxSession;
import org.apache.james.mailbox.MessageMetaData;
import org.apache.james.mailbox.MessageRange;
-import org.apache.james.mailbox.inmemory.mail.model.SimpleMailboxMembership;
import org.apache.james.mailbox.store.mail.AbstractMessageMapper;
import org.apache.james.mailbox.store.mail.SimpleMessageMetaData;
import org.apache.james.mailbox.store.mail.model.Mailbox;
import org.apache.james.mailbox.store.mail.model.Message;
+import org.apache.james.mailbox.store.mail.model.SimpleMessage;
public class InMemoryMessageMapper extends AbstractMessageMapper<Long> {
@@ -214,7 +214,10 @@ public class InMemoryMessageMapper exten
* @see org.apache.james.mailbox.store.mail.AbstractMessageMapper#copy(org.apache.james.mailbox.store.mail.model.Mailbox, long, long, org.apache.james.mailbox.store.mail.model.Message)
*/
protected MessageMetaData copy(Mailbox<Long> mailbox, long uid, long modSeq, Message<Long> original) throws MailboxException {
- return save(mailbox, new SimpleMailboxMembership(mailbox.getMailboxId(), uid, modSeq, (SimpleMailboxMembership)original));
+ SimpleMessage<Long> message = new SimpleMessage<Long>(mailbox, original);
+ message.setUid(uid);
+ message.setModSeq(modSeq);
+ return save(mailbox, message);
}
/*
Modified: james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/mail/model/SimpleMessage.java
URL: http://svn.apache.org/viewvc/james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/mail/model/SimpleMessage.java?rev=1137419&r1=1137418&r2=1137419&view=diff
==============================================================================
--- james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/mail/model/SimpleMessage.java (original)
+++ james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/mail/model/SimpleMessage.java Sun Jun 19 19:28:42 2011
@@ -72,7 +72,7 @@ public class SimpleMessage<Id> extends A
}
- public SimpleMessage(Mailbox<Id> mailbox, Message<Integer> original) throws MailboxException {
+ public SimpleMessage(Mailbox<Id> mailbox, Message<Id> original) throws MailboxException {
this.internalDate = original.getInternalDate();
this.size = original.getFullContentOctets();
this.mailboxId = mailbox.getMailboxId();
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org