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 rd...@apache.org on 2007/12/09 21:23:39 UTC
svn commit: r602730 - in /james/server/trunk:
imap-api/src/main/java/org/apache/james/api/imap/display/
imap-codec-library/src/main/java/org/apache/james/imap/message/response/imap4rev1/legacy/
imap-codec-library/src/main/java/org/apache/james/imapserv...
Author: rdonkin
Date: Sun Dec 9 12:23:38 2007
New Revision: 602730
URL: http://svn.apache.org/viewvc?rev=602730&view=rev
Log:
Replaced deprecated response.
Removed:
james/server/trunk/imap-codec-library/src/main/java/org/apache/james/imap/message/response/imap4rev1/legacy/CommandCompleteResponse.java
james/server/trunk/imap-codec-library/src/main/java/org/apache/james/imapserver/codec/encode/imap4rev1/legacy/CommandCompleteResponseEncoder.java
Modified:
james/server/trunk/imap-api/src/main/java/org/apache/james/api/imap/display/HumanReadableTextKey.java
james/server/trunk/imap-codec-library/src/main/java/org/apache/james/imapserver/codec/encode/main/DefaultImapEncoderFactory.java
james/server/trunk/imap-mailbox-processor-function/src/main/java/org/apache/james/imapserver/processor/imap4rev1/CheckProcessor.java
james/server/trunk/imap-mailbox-processor-function/src/main/java/org/apache/james/imapserver/processor/imap4rev1/CopyProcessor.java
james/server/trunk/imap-mailbox-processor-function/src/main/java/org/apache/james/imapserver/processor/imap4rev1/CreateProcessor.java
james/server/trunk/imap-mailbox-processor-function/src/main/java/org/apache/james/imapserver/processor/imap4rev1/DeleteProcessor.java
james/server/trunk/imap-mailbox-processor-function/src/main/java/org/apache/james/imapserver/processor/imap4rev1/ExpungeProcessor.java
james/server/trunk/imap-mailbox-processor-function/src/main/java/org/apache/james/imapserver/processor/imap4rev1/NoopProcessor.java
james/server/trunk/imap-mailbox-processor-function/src/main/java/org/apache/james/imapserver/processor/imap4rev1/RenameProcessor.java
james/server/trunk/imap-mailbox-processor-function/src/main/java/org/apache/james/imapserver/processor/imap4rev1/SubscribeProcessor.java
james/server/trunk/imap-mailbox-processor-function/src/main/java/org/apache/james/imapserver/processor/imap4rev1/UnsubscribeProcessor.java
Modified: james/server/trunk/imap-api/src/main/java/org/apache/james/api/imap/display/HumanReadableTextKey.java
URL: http://svn.apache.org/viewvc/james/server/trunk/imap-api/src/main/java/org/apache/james/api/imap/display/HumanReadableTextKey.java?rev=602730&r1=602729&r2=602730&view=diff
==============================================================================
--- james/server/trunk/imap-api/src/main/java/org/apache/james/api/imap/display/HumanReadableTextKey.java (original)
+++ james/server/trunk/imap-api/src/main/java/org/apache/james/api/imap/display/HumanReadableTextKey.java Sun Dec 9 12:23:38 2007
@@ -40,6 +40,10 @@
= new HumanReadableTextKey("org.apache.james.imap.UNSUPPORTED_CRITERIA",
"failed. One or more search criteria is unsupported.");
+ public static final HumanReadableTextKey MAILBOX_IS_READ_ONLY
+ = new HumanReadableTextKey("org.apache.james.imap.MAILBOX_IS_READ_ONLY",
+ "failed. Mailbox is read only.");
+
private final String defaultValue;
private final String key;
public HumanReadableTextKey(final String key, final String defaultValue) {
Modified: james/server/trunk/imap-codec-library/src/main/java/org/apache/james/imapserver/codec/encode/main/DefaultImapEncoderFactory.java
URL: http://svn.apache.org/viewvc/james/server/trunk/imap-codec-library/src/main/java/org/apache/james/imapserver/codec/encode/main/DefaultImapEncoderFactory.java?rev=602730&r1=602729&r2=602730&view=diff
==============================================================================
--- james/server/trunk/imap-codec-library/src/main/java/org/apache/james/imapserver/codec/encode/main/DefaultImapEncoderFactory.java (original)
+++ james/server/trunk/imap-codec-library/src/main/java/org/apache/james/imapserver/codec/encode/main/DefaultImapEncoderFactory.java Sun Dec 9 12:23:38 2007
@@ -29,7 +29,6 @@
import org.apache.james.imapserver.codec.encode.imap4rev1.StatusResponseEncoder;
import org.apache.james.imapserver.codec.encode.imap4rev1.legacy.BadResponseEncoder;
import org.apache.james.imapserver.codec.encode.imap4rev1.legacy.CapabilityResponseEncoder;
-import org.apache.james.imapserver.codec.encode.imap4rev1.legacy.CommandCompleteResponseEncoder;
import org.apache.james.imapserver.codec.encode.imap4rev1.legacy.CommandFailedResponseEncoder;
import org.apache.james.imapserver.codec.encode.imap4rev1.legacy.ErrorResponseEncoder;
import org.apache.james.imapserver.codec.encode.imap4rev1.legacy.ExamineAndSelectResponseEncoder;
@@ -61,8 +60,7 @@
final ExamineAndSelectResponseEncoder examineAndSelectResponseEncoder = new ExamineAndSelectResponseEncoder(listResponseEncoder);
final ErrorResponseEncoder errorResponseEncoder = new ErrorResponseEncoder(examineAndSelectResponseEncoder);
final CommandFailedResponseEncoder commandFailedResponseEncoder = new CommandFailedResponseEncoder(errorResponseEncoder);
- final CommandCompleteResponseEncoder commandCompleteResponseEncoder = new CommandCompleteResponseEncoder(commandFailedResponseEncoder);
- final CapabilityResponseEncoder capabilityResponseEncoder = new CapabilityResponseEncoder(commandCompleteResponseEncoder);
+ final CapabilityResponseEncoder capabilityResponseEncoder = new CapabilityResponseEncoder(commandFailedResponseEncoder);
final BadResponseEncoder result = new BadResponseEncoder(capabilityResponseEncoder);
return result;
}
Modified: james/server/trunk/imap-mailbox-processor-function/src/main/java/org/apache/james/imapserver/processor/imap4rev1/CheckProcessor.java
URL: http://svn.apache.org/viewvc/james/server/trunk/imap-mailbox-processor-function/src/main/java/org/apache/james/imapserver/processor/imap4rev1/CheckProcessor.java?rev=602730&r1=602729&r2=602730&view=diff
==============================================================================
--- james/server/trunk/imap-mailbox-processor-function/src/main/java/org/apache/james/imapserver/processor/imap4rev1/CheckProcessor.java (original)
+++ james/server/trunk/imap-mailbox-processor-function/src/main/java/org/apache/james/imapserver/processor/imap4rev1/CheckProcessor.java Sun Dec 9 12:23:38 2007
@@ -23,16 +23,12 @@
import org.apache.james.api.imap.ImapMessage;
import org.apache.james.api.imap.ProtocolException;
import org.apache.james.api.imap.message.request.ImapRequest;
-import org.apache.james.api.imap.message.response.ImapResponseMessage;
import org.apache.james.api.imap.message.response.imap4rev1.StatusResponseFactory;
import org.apache.james.api.imap.process.ImapProcessor;
import org.apache.james.api.imap.process.ImapSession;
-import org.apache.james.api.imap.process.ImapProcessor.Responder;
import org.apache.james.imap.message.request.imap4rev1.CheckRequest;
-import org.apache.james.imap.message.response.imap4rev1.legacy.CommandCompleteResponse;
import org.apache.james.imapserver.processor.base.AbstractImapRequestProcessor;
import org.apache.james.imapserver.processor.base.AuthorizationException;
-import org.apache.james.imapserver.processor.base.ImapSessionUtils;
import org.apache.james.imapserver.store.MailboxException;
public class CheckProcessor extends AbstractImapRequestProcessor {
@@ -48,25 +44,7 @@
protected void doProcess(ImapRequest message,
ImapSession session, String tag, ImapCommand command, Responder responder)
throws MailboxException, AuthorizationException, ProtocolException {
- final CheckRequest request = (CheckRequest) message;
- final ImapResponseMessage result = doProcess(request, session, tag,
- command);
- responder.respond(result);
- }
-
- private ImapResponseMessage doProcess(CheckRequest request,
- ImapSession session, String tag, ImapCommand command)
- throws MailboxException, AuthorizationException, ProtocolException {
- final ImapResponseMessage result = doProcess(session, tag, command);
- return result;
- }
-
- private ImapResponseMessage doProcess(ImapSession session, String tag,
- ImapCommand command) throws MailboxException,
- AuthorizationException, ProtocolException {
- final CommandCompleteResponse result = new CommandCompleteResponse(
- command, tag);
- ImapSessionUtils.addUnsolicitedResponses(result, session, false);
- return result;
+ unsolicitedResponses(session, responder, false);
+ okComplete(command, tag, responder);
}
}
Modified: james/server/trunk/imap-mailbox-processor-function/src/main/java/org/apache/james/imapserver/processor/imap4rev1/CopyProcessor.java
URL: http://svn.apache.org/viewvc/james/server/trunk/imap-mailbox-processor-function/src/main/java/org/apache/james/imapserver/processor/imap4rev1/CopyProcessor.java?rev=602730&r1=602729&r2=602730&view=diff
==============================================================================
--- james/server/trunk/imap-mailbox-processor-function/src/main/java/org/apache/james/imapserver/processor/imap4rev1/CopyProcessor.java (original)
+++ james/server/trunk/imap-mailbox-processor-function/src/main/java/org/apache/james/imapserver/processor/imap4rev1/CopyProcessor.java Sun Dec 9 12:23:38 2007
@@ -30,7 +30,6 @@
import org.apache.james.api.imap.process.ImapSession;
import org.apache.james.api.imap.process.ImapProcessor.Responder;
import org.apache.james.imap.message.request.imap4rev1.CopyRequest;
-import org.apache.james.imap.message.response.imap4rev1.legacy.CommandCompleteResponse;
import org.apache.james.imapserver.processor.base.AbstractMailboxAwareProcessor;
import org.apache.james.imapserver.processor.base.AuthorizationException;
import org.apache.james.imapserver.processor.base.ImapSessionUtils;
@@ -58,26 +57,9 @@
ImapSession session, String tag, ImapCommand command, Responder responder)
throws MailboxException, AuthorizationException, ProtocolException {
final CopyRequest request = (CopyRequest) message;
- final ImapResponseMessage result = doProcess(request, session, tag,
- command);
- responder.respond(result);
- }
-
- private ImapResponseMessage doProcess(CopyRequest request,
- ImapSession session, String tag, ImapCommand command)
- throws MailboxException, AuthorizationException, ProtocolException {
final String mailboxName = request.getMailboxName();
final IdRange[] idSet = request.getIdSet();
final boolean useUids = request.isUseUids();
- final ImapResponseMessage result = doProcess(mailboxName, idSet,
- useUids, session, tag, command);
- return result;
- }
-
- private ImapResponseMessage doProcess(String mailboxName, IdRange[] idSet,
- boolean useUids, ImapSession session, String tag,
- ImapCommand command) throws MailboxException,
- AuthorizationException, ProtocolException {
ImapMailbox currentMailbox = ImapSessionUtils
.getMailbox(session);
try {
@@ -107,9 +89,7 @@
} catch (MailboxManagerException e) {
throw new MailboxException(e);
}
- final CommandCompleteResponse result = new CommandCompleteResponse(
- command, tag);
- ImapSessionUtils.addUnsolicitedResponses(result, session, useUids);
- return result;
+ unsolicitedResponses(session, responder, useUids);
+ okComplete(command, tag, responder);
}
}
Modified: james/server/trunk/imap-mailbox-processor-function/src/main/java/org/apache/james/imapserver/processor/imap4rev1/CreateProcessor.java
URL: http://svn.apache.org/viewvc/james/server/trunk/imap-mailbox-processor-function/src/main/java/org/apache/james/imapserver/processor/imap4rev1/CreateProcessor.java?rev=602730&r1=602729&r2=602730&view=diff
==============================================================================
--- james/server/trunk/imap-mailbox-processor-function/src/main/java/org/apache/james/imapserver/processor/imap4rev1/CreateProcessor.java (original)
+++ james/server/trunk/imap-mailbox-processor-function/src/main/java/org/apache/james/imapserver/processor/imap4rev1/CreateProcessor.java Sun Dec 9 12:23:38 2007
@@ -23,16 +23,12 @@
import org.apache.james.api.imap.ImapMessage;
import org.apache.james.api.imap.ProtocolException;
import org.apache.james.api.imap.message.request.ImapRequest;
-import org.apache.james.api.imap.message.response.ImapResponseMessage;
import org.apache.james.api.imap.message.response.imap4rev1.StatusResponseFactory;
import org.apache.james.api.imap.process.ImapProcessor;
import org.apache.james.api.imap.process.ImapSession;
-import org.apache.james.api.imap.process.ImapProcessor.Responder;
import org.apache.james.imap.message.request.imap4rev1.CreateRequest;
-import org.apache.james.imap.message.response.imap4rev1.legacy.CommandCompleteResponse;
import org.apache.james.imapserver.processor.base.AbstractMailboxAwareProcessor;
import org.apache.james.imapserver.processor.base.AuthorizationException;
-import org.apache.james.imapserver.processor.base.ImapSessionUtils;
import org.apache.james.imapserver.store.MailboxException;
import org.apache.james.mailboxmanager.MailboxManagerException;
import org.apache.james.mailboxmanager.manager.MailboxManager;
@@ -53,23 +49,7 @@
ImapSession session, String tag, ImapCommand command, Responder responder)
throws MailboxException, AuthorizationException, ProtocolException {
final CreateRequest request = (CreateRequest) message;
- final ImapResponseMessage result = doProcess(request, session, tag,
- command);
- responder.respond(result);
- }
-
- private ImapResponseMessage doProcess(CreateRequest request,
- ImapSession session, String tag, ImapCommand command)
- throws MailboxException, AuthorizationException, ProtocolException {
final String mailboxName = request.getMailboxName();
- final ImapResponseMessage result = doProcess(mailboxName, session, tag,
- command);
- return result;
- }
-
- private ImapResponseMessage doProcess(String mailboxName,
- ImapSession session, String tag, ImapCommand command)
- throws MailboxException, AuthorizationException, ProtocolException {
try {
final String fullMailboxName = buildFullName(session, mailboxName);
@@ -78,9 +58,7 @@
} catch (MailboxManagerException e) {
throw new MailboxException(e);
}
- final CommandCompleteResponse result = new CommandCompleteResponse(
- command, tag);
- ImapSessionUtils.addUnsolicitedResponses(result, session, false);
- return result;
+ okComplete(command, tag, responder);
+ unsolicitedResponses(session, responder, false);
}
}
Modified: james/server/trunk/imap-mailbox-processor-function/src/main/java/org/apache/james/imapserver/processor/imap4rev1/DeleteProcessor.java
URL: http://svn.apache.org/viewvc/james/server/trunk/imap-mailbox-processor-function/src/main/java/org/apache/james/imapserver/processor/imap4rev1/DeleteProcessor.java?rev=602730&r1=602729&r2=602730&view=diff
==============================================================================
--- james/server/trunk/imap-mailbox-processor-function/src/main/java/org/apache/james/imapserver/processor/imap4rev1/DeleteProcessor.java (original)
+++ james/server/trunk/imap-mailbox-processor-function/src/main/java/org/apache/james/imapserver/processor/imap4rev1/DeleteProcessor.java Sun Dec 9 12:23:38 2007
@@ -23,13 +23,10 @@
import org.apache.james.api.imap.ImapMessage;
import org.apache.james.api.imap.ProtocolException;
import org.apache.james.api.imap.message.request.ImapRequest;
-import org.apache.james.api.imap.message.response.ImapResponseMessage;
import org.apache.james.api.imap.message.response.imap4rev1.StatusResponseFactory;
import org.apache.james.api.imap.process.ImapProcessor;
import org.apache.james.api.imap.process.ImapSession;
-import org.apache.james.api.imap.process.ImapProcessor.Responder;
import org.apache.james.imap.message.request.imap4rev1.DeleteRequest;
-import org.apache.james.imap.message.response.imap4rev1.legacy.CommandCompleteResponse;
import org.apache.james.imapserver.processor.base.AbstractMailboxAwareProcessor;
import org.apache.james.imapserver.processor.base.AuthorizationException;
import org.apache.james.imapserver.processor.base.ImapSessionUtils;
@@ -53,23 +50,7 @@
ImapSession session, String tag, ImapCommand command, Responder responder)
throws MailboxException, AuthorizationException, ProtocolException {
final DeleteRequest request = (DeleteRequest) message;
- final ImapResponseMessage result = doProcess(request, session, tag,
- command);
- responder.respond(result);
- }
-
- private ImapResponseMessage doProcess(DeleteRequest request,
- ImapSession session, String tag, ImapCommand command)
- throws MailboxException, AuthorizationException, ProtocolException {
- final String authType = request.getMailboxName();
- final ImapResponseMessage result = doProcess(authType, session, tag,
- command);
- return result;
- }
-
- private ImapResponseMessage doProcess(String mailboxName,
- ImapSession session, String tag, ImapCommand command)
- throws MailboxException, AuthorizationException, ProtocolException {
+ final String mailboxName = request.getMailboxName();
try {
final String fullMailboxName = buildFullName(session, mailboxName);
if (session.getSelected() != null) {
@@ -84,9 +65,7 @@
throw new MailboxException(e);
}
- final CommandCompleteResponse result = new CommandCompleteResponse(
- command, tag);
- ImapSessionUtils.addUnsolicitedResponses(result, session, false);
- return result;
+ unsolicitedResponses(session, responder, false);
+ okComplete(command, tag, responder);
}
}
Modified: james/server/trunk/imap-mailbox-processor-function/src/main/java/org/apache/james/imapserver/processor/imap4rev1/ExpungeProcessor.java
URL: http://svn.apache.org/viewvc/james/server/trunk/imap-mailbox-processor-function/src/main/java/org/apache/james/imapserver/processor/imap4rev1/ExpungeProcessor.java?rev=602730&r1=602729&r2=602730&view=diff
==============================================================================
--- james/server/trunk/imap-mailbox-processor-function/src/main/java/org/apache/james/imapserver/processor/imap4rev1/ExpungeProcessor.java (original)
+++ james/server/trunk/imap-mailbox-processor-function/src/main/java/org/apache/james/imapserver/processor/imap4rev1/ExpungeProcessor.java Sun Dec 9 12:23:38 2007
@@ -22,6 +22,7 @@
import org.apache.james.api.imap.ImapCommand;
import org.apache.james.api.imap.ImapMessage;
import org.apache.james.api.imap.ProtocolException;
+import org.apache.james.api.imap.display.HumanReadableTextKey;
import org.apache.james.api.imap.message.request.ImapRequest;
import org.apache.james.api.imap.message.response.ImapResponseMessage;
import org.apache.james.api.imap.message.response.imap4rev1.StatusResponseFactory;
@@ -29,8 +30,6 @@
import org.apache.james.api.imap.process.ImapSession;
import org.apache.james.api.imap.process.ImapProcessor.Responder;
import org.apache.james.imap.message.request.imap4rev1.ExpungeRequest;
-import org.apache.james.imap.message.response.imap4rev1.legacy.CommandCompleteResponse;
-import org.apache.james.imap.message.response.imap4rev1.legacy.CommandFailedResponse;
import org.apache.james.imapserver.processor.base.AbstractImapRequestProcessor;
import org.apache.james.imapserver.processor.base.AuthorizationException;
import org.apache.james.imapserver.processor.base.ImapSessionUtils;
@@ -56,39 +55,18 @@
ImapSession session, String tag, ImapCommand command, Responder responder)
throws MailboxException, AuthorizationException, ProtocolException {
final ExpungeRequest request = (ExpungeRequest) message;
- final ImapResponseMessage result = doProcess(request, session, tag,
- command);
- responder.respond(result);
- }
-
- private ImapResponseMessage doProcess(ExpungeRequest request,
- ImapSession session, String tag, ImapCommand command)
- throws MailboxException, AuthorizationException, ProtocolException {
- final ImapResponseMessage result = doProcess(session, tag, command);
- return result;
- }
-
- private ImapResponseMessage doProcess(ImapSession session, String tag,
- ImapCommand command) throws MailboxException,
- AuthorizationException, ProtocolException {
- ImapResponseMessage result;
ImapMailbox mailbox = ImapSessionUtils.getMailbox(session);
if (!mailbox.isWriteable()) {
- result = new CommandFailedResponse(command,
- "Mailbox selected read only.", tag);
+ no(command, tag, responder, HumanReadableTextKey.MAILBOX_IS_READ_ONLY);
} else {
try {
mailbox.expunge(GeneralMessageSetImpl.all(),
MessageResult.MINIMAL, ImapSessionUtils.getMailboxSession(session));
- CommandCompleteResponse commandCompleteResponse = new CommandCompleteResponse(
- command, tag);
- ImapSessionUtils.addUnsolicitedResponses(
- commandCompleteResponse, session, false);
- result = commandCompleteResponse;
+ unsolicitedResponses(session, responder, false);
+ okComplete(command, tag, responder);
} catch (MailboxManagerException e) {
throw new MailboxException(e);
}
}
- return result;
}
}
Modified: james/server/trunk/imap-mailbox-processor-function/src/main/java/org/apache/james/imapserver/processor/imap4rev1/NoopProcessor.java
URL: http://svn.apache.org/viewvc/james/server/trunk/imap-mailbox-processor-function/src/main/java/org/apache/james/imapserver/processor/imap4rev1/NoopProcessor.java?rev=602730&r1=602729&r2=602730&view=diff
==============================================================================
--- james/server/trunk/imap-mailbox-processor-function/src/main/java/org/apache/james/imapserver/processor/imap4rev1/NoopProcessor.java (original)
+++ james/server/trunk/imap-mailbox-processor-function/src/main/java/org/apache/james/imapserver/processor/imap4rev1/NoopProcessor.java Sun Dec 9 12:23:38 2007
@@ -23,16 +23,12 @@
import org.apache.james.api.imap.ImapMessage;
import org.apache.james.api.imap.ProtocolException;
import org.apache.james.api.imap.message.request.ImapRequest;
-import org.apache.james.api.imap.message.response.ImapResponseMessage;
import org.apache.james.api.imap.message.response.imap4rev1.StatusResponseFactory;
import org.apache.james.api.imap.process.ImapProcessor;
import org.apache.james.api.imap.process.ImapSession;
-import org.apache.james.api.imap.process.ImapProcessor.Responder;
import org.apache.james.imap.message.request.imap4rev1.NoopRequest;
-import org.apache.james.imap.message.response.imap4rev1.legacy.CommandCompleteResponse;
import org.apache.james.imapserver.processor.base.AbstractImapRequestProcessor;
import org.apache.james.imapserver.processor.base.AuthorizationException;
-import org.apache.james.imapserver.processor.base.ImapSessionUtils;
import org.apache.james.imapserver.store.MailboxException;
public class NoopProcessor extends AbstractImapRequestProcessor {
@@ -49,27 +45,10 @@
ImapSession session, String tag, ImapCommand command, Responder responder)
throws MailboxException, AuthorizationException, ProtocolException {
final NoopRequest request = (NoopRequest) message;
- final ImapResponseMessage result = doProcess(request, session, tag,
- command);
- responder.respond(result);
- }
-
- private ImapResponseMessage doProcess(NoopRequest request,
- ImapSession session, String tag, ImapCommand command)
- throws MailboxException, AuthorizationException, ProtocolException {
- final ImapResponseMessage result = doProcess(session, tag, command);
- return result;
- }
-
- private ImapResponseMessage doProcess(ImapSession session, String tag,
- ImapCommand command) throws MailboxException,
- AuthorizationException, ProtocolException {
// TODO: untagged responses?
// TODO: NOOP is used to check for new mail: need to return untagged
// responses
- final CommandCompleteResponse result = new CommandCompleteResponse(
- command, tag);
- ImapSessionUtils.addUnsolicitedResponses(result, session, false);
- return result;
+ unsolicitedResponses(session, responder, false);
+ okComplete(command, tag, responder);
}
}
Modified: james/server/trunk/imap-mailbox-processor-function/src/main/java/org/apache/james/imapserver/processor/imap4rev1/RenameProcessor.java
URL: http://svn.apache.org/viewvc/james/server/trunk/imap-mailbox-processor-function/src/main/java/org/apache/james/imapserver/processor/imap4rev1/RenameProcessor.java?rev=602730&r1=602729&r2=602730&view=diff
==============================================================================
--- james/server/trunk/imap-mailbox-processor-function/src/main/java/org/apache/james/imapserver/processor/imap4rev1/RenameProcessor.java (original)
+++ james/server/trunk/imap-mailbox-processor-function/src/main/java/org/apache/james/imapserver/processor/imap4rev1/RenameProcessor.java Sun Dec 9 12:23:38 2007
@@ -23,16 +23,12 @@
import org.apache.james.api.imap.ImapMessage;
import org.apache.james.api.imap.ProtocolException;
import org.apache.james.api.imap.message.request.ImapRequest;
-import org.apache.james.api.imap.message.response.ImapResponseMessage;
import org.apache.james.api.imap.message.response.imap4rev1.StatusResponseFactory;
import org.apache.james.api.imap.process.ImapProcessor;
import org.apache.james.api.imap.process.ImapSession;
-import org.apache.james.api.imap.process.ImapProcessor.Responder;
import org.apache.james.imap.message.request.imap4rev1.RenameRequest;
-import org.apache.james.imap.message.response.imap4rev1.legacy.CommandCompleteResponse;
import org.apache.james.imapserver.processor.base.AbstractMailboxAwareProcessor;
import org.apache.james.imapserver.processor.base.AuthorizationException;
-import org.apache.james.imapserver.processor.base.ImapSessionUtils;
import org.apache.james.imapserver.store.MailboxException;
import org.apache.james.mailboxmanager.MailboxManagerException;
import org.apache.james.mailboxmanager.manager.MailboxManager;
@@ -53,25 +49,8 @@
ImapSession session, String tag, ImapCommand command, Responder responder)
throws MailboxException, AuthorizationException, ProtocolException {
final RenameRequest request = (RenameRequest) message;
- final ImapResponseMessage result = doProcess(request, session, tag,
- command);
- responder.respond(result);
- }
-
- private ImapResponseMessage doProcess(RenameRequest request,
- ImapSession session, String tag, ImapCommand command)
- throws MailboxException, AuthorizationException, ProtocolException {
final String existingName = request.getExistingName();
final String newName = request.getNewName();
- final ImapResponseMessage result = doProcess(existingName, newName,
- session, tag, command);
- return result;
- }
-
- private ImapResponseMessage doProcess(final String existingName,
- final String newName, ImapSession session, String tag,
- ImapCommand command) throws MailboxException,
- AuthorizationException, ProtocolException {
try {
final String fullExistingName = buildFullName(session, existingName);
final String fullNewName = buildFullName(session, newName);
@@ -81,9 +60,7 @@
throw new MailboxException(e);
}
- final CommandCompleteResponse result = new CommandCompleteResponse(
- command, tag);
- ImapSessionUtils.addUnsolicitedResponses(result, session, false);
- return result;
+ okComplete(command, tag, responder);
+ unsolicitedResponses(session, responder, false);
}
}
Modified: james/server/trunk/imap-mailbox-processor-function/src/main/java/org/apache/james/imapserver/processor/imap4rev1/SubscribeProcessor.java
URL: http://svn.apache.org/viewvc/james/server/trunk/imap-mailbox-processor-function/src/main/java/org/apache/james/imapserver/processor/imap4rev1/SubscribeProcessor.java?rev=602730&r1=602729&r2=602730&view=diff
==============================================================================
--- james/server/trunk/imap-mailbox-processor-function/src/main/java/org/apache/james/imapserver/processor/imap4rev1/SubscribeProcessor.java (original)
+++ james/server/trunk/imap-mailbox-processor-function/src/main/java/org/apache/james/imapserver/processor/imap4rev1/SubscribeProcessor.java Sun Dec 9 12:23:38 2007
@@ -23,16 +23,12 @@
import org.apache.james.api.imap.ImapMessage;
import org.apache.james.api.imap.ProtocolException;
import org.apache.james.api.imap.message.request.ImapRequest;
-import org.apache.james.api.imap.message.response.ImapResponseMessage;
import org.apache.james.api.imap.message.response.imap4rev1.StatusResponseFactory;
import org.apache.james.api.imap.process.ImapProcessor;
import org.apache.james.api.imap.process.ImapSession;
-import org.apache.james.api.imap.process.ImapProcessor.Responder;
import org.apache.james.imap.message.request.imap4rev1.SubscribeRequest;
-import org.apache.james.imap.message.response.imap4rev1.legacy.CommandCompleteResponse;
import org.apache.james.imapserver.processor.base.AbstractMailboxAwareProcessor;
import org.apache.james.imapserver.processor.base.AuthorizationException;
-import org.apache.james.imapserver.processor.base.ImapSessionUtils;
import org.apache.james.imapserver.store.MailboxException;
import org.apache.james.mailboxmanager.MailboxManagerException;
import org.apache.james.mailboxmanager.manager.MailboxManager;
@@ -53,23 +49,7 @@
ImapSession session, String tag, ImapCommand command, Responder responder)
throws MailboxException, AuthorizationException, ProtocolException {
final SubscribeRequest request = (SubscribeRequest) message;
- final ImapResponseMessage result = doProcess(request, session, tag,
- command);
- responder.respond(result);
- }
-
- private ImapResponseMessage doProcess(SubscribeRequest request,
- ImapSession session, String tag, ImapCommand command)
- throws MailboxException, AuthorizationException, ProtocolException {
final String mailboxName = request.getMailboxName();
- final ImapResponseMessage result = doProcess(mailboxName, session, tag,
- command);
- return result;
- }
-
- private ImapResponseMessage doProcess(final String mailboxName,
- ImapSession session, String tag, ImapCommand command)
- throws MailboxException, AuthorizationException, ProtocolException {
try {
final String fullMailboxName = buildFullName(session, mailboxName);
final MailboxManager mailboxManager = getMailboxManager(session);
@@ -77,9 +57,7 @@
} catch (MailboxManagerException e) {
throw new MailboxException(e);
}
- final CommandCompleteResponse result = new CommandCompleteResponse(
- command, tag);
- ImapSessionUtils.addUnsolicitedResponses(result, session, false);
- return result;
+ okComplete(command, tag, responder);
+ unsolicitedResponses(session, responder, false);
}
}
Modified: james/server/trunk/imap-mailbox-processor-function/src/main/java/org/apache/james/imapserver/processor/imap4rev1/UnsubscribeProcessor.java
URL: http://svn.apache.org/viewvc/james/server/trunk/imap-mailbox-processor-function/src/main/java/org/apache/james/imapserver/processor/imap4rev1/UnsubscribeProcessor.java?rev=602730&r1=602729&r2=602730&view=diff
==============================================================================
--- james/server/trunk/imap-mailbox-processor-function/src/main/java/org/apache/james/imapserver/processor/imap4rev1/UnsubscribeProcessor.java (original)
+++ james/server/trunk/imap-mailbox-processor-function/src/main/java/org/apache/james/imapserver/processor/imap4rev1/UnsubscribeProcessor.java Sun Dec 9 12:23:38 2007
@@ -23,16 +23,12 @@
import org.apache.james.api.imap.ImapMessage;
import org.apache.james.api.imap.ProtocolException;
import org.apache.james.api.imap.message.request.ImapRequest;
-import org.apache.james.api.imap.message.response.ImapResponseMessage;
import org.apache.james.api.imap.message.response.imap4rev1.StatusResponseFactory;
import org.apache.james.api.imap.process.ImapProcessor;
import org.apache.james.api.imap.process.ImapSession;
-import org.apache.james.api.imap.process.ImapProcessor.Responder;
import org.apache.james.imap.message.request.imap4rev1.UnsubscribeRequest;
-import org.apache.james.imap.message.response.imap4rev1.legacy.CommandCompleteResponse;
import org.apache.james.imapserver.processor.base.AbstractMailboxAwareProcessor;
import org.apache.james.imapserver.processor.base.AuthorizationException;
-import org.apache.james.imapserver.processor.base.ImapSessionUtils;
import org.apache.james.imapserver.store.MailboxException;
import org.apache.james.mailboxmanager.MailboxManagerException;
import org.apache.james.mailboxmanager.manager.MailboxManager;
@@ -53,23 +49,7 @@
ImapSession session, String tag, ImapCommand command, Responder responder)
throws MailboxException, AuthorizationException, ProtocolException {
final UnsubscribeRequest request = (UnsubscribeRequest) message;
- final ImapResponseMessage result = doProcess(request, session, tag,
- command);
- responder.respond(result);
- }
-
- private ImapResponseMessage doProcess(UnsubscribeRequest request,
- ImapSession session, String tag, ImapCommand command)
- throws MailboxException, AuthorizationException, ProtocolException {
- final String authType = request.getMailboxName();
- final ImapResponseMessage result = doProcess(authType, session, tag,
- command);
- return result;
- }
-
- private ImapResponseMessage doProcess(final String mailboxName,
- ImapSession session, String tag, ImapCommand command)
- throws MailboxException, AuthorizationException, ProtocolException {
+ final String mailboxName = request.getMailboxName();
try {
final String fullMailboxName = buildFullName(session, mailboxName);
final MailboxManager mailboxManager = getMailboxManager(session);
@@ -77,9 +57,7 @@
} catch (MailboxManagerException e) {
throw new MailboxException(e);
}
- final CommandCompleteResponse result = new CommandCompleteResponse(
- command, tag);
- ImapSessionUtils.addUnsolicitedResponses(result, session, false);
- return result;
+ okComplete(command, tag, responder);
+ unsolicitedResponses(session, responder, false);
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org