This is an automated email from the ASF dual-hosted git repository. btellier pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/james-project.git
commit 8f14db3604f56d623aca28cdbc4ab4d8b3e96ebd Author: Benoit Tellier <btell...@linagora.com> AuthorDate: Tue Nov 12 17:27:26 2019 +0700 [Refactoring] processMessage rename --- .../org/apache/james/imap/processor/AbstractMailboxProcessor.java | 4 ++-- .../apache/james/imap/processor/AbstractMessageRangeProcessor.java | 2 +- .../org/apache/james/imap/processor/AbstractSelectionProcessor.java | 2 +- .../apache/james/imap/processor/AbstractSubscriptionProcessor.java | 2 +- .../main/java/org/apache/james/imap/processor/AppendProcessor.java | 2 +- .../java/org/apache/james/imap/processor/AuthenticateProcessor.java | 2 +- .../java/org/apache/james/imap/processor/CapabilityProcessor.java | 2 +- .../src/main/java/org/apache/james/imap/processor/CheckProcessor.java | 2 +- .../src/main/java/org/apache/james/imap/processor/CloseProcessor.java | 2 +- .../main/java/org/apache/james/imap/processor/CreateProcessor.java | 2 +- .../main/java/org/apache/james/imap/processor/DeleteACLProcessor.java | 2 +- .../main/java/org/apache/james/imap/processor/DeleteProcessor.java | 2 +- .../main/java/org/apache/james/imap/processor/EnableProcessor.java | 2 +- .../main/java/org/apache/james/imap/processor/ExpungeProcessor.java | 2 +- .../main/java/org/apache/james/imap/processor/GetACLProcessor.java | 2 +- .../java/org/apache/james/imap/processor/GetAnnotationProcessor.java | 2 +- .../main/java/org/apache/james/imap/processor/GetQuotaProcessor.java | 2 +- .../java/org/apache/james/imap/processor/GetQuotaRootProcessor.java | 2 +- .../src/main/java/org/apache/james/imap/processor/IdleProcessor.java | 2 +- .../src/main/java/org/apache/james/imap/processor/ListProcessor.java | 2 +- .../java/org/apache/james/imap/processor/ListRightsProcessor.java | 2 +- .../src/main/java/org/apache/james/imap/processor/LoginProcessor.java | 2 +- .../main/java/org/apache/james/imap/processor/LogoutProcessor.java | 2 +- .../main/java/org/apache/james/imap/processor/MyRightsProcessor.java | 2 +- .../main/java/org/apache/james/imap/processor/NamespaceProcessor.java | 2 +- .../src/main/java/org/apache/james/imap/processor/NoopProcessor.java | 2 +- .../main/java/org/apache/james/imap/processor/RenameProcessor.java | 2 +- .../main/java/org/apache/james/imap/processor/SearchProcessor.java | 2 +- .../main/java/org/apache/james/imap/processor/SetACLProcessor.java | 2 +- .../java/org/apache/james/imap/processor/SetAnnotationProcessor.java | 2 +- .../main/java/org/apache/james/imap/processor/SetQuotaProcessor.java | 2 +- .../main/java/org/apache/james/imap/processor/StatusProcessor.java | 2 +- .../src/main/java/org/apache/james/imap/processor/StoreProcessor.java | 2 +- .../main/java/org/apache/james/imap/processor/UnselectProcessor.java | 2 +- .../java/org/apache/james/imap/processor/fetch/FetchProcessor.java | 2 +- .../java/org/apache/james/imap/processor/SearchProcessorTest.java | 2 +- 36 files changed, 37 insertions(+), 37 deletions(-) diff --git a/protocols/imap/src/main/java/org/apache/james/imap/processor/AbstractMailboxProcessor.java b/protocols/imap/src/main/java/org/apache/james/imap/processor/AbstractMailboxProcessor.java index e212b26..99d9382 100644 --- a/protocols/imap/src/main/java/org/apache/james/imap/processor/AbstractMailboxProcessor.java +++ b/protocols/imap/src/main/java/org/apache/james/imap/processor/AbstractMailboxProcessor.java @@ -95,7 +95,7 @@ public abstract class AbstractMailboxProcessor<M extends ImapRequest> extends Ab } else { getMailboxManager().startProcessingRequest(ImapSessionUtils.getMailboxSession(session)); - processMessage(acceptableMessage, session, responder); + processRequest(acceptableMessage, session, responder); getMailboxManager().endProcessingRequest(ImapSessionUtils.getMailboxSession(session)); } @@ -355,7 +355,7 @@ public abstract class AbstractMailboxProcessor<M extends ImapRequest> extends Ab responder.respond(response); } - protected abstract void processMessage(M message, ImapSession session, Responder responder); + protected abstract void processRequest(M message, ImapSession session, Responder responder); /** * Joins the elements of a mailboxPath together and returns them as a string diff --git a/protocols/imap/src/main/java/org/apache/james/imap/processor/AbstractMessageRangeProcessor.java b/protocols/imap/src/main/java/org/apache/james/imap/processor/AbstractMessageRangeProcessor.java index 2a61822..cc56604 100644 --- a/protocols/imap/src/main/java/org/apache/james/imap/processor/AbstractMessageRangeProcessor.java +++ b/protocols/imap/src/main/java/org/apache/james/imap/processor/AbstractMessageRangeProcessor.java @@ -60,7 +60,7 @@ public abstract class AbstractMessageRangeProcessor<M extends AbstractMessageRan protected abstract String getOperationName(); @Override - protected void processMessage(M request, ImapSession session, Responder responder) { + protected void processRequest(M request, ImapSession session, Responder responder) { final MailboxPath targetMailbox = PathConverter.forSession(session).buildFullPath(request.getMailboxName()); final IdRange[] idSet = request.getIdSet(); final boolean useUids = request.isUseUids(); diff --git a/protocols/imap/src/main/java/org/apache/james/imap/processor/AbstractSelectionProcessor.java b/protocols/imap/src/main/java/org/apache/james/imap/processor/AbstractSelectionProcessor.java index 8d20313..08923e5 100644 --- a/protocols/imap/src/main/java/org/apache/james/imap/processor/AbstractSelectionProcessor.java +++ b/protocols/imap/src/main/java/org/apache/james/imap/processor/AbstractSelectionProcessor.java @@ -77,7 +77,7 @@ abstract class AbstractSelectionProcessor<M extends AbstractMailboxSelectionRequ } @Override - protected void processMessage(M request, ImapSession session, Responder responder) { + protected void processRequest(M request, ImapSession session, Responder responder) { final String mailboxName = request.getMailboxName(); try { final MailboxPath fullMailboxPath = PathConverter.forSession(session).buildFullPath(mailboxName); diff --git a/protocols/imap/src/main/java/org/apache/james/imap/processor/AbstractSubscriptionProcessor.java b/protocols/imap/src/main/java/org/apache/james/imap/processor/AbstractSubscriptionProcessor.java index 929a5c3..6bcac42 100644 --- a/protocols/imap/src/main/java/org/apache/james/imap/processor/AbstractSubscriptionProcessor.java +++ b/protocols/imap/src/main/java/org/apache/james/imap/processor/AbstractSubscriptionProcessor.java @@ -52,7 +52,7 @@ public abstract class AbstractSubscriptionProcessor<M extends ImapRequest> exten } @Override - protected final void processMessage(M message, ImapSession session, Responder responder) { + protected final void processRequest(M message, ImapSession session, Responder responder) { // take care of calling the start/end processing MailboxSession mSession = ImapSessionUtils.getMailboxSession(session); diff --git a/protocols/imap/src/main/java/org/apache/james/imap/processor/AppendProcessor.java b/protocols/imap/src/main/java/org/apache/james/imap/processor/AppendProcessor.java index 0a8282e..6cd15dc 100644 --- a/protocols/imap/src/main/java/org/apache/james/imap/processor/AppendProcessor.java +++ b/protocols/imap/src/main/java/org/apache/james/imap/processor/AppendProcessor.java @@ -62,7 +62,7 @@ public class AppendProcessor extends AbstractMailboxProcessor<AppendRequest> { } @Override - protected void processMessage(AppendRequest request, ImapSession session, Responder responder) { + protected void processRequest(AppendRequest request, ImapSession session, Responder responder) { final String mailboxName = request.getMailboxName(); final InputStream messageIn = request.getMessage(); final Date datetime = request.getDatetime(); diff --git a/protocols/imap/src/main/java/org/apache/james/imap/processor/AuthenticateProcessor.java b/protocols/imap/src/main/java/org/apache/james/imap/processor/AuthenticateProcessor.java index 33b82e3..43f65d5 100644 --- a/protocols/imap/src/main/java/org/apache/james/imap/processor/AuthenticateProcessor.java +++ b/protocols/imap/src/main/java/org/apache/james/imap/processor/AuthenticateProcessor.java @@ -55,7 +55,7 @@ public class AuthenticateProcessor extends AbstractAuthProcessor<AuthenticateReq } @Override - protected void processMessage(AuthenticateRequest request, ImapSession session, final Responder responder) { + protected void processRequest(AuthenticateRequest request, ImapSession session, final Responder responder) { final String authType = request.getAuthType(); if (authType.equalsIgnoreCase(PLAIN)) { // See if AUTH=PLAIN is allowed. See IMAP-304 diff --git a/protocols/imap/src/main/java/org/apache/james/imap/processor/CapabilityProcessor.java b/protocols/imap/src/main/java/org/apache/james/imap/processor/CapabilityProcessor.java index aed50c8..925f40f 100644 --- a/protocols/imap/src/main/java/org/apache/james/imap/processor/CapabilityProcessor.java +++ b/protocols/imap/src/main/java/org/apache/james/imap/processor/CapabilityProcessor.java @@ -78,7 +78,7 @@ public class CapabilityProcessor extends AbstractMailboxProcessor<CapabilityRequ } @Override - protected void processMessage(CapabilityRequest request, ImapSession session, Responder responder) { + protected void processRequest(CapabilityRequest request, ImapSession session, Responder responder) { final CapabilityResponse result = new CapabilityResponse(getSupportedCapabilities(session)); responder.respond(result); unsolicitedResponses(session, responder, false); diff --git a/protocols/imap/src/main/java/org/apache/james/imap/processor/CheckProcessor.java b/protocols/imap/src/main/java/org/apache/james/imap/processor/CheckProcessor.java index ccb4de8..feeca69 100644 --- a/protocols/imap/src/main/java/org/apache/james/imap/processor/CheckProcessor.java +++ b/protocols/imap/src/main/java/org/apache/james/imap/processor/CheckProcessor.java @@ -37,7 +37,7 @@ public class CheckProcessor extends AbstractMailboxProcessor<CheckRequest> { } @Override - protected void processMessage(CheckRequest message, ImapSession session, Responder responder) { + protected void processRequest(CheckRequest message, ImapSession session, Responder responder) { unsolicitedResponses(session, responder, false); okComplete(message, responder); } diff --git a/protocols/imap/src/main/java/org/apache/james/imap/processor/CloseProcessor.java b/protocols/imap/src/main/java/org/apache/james/imap/processor/CloseProcessor.java index 2d06c12..c870ce8 100644 --- a/protocols/imap/src/main/java/org/apache/james/imap/processor/CloseProcessor.java +++ b/protocols/imap/src/main/java/org/apache/james/imap/processor/CloseProcessor.java @@ -47,7 +47,7 @@ public class CloseProcessor extends AbstractMailboxProcessor<CloseRequest> { } @Override - protected void processMessage(CloseRequest message, ImapSession session, Responder responder) { + protected void processRequest(CloseRequest message, ImapSession session, Responder responder) { try { MessageManager mailbox = getSelectedMailbox(session); final MailboxSession mailboxSession = ImapSessionUtils.getMailboxSession(session); diff --git a/protocols/imap/src/main/java/org/apache/james/imap/processor/CreateProcessor.java b/protocols/imap/src/main/java/org/apache/james/imap/processor/CreateProcessor.java index 09cd9c1..c2ddf7f 100644 --- a/protocols/imap/src/main/java/org/apache/james/imap/processor/CreateProcessor.java +++ b/protocols/imap/src/main/java/org/apache/james/imap/processor/CreateProcessor.java @@ -47,7 +47,7 @@ public class CreateProcessor extends AbstractMailboxProcessor<CreateRequest> { } @Override - protected void processMessage(CreateRequest request, ImapSession session, Responder responder) { + protected void processRequest(CreateRequest request, ImapSession session, Responder responder) { final MailboxPath mailboxPath = PathConverter.forSession(session).buildFullPath(request.getMailboxName()); try { final MailboxManager mailboxManager = getMailboxManager(); diff --git a/protocols/imap/src/main/java/org/apache/james/imap/processor/DeleteACLProcessor.java b/protocols/imap/src/main/java/org/apache/james/imap/processor/DeleteACLProcessor.java index 26a3a4a..93b6fc5 100644 --- a/protocols/imap/src/main/java/org/apache/james/imap/processor/DeleteACLProcessor.java +++ b/protocols/imap/src/main/java/org/apache/james/imap/processor/DeleteACLProcessor.java @@ -59,7 +59,7 @@ public class DeleteACLProcessor extends AbstractMailboxProcessor<DeleteACLReques } @Override - protected void processMessage(DeleteACLRequest message, ImapSession session, Responder responder) { + protected void processRequest(DeleteACLRequest message, ImapSession session, Responder responder) { final MailboxManager mailboxManager = getMailboxManager(); final MailboxSession mailboxSession = ImapSessionUtils.getMailboxSession(session); diff --git a/protocols/imap/src/main/java/org/apache/james/imap/processor/DeleteProcessor.java b/protocols/imap/src/main/java/org/apache/james/imap/processor/DeleteProcessor.java index ebcb4a9..55f18ff 100644 --- a/protocols/imap/src/main/java/org/apache/james/imap/processor/DeleteProcessor.java +++ b/protocols/imap/src/main/java/org/apache/james/imap/processor/DeleteProcessor.java @@ -49,7 +49,7 @@ public class DeleteProcessor extends AbstractMailboxProcessor<DeleteRequest> { } @Override - protected void processMessage(DeleteRequest request, ImapSession session, Responder responder) { + protected void processRequest(DeleteRequest request, ImapSession session, Responder responder) { final MailboxPath mailboxPath = PathConverter.forSession(session).buildFullPath(request.getMailboxName()); try { final SelectedMailbox selected = session.getSelected(); diff --git a/protocols/imap/src/main/java/org/apache/james/imap/processor/EnableProcessor.java b/protocols/imap/src/main/java/org/apache/james/imap/processor/EnableProcessor.java index 01920f5..92841d0 100644 --- a/protocols/imap/src/main/java/org/apache/james/imap/processor/EnableProcessor.java +++ b/protocols/imap/src/main/java/org/apache/james/imap/processor/EnableProcessor.java @@ -67,7 +67,7 @@ public class EnableProcessor extends AbstractMailboxProcessor<EnableRequest> imp @Override - protected void processMessage(EnableRequest request, ImapSession session, Responder responder) { + protected void processRequest(EnableRequest request, ImapSession session, Responder responder) { try { List<String> caps = request.getCapabilities(); diff --git a/protocols/imap/src/main/java/org/apache/james/imap/processor/ExpungeProcessor.java b/protocols/imap/src/main/java/org/apache/james/imap/processor/ExpungeProcessor.java index e2dedaf..dac509c 100644 --- a/protocols/imap/src/main/java/org/apache/james/imap/processor/ExpungeProcessor.java +++ b/protocols/imap/src/main/java/org/apache/james/imap/processor/ExpungeProcessor.java @@ -60,7 +60,7 @@ public class ExpungeProcessor extends AbstractMailboxProcessor<ExpungeRequest> i } @Override - protected void processMessage(ExpungeRequest request, ImapSession session, Responder responder) { + protected void processRequest(ExpungeRequest request, ImapSession session, Responder responder) { try { final MessageManager mailbox = getSelectedMailbox(session); final MailboxSession mailboxSession = ImapSessionUtils.getMailboxSession(session); diff --git a/protocols/imap/src/main/java/org/apache/james/imap/processor/GetACLProcessor.java b/protocols/imap/src/main/java/org/apache/james/imap/processor/GetACLProcessor.java index a06ef57..980e567 100644 --- a/protocols/imap/src/main/java/org/apache/james/imap/processor/GetACLProcessor.java +++ b/protocols/imap/src/main/java/org/apache/james/imap/processor/GetACLProcessor.java @@ -61,7 +61,7 @@ public class GetACLProcessor extends AbstractMailboxProcessor<GetACLRequest> imp } @Override - protected void processMessage(GetACLRequest message, ImapSession session, Responder responder) { + protected void processRequest(GetACLRequest message, ImapSession session, Responder responder) { final MailboxManager mailboxManager = getMailboxManager(); final MailboxSession mailboxSession = ImapSessionUtils.getMailboxSession(session); diff --git a/protocols/imap/src/main/java/org/apache/james/imap/processor/GetAnnotationProcessor.java b/protocols/imap/src/main/java/org/apache/james/imap/processor/GetAnnotationProcessor.java index 672655e..09fb510 100644 --- a/protocols/imap/src/main/java/org/apache/james/imap/processor/GetAnnotationProcessor.java +++ b/protocols/imap/src/main/java/org/apache/james/imap/processor/GetAnnotationProcessor.java @@ -68,7 +68,7 @@ public class GetAnnotationProcessor extends AbstractMailboxProcessor<GetAnnotati } @Override - protected void processMessage(GetAnnotationRequest message, ImapSession session, Responder responder) { + protected void processRequest(GetAnnotationRequest message, ImapSession session, Responder responder) { try { proceed(message, session, responder); } catch (MailboxNotFoundException e) { diff --git a/protocols/imap/src/main/java/org/apache/james/imap/processor/GetQuotaProcessor.java b/protocols/imap/src/main/java/org/apache/james/imap/processor/GetQuotaProcessor.java index f16cd43..fb74eeb 100644 --- a/protocols/imap/src/main/java/org/apache/james/imap/processor/GetQuotaProcessor.java +++ b/protocols/imap/src/main/java/org/apache/james/imap/processor/GetQuotaProcessor.java @@ -69,7 +69,7 @@ public class GetQuotaProcessor extends AbstractMailboxProcessor<GetQuotaRequest> } @Override - protected void processMessage(GetQuotaRequest message, ImapSession session, Responder responder) { + protected void processRequest(GetQuotaRequest message, ImapSession session, Responder responder) { try { QuotaRoot quotaRoot = quotaRootResolver.fromString(message.getQuotaRoot()); if (hasRight(quotaRoot, session)) { diff --git a/protocols/imap/src/main/java/org/apache/james/imap/processor/GetQuotaRootProcessor.java b/protocols/imap/src/main/java/org/apache/james/imap/processor/GetQuotaRootProcessor.java index 7f1fc41..293174f 100644 --- a/protocols/imap/src/main/java/org/apache/james/imap/processor/GetQuotaRootProcessor.java +++ b/protocols/imap/src/main/java/org/apache/james/imap/processor/GetQuotaRootProcessor.java @@ -70,7 +70,7 @@ public class GetQuotaRootProcessor extends AbstractMailboxProcessor<GetQuotaRoot } @Override - protected void processMessage(GetQuotaRootRequest message, ImapSession session, Responder responder) { + protected void processRequest(GetQuotaRootRequest message, ImapSession session, Responder responder) { final MailboxSession mailboxSession = ImapSessionUtils.getMailboxSession(session); final MailboxManager mailboxManager = getMailboxManager(); diff --git a/protocols/imap/src/main/java/org/apache/james/imap/processor/IdleProcessor.java b/protocols/imap/src/main/java/org/apache/james/imap/processor/IdleProcessor.java index 42903c0..ad19a73 100644 --- a/protocols/imap/src/main/java/org/apache/james/imap/processor/IdleProcessor.java +++ b/protocols/imap/src/main/java/org/apache/james/imap/processor/IdleProcessor.java @@ -84,7 +84,7 @@ public class IdleProcessor extends AbstractMailboxProcessor<IdleRequest> impleme } @Override - protected void processMessage(IdleRequest message, ImapSession session, Responder responder) { + protected void processRequest(IdleRequest message, ImapSession session, Responder responder) { SelectedMailbox sm = session.getSelected(); Registration registration; if (sm != null) { diff --git a/protocols/imap/src/main/java/org/apache/james/imap/processor/ListProcessor.java b/protocols/imap/src/main/java/org/apache/james/imap/processor/ListProcessor.java index a535273..e62f61b 100644 --- a/protocols/imap/src/main/java/org/apache/james/imap/processor/ListProcessor.java +++ b/protocols/imap/src/main/java/org/apache/james/imap/processor/ListProcessor.java @@ -68,7 +68,7 @@ public class ListProcessor extends AbstractMailboxProcessor<ListRequest> { * reference is non-rooted or is an empty string. */ @Override - protected void processMessage(ListRequest request, ImapSession session, Responder responder) { + protected void processRequest(ListRequest request, ImapSession session, Responder responder) { String baseReferenceName = request.getBaseReferenceName(); String mailboxPatternString = request.getMailboxPattern(); MailboxSession mailboxSession = ImapSessionUtils.getMailboxSession(session); diff --git a/protocols/imap/src/main/java/org/apache/james/imap/processor/ListRightsProcessor.java b/protocols/imap/src/main/java/org/apache/james/imap/processor/ListRightsProcessor.java index 9cfc43f..70dfeb8 100644 --- a/protocols/imap/src/main/java/org/apache/james/imap/processor/ListRightsProcessor.java +++ b/protocols/imap/src/main/java/org/apache/james/imap/processor/ListRightsProcessor.java @@ -60,7 +60,7 @@ public class ListRightsProcessor extends AbstractMailboxProcessor<ListRightsRequ } @Override - protected void processMessage(ListRightsRequest message, ImapSession session, Responder responder) { + protected void processRequest(ListRightsRequest message, ImapSession session, Responder responder) { final MailboxManager mailboxManager = getMailboxManager(); final MailboxSession mailboxSession = ImapSessionUtils.getMailboxSession(session); diff --git a/protocols/imap/src/main/java/org/apache/james/imap/processor/LoginProcessor.java b/protocols/imap/src/main/java/org/apache/james/imap/processor/LoginProcessor.java index 87f4b00..f6593b8 100644 --- a/protocols/imap/src/main/java/org/apache/james/imap/processor/LoginProcessor.java +++ b/protocols/imap/src/main/java/org/apache/james/imap/processor/LoginProcessor.java @@ -47,7 +47,7 @@ public class LoginProcessor extends AbstractAuthProcessor<LoginRequest> implemen } @Override - protected void processMessage(LoginRequest request, ImapSession session, Responder responder) { + protected void processRequest(LoginRequest request, ImapSession session, Responder responder) { // check if the login is allowed with LOGIN command. See IMAP-304 if (session.isPlainAuthDisallowed() && session.isTLSActive() == false) { no(request, responder, HumanReadableText.DISABLED_LOGIN); diff --git a/protocols/imap/src/main/java/org/apache/james/imap/processor/LogoutProcessor.java b/protocols/imap/src/main/java/org/apache/james/imap/processor/LogoutProcessor.java index 17204f9..4710f5e 100644 --- a/protocols/imap/src/main/java/org/apache/james/imap/processor/LogoutProcessor.java +++ b/protocols/imap/src/main/java/org/apache/james/imap/processor/LogoutProcessor.java @@ -44,7 +44,7 @@ public class LogoutProcessor extends AbstractMailboxProcessor<LogoutRequest> { } @Override - protected void processMessage(LogoutRequest request, ImapSession session, Responder responder) { + protected void processRequest(LogoutRequest request, ImapSession session, Responder responder) { final MailboxSession mailboxSession = ImapSessionUtils.getMailboxSession(session); try { getMailboxManager().logout(mailboxSession, false); diff --git a/protocols/imap/src/main/java/org/apache/james/imap/processor/MyRightsProcessor.java b/protocols/imap/src/main/java/org/apache/james/imap/processor/MyRightsProcessor.java index e904805..f7c488a 100644 --- a/protocols/imap/src/main/java/org/apache/james/imap/processor/MyRightsProcessor.java +++ b/protocols/imap/src/main/java/org/apache/james/imap/processor/MyRightsProcessor.java @@ -58,7 +58,7 @@ public class MyRightsProcessor extends AbstractMailboxProcessor<MyRightsRequest> } @Override - protected void processMessage(MyRightsRequest message, ImapSession session, Responder responder) { + protected void processRequest(MyRightsRequest message, ImapSession session, Responder responder) { final MailboxManager mailboxManager = getMailboxManager(); final MailboxSession mailboxSession = ImapSessionUtils.getMailboxSession(session); diff --git a/protocols/imap/src/main/java/org/apache/james/imap/processor/NamespaceProcessor.java b/protocols/imap/src/main/java/org/apache/james/imap/processor/NamespaceProcessor.java index c6ba459..eed4a6b 100644 --- a/protocols/imap/src/main/java/org/apache/james/imap/processor/NamespaceProcessor.java +++ b/protocols/imap/src/main/java/org/apache/james/imap/processor/NamespaceProcessor.java @@ -51,7 +51,7 @@ public class NamespaceProcessor extends AbstractMailboxProcessor<NamespaceReques } @Override - protected void processMessage(NamespaceRequest request, ImapSession session, Responder responder) { + protected void processRequest(NamespaceRequest request, ImapSession session, Responder responder) { final MailboxSession mailboxSession = ImapSessionUtils.getMailboxSession(session); final List<NamespaceResponse.Namespace> personalNamespaces = buildPersonalNamespaces(mailboxSession, session); final List<NamespaceResponse.Namespace> otherUsersNamespaces = buildOtherUsersSpaces(mailboxSession, session); diff --git a/protocols/imap/src/main/java/org/apache/james/imap/processor/NoopProcessor.java b/protocols/imap/src/main/java/org/apache/james/imap/processor/NoopProcessor.java index 9dd7e24..35a59e9 100644 --- a/protocols/imap/src/main/java/org/apache/james/imap/processor/NoopProcessor.java +++ b/protocols/imap/src/main/java/org/apache/james/imap/processor/NoopProcessor.java @@ -37,7 +37,7 @@ public class NoopProcessor extends AbstractMailboxProcessor<NoopRequest> { } @Override - protected void processMessage(NoopRequest message, ImapSession session, Responder responder) { + protected void processRequest(NoopRequest message, ImapSession session, Responder responder) { // So, unsolicated responses are returned to check for new mail unsolicitedResponses(session, responder, false); okComplete(message, responder); diff --git a/protocols/imap/src/main/java/org/apache/james/imap/processor/RenameProcessor.java b/protocols/imap/src/main/java/org/apache/james/imap/processor/RenameProcessor.java index b418fae..0721035 100644 --- a/protocols/imap/src/main/java/org/apache/james/imap/processor/RenameProcessor.java +++ b/protocols/imap/src/main/java/org/apache/james/imap/processor/RenameProcessor.java @@ -50,7 +50,7 @@ public class RenameProcessor extends AbstractMailboxProcessor<RenameRequest> { } @Override - protected void processMessage(RenameRequest request, ImapSession session, Responder responder) { + protected void processRequest(RenameRequest request, ImapSession session, Responder responder) { PathConverter pathConverter = PathConverter.forSession(session); MailboxPath existingPath = pathConverter.buildFullPath(request.getExistingName()); MailboxPath newPath = pathConverter.buildFullPath(request.getNewName()); diff --git a/protocols/imap/src/main/java/org/apache/james/imap/processor/SearchProcessor.java b/protocols/imap/src/main/java/org/apache/james/imap/processor/SearchProcessor.java index c2752a9..2953148 100644 --- a/protocols/imap/src/main/java/org/apache/james/imap/processor/SearchProcessor.java +++ b/protocols/imap/src/main/java/org/apache/james/imap/processor/SearchProcessor.java @@ -81,7 +81,7 @@ public class SearchProcessor extends AbstractMailboxProcessor<SearchRequest> imp } @Override - protected void processMessage(SearchRequest request, ImapSession session, Responder responder) { + protected void processRequest(SearchRequest request, ImapSession session, Responder responder) { final SearchOperation operation = request.getSearchOperation(); final SearchKey searchKey = operation.getSearchKey(); final boolean useUids = request.isUseUids(); diff --git a/protocols/imap/src/main/java/org/apache/james/imap/processor/SetACLProcessor.java b/protocols/imap/src/main/java/org/apache/james/imap/processor/SetACLProcessor.java index 97bb3aa..e34f96b 100644 --- a/protocols/imap/src/main/java/org/apache/james/imap/processor/SetACLProcessor.java +++ b/protocols/imap/src/main/java/org/apache/james/imap/processor/SetACLProcessor.java @@ -60,7 +60,7 @@ public class SetACLProcessor extends AbstractMailboxProcessor<SetACLRequest> imp } @Override - protected void processMessage(SetACLRequest message, ImapSession session, Responder responder) { + protected void processRequest(SetACLRequest message, ImapSession session, Responder responder) { final MailboxManager mailboxManager = getMailboxManager(); final MailboxSession mailboxSession = ImapSessionUtils.getMailboxSession(session); diff --git a/protocols/imap/src/main/java/org/apache/james/imap/processor/SetAnnotationProcessor.java b/protocols/imap/src/main/java/org/apache/james/imap/processor/SetAnnotationProcessor.java index ca9e773..e812b71 100644 --- a/protocols/imap/src/main/java/org/apache/james/imap/processor/SetAnnotationProcessor.java +++ b/protocols/imap/src/main/java/org/apache/james/imap/processor/SetAnnotationProcessor.java @@ -58,7 +58,7 @@ public class SetAnnotationProcessor extends AbstractMailboxProcessor<SetAnnotati } @Override - protected void processMessage(SetAnnotationRequest message, ImapSession session, Responder responder) { + protected void processRequest(SetAnnotationRequest message, ImapSession session, Responder responder) { final MailboxManager mailboxManager = getMailboxManager(); final MailboxSession mailboxSession = ImapSessionUtils.getMailboxSession(session); final String mailboxName = message.getMailboxName(); diff --git a/protocols/imap/src/main/java/org/apache/james/imap/processor/SetQuotaProcessor.java b/protocols/imap/src/main/java/org/apache/james/imap/processor/SetQuotaProcessor.java index 69a56e6..f99acb7 100644 --- a/protocols/imap/src/main/java/org/apache/james/imap/processor/SetQuotaProcessor.java +++ b/protocols/imap/src/main/java/org/apache/james/imap/processor/SetQuotaProcessor.java @@ -50,7 +50,7 @@ public class SetQuotaProcessor extends AbstractMailboxProcessor<SetQuotaRequest> } @Override - protected void processMessage(SetQuotaRequest message, ImapSession session, Responder responder) { + protected void processRequest(SetQuotaRequest message, ImapSession session, Responder responder) { Object[] params = new Object[]{ "Full admin rights", message.getCommand().getName(), diff --git a/protocols/imap/src/main/java/org/apache/james/imap/processor/StatusProcessor.java b/protocols/imap/src/main/java/org/apache/james/imap/processor/StatusProcessor.java index 7620d54..4752e4d 100644 --- a/protocols/imap/src/main/java/org/apache/james/imap/processor/StatusProcessor.java +++ b/protocols/imap/src/main/java/org/apache/james/imap/processor/StatusProcessor.java @@ -50,7 +50,7 @@ public class StatusProcessor extends AbstractMailboxProcessor<StatusRequest> { } @Override - protected void processMessage(StatusRequest request, ImapSession session, Responder responder) { + protected void processRequest(StatusRequest request, ImapSession session, Responder responder) { MailboxPath mailboxPath = PathConverter.forSession(session).buildFullPath(request.getMailboxName()); StatusDataItems statusDataItems = request.getStatusDataItems(); MailboxSession mailboxSession = ImapSessionUtils.getMailboxSession(session); diff --git a/protocols/imap/src/main/java/org/apache/james/imap/processor/StoreProcessor.java b/protocols/imap/src/main/java/org/apache/james/imap/processor/StoreProcessor.java index 8f8b876..05692ea 100644 --- a/protocols/imap/src/main/java/org/apache/james/imap/processor/StoreProcessor.java +++ b/protocols/imap/src/main/java/org/apache/james/imap/processor/StoreProcessor.java @@ -75,7 +75,7 @@ public class StoreProcessor extends AbstractMailboxProcessor<StoreRequest> { } @Override - protected void processMessage(StoreRequest request, ImapSession session, Responder responder) { + protected void processRequest(StoreRequest request, ImapSession session, Responder responder) { final IdRange[] idSet = request.getIdSet(); final boolean useUids = request.isUseUids(); final long unchangedSince = request.getUnchangedSince(); diff --git a/protocols/imap/src/main/java/org/apache/james/imap/processor/UnselectProcessor.java b/protocols/imap/src/main/java/org/apache/james/imap/processor/UnselectProcessor.java index cac3095..ac80507 100644 --- a/protocols/imap/src/main/java/org/apache/james/imap/processor/UnselectProcessor.java +++ b/protocols/imap/src/main/java/org/apache/james/imap/processor/UnselectProcessor.java @@ -47,7 +47,7 @@ public class UnselectProcessor extends AbstractMailboxProcessor<UnselectRequest> } @Override - protected void processMessage(UnselectRequest message, ImapSession session, Responder responder) { + protected void processRequest(UnselectRequest message, ImapSession session, Responder responder) { if (session.getSelected() != null) { session.deselect(); okComplete(message, responder); diff --git a/protocols/imap/src/main/java/org/apache/james/imap/processor/fetch/FetchProcessor.java b/protocols/imap/src/main/java/org/apache/james/imap/processor/fetch/FetchProcessor.java index 2cf8481..f257580 100644 --- a/protocols/imap/src/main/java/org/apache/james/imap/processor/fetch/FetchProcessor.java +++ b/protocols/imap/src/main/java/org/apache/james/imap/processor/fetch/FetchProcessor.java @@ -63,7 +63,7 @@ public class FetchProcessor extends AbstractMailboxProcessor<FetchRequest> { } @Override - protected void processMessage(FetchRequest request, ImapSession session, Responder responder) { + protected void processRequest(FetchRequest request, ImapSession session, Responder responder) { final boolean useUids = request.isUseUids(); final IdRange[] idSet = request.getIdSet(); final FetchData fetch = request.getFetch(); diff --git a/protocols/imap/src/test/java/org/apache/james/imap/processor/SearchProcessorTest.java b/protocols/imap/src/test/java/org/apache/james/imap/processor/SearchProcessorTest.java index 00f6b9c..f4689bf 100644 --- a/protocols/imap/src/test/java/org/apache/james/imap/processor/SearchProcessorTest.java +++ b/protocols/imap/src/test/java/org/apache/james/imap/processor/SearchProcessorTest.java @@ -473,7 +473,7 @@ public class SearchProcessorTest { when(selectedMailbox.hasNewApplicableFlags()).thenReturn(false); SearchRequest message = new SearchRequest(command, new SearchOperation(key, new ArrayList<>()), false, TAG); - processor.processMessage(message, session, responder); + processor.processRequest(message, session, responder); } private void expectOk() { --------------------------------------------------------------------- To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org For additional commands, e-mail: server-dev-h...@james.apache.org