Author: rdonkin
Date: Tue Jun 2 11:51:43 2009
New Revision: 781009
URL: http://svn.apache.org/viewvc?rev=781009&view=rev
Log:
IMAP-95 MailboxMapper need not be generally exposed.
https://issues.apache.org/jira/browse/IMAP-95
Modified:
james/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/JPAMailbox.java
james/imap/trunk/memory/src/main/java/org/apache/james/imap/inmemory/InMemoryStoreMailbox.java
james/imap/trunk/store/src/main/java/org/apache/james/imap/store/StoreMailbox.java
james/imap/trunk/store/src/main/java/org/apache/james/imap/store/mail/MailboxMapper.java
Modified:
james/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/JPAMailbox.java
URL:
http://svn.apache.org/viewvc/james/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/JPAMailbox.java?rev=781009&r1=781008&r2=781009&view=diff
==============================================================================
---
james/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/JPAMailbox.java
(original)
+++
james/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/JPAMailbox.java
Tue Jun 2 11:51:43 2009
@@ -54,8 +54,7 @@
return mapper.findMailboxById(mailboxId);
}
- @Override
- protected MailboxMapper createMailboxMapper() {
+ private JPAMailboxMapper createMailboxMapper() {
final JPAMailboxMapper mapper = new
OpenJPAMailboxMapper(entityManagerFactory.createEntityManager());
return mapper;
}
@@ -88,5 +87,12 @@
protected Header createHeader(int lineNumber, String name, String value) {
final Header header = new JPAHeader(lineNumber, name, value);
return header;
+ }
+
+ @Override
+ protected Mailbox reserveNextUid() throws MailboxException {
+ final JPAMailboxMapper mapper = createMailboxMapper();
+ final Mailbox mailbox = mapper.consumeNextUid(mailboxId);
+ return mailbox;
}
}
Modified:
james/imap/trunk/memory/src/main/java/org/apache/james/imap/inmemory/InMemoryStoreMailbox.java
URL:
http://svn.apache.org/viewvc/james/imap/trunk/memory/src/main/java/org/apache/james/imap/inmemory/InMemoryStoreMailbox.java?rev=781009&r1=781008&r2=781009&view=diff
==============================================================================
---
james/imap/trunk/memory/src/main/java/org/apache/james/imap/inmemory/InMemoryStoreMailbox.java
(original)
+++
james/imap/trunk/memory/src/main/java/org/apache/james/imap/inmemory/InMemoryStoreMailbox.java
Tue Jun 2 11:51:43 2009
@@ -26,7 +26,6 @@
import org.apache.james.imap.mailbox.MailboxException;
import org.apache.james.imap.store.StoreMailbox;
-import org.apache.james.imap.store.mail.MailboxMapper;
import org.apache.james.imap.store.mail.MessageMapper;
import org.apache.james.imap.store.mail.model.Header;
import org.apache.james.imap.store.mail.model.Mailbox;
@@ -52,26 +51,26 @@
}
@Override
- protected MailboxMapper createMailboxMapper() {
+ protected MailboxMembership createMessage(Date internalDate, long uid, int
size, int bodyStartOctet, byte[] document, Flags flags, List<Header> headers,
PropertyBuilder propertyBuilder) {
// TODO Auto-generated method stub
return null;
}
@Override
- protected MailboxMembership createMessage(Date internalDate, long uid, int
size, int bodyStartOctet, byte[] document, Flags flags, List<Header> headers,
PropertyBuilder propertyBuilder) {
+ protected MessageMapper createMessageMapper() {
// TODO Auto-generated method stub
return null;
}
@Override
- protected MessageMapper createMessageMapper() {
+ protected Mailbox getMailboxRow() throws MailboxException {
// TODO Auto-generated method stub
return null;
}
@Override
- protected Mailbox getMailboxRow() throws MailboxException {
- // TODO Auto-generated method stub
+ protected Mailbox reserveNextUid() throws MailboxException {
+ // TODO: implementation
return null;
}
Modified:
james/imap/trunk/store/src/main/java/org/apache/james/imap/store/StoreMailbox.java
URL:
http://svn.apache.org/viewvc/james/imap/trunk/store/src/main/java/org/apache/james/imap/store/StoreMailbox.java?rev=781009&r1=781008&r2=781009&view=diff
==============================================================================
---
james/imap/trunk/store/src/main/java/org/apache/james/imap/store/StoreMailbox.java
(original)
+++
james/imap/trunk/store/src/main/java/org/apache/james/imap/store/StoreMailbox.java
Tue Jun 2 11:51:43 2009
@@ -48,7 +48,6 @@
import org.apache.james.imap.mailbox.MessageResult.FetchGroup;
import org.apache.james.imap.mailbox.util.UidChangeTracker;
import org.apache.james.imap.mailbox.util.UidRange;
-import org.apache.james.imap.store.mail.MailboxMapper;
import org.apache.james.imap.store.mail.MessageMapper;
import org.apache.james.imap.store.mail.model.Header;
import org.apache.james.imap.store.mail.model.Mailbox;
@@ -79,8 +78,6 @@
protected abstract Mailbox getMailboxRow() throws MailboxException;
- protected abstract MailboxMapper createMailboxMapper();
-
public long getMailboxId() {
return mailboxId;
}
@@ -239,11 +236,7 @@
protected abstract Header createHeader(int lineNumber, String name, String
value);
- private Mailbox reserveNextUid() throws MailboxException {
- final MailboxMapper mapper = createMailboxMapper();
- final Mailbox mailbox = mapper.consumeNextUid(mailboxId);
- return mailbox;
- }
+ protected abstract Mailbox reserveNextUid() throws MailboxException;
public Iterator<MessageResult> getMessages(final MessageRange set,
FetchGroup fetchGroup,
MailboxSession mailboxSession) throws MailboxException {
Modified:
james/imap/trunk/store/src/main/java/org/apache/james/imap/store/mail/MailboxMapper.java
URL:
http://svn.apache.org/viewvc/james/imap/trunk/store/src/main/java/org/apache/james/imap/store/mail/MailboxMapper.java?rev=781009&r1=781008&r2=781009&view=diff
==============================================================================
---
james/imap/trunk/store/src/main/java/org/apache/james/imap/store/mail/MailboxMapper.java
(original)
+++
james/imap/trunk/store/src/main/java/org/apache/james/imap/store/mail/MailboxMapper.java
Tue Jun 2 11:51:43 2009
@@ -56,8 +56,4 @@
public abstract Mailbox findMailboxById(long mailboxId)
throws StorageException, MailboxNotFoundException;
-
- public abstract Mailbox consumeNextUid(long mailboxId)
- throws StorageException, MailboxNotFoundException;
-
}
\ No newline at end of file
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
