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 bt...@apache.org on 2019/11/15 02:41:21 UTC
[james-project] 12/30: [Refactoring] Rename Message to Request in
IMAP processor
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 e7188da2ebfc011eb4d8bf1390d176ab7158302b
Author: Benoit Tellier <bt...@linagora.com>
AuthorDate: Wed Nov 13 10:49:16 2019 +0700
[Refactoring] Rename Message to Request in IMAP processor
---
.../imap/processor/AbstractAuthProcessor.java | 6 ++--
.../imap/processor/AbstractMailboxProcessor.java | 10 +++----
.../processor/AbstractMessageRangeProcessor.java | 8 +++---
.../imap/processor/AbstractSelectionProcessor.java | 6 ++--
.../processor/AbstractSubscriptionProcessor.java | 14 +++++-----
.../james/imap/processor/AppendProcessor.java | 4 +--
.../imap/processor/AuthenticateProcessor.java | 4 +--
.../james/imap/processor/CapabilityProcessor.java | 2 +-
.../james/imap/processor/CheckProcessor.java | 6 ++--
.../james/imap/processor/CloseProcessor.java | 8 +++---
.../apache/james/imap/processor/CopyProcessor.java | 8 +++---
.../james/imap/processor/CreateProcessor.java | 4 +--
.../james/imap/processor/DeleteACLProcessor.java | 28 +++++++++----------
.../james/imap/processor/DeleteProcessor.java | 4 +--
.../james/imap/processor/EnableProcessor.java | 4 +--
.../james/imap/processor/ExamineProcessor.java | 16 +++++------
.../james/imap/processor/ExpungeProcessor.java | 4 +--
.../james/imap/processor/GetACLProcessor.java | 22 +++++++--------
.../imap/processor/GetAnnotationProcessor.java | 22 +++++++--------
.../james/imap/processor/GetQuotaProcessor.java | 16 +++++------
.../imap/processor/GetQuotaRootProcessor.java | 20 +++++++-------
.../apache/james/imap/processor/IdleProcessor.java | 6 ++--
.../apache/james/imap/processor/LSubProcessor.java | 6 ++--
.../apache/james/imap/processor/ListProcessor.java | 6 ++--
.../james/imap/processor/ListRightsProcessor.java | 26 +++++++++---------
.../james/imap/processor/LoginProcessor.java | 4 +--
.../james/imap/processor/LogoutProcessor.java | 2 +-
.../apache/james/imap/processor/MoveProcessor.java | 8 +++---
.../james/imap/processor/MyRightsProcessor.java | 18 ++++++------
.../james/imap/processor/NamespaceProcessor.java | 2 +-
.../apache/james/imap/processor/NoopProcessor.java | 4 +--
.../james/imap/processor/RenameProcessor.java | 6 ++--
.../james/imap/processor/SearchProcessor.java | 6 ++--
.../james/imap/processor/SetACLProcessor.java | 32 +++++++++++-----------
.../imap/processor/SetAnnotationProcessor.java | 26 +++++++++---------
.../james/imap/processor/SetQuotaProcessor.java | 12 ++++----
.../james/imap/processor/StatusProcessor.java | 6 ++--
.../james/imap/processor/UnselectProcessor.java | 8 +++---
.../james/imap/processor/fetch/FetchProcessor.java | 8 +++---
39 files changed, 201 insertions(+), 201 deletions(-)
diff --git a/protocols/imap/src/main/java/org/apache/james/imap/processor/AbstractAuthProcessor.java b/protocols/imap/src/main/java/org/apache/james/imap/processor/AbstractAuthProcessor.java
index 94ccf20..7d8ba6a 100644
--- a/protocols/imap/src/main/java/org/apache/james/imap/processor/AbstractAuthProcessor.java
+++ b/protocols/imap/src/main/java/org/apache/james/imap/processor/AbstractAuthProcessor.java
@@ -44,7 +44,7 @@ import org.slf4j.LoggerFactory;
import com.google.common.base.Preconditions;
-public abstract class AbstractAuthProcessor<M extends ImapRequest> extends AbstractMailboxProcessor<M> {
+public abstract class AbstractAuthProcessor<R extends ImapRequest> extends AbstractMailboxProcessor<R> {
private static final Logger LOGGER = LoggerFactory.getLogger(AbstractAuthProcessor.class);
private static final String ATTRIBUTE_NUMBER_OF_FAILURES = "org.apache.james.imap.processor.imap4rev1.NUMBER_OF_FAILURES";
@@ -52,8 +52,8 @@ public abstract class AbstractAuthProcessor<M extends ImapRequest> extends Abstr
// TODO: this should be configurable
private static final int MAX_FAILURES = 3;
- public AbstractAuthProcessor(Class<M> acceptableClass, ImapProcessor next, MailboxManager mailboxManager, StatusResponseFactory factory,
- MetricFactory metricFactory) {
+ public AbstractAuthProcessor(Class<R> acceptableClass, ImapProcessor next, MailboxManager mailboxManager, StatusResponseFactory factory,
+ MetricFactory metricFactory) {
super(acceptableClass, next, mailboxManager, factory, metricFactory);
}
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 99d9382..f4d1479 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
@@ -68,7 +68,7 @@ import org.apache.james.metrics.api.TimeMetric;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-public abstract class AbstractMailboxProcessor<M extends ImapRequest> extends AbstractChainedProcessor<M> {
+public abstract class AbstractMailboxProcessor<R extends ImapRequest> extends AbstractChainedProcessor<R> {
private static final Logger LOGGER = LoggerFactory.getLogger(AbstractMailboxProcessor.class);
public static final String IMAP_PREFIX = "IMAP-";
@@ -76,8 +76,8 @@ public abstract class AbstractMailboxProcessor<M extends ImapRequest> extends Ab
private final StatusResponseFactory factory;
private final MetricFactory metricFactory;
- public AbstractMailboxProcessor(Class<M> acceptableClass, ImapProcessor next, MailboxManager mailboxManager, StatusResponseFactory factory,
- MetricFactory metricFactory) {
+ public AbstractMailboxProcessor(Class<R> acceptableClass, ImapProcessor next, MailboxManager mailboxManager, StatusResponseFactory factory,
+ MetricFactory metricFactory) {
super(acceptableClass, next);
this.mailboxManager = mailboxManager;
this.factory = factory;
@@ -85,7 +85,7 @@ public abstract class AbstractMailboxProcessor<M extends ImapRequest> extends Ab
}
@Override
- protected final void doProcess(M acceptableMessage, Responder responder, ImapSession session) {
+ protected final void doProcess(R acceptableMessage, Responder responder, ImapSession session) {
TimeMetric timeMetric = metricFactory.timer(IMAP_PREFIX + acceptableMessage.getCommand().getName());
try {
if (!acceptableMessage.getCommand().validForState(session.getState())) {
@@ -355,7 +355,7 @@ public abstract class AbstractMailboxProcessor<M extends ImapRequest> extends Ab
responder.respond(response);
}
- protected abstract void processRequest(M message, ImapSession session, Responder responder);
+ protected abstract void processRequest(R request, 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 cc56604..f339d38 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
@@ -43,11 +43,11 @@ import org.apache.james.metrics.api.MetricFactory;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-public abstract class AbstractMessageRangeProcessor<M extends AbstractMessageRangeRequest> extends AbstractMailboxProcessor<M> {
+public abstract class AbstractMessageRangeProcessor<R extends AbstractMessageRangeRequest> extends AbstractMailboxProcessor<R> {
private static final Logger LOGGER = LoggerFactory.getLogger(AbstractMessageRangeProcessor.class);
- public AbstractMessageRangeProcessor(Class<M> acceptableClass, ImapProcessor next, MailboxManager mailboxManager, StatusResponseFactory factory,
- MetricFactory metricFactory) {
+ public AbstractMessageRangeProcessor(Class<R> acceptableClass, ImapProcessor next, MailboxManager mailboxManager, StatusResponseFactory factory,
+ MetricFactory metricFactory) {
super(acceptableClass, next, mailboxManager, factory, metricFactory);
}
@@ -60,7 +60,7 @@ public abstract class AbstractMessageRangeProcessor<M extends AbstractMessageRan
protected abstract String getOperationName();
@Override
- protected void processRequest(M request, ImapSession session, Responder responder) {
+ protected void processRequest(R 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 08923e5..2a03651 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
@@ -59,7 +59,7 @@ import org.slf4j.LoggerFactory;
import com.google.common.collect.ImmutableList;
-abstract class AbstractSelectionProcessor<M extends AbstractMailboxSelectionRequest> extends AbstractMailboxProcessor<M> implements PermitEnableCapabilityProcessor {
+abstract class AbstractSelectionProcessor<R extends AbstractMailboxSelectionRequest> extends AbstractMailboxProcessor<R> implements PermitEnableCapabilityProcessor {
private static final Logger LOGGER = LoggerFactory.getLogger(AbstractSelectionProcessor.class);
private static final List<String> CAPS = ImmutableList.of(ImapConstants.SUPPORTS_QRESYNC, ImapConstants.SUPPORTS_CONDSTORE);
@@ -67,7 +67,7 @@ abstract class AbstractSelectionProcessor<M extends AbstractMailboxSelectionRequ
private final boolean openReadOnly;
private final EventBus eventBus;
- public AbstractSelectionProcessor(Class<M> acceptableClass, ImapProcessor next, MailboxManager mailboxManager, StatusResponseFactory statusResponseFactory, boolean openReadOnly,
+ public AbstractSelectionProcessor(Class<R> acceptableClass, ImapProcessor next, MailboxManager mailboxManager, StatusResponseFactory statusResponseFactory, boolean openReadOnly,
MetricFactory metricFactory, EventBus eventBus) {
super(acceptableClass, next, mailboxManager, statusResponseFactory, metricFactory);
this.statusResponseFactory = statusResponseFactory;
@@ -77,7 +77,7 @@ abstract class AbstractSelectionProcessor<M extends AbstractMailboxSelectionRequ
}
@Override
- protected void processRequest(M request, ImapSession session, Responder responder) {
+ protected void processRequest(R 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 6bcac42..ec3c4f2 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
@@ -32,12 +32,12 @@ import org.apache.james.metrics.api.MetricFactory;
* Abstract base class which should be used by implementations which need to
* access the {@link SubscriptionManager}
*/
-public abstract class AbstractSubscriptionProcessor<M extends ImapRequest> extends AbstractMailboxProcessor<M> {
+public abstract class AbstractSubscriptionProcessor<R extends ImapRequest> extends AbstractMailboxProcessor<R> {
private final SubscriptionManager subscriptionManager;
- public AbstractSubscriptionProcessor(Class<M> acceptableClass, ImapProcessor next, MailboxManager mailboxManager, SubscriptionManager subscriptionManager, StatusResponseFactory factory,
- MetricFactory metricFactory) {
+ public AbstractSubscriptionProcessor(Class<R> acceptableClass, ImapProcessor next, MailboxManager mailboxManager, SubscriptionManager subscriptionManager, StatusResponseFactory factory,
+ MetricFactory metricFactory) {
super(acceptableClass, next, mailboxManager, factory, metricFactory);
this.subscriptionManager = subscriptionManager;
}
@@ -52,22 +52,22 @@ public abstract class AbstractSubscriptionProcessor<M extends ImapRequest> exten
}
@Override
- protected final void processRequest(M message, ImapSession session, Responder responder) {
+ protected final void processRequest(R request, ImapSession session, Responder responder) {
// take care of calling the start/end processing
MailboxSession mSession = ImapSessionUtils.getMailboxSession(session);
getSubscriptionManager().startProcessingRequest(mSession);
- doProcessRequest(message, session, responder);
+ doProcessRequest(request, session, responder);
getSubscriptionManager().endProcessingRequest(mSession);
}
/**
* Process the request
*
- * @param message
+ * @param request
* @param session
* @param responder
*/
- protected abstract void doProcessRequest(M message, ImapSession session, Responder responder);
+ protected abstract void doProcessRequest(R request, ImapSession session, Responder responder);
}
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 6cd15dc..983d855 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
@@ -153,10 +153,10 @@ public class AppendProcessor extends AbstractMailboxProcessor<AppendRequest> {
}
@Override
- protected Closeable addContextToMDC(AppendRequest message) {
+ protected Closeable addContextToMDC(AppendRequest request) {
return MDCBuilder.create()
.addContext(MDCBuilder.ACTION, "APPEND")
- .addContext("mailbox", message.getMailboxName())
+ .addContext("mailbox", request.getMailboxName())
.build();
}
}
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 43f65d5..b44dd1a 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
@@ -146,10 +146,10 @@ public class AuthenticateProcessor extends AbstractAuthProcessor<AuthenticateReq
}
@Override
- protected Closeable addContextToMDC(AuthenticateRequest message) {
+ protected Closeable addContextToMDC(AuthenticateRequest request) {
return MDCBuilder.create()
.addContext(MDCBuilder.ACTION, "AUTHENTICATE")
- .addContext("authType", message.getAuthType())
+ .addContext("authType", request.getAuthType())
.build();
}
}
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 925f40f..d82f129 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
@@ -116,7 +116,7 @@ public class CapabilityProcessor extends AbstractMailboxProcessor<CapabilityRequ
}
@Override
- protected Closeable addContextToMDC(CapabilityRequest message) {
+ protected Closeable addContextToMDC(CapabilityRequest request) {
return MDCBuilder.create()
.addContext(MDCBuilder.ACTION, "CAPABILITY")
.build();
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 feeca69..57863f6 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,13 +37,13 @@ public class CheckProcessor extends AbstractMailboxProcessor<CheckRequest> {
}
@Override
- protected void processRequest(CheckRequest message, ImapSession session, Responder responder) {
+ protected void processRequest(CheckRequest request, ImapSession session, Responder responder) {
unsolicitedResponses(session, responder, false);
- okComplete(message, responder);
+ okComplete(request, responder);
}
@Override
- protected Closeable addContextToMDC(CheckRequest message) {
+ protected Closeable addContextToMDC(CheckRequest request) {
return MDCBuilder.create()
.addContext(MDCBuilder.ACTION, "CHECK")
.build();
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 c870ce8..cc0f6b6 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 processRequest(CloseRequest message, ImapSession session, Responder responder) {
+ protected void processRequest(CloseRequest request, ImapSession session, Responder responder) {
try {
MessageManager mailbox = getSelectedMailbox(session);
final MailboxSession mailboxSession = ImapSessionUtils.getMailboxSession(session);
@@ -58,18 +58,18 @@ public class CloseProcessor extends AbstractMailboxProcessor<CloseRequest> {
// Don't send HIGHESTMODSEQ when close. Like correct in the ERRATA of RFC5162
//
// See http://www.rfc-editor.org/errata_search.php?rfc=5162
- okComplete(message, responder);
+ okComplete(request, responder);
}
} catch (MailboxException e) {
LOGGER.error("Close failed for mailbox {}", session.getSelected().getMailboxId(), e);
- no(message, responder, HumanReadableText.GENERIC_FAILURE_DURING_PROCESSING);
+ no(request, responder, HumanReadableText.GENERIC_FAILURE_DURING_PROCESSING);
}
}
@Override
- protected Closeable addContextToMDC(CloseRequest message) {
+ protected Closeable addContextToMDC(CloseRequest request) {
return MDCBuilder.create()
.addContext(MDCBuilder.ACTION, "CLOSE")
.build();
diff --git a/protocols/imap/src/main/java/org/apache/james/imap/processor/CopyProcessor.java b/protocols/imap/src/main/java/org/apache/james/imap/processor/CopyProcessor.java
index be6f59f..42b65c7 100644
--- a/protocols/imap/src/main/java/org/apache/james/imap/processor/CopyProcessor.java
+++ b/protocols/imap/src/main/java/org/apache/james/imap/processor/CopyProcessor.java
@@ -56,12 +56,12 @@ public class CopyProcessor extends AbstractMessageRangeProcessor<CopyRequest> {
}
@Override
- protected Closeable addContextToMDC(CopyRequest message) {
+ protected Closeable addContextToMDC(CopyRequest request) {
return MDCBuilder.create()
.addContext(MDCBuilder.ACTION, "COPY")
- .addContext("targetMailbox", message.getMailboxName())
- .addContext("uidEnabled", message.isUseUids())
- .addContext("idSet", IdRange.toString(message.getIdSet()))
+ .addContext("targetMailbox", request.getMailboxName())
+ .addContext("uidEnabled", request.isUseUids())
+ .addContext("idSet", IdRange.toString(request.getIdSet()))
.build();
}
}
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 c2ddf7f..ecbfc8b 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
@@ -67,10 +67,10 @@ public class CreateProcessor extends AbstractMailboxProcessor<CreateRequest> {
}
@Override
- protected Closeable addContextToMDC(CreateRequest message) {
+ protected Closeable addContextToMDC(CreateRequest request) {
return MDCBuilder.create()
.addContext(MDCBuilder.ACTION, "CREATE")
- .addContext("mailbox", message.getMailboxName())
+ .addContext("mailbox", request.getMailboxName())
.build();
}
}
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 93b6fc5..44a9658 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,12 +59,12 @@ public class DeleteACLProcessor extends AbstractMailboxProcessor<DeleteACLReques
}
@Override
- protected void processRequest(DeleteACLRequest message, ImapSession session, Responder responder) {
+ protected void processRequest(DeleteACLRequest request, ImapSession session, Responder responder) {
final MailboxManager mailboxManager = getMailboxManager();
final MailboxSession mailboxSession = ImapSessionUtils.getMailboxSession(session);
- final String mailboxName = message.getMailboxName();
- final String identifier = message.getIdentifier();
+ final String mailboxName = request.getMailboxName();
+ final String identifier = request.getIdentifier();
try {
MailboxPath mailboxPath = PathConverter.forSession(session).buildFullPath(mailboxName);
@@ -81,16 +81,16 @@ public class DeleteACLProcessor extends AbstractMailboxProcessor<DeleteACLReques
* existence information, much less the mailbox’s ACL.
*/
if (!mailboxManager.hasRight(mailboxPath, MailboxACL.Right.Lookup, mailboxSession)) {
- no(message, responder, HumanReadableText.MAILBOX_NOT_FOUND);
+ no(request, responder, HumanReadableText.MAILBOX_NOT_FOUND);
} else if (!mailboxManager.hasRight(mailboxPath, MailboxACL.Right.Administer, mailboxSession)) {
/* RFC 4314 section 4. */
Object[] params = new Object[] {
MailboxACL.Right.Administer.toString(),
- message.getCommand().getName(),
+ request.getCommand().getName(),
mailboxName
};
HumanReadableText text = new HumanReadableText(HumanReadableText.UNSUFFICIENT_RIGHTS_KEY, HumanReadableText.UNSUFFICIENT_RIGHTS_DEFAULT_VALUE, params);
- no(message, responder, text);
+ no(request, responder, text);
} else {
EntryKey key = EntryKey.deserialize(identifier);
@@ -111,7 +111,7 @@ public class DeleteACLProcessor extends AbstractMailboxProcessor<DeleteACLReques
mailboxSession
);
- okComplete(message, responder);
+ okComplete(request, responder);
// FIXME should we send unsolicited responses here?
// unsolicitedResponses(session, responder, false);
}
@@ -124,12 +124,12 @@ public class DeleteACLProcessor extends AbstractMailboxProcessor<DeleteACLReques
* */
Object[] params = new Object[] {e.getUnsupportedRight()};
HumanReadableText text = new HumanReadableText(HumanReadableText.UNSUPPORTED_RIGHT_KEY, HumanReadableText.UNSUPPORTED_RIGHT_DEFAULT_VALUE, params);
- taggedBad(message, responder, text);
+ taggedBad(request, responder, text);
} catch (MailboxNotFoundException e) {
- no(message, responder, HumanReadableText.MAILBOX_NOT_FOUND);
+ no(request, responder, HumanReadableText.MAILBOX_NOT_FOUND);
} catch (MailboxException e) {
- LOGGER.error("{} failed for mailbox {}", message.getCommand().getName(), mailboxName, e);
- no(message, responder, HumanReadableText.GENERIC_FAILURE_DURING_PROCESSING);
+ LOGGER.error("{} failed for mailbox {}", request.getCommand().getName(), mailboxName, e);
+ no(request, responder, HumanReadableText.GENERIC_FAILURE_DURING_PROCESSING);
}
}
@@ -140,11 +140,11 @@ public class DeleteACLProcessor extends AbstractMailboxProcessor<DeleteACLReques
}
@Override
- protected Closeable addContextToMDC(DeleteACLRequest message) {
+ protected Closeable addContextToMDC(DeleteACLRequest request) {
return MDCBuilder.create()
.addContext(MDCBuilder.ACTION, "DELETE_ACL")
- .addContext("mailbox", message.getMailboxName())
- .addContext("identifier", message.getIdentifier())
+ .addContext("mailbox", request.getMailboxName())
+ .addContext("identifier", request.getIdentifier())
.build();
}
}
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 55f18ff..dc7958b 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
@@ -73,10 +73,10 @@ public class DeleteProcessor extends AbstractMailboxProcessor<DeleteRequest> {
}
@Override
- protected Closeable addContextToMDC(DeleteRequest message) {
+ protected Closeable addContextToMDC(DeleteRequest request) {
return MDCBuilder.create()
.addContext(MDCBuilder.ACTION, "DELETE")
- .addContext("mailbox", message.getMailboxName())
+ .addContext("mailbox", request.getMailboxName())
.build();
}
}
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 92841d0..74b8982 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
@@ -127,10 +127,10 @@ public class EnableProcessor extends AbstractMailboxProcessor<EnableRequest> imp
}
@Override
- protected Closeable addContextToMDC(EnableRequest message) {
+ protected Closeable addContextToMDC(EnableRequest request) {
return MDCBuilder.create()
.addContext(MDCBuilder.ACTION, "ENABLE")
- .addContext("capabilities", ImmutableList.copyOf(message.getCapabilities()))
+ .addContext("capabilities", ImmutableList.copyOf(request.getCapabilities()))
.build();
}
}
diff --git a/protocols/imap/src/main/java/org/apache/james/imap/processor/ExamineProcessor.java b/protocols/imap/src/main/java/org/apache/james/imap/processor/ExamineProcessor.java
index eaed119..5486524 100644
--- a/protocols/imap/src/main/java/org/apache/james/imap/processor/ExamineProcessor.java
+++ b/protocols/imap/src/main/java/org/apache/james/imap/processor/ExamineProcessor.java
@@ -39,16 +39,16 @@ public class ExamineProcessor extends AbstractSelectionProcessor<ExamineRequest>
}
@Override
- protected Closeable addContextToMDC(ExamineRequest message) {
+ protected Closeable addContextToMDC(ExamineRequest request) {
return MDCBuilder.create()
.addContext(MDCBuilder.ACTION, "EXAMINE")
- .addContext("mailbox", message.getMailboxName())
- .addContext("condstore", Boolean.toString(message.getCondstore()))
- .addContext("knownModseq", message.getKnownModSeq())
- .addContext("knownUids", UidRange.toString(message.getKnownUidSet()))
- .addContext("knownIdRange", IdRange.toString(message.getKnownSequenceSet()))
- .addContext("lastKnownUidValidity", message.getLastKnownUidValidity())
- .addContext("uidSet", UidRange.toString(message.getUidSet()))
+ .addContext("mailbox", request.getMailboxName())
+ .addContext("condstore", Boolean.toString(request.getCondstore()))
+ .addContext("knownModseq", request.getKnownModSeq())
+ .addContext("knownUids", UidRange.toString(request.getKnownUidSet()))
+ .addContext("knownIdRange", IdRange.toString(request.getKnownSequenceSet()))
+ .addContext("lastKnownUidValidity", request.getLastKnownUidValidity())
+ .addContext("uidSet", UidRange.toString(request.getUidSet()))
.build();
}
}
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 dac509c..6646faa 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
@@ -127,10 +127,10 @@ public class ExpungeProcessor extends AbstractMailboxProcessor<ExpungeRequest> i
}
@Override
- protected Closeable addContextToMDC(ExpungeRequest message) {
+ protected Closeable addContextToMDC(ExpungeRequest request) {
return MDCBuilder.create()
.addContext(MDCBuilder.ACTION, "EXPUNGE")
- .addContext("uidSet", IdRange.toString(message.getUidSet()))
+ .addContext("uidSet", IdRange.toString(request.getUidSet()))
.build();
}
}
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 980e567..bd7e884 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,11 +61,11 @@ public class GetACLProcessor extends AbstractMailboxProcessor<GetACLRequest> imp
}
@Override
- protected void processRequest(GetACLRequest message, ImapSession session, Responder responder) {
+ protected void processRequest(GetACLRequest request, ImapSession session, Responder responder) {
final MailboxManager mailboxManager = getMailboxManager();
final MailboxSession mailboxSession = ImapSessionUtils.getMailboxSession(session);
- final String mailboxName = message.getMailboxName();
+ final String mailboxName = request.getMailboxName();
try {
MailboxPath mailboxPath = PathConverter.forSession(session).buildFullPath(mailboxName);
@@ -82,29 +82,29 @@ public class GetACLProcessor extends AbstractMailboxProcessor<GetACLRequest> imp
* existence information, much less the mailbox’s ACL.
*/
if (!mailboxManager.hasRight(mailboxPath, MailboxACL.Right.Lookup, mailboxSession)) {
- no(message, responder, HumanReadableText.MAILBOX_NOT_FOUND);
+ no(request, responder, HumanReadableText.MAILBOX_NOT_FOUND);
} else if (!mailboxManager.hasRight(mailboxPath, MailboxACL.Right.Administer, mailboxSession)) {
/* RFC 4314 section 4. */
Object[] params = new Object[] {
MailboxACL.Right.Administer.toString(),
- message.getCommand().getName(),
+ request.getCommand().getName(),
mailboxName
};
HumanReadableText text = new HumanReadableText(HumanReadableText.UNSUFFICIENT_RIGHTS_KEY, HumanReadableText.UNSUFFICIENT_RIGHTS_DEFAULT_VALUE, params);
- no(message, responder, text);
+ no(request, responder, text);
} else {
MetaData metaData = messageManager.getMetaData(false, mailboxSession, FetchGroup.NO_COUNT);
ACLResponse aclResponse = new ACLResponse(mailboxName, metaData.getACL());
responder.respond(aclResponse);
- okComplete(message, responder);
+ okComplete(request, responder);
// FIXME should we send unsolicited responses here?
// unsolicitedResponses(session, responder, false);
}
} catch (MailboxNotFoundException e) {
- no(message, responder, HumanReadableText.MAILBOX_NOT_FOUND);
+ no(request, responder, HumanReadableText.MAILBOX_NOT_FOUND);
} catch (MailboxException e) {
- LOGGER.error("{} failed for mailbox {}", message.getCommand().getName(), mailboxName, e);
- no(message, responder, HumanReadableText.GENERIC_FAILURE_DURING_PROCESSING);
+ LOGGER.error("{} failed for mailbox {}", request.getCommand().getName(), mailboxName, e);
+ no(request, responder, HumanReadableText.GENERIC_FAILURE_DURING_PROCESSING);
}
}
@@ -115,10 +115,10 @@ public class GetACLProcessor extends AbstractMailboxProcessor<GetACLRequest> imp
}
@Override
- protected Closeable addContextToMDC(GetACLRequest message) {
+ protected Closeable addContextToMDC(GetACLRequest request) {
return MDCBuilder.create()
.addContext(MDCBuilder.ACTION, "GET_ACL")
- .addContext("mailbox", message.getMailboxName())
+ .addContext("mailbox", request.getMailboxName())
.build();
}
}
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 09fb510..f8a3abd 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,15 +68,15 @@ public class GetAnnotationProcessor extends AbstractMailboxProcessor<GetAnnotati
}
@Override
- protected void processRequest(GetAnnotationRequest message, ImapSession session, Responder responder) {
+ protected void processRequest(GetAnnotationRequest request, ImapSession session, Responder responder) {
try {
- proceed(message, session, responder);
+ proceed(request, session, responder);
} catch (MailboxNotFoundException e) {
- LOGGER.info("The command: {} is failed because not found mailbox {}", message.getCommand().getName(), message.getMailboxName());
- no(message, responder, HumanReadableText.FAILURE_NO_SUCH_MAILBOX, ResponseCode.tryCreate());
+ LOGGER.info("The command: {} is failed because not found mailbox {}", request.getCommand().getName(), request.getMailboxName());
+ no(request, responder, HumanReadableText.FAILURE_NO_SUCH_MAILBOX, ResponseCode.tryCreate());
} catch (MailboxException e) {
- LOGGER.error("GetAnnotation on mailbox {} failed for user {}", message.getMailboxName(), ImapSessionUtils.getUserName(session), e);
- no(message, responder, HumanReadableText.GENERIC_FAILURE_DURING_PROCESSING);
+ LOGGER.error("GetAnnotation on mailbox {} failed for user {}", request.getMailboxName(), ImapSessionUtils.getUserName(session), e);
+ no(request, responder, HumanReadableText.GENERIC_FAILURE_DURING_PROCESSING);
}
}
@@ -156,13 +156,13 @@ public class GetAnnotationProcessor extends AbstractMailboxProcessor<GetAnnotati
}
@Override
- protected Closeable addContextToMDC(GetAnnotationRequest message) {
+ protected Closeable addContextToMDC(GetAnnotationRequest request) {
return MDCBuilder.create()
.addContext(MDCBuilder.ACTION, "GET_ANNOTATION")
- .addContext("mailbox", message.getMailboxName())
- .addContext("depth", message.getDepth())
- .addContext("maxSize", message.getMaxsize())
- .addContext("keys", message.getKeys())
+ .addContext("mailbox", request.getMailboxName())
+ .addContext("depth", request.getDepth())
+ .addContext("maxSize", request.getMaxsize())
+ .addContext("keys", request.getKeys())
.build();
}
}
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 fb74eeb..6dba743 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,9 +69,9 @@ public class GetQuotaProcessor extends AbstractMailboxProcessor<GetQuotaRequest>
}
@Override
- protected void processRequest(GetQuotaRequest message, ImapSession session, Responder responder) {
+ protected void processRequest(GetQuotaRequest request, ImapSession session, Responder responder) {
try {
- QuotaRoot quotaRoot = quotaRootResolver.fromString(message.getQuotaRoot());
+ QuotaRoot quotaRoot = quotaRootResolver.fromString(request.getQuotaRoot());
if (hasRight(quotaRoot, session)) {
Quota<QuotaCount> messageQuota = quotaManager.getMessageQuota(quotaRoot);
Quota<QuotaSize> storageQuota = quotaManager.getStorageQuota(quotaRoot);
@@ -81,18 +81,18 @@ public class GetQuotaProcessor extends AbstractMailboxProcessor<GetQuotaRequest>
if (storageQuota.getLimit().isLimited()) {
responder.respond(new QuotaResponse(ImapConstants.STORAGE_QUOTA_RESOURCE, quotaRoot.getValue(), storageQuota));
}
- okComplete(message, responder);
+ okComplete(request, responder);
} else {
Object[] params = new Object[]{
MailboxACL.Right.Read.toString(),
- message.getCommand().getName(),
+ request.getCommand().getName(),
"Any mailbox of this user USER"
};
HumanReadableText humanReadableText = new HumanReadableText(HumanReadableText.UNSUFFICIENT_RIGHTS_KEY, HumanReadableText.UNSUFFICIENT_RIGHTS_DEFAULT_VALUE, params);
- no(message, responder, humanReadableText);
+ no(request, responder, humanReadableText);
}
} catch (MailboxException me) {
- taggedBad(message, responder, HumanReadableText.FAILURE_NO_SUCH_MAILBOX);
+ taggedBad(request, responder, HumanReadableText.FAILURE_NO_SUCH_MAILBOX);
}
}
@@ -109,10 +109,10 @@ public class GetQuotaProcessor extends AbstractMailboxProcessor<GetQuotaRequest>
}
@Override
- protected Closeable addContextToMDC(GetQuotaRequest message) {
+ protected Closeable addContextToMDC(GetQuotaRequest request) {
return MDCBuilder.create()
.addContext(MDCBuilder.ACTION, "GET_QUOTA")
- .addContext("quotaRoot", message.getQuotaRoot())
+ .addContext("quotaRoot", request.getQuotaRoot())
.build();
}
}
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 293174f..2674736 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,11 +70,11 @@ public class GetQuotaRootProcessor extends AbstractMailboxProcessor<GetQuotaRoot
}
@Override
- protected void processRequest(GetQuotaRootRequest message, ImapSession session, Responder responder) {
+ protected void processRequest(GetQuotaRootRequest request, ImapSession session, Responder responder) {
final MailboxSession mailboxSession = ImapSessionUtils.getMailboxSession(session);
final MailboxManager mailboxManager = getMailboxManager();
- final MailboxPath mailboxPath = PathConverter.forSession(session).buildFullPath(message.getMailboxName());
+ final MailboxPath mailboxPath = PathConverter.forSession(session).buildFullPath(request.getMailboxName());
// First check mailbox exists
try {
@@ -82,34 +82,34 @@ public class GetQuotaRootProcessor extends AbstractMailboxProcessor<GetQuotaRoot
QuotaRoot quotaRoot = quotaRootResolver.getQuotaRoot(mailboxPath);
Quota<QuotaCount> messageQuota = quotaManager.getMessageQuota(quotaRoot);
Quota<QuotaSize> storageQuota = quotaManager.getStorageQuota(quotaRoot);
- responder.respond(new QuotaRootResponse(message.getMailboxName(), quotaRoot.getValue()));
+ responder.respond(new QuotaRootResponse(request.getMailboxName(), quotaRoot.getValue()));
if (messageQuota.getLimit().isLimited()) {
responder.respond(new QuotaResponse(ImapConstants.MESSAGE_QUOTA_RESOURCE, quotaRoot.getValue(), messageQuota));
}
if (storageQuota.getLimit().isLimited()) {
responder.respond(new QuotaResponse(ImapConstants.STORAGE_QUOTA_RESOURCE, quotaRoot.getValue(), storageQuota));
}
- okComplete(message, responder);
+ okComplete(request, responder);
} else {
Object[] params = new Object[]{
MailboxACL.Right.Read.toString(),
- message.getCommand().getName(),
- message.getMailboxName()
+ request.getCommand().getName(),
+ request.getMailboxName()
};
HumanReadableText humanReadableText = new HumanReadableText(HumanReadableText.UNSUFFICIENT_RIGHTS_KEY, HumanReadableText.UNSUFFICIENT_RIGHTS_DEFAULT_VALUE, params);
- no(message, responder, humanReadableText);
+ no(request, responder, humanReadableText);
}
} catch (MailboxException me) {
- taggedBad(message, responder, HumanReadableText.FAILURE_NO_SUCH_MAILBOX);
+ taggedBad(request, responder, HumanReadableText.FAILURE_NO_SUCH_MAILBOX);
}
}
@Override
- protected Closeable addContextToMDC(GetQuotaRootRequest message) {
+ protected Closeable addContextToMDC(GetQuotaRootRequest request) {
return MDCBuilder.create()
.addContext(MDCBuilder.ACTION, "GET_QUOTA_ROOT")
- .addContext("mailbox", message.getMailboxName())
+ .addContext("mailbox", request.getMailboxName())
.build();
}
}
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 ad19a73..f1dbe51 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 processRequest(IdleRequest message, ImapSession session, Responder responder) {
+ protected void processRequest(IdleRequest request, ImapSession session, Responder responder) {
SelectedMailbox sm = session.getSelected();
Registration registration;
if (sm != null) {
@@ -110,10 +110,10 @@ public class IdleProcessor extends AbstractMailboxProcessor<IdleRequest> impleme
}
session.popLineHandler();
if (!DONE.equals(line.toUpperCase(Locale.US))) {
- StatusResponse response = getStatusResponseFactory().taggedBad(message.getTag(), message.getCommand(), HumanReadableText.INVALID_COMMAND);
+ StatusResponse response = getStatusResponseFactory().taggedBad(request.getTag(), request.getCommand(), HumanReadableText.INVALID_COMMAND);
responder.respond(response);
} else {
- okComplete(message, responder);
+ okComplete(request, responder);
}
idleActive.set(false);
diff --git a/protocols/imap/src/main/java/org/apache/james/imap/processor/LSubProcessor.java b/protocols/imap/src/main/java/org/apache/james/imap/processor/LSubProcessor.java
index 58aa33d..1842c7a 100644
--- a/protocols/imap/src/main/java/org/apache/james/imap/processor/LSubProcessor.java
+++ b/protocols/imap/src/main/java/org/apache/james/imap/processor/LSubProcessor.java
@@ -101,11 +101,11 @@ public class LSubProcessor extends AbstractSubscriptionProcessor<LsubRequest> {
}
@Override
- protected Closeable addContextToMDC(LsubRequest message) {
+ protected Closeable addContextToMDC(LsubRequest request) {
return MDCBuilder.create()
.addContext(MDCBuilder.ACTION, "LSUB")
- .addContext("base", message.getBaseReferenceName())
- .addContext("pattern", message.getMailboxPattern())
+ .addContext("base", request.getBaseReferenceName())
+ .addContext("pattern", request.getMailboxPattern())
.build();
}
}
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 e62f61b..1768917 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
@@ -188,11 +188,11 @@ public class ListProcessor extends AbstractMailboxProcessor<ListRequest> {
}
@Override
- protected Closeable addContextToMDC(ListRequest message) {
+ protected Closeable addContextToMDC(ListRequest request) {
return MDCBuilder.create()
.addContext(MDCBuilder.ACTION, "LIST")
- .addContext("base", message.getBaseReferenceName())
- .addContext("pattern", message.getMailboxPattern())
+ .addContext("base", request.getBaseReferenceName())
+ .addContext("pattern", request.getMailboxPattern())
.build();
}
}
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 70dfeb8..38b69e8 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,12 +60,12 @@ public class ListRightsProcessor extends AbstractMailboxProcessor<ListRightsRequ
}
@Override
- protected void processRequest(ListRightsRequest message, ImapSession session, Responder responder) {
+ protected void processRequest(ListRightsRequest request, ImapSession session, Responder responder) {
final MailboxManager mailboxManager = getMailboxManager();
final MailboxSession mailboxSession = ImapSessionUtils.getMailboxSession(session);
- final String mailboxName = message.getMailboxName();
- final String identifier = message.getIdentifier();
+ final String mailboxName = request.getMailboxName();
+ final String identifier = request.getIdentifier();
try {
MailboxPath mailboxPath = PathConverter.forSession(session).buildFullPath(mailboxName);
@@ -83,16 +83,16 @@ public class ListRightsProcessor extends AbstractMailboxProcessor<ListRightsRequ
* existence information, much less the mailbox’s ACL.
*/
if (!mailboxManager.hasRight(mailboxPath, MailboxACL.Right.Lookup, mailboxSession)) {
- no(message, responder, HumanReadableText.MAILBOX_NOT_FOUND);
+ no(request, responder, HumanReadableText.MAILBOX_NOT_FOUND);
} else if (!mailboxManager.hasRight(mailboxPath, MailboxACL.Right.Administer, mailboxSession)) {
/* RFC 4314 section 4. */
Object[] params = new Object[] {
MailboxACL.Right.Administer.toString(),
- message.getCommand().getName(),
+ request.getCommand().getName(),
mailboxName
};
HumanReadableText text = new HumanReadableText(HumanReadableText.UNSUFFICIENT_RIGHTS_KEY, HumanReadableText.UNSUFFICIENT_RIGHTS_DEFAULT_VALUE, params);
- no(message, responder, text);
+ no(request, responder, text);
} else {
EntryKey key = EntryKey.deserialize(identifier);
@@ -110,15 +110,15 @@ public class ListRightsProcessor extends AbstractMailboxProcessor<ListRightsRequ
Rfc4314Rights[] rights = mailboxManager.listRights(mailboxPath, key, mailboxSession);
ListRightsResponse aclResponse = new ListRightsResponse(mailboxName, identifier, rights);
responder.respond(aclResponse);
- okComplete(message, responder);
+ okComplete(request, responder);
// FIXME should we send unsolicited responses here?
// unsolicitedResponses(session, responder, false);
}
} catch (MailboxNotFoundException e) {
- no(message, responder, HumanReadableText.MAILBOX_NOT_FOUND);
+ no(request, responder, HumanReadableText.MAILBOX_NOT_FOUND);
} catch (MailboxException e) {
- LOGGER.error("{} failed for mailbox {}", message.getCommand().getName(), mailboxName, e);
- no(message, responder, HumanReadableText.GENERIC_FAILURE_DURING_PROCESSING);
+ LOGGER.error("{} failed for mailbox {}", request.getCommand().getName(), mailboxName, e);
+ no(request, responder, HumanReadableText.GENERIC_FAILURE_DURING_PROCESSING);
}
}
@@ -129,11 +129,11 @@ public class ListRightsProcessor extends AbstractMailboxProcessor<ListRightsRequ
}
@Override
- protected Closeable addContextToMDC(ListRightsRequest message) {
+ protected Closeable addContextToMDC(ListRightsRequest request) {
return MDCBuilder.create()
.addContext(MDCBuilder.ACTION, "LIST_RIGHTS")
- .addContext("mailbox", message.getMailboxName())
- .addContext("identifier", message.getIdentifier())
+ .addContext("mailbox", request.getMailboxName())
+ .addContext("identifier", request.getIdentifier())
.build();
}
}
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 f6593b8..3faa59f 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
@@ -68,10 +68,10 @@ public class LoginProcessor extends AbstractAuthProcessor<LoginRequest> implemen
}
@Override
- protected Closeable addContextToMDC(LoginRequest message) {
+ protected Closeable addContextToMDC(LoginRequest request) {
return MDCBuilder.create()
.addContext(MDCBuilder.ACTION, "LOGIN")
- .addContext(MDCBuilder.USER, message.getUserid())
+ .addContext(MDCBuilder.USER, request.getUserid())
.build();
}
}
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 4710f5e..c6b9e8c 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
@@ -58,7 +58,7 @@ public class LogoutProcessor extends AbstractMailboxProcessor<LogoutRequest> {
}
@Override
- protected Closeable addContextToMDC(LogoutRequest message) {
+ protected Closeable addContextToMDC(LogoutRequest request) {
return MDCBuilder.create()
.addContext(MDCBuilder.ACTION, "LOGOUT")
.build();
diff --git a/protocols/imap/src/main/java/org/apache/james/imap/processor/MoveProcessor.java b/protocols/imap/src/main/java/org/apache/james/imap/processor/MoveProcessor.java
index 1f72217..2adb49a 100644
--- a/protocols/imap/src/main/java/org/apache/james/imap/processor/MoveProcessor.java
+++ b/protocols/imap/src/main/java/org/apache/james/imap/processor/MoveProcessor.java
@@ -71,12 +71,12 @@ public class MoveProcessor extends AbstractMessageRangeProcessor<MoveRequest> im
}
@Override
- protected Closeable addContextToMDC(MoveRequest message) {
+ protected Closeable addContextToMDC(MoveRequest request) {
return MDCBuilder.create()
.addContext(MDCBuilder.ACTION, "MOVE")
- .addContext("targetMailbox", message.getMailboxName())
- .addContext("uidEnabled", message.isUseUids())
- .addContext("idSet", IdRange.toString(message.getIdSet()))
+ .addContext("targetMailbox", request.getMailboxName())
+ .addContext("uidEnabled", request.isUseUids())
+ .addContext("idSet", IdRange.toString(request.getIdSet()))
.build();
}
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 f7c488a..3d88813 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,11 +58,11 @@ public class MyRightsProcessor extends AbstractMailboxProcessor<MyRightsRequest>
}
@Override
- protected void processRequest(MyRightsRequest message, ImapSession session, Responder responder) {
+ protected void processRequest(MyRightsRequest request, ImapSession session, Responder responder) {
final MailboxManager mailboxManager = getMailboxManager();
final MailboxSession mailboxSession = ImapSessionUtils.getMailboxSession(session);
- final String mailboxName = message.getMailboxName();
+ final String mailboxName = request.getMailboxName();
try {
MailboxPath mailboxPath = PathConverter.forSession(session).buildFullPath(mailboxName);
@@ -89,19 +89,19 @@ public class MyRightsProcessor extends AbstractMailboxProcessor<MyRightsRequest>
&& !myRights.contains(MailboxACL.Right.CreateMailbox)
&& !myRights.contains(MailboxACL.Right.DeleteMailbox)
&& !myRights.contains(MailboxACL.Right.Administer)) {
- no(message, responder, HumanReadableText.MAILBOX_NOT_FOUND);
+ no(request, responder, HumanReadableText.MAILBOX_NOT_FOUND);
} else {
MyRightsResponse myRightsResponse = new MyRightsResponse(mailboxName, myRights);
responder.respond(myRightsResponse);
- okComplete(message, responder);
+ okComplete(request, responder);
// FIXME should we send unsolicited responses here?
// unsolicitedResponses(session, responder, false);
}
} catch (MailboxNotFoundException e) {
- no(message, responder, HumanReadableText.MAILBOX_NOT_FOUND);
+ no(request, responder, HumanReadableText.MAILBOX_NOT_FOUND);
} catch (MailboxException e) {
- LOGGER.error("{} failed for mailbox {}", message.getCommand().getName(), mailboxName, e);
- no(message, responder, HumanReadableText.GENERIC_FAILURE_DURING_PROCESSING);
+ LOGGER.error("{} failed for mailbox {}", request.getCommand().getName(), mailboxName, e);
+ no(request, responder, HumanReadableText.GENERIC_FAILURE_DURING_PROCESSING);
}
}
@@ -112,10 +112,10 @@ public class MyRightsProcessor extends AbstractMailboxProcessor<MyRightsRequest>
}
@Override
- protected Closeable addContextToMDC(MyRightsRequest message) {
+ protected Closeable addContextToMDC(MyRightsRequest request) {
return MDCBuilder.create()
.addContext(MDCBuilder.ACTION, "MYRIGHTS")
- .addContext("mailbox", message.getMailboxName())
+ .addContext("mailbox", request.getMailboxName())
.build();
}
}
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 eed4a6b..b0b5a04 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
@@ -109,7 +109,7 @@ public class NamespaceProcessor extends AbstractMailboxProcessor<NamespaceReques
}
@Override
- protected Closeable addContextToMDC(NamespaceRequest message) {
+ protected Closeable addContextToMDC(NamespaceRequest request) {
return MDCBuilder.create()
.addContext(MDCBuilder.ACTION, "NAMESPACE")
.build();
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 35a59e9..e66015a 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,10 +37,10 @@ public class NoopProcessor extends AbstractMailboxProcessor<NoopRequest> {
}
@Override
- protected void processRequest(NoopRequest message, ImapSession session, Responder responder) {
+ protected void processRequest(NoopRequest request, ImapSession session, Responder responder) {
// So, unsolicated responses are returned to check for new mail
unsolicitedResponses(session, responder, false);
- okComplete(message, responder);
+ okComplete(request, responder);
}
@Override
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 0721035..8d464fc 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
@@ -80,11 +80,11 @@ public class RenameProcessor extends AbstractMailboxProcessor<RenameRequest> {
}
@Override
- protected Closeable addContextToMDC(RenameRequest message) {
+ protected Closeable addContextToMDC(RenameRequest request) {
return MDCBuilder.create()
.addContext(MDCBuilder.ACTION, "RENAME")
- .addContext("existingName", message.getExistingName())
- .addContext("newName", message.getNewName())
+ .addContext("existingName", request.getExistingName())
+ .addContext("newName", request.getNewName())
.build();
}
}
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 2953148..9750c6a 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
@@ -503,11 +503,11 @@ public class SearchProcessor extends AbstractMailboxProcessor<SearchRequest> imp
}
@Override
- protected Closeable addContextToMDC(SearchRequest message) {
+ protected Closeable addContextToMDC(SearchRequest request) {
return MDCBuilder.create()
.addContext(MDCBuilder.ACTION, "SEARCH")
- .addContext("useUid", message.isUseUids())
- .addContext("searchOperation", message.getSearchOperation())
+ .addContext("useUid", request.isUseUids())
+ .addContext("searchOperation", request.getSearchOperation())
.build();
}
}
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 e34f96b..25d2ead 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,17 +60,17 @@ public class SetACLProcessor extends AbstractMailboxProcessor<SetACLRequest> imp
}
@Override
- protected void processRequest(SetACLRequest message, ImapSession session, Responder responder) {
+ protected void processRequest(SetACLRequest request, ImapSession session, Responder responder) {
final MailboxManager mailboxManager = getMailboxManager();
final MailboxSession mailboxSession = ImapSessionUtils.getMailboxSession(session);
- final String mailboxName = message.getMailboxName();
- final String identifier = message.getIdentifier();
+ final String mailboxName = request.getMailboxName();
+ final String identifier = request.getIdentifier();
try {
/* parsing the rights is the the cheapest thing to begin with */
EditMode editMode = EditMode.REPLACE;
- String rights = message.getRights();
+ String rights = request.getRights();
if (rights != null && rights.length() > 0) {
switch (rights.charAt(0)) {
case MailboxACL.ADD_RIGHTS_MARKER:
@@ -100,16 +100,16 @@ public class SetACLProcessor extends AbstractMailboxProcessor<SetACLRequest> imp
* existence information, much less the mailbox’s ACL.
*/
if (!mailboxManager.hasRight(mailboxPath, MailboxACL.Right.Lookup, mailboxSession)) {
- no(message, responder, HumanReadableText.MAILBOX_NOT_FOUND);
+ no(request, responder, HumanReadableText.MAILBOX_NOT_FOUND);
} else if (!mailboxManager.hasRight(mailboxPath, MailboxACL.Right.Administer, mailboxSession)) {
/* RFC 4314 section 4. */
Object[] params = new Object[] {
MailboxACL.Right.Administer.toString(),
- message.getCommand().getName(),
+ request.getCommand().getName(),
mailboxName
};
HumanReadableText text = new HumanReadableText(HumanReadableText.UNSUFFICIENT_RIGHTS_KEY, HumanReadableText.UNSUFFICIENT_RIGHTS_DEFAULT_VALUE, params);
- no(message, responder, text);
+ no(request, responder, text);
} else {
EntryKey key = EntryKey.deserialize(identifier);
@@ -128,7 +128,7 @@ public class SetACLProcessor extends AbstractMailboxProcessor<SetACLRequest> imp
MailboxACL.command().key(key).mode(editMode).rights(mailboxAclRights).build(),
mailboxSession);
- okComplete(message, responder);
+ okComplete(request, responder);
// FIXME should we send unsolicited responses here?
// unsolicitedResponses(session, responder, false);
}
@@ -141,12 +141,12 @@ public class SetACLProcessor extends AbstractMailboxProcessor<SetACLRequest> imp
* */
Object[] params = new Object[] {e.getUnsupportedRight()};
HumanReadableText text = new HumanReadableText(HumanReadableText.UNSUPPORTED_RIGHT_KEY, HumanReadableText.UNSUPPORTED_RIGHT_DEFAULT_VALUE, params);
- taggedBad(message, responder, text);
+ taggedBad(request, responder, text);
} catch (MailboxNotFoundException e) {
- no(message, responder, HumanReadableText.MAILBOX_NOT_FOUND);
+ no(request, responder, HumanReadableText.MAILBOX_NOT_FOUND);
} catch (MailboxException e) {
- LOGGER.error("{} failed for mailbox {}", message.getCommand().getName(), mailboxName, e);
- no(message, responder, HumanReadableText.GENERIC_FAILURE_DURING_PROCESSING);
+ LOGGER.error("{} failed for mailbox {}", request.getCommand().getName(), mailboxName, e);
+ no(request, responder, HumanReadableText.GENERIC_FAILURE_DURING_PROCESSING);
}
}
@@ -157,12 +157,12 @@ public class SetACLProcessor extends AbstractMailboxProcessor<SetACLRequest> imp
}
@Override
- protected Closeable addContextToMDC(SetACLRequest message) {
+ protected Closeable addContextToMDC(SetACLRequest request) {
return MDCBuilder.create()
.addContext(MDCBuilder.ACTION, "SET_ACL")
- .addContext("mailbox", message.getMailboxName())
- .addContext("identifier", message.getIdentifier())
- .addContext("rights", message.getRights())
+ .addContext("mailbox", request.getMailboxName())
+ .addContext("identifier", request.getIdentifier())
+ .addContext("rights", request.getRights())
.build();
}
}
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 e812b71..630799f 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,34 +58,34 @@ public class SetAnnotationProcessor extends AbstractMailboxProcessor<SetAnnotati
}
@Override
- protected void processRequest(SetAnnotationRequest message, ImapSession session, Responder responder) {
+ protected void processRequest(SetAnnotationRequest request, ImapSession session, Responder responder) {
final MailboxManager mailboxManager = getMailboxManager();
final MailboxSession mailboxSession = ImapSessionUtils.getMailboxSession(session);
- final String mailboxName = message.getMailboxName();
+ final String mailboxName = request.getMailboxName();
try {
MailboxPath mailboxPath = PathConverter.forSession(session).buildFullPath(mailboxName);
- mailboxManager.updateAnnotations(mailboxPath, mailboxSession, message.getMailboxAnnotations());
+ mailboxManager.updateAnnotations(mailboxPath, mailboxSession, request.getMailboxAnnotations());
- okComplete(message, responder);
+ okComplete(request, responder);
} catch (MailboxNotFoundException e) {
- LOGGER.info("{} failed for mailbox {}", message.getCommand().getName(), mailboxName, e);
- no(message, responder, HumanReadableText.FAILURE_NO_SUCH_MAILBOX, StatusResponse.ResponseCode.tryCreate());
+ LOGGER.info("{} failed for mailbox {}", request.getCommand().getName(), mailboxName, e);
+ no(request, responder, HumanReadableText.FAILURE_NO_SUCH_MAILBOX, StatusResponse.ResponseCode.tryCreate());
} catch (AnnotationException e) {
- LOGGER.info("{} failed for mailbox {}", message.getCommand().getName(), mailboxName, e);
- no(message, responder, new HumanReadableText(HumanReadableText.MAILBOX_ANNOTATION_KEY, e.getMessage()));
+ LOGGER.info("{} failed for mailbox {}", request.getCommand().getName(), mailboxName, e);
+ no(request, responder, new HumanReadableText(HumanReadableText.MAILBOX_ANNOTATION_KEY, e.getMessage()));
} catch (MailboxException e) {
- LOGGER.error("{} failed for mailbox {}", message.getCommand().getName(), mailboxName, e);
- no(message, responder, HumanReadableText.GENERIC_FAILURE_DURING_PROCESSING);
+ LOGGER.error("{} failed for mailbox {}", request.getCommand().getName(), mailboxName, e);
+ no(request, responder, HumanReadableText.GENERIC_FAILURE_DURING_PROCESSING);
}
}
@Override
- protected Closeable addContextToMDC(SetAnnotationRequest message) {
+ protected Closeable addContextToMDC(SetAnnotationRequest request) {
return MDCBuilder.create()
.addContext(MDCBuilder.ACTION, "SET_ANNOTATION")
- .addContext("mailbox", message.getMailboxName())
- .addContext("annotations", message.getMailboxAnnotations())
+ .addContext("mailbox", request.getMailboxName())
+ .addContext("annotations", request.getMailboxAnnotations())
.build();
}
}
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 f99acb7..3601b64 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,22 +50,22 @@ public class SetQuotaProcessor extends AbstractMailboxProcessor<SetQuotaRequest>
}
@Override
- protected void processRequest(SetQuotaRequest message, ImapSession session, Responder responder) {
+ protected void processRequest(SetQuotaRequest request, ImapSession session, Responder responder) {
Object[] params = new Object[]{
"Full admin rights",
- message.getCommand().getName(),
+ request.getCommand().getName(),
"Can not perform SETQUOTA commands"
};
HumanReadableText humanReadableText = new HumanReadableText(HumanReadableText.UNSUFFICIENT_RIGHTS_KEY, HumanReadableText.UNSUFFICIENT_RIGHTS_DEFAULT_VALUE, params);
- no(message, responder, humanReadableText);
+ no(request, responder, humanReadableText);
}
@Override
- protected Closeable addContextToMDC(SetQuotaRequest message) {
+ protected Closeable addContextToMDC(SetQuotaRequest request) {
return MDCBuilder.create()
.addContext(MDCBuilder.ACTION, "SET_QUOTA")
- .addContext("quotaRoot", message.getQuotaRoot())
- .addContext("limits", message.getResourceLimits())
+ .addContext("quotaRoot", request.getQuotaRoot())
+ .addContext("limits", request.getResourceLimits())
.build();
}
}
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 4752e4d..f067be9 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
@@ -148,11 +148,11 @@ public class StatusProcessor extends AbstractMailboxProcessor<StatusRequest> {
}
@Override
- protected Closeable addContextToMDC(StatusRequest message) {
+ protected Closeable addContextToMDC(StatusRequest request) {
return MDCBuilder.create()
.addContext(MDCBuilder.ACTION, "STATUS")
- .addContext("mailbox", message.getMailboxName())
- .addContext("parameters", message.getStatusDataItems())
+ .addContext("mailbox", request.getMailboxName())
+ .addContext("parameters", request.getStatusDataItems())
.build();
}
}
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 ac80507..5253f33 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,12 +47,12 @@ public class UnselectProcessor extends AbstractMailboxProcessor<UnselectRequest>
}
@Override
- protected void processRequest(UnselectRequest message, ImapSession session, Responder responder) {
+ protected void processRequest(UnselectRequest request, ImapSession session, Responder responder) {
if (session.getSelected() != null) {
session.deselect();
- okComplete(message, responder);
+ okComplete(request, responder);
} else {
- taggedBad(message, responder, HumanReadableText.UNSELECT);
+ taggedBad(request, responder, HumanReadableText.UNSELECT);
}
}
@@ -63,7 +63,7 @@ public class UnselectProcessor extends AbstractMailboxProcessor<UnselectRequest>
}
@Override
- protected Closeable addContextToMDC(UnselectRequest message) {
+ protected Closeable addContextToMDC(UnselectRequest request) {
return MDCBuilder.create()
.addContext(MDCBuilder.ACTION, "UNSELECT")
.build();
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 f257580..dd7c52b 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
@@ -239,12 +239,12 @@ public class FetchProcessor extends AbstractMailboxProcessor<FetchRequest> {
}
@Override
- protected Closeable addContextToMDC(FetchRequest message) {
+ protected Closeable addContextToMDC(FetchRequest request) {
return MDCBuilder.create()
.addContext(MDCBuilder.ACTION, "FETCH")
- .addContext("useUid", message.isUseUids())
- .addContext("idSet", IdRange.toString(message.getIdSet()))
- .addContext("fetchedData", message.getFetch())
+ .addContext("useUid", request.isUseUids())
+ .addContext("idSet", IdRange.toString(request.getIdSet()))
+ .addContext("fetchedData", request.getFetch())
.build();
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org