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 ma...@apache.org on 2016/01/12 14:17:05 UTC
svn commit: r1724225 [2/5] - in /james/project/trunk:
dockerfiles/run/guice/destination/conf/META-INF/
dockerfiles/run/spring/destination/conf/META-INF/
mailbox/caching/src/main/java/org/apache/james/mailbox/caching/
mailbox/cassandra/src/main/java/org...
Modified: james/project/trunk/mailbox/jcr/src/main/java/org/apache/james/mailbox/jcr/JCRMessageManager.java
URL: http://svn.apache.org/viewvc/james/project/trunk/mailbox/jcr/src/main/java/org/apache/james/mailbox/jcr/JCRMessageManager.java?rev=1724225&r1=1724224&r2=1724225&view=diff
==============================================================================
--- james/project/trunk/mailbox/jcr/src/main/java/org/apache/james/mailbox/jcr/JCRMessageManager.java (original)
+++ james/project/trunk/mailbox/jcr/src/main/java/org/apache/james/mailbox/jcr/JCRMessageManager.java Tue Jan 12 13:17:03 2016
@@ -29,13 +29,13 @@ import org.apache.james.mailbox.acl.Grou
import org.apache.james.mailbox.acl.MailboxACLResolver;
import org.apache.james.mailbox.exception.MailboxException;
import org.apache.james.mailbox.jcr.mail.model.JCRMailbox;
-import org.apache.james.mailbox.jcr.mail.model.JCRMessage;
+import org.apache.james.mailbox.jcr.mail.model.JCRMailboxMessage;
import org.apache.james.mailbox.quota.QuotaManager;
import org.apache.james.mailbox.quota.QuotaRootResolver;
import org.apache.james.mailbox.store.event.MailboxEventDispatcher;
import org.apache.james.mailbox.store.MailboxSessionMapperFactory;
import org.apache.james.mailbox.store.StoreMessageManager;
-import org.apache.james.mailbox.store.mail.model.Message;
+import org.apache.james.mailbox.store.mail.model.MailboxMessage;
import org.apache.james.mailbox.store.mail.model.impl.PropertyBuilder;
import org.apache.james.mailbox.store.search.MessageSearchIndex;
import org.slf4j.Logger;
@@ -56,8 +56,8 @@ public class JCRMessageManager extends S
@Override
- protected Message<JCRId> createMessage(Date internalDate, int size, int bodyStartOctet, SharedInputStream content, Flags flags, PropertyBuilder propertyBuilder) throws MailboxException{
- final Message<JCRId> message = new JCRMessage(getMailboxEntity().getMailboxId(), internalDate,
+ protected MailboxMessage<JCRId> createMessage(Date internalDate, int size, int bodyStartOctet, SharedInputStream content, Flags flags, PropertyBuilder propertyBuilder) throws MailboxException{
+ final MailboxMessage<JCRId> message = new JCRMailboxMessage(getMailboxEntity().getMailboxId(), internalDate,
size, flags, content, bodyStartOctet, propertyBuilder, log);
return message;
}
Modified: james/project/trunk/mailbox/jcr/src/main/java/org/apache/james/mailbox/jcr/mail/JCRMessageMapper.java
URL: http://svn.apache.org/viewvc/james/project/trunk/mailbox/jcr/src/main/java/org/apache/james/mailbox/jcr/mail/JCRMessageMapper.java?rev=1724225&r1=1724224&r2=1724225&view=diff
==============================================================================
--- james/project/trunk/mailbox/jcr/src/main/java/org/apache/james/mailbox/jcr/mail/JCRMessageMapper.java (original)
+++ james/project/trunk/mailbox/jcr/src/main/java/org/apache/james/mailbox/jcr/mail/JCRMessageMapper.java Tue Jan 12 13:17:03 2016
@@ -43,7 +43,7 @@ import org.apache.james.mailbox.exceptio
import org.apache.james.mailbox.jcr.JCRId;
import org.apache.james.mailbox.jcr.JCRImapConstants;
import org.apache.james.mailbox.jcr.MailboxSessionJCRRepository;
-import org.apache.james.mailbox.jcr.mail.model.JCRMessage;
+import org.apache.james.mailbox.jcr.mail.model.JCRMailboxMessage;
import org.apache.james.mailbox.model.MessageMetaData;
import org.apache.james.mailbox.model.MessageRange;
import org.apache.james.mailbox.model.MessageRange.Type;
@@ -53,7 +53,7 @@ import org.apache.james.mailbox.store.ma
import org.apache.james.mailbox.store.mail.ModSeqProvider;
import org.apache.james.mailbox.store.mail.UidProvider;
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.MailboxMessage;
/**
* JCR implementation of a {@link MessageMapper}. The implementation store each
@@ -214,7 +214,7 @@ public class JCRMessageMapper extends Ab
// we use order by because without it count will always be 0 in
// jackrabbit
String queryString = "/jcr:root" + getMailboxPath(mailbox) + "//element(*,jamesMailbox:message) order by @"
- + JCRMessage.UID_PROPERTY;
+ + JCRMailboxMessage.UID_PROPERTY;
QueryManager manager = getSession().getWorkspace().getQueryManager();
QueryResult result = manager.createQuery(queryString, XPATH_LANGUAGE).execute();
NodeIterator nodes = result.getNodes();
@@ -245,7 +245,7 @@ public class JCRMessageMapper extends Ab
// we use order by because without it count will always be 0 in
// jackrabbit
String queryString = "/jcr:root" + getMailboxPath(mailbox) + "//element(*,jamesMailbox:message)[@"
- + JCRMessage.SEEN_PROPERTY + "='false'] order by @" + JCRMessage.UID_PROPERTY;
+ + JCRMailboxMessage.SEEN_PROPERTY + "='false'] order by @" + JCRMailboxMessage.UID_PROPERTY;
QueryManager manager = getSession().getWorkspace().getQueryManager();
QueryResult result = manager.createQuery(queryString, XPATH_LANGUAGE).execute();
NodeIterator nodes = result.getNodes();
@@ -271,10 +271,10 @@ public class JCRMessageMapper extends Ab
* @see
* org.apache.james.mailbox.store.mail.MessageMapper#delete(org.apache.james
* .mailbox.store.mail.model.Mailbox,
- * org.apache.james.mailbox.store.mail.model.Message)
+ * org.apache.james.mailbox.store.mail.model.MailboxMessage)
*/
- public void delete(Mailbox<JCRId> mailbox, Message<JCRId> message) throws MailboxException {
- JCRMessage membership = (JCRMessage) message;
+ public void delete(Mailbox<JCRId> mailbox, MailboxMessage<JCRId> message) throws MailboxException {
+ JCRMailboxMessage membership = (JCRMailboxMessage) message;
if (membership.isPersistent()) {
try {
@@ -294,10 +294,10 @@ public class JCRMessageMapper extends Ab
* org.apache.james.mailbox.MessageRange,
* org.apache.james.mailbox.store.mail.MessageMapper.FetchType, int)
*/
- public Iterator<Message<JCRId>> findInMailbox(Mailbox<JCRId> mailbox, MessageRange set, FetchType fType, int max)
+ public Iterator<MailboxMessage<JCRId>> findInMailbox(Mailbox<JCRId> mailbox, MessageRange set, FetchType fType, int max)
throws MailboxException {
try {
- List<Message<JCRId>> results;
+ List<MailboxMessage<JCRId>> results;
long from = set.getUidFrom();
final long to = set.getUidTo();
final Type type = set.getType();
@@ -339,7 +339,7 @@ public class JCRMessageMapper extends Ab
List<Long> list = new ArrayList<Long>();
String queryString = "/jcr:root" + getMailboxPath(mailbox) + "//element(*,jamesMailbox:message)[@"
- + JCRMessage.RECENT_PROPERTY + "='true'] order by @" + JCRMessage.UID_PROPERTY;
+ + JCRMailboxMessage.RECENT_PROPERTY + "='true'] order by @" + JCRMailboxMessage.UID_PROPERTY;
QueryManager manager = getSession().getWorkspace().getQueryManager();
Query query = manager.createQuery(queryString, XPATH_LANGUAGE);
@@ -347,7 +347,7 @@ public class JCRMessageMapper extends Ab
NodeIterator iterator = result.getNodes();
while (iterator.hasNext()) {
- list.add(new JCRMessage(iterator.nextNode(), mailboxSession.getLog()).getUid());
+ list.add(new JCRMailboxMessage(iterator.nextNode(), mailboxSession.getLog()).getUid());
}
return list;
@@ -366,7 +366,7 @@ public class JCRMessageMapper extends Ab
public Long findFirstUnseenMessageUid(Mailbox<JCRId> mailbox) throws MailboxException {
try {
String queryString = "/jcr:root" + getMailboxPath(mailbox) + "//element(*,jamesMailbox:message)[@"
- + JCRMessage.SEEN_PROPERTY + "='false'] order by @" + JCRMessage.UID_PROPERTY;
+ + JCRMailboxMessage.SEEN_PROPERTY + "='false'] order by @" + JCRMailboxMessage.UID_PROPERTY;
QueryManager manager = getSession().getWorkspace().getQueryManager();
@@ -376,7 +376,7 @@ public class JCRMessageMapper extends Ab
NodeIterator iterator = result.getNodes();
if (iterator.hasNext()) {
- return new JCRMessage(iterator.nextNode(), mailboxSession.getLog()).getUid();
+ return new JCRMailboxMessage(iterator.nextNode(), mailboxSession.getLog()).getUid();
} else {
return null;
}
@@ -389,7 +389,7 @@ public class JCRMessageMapper extends Ab
public Map<Long, MessageMetaData> expungeMarkedForDeletionInMailbox(Mailbox<JCRId> mailbox, MessageRange set)
throws MailboxException {
try {
- final List<Message<JCRId>> results;
+ final List<MailboxMessage<JCRId>> results;
final long from = set.getUidFrom();
final long to = set.getUidTo();
final Type type = set.getType();
@@ -410,7 +410,7 @@ public class JCRMessageMapper extends Ab
}
Map<Long, MessageMetaData> uids = new HashMap<Long, MessageMetaData>();
for (int i = 0; i < results.size(); i++) {
- Message<JCRId> m = results.get(i);
+ MailboxMessage<JCRId> m = results.get(i);
long uid = m.getUid();
uids.put(uid, new SimpleMessageMetaData(m));
delete(mailbox, m);
@@ -425,39 +425,39 @@ public class JCRMessageMapper extends Ab
* (non-Javadoc)
*
* @see org.apache.james.mailbox.store.mail.MessageMapper#move(org.apache.james.mailbox.store.mail.model.Mailbox,
- * org.apache.james.mailbox.store.mail.model.Message)
+ * MailboxMessage)
*/
@Override
- public MessageMetaData move(Mailbox<JCRId> mailbox, Message<JCRId> original) throws MailboxException {
+ public MessageMetaData move(Mailbox<JCRId> mailbox, MailboxMessage<JCRId> original) throws MailboxException {
throw new UnsupportedOperationException("Not implemented - see https://issues.apache.org/jira/browse/IMAP-370");
}
@Override
- protected MessageMetaData copy(Mailbox<JCRId> mailbox, long uid, long modSeq, Message<JCRId> original)
+ protected MessageMetaData copy(Mailbox<JCRId> mailbox, long uid, long modSeq, MailboxMessage<JCRId> original)
throws MailboxException {
try {
String newMessagePath = getSession().getNodeByIdentifier(mailbox.getMailboxId().serialize()).getPath() + NODE_DELIMITER
+ String.valueOf(uid);
getSession().getWorkspace().copy(
- ((JCRMessage) original).getNode().getPath(),
+ ((JCRMailboxMessage) original).getNode().getPath(),
getSession().getNodeByIdentifier(mailbox.getMailboxId().serialize()).getPath() + NODE_DELIMITER
+ String.valueOf(uid));
Node node = getSession().getNode(newMessagePath);
- node.setProperty(JCRMessage.MAILBOX_UUID_PROPERTY, mailbox.getMailboxId().serialize());
- node.setProperty(JCRMessage.UID_PROPERTY, uid);
- node.setProperty(JCRMessage.MODSEQ_PROPERTY, modSeq);
+ node.setProperty(JCRMailboxMessage.MAILBOX_UUID_PROPERTY, mailbox.getMailboxId().serialize());
+ node.setProperty(JCRMailboxMessage.UID_PROPERTY, uid);
+ node.setProperty(JCRMailboxMessage.MODSEQ_PROPERTY, modSeq);
// A copy of a message is recent
// See MAILBOX-85
- node.setProperty(JCRMessage.RECENT_PROPERTY, true);
- return new SimpleMessageMetaData(new JCRMessage(node, mailboxSession.getLog()));
+ node.setProperty(JCRMailboxMessage.RECENT_PROPERTY, true);
+ return new SimpleMessageMetaData(new JCRMailboxMessage(node, mailboxSession.getLog()));
} catch (RepositoryException e) {
throw new MailboxException("Unable to copy message " + original + " in mailbox " + mailbox, e);
}
}
@Override
- protected MessageMetaData save(Mailbox<JCRId> mailbox, Message<JCRId> message) throws MailboxException {
- final JCRMessage membership = (JCRMessage) message;
+ protected MessageMetaData save(Mailbox<JCRId> mailbox, MailboxMessage<JCRId> message) throws MailboxException {
+ final JCRMailboxMessage membership = (JCRMailboxMessage) message;
try {
Node messageNode = null;
@@ -547,11 +547,11 @@ public class JCRMessageMapper extends Ab
return ISO9075.encodePath(getSession().getNodeByIdentifier(mailbox.getMailboxId().serialize()).getPath());
}
- private List<Message<JCRId>> findMessagesInMailboxAfterUID(Mailbox<JCRId> mailbox, long uid, int batchSize)
+ private List<MailboxMessage<JCRId>> findMessagesInMailboxAfterUID(Mailbox<JCRId> mailbox, long uid, int batchSize)
throws RepositoryException {
- List<Message<JCRId>> list = new ArrayList<Message<JCRId>>();
+ List<MailboxMessage<JCRId>> list = new ArrayList<MailboxMessage<JCRId>>();
String queryString = "/jcr:root" + getMailboxPath(mailbox) + "//element(*,jamesMailbox:message)[@"
- + JCRMessage.UID_PROPERTY + ">=" + uid + "] order by @" + JCRMessage.UID_PROPERTY;
+ + JCRMailboxMessage.UID_PROPERTY + ">=" + uid + "] order by @" + JCRMailboxMessage.UID_PROPERTY;
QueryManager manager = getSession().getWorkspace().getQueryManager();
Query query = manager.createQuery(queryString, XPATH_LANGUAGE);
@@ -561,16 +561,16 @@ public class JCRMessageMapper extends Ab
NodeIterator iterator = result.getNodes();
while (iterator.hasNext()) {
- list.add(new JCRMessage(iterator.nextNode(), mailboxSession.getLog()));
+ list.add(new JCRMailboxMessage(iterator.nextNode(), mailboxSession.getLog()));
}
return list;
}
- private List<Message<JCRId>> findMessageInMailboxWithUID(Mailbox<JCRId> mailbox, long uid)
+ private List<MailboxMessage<JCRId>> findMessageInMailboxWithUID(Mailbox<JCRId> mailbox, long uid)
throws RepositoryException {
- List<Message<JCRId>> list = new ArrayList<Message<JCRId>>();
+ List<MailboxMessage<JCRId>> list = new ArrayList<MailboxMessage<JCRId>>();
String queryString = "/jcr:root" + getMailboxPath(mailbox) + "//element(*,jamesMailbox:message)[@"
- + JCRMessage.UID_PROPERTY + "=" + uid + "]";
+ + JCRMailboxMessage.UID_PROPERTY + "=" + uid + "]";
QueryManager manager = getSession().getWorkspace().getQueryManager();
Query query = manager.createQuery(queryString, XPATH_LANGUAGE);
@@ -578,17 +578,17 @@ public class JCRMessageMapper extends Ab
QueryResult result = query.execute();
NodeIterator iterator = result.getNodes();
while (iterator.hasNext()) {
- list.add(new JCRMessage(iterator.nextNode(), mailboxSession.getLog()));
+ list.add(new JCRMailboxMessage(iterator.nextNode(), mailboxSession.getLog()));
}
return list;
}
- private List<Message<JCRId>> findMessagesInMailboxBetweenUIDs(Mailbox<JCRId> mailbox, long from, long to,
- int batchSize) throws RepositoryException {
- List<Message<JCRId>> list = new ArrayList<Message<JCRId>>();
+ private List<MailboxMessage<JCRId>> findMessagesInMailboxBetweenUIDs(Mailbox<JCRId> mailbox, long from, long to,
+ int batchSize) throws RepositoryException {
+ List<MailboxMessage<JCRId>> list = new ArrayList<MailboxMessage<JCRId>>();
String queryString = "/jcr:root" + getMailboxPath(mailbox) + "//element(*,jamesMailbox:message)[@"
- + JCRMessage.UID_PROPERTY + ">=" + from + " and @" + JCRMessage.UID_PROPERTY + "<=" + to
- + "] order by @" + JCRMessage.UID_PROPERTY;
+ + JCRMailboxMessage.UID_PROPERTY + ">=" + from + " and @" + JCRMailboxMessage.UID_PROPERTY + "<=" + to
+ + "] order by @" + JCRMailboxMessage.UID_PROPERTY;
QueryManager manager = getSession().getWorkspace().getQueryManager();
Query query = manager.createQuery(queryString, XPATH_LANGUAGE);
@@ -598,17 +598,17 @@ public class JCRMessageMapper extends Ab
NodeIterator iterator = result.getNodes();
while (iterator.hasNext()) {
- list.add(new JCRMessage(iterator.nextNode(), mailboxSession.getLog()));
+ list.add(new JCRMailboxMessage(iterator.nextNode(), mailboxSession.getLog()));
}
return list;
}
- private List<Message<JCRId>> findMessagesInMailbox(Mailbox<JCRId> mailbox, int batchSize)
+ private List<MailboxMessage<JCRId>> findMessagesInMailbox(Mailbox<JCRId> mailbox, int batchSize)
throws RepositoryException {
- List<Message<JCRId>> list = new ArrayList<Message<JCRId>>();
+ List<MailboxMessage<JCRId>> list = new ArrayList<MailboxMessage<JCRId>>();
String queryString = "/jcr:root" + getMailboxPath(mailbox) + "//element(*,jamesMailbox:message) order by @"
- + JCRMessage.UID_PROPERTY;
+ + JCRMailboxMessage.UID_PROPERTY;
QueryManager manager = getSession().getWorkspace().getQueryManager();
Query query = manager.createQuery(queryString, XPATH_LANGUAGE);
if (batchSize > 0)
@@ -617,33 +617,33 @@ public class JCRMessageMapper extends Ab
NodeIterator iterator = result.getNodes();
while (iterator.hasNext()) {
- list.add(new JCRMessage(iterator.nextNode(), mailboxSession.getLog()));
+ list.add(new JCRMailboxMessage(iterator.nextNode(), mailboxSession.getLog()));
}
return list;
}
- private List<Message<JCRId>> findDeletedMessagesInMailboxAfterUID(Mailbox<JCRId> mailbox, long uid)
+ private List<MailboxMessage<JCRId>> findDeletedMessagesInMailboxAfterUID(Mailbox<JCRId> mailbox, long uid)
throws RepositoryException {
- List<Message<JCRId>> list = new ArrayList<Message<JCRId>>();
+ List<MailboxMessage<JCRId>> list = new ArrayList<MailboxMessage<JCRId>>();
String queryString = "/jcr:root" + getMailboxPath(mailbox) + "//element(*,jamesMailbox:message)[@"
- + JCRMessage.UID_PROPERTY + ">=" + uid + " and @" + JCRMessage.DELETED_PROPERTY + "='true'] order by @"
- + JCRMessage.UID_PROPERTY;
+ + JCRMailboxMessage.UID_PROPERTY + ">=" + uid + " and @" + JCRMailboxMessage.DELETED_PROPERTY + "='true'] order by @"
+ + JCRMailboxMessage.UID_PROPERTY;
QueryManager manager = getSession().getWorkspace().getQueryManager();
QueryResult result = manager.createQuery(queryString, XPATH_LANGUAGE).execute();
NodeIterator iterator = result.getNodes();
while (iterator.hasNext()) {
- list.add(new JCRMessage(iterator.nextNode(), mailboxSession.getLog()));
+ list.add(new JCRMailboxMessage(iterator.nextNode(), mailboxSession.getLog()));
}
return list;
}
- private List<Message<JCRId>> findDeletedMessageInMailboxWithUID(Mailbox<JCRId> mailbox, long uid)
+ private List<MailboxMessage<JCRId>> findDeletedMessageInMailboxWithUID(Mailbox<JCRId> mailbox, long uid)
throws RepositoryException {
- List<Message<JCRId>> list = new ArrayList<Message<JCRId>>();
+ List<MailboxMessage<JCRId>> list = new ArrayList<MailboxMessage<JCRId>>();
String queryString = "/jcr:root" + getMailboxPath(mailbox) + "//element(*,jamesMailbox:message)[@"
- + JCRMessage.UID_PROPERTY + "=" + uid + " and @" + JCRMessage.DELETED_PROPERTY + "='true']";
+ + JCRMailboxMessage.UID_PROPERTY + "=" + uid + " and @" + JCRMailboxMessage.DELETED_PROPERTY + "='true']";
QueryManager manager = getSession().getWorkspace().getQueryManager();
Query query = manager.createQuery(queryString, XPATH_LANGUAGE);
query.setLimit(1);
@@ -651,41 +651,41 @@ public class JCRMessageMapper extends Ab
NodeIterator iterator = result.getNodes();
while (iterator.hasNext()) {
- JCRMessage member = new JCRMessage(iterator.nextNode(), mailboxSession.getLog());
+ JCRMailboxMessage member = new JCRMailboxMessage(iterator.nextNode(), mailboxSession.getLog());
list.add(member);
}
return list;
}
- private List<Message<JCRId>> findDeletedMessagesInMailboxBetweenUIDs(Mailbox<JCRId> mailbox, long from, long to)
+ private List<MailboxMessage<JCRId>> findDeletedMessagesInMailboxBetweenUIDs(Mailbox<JCRId> mailbox, long from, long to)
throws RepositoryException {
- List<Message<JCRId>> list = new ArrayList<Message<JCRId>>();
+ List<MailboxMessage<JCRId>> list = new ArrayList<MailboxMessage<JCRId>>();
String queryString = "/jcr:root" + getMailboxPath(mailbox) + "//element(*,jamesMailbox:message)[@"
- + JCRMessage.UID_PROPERTY + ">=" + from + " and @" + JCRMessage.UID_PROPERTY + "<=" + to + " and @"
- + JCRMessage.DELETED_PROPERTY + "='true'] order by @" + JCRMessage.UID_PROPERTY;
+ + JCRMailboxMessage.UID_PROPERTY + ">=" + from + " and @" + JCRMailboxMessage.UID_PROPERTY + "<=" + to + " and @"
+ + JCRMailboxMessage.DELETED_PROPERTY + "='true'] order by @" + JCRMailboxMessage.UID_PROPERTY;
QueryManager manager = getSession().getWorkspace().getQueryManager();
QueryResult result = manager.createQuery(queryString, XPATH_LANGUAGE).execute();
NodeIterator iterator = result.getNodes();
while (iterator.hasNext()) {
- list.add(new JCRMessage(iterator.nextNode(), mailboxSession.getLog()));
+ list.add(new JCRMailboxMessage(iterator.nextNode(), mailboxSession.getLog()));
}
return list;
}
- private List<Message<JCRId>> findDeletedMessagesInMailbox(Mailbox<JCRId> mailbox) throws RepositoryException {
+ private List<MailboxMessage<JCRId>> findDeletedMessagesInMailbox(Mailbox<JCRId> mailbox) throws RepositoryException {
- List<Message<JCRId>> list = new ArrayList<Message<JCRId>>();
+ List<MailboxMessage<JCRId>> list = new ArrayList<MailboxMessage<JCRId>>();
String queryString = "/jcr:root" + getMailboxPath(mailbox) + "//element(*,jamesMailbox:message)[@"
- + JCRMessage.DELETED_PROPERTY + "='true'] order by @" + JCRMessage.UID_PROPERTY;
+ + JCRMailboxMessage.DELETED_PROPERTY + "='true'] order by @" + JCRMailboxMessage.UID_PROPERTY;
QueryManager manager = getSession().getWorkspace().getQueryManager();
QueryResult result = manager.createQuery(queryString, XPATH_LANGUAGE).execute();
NodeIterator iterator = result.getNodes();
while (iterator.hasNext()) {
- JCRMessage member = new JCRMessage(iterator.nextNode(), mailboxSession.getLog());
+ JCRMailboxMessage member = new JCRMailboxMessage(iterator.nextNode(), mailboxSession.getLog());
list.add(member);
}
return list;
Copied: james/project/trunk/mailbox/jcr/src/main/java/org/apache/james/mailbox/jcr/mail/model/JCRMailboxMessage.java (from r1724224, james/project/trunk/mailbox/jcr/src/main/java/org/apache/james/mailbox/jcr/mail/model/JCRMessage.java)
URL: http://svn.apache.org/viewvc/james/project/trunk/mailbox/jcr/src/main/java/org/apache/james/mailbox/jcr/mail/model/JCRMailboxMessage.java?p2=james/project/trunk/mailbox/jcr/src/main/java/org/apache/james/mailbox/jcr/mail/model/JCRMailboxMessage.java&p1=james/project/trunk/mailbox/jcr/src/main/java/org/apache/james/mailbox/jcr/mail/model/JCRMessage.java&r1=1724224&r2=1724225&rev=1724225&view=diff
==============================================================================
--- james/project/trunk/mailbox/jcr/src/main/java/org/apache/james/mailbox/jcr/mail/model/JCRMessage.java (original)
+++ james/project/trunk/mailbox/jcr/src/main/java/org/apache/james/mailbox/jcr/mail/model/JCRMailboxMessage.java Tue Jan 12 13:17:03 2016
@@ -41,17 +41,17 @@ import org.apache.james.mailbox.exceptio
import org.apache.james.mailbox.jcr.JCRId;
import org.apache.james.mailbox.jcr.JCRImapConstants;
import org.apache.james.mailbox.jcr.Persistent;
-import org.apache.james.mailbox.store.mail.model.AbstractMessage;
-import org.apache.james.mailbox.store.mail.model.Message;
+import org.apache.james.mailbox.store.mail.model.AbstractMailboxMessage;
+import org.apache.james.mailbox.store.mail.model.MailboxMessage;
import org.apache.james.mailbox.store.mail.model.Property;
import org.apache.james.mailbox.store.mail.model.impl.PropertyBuilder;
import org.slf4j.Logger;
/**
- * JCR implementation of {@link Message}
+ * JCR implementation of {@link MailboxMessage}
*
*/
-public class JCRMessage extends AbstractMessage<JCRId> implements JCRImapConstants, Persistent{
+public class JCRMailboxMessage extends AbstractMailboxMessage<JCRId> implements JCRImapConstants, Persistent{
private Node node;
private final Logger logger;
@@ -98,13 +98,13 @@ public class JCRMessage extends Abstract
public final static String SUBTYPE_PROPERTY = "jamesMailbox:messageSubType";
public final static String MODSEQ_PROPERTY = "jamesMailbox:modSeq";
- public JCRMessage(Node node, Logger logger) {
+ public JCRMailboxMessage(Node node, Logger logger) {
this.logger= logger;
this.node = node;
}
- public JCRMessage(JCRId mailboxUUID, Date internalDate, int size, Flags flags, SharedInputStream content,
- int bodyStartOctet, final PropertyBuilder propertyBuilder, Logger logger) {
+ public JCRMailboxMessage(JCRId mailboxUUID, Date internalDate, int size, Flags flags, SharedInputStream content,
+ int bodyStartOctet, final PropertyBuilder propertyBuilder, Logger logger) {
super();
this.mailboxUUID = mailboxUUID;
this.internalDate = internalDate;
@@ -132,7 +132,7 @@ public class JCRMessage extends Abstract
* @param message
* @throws IOException
*/
- public JCRMessage(JCRId mailboxUUID, long uid, long modSeq, JCRMessage message, Logger logger) throws MailboxException {
+ public JCRMailboxMessage(JCRId mailboxUUID, long uid, long modSeq, JCRMailboxMessage message, Logger logger) throws MailboxException {
this.mailboxUUID = mailboxUUID;
this.internalDate = message.getInternalDate();
this.size = message.getFullContentOctets();
@@ -372,7 +372,7 @@ public class JCRMessage extends Abstract
if (getClass() != obj.getClass())
return false;
- final JCRMessage other = (JCRMessage) obj;
+ final JCRMailboxMessage other = (JCRMailboxMessage) obj;
if (getUUID() != null) {
if (!getUUID().equals(other.getUUID()))
@@ -694,7 +694,7 @@ public class JCRMessage extends Abstract
/*
* (non-Javadoc)
- * @see org.apache.james.mailbox.store.mail.model.Message#getBodyContent()
+ * @see org.apache.james.mailbox.store.mail.model.MailboxMessage#getBodyContent()
*/
public InputStream getBodyContent() throws IOException {
InputStream body = getFullContent();
@@ -704,7 +704,7 @@ public class JCRMessage extends Abstract
/*
* (non-Javadoc)
- * @see org.apache.james.mailbox.store.mail.model.Message#getModSeq()
+ * @see org.apache.james.mailbox.store.mail.model.MailboxMessage#getModSeq()
*/
public long getModSeq() {
if (isPersistent()) {
@@ -721,7 +721,7 @@ public class JCRMessage extends Abstract
/*
* (non-Javadoc)
- * @see org.apache.james.mailbox.store.mail.model.Message#setModSeq(long)
+ * @see org.apache.james.mailbox.store.mail.model.MailboxMessage#setModSeq(long)
*/
public void setModSeq(long modSeq) {
if (isPersistent()) {
@@ -737,7 +737,7 @@ public class JCRMessage extends Abstract
/*
* (non-Javadoc)
- * @see org.apache.james.mailbox.store.mail.model.Message#setUid(long)
+ * @see org.apache.james.mailbox.store.mail.model.MailboxMessage#setUid(long)
*/
public void setUid(long uid) {
if (isPersistent()) {
@@ -753,7 +753,7 @@ public class JCRMessage extends Abstract
/*
* (non-Javadoc)
- * @see org.apache.james.mailbox.store.mail.model.Message#getHeaderContent()
+ * @see org.apache.james.mailbox.store.mail.model.MailboxMessage#getHeaderContent()
*/
public InputStream getHeaderContent() throws IOException {
long limit = getBodyStartOctet();
Modified: james/project/trunk/mailbox/jpa/src/main/java/org/apache/james/mailbox/jpa/JPAMessageManager.java
URL: http://svn.apache.org/viewvc/james/project/trunk/mailbox/jpa/src/main/java/org/apache/james/mailbox/jpa/JPAMessageManager.java?rev=1724225&r1=1724224&r2=1724225&view=diff
==============================================================================
--- james/project/trunk/mailbox/jpa/src/main/java/org/apache/james/mailbox/jpa/JPAMessageManager.java (original)
+++ james/project/trunk/mailbox/jpa/src/main/java/org/apache/james/mailbox/jpa/JPAMessageManager.java Tue Jan 12 13:17:03 2016
@@ -29,14 +29,14 @@ import org.apache.james.mailbox.acl.Grou
import org.apache.james.mailbox.acl.MailboxACLResolver;
import org.apache.james.mailbox.exception.MailboxException;
import org.apache.james.mailbox.jpa.mail.model.JPAMailbox;
-import org.apache.james.mailbox.jpa.mail.model.openjpa.JPAMessage;
+import org.apache.james.mailbox.jpa.mail.model.openjpa.JPAMailboxMessage;
import org.apache.james.mailbox.quota.QuotaManager;
import org.apache.james.mailbox.quota.QuotaRootResolver;
import org.apache.james.mailbox.store.event.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.MailboxMessage;
import org.apache.james.mailbox.store.mail.model.impl.PropertyBuilder;
import org.apache.james.mailbox.store.search.MessageSearchIndex;
@@ -56,10 +56,10 @@ public class JPAMessageManager extends S
}
@Override
- protected Message<JPAId> createMessage(Date internalDate, final int size, int bodyStartOctet, final SharedInputStream content,
- final Flags flags, PropertyBuilder propertyBuilder) throws MailboxException{
+ protected MailboxMessage<JPAId> createMessage(Date internalDate, final int size, int bodyStartOctet, final SharedInputStream content,
+ final Flags flags, PropertyBuilder propertyBuilder) throws MailboxException{
- final Message<JPAId> message = new JPAMessage((JPAMailbox) getMailboxEntity(), internalDate, size, flags, content, bodyStartOctet, propertyBuilder);
+ final MailboxMessage<JPAId> message = new JPAMailboxMessage((JPAMailbox) getMailboxEntity(), internalDate, size, flags, content, bodyStartOctet, propertyBuilder);
return message;
}
Modified: james/project/trunk/mailbox/jpa/src/main/java/org/apache/james/mailbox/jpa/mail/JPAMessageMapper.java
URL: http://svn.apache.org/viewvc/james/project/trunk/mailbox/jpa/src/main/java/org/apache/james/mailbox/jpa/mail/JPAMessageMapper.java?rev=1724225&r1=1724224&r2=1724225&view=diff
==============================================================================
--- james/project/trunk/mailbox/jpa/src/main/java/org/apache/james/mailbox/jpa/mail/JPAMessageMapper.java (original)
+++ james/project/trunk/mailbox/jpa/src/main/java/org/apache/james/mailbox/jpa/mail/JPAMessageMapper.java Tue Jan 12 13:17:03 2016
@@ -33,10 +33,10 @@ import org.apache.james.mailbox.MailboxS
import org.apache.james.mailbox.exception.MailboxException;
import org.apache.james.mailbox.jpa.JPAId;
import org.apache.james.mailbox.jpa.mail.model.JPAMailbox;
-import org.apache.james.mailbox.jpa.mail.model.openjpa.AbstractJPAMessage;
-import org.apache.james.mailbox.jpa.mail.model.openjpa.JPAEncryptedMessage;
-import org.apache.james.mailbox.jpa.mail.model.openjpa.JPAMessage;
-import org.apache.james.mailbox.jpa.mail.model.openjpa.JPAStreamingMessage;
+import org.apache.james.mailbox.jpa.mail.model.openjpa.AbstractJPAMailboxMessage;
+import org.apache.james.mailbox.jpa.mail.model.openjpa.JPAEncryptedMailboxMessage;
+import org.apache.james.mailbox.jpa.mail.model.openjpa.JPAMailboxMessage;
+import org.apache.james.mailbox.jpa.mail.model.openjpa.JPAStreamingMailboxMessage;
import org.apache.james.mailbox.model.MessageMetaData;
import org.apache.james.mailbox.model.MessageRange;
import org.apache.james.mailbox.model.MessageRange.Type;
@@ -46,7 +46,7 @@ import org.apache.james.mailbox.store.ma
import org.apache.james.mailbox.store.mail.ModSeqProvider;
import org.apache.james.mailbox.store.mail.UidProvider;
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.MailboxMessage;
import org.apache.openjpa.persistence.ArgumentException;
/**
@@ -124,10 +124,10 @@ public class JPAMessageMapper extends Ab
* org.apache.james.mailbox.model.MessageRange,
* org.apache.james.mailbox.store.mail.MessageMapper.FetchType, int)
*/
- public Iterator<Message<JPAId>> findInMailbox(Mailbox<JPAId> mailbox, MessageRange set, FetchType fType, int max)
+ public Iterator<MailboxMessage<JPAId>> findInMailbox(Mailbox<JPAId> mailbox, MessageRange set, FetchType fType, int max)
throws MailboxException {
try {
- List<Message<JPAId>> results;
+ List<MailboxMessage<JPAId>> results;
long from = set.getUidFrom();
final long to = set.getUidTo();
final Type type = set.getType();
@@ -181,9 +181,9 @@ public class JPAMessageMapper extends Ab
/**
* @see org.apache.james.mailbox.store.mail.MessageMapper#delete(org.apache.james.mailbox.store.mail.model.Mailbox,
- * org.apache.james.mailbox.store.mail.model.Message)
+ * MailboxMessage)
*/
- public void delete(Mailbox<JPAId> mailbox, Message<JPAId> message) throws MailboxException {
+ public void delete(Mailbox<JPAId> mailbox, MailboxMessage<JPAId> message) throws MailboxException {
try {
getEntityManager().remove(message);
} catch (PersistenceException e) {
@@ -200,7 +200,7 @@ public class JPAMessageMapper extends Ab
Query query = getEntityManager().createNamedQuery("findUnseenMessagesInMailboxOrderByUid").setParameter(
"idParam", mailbox.getMailboxId().getRawId());
query.setMaxResults(1);
- List<Message<JPAId>> result = query.getResultList();
+ List<MailboxMessage<JPAId>> result = query.getResultList();
if (result.isEmpty()) {
return null;
} else {
@@ -230,7 +230,7 @@ public class JPAMessageMapper extends Ab
throws MailboxException {
try {
final Map<Long, MessageMetaData> data;
- final List<Message<JPAId>> results;
+ final List<MailboxMessage<JPAId>> results;
final long from = set.getUidFrom();
final long to = set.getUidTo();
@@ -268,35 +268,35 @@ public class JPAMessageMapper extends Ab
* (non-Javadoc)
*
* @see org.apache.james.mailbox.store.mail.MessageMapper#move(org.apache.james.mailbox.store.mail.model.Mailbox,
- * org.apache.james.mailbox.store.mail.model.Message)
+ * MailboxMessage)
*/
@Override
- public MessageMetaData move(Mailbox<JPAId> mailbox, Message<JPAId> original) throws MailboxException {
+ public MessageMetaData move(Mailbox<JPAId> mailbox, MailboxMessage<JPAId> original) throws MailboxException {
throw new UnsupportedOperationException("Not implemented - see https://issues.apache.org/jira/browse/IMAP-370");
}
/**
* @see org.apache.james.mailbox.store.mail.AbstractMessageMapper#copy(Mailbox,
- * long, long, Message)
+ * long, long, MailboxMessage)
*/
- protected MessageMetaData copy(Mailbox<JPAId> mailbox, long uid, long modSeq, Message<JPAId> original)
+ protected MessageMetaData copy(Mailbox<JPAId> mailbox, long uid, long modSeq, MailboxMessage<JPAId> original)
throws MailboxException {
- Message<JPAId> copy;
- if (original instanceof JPAStreamingMessage) {
- copy = new JPAStreamingMessage((JPAMailbox) mailbox, uid, modSeq, original);
- } else if (original instanceof JPAEncryptedMessage) {
- copy = new JPAEncryptedMessage((JPAMailbox) mailbox, uid, modSeq, original);
+ MailboxMessage<JPAId> copy;
+ if (original instanceof JPAStreamingMailboxMessage) {
+ copy = new JPAStreamingMailboxMessage((JPAMailbox) mailbox, uid, modSeq, original);
+ } else if (original instanceof JPAEncryptedMailboxMessage) {
+ copy = new JPAEncryptedMailboxMessage((JPAMailbox) mailbox, uid, modSeq, original);
} else {
- copy = new JPAMessage((JPAMailbox) mailbox, uid, modSeq, original);
+ copy = new JPAMailboxMessage((JPAMailbox) mailbox, uid, modSeq, original);
}
return save(mailbox, copy);
}
/**
* @see org.apache.james.mailbox.store.mail.AbstractMessageMapper#save(Mailbox,
- * Message)
+ * MailboxMessage)
*/
- protected MessageMetaData save(Mailbox<JPAId> mailbox, Message<JPAId> message) throws MailboxException {
+ protected MessageMetaData save(Mailbox<JPAId> mailbox, MailboxMessage<JPAId> message) throws MailboxException {
try {
@@ -304,7 +304,7 @@ public class JPAMessageMapper extends Ab
// mailbox is already "JPA detached"
// If we don't this, we will get an
// org.apache.openjpa.persistence.ArgumentException.
- ((AbstractJPAMessage) message)
+ ((AbstractJPAMailboxMessage) message)
.setMailbox(getEntityManager().find(JPAMailbox.class, mailbox.getMailboxId().getRawId()));
getEntityManager().persist(message);
@@ -317,7 +317,7 @@ public class JPAMessageMapper extends Ab
}
@SuppressWarnings("unchecked")
- private List<Message<JPAId>> findMessagesInMailboxAfterUID(Mailbox<JPAId> mailbox, long uid, int batchSize) {
+ private List<MailboxMessage<JPAId>> findMessagesInMailboxAfterUID(Mailbox<JPAId> mailbox, long uid, int batchSize) {
Query query = getEntityManager().createNamedQuery("findMessagesInMailboxAfterUID")
.setParameter("idParam", mailbox.getMailboxId().getRawId()).setParameter("uidParam", uid);
@@ -328,15 +328,15 @@ public class JPAMessageMapper extends Ab
}
@SuppressWarnings("unchecked")
- private List<Message<JPAId>> findMessagesInMailboxWithUID(Mailbox<JPAId> mailbox, long uid) {
+ private List<MailboxMessage<JPAId>> findMessagesInMailboxWithUID(Mailbox<JPAId> mailbox, long uid) {
return getEntityManager().createNamedQuery("findMessagesInMailboxWithUID")
.setParameter("idParam", mailbox.getMailboxId().getRawId()).setParameter("uidParam", uid).setMaxResults(1)
.getResultList();
}
@SuppressWarnings("unchecked")
- private List<Message<JPAId>> findMessagesInMailboxBetweenUIDs(Mailbox<JPAId> mailbox, long from, long to,
- int batchSize) {
+ private List<MailboxMessage<JPAId>> findMessagesInMailboxBetweenUIDs(Mailbox<JPAId> mailbox, long from, long to,
+ int batchSize) {
Query query = getEntityManager().createNamedQuery("findMessagesInMailboxBetweenUIDs")
.setParameter("idParam", mailbox.getMailboxId().getRawId()).setParameter("fromParam", from)
.setParameter("toParam", to);
@@ -348,7 +348,7 @@ public class JPAMessageMapper extends Ab
}
@SuppressWarnings("unchecked")
- private List<Message<JPAId>> findMessagesInMailbox(Mailbox<JPAId> mailbox, int batchSize) {
+ private List<MailboxMessage<JPAId>> findMessagesInMailbox(Mailbox<JPAId> mailbox, int batchSize) {
Query query = getEntityManager().createNamedQuery("findMessagesInMailbox").setParameter("idParam",
mailbox.getMailboxId().getRawId());
if (batchSize > 0)
@@ -356,10 +356,10 @@ public class JPAMessageMapper extends Ab
return query.getResultList();
}
- private Map<Long, MessageMetaData> createMetaData(List<Message<JPAId>> uids) {
+ private Map<Long, MessageMetaData> createMetaData(List<MailboxMessage<JPAId>> uids) {
final Map<Long, MessageMetaData> data = new HashMap<Long, MessageMetaData>();
for (int i = 0; i < uids.size(); i++) {
- Message<JPAId> m = uids.get(i);
+ MailboxMessage<JPAId> m = uids.get(i);
data.put(m.getUid(), new SimpleMessageMetaData(m));
}
return data;
@@ -387,26 +387,26 @@ public class JPAMessageMapper extends Ab
}
@SuppressWarnings("unchecked")
- private List<Message<JPAId>> findDeletedMessagesInMailbox(Mailbox<JPAId> mailbox) {
+ private List<MailboxMessage<JPAId>> findDeletedMessagesInMailbox(Mailbox<JPAId> mailbox) {
return getEntityManager().createNamedQuery("findDeletedMessagesInMailbox")
.setParameter("idParam", mailbox.getMailboxId().getRawId()).getResultList();
}
@SuppressWarnings("unchecked")
- private List<Message<JPAId>> findDeletedMessagesInMailboxAfterUID(Mailbox<JPAId> mailbox, long uid) {
+ private List<MailboxMessage<JPAId>> findDeletedMessagesInMailboxAfterUID(Mailbox<JPAId> mailbox, long uid) {
return getEntityManager().createNamedQuery("findDeletedMessagesInMailboxAfterUID")
.setParameter("idParam", mailbox.getMailboxId().getRawId()).setParameter("uidParam", uid).getResultList();
}
@SuppressWarnings("unchecked")
- private List<Message<JPAId>> findDeletedMessagesInMailboxWithUID(Mailbox<JPAId> mailbox, long uid) {
+ private List<MailboxMessage<JPAId>> findDeletedMessagesInMailboxWithUID(Mailbox<JPAId> mailbox, long uid) {
return getEntityManager().createNamedQuery("findDeletedMessagesInMailboxWithUID")
.setParameter("idParam", mailbox.getMailboxId().getRawId()).setParameter("uidParam", uid).setMaxResults(1)
.getResultList();
}
@SuppressWarnings("unchecked")
- private List<Message<JPAId>> findDeletedMessagesInMailboxBetweenUIDs(Mailbox<JPAId> mailbox, long from, long to) {
+ private List<MailboxMessage<JPAId>> findDeletedMessagesInMailboxBetweenUIDs(Mailbox<JPAId> mailbox, long from, long to) {
return getEntityManager().createNamedQuery("findDeletedMessagesInMailboxBetweenUIDs")
.setParameter("idParam", mailbox.getMailboxId().getRawId()).setParameter("fromParam", from)
.setParameter("toParam", to).getResultList();
Copied: james/project/trunk/mailbox/jpa/src/main/java/org/apache/james/mailbox/jpa/mail/model/openjpa/AbstractJPAMailboxMessage.java (from r1724224, james/project/trunk/mailbox/jpa/src/main/java/org/apache/james/mailbox/jpa/mail/model/openjpa/AbstractJPAMessage.java)
URL: http://svn.apache.org/viewvc/james/project/trunk/mailbox/jpa/src/main/java/org/apache/james/mailbox/jpa/mail/model/openjpa/AbstractJPAMailboxMessage.java?p2=james/project/trunk/mailbox/jpa/src/main/java/org/apache/james/mailbox/jpa/mail/model/openjpa/AbstractJPAMailboxMessage.java&p1=james/project/trunk/mailbox/jpa/src/main/java/org/apache/james/mailbox/jpa/mail/model/openjpa/AbstractJPAMessage.java&r1=1724224&r2=1724225&rev=1724225&view=diff
==============================================================================
--- james/project/trunk/mailbox/jpa/src/main/java/org/apache/james/mailbox/jpa/mail/model/openjpa/AbstractJPAMessage.java (original)
+++ james/project/trunk/mailbox/jpa/src/main/java/org/apache/james/mailbox/jpa/mail/model/openjpa/AbstractJPAMailboxMessage.java Tue Jan 12 13:17:03 2016
@@ -42,8 +42,8 @@ import org.apache.james.mailbox.jpa.JPAI
import org.apache.james.mailbox.jpa.mail.model.JPAMailbox;
import org.apache.james.mailbox.jpa.mail.model.JPAProperty;
import org.apache.james.mailbox.jpa.mail.model.JPAUserFlag;
-import org.apache.james.mailbox.store.mail.model.AbstractMessage;
-import org.apache.james.mailbox.store.mail.model.Message;
+import org.apache.james.mailbox.store.mail.model.AbstractMailboxMessage;
+import org.apache.james.mailbox.store.mail.model.MailboxMessage;
import org.apache.james.mailbox.store.mail.model.Property;
import org.apache.james.mailbox.store.mail.model.impl.PropertyBuilder;
import org.apache.openjpa.persistence.jdbc.ElementJoinColumn;
@@ -51,55 +51,55 @@ import org.apache.openjpa.persistence.jd
import org.apache.openjpa.persistence.jdbc.Index;
/**
- * Abstract base class for JPA based implementations of {@link AbstractMessage}
+ * Abstract base class for JPA based implementations of {@link AbstractMailboxMessage}
*/
-@IdClass(AbstractJPAMessage.MailboxIdUidKey.class)
+@IdClass(AbstractJPAMailboxMessage.MailboxIdUidKey.class)
@NamedQueries({
@NamedQuery(name="findRecentMessageUidsInMailbox",
- query="SELECT message.uid FROM Message message WHERE message.mailbox.mailboxId = :idParam AND message.recent = TRUE ORDER BY message.uid ASC"),
+ query="SELECT message.uid FROM MailboxMessage message WHERE message.mailbox.mailboxId = :idParam AND message.recent = TRUE ORDER BY message.uid ASC"),
@NamedQuery(name="findUnseenMessagesInMailboxOrderByUid",
- query="SELECT message FROM Message message WHERE message.mailbox.mailboxId = :idParam AND message.seen = FALSE ORDER BY message.uid ASC"),
+ query="SELECT message FROM MailboxMessage message WHERE message.mailbox.mailboxId = :idParam AND message.seen = FALSE ORDER BY message.uid ASC"),
@NamedQuery(name="findMessagesInMailbox",
- query="SELECT message FROM Message message WHERE message.mailbox.mailboxId = :idParam ORDER BY message.uid ASC"),
+ query="SELECT message FROM MailboxMessage message WHERE message.mailbox.mailboxId = :idParam ORDER BY message.uid ASC"),
@NamedQuery(name="findMessagesInMailboxBetweenUIDs",
- query="SELECT message FROM Message message WHERE message.mailbox.mailboxId = :idParam AND message.uid BETWEEN :fromParam AND :toParam ORDER BY message.uid ASC"),
+ query="SELECT message FROM MailboxMessage message WHERE message.mailbox.mailboxId = :idParam AND message.uid BETWEEN :fromParam AND :toParam ORDER BY message.uid ASC"),
@NamedQuery(name="findMessagesInMailboxWithUID",
- query="SELECT message FROM Message message WHERE message.mailbox.mailboxId = :idParam AND message.uid=:uidParam ORDER BY message.uid ASC"),
+ query="SELECT message FROM MailboxMessage message WHERE message.mailbox.mailboxId = :idParam AND message.uid=:uidParam ORDER BY message.uid ASC"),
@NamedQuery(name="findMessagesInMailboxAfterUID",
- query="SELECT message FROM Message message WHERE message.mailbox.mailboxId = :idParam AND message.uid>=:uidParam ORDER BY message.uid ASC"),
+ query="SELECT message FROM MailboxMessage message WHERE message.mailbox.mailboxId = :idParam AND message.uid>=:uidParam ORDER BY message.uid ASC"),
@NamedQuery(name="findDeletedMessagesInMailbox",
- query="SELECT message FROM Message message WHERE message.mailbox.mailboxId = :idParam AND message.deleted=TRUE ORDER BY message.uid ASC"),
+ query="SELECT message FROM MailboxMessage message WHERE message.mailbox.mailboxId = :idParam AND message.deleted=TRUE ORDER BY message.uid ASC"),
@NamedQuery(name="findDeletedMessagesInMailboxBetweenUIDs",
- query="SELECT message FROM Message message WHERE message.mailbox.mailboxId = :idParam AND message.uid BETWEEN :fromParam AND :toParam AND message.deleted=TRUE ORDER BY message.uid ASC"),
+ query="SELECT message FROM MailboxMessage message WHERE message.mailbox.mailboxId = :idParam AND message.uid BETWEEN :fromParam AND :toParam AND message.deleted=TRUE ORDER BY message.uid ASC"),
@NamedQuery(name="findDeletedMessagesInMailboxWithUID",
- query="SELECT message FROM Message message WHERE message.mailbox.mailboxId = :idParam AND message.uid=:uidParam AND message.deleted=TRUE ORDER BY message.uid ASC"),
+ query="SELECT message FROM MailboxMessage message WHERE message.mailbox.mailboxId = :idParam AND message.uid=:uidParam AND message.deleted=TRUE ORDER BY message.uid ASC"),
@NamedQuery(name="findDeletedMessagesInMailboxAfterUID",
- query="SELECT message FROM Message message WHERE message.mailbox.mailboxId = :idParam AND message.uid>=:uidParam AND message.deleted=TRUE ORDER BY message.uid ASC"),
+ query="SELECT message FROM MailboxMessage message WHERE message.mailbox.mailboxId = :idParam AND message.uid>=:uidParam AND message.deleted=TRUE ORDER BY message.uid ASC"),
@NamedQuery(name="deleteDeletedMessagesInMailbox",
- query="DELETE FROM Message message WHERE message.mailbox.mailboxId = :idParam AND message.deleted=TRUE"),
+ query="DELETE FROM MailboxMessage message WHERE message.mailbox.mailboxId = :idParam AND message.deleted=TRUE"),
@NamedQuery(name="deleteDeletedMessagesInMailboxBetweenUIDs",
- query="DELETE FROM Message message WHERE message.mailbox.mailboxId = :idParam AND message.uid BETWEEN :fromParam AND :toParam AND message.deleted=TRUE"),
+ query="DELETE FROM MailboxMessage message WHERE message.mailbox.mailboxId = :idParam AND message.uid BETWEEN :fromParam AND :toParam AND message.deleted=TRUE"),
@NamedQuery(name="deleteDeletedMessagesInMailboxWithUID",
- query="DELETE FROM Message message WHERE message.mailbox.mailboxId = :idParam AND message.uid=:uidParam AND message.deleted=TRUE"),
+ query="DELETE FROM MailboxMessage message WHERE message.mailbox.mailboxId = :idParam AND message.uid=:uidParam AND message.deleted=TRUE"),
@NamedQuery(name="deleteDeletedMessagesInMailboxAfterUID",
- query="DELETE FROM Message message WHERE message.mailbox.mailboxId = :idParam AND message.uid>=:uidParam AND message.deleted=TRUE"),
+ query="DELETE FROM MailboxMessage message WHERE message.mailbox.mailboxId = :idParam AND message.uid>=:uidParam AND message.deleted=TRUE"),
@NamedQuery(name="countUnseenMessagesInMailbox",
- query="SELECT COUNT(message) FROM Message message WHERE message.mailbox.mailboxId = :idParam AND message.seen=FALSE"),
+ query="SELECT COUNT(message) FROM MailboxMessage message WHERE message.mailbox.mailboxId = :idParam AND message.seen=FALSE"),
@NamedQuery(name="countMessagesInMailbox",
- query="SELECT COUNT(message) FROM Message message WHERE message.mailbox.mailboxId = :idParam"),
+ query="SELECT COUNT(message) FROM MailboxMessage message WHERE message.mailbox.mailboxId = :idParam"),
@NamedQuery(name="deleteMessages",
- query="DELETE FROM Message message WHERE message.mailbox.mailboxId = :idParam"),
+ query="DELETE FROM MailboxMessage message WHERE message.mailbox.mailboxId = :idParam"),
@NamedQuery(name="findLastUidInMailbox",
- query="SELECT message.uid FROM Message message WHERE message.mailbox.mailboxId = :idParam ORDER BY message.uid DESC"),
+ query="SELECT message.uid FROM MailboxMessage message WHERE message.mailbox.mailboxId = :idParam ORDER BY message.uid DESC"),
@NamedQuery(name="findHighestModSeqInMailbox",
- query="SELECT message.modSeq FROM Message message WHERE message.mailbox.mailboxId = :idParam ORDER BY message.modSeq DESC"),
+ query="SELECT message.modSeq FROM MailboxMessage message WHERE message.mailbox.mailboxId = :idParam ORDER BY message.modSeq DESC"),
@NamedQuery(name="deleteAllMemberships",
- query="DELETE FROM Message message")
+ query="DELETE FROM MailboxMessage message")
})
@MappedSuperclass
-public abstract class AbstractJPAMessage extends AbstractMessage<JPAId> {
+public abstract class AbstractJPAMailboxMessage extends AbstractMailboxMessage<JPAId> {
@@ -245,9 +245,9 @@ public abstract class AbstractJPAMessage
private List<JPAUserFlag> userFlags;
@Deprecated
- public AbstractJPAMessage() {}
+ public AbstractJPAMailboxMessage() {}
- public AbstractJPAMessage(JPAMailbox mailbox, Date internalDate, Flags flags, final long contentOctets, final int bodyStartOctet, final PropertyBuilder propertyBuilder) {
+ public AbstractJPAMailboxMessage(JPAMailbox mailbox, Date internalDate, Flags flags, final long contentOctets, final int bodyStartOctet, final PropertyBuilder propertyBuilder) {
super();
this.mailbox = mailbox;
this.internalDate = internalDate;
@@ -277,7 +277,7 @@ public abstract class AbstractJPAMessage
* @param original message to be copied, not null
* @throws IOException
*/
- public AbstractJPAMessage(JPAMailbox mailbox, long uid, long modSeq, Message<?> original) throws MailboxException {
+ public AbstractJPAMailboxMessage(JPAMailbox mailbox, long uid, long modSeq, MailboxMessage<?> original) throws MailboxException {
super();
this.mailbox = mailbox;
this.uid = uid;
@@ -323,7 +323,7 @@ public abstract class AbstractJPAMessage
return false;
if (getClass() != obj.getClass())
return false;
- final AbstractJPAMessage other = (AbstractJPAMessage) obj;
+ final AbstractJPAMailboxMessage other = (AbstractJPAMailboxMessage) obj;
if (getMailboxId() != null) {
if (!getMailboxId().equals(other.getMailboxId()))
return false;
@@ -337,14 +337,14 @@ public abstract class AbstractJPAMessage
}
/**
- * @see org.apache.james.mailbox.store.mail.model.Message#getModSeq()
+ * @see MailboxMessage#getModSeq()
*/
public long getModSeq() {
return modSeq;
}
/**
- * @see org.apache.james.mailbox.store.mail.model.Message#setModSeq(long)
+ * @see MailboxMessage#setModSeq(long)
*/
public void setModSeq(long modSeq) {
this.modSeq = modSeq;
@@ -388,7 +388,7 @@ public abstract class AbstractJPAMessage
}
/**
- * @see org.apache.james.mailbox.store.mail.model.Message#getFullContentOctets()
+ * @see MailboxMessage#getFullContentOctets()
*/
public long getFullContentOctets() {
return contentOctets;
@@ -401,63 +401,63 @@ public abstract class AbstractJPAMessage
/**
- * @see org.apache.james.mailbox.store.mail.model.Message#getInternalDate()
+ * @see MailboxMessage#getInternalDate()
*/
public Date getInternalDate() {
return internalDate;
}
/**
- * @see org.apache.james.mailbox.store.mail.model.Message#getMailboxId()
+ * @see MailboxMessage#getMailboxId()
*/
public JPAId getMailboxId() {
return getMailbox().getMailboxId();
}
/**
- * @see org.apache.james.mailbox.store.mail.model.Message#getUid()
+ * @see MailboxMessage#getUid()
*/
public long getUid() {
return uid;
}
/**
- * @see org.apache.james.mailbox.store.mail.model.Message#isAnswered()
+ * @see MailboxMessage#isAnswered()
*/
public boolean isAnswered() {
return answered;
}
/**
- * @see org.apache.james.mailbox.store.mail.model.Message#isDeleted()
+ * @see MailboxMessage#isDeleted()
*/
public boolean isDeleted() {
return deleted;
}
/**
- * @see org.apache.james.mailbox.store.mail.model.Message#isDraft()
+ * @see MailboxMessage#isDraft()
*/
public boolean isDraft() {
return draft;
}
/**
- * @see org.apache.james.mailbox.store.mail.model.Message#isFlagged()
+ * @see MailboxMessage#isFlagged()
*/
public boolean isFlagged() {
return flagged;
}
/**
- * @see org.apache.james.mailbox.store.mail.model.Message#isRecent()
+ * @see MailboxMessage#isRecent()
*/
public boolean isRecent() {
return recent;
}
/**
- * @see org.apache.james.mailbox.store.mail.model.Message#isSeen()
+ * @see MailboxMessage#isSeen()
*/
public boolean isSeen() {
return seen;
@@ -468,7 +468,7 @@ public abstract class AbstractJPAMessage
}
/**
- * @see org.apache.james.mailbox.store.mail.model.Message#setFlags(javax.mail.Flags)
+ * @see MailboxMessage#setFlags(javax.mail.Flags)
*/
public void setFlags(Flags flags) {
answered = flags.contains(Flags.Flag.ANSWERED);
Copied: james/project/trunk/mailbox/jpa/src/main/java/org/apache/james/mailbox/jpa/mail/model/openjpa/JPAEncryptedMailboxMessage.java (from r1724224, james/project/trunk/mailbox/jpa/src/main/java/org/apache/james/mailbox/jpa/mail/model/openjpa/JPAEncryptedMessage.java)
URL: http://svn.apache.org/viewvc/james/project/trunk/mailbox/jpa/src/main/java/org/apache/james/mailbox/jpa/mail/model/openjpa/JPAEncryptedMailboxMessage.java?p2=james/project/trunk/mailbox/jpa/src/main/java/org/apache/james/mailbox/jpa/mail/model/openjpa/JPAEncryptedMailboxMessage.java&p1=james/project/trunk/mailbox/jpa/src/main/java/org/apache/james/mailbox/jpa/mail/model/openjpa/JPAEncryptedMessage.java&r1=1724224&r2=1724225&rev=1724225&view=diff
==============================================================================
--- james/project/trunk/mailbox/jpa/src/main/java/org/apache/james/mailbox/jpa/mail/model/openjpa/JPAEncryptedMessage.java (original)
+++ james/project/trunk/mailbox/jpa/src/main/java/org/apache/james/mailbox/jpa/mail/model/openjpa/JPAEncryptedMailboxMessage.java Tue Jan 12 13:17:03 2016
@@ -35,14 +35,14 @@ import javax.persistence.Table;
import org.apache.commons.io.IOUtils;
import org.apache.james.mailbox.exception.MailboxException;
import org.apache.james.mailbox.jpa.mail.model.JPAMailbox;
-import org.apache.james.mailbox.store.mail.model.Message;
+import org.apache.james.mailbox.store.mail.model.MailboxMessage;
import org.apache.james.mailbox.store.mail.model.impl.PropertyBuilder;
import org.apache.openjpa.persistence.Externalizer;
import org.apache.openjpa.persistence.Factory;
-@Entity(name="Message")
+@Entity(name="MailboxMessage")
@Table(name="JAMES_MAIL")
-public class JPAEncryptedMessage extends AbstractJPAMessage {
+public class JPAEncryptedMailboxMessage extends AbstractJPAMailboxMessage {
/** The value for the body field. Lazy loaded */
/** We use a max length to represent 1gb data. Thats prolly overkill, but who knows */
@@ -62,9 +62,9 @@ public class JPAEncryptedMessage extends
@Lob private byte[] header;
@Deprecated
- public JPAEncryptedMessage() {}
+ public JPAEncryptedMailboxMessage() {}
- public JPAEncryptedMessage(JPAMailbox mailbox,Date internalDate, int size, Flags flags, SharedInputStream content, int bodyStartOctet, final PropertyBuilder propertyBuilder) throws MailboxException {
+ public JPAEncryptedMailboxMessage(JPAMailbox mailbox, Date internalDate, int size, Flags flags, SharedInputStream content, int bodyStartOctet, final PropertyBuilder propertyBuilder) throws MailboxException {
super(mailbox, internalDate, flags, size ,bodyStartOctet, propertyBuilder);
try {
int headerEnd = bodyStartOctet;
@@ -85,7 +85,7 @@ public class JPAEncryptedMessage extends
* @param message
* @throws MailboxException
*/
- public JPAEncryptedMessage(JPAMailbox mailbox, long uid, long modSeq, Message<?> message) throws MailboxException{
+ public JPAEncryptedMailboxMessage(JPAMailbox mailbox, long uid, long modSeq, MailboxMessage<?> message) throws MailboxException{
super(mailbox, uid, modSeq, message);
try {
this.body = IOUtils.toByteArray(message.getBodyContent());
@@ -97,14 +97,14 @@ public class JPAEncryptedMessage extends
/**
- * @see org.apache.james.mailbox.store.mail.model.Message#getBodyContent()
+ * @see MailboxMessage#getBodyContent()
*/
public InputStream getBodyContent() throws IOException {
return new ByteArrayInputStream(body);
}
/**
- * @see org.apache.james.mailbox.store.mail.model.Message#getHeaderContent()
+ * @see MailboxMessage#getHeaderContent()
*/
public InputStream getHeaderContent() throws IOException {
return new ByteArrayInputStream(header);
Copied: james/project/trunk/mailbox/jpa/src/main/java/org/apache/james/mailbox/jpa/mail/model/openjpa/JPAMailboxMessage.java (from r1724224, james/project/trunk/mailbox/jpa/src/main/java/org/apache/james/mailbox/jpa/mail/model/openjpa/JPAMessage.java)
URL: http://svn.apache.org/viewvc/james/project/trunk/mailbox/jpa/src/main/java/org/apache/james/mailbox/jpa/mail/model/openjpa/JPAMailboxMessage.java?p2=james/project/trunk/mailbox/jpa/src/main/java/org/apache/james/mailbox/jpa/mail/model/openjpa/JPAMailboxMessage.java&p1=james/project/trunk/mailbox/jpa/src/main/java/org/apache/james/mailbox/jpa/mail/model/openjpa/JPAMessage.java&r1=1724224&r2=1724225&rev=1724225&view=diff
==============================================================================
--- james/project/trunk/mailbox/jpa/src/main/java/org/apache/james/mailbox/jpa/mail/model/openjpa/JPAMessage.java (original)
+++ james/project/trunk/mailbox/jpa/src/main/java/org/apache/james/mailbox/jpa/mail/model/openjpa/JPAMailboxMessage.java Tue Jan 12 13:17:03 2016
@@ -35,12 +35,12 @@ import javax.persistence.Table;
import org.apache.commons.io.IOUtils;
import org.apache.james.mailbox.exception.MailboxException;
import org.apache.james.mailbox.jpa.mail.model.JPAMailbox;
-import org.apache.james.mailbox.store.mail.model.Message;
+import org.apache.james.mailbox.store.mail.model.MailboxMessage;
import org.apache.james.mailbox.store.mail.model.impl.PropertyBuilder;
-@Entity(name="Message")
+@Entity(name="MailboxMessage")
@Table(name="JAMES_MAIL")
-public class JPAMessage extends AbstractJPAMessage {
+public class JPAMailboxMessage extends AbstractJPAMailboxMessage {
/** The value for the body field. Lazy loaded */
/** We use a max length to represent 1gb data. Thats prolly overkill, but who knows */
@@ -56,9 +56,9 @@ public class JPAMessage extends Abstract
@Lob private byte[] header;
@Deprecated
- public JPAMessage() {}
+ public JPAMailboxMessage() {}
- public JPAMessage(JPAMailbox mailbox,Date internalDate, int size, Flags flags, SharedInputStream content, int bodyStartOctet, final PropertyBuilder propertyBuilder) throws MailboxException {
+ public JPAMailboxMessage(JPAMailbox mailbox, Date internalDate, int size, Flags flags, SharedInputStream content, int bodyStartOctet, final PropertyBuilder propertyBuilder) throws MailboxException {
super(mailbox, internalDate, flags, size ,bodyStartOctet, propertyBuilder);
try {
int headerEnd = bodyStartOctet;
@@ -79,7 +79,7 @@ public class JPAMessage extends Abstract
* @param message
* @throws MailboxException
*/
- public JPAMessage(JPAMailbox mailbox, long uid, long modSeq, Message<?> message) throws MailboxException{
+ public JPAMailboxMessage(JPAMailbox mailbox, long uid, long modSeq, MailboxMessage<?> message) throws MailboxException{
super(mailbox, uid, modSeq, message);
try {
this.body = IOUtils.toByteArray(message.getBodyContent());
@@ -91,14 +91,14 @@ public class JPAMessage extends Abstract
/**
- * @see org.apache.james.mailbox.store.mail.model.Message#getBodyContent()
+ * @see MailboxMessage#getBodyContent()
*/
public InputStream getBodyContent() throws IOException {
return new ByteArrayInputStream(body);
}
/**
- * @see org.apache.james.mailbox.store.mail.model.Message#getHeaderContent()
+ * @see MailboxMessage#getHeaderContent()
*/
public InputStream getHeaderContent() throws IOException {
return new ByteArrayInputStream(header);
Copied: james/project/trunk/mailbox/jpa/src/main/java/org/apache/james/mailbox/jpa/mail/model/openjpa/JPAStreamingMailboxMessage.java (from r1724224, james/project/trunk/mailbox/jpa/src/main/java/org/apache/james/mailbox/jpa/mail/model/openjpa/JPAStreamingMessage.java)
URL: http://svn.apache.org/viewvc/james/project/trunk/mailbox/jpa/src/main/java/org/apache/james/mailbox/jpa/mail/model/openjpa/JPAStreamingMailboxMessage.java?p2=james/project/trunk/mailbox/jpa/src/main/java/org/apache/james/mailbox/jpa/mail/model/openjpa/JPAStreamingMailboxMessage.java&p1=james/project/trunk/mailbox/jpa/src/main/java/org/apache/james/mailbox/jpa/mail/model/openjpa/JPAStreamingMessage.java&r1=1724224&r2=1724225&rev=1724225&view=diff
==============================================================================
--- james/project/trunk/mailbox/jpa/src/main/java/org/apache/james/mailbox/jpa/mail/model/openjpa/JPAStreamingMessage.java (original)
+++ james/project/trunk/mailbox/jpa/src/main/java/org/apache/james/mailbox/jpa/mail/model/openjpa/JPAStreamingMailboxMessage.java Tue Jan 12 13:17:03 2016
@@ -33,23 +33,23 @@ import javax.persistence.Table;
import org.apache.commons.io.IOUtils;
import org.apache.james.mailbox.exception.MailboxException;
import org.apache.james.mailbox.jpa.mail.model.JPAMailbox;
-import org.apache.james.mailbox.store.mail.model.Message;
+import org.apache.james.mailbox.store.mail.model.MailboxMessage;
import org.apache.james.mailbox.store.mail.model.impl.PropertyBuilder;
import org.apache.openjpa.persistence.Persistent;
/**
- * JPA implementation of {@link AbstractJPAMessage} which use openjpas {@link Persistent} type to
+ * JPA implementation of {@link AbstractJPAMailboxMessage} which use openjpas {@link Persistent} type to
* be able to stream the message content without loading it into the memory at all.
*
* This is not supported for all DB's yet. See <a href="http://openjpa.apache.org/builds/latest/docs/manual/ref_guide_mapping_jpa.html">Additional JPA Mappings</a>
*
- * If your DB is not supported by this, use {@link JPAMessage}
+ * If your DB is not supported by this, use {@link JPAMailboxMessage}
*
* TODO: Fix me!
*/
-@Entity(name="Message")
+@Entity(name="MailboxMessage")
@Table(name="JAMES_MAIL")
-public class JPAStreamingMessage extends AbstractJPAMessage {
+public class JPAStreamingMailboxMessage extends AbstractJPAMailboxMessage {
@Persistent(optional = false, fetch = FetchType.LAZY)
@Column(name = "MAIL_BYTES", length = 1048576000, nullable = false)
@@ -62,9 +62,9 @@ public class JPAStreamingMessage extends
private SharedInputStream content;
@Deprecated
- public JPAStreamingMessage() {}
+ public JPAStreamingMailboxMessage() {}
- public JPAStreamingMessage(JPAMailbox mailbox, Date internalDate, int size, Flags flags, SharedInputStream content, int bodyStartOctet,final PropertyBuilder propertyBuilder) throws MailboxException {
+ public JPAStreamingMailboxMessage(JPAMailbox mailbox, Date internalDate, int size, Flags flags, SharedInputStream content, int bodyStartOctet, final PropertyBuilder propertyBuilder) throws MailboxException {
super(mailbox, internalDate, flags, size ,bodyStartOctet, propertyBuilder);
this.content = content;
@@ -83,7 +83,7 @@ public class JPAStreamingMessage extends
* @param message
* @throws IOException
*/
- public JPAStreamingMessage(JPAMailbox mailbox, long uid, long modSeq, Message<?> message) throws MailboxException {
+ public JPAStreamingMailboxMessage(JPAMailbox mailbox, long uid, long modSeq, MailboxMessage<?> message) throws MailboxException {
super(mailbox, uid, modSeq, message);
try {
this.content = new SharedByteArrayInputStream(IOUtils.toByteArray(message.getFullContent()));
@@ -96,14 +96,14 @@ public class JPAStreamingMessage extends
/**
- * @see org.apache.james.mailbox.store.mail.model.Message#getBodyContent()
+ * @see MailboxMessage#getBodyContent()
*/
public InputStream getBodyContent() throws IOException {
return content.newStream(getBodyStartOctet(), -1);
}
/**
- * @see org.apache.james.mailbox.store.mail.model.Message#getHeaderContent()
+ * @see MailboxMessage#getHeaderContent()
*/
public InputStream getHeaderContent() throws IOException {
int headerEnd = getBodyStartOctet() -2;
Modified: james/project/trunk/mailbox/jpa/src/main/java/org/apache/james/mailbox/jpa/openjpa/OpenJPAMessageManager.java
URL: http://svn.apache.org/viewvc/james/project/trunk/mailbox/jpa/src/main/java/org/apache/james/mailbox/jpa/openjpa/OpenJPAMessageManager.java?rev=1724225&r1=1724224&r2=1724225&view=diff
==============================================================================
--- james/project/trunk/mailbox/jpa/src/main/java/org/apache/james/mailbox/jpa/openjpa/OpenJPAMessageManager.java (original)
+++ james/project/trunk/mailbox/jpa/src/main/java/org/apache/james/mailbox/jpa/openjpa/OpenJPAMessageManager.java Tue Jan 12 13:17:03 2016
@@ -31,14 +31,14 @@ import org.apache.james.mailbox.exceptio
import org.apache.james.mailbox.jpa.JPAId;
import org.apache.james.mailbox.jpa.JPAMessageManager;
import org.apache.james.mailbox.jpa.mail.model.JPAMailbox;
-import org.apache.james.mailbox.jpa.mail.model.openjpa.JPAEncryptedMessage;
-import org.apache.james.mailbox.jpa.mail.model.openjpa.JPAStreamingMessage;
+import org.apache.james.mailbox.jpa.mail.model.openjpa.JPAEncryptedMailboxMessage;
+import org.apache.james.mailbox.jpa.mail.model.openjpa.JPAStreamingMailboxMessage;
import org.apache.james.mailbox.quota.QuotaManager;
import org.apache.james.mailbox.quota.QuotaRootResolver;
import org.apache.james.mailbox.store.event.MailboxEventDispatcher;
import org.apache.james.mailbox.store.MailboxSessionMapperFactory;
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.MailboxMessage;
import org.apache.james.mailbox.store.mail.model.impl.PropertyBuilder;
import org.apache.james.mailbox.store.search.MessageSearchIndex;
@@ -74,16 +74,16 @@ public class OpenJPAMessageManager exten
}
@Override
- protected Message<JPAId> createMessage(Date internalDate, int size, int bodyStartOctet, SharedInputStream content, Flags flags, PropertyBuilder propertyBuilder) throws MailboxException {
+ protected MailboxMessage<JPAId> createMessage(Date internalDate, int size, int bodyStartOctet, SharedInputStream content, Flags flags, PropertyBuilder propertyBuilder) throws MailboxException {
int headerEnd = bodyStartOctet -2;
if (headerEnd < 0) {
headerEnd = 0;
}
switch (feature) {
case Streaming:
- return new JPAStreamingMessage((JPAMailbox) getMailboxEntity(), internalDate, size, flags, content, bodyStartOctet, propertyBuilder);
+ return new JPAStreamingMailboxMessage((JPAMailbox) getMailboxEntity(), internalDate, size, flags, content, bodyStartOctet, propertyBuilder);
case Encryption:
- return new JPAEncryptedMessage((JPAMailbox) getMailboxEntity(), internalDate, size, flags, content, bodyStartOctet, propertyBuilder);
+ return new JPAEncryptedMailboxMessage((JPAMailbox) getMailboxEntity(), internalDate, size, flags, content, bodyStartOctet, propertyBuilder);
default:
return super.createMessage(internalDate, size, bodyStartOctet, content, flags, propertyBuilder);
}
Modified: james/project/trunk/mailbox/jpa/src/main/resources/META-INF/persistence.xml
URL: http://svn.apache.org/viewvc/james/project/trunk/mailbox/jpa/src/main/resources/META-INF/persistence.xml?rev=1724225&r1=1724224&r2=1724225&view=diff
==============================================================================
--- james/project/trunk/mailbox/jpa/src/main/resources/META-INF/persistence.xml (original)
+++ james/project/trunk/mailbox/jpa/src/main/resources/META-INF/persistence.xml Tue Jan 12 13:17:03 2016
@@ -26,8 +26,8 @@
<persistence-unit name="James" transaction-type="RESOURCE_LOCAL">
<class>org.apache.james.mailbox.jpa.mail.model.JPAMailbox</class>
<class>org.apache.james.mailbox.jpa.mail.model.JPAUserFlag</class>
- <class>org.apache.james.mailbox.jpa.mail.model.openjpa.AbstractJPAMessage</class>
- <class>org.apache.james.mailbox.jpa.mail.model.openjpa.JPAMessage</class>
+ <class>org.apache.james.mailbox.jpa.mail.model.openjpa.AbstractJPAMailboxMessage</class>
+ <class>org.apache.james.mailbox.jpa.mail.model.openjpa.JPAMailboxMessage</class>
<class>org.apache.james.mailbox.jpa.mail.model.JPAProperty</class>
<class>org.apache.james.mailbox.jpa.user.model.JPASubscription</class>
<properties>
Modified: james/project/trunk/mailbox/jpa/src/test/java/org/apache/james/mailbox/jpa/JPAMailboxManagerTest.java
URL: http://svn.apache.org/viewvc/james/project/trunk/mailbox/jpa/src/test/java/org/apache/james/mailbox/jpa/JPAMailboxManagerTest.java?rev=1724225&r1=1724224&r2=1724225&view=diff
==============================================================================
--- james/project/trunk/mailbox/jpa/src/test/java/org/apache/james/mailbox/jpa/JPAMailboxManagerTest.java (original)
+++ james/project/trunk/mailbox/jpa/src/test/java/org/apache/james/mailbox/jpa/JPAMailboxManagerTest.java Tue Jan 12 13:17:03 2016
@@ -35,8 +35,8 @@ import org.apache.james.mailbox.jpa.mail
import org.apache.james.mailbox.jpa.mail.model.JPAMailbox;
import org.apache.james.mailbox.jpa.mail.model.JPAProperty;
import org.apache.james.mailbox.jpa.mail.model.JPAUserFlag;
-import org.apache.james.mailbox.jpa.mail.model.openjpa.AbstractJPAMessage;
-import org.apache.james.mailbox.jpa.mail.model.openjpa.JPAMessage;
+import org.apache.james.mailbox.jpa.mail.model.openjpa.AbstractJPAMailboxMessage;
+import org.apache.james.mailbox.jpa.mail.model.openjpa.JPAMailboxMessage;
import org.apache.james.mailbox.jpa.openjpa.OpenJPAMailboxManager;
import org.apache.james.mailbox.jpa.user.model.JPASubscription;
import org.apache.james.mailbox.store.JVMMailboxPathLocker;
@@ -93,8 +93,8 @@ public class JPAMailboxManagerTest exten
properties.put("openjpa.jdbc.SynchronizeMappings", "buildSchema(ForeignKeys=true)");
properties.put("openjpa.MetaDataFactory", "jpa(Types=" +
JPAMailbox.class.getName() + ";" +
- AbstractJPAMessage.class.getName() + ";" +
- JPAMessage.class.getName() + ";" +
+ AbstractJPAMailboxMessage.class.getName() + ";" +
+ JPAMailboxMessage.class.getName() + ";" +
JPAProperty.class.getName() + ";" +
JPAUserFlag.class.getName() + ";" +
JPASubscription.class.getName() + ")");
Modified: james/project/trunk/mailbox/jpa/src/test/java/org/apache/james/mailbox/jpa/JPAStressTest.java
URL: http://svn.apache.org/viewvc/james/project/trunk/mailbox/jpa/src/test/java/org/apache/james/mailbox/jpa/JPAStressTest.java?rev=1724225&r1=1724224&r2=1724225&view=diff
==============================================================================
--- james/project/trunk/mailbox/jpa/src/test/java/org/apache/james/mailbox/jpa/JPAStressTest.java (original)
+++ james/project/trunk/mailbox/jpa/src/test/java/org/apache/james/mailbox/jpa/JPAStressTest.java Tue Jan 12 13:17:03 2016
@@ -36,8 +36,8 @@ import org.apache.james.mailbox.jpa.mail
import org.apache.james.mailbox.jpa.mail.model.JPAMailbox;
import org.apache.james.mailbox.jpa.mail.model.JPAProperty;
import org.apache.james.mailbox.jpa.mail.model.JPAUserFlag;
-import org.apache.james.mailbox.jpa.mail.model.openjpa.AbstractJPAMessage;
-import org.apache.james.mailbox.jpa.mail.model.openjpa.JPAMessage;
+import org.apache.james.mailbox.jpa.mail.model.openjpa.AbstractJPAMailboxMessage;
+import org.apache.james.mailbox.jpa.mail.model.openjpa.JPAMailboxMessage;
import org.apache.james.mailbox.jpa.openjpa.OpenJPAMailboxManager;
import org.apache.james.mailbox.jpa.user.model.JPASubscription;
import org.apache.james.mailbox.store.JVMMailboxPathLocker;
@@ -68,8 +68,8 @@ public class JPAStressTest extends Abstr
properties.put("openjpa.jdbc.SynchronizeMappings", "buildSchema(ForeignKeys=true)");
properties.put("openjpa.MetaDataFactory", "jpa(Types=" +
JPAMailbox.class.getName() + ";" +
- AbstractJPAMessage.class.getName() + ";" +
- JPAMessage.class.getName() + ";" +
+ AbstractJPAMailboxMessage.class.getName() + ";" +
+ JPAMailboxMessage.class.getName() + ";" +
JPAProperty.class.getName() + ";" +
JPAUserFlag.class.getName() + ";" +
JPASubscription.class.getName() + ")");
Modified: james/project/trunk/mailbox/jpa/src/test/java/org/apache/james/mailbox/jpa/JPASubscriptionManagerTest.java
URL: http://svn.apache.org/viewvc/james/project/trunk/mailbox/jpa/src/test/java/org/apache/james/mailbox/jpa/JPASubscriptionManagerTest.java?rev=1724225&r1=1724224&r2=1724225&view=diff
==============================================================================
--- james/project/trunk/mailbox/jpa/src/test/java/org/apache/james/mailbox/jpa/JPASubscriptionManagerTest.java (original)
+++ james/project/trunk/mailbox/jpa/src/test/java/org/apache/james/mailbox/jpa/JPASubscriptionManagerTest.java Tue Jan 12 13:17:03 2016
@@ -28,8 +28,8 @@ import org.apache.james.mailbox.jpa.mail
import org.apache.james.mailbox.jpa.mail.model.JPAMailbox;
import org.apache.james.mailbox.jpa.mail.model.JPAProperty;
import org.apache.james.mailbox.jpa.mail.model.JPAUserFlag;
-import org.apache.james.mailbox.jpa.mail.model.openjpa.AbstractJPAMessage;
-import org.apache.james.mailbox.jpa.mail.model.openjpa.JPAMessage;
+import org.apache.james.mailbox.jpa.mail.model.openjpa.AbstractJPAMailboxMessage;
+import org.apache.james.mailbox.jpa.mail.model.openjpa.JPAMailboxMessage;
import org.apache.james.mailbox.jpa.user.model.JPASubscription;
import org.apache.james.mailbox.store.JVMMailboxPathLocker;
import org.apache.openjpa.persistence.OpenJPAEntityManagerFactory;
@@ -52,8 +52,8 @@ public class JPASubscriptionManagerTest
properties.put("openjpa.jdbc.SynchronizeMappings", "buildSchema(ForeignKeys=true)");
properties.put("openjpa.MetaDataFactory", "jpa(Types=" +
JPAMailbox.class.getName() + ";" +
- AbstractJPAMessage.class.getName() + ";" +
- JPAMessage.class.getName() + ";" +
+ AbstractJPAMailboxMessage.class.getName() + ";" +
+ JPAMailboxMessage.class.getName() + ";" +
JPAProperty.class.getName() + ";" +
JPAUserFlag.class.getName() + ";" +
JPASubscription.class.getName() + ")");
Modified: james/project/trunk/mailbox/kafka/src/main/java/org/apache/james/mailbox/kafka/KafkaMessageConsumer.java
URL: http://svn.apache.org/viewvc/james/project/trunk/mailbox/kafka/src/main/java/org/apache/james/mailbox/kafka/KafkaMessageConsumer.java?rev=1724225&r1=1724224&r2=1724225&view=diff
==============================================================================
--- james/project/trunk/mailbox/kafka/src/main/java/org/apache/james/mailbox/kafka/KafkaMessageConsumer.java (original)
+++ james/project/trunk/mailbox/kafka/src/main/java/org/apache/james/mailbox/kafka/KafkaMessageConsumer.java Tue Jan 12 13:17:03 2016
@@ -99,7 +99,7 @@ public class KafkaMessageConsumer implem
executor = Executors.newFixedThreadPool(numberOfTread);
startConsuming(streams);
} else {
- LOG.warn("This Kafka Message Receiver was already launched.");
+ LOG.warn("This Kafka MailboxMessage Receiver was already launched.");
}
}
Modified: james/project/trunk/mailbox/lucene/src/main/java/org/apache/james/mailbox/lucene/search/LuceneMessageSearchIndex.java
URL: http://svn.apache.org/viewvc/james/project/trunk/mailbox/lucene/src/main/java/org/apache/james/mailbox/lucene/search/LuceneMessageSearchIndex.java?rev=1724225&r1=1724224&r2=1724225&view=diff
==============================================================================
--- james/project/trunk/mailbox/lucene/src/main/java/org/apache/james/mailbox/lucene/search/LuceneMessageSearchIndex.java (original)
+++ james/project/trunk/mailbox/lucene/src/main/java/org/apache/james/mailbox/lucene/search/LuceneMessageSearchIndex.java Tue Jan 12 13:17:03 2016
@@ -59,7 +59,7 @@ import org.apache.james.mailbox.model.Se
import org.apache.james.mailbox.store.mail.MessageMapperFactory;
import org.apache.james.mailbox.store.mail.model.MailboxId;
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.MailboxMessage;
import org.apache.james.mailbox.store.search.ListeningMessageSearchIndex;
import org.apache.james.mailbox.store.search.SearchUtil;
import org.apache.james.mime4j.MimeException;
@@ -141,22 +141,22 @@ public class LuceneMessageSearchIndex<Id
/**
- * {@link Field} which will contain uid of the {@link Message}
+ * {@link Field} which will contain uid of the {@link MailboxMessage}
*/
public final static String UID_FIELD = "uid";
/**
- * {@link Field} which will contain the {@link Flags} of the {@link Message}
+ * {@link Field} which will contain the {@link Flags} of the {@link MailboxMessage}
*/
public final static String FLAGS_FIELD = "flags";
/**
- * {@link Field} which will contain the size of the {@link Message}
+ * {@link Field} which will contain the size of the {@link MailboxMessage}
*/
public final static String SIZE_FIELD = "size";
/**
- * {@link Field} which will contain the body of the {@link Message}
+ * {@link Field} which will contain the body of the {@link MailboxMessage}
*/
public final static String BODY_FIELD = "body";
@@ -167,7 +167,7 @@ public class LuceneMessageSearchIndex<Id
public final static String PREFIX_HEADER_FIELD ="header_";
/**
- * {@link Field} which will contain the whole message header of the {@link Message}
+ * {@link Field} which will contain the whole message header of the {@link MailboxMessage}
*/
public final static String HEADERS_FIELD ="headers";
@@ -375,7 +375,7 @@ public class LuceneMessageSearchIndex<Id
}
/**
- * Create a {@link Analyzer} which is used to index the {@link Message}'s
+ * Create a {@link Analyzer} which is used to index the {@link MailboxMessage}'s
*
* @param lenient
*
@@ -446,14 +446,14 @@ public class LuceneMessageSearchIndex<Id
/**
- * Create a new {@link Document} for the given {@link Message}. This Document does not contain any flags data. The {@link Flags} are stored in a seperate Document.
+ * Create a new {@link Document} for the given {@link MailboxMessage}. This Document does not contain any flags data. The {@link Flags} are stored in a seperate Document.
*
- * See {@link #createFlagsDocument(Message)}
+ * See {@link #createFlagsDocument(MailboxMessage)}
*
* @param membership
* @return document
*/
- private Document createMessageDocument(final MailboxSession session, final Message<?> membership) throws MailboxException{
+ private Document createMessageDocument(final MailboxSession session, final MailboxMessage<?> membership) throws MailboxException{
final Document doc = new Document();
// TODO: Better handling
doc.add(new Field(MAILBOX_ID_FIELD, membership.getMailboxId().serialize().toUpperCase(Locale.ENGLISH), Store.YES, Index.NOT_ANALYZED));
@@ -1189,9 +1189,9 @@ public class LuceneMessageSearchIndex<Id
/**
- * @see org.apache.james.mailbox.store.search.ListeningMessageSearchIndex#add(org.apache.james.mailbox.MailboxSession, org.apache.james.mailbox.store.mail.model.Mailbox, org.apache.james.mailbox.store.mail.model.Message)
+ * @see org.apache.james.mailbox.store.search.ListeningMessageSearchIndex#add(org.apache.james.mailbox.MailboxSession, org.apache.james.mailbox.store.mail.model.Mailbox, MailboxMessage)
*/
- public void add(MailboxSession session, Mailbox<Id> mailbox, Message<Id> membership) throws MailboxException {
+ public void add(MailboxSession session, Mailbox<Id> mailbox, MailboxMessage<Id> membership) throws MailboxException {
Document doc = createMessageDocument(session, membership);
Document flagsDoc = createFlagsDocument(membership);
@@ -1249,7 +1249,7 @@ public class LuceneMessageSearchIndex<Id
* @param f
* @param doc
*/
- private Document createFlagsDocument(Message<?> message) {
+ private Document createFlagsDocument(MailboxMessage<?> message) {
Document doc = new Document();
doc.add(new Field(ID_FIELD, "flags-" + message.getMailboxId().serialize() +"-" + Long.toString(message.getUid()), Store.YES, Index.NOT_ANALYZED));
doc.add(new Field(MAILBOX_ID_FIELD, message.getMailboxId().serialize(), Store.YES, Index.NOT_ANALYZED));
Copied: james/project/trunk/mailbox/lucene/src/test/java/org/apache/james/mailbox/lucene/search/LuceneMailboxMessageSearchIndexTest.java (from r1724224, james/project/trunk/mailbox/lucene/src/test/java/org/apache/james/mailbox/lucene/search/LuceneMessageSearchIndexTest.java)
URL: http://svn.apache.org/viewvc/james/project/trunk/mailbox/lucene/src/test/java/org/apache/james/mailbox/lucene/search/LuceneMailboxMessageSearchIndexTest.java?p2=james/project/trunk/mailbox/lucene/src/test/java/org/apache/james/mailbox/lucene/search/LuceneMailboxMessageSearchIndexTest.java&p1=james/project/trunk/mailbox/lucene/src/test/java/org/apache/james/mailbox/lucene/search/LuceneMessageSearchIndexTest.java&r1=1724224&r2=1724225&rev=1724225&view=diff
==============================================================================
--- james/project/trunk/mailbox/lucene/src/test/java/org/apache/james/mailbox/lucene/search/LuceneMessageSearchIndexTest.java (original)
+++ james/project/trunk/mailbox/lucene/src/test/java/org/apache/james/mailbox/lucene/search/LuceneMailboxMessageSearchIndexTest.java Tue Jan 12 13:17:03 2016
@@ -44,12 +44,12 @@ import org.apache.james.mailbox.store.Me
import org.apache.james.mailbox.store.SimpleMailboxMembership;
import org.apache.james.mailbox.store.TestId;
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.MailboxMessage;
import org.apache.lucene.store.RAMDirectory;
import org.junit.Before;
import org.junit.Test;
-public class LuceneMessageSearchIndexTest {
+public class LuceneMailboxMessageSearchIndexTest {
private LuceneMessageSearchIndex<TestId> index;
@@ -70,7 +70,7 @@ public class LuceneMessageSearchIndexTes
+ "It has " + RHUBARD + ".\r\n" + "It has " + CUSTARD + ".\r\n"
+ "It needs naught else.\r\n";
- Message<TestId> row;
+ MailboxMessage<TestId> row;
protected boolean useLenient() {
return true;
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org