Author: norman
Date: Fri Dec 3 20:56:00 2010
New Revision: 1041997
URL: http://svn.apache.org/viewvc?rev=1041997&view=rev
Log:
No need to support the limit of recent messages via query. Just keep it
simple...
Modified:
james/mailbox/trunk/jcr/src/main/java/org/apache/james/mailbox/jcr/mail/JCRMessageMapper.java
james/mailbox/trunk/jpa/src/main/java/org/apache/james/mailbox/jpa/mail/JPAMessageMapper.java
james/mailbox/trunk/maildir/src/main/java/org/apache/james/mailbox/maildir/MaildirFolder.java
james/mailbox/trunk/maildir/src/main/java/org/apache/james/mailbox/maildir/mail/MaildirMessageMapper.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/StoreMessageManager.java
james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/mail/MessageMapper.java
Modified:
james/mailbox/trunk/jcr/src/main/java/org/apache/james/mailbox/jcr/mail/JCRMessageMapper.java
URL:
http://svn.apache.org/viewvc/james/mailbox/trunk/jcr/src/main/java/org/apache/james/mailbox/jcr/mail/JCRMessageMapper.java?rev=1041997&r1=1041996&r2=1041997&view=diff
==============================================================================
---
james/mailbox/trunk/jcr/src/main/java/org/apache/james/mailbox/jcr/mail/JCRMessageMapper.java
(original)
+++
james/mailbox/trunk/jcr/src/main/java/org/apache/james/mailbox/jcr/mail/JCRMessageMapper.java
Fri Dec 3 20:56:00 2010
@@ -414,7 +414,7 @@ public class JCRMessageMapper extends Ab
*
org.apache.james.mailbox.store.mail.MessageMapper#findRecentMessagesInMailbox
* ()
*/
- public List<MailboxMembership<String>>
findRecentMessagesInMailbox(Mailbox<String> mailbox, int limit) throws
MailboxException {
+ public List<MailboxMembership<String>>
findRecentMessagesInMailbox(Mailbox<String> mailbox) throws MailboxException {
try {
@@ -423,9 +423,6 @@ public class JCRMessageMapper extends Ab
QueryManager manager =
getSession().getWorkspace().getQueryManager();
Query query = manager.createQuery(queryString, Query.XPATH);
- if (limit > 0) {
- query.setLimit(limit);
- }
QueryResult result = query.execute();
NodeIterator iterator = result.getNodes();
Modified:
james/mailbox/trunk/jpa/src/main/java/org/apache/james/mailbox/jpa/mail/JPAMessageMapper.java
URL:
http://svn.apache.org/viewvc/james/mailbox/trunk/jpa/src/main/java/org/apache/james/mailbox/jpa/mail/JPAMessageMapper.java?rev=1041997&r1=1041996&r2=1041997&view=diff
==============================================================================
---
james/mailbox/trunk/jpa/src/main/java/org/apache/james/mailbox/jpa/mail/JPAMessageMapper.java
(original)
+++
james/mailbox/trunk/jpa/src/main/java/org/apache/james/mailbox/jpa/mail/JPAMessageMapper.java
Fri Dec 3 20:56:00 2010
@@ -286,12 +286,9 @@ public class JPAMessageMapper extends JP
* @see
org.apache.james.mailbox.store.mail.MessageMapper#findRecentMessagesInMailbox()
*/
@SuppressWarnings("unchecked")
- public List<MailboxMembership<Long>>
findRecentMessagesInMailbox(Mailbox<Long> mailbox, int limit) throws
MailboxException {
+ public List<MailboxMembership<Long>>
findRecentMessagesInMailbox(Mailbox<Long> mailbox) throws MailboxException {
try {
Query query =
getEntityManager().createNamedQuery("findRecentMessagesInMailbox").setParameter("idParam",
mailbox.getMailboxId());
- if (limit > 0) {
- query = query.setMaxResults(limit);
- }
return query.getResultList();
} catch (PersistenceException e) {
throw new MailboxException("Search of recent messages failed in
mailbox " + mailbox, e);
Modified:
james/mailbox/trunk/maildir/src/main/java/org/apache/james/mailbox/maildir/MaildirFolder.java
URL:
http://svn.apache.org/viewvc/james/mailbox/trunk/maildir/src/main/java/org/apache/james/mailbox/maildir/MaildirFolder.java?rev=1041997&r1=1041996&r2=1041997&view=diff
==============================================================================
---
james/mailbox/trunk/maildir/src/main/java/org/apache/james/mailbox/maildir/MaildirFolder.java
(original)
+++
james/mailbox/trunk/maildir/src/main/java/org/apache/james/mailbox/maildir/MaildirFolder.java
Fri Dec 3 20:56:00 2010
@@ -361,16 +361,13 @@ public class MaildirFolder {
/**
* Creates a map of recent messages.
- * @param limit The number of items; a limit smaller then 1 disables the
limit
* @return A {...@link Map} with all uids and associated {...@link
MaildirMessageName}s of recent messages
* @throws IOException If there is a problem with the uid list file
*/
- public SortedMap<Long, MaildirMessageName> getRecentMessages(int limit)
throws IOException {
+ public SortedMap<Long, MaildirMessageName> getRecentMessages() throws
IOException {
String[] recentFiles = getNewFolder().list();
LinkedList<String> lines = new LinkedList<String>();
- int theLimit = limit;
- if (limit < 1 || limit > recentFiles.length)
- theLimit = recentFiles.length;
+ int theLimit = recentFiles.length;
SortedMap<Long, MaildirMessageName> recentMessages = new TreeMap<Long,
MaildirMessageName>();
File uidList = lockUidList();
try {
Modified:
james/mailbox/trunk/maildir/src/main/java/org/apache/james/mailbox/maildir/mail/MaildirMessageMapper.java
URL:
http://svn.apache.org/viewvc/james/mailbox/trunk/maildir/src/main/java/org/apache/james/mailbox/maildir/mail/MaildirMessageMapper.java?rev=1041997&r1=1041996&r2=1041997&view=diff
==============================================================================
---
james/mailbox/trunk/maildir/src/main/java/org/apache/james/mailbox/maildir/mail/MaildirMessageMapper.java
(original)
+++
james/mailbox/trunk/maildir/src/main/java/org/apache/james/mailbox/maildir/mail/MaildirMessageMapper.java
Fri Dec 3 20:56:00 2010
@@ -241,14 +241,14 @@ public class MaildirMessageMapper extend
/*
* (non-Javadoc)
- * @see
org.apache.james.mailbox.store.mail.MessageMapper#findRecentMessagesInMailbox(org.apache.james.mailbox.store.mail.model.Mailbox,
int)
+ * @see
org.apache.james.mailbox.store.mail.MessageMapper#findRecentMessagesInMailbox(org.apache.james.mailbox.store.mail.model.Mailbox)
*/
- public List<MailboxMembership<Integer>>
findRecentMessagesInMailbox(Mailbox<Integer> mailbox, int limit)
+ public List<MailboxMembership<Integer>>
findRecentMessagesInMailbox(Mailbox<Integer> mailbox)
throws MailboxException {
MaildirFolder folder = maildirStore.createMaildirFolder(mailbox);
SortedMap<Long, MaildirMessageName> recentMessageNames;
try {
- recentMessageNames = folder.getRecentMessages(limit);
+ recentMessageNames = folder.getRecentMessages();
} catch (IOException e) {
throw new MailboxException("Failure while search recent messages
in Mailbox " + mailbox, 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=1041997&r1=1041996&r2=1041997&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
Fri Dec 3 20:56:00 2010
@@ -148,7 +148,7 @@ public class InMemoryMessageMapper exten
* (non-Javadoc)
* @see
org.apache.james.mailbox.store.mail.MessageMapper#findRecentMessagesInMailbox()
*/
- public List<MailboxMembership<Long>>
findRecentMessagesInMailbox(Mailbox<Long> mailbox,int limit) throws
MailboxException {
+ public List<MailboxMembership<Long>>
findRecentMessagesInMailbox(Mailbox<Long> mailbox) throws MailboxException {
final List<MailboxMembership<Long>> results = new
ArrayList<MailboxMembership<Long>>();
for(MailboxMembership<Long>
member:getMembershipByUidForMailbox(mailbox).values()) {
if (member.isRecent()) {
@@ -156,9 +156,7 @@ public class InMemoryMessageMapper exten
}
}
Collections.sort(results, MailboxMembershipComparator.INSTANCE);
- if (limit > 0 && limit > results.size()) {
- return results.subList(0, limit -1);
- }
+
return results;
}
Modified:
james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/StoreMessageManager.java
URL:
http://svn.apache.org/viewvc/james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/StoreMessageManager.java?rev=1041997&r1=1041996&r2=1041997&view=diff
==============================================================================
---
james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/StoreMessageManager.java
(original)
+++
james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/StoreMessageManager.java
Fri Dec 3 20:56:00 2010
@@ -483,7 +483,7 @@ public abstract class StoreMessageManage
return messageMapper.execute(new Mapper.Transaction<List<Long>>() {
public List<Long> run() throws MailboxException {
- final List<MailboxMembership<Id>> members =
messageMapper.findRecentMessagesInMailbox(getMailboxEntity(), -1);
+ final List<MailboxMembership<Id>> members =
messageMapper.findRecentMessagesInMailbox(getMailboxEntity());
final List<Long> results = new ArrayList<Long>();
for (MailboxMembership<Id> member:members) {
Modified:
james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/mail/MessageMapper.java
URL:
http://svn.apache.org/viewvc/james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/mail/MessageMapper.java?rev=1041997&r1=1041996&r2=1041997&view=diff
==============================================================================
---
james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/mail/MessageMapper.java
(original)
+++
james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/mail/MessageMapper.java
Fri Dec 3 20:56:00 2010
@@ -111,15 +111,12 @@ public interface MessageMapper<Id> exten
/**
* Return a List of {...@link MailboxMembership} which are recent.
* The list must be ordered by the {...@link Message} uid.
- * If a limit was given the list will maximal be the size of the limit. Id
a
- * limit smaller then 1 is given the List must contain all messages
*
* @param mailbox
- * @param limit
* @return recentList
* @throws StorageException
*/
- public abstract List<MailboxMembership<Id>>
findRecentMessagesInMailbox(Mailbox<Id> mailbox, int limit) throws
MailboxException;
+ public abstract List<MailboxMembership<Id>>
findRecentMessagesInMailbox(Mailbox<Id> mailbox) throws MailboxException;
/**
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
