Author: norman
Date: Thu Oct 6 05:23:47 2011
New Revision: 1179504
URL: http://svn.apache.org/viewvc?rev=1179504&view=rev
Log:
Remove batchSize parameter from MessageManager.getMessages(...). See MAILBOX-148
Modified:
james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/AbstractMailboxProcessor.java
james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/AbstractSelectionProcessor.java
james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/DefaultProcessorChain.java
james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/SearchProcessor.java
james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/StoreProcessor.java
james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/fetch/FetchProcessor.java
james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/main/DefaultImapProcessorFactory.java
Modified:
james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/AbstractMailboxProcessor.java
URL:
http://svn.apache.org/viewvc/james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/AbstractMailboxProcessor.java?rev=1179504&r1=1179503&r2=1179504&view=diff
==============================================================================
---
james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/AbstractMailboxProcessor.java
(original)
+++
james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/AbstractMailboxProcessor.java
Thu Oct 6 05:23:47 2011
@@ -225,7 +225,7 @@ abstract public class AbstractMailboxPro
protected void addFlagsResponses(final ImapSession session, final
SelectedMailbox selected, final ImapProcessor.Responder responder, boolean
useUid, MessageRange messageSet, MessageManager mailbox, MailboxSession
mailboxSession) throws MailboxException {
- final MessageResultIterator it = mailbox.getMessages(messageSet,
FetchGroupImpl.MINIMAL, -1, mailboxSession);
+ final MessageResultIterator it = mailbox.getMessages(messageSet,
FetchGroupImpl.MINIMAL, mailboxSession);
while (it.hasNext()) {
MessageResult mr = it.next();
final long uid = mr.getUid();
Modified:
james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/AbstractSelectionProcessor.java
URL:
http://svn.apache.org/viewvc/james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/AbstractSelectionProcessor.java?rev=1179504&r1=1179503&r2=1179504&view=diff
==============================================================================
---
james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/AbstractSelectionProcessor.java
(original)
+++
james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/AbstractSelectionProcessor.java
Thu Oct 6 05:23:47 2011
@@ -416,7 +416,7 @@ abstract class AbstractSelectionProcesso
private SelectedMailbox createNewSelectedMailbox(final MessageManager
mailbox, final MailboxSession mailboxSession, ImapSession session, MailboxPath
path) throws MailboxException {
- MessageResultIterator messages =
mailbox.getMessages(MessageRange.all(), FetchGroupImpl.MINIMAL, -1,
mailboxSession);
+ MessageResultIterator messages =
mailbox.getMessages(MessageRange.all(), FetchGroupImpl.MINIMAL, mailboxSession);
Flags applicableFlags = new Flags(flags);
List<Long> uids = new ArrayList<Long>();
while(messages.hasNext()) {
Modified:
james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/DefaultProcessorChain.java
URL:
http://svn.apache.org/viewvc/james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/DefaultProcessorChain.java?rev=1179504&r1=1179503&r2=1179504&view=diff
==============================================================================
---
james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/DefaultProcessorChain.java
(original)
+++
james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/DefaultProcessorChain.java
Thu Oct 6 05:23:47 2011
@@ -35,7 +35,7 @@ import org.apache.james.mailbox.Subscrip
*/
public class DefaultProcessorChain {
- public static final ImapProcessor createDefaultChain(final ImapProcessor
chainEndProcessor, final MailboxManager mailboxManager, final
SubscriptionManager subscriptionManager, final StatusResponseFactory
statusResponseFactory, MailboxTyper mailboxTyper, int batchSize, long
idleKeepAlive, TimeUnit milliseconds, Set<String> disabledCaps) {
+ public static final ImapProcessor createDefaultChain(final ImapProcessor
chainEndProcessor, final MailboxManager mailboxManager, final
SubscriptionManager subscriptionManager, final StatusResponseFactory
statusResponseFactory, MailboxTyper mailboxTyper, long idleKeepAlive, TimeUnit
milliseconds, Set<String> disabledCaps) {
final SystemMessageProcessor systemProcessor = new
SystemMessageProcessor(chainEndProcessor, mailboxManager);
final LogoutProcessor logoutProcessor = new
LogoutProcessor(systemProcessor, mailboxManager, statusResponseFactory);
@@ -78,7 +78,7 @@ public class DefaultProcessorChain {
capabilityProcessor.addProcessor(xlistProcessor);
- final ImapProcessor fetchProcessor = new
FetchProcessor(namespaceProcessor, mailboxManager, statusResponseFactory,
batchSize);
+ final ImapProcessor fetchProcessor = new
FetchProcessor(namespaceProcessor, mailboxManager, statusResponseFactory);
final StartTLSProcessor startTLSProcessor = new
StartTLSProcessor(fetchProcessor, statusResponseFactory);
final UnselectProcessor unselectProcessor = new
UnselectProcessor(startTLSProcessor, mailboxManager, statusResponseFactory);
Modified:
james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/SearchProcessor.java
URL:
http://svn.apache.org/viewvc/james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/SearchProcessor.java?rev=1179504&r1=1179503&r2=1179504&view=diff
==============================================================================
---
james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/SearchProcessor.java
(original)
+++
james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/SearchProcessor.java
Thu Oct 6 05:23:47 2011
@@ -240,7 +240,7 @@ public class SearchProcessor extends Abs
// Reverse loop over the ranges as its more likely that we find a
match at the end
int size = ranges.size();
for (int i = size -1 ; i > 0; i--) {
- MessageResultIterator results = mailbox.getMessages(ranges.get(i),
FetchGroupImpl.MINIMAL, -1, session);
+ MessageResultIterator results = mailbox.getMessages(ranges.get(i),
FetchGroupImpl.MINIMAL, session);
while(results.hasNext()) {
long modSeq = results.next().getModSeq();
if (highestModSeq == null || modSeq > highestModSeq) {
Modified:
james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/StoreProcessor.java
URL:
http://svn.apache.org/viewvc/james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/StoreProcessor.java?rev=1179504&r1=1179503&r2=1179504&view=diff
==============================================================================
---
james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/StoreProcessor.java
(original)
+++
james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/StoreProcessor.java
Thu Oct 6 05:23:47 2011
@@ -117,7 +117,7 @@ public class StoreProcessor extends Abst
List<Long> uids = new ArrayList<Long>();
- MessageResultIterator results =
mailbox.getMessages(messageSet, FetchGroupImpl.MINIMAL, -1, mailboxSession);
+ MessageResultIterator results =
mailbox.getMessages(messageSet, FetchGroupImpl.MINIMAL, mailboxSession);
while(results.hasNext()) {
MessageResult r = results.next();
long uid = r.getUid();
@@ -261,7 +261,7 @@ public class StoreProcessor extends Abst
// - QRESYNC was enabled via ENABLE QRESYNC
//
if (unchangedSince != -1 || qresyncEnabled || condstoreEnabled) {
- MessageResultIterator results =
mailbox.getMessages(messageSet, FetchGroupImpl.MINIMAL, -1, mailboxSession);
+ MessageResultIterator results =
mailbox.getMessages(messageSet, FetchGroupImpl.MINIMAL, mailboxSession);
while(results.hasNext()) {
MessageResult r = results.next();
// Store the modseq for the uid for later usage in the
response
Modified:
james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/fetch/FetchProcessor.java
URL:
http://svn.apache.org/viewvc/james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/fetch/FetchProcessor.java?rev=1179504&r1=1179503&r2=1179504&view=diff
==============================================================================
---
james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/fetch/FetchProcessor.java
(original)
+++
james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/fetch/FetchProcessor.java
Thu Oct 6 05:23:47 2011
@@ -53,11 +53,8 @@ import org.apache.james.mailbox.MessageR
public class FetchProcessor extends AbstractMailboxProcessor<FetchRequest> {
- private int batchSize;
-
- public FetchProcessor(final ImapProcessor next, final MailboxManager
mailboxManager, final StatusResponseFactory factory, int batchSize) {
+ public FetchProcessor(final ImapProcessor next, final MailboxManager
mailboxManager, final StatusResponseFactory factory) {
super(FetchRequest.class, next, mailboxManager, factory);
- this.batchSize = batchSize;
}
/*
@@ -160,7 +157,7 @@ public class FetchProcessor extends Abst
FetchGroup resultToFetch = getFetchGroup(fetch);
for (int i = 0; i < ranges.size(); i++) {
- MessageResultIterator messages =
mailbox.getMessages(ranges.get(i), resultToFetch, batchSize, mailboxSession);
+ MessageResultIterator messages =
mailbox.getMessages(ranges.get(i), resultToFetch, mailboxSession);
while (messages.hasNext()) {
final MessageResult result = messages.next();
try {
Modified:
james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/main/DefaultImapProcessorFactory.java
URL:
http://svn.apache.org/viewvc/james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/main/DefaultImapProcessorFactory.java?rev=1179504&r1=1179503&r2=1179504&view=diff
==============================================================================
---
james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/main/DefaultImapProcessorFactory.java
(original)
+++
james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/main/DefaultImapProcessorFactory.java
Thu Oct 6 05:23:47 2011
@@ -23,7 +23,6 @@ import java.util.HashSet;
import java.util.Set;
import java.util.concurrent.TimeUnit;
-import org.apache.james.imap.api.ImapConstants;
import org.apache.james.imap.api.message.response.StatusResponseFactory;
import org.apache.james.imap.api.process.ImapProcessor;
import org.apache.james.imap.api.process.MailboxTyper;
@@ -41,21 +40,21 @@ import org.apache.james.mailbox.Subscrip
public class DefaultImapProcessorFactory {
public static final ImapProcessor createDefaultProcessor(final
MailboxManager mailboxManager, final SubscriptionManager subscriptionManager) {
- return createXListSupportingProcessor(mailboxManager,
subscriptionManager, null, ImapConstants.DEFAULT_BATCH_SIZE,
IdleProcessor.DEFAULT_HEARTBEAT_INTERVAL_IN_SECONDS, new HashSet<String>());
+ return createXListSupportingProcessor(mailboxManager,
subscriptionManager, null, IdleProcessor.DEFAULT_HEARTBEAT_INTERVAL_IN_SECONDS,
new HashSet<String>());
}
- public static final ImapProcessor createDefaultProcessor(final
MailboxManager mailboxManager, final SubscriptionManager subscriptionManager,
int batchSize, long idleKeepAlive) {
- return createXListSupportingProcessor(mailboxManager,
subscriptionManager, null, batchSize, idleKeepAlive, new HashSet<String>());
+ public static final ImapProcessor createDefaultProcessor(final
MailboxManager mailboxManager, final SubscriptionManager subscriptionManager,
long idleKeepAlive) {
+ return createXListSupportingProcessor(mailboxManager,
subscriptionManager, null, idleKeepAlive, new HashSet<String>());
}
public static final ImapProcessor createXListSupportingProcessor(final
MailboxManager mailboxManager, final SubscriptionManager subscriptionManager,
MailboxTyper mailboxTyper) {
- return createXListSupportingProcessor(mailboxManager,
subscriptionManager, mailboxTyper, ImapConstants.DEFAULT_BATCH_SIZE,
IdleProcessor.DEFAULT_HEARTBEAT_INTERVAL_IN_SECONDS, new HashSet<String>());
+ return createXListSupportingProcessor(mailboxManager,
subscriptionManager, mailboxTyper,
IdleProcessor.DEFAULT_HEARTBEAT_INTERVAL_IN_SECONDS, new HashSet<String>());
}
- public static final ImapProcessor createXListSupportingProcessor(final
MailboxManager mailboxManager, final SubscriptionManager subscriptionManager,
MailboxTyper mailboxTyper, int batchSize, long idleKeepAlive, Set<String>
disabledCaps) {
+ public static final ImapProcessor createXListSupportingProcessor(final
MailboxManager mailboxManager, final SubscriptionManager subscriptionManager,
MailboxTyper mailboxTyper, long idleKeepAlive, Set<String> disabledCaps) {
final StatusResponseFactory statusResponseFactory = new
UnpooledStatusResponseFactory();
final UnknownRequestProcessor unknownRequestImapProcessor = new
UnknownRequestProcessor(statusResponseFactory);
- final ImapProcessor imap4rev1Chain =
DefaultProcessorChain.createDefaultChain(unknownRequestImapProcessor,
mailboxManager, subscriptionManager, statusResponseFactory, mailboxTyper,
batchSize, idleKeepAlive, TimeUnit.SECONDS, disabledCaps);
+ final ImapProcessor imap4rev1Chain =
DefaultProcessorChain.createDefaultChain(unknownRequestImapProcessor,
mailboxManager, subscriptionManager, statusResponseFactory, mailboxTyper,
idleKeepAlive, TimeUnit.SECONDS, disabledCaps);
final ImapProcessor result = new
ImapResponseMessageProcessor(imap4rev1Chain);
return result;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
