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=1063725&r1=1063724&r2=1063725&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 Wed Jan 26 14:06:24 2011 @@ -26,13 +26,11 @@ import java.util.Iterator; import java.util.List; import org.apache.james.imap.api.ImapCommand; -import org.apache.james.imap.api.ImapMessage; import org.apache.james.imap.api.ImapSessionUtils; import org.apache.james.imap.api.display.HumanReadableText; import org.apache.james.imap.api.message.BodyFetchElement; import org.apache.james.imap.api.message.FetchData; import org.apache.james.imap.api.message.IdRange; -import org.apache.james.imap.api.message.request.ImapRequest; import org.apache.james.imap.api.message.response.StatusResponseFactory; import org.apache.james.imap.api.process.ImapProcessor; import org.apache.james.imap.api.process.ImapSession; @@ -46,39 +44,31 @@ import org.apache.james.mailbox.MailboxM import org.apache.james.mailbox.MailboxSession; import org.apache.james.mailbox.MessageManager; import org.apache.james.mailbox.MessageRange; -import org.apache.james.mailbox.MessageResult; -import org.apache.james.mailbox.UnsupportedCriteriaException; import org.apache.james.mailbox.MessageRange.Type; +import org.apache.james.mailbox.MessageResult; import org.apache.james.mailbox.MessageResult.FetchGroup; import org.apache.james.mailbox.MessageResult.MimePath; +import org.apache.james.mailbox.UnsupportedCriteriaException; import org.apache.james.mailbox.util.FetchGroupImpl; import org.apache.james.mime4j.field.address.parser.ParseException; -public class FetchProcessor extends AbstractMailboxProcessor { +public class FetchProcessor extends AbstractMailboxProcessor<FetchRequest> { private int batchSize; public FetchProcessor(final ImapProcessor next, final MailboxManager mailboxManager, final StatusResponseFactory factory, int batchSize) { - super(next, mailboxManager, factory); + super(FetchRequest.class,next, mailboxManager, factory); this.batchSize = batchSize; } - /* - * (non-Javadoc) - * @see org.apache.james.imap.processor.base.AbstractChainedProcessor#isAcceptable(org.apache.james.imap.api.ImapMessage) - */ - protected boolean isAcceptable(ImapMessage message) { - return (message instanceof FetchRequest); - } /* * (non-Javadoc) * @see org.apache.james.imap.processor.AbstractMailboxProcessor#doProcess(org.apache.james.imap.api.message.request.ImapRequest, org.apache.james.imap.api.process.ImapSession, java.lang.String, org.apache.james.imap.api.ImapCommand, org.apache.james.imap.api.process.ImapProcessor.Responder) */ - protected void doProcess(ImapRequest message, ImapSession session, + protected void doProcess(FetchRequest request, ImapSession session, String tag, ImapCommand command, Responder responder) { - final FetchRequest request = (FetchRequest) message; final boolean useUids = request.isUseUids(); final IdRange[] idSet = request.getIdSet(); final FetchData fetch = request.getFetch(); @@ -250,4 +240,5 @@ public class FetchProcessor extends Abst result.addPartContent(mimePath, content); } } + }
Modified: james/imap/trunk/processor/src/test/java/org/apache/james/imap/processor/NamespaceProcessorTest.java URL: http://svn.apache.org/viewvc/james/imap/trunk/processor/src/test/java/org/apache/james/imap/processor/NamespaceProcessorTest.java?rev=1063725&r1=1063724&r2=1063725&view=diff ============================================================================== --- james/imap/trunk/processor/src/test/java/org/apache/james/imap/processor/NamespaceProcessorTest.java (original) +++ james/imap/trunk/processor/src/test/java/org/apache/james/imap/processor/NamespaceProcessorTest.java Wed Jan 26 14:06:24 2011 @@ -18,25 +18,21 @@ ****************************************************************/ package org.apache.james.imap.processor; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; - import java.util.ArrayList; import java.util.Arrays; import java.util.Collection; import java.util.List; import org.apache.james.imap.api.ImapCommand; -import org.apache.james.imap.api.ImapMessage; import org.apache.james.imap.api.ImapSessionState; import org.apache.james.imap.api.ImapSessionUtils; import org.apache.james.imap.api.display.HumanReadableText; import org.apache.james.imap.api.message.response.StatusResponse; -import org.apache.james.imap.api.message.response.StatusResponseFactory; import org.apache.james.imap.api.message.response.StatusResponse.ResponseCode; +import org.apache.james.imap.api.message.response.StatusResponseFactory; import org.apache.james.imap.api.process.ImapProcessor; -import org.apache.james.imap.api.process.ImapSession; import org.apache.james.imap.api.process.ImapProcessor.Responder; +import org.apache.james.imap.api.process.ImapSession; import org.apache.james.imap.message.request.NamespaceRequest; import org.apache.james.imap.message.response.NamespaceResponse; import org.apache.james.mailbox.MailboxConstants; @@ -83,25 +79,7 @@ public class NamespaceProcessorTest { } - @Test - public void testShouldAcceptNamespaceRequests() throws Exception { - mockery.checking (new Expectations() {{ - allowing(imapSessionStub).getAttribute(ImapSessionUtils.MAILBOX_SESSION_ATTRIBUTE_SESSION_KEY); will(returnValue(mailboxSessionStub)); - allowing(mailboxSessionStub).getPersonalSpace(); will(returnValue(PERSONAL_PREFIX)); - allowing(mailboxSessionStub).getOtherUsersSpace(); will(returnValue(USERS_PREFIX)); - allowing(mailboxSessionStub).getSharedSpaces();will(returnValue(Arrays.asList(SHARED_PREFIX))); - allowing(imapSessionStub).getState();will(returnValue(ImapSessionState.AUTHENTICATED)); - allowing(statusResponseStub).taggedOk( - with(any(String.class)), with(any(ImapCommand.class)), - with(any(HumanReadableText.class)), with(any(ResponseCode.class))); will(returnValue(mockery.mock(StatusResponse.class))); - ignoring(imapSessionStub); - ignoring(mailboxSessionStub); - ignoring(mailboxManagerStub); - ignoring(statusResponseStub); - }}); - assertFalse(subject.isAcceptable(mockery.mock(ImapMessage.class))); - assertTrue(subject.isAcceptable(namespaceRequest)); - } + @Test public void testNamespaceResponseShouldContainPersonalAndUserSpaces() throws Exception { --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
