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/12/13 10:01:17 UTC
[james-project] 12/17: [Refactoring] Enforce IMAP request to have
the correct Command associated with them
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 33eebba1c0fa6cda7118d9e0fbb2e8122c772a5e
Author: Benoit Tellier <bt...@linagora.com>
AuthorDate: Fri Dec 13 04:21:51 2019 +0100
[Refactoring] Enforce IMAP request to have the correct Command associated with them
This should not be a responsibility of the parser and avoids invalid states
later on.
---
.../org/apache/james/imap/api/ImapCommand.java | 16 ++++
.../org/apache/james/imap/api/ImapConstants.java | 9 +--
.../decode/base/AbstractImapCommandParser.java | 8 +-
.../parser/AbstractMessageRangeCommandParser.java | 6 +-
.../parser/AbstractSelectionCommandParser.java | 6 +-
.../decode/parser/AbstractUidCommandParser.java | 11 +--
.../imap/decode/parser/AppendCommandParser.java | 6 +-
.../decode/parser/AuthenticateCommandParser.java | 8 +-
.../decode/parser/CapabilityCommandParser.java | 7 +-
.../imap/decode/parser/CheckCommandParser.java | 5 +-
.../imap/decode/parser/CloseCommandParser.java | 7 +-
.../imap/decode/parser/CompressCommandParser.java | 9 +--
.../imap/decode/parser/CopyCommandParser.java | 7 +-
.../imap/decode/parser/CreateCommandParser.java | 5 +-
.../imap/decode/parser/DeleteACLCommandParser.java | 5 +-
.../imap/decode/parser/DeleteCommandParser.java | 5 +-
.../imap/decode/parser/EnableCommandParser.java | 5 +-
.../imap/decode/parser/ExamineCommandParser.java | 7 +-
.../imap/decode/parser/ExpungeCommandParser.java | 5 +-
.../imap/decode/parser/FetchCommandParser.java | 5 +-
.../imap/decode/parser/GetACLCommandParser.java | 5 +-
.../decode/parser/GetAnnotationCommandParser.java | 9 +--
.../imap/decode/parser/GetQuotaCommandParser.java | 5 +-
.../decode/parser/GetQuotaRootCommandParser.java | 5 +-
.../imap/decode/parser/IdleCommandParser.java | 5 +-
.../imap/decode/parser/ListCommandParser.java | 8 +-
.../decode/parser/ListRightsCommandParser.java | 7 +-
.../imap/decode/parser/LoginCommandParser.java | 7 +-
.../imap/decode/parser/LogoutCommandParser.java | 7 +-
.../imap/decode/parser/LsubCommandParser.java | 6 +-
.../imap/decode/parser/MoveCommandParser.java | 8 +-
.../imap/decode/parser/MyRightsCommandParser.java | 6 +-
.../imap/decode/parser/NamespaceCommandParser.java | 8 +-
.../imap/decode/parser/NoopCommandParser.java | 7 +-
.../imap/decode/parser/RenameCommandParser.java | 7 +-
.../imap/decode/parser/SearchCommandParser.java | 11 ++-
.../imap/decode/parser/SelectCommandParser.java | 5 +-
.../imap/decode/parser/SetACLCommandParser.java | 7 +-
.../decode/parser/SetAnnotationCommandParser.java | 5 +-
.../imap/decode/parser/SetQuotaCommandParser.java | 6 +-
.../imap/decode/parser/StartTLSCommandParser.java | 9 +--
.../imap/decode/parser/StatusCommandParser.java | 5 +-
.../imap/decode/parser/StoreCommandParser.java | 5 +-
.../imap/decode/parser/SubscribeCommandParser.java | 7 +-
.../james/imap/decode/parser/UidCommandParser.java | 3 +-
.../imap/decode/parser/UnselectCommandParser.java | 8 +-
.../decode/parser/UnsubscribeCommandParser.java | 7 +-
.../imap/decode/parser/XListCommandParser.java | 6 +-
.../imap/encode/NamespaceResponseEncoder.java | 2 +-
.../james/imap/message/request/AppendRequest.java | 9 +--
.../imap/message/request/AuthenticateRequest.java | 7 +-
.../imap/message/request/CapabilityRequest.java | 7 +-
.../james/imap/message/request/CheckRequest.java | 7 +-
.../james/imap/message/request/CloseRequest.java | 7 +-
.../imap/message/request/CompressRequest.java | 7 +-
.../james/imap/message/request/CopyRequest.java | 7 +-
.../james/imap/message/request/CreateRequest.java | 6 +-
.../imap/message/request/DeleteACLRequest.java | 6 +-
.../james/imap/message/request/DeleteRequest.java | 6 +-
.../james/imap/message/request/EnableRequest.java | 6 +-
.../james/imap/message/request/ExamineRequest.java | 6 +-
.../james/imap/message/request/ExpungeRequest.java | 6 +-
.../james/imap/message/request/FetchRequest.java | 8 +-
.../james/imap/message/request/GetACLRequest.java | 6 +-
.../imap/message/request/GetAnnotationRequest.java | 10 +--
.../imap/message/request/GetQuotaRequest.java | 6 +-
.../imap/message/request/GetQuotaRootRequest.java | 6 +-
.../message/request/IRAuthenticateRequest.java | 8 +-
.../james/imap/message/request/IdleRequest.java | 8 +-
.../james/imap/message/request/ListRequest.java | 6 +-
.../imap/message/request/ListRightsRequest.java | 6 +-
.../james/imap/message/request/LoginRequest.java | 6 +-
.../james/imap/message/request/LogoutRequest.java | 8 +-
.../james/imap/message/request/LsubRequest.java | 6 +-
.../james/imap/message/request/MoveRequest.java | 6 +-
.../imap/message/request/MyRightsRequest.java | 7 +-
.../imap/message/request/NamespaceRequest.java | 7 +-
.../james/imap/message/request/NoopRequest.java | 7 +-
.../james/imap/message/request/RenameRequest.java | 7 +-
.../james/imap/message/request/SearchRequest.java | 8 +-
.../james/imap/message/request/SelectRequest.java | 7 +-
.../james/imap/message/request/SetACLRequest.java | 6 +-
.../imap/message/request/SetAnnotationRequest.java | 6 +-
.../imap/message/request/SetQuotaRequest.java | 6 +-
.../imap/message/request/StartTLSRequest.java | 8 +-
.../james/imap/message/request/StatusRequest.java | 6 +-
.../james/imap/message/request/StoreRequest.java | 6 +-
.../imap/message/request/SubscribeRequest.java | 6 +-
.../imap/message/request/UnselectRequest.java | 8 +-
.../imap/message/request/UnsubscribeRequest.java | 6 +-
.../james/imap/message/request/XListRequest.java | 5 +-
.../james/imap/processor/CompressProcessor.java | 2 +-
.../james/imap/decode/parser/CopyParserTest.java | 7 +-
.../decode/parser/CreateCommandParserTest.java | 8 +-
.../parser/FetchCommandParserPartialFetchTest.java | 7 +-
.../parser/GetAnnotationCommandParserTest.java | 89 +++++++++++-----------
.../imap/decode/parser/GetQuotaParserTest.java | 6 +-
.../imap/decode/parser/GetQuotaRootParserTest.java | 13 +---
.../james/imap/decode/parser/MoveParserTest.java | 7 +-
.../parser/SearchCommandParserCharsetTest.java | 8 +-
.../SearchCommandParserQuotedCharsetTest.java | 10 +--
...earchCommandParserSearchKeySequenceSetTest.java | 4 -
.../parser/SetAnnotationCommandParserTest.java | 29 ++++---
.../decode/parser/SetQuotaCommandParserTest.java | 6 +-
.../imap/decode/parser/StoreCommandParserTest.java | 7 +-
.../imap/encode/NamespaceResponseEncoderTest.java | 10 +--
.../james/imap/processor/CopyProcessorTest.java | 10 +--
.../imap/processor/DeleteACLProcessorTest.java | 2 -
.../james/imap/processor/GetACLProcessorTest.java | 3 +-
.../imap/processor/GetAnnotationProcessorTest.java | 1 -
.../imap/processor/GetQuotaProcessorTest.java | 7 +-
.../imap/processor/GetQuotaRootProcessorTest.java | 7 +-
.../james/imap/processor/LSubProcessorTest.java | 20 +++--
.../imap/processor/ListRightsProcessorTest.java | 3 +-
.../james/imap/processor/MoveProcessorTest.java | 10 +--
.../imap/processor/NamespaceProcessorTest.java | 2 +-
.../james/imap/processor/SearchProcessorTest.java | 7 +-
.../james/imap/processor/SetACLProcessorTest.java | 7 +-
.../imap/processor/SetAnnotationProcessorTest.java | 2 +-
.../imap/processor/SetQuotaProcessorTest.java | 3 +-
120 files changed, 372 insertions(+), 536 deletions(-)
diff --git a/protocols/imap/src/main/java/org/apache/james/imap/api/ImapCommand.java b/protocols/imap/src/main/java/org/apache/james/imap/api/ImapCommand.java
index 9467237..e7eefc7 100644
--- a/protocols/imap/src/main/java/org/apache/james/imap/api/ImapCommand.java
+++ b/protocols/imap/src/main/java/org/apache/james/imap/api/ImapCommand.java
@@ -20,6 +20,7 @@
package org.apache.james.imap.api;
import java.util.EnumSet;
+import java.util.Objects;
/**
* Represents a processor for a particular Imap command. Implementations of this
@@ -78,4 +79,19 @@ public class ImapCommand {
public String toString() {
return name;
}
+
+ @Override
+ public final boolean equals(Object o) {
+ if (o instanceof ImapCommand) {
+ ImapCommand that = (ImapCommand) o;
+
+ return Objects.equals(this.name, that.name);
+ }
+ return false;
+ }
+
+ @Override
+ public final int hashCode() {
+ return Objects.hash(name);
+ }
}
diff --git a/protocols/imap/src/main/java/org/apache/james/imap/api/ImapConstants.java b/protocols/imap/src/main/java/org/apache/james/imap/api/ImapConstants.java
index 29d2950..27c358e 100644
--- a/protocols/imap/src/main/java/org/apache/james/imap/api/ImapConstants.java
+++ b/protocols/imap/src/main/java/org/apache/james/imap/api/ImapConstants.java
@@ -135,7 +135,6 @@ public interface ImapConstants {
String NAME_ATTRIBUTE_HAS_NO_CHILDREN = "\\HasNoChildren";
- String NAMESPACE_COMMAND_NAME = "NAMESPACE";
char BACK_SLASH = '\\';
@@ -152,11 +151,13 @@ public interface ImapConstants {
String STATUS_HIGHESTMODSEQ = "HIGHESTMODSEQ";
ImapCommand CAPABILITY_COMMAND = ImapCommand.anyStateCommand("CAPABILITY");
+ ImapCommand COMPRESS_COMMAND = ImapCommand.anyStateCommand("COMPRESS");
ImapCommand LOGOUT_COMMAND = ImapCommand.anyStateCommand("LOGOUT");
ImapCommand NOOP_COMMAND = ImapCommand.anyStateCommand("NOOP");
ImapCommand AUTHENTICATE_COMMAND = ImapCommand.nonAuthenticatedStateCommand("AUTHENTICATE");
ImapCommand LOGIN_COMMAND = ImapCommand.nonAuthenticatedStateCommand("LOGIN");
+ ImapCommand STARTTLS_COMMAND = ImapCommand.nonAuthenticatedStateCommand("STARTTLS");
ImapCommand APPEND_COMMAND = ImapCommand.authenticatedStateCommand("APPEND");
ImapCommand CREATE_COMMAND = ImapCommand.authenticatedStateCommand("CREATE");
@@ -166,6 +167,7 @@ public interface ImapConstants {
ImapCommand IDLE_COMMAND = ImapCommand.authenticatedStateCommand("IDLE");
ImapCommand LIST_COMMAND = ImapCommand.authenticatedStateCommand("LIST");
ImapCommand LSUB_COMMAND = ImapCommand.authenticatedStateCommand("LSUB");
+ ImapCommand NAMESPACE_COMMAND = ImapCommand.authenticatedStateCommand("NAMESPACE");
ImapCommand RENAME_COMMAND = ImapCommand.authenticatedStateCommand("RENAME");
ImapCommand SELECT_COMMAND = ImapCommand.authenticatedStateCommand("SELECT");
ImapCommand STATUS_COMMAND = ImapCommand.authenticatedStateCommand("STATUS");
@@ -231,15 +233,10 @@ public interface ImapConstants {
String FETCH_MODSEQ = "MODSEQ";
-
- String STARTTLS = "STARTTLS";
-
String LINE_END = "\r\n";
long MAX_NZ_NUMBER = 4294967295L;
long MIN_NZ_NUMBER = 1L;
- String COMPRESS_COMMAND_NAME = "COMPRESS";
-
// Quota resources definition
String STORAGE_QUOTA_RESOURCE = "STORAGE";
diff --git a/protocols/imap/src/main/java/org/apache/james/imap/decode/base/AbstractImapCommandParser.java b/protocols/imap/src/main/java/org/apache/james/imap/decode/base/AbstractImapCommandParser.java
index e846ebc..dd73566 100644
--- a/protocols/imap/src/main/java/org/apache/james/imap/decode/base/AbstractImapCommandParser.java
+++ b/protocols/imap/src/main/java/org/apache/james/imap/decode/base/AbstractImapCommandParser.java
@@ -69,7 +69,7 @@ public abstract class AbstractImapCommandParser implements ImapCommandParser {
public final ImapMessage parse(ImapRequestLineReader request, Tag tag, ImapSession session) {
if (command.validForState(session.getState())) {
try {
- return decode(command, request, tag, session);
+ return decode(request, tag, session);
} catch (DecodingException e) {
LOGGER.debug("Cannot parse protocol ", e);
return statusResponseFactory.taggedBad(tag, command, e.getKey());
@@ -80,9 +80,7 @@ public abstract class AbstractImapCommandParser implements ImapCommandParser {
/**
* Parses a request into a command message for later processing.
- *
- * @param command
- * <code>ImapCommand</code> to be parsed, not null
+ *
* @param request
* <code>ImapRequestLineReader</code>, not null
* @param tag
@@ -93,6 +91,6 @@ public abstract class AbstractImapCommandParser implements ImapCommandParser {
* @throws DecodingException
* if the request cannot be parsed
*/
- protected abstract ImapMessage decode(ImapCommand command, ImapRequestLineReader request, Tag tag, ImapSession session) throws DecodingException;
+ protected abstract ImapMessage decode(ImapRequestLineReader request, Tag tag, ImapSession session) throws DecodingException;
}
diff --git a/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/AbstractMessageRangeCommandParser.java b/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/AbstractMessageRangeCommandParser.java
index 8d44469..0616987 100644
--- a/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/AbstractMessageRangeCommandParser.java
+++ b/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/AbstractMessageRangeCommandParser.java
@@ -36,13 +36,13 @@ public abstract class AbstractMessageRangeCommandParser extends AbstractUidComma
}
@Override
- protected ImapMessage decode(ImapCommand command, ImapRequestLineReader request, Tag tag, boolean useUids, ImapSession session) throws DecodingException {
+ protected ImapMessage decode(ImapRequestLineReader request, Tag tag, boolean useUids, ImapSession session) throws DecodingException {
IdRange[] idSet = request.parseIdRange(session);
String mailboxName = request.mailbox();
request.eol();
- return createRequest(command, tag, useUids, idSet, mailboxName);
+ return createRequest(tag, useUids, idSet, mailboxName);
}
- protected abstract AbstractMessageRangeRequest createRequest(ImapCommand command, Tag tag, boolean useUids, IdRange[] idSet, String mailboxName);
+ protected abstract AbstractMessageRangeRequest createRequest(Tag tag, boolean useUids, IdRange[] idSet, String mailboxName);
}
diff --git a/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/AbstractSelectionCommandParser.java b/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/AbstractSelectionCommandParser.java
index 5ec332a..c381ce2 100644
--- a/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/AbstractSelectionCommandParser.java
+++ b/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/AbstractSelectionCommandParser.java
@@ -43,7 +43,7 @@ public abstract class AbstractSelectionCommandParser extends AbstractImapCommand
}
@Override
- protected ImapMessage decode(ImapCommand command, ImapRequestLineReader request, Tag tag, ImapSession session) throws DecodingException {
+ protected ImapMessage decode(ImapRequestLineReader request, Tag tag, ImapSession session) throws DecodingException {
final String mailboxName = request.mailbox();
boolean condstore = false;
Long lastKnownUidValidity = null;
@@ -142,7 +142,7 @@ public abstract class AbstractSelectionCommandParser extends AbstractImapCommand
}
request.eol();
- return createRequest(command, mailboxName, condstore, lastKnownUidValidity, knownModSeq, uidSet, knownUidSet, knownSequenceSet, tag);
+ return createRequest(mailboxName, condstore, lastKnownUidValidity, knownModSeq, uidSet, knownUidSet, knownSequenceSet, tag);
}
/**
@@ -222,5 +222,5 @@ public abstract class AbstractSelectionCommandParser extends AbstractImapCommand
/**
* Create a new {@link AbstractMailboxSelectionRequest} for the given arguments
*/
- protected abstract AbstractMailboxSelectionRequest createRequest(ImapCommand command, String mailboxName, boolean condstore, Long lastKnownUidValidity, Long knownModSeq, UidRange[] uidSet, UidRange[] knownUidSet, IdRange[] knownSequenceSet, Tag tag);
+ protected abstract AbstractMailboxSelectionRequest createRequest(String mailboxName, boolean condstore, Long lastKnownUidValidity, Long knownModSeq, UidRange[] uidSet, UidRange[] knownUidSet, IdRange[] knownSequenceSet, Tag tag);
}
diff --git a/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/AbstractUidCommandParser.java b/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/AbstractUidCommandParser.java
index c496f00..2a3f4e8 100644
--- a/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/AbstractUidCommandParser.java
+++ b/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/AbstractUidCommandParser.java
@@ -35,14 +35,9 @@ abstract class AbstractUidCommandParser extends AbstractImapCommandParser {
}
@Override
- protected ImapMessage decode(ImapCommand command, ImapRequestLineReader request, Tag tag, ImapSession session) throws DecodingException {
- return decode(command, request, tag, false, session);
+ protected ImapMessage decode(ImapRequestLineReader request, Tag tag, ImapSession session) throws DecodingException {
+ return decode(request, tag, false, session);
}
- public ImapMessage decode(ImapRequestLineReader request, Tag tag, boolean useUids, ImapSession session) throws DecodingException {
- final ImapCommand command = getCommand();
- return decode(command, request, tag, useUids, session);
- }
-
- protected abstract ImapMessage decode(ImapCommand command, ImapRequestLineReader request, Tag tag, boolean useUids, ImapSession session) throws DecodingException;
+ protected abstract ImapMessage decode(ImapRequestLineReader request, Tag tag, boolean useUids, ImapSession session) throws DecodingException;
}
diff --git a/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/AppendCommandParser.java b/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/AppendCommandParser.java
index fa50df7..a64259c 100644
--- a/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/AppendCommandParser.java
+++ b/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/AppendCommandParser.java
@@ -24,7 +24,6 @@ import java.util.Date;
import javax.mail.Flags;
-import org.apache.james.imap.api.ImapCommand;
import org.apache.james.imap.api.ImapConstants;
import org.apache.james.imap.api.ImapMessage;
import org.apache.james.imap.api.Tag;
@@ -39,7 +38,6 @@ import org.apache.james.imap.message.request.AppendRequest;
* Parses APPEND command
*/
public class AppendCommandParser extends AbstractImapCommandParser {
-
public AppendCommandParser(StatusResponseFactory statusResponseFactory) {
super(ImapConstants.APPEND_COMMAND, statusResponseFactory);
}
@@ -72,7 +70,7 @@ public class AppendCommandParser extends AbstractImapCommandParser {
}
@Override
- protected ImapMessage decode(ImapCommand command, ImapRequestLineReader request, Tag tag, ImapSession session) throws DecodingException {
+ protected ImapMessage decode(ImapRequestLineReader request, Tag tag, ImapSession session) throws DecodingException {
String mailboxName = request.mailbox();
Flags flags = optionalAppendFlags(request);
if (flags == null) {
@@ -84,6 +82,6 @@ public class AppendCommandParser extends AbstractImapCommandParser {
}
request.nextWordChar();
- return new AppendRequest(command, mailboxName, flags, Date.from(datetime.atZone(ZoneId.systemDefault()).toInstant()), request.consumeLiteral(true), tag);
+ return new AppendRequest(mailboxName, flags, Date.from(datetime.atZone(ZoneId.systemDefault()).toInstant()), request.consumeLiteral(true), tag);
}
}
diff --git a/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/AuthenticateCommandParser.java b/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/AuthenticateCommandParser.java
index 710a8d7..26a9020 100644
--- a/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/AuthenticateCommandParser.java
+++ b/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/AuthenticateCommandParser.java
@@ -18,7 +18,6 @@
****************************************************************/
package org.apache.james.imap.decode.parser;
-import org.apache.james.imap.api.ImapCommand;
import org.apache.james.imap.api.ImapConstants;
import org.apache.james.imap.api.ImapMessage;
import org.apache.james.imap.api.Tag;
@@ -40,21 +39,20 @@ public class AuthenticateCommandParser extends AbstractImapCommandParser {
}
@Override
- protected ImapMessage decode(ImapCommand command, ImapRequestLineReader request, Tag tag, ImapSession session) throws DecodingException {
+ protected ImapMessage decode(ImapRequestLineReader request, Tag tag, ImapSession session) throws DecodingException {
ImapMessage result;
String authType = request.astring();
try {
- result = new AuthenticateRequest(command, authType, tag);
+ result = new AuthenticateRequest(authType, tag);
request.eol();
} catch (DecodingException e) {
// Ok this means we have some SASL-IR request to parse
String initialClientResponse = request.astring();
- result = new IRAuthenticateRequest(command, authType, tag, initialClientResponse);
+ result = new IRAuthenticateRequest(authType, tag, initialClientResponse);
request.eol();
}
return result;
}
-
}
diff --git a/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/CapabilityCommandParser.java b/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/CapabilityCommandParser.java
index d79856f..b015d87 100644
--- a/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/CapabilityCommandParser.java
+++ b/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/CapabilityCommandParser.java
@@ -18,7 +18,6 @@
****************************************************************/
package org.apache.james.imap.decode.parser;
-import org.apache.james.imap.api.ImapCommand;
import org.apache.james.imap.api.ImapConstants;
import org.apache.james.imap.api.ImapMessage;
import org.apache.james.imap.api.Tag;
@@ -33,15 +32,13 @@ import org.apache.james.imap.message.request.CapabilityRequest;
* Parses CAPABILITY commands
*/
public class CapabilityCommandParser extends AbstractImapCommandParser {
-
public CapabilityCommandParser(StatusResponseFactory statusResponseFactory) {
super(ImapConstants.CAPABILITY_COMMAND, statusResponseFactory);
}
@Override
- protected ImapMessage decode(ImapCommand command, ImapRequestLineReader request, Tag tag, ImapSession session) throws DecodingException {
+ protected ImapMessage decode(ImapRequestLineReader request, Tag tag, ImapSession session) throws DecodingException {
request.eol();
- return new CapabilityRequest(command, tag);
+ return new CapabilityRequest(tag);
}
-
}
diff --git a/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/CheckCommandParser.java b/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/CheckCommandParser.java
index 73445f0..949356c 100644
--- a/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/CheckCommandParser.java
+++ b/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/CheckCommandParser.java
@@ -18,7 +18,6 @@
****************************************************************/
package org.apache.james.imap.decode.parser;
-import org.apache.james.imap.api.ImapCommand;
import org.apache.james.imap.api.ImapConstants;
import org.apache.james.imap.api.ImapMessage;
import org.apache.james.imap.api.Tag;
@@ -39,9 +38,9 @@ public class CheckCommandParser extends AbstractImapCommandParser {
}
@Override
- protected ImapMessage decode(ImapCommand command, ImapRequestLineReader request, Tag tag, ImapSession session) throws DecodingException {
+ protected ImapMessage decode(ImapRequestLineReader request, Tag tag, ImapSession session) throws DecodingException {
request.eol();
- return new CheckRequest(command, tag);
+ return new CheckRequest(tag);
}
}
diff --git a/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/CloseCommandParser.java b/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/CloseCommandParser.java
index 027e432..b774f4d 100644
--- a/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/CloseCommandParser.java
+++ b/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/CloseCommandParser.java
@@ -18,7 +18,6 @@
****************************************************************/
package org.apache.james.imap.decode.parser;
-import org.apache.james.imap.api.ImapCommand;
import org.apache.james.imap.api.ImapConstants;
import org.apache.james.imap.api.ImapMessage;
import org.apache.james.imap.api.Tag;
@@ -33,15 +32,13 @@ import org.apache.james.imap.message.request.CloseRequest;
* Parse CLOSE commands
*/
class CloseCommandParser extends AbstractImapCommandParser {
-
public CloseCommandParser(StatusResponseFactory statusResponseFactory) {
super(ImapConstants.CLOSE_COMMAND, statusResponseFactory);
}
@Override
- protected ImapMessage decode(ImapCommand command, ImapRequestLineReader request, Tag tag, ImapSession session) throws DecodingException {
+ protected ImapMessage decode(ImapRequestLineReader request, Tag tag, ImapSession session) throws DecodingException {
request.eol();
- return new CloseRequest(command, tag);
+ return new CloseRequest(tag);
}
-
}
diff --git a/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/CompressCommandParser.java b/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/CompressCommandParser.java
index b7d66fe..da88b00 100644
--- a/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/CompressCommandParser.java
+++ b/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/CompressCommandParser.java
@@ -18,7 +18,6 @@
****************************************************************/
package org.apache.james.imap.decode.parser;
-import org.apache.james.imap.api.ImapCommand;
import org.apache.james.imap.api.ImapConstants;
import org.apache.james.imap.api.ImapMessage;
import org.apache.james.imap.api.Tag;
@@ -30,16 +29,14 @@ import org.apache.james.imap.decode.base.AbstractImapCommandParser;
import org.apache.james.imap.message.request.CompressRequest;
public class CompressCommandParser extends AbstractImapCommandParser {
-
public CompressCommandParser(StatusResponseFactory statusResponseFactory) {
- super(ImapCommand.anyStateCommand(ImapConstants.COMPRESS_COMMAND_NAME), statusResponseFactory);
+ super(ImapConstants.COMPRESS_COMMAND, statusResponseFactory);
}
@Override
- protected ImapMessage decode(ImapCommand command, ImapRequestLineReader request, Tag tag, ImapSession session) throws DecodingException {
+ protected ImapMessage decode(ImapRequestLineReader request, Tag tag, ImapSession session) throws DecodingException {
String algorithm = request.atom();
request.eol();
- return new CompressRequest(tag, command, algorithm);
+ return new CompressRequest(tag, algorithm);
}
-
}
diff --git a/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/CopyCommandParser.java b/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/CopyCommandParser.java
index db1c463..8300bb7 100644
--- a/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/CopyCommandParser.java
+++ b/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/CopyCommandParser.java
@@ -18,7 +18,6 @@
****************************************************************/
package org.apache.james.imap.decode.parser;
-import org.apache.james.imap.api.ImapCommand;
import org.apache.james.imap.api.ImapConstants;
import org.apache.james.imap.api.Tag;
import org.apache.james.imap.api.message.IdRange;
@@ -29,14 +28,12 @@ import org.apache.james.imap.message.request.CopyRequest;
* Parse COPY commands
*/
public class CopyCommandParser extends AbstractMessageRangeCommandParser {
-
public CopyCommandParser(StatusResponseFactory statusResponseFactory) {
super(ImapConstants.COPY_COMMAND, statusResponseFactory);
}
@Override
- protected CopyRequest createRequest(ImapCommand command, Tag tag, boolean useUids, IdRange[] idSet, String mailboxName) {
- return new CopyRequest(command, idSet, mailboxName, useUids, tag);
+ protected CopyRequest createRequest(Tag tag, boolean useUids, IdRange[] idSet, String mailboxName) {
+ return new CopyRequest(idSet, mailboxName, useUids, tag);
}
-
}
diff --git a/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/CreateCommandParser.java b/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/CreateCommandParser.java
index 410d384..419618a 100644
--- a/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/CreateCommandParser.java
+++ b/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/CreateCommandParser.java
@@ -18,7 +18,6 @@
****************************************************************/
package org.apache.james.imap.decode.parser;
-import org.apache.james.imap.api.ImapCommand;
import org.apache.james.imap.api.ImapConstants;
import org.apache.james.imap.api.ImapMessage;
import org.apache.james.imap.api.Tag;
@@ -44,7 +43,7 @@ public class CreateCommandParser extends AbstractImapCommandParser {
}
@Override
- protected ImapMessage decode(ImapCommand command, ImapRequestLineReader request, Tag tag, ImapSession session) throws DecodingException {
+ protected ImapMessage decode(ImapRequestLineReader request, Tag tag, ImapSession session) throws DecodingException {
String mailboxName = request.mailbox();
MailboxSession mailboxSession = session.getMailboxSession();
@@ -62,7 +61,7 @@ public class CreateCommandParser extends AbstractImapCommandParser {
}
request.eol();
assertMailboxNameJustContainDelimiter(mailboxName, mailboxSession.getPathDelimiter());
- return new CreateRequest(command, mailboxName, tag);
+ return new CreateRequest(mailboxName, tag);
}
private void assertMailboxNameJustContainDelimiter(String mailboxName, char delimiter) throws DecodingException {
diff --git a/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/DeleteACLCommandParser.java b/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/DeleteACLCommandParser.java
index 37c9c51..df2f294 100644
--- a/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/DeleteACLCommandParser.java
+++ b/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/DeleteACLCommandParser.java
@@ -19,7 +19,6 @@
package org.apache.james.imap.decode.parser;
-import org.apache.james.imap.api.ImapCommand;
import org.apache.james.imap.api.ImapConstants;
import org.apache.james.imap.api.ImapMessage;
import org.apache.james.imap.api.Tag;
@@ -40,11 +39,11 @@ public class DeleteACLCommandParser extends AbstractImapCommandParser {
}
@Override
- protected ImapMessage decode(ImapCommand command, ImapRequestLineReader request, Tag tag, ImapSession session) throws DecodingException {
+ protected ImapMessage decode(ImapRequestLineReader request, Tag tag, ImapSession session) throws DecodingException {
final String mailboxName = request.mailbox();
final String identifier = request.astring();
request.eol();
- return new DeleteACLRequest(tag, command, mailboxName, identifier);
+ return new DeleteACLRequest(tag, mailboxName, identifier);
}
}
diff --git a/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/DeleteCommandParser.java b/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/DeleteCommandParser.java
index 62c39c7..fd5c432 100644
--- a/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/DeleteCommandParser.java
+++ b/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/DeleteCommandParser.java
@@ -18,7 +18,6 @@
****************************************************************/
package org.apache.james.imap.decode.parser;
-import org.apache.james.imap.api.ImapCommand;
import org.apache.james.imap.api.ImapConstants;
import org.apache.james.imap.api.ImapMessage;
import org.apache.james.imap.api.Tag;
@@ -39,11 +38,11 @@ public class DeleteCommandParser extends AbstractImapCommandParser {
}
@Override
- protected ImapMessage decode(ImapCommand command, ImapRequestLineReader request, Tag tag, ImapSession session) throws DecodingException {
+ protected ImapMessage decode(ImapRequestLineReader request, Tag tag, ImapSession session) throws DecodingException {
String mailboxName = request.mailbox();
request.eol();
- return new DeleteRequest(command, mailboxName, tag);
+ return new DeleteRequest(mailboxName, tag);
}
}
diff --git a/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/EnableCommandParser.java b/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/EnableCommandParser.java
index 9efef2a..e9f14ef 100644
--- a/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/EnableCommandParser.java
+++ b/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/EnableCommandParser.java
@@ -21,7 +21,6 @@ package org.apache.james.imap.decode.parser;
import java.util.ArrayList;
import java.util.List;
-import org.apache.james.imap.api.ImapCommand;
import org.apache.james.imap.api.ImapConstants;
import org.apache.james.imap.api.ImapMessage;
import org.apache.james.imap.api.Tag;
@@ -40,7 +39,7 @@ public class EnableCommandParser extends AbstractImapCommandParser {
}
@Override
- protected ImapMessage decode(ImapCommand command, ImapRequestLineReader request, Tag tag, ImapSession session) throws DecodingException {
+ protected ImapMessage decode(ImapRequestLineReader request, Tag tag, ImapSession session) throws DecodingException {
List<Capability> caps = new ArrayList<>();
caps.add(Capability.of(request.astring()));
while (request.nextChar() == ' ') {
@@ -48,7 +47,7 @@ public class EnableCommandParser extends AbstractImapCommandParser {
caps.add(Capability.of(request.astring()));
}
request.eol();
- return new EnableRequest(tag, command, caps);
+ return new EnableRequest(tag, caps);
}
}
diff --git a/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/ExamineCommandParser.java b/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/ExamineCommandParser.java
index 10dc958..bc71492 100644
--- a/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/ExamineCommandParser.java
+++ b/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/ExamineCommandParser.java
@@ -18,7 +18,6 @@
****************************************************************/
package org.apache.james.imap.decode.parser;
-import org.apache.james.imap.api.ImapCommand;
import org.apache.james.imap.api.ImapConstants;
import org.apache.james.imap.api.Tag;
import org.apache.james.imap.api.message.IdRange;
@@ -37,9 +36,7 @@ public class ExamineCommandParser extends AbstractSelectionCommandParser {
}
@Override
- protected AbstractMailboxSelectionRequest createRequest(ImapCommand command, String mailboxName, boolean condstore, Long lastKnownUidValidity, Long knownModSeq, UidRange[] uidSet, UidRange[] knownUidSet, IdRange[] knownSequenceSet, Tag tag) {
- return new ExamineRequest(command, mailboxName, condstore, lastKnownUidValidity, knownModSeq, uidSet, knownUidSet, knownSequenceSet, tag);
+ protected AbstractMailboxSelectionRequest createRequest(String mailboxName, boolean condstore, Long lastKnownUidValidity, Long knownModSeq, UidRange[] uidSet, UidRange[] knownUidSet, IdRange[] knownSequenceSet, Tag tag) {
+ return new ExamineRequest(mailboxName, condstore, lastKnownUidValidity, knownModSeq, uidSet, knownUidSet, knownSequenceSet, tag);
}
-
-
}
diff --git a/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/ExpungeCommandParser.java b/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/ExpungeCommandParser.java
index 067e898..04040f7 100644
--- a/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/ExpungeCommandParser.java
+++ b/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/ExpungeCommandParser.java
@@ -18,7 +18,6 @@
****************************************************************/
package org.apache.james.imap.decode.parser;
-import org.apache.james.imap.api.ImapCommand;
import org.apache.james.imap.api.ImapConstants;
import org.apache.james.imap.api.ImapMessage;
import org.apache.james.imap.api.Tag;
@@ -39,14 +38,14 @@ public class ExpungeCommandParser extends AbstractUidCommandParser {
}
@Override
- protected ImapMessage decode(ImapCommand command, ImapRequestLineReader request, Tag tag, boolean useUids, ImapSession session) throws DecodingException {
+ protected ImapMessage decode(ImapRequestLineReader request, Tag tag, boolean useUids, ImapSession session) throws DecodingException {
IdRange[] uidSet = null;
if (useUids) {
uidSet = request.parseIdRange(session);
}
request.eol();
- return new ExpungeRequest(command, tag, uidSet);
+ return new ExpungeRequest(tag, uidSet);
}
}
diff --git a/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/FetchCommandParser.java b/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/FetchCommandParser.java
index c683f02..c51ca96 100644
--- a/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/FetchCommandParser.java
+++ b/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/FetchCommandParser.java
@@ -29,7 +29,6 @@ import static org.apache.james.imap.api.message.FetchData.Item.UID;
import java.util.List;
-import org.apache.james.imap.api.ImapCommand;
import org.apache.james.imap.api.ImapConstants;
import org.apache.james.imap.api.ImapMessage;
import org.apache.james.imap.api.Tag;
@@ -247,7 +246,7 @@ public class FetchCommandParser extends AbstractUidCommandParser {
}
@Override
- protected ImapMessage decode(ImapCommand command, ImapRequestLineReader request, Tag tag, boolean useUids, ImapSession session) throws DecodingException {
+ protected ImapMessage decode(ImapRequestLineReader request, Tag tag, boolean useUids, ImapSession session) throws DecodingException {
IdRange[] idSet = request.parseIdRange(session);
FetchData fetch = fetchRequest(request, useUids);
@@ -260,7 +259,7 @@ public class FetchCommandParser extends AbstractUidCommandParser {
request.eol();
- return new FetchRequest(command, useUids, idSet, fetch, tag);
+ return new FetchRequest(useUids, idSet, fetch, tag);
}
}
diff --git a/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/GetACLCommandParser.java b/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/GetACLCommandParser.java
index a7dab53..bbcef58 100644
--- a/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/GetACLCommandParser.java
+++ b/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/GetACLCommandParser.java
@@ -19,7 +19,6 @@
package org.apache.james.imap.decode.parser;
-import org.apache.james.imap.api.ImapCommand;
import org.apache.james.imap.api.ImapConstants;
import org.apache.james.imap.api.ImapMessage;
import org.apache.james.imap.api.Tag;
@@ -40,10 +39,10 @@ public class GetACLCommandParser extends AbstractImapCommandParser {
}
@Override
- protected ImapMessage decode(ImapCommand command, ImapRequestLineReader request, Tag tag, ImapSession session) throws DecodingException {
+ protected ImapMessage decode(ImapRequestLineReader request, Tag tag, ImapSession session) throws DecodingException {
final String mailboxName = request.mailbox();
request.eol();
- return new GetACLRequest(tag, command, mailboxName);
+ return new GetACLRequest(tag, mailboxName);
}
}
diff --git a/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/GetAnnotationCommandParser.java b/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/GetAnnotationCommandParser.java
index 031f8c6..4a86128 100644
--- a/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/GetAnnotationCommandParser.java
+++ b/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/GetAnnotationCommandParser.java
@@ -21,7 +21,6 @@ package org.apache.james.imap.decode.parser;
import java.util.Optional;
-import org.apache.james.imap.api.ImapCommand;
import org.apache.james.imap.api.ImapConstants;
import org.apache.james.imap.api.ImapMessage;
import org.apache.james.imap.api.Tag;
@@ -50,17 +49,17 @@ public class GetAnnotationCommandParser extends AbstractImapCommandParser {
}
@Override
- protected ImapMessage decode(ImapCommand command, ImapRequestLineReader requestReader, Tag tag, ImapSession session)
+ protected ImapMessage decode(ImapRequestLineReader requestReader, Tag tag, ImapSession session)
throws DecodingException {
try {
- return buildAnnotationRequest(command, requestReader, tag);
+ return buildAnnotationRequest(requestReader, tag);
} catch (NullPointerException | IllegalArgumentException | IllegalStateException e) {
throw new DecodingException(HumanReadableText.ILLEGAL_ARGUMENTS, e.getMessage(), e);
}
}
- private ImapMessage buildAnnotationRequest(ImapCommand command, ImapRequestLineReader requestReader, Tag tag) throws DecodingException {
- GetAnnotationRequest.Builder builder = GetAnnotationRequest.builder().tag(tag).command(command);
+ private ImapMessage buildAnnotationRequest(ImapRequestLineReader requestReader, Tag tag) throws DecodingException {
+ GetAnnotationRequest.Builder builder = GetAnnotationRequest.builder().tag(tag);
builder.mailboxName(requestReader.mailbox());
consumeOptionsAndKeys(requestReader, builder);
diff --git a/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/GetQuotaCommandParser.java b/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/GetQuotaCommandParser.java
index 6a154d9..4a21123 100644
--- a/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/GetQuotaCommandParser.java
+++ b/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/GetQuotaCommandParser.java
@@ -19,7 +19,6 @@
package org.apache.james.imap.decode.parser;
-import org.apache.james.imap.api.ImapCommand;
import org.apache.james.imap.api.ImapConstants;
import org.apache.james.imap.api.ImapMessage;
import org.apache.james.imap.api.Tag;
@@ -39,9 +38,9 @@ public class GetQuotaCommandParser extends AbstractImapCommandParser {
}
@Override
- protected ImapMessage decode(ImapCommand command, ImapRequestLineReader request, Tag tag, ImapSession session) throws DecodingException {
+ protected ImapMessage decode(ImapRequestLineReader request, Tag tag, ImapSession session) throws DecodingException {
final String quotaRoot = request.atom();
request.eol();
- return new GetQuotaRequest(tag, command, quotaRoot);
+ return new GetQuotaRequest(tag, quotaRoot);
}
}
diff --git a/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/GetQuotaRootCommandParser.java b/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/GetQuotaRootCommandParser.java
index 015382b..533b13d 100644
--- a/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/GetQuotaRootCommandParser.java
+++ b/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/GetQuotaRootCommandParser.java
@@ -19,7 +19,6 @@
package org.apache.james.imap.decode.parser;
-import org.apache.james.imap.api.ImapCommand;
import org.apache.james.imap.api.ImapConstants;
import org.apache.james.imap.api.ImapMessage;
import org.apache.james.imap.api.Tag;
@@ -40,10 +39,10 @@ public class GetQuotaRootCommandParser extends AbstractImapCommandParser {
}
@Override
- protected ImapMessage decode(ImapCommand command, ImapRequestLineReader request, Tag tag, ImapSession session) throws DecodingException {
+ protected ImapMessage decode(ImapRequestLineReader request, Tag tag, ImapSession session) throws DecodingException {
final String mailboxName = request.mailbox();
request.eol();
- return new GetQuotaRootRequest(tag, command, mailboxName);
+ return new GetQuotaRootRequest(tag, mailboxName);
}
}
diff --git a/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/IdleCommandParser.java b/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/IdleCommandParser.java
index 2be9e85..a0f1c0d 100644
--- a/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/IdleCommandParser.java
+++ b/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/IdleCommandParser.java
@@ -18,7 +18,6 @@
****************************************************************/
package org.apache.james.imap.decode.parser;
-import org.apache.james.imap.api.ImapCommand;
import org.apache.james.imap.api.ImapConstants;
import org.apache.james.imap.api.ImapMessage;
import org.apache.james.imap.api.Tag;
@@ -39,9 +38,9 @@ public class IdleCommandParser extends AbstractImapCommandParser {
}
@Override
- protected ImapMessage decode(ImapCommand command, ImapRequestLineReader request, Tag tag, ImapSession session) throws DecodingException {
+ protected ImapMessage decode(ImapRequestLineReader request, Tag tag, ImapSession session) throws DecodingException {
request.eol();
- return new IdleRequest(command, tag);
+ return new IdleRequest(tag);
}
}
diff --git a/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/ListCommandParser.java b/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/ListCommandParser.java
index 0648a74..7ec14fe 100644
--- a/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/ListCommandParser.java
+++ b/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/ListCommandParser.java
@@ -72,14 +72,14 @@ public class ListCommandParser extends AbstractUidCommandParser {
}
@Override
- protected ImapMessage decode(ImapCommand command, ImapRequestLineReader request, Tag tag, boolean useUids, ImapSession session) throws DecodingException {
+ protected ImapMessage decode(ImapRequestLineReader request, Tag tag, boolean useUids, ImapSession session) throws DecodingException {
String referenceName = request.mailbox();
String mailboxPattern = listMailbox(request);
request.eol();
- return createMessage(command, referenceName, mailboxPattern, tag);
+ return createMessage(referenceName, mailboxPattern, tag);
}
- protected ImapMessage createMessage(ImapCommand command, String referenceName, String mailboxPattern, Tag tag) {
- return new ListRequest(command, referenceName, mailboxPattern, tag);
+ protected ImapMessage createMessage(String referenceName, String mailboxPattern, Tag tag) {
+ return new ListRequest(referenceName, mailboxPattern, tag);
}
}
diff --git a/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/ListRightsCommandParser.java b/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/ListRightsCommandParser.java
index e4f78e1..c7e4da0 100644
--- a/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/ListRightsCommandParser.java
+++ b/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/ListRightsCommandParser.java
@@ -19,7 +19,6 @@
package org.apache.james.imap.decode.parser;
-import org.apache.james.imap.api.ImapCommand;
import org.apache.james.imap.api.ImapConstants;
import org.apache.james.imap.api.ImapMessage;
import org.apache.james.imap.api.Tag;
@@ -34,17 +33,15 @@ import org.apache.james.imap.message.request.ListRightsRequest;
* LISTRIGHTS Parser
*/
public class ListRightsCommandParser extends AbstractImapCommandParser {
-
public ListRightsCommandParser(StatusResponseFactory statusResponseFactory) {
super(ImapConstants.LISTRIGHTS_COMMAND, statusResponseFactory);
}
@Override
- protected ImapMessage decode(ImapCommand command, ImapRequestLineReader request, Tag tag, ImapSession session) throws DecodingException {
+ protected ImapMessage decode(ImapRequestLineReader request, Tag tag, ImapSession session) throws DecodingException {
final String mailboxName = request.mailbox();
final String identifier = request.astring();
request.eol();
- return new ListRightsRequest(tag, command, mailboxName, identifier);
+ return new ListRightsRequest(tag, mailboxName, identifier);
}
-
}
diff --git a/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/LoginCommandParser.java b/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/LoginCommandParser.java
index 9462c70..71beb18 100644
--- a/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/LoginCommandParser.java
+++ b/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/LoginCommandParser.java
@@ -19,7 +19,6 @@
package org.apache.james.imap.decode.parser;
import org.apache.james.core.Username;
-import org.apache.james.imap.api.ImapCommand;
import org.apache.james.imap.api.ImapConstants;
import org.apache.james.imap.api.ImapMessage;
import org.apache.james.imap.api.Tag;
@@ -34,18 +33,16 @@ import org.apache.james.imap.message.request.LoginRequest;
* Parse LOGIN commands
*/
public class LoginCommandParser extends AbstractImapCommandParser {
-
public LoginCommandParser(StatusResponseFactory statusResponseFactory) {
super(ImapConstants.LOGIN_COMMAND, statusResponseFactory);
}
@Override
- protected ImapMessage decode(ImapCommand command, ImapRequestLineReader request, Tag tag, ImapSession session) throws DecodingException {
+ protected ImapMessage decode(ImapRequestLineReader request, Tag tag, ImapSession session) throws DecodingException {
Username userid = Username.of(request.astring());
String password = request.astring();
request.eol();
- return new LoginRequest(command, userid, password, tag);
+ return new LoginRequest(userid, password, tag);
}
-
}
diff --git a/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/LogoutCommandParser.java b/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/LogoutCommandParser.java
index dbbaec5..0793628 100644
--- a/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/LogoutCommandParser.java
+++ b/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/LogoutCommandParser.java
@@ -18,7 +18,6 @@
****************************************************************/
package org.apache.james.imap.decode.parser;
-import org.apache.james.imap.api.ImapCommand;
import org.apache.james.imap.api.ImapConstants;
import org.apache.james.imap.api.ImapMessage;
import org.apache.james.imap.api.Tag;
@@ -33,15 +32,13 @@ import org.apache.james.imap.message.request.LogoutRequest;
* Parse LOGOUT commands
*/
public class LogoutCommandParser extends AbstractImapCommandParser {
-
public LogoutCommandParser(StatusResponseFactory statusResponseFactory) {
super(ImapConstants.LOGOUT_COMMAND, statusResponseFactory);
}
@Override
- protected ImapMessage decode(ImapCommand command, ImapRequestLineReader request, Tag tag, ImapSession session) throws DecodingException {
+ protected ImapMessage decode(ImapRequestLineReader request, Tag tag, ImapSession session) throws DecodingException {
request.eol();
- return new LogoutRequest(command, tag);
+ return new LogoutRequest(tag);
}
-
}
diff --git a/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/LsubCommandParser.java b/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/LsubCommandParser.java
index 8ae1fe9..3d1d4ef 100644
--- a/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/LsubCommandParser.java
+++ b/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/LsubCommandParser.java
@@ -18,7 +18,6 @@
****************************************************************/
package org.apache.james.imap.decode.parser;
-import org.apache.james.imap.api.ImapCommand;
import org.apache.james.imap.api.ImapConstants;
import org.apache.james.imap.api.ImapMessage;
import org.apache.james.imap.api.Tag;
@@ -29,13 +28,12 @@ import org.apache.james.imap.message.request.LsubRequest;
* Parse LSUB commands
*/
public class LsubCommandParser extends ListCommandParser {
-
public LsubCommandParser(StatusResponseFactory statusResponseFactory) {
super(ImapConstants.LSUB_COMMAND, statusResponseFactory);
}
@Override
- protected ImapMessage createMessage(ImapCommand command, String referenceName, String mailboxPattern, Tag tag) {
- return new LsubRequest(command, referenceName, mailboxPattern, tag);
+ protected ImapMessage createMessage(String referenceName, String mailboxPattern, Tag tag) {
+ return new LsubRequest(referenceName, mailboxPattern, tag);
}
}
diff --git a/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/MoveCommandParser.java b/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/MoveCommandParser.java
index 93228f3..6df14c5 100644
--- a/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/MoveCommandParser.java
+++ b/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/MoveCommandParser.java
@@ -1,6 +1,5 @@
package org.apache.james.imap.decode.parser;
-import org.apache.james.imap.api.ImapCommand;
import org.apache.james.imap.api.ImapConstants;
import org.apache.james.imap.api.Tag;
import org.apache.james.imap.api.message.IdRange;
@@ -11,15 +10,12 @@ import org.apache.james.imap.message.request.MoveRequest;
* Parse MOVE commands
*/
public class MoveCommandParser extends AbstractMessageRangeCommandParser {
-
public MoveCommandParser(StatusResponseFactory statusResponseFactory) {
super(ImapConstants.MOVE_COMMAND, statusResponseFactory);
}
@Override
- protected MoveRequest createRequest(ImapCommand command, Tag tag,
- boolean useUids, IdRange[] idSet, String mailboxName) {
- return new MoveRequest(command, idSet, mailboxName, useUids, tag);
+ protected MoveRequest createRequest(Tag tag, boolean useUids, IdRange[] idSet, String mailboxName) {
+ return new MoveRequest(idSet, mailboxName, useUids, tag);
}
-
}
diff --git a/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/MyRightsCommandParser.java b/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/MyRightsCommandParser.java
index 584a006..1123130 100644
--- a/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/MyRightsCommandParser.java
+++ b/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/MyRightsCommandParser.java
@@ -19,7 +19,6 @@
package org.apache.james.imap.decode.parser;
-import org.apache.james.imap.api.ImapCommand;
import org.apache.james.imap.api.ImapConstants;
import org.apache.james.imap.api.ImapMessage;
import org.apache.james.imap.api.Tag;
@@ -40,10 +39,9 @@ public class MyRightsCommandParser extends AbstractImapCommandParser {
}
@Override
- protected ImapMessage decode(ImapCommand command, ImapRequestLineReader request, Tag tag, ImapSession session) throws DecodingException {
+ protected ImapMessage decode(ImapRequestLineReader request, Tag tag, ImapSession session) throws DecodingException {
final String mailboxName = request.mailbox();
request.eol();
- return new MyRightsRequest(tag, command, mailboxName);
+ return new MyRightsRequest(tag, mailboxName);
}
-
}
diff --git a/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/NamespaceCommandParser.java b/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/NamespaceCommandParser.java
index b83371a..6ecf1b6 100644
--- a/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/NamespaceCommandParser.java
+++ b/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/NamespaceCommandParser.java
@@ -18,7 +18,6 @@
****************************************************************/
package org.apache.james.imap.decode.parser;
-import org.apache.james.imap.api.ImapCommand;
import org.apache.james.imap.api.ImapConstants;
import org.apache.james.imap.api.ImapMessage;
import org.apache.james.imap.api.Tag;
@@ -33,13 +32,12 @@ import org.apache.james.imap.message.request.NamespaceRequest;
* Parse NAMESPACE commands
*/
public class NamespaceCommandParser extends AbstractImapCommandParser {
-
public NamespaceCommandParser(StatusResponseFactory statusResponseFactory) {
- super(ImapCommand.authenticatedStateCommand(ImapConstants.NAMESPACE_COMMAND_NAME), statusResponseFactory);
+ super(ImapConstants.NAMESPACE_COMMAND, statusResponseFactory);
}
@Override
- protected ImapMessage decode(ImapCommand command, ImapRequestLineReader request, Tag tag, ImapSession session) throws DecodingException {
- return new NamespaceRequest(command, tag);
+ protected ImapMessage decode(ImapRequestLineReader request, Tag tag, ImapSession session) throws DecodingException {
+ return new NamespaceRequest(tag);
}
}
diff --git a/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/NoopCommandParser.java b/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/NoopCommandParser.java
index b0eba28..22face9 100644
--- a/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/NoopCommandParser.java
+++ b/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/NoopCommandParser.java
@@ -18,7 +18,6 @@
****************************************************************/
package org.apache.james.imap.decode.parser;
-import org.apache.james.imap.api.ImapCommand;
import org.apache.james.imap.api.ImapConstants;
import org.apache.james.imap.api.ImapMessage;
import org.apache.james.imap.api.Tag;
@@ -33,15 +32,13 @@ import org.apache.james.imap.message.request.NoopRequest;
* Parses NOOP commands
*/
public class NoopCommandParser extends AbstractImapCommandParser {
-
public NoopCommandParser(StatusResponseFactory statusResponseFactory) {
super(ImapConstants.NOOP_COMMAND, statusResponseFactory);
}
@Override
- protected ImapMessage decode(ImapCommand command, ImapRequestLineReader request, Tag tag, ImapSession session) throws DecodingException {
+ protected ImapMessage decode(ImapRequestLineReader request, Tag tag, ImapSession session) throws DecodingException {
request.eol();
- return new NoopRequest(command, tag);
+ return new NoopRequest(tag);
}
-
}
diff --git a/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/RenameCommandParser.java b/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/RenameCommandParser.java
index bc40f93..8d4177c 100644
--- a/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/RenameCommandParser.java
+++ b/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/RenameCommandParser.java
@@ -18,7 +18,6 @@
****************************************************************/
package org.apache.james.imap.decode.parser;
-import org.apache.james.imap.api.ImapCommand;
import org.apache.james.imap.api.ImapConstants;
import org.apache.james.imap.api.ImapMessage;
import org.apache.james.imap.api.Tag;
@@ -33,17 +32,15 @@ import org.apache.james.imap.message.request.RenameRequest;
* Parses RENAME command
*/
public class RenameCommandParser extends AbstractImapCommandParser {
-
public RenameCommandParser(StatusResponseFactory statusResponseFactory) {
super(ImapConstants.RENAME_COMMAND, statusResponseFactory);
}
@Override
- protected ImapMessage decode(ImapCommand command, ImapRequestLineReader request, Tag tag, ImapSession session) throws DecodingException {
+ protected ImapMessage decode(ImapRequestLineReader request, Tag tag, ImapSession session) throws DecodingException {
final String existingName = request.mailbox();
final String newName = request.mailbox();
request.eol();
- return new RenameRequest(command, existingName, newName, tag);
+ return new RenameRequest(existingName, newName, tag);
}
-
}
diff --git a/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/SearchCommandParser.java b/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/SearchCommandParser.java
index 79824d4..37e5436 100644
--- a/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/SearchCommandParser.java
+++ b/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/SearchCommandParser.java
@@ -25,7 +25,6 @@ import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
-import org.apache.james.imap.api.ImapCommand;
import org.apache.james.imap.api.ImapConstants;
import org.apache.james.imap.api.ImapMessage;
import org.apache.james.imap.api.Tag;
@@ -902,9 +901,9 @@ public class SearchCommandParser extends AbstractUidCommandParser {
return result;
}
- private ImapMessage unsupportedCharset(Tag tag, ImapCommand command) {
+ private ImapMessage unsupportedCharset(Tag tag) {
final ResponseCode badCharset = StatusResponse.ResponseCode.badCharset();
- return taggedNo(tag, command, HumanReadableText.BAD_CHARSET, badCharset);
+ return taggedNo(tag, ImapConstants.SEARCH_COMMAND, HumanReadableText.BAD_CHARSET, badCharset);
}
/**
@@ -968,7 +967,7 @@ public class SearchCommandParser extends AbstractUidCommandParser {
}
@Override
- protected ImapMessage decode(ImapCommand command, ImapRequestLineReader request, Tag tag, boolean useUids, ImapSession session) throws DecodingException {
+ protected ImapMessage decode(ImapRequestLineReader request, Tag tag, boolean useUids, ImapSession session) throws DecodingException {
try {
SearchKey recent = null;
List<SearchResultOption> options = null;
@@ -1018,10 +1017,10 @@ public class SearchCommandParser extends AbstractUidCommandParser {
options = new ArrayList<>();
}
- return new SearchRequest(command, new SearchOperation(finalKey, options), useUids, tag);
+ return new SearchRequest(new SearchOperation(finalKey, options), useUids, tag);
} catch (IllegalCharsetNameException | UnsupportedCharsetException e) {
LOGGER.debug("Unable to decode request", e);
- return unsupportedCharset(tag, command);
+ return unsupportedCharset(tag);
}
}
diff --git a/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/SelectCommandParser.java b/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/SelectCommandParser.java
index cb38294..8fc5dc8 100644
--- a/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/SelectCommandParser.java
+++ b/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/SelectCommandParser.java
@@ -18,7 +18,6 @@
****************************************************************/
package org.apache.james.imap.decode.parser;
-import org.apache.james.imap.api.ImapCommand;
import org.apache.james.imap.api.ImapConstants;
import org.apache.james.imap.api.Tag;
import org.apache.james.imap.api.message.IdRange;
@@ -36,7 +35,7 @@ public class SelectCommandParser extends AbstractSelectionCommandParser {
}
@Override
- protected AbstractMailboxSelectionRequest createRequest(ImapCommand command, String mailboxName, boolean condstore, Long lastKnownUidValidity, Long knownModSeq, UidRange[] uidSet, UidRange[] knownUidSet, IdRange[] knownSequenceSet, Tag tag) {
- return new SelectRequest(command, mailboxName, condstore, lastKnownUidValidity, knownModSeq, uidSet, knownUidSet, knownSequenceSet, tag);
+ protected AbstractMailboxSelectionRequest createRequest(String mailboxName, boolean condstore, Long lastKnownUidValidity, Long knownModSeq, UidRange[] uidSet, UidRange[] knownUidSet, IdRange[] knownSequenceSet, Tag tag) {
+ return new SelectRequest(mailboxName, condstore, lastKnownUidValidity, knownModSeq, uidSet, knownUidSet, knownSequenceSet, tag);
}
}
diff --git a/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/SetACLCommandParser.java b/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/SetACLCommandParser.java
index 4a967d6..981b486 100644
--- a/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/SetACLCommandParser.java
+++ b/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/SetACLCommandParser.java
@@ -19,7 +19,6 @@
package org.apache.james.imap.decode.parser;
-import org.apache.james.imap.api.ImapCommand;
import org.apache.james.imap.api.ImapConstants;
import org.apache.james.imap.api.ImapMessage;
import org.apache.james.imap.api.Tag;
@@ -34,18 +33,16 @@ import org.apache.james.imap.message.request.SetACLRequest;
* SETACL Parser
*/
public class SetACLCommandParser extends AbstractImapCommandParser {
-
public SetACLCommandParser(StatusResponseFactory statusResponseFactory) {
super(ImapConstants.SETACL_COMMAND, statusResponseFactory);
}
@Override
- protected ImapMessage decode(ImapCommand command, ImapRequestLineReader request, Tag tag, ImapSession session) throws DecodingException {
+ protected ImapMessage decode(ImapRequestLineReader request, Tag tag, ImapSession session) throws DecodingException {
final String mailboxName = request.mailbox();
final String identifier = request.astring();
final String rights = request.astring();
request.eol();
- return new SetACLRequest(tag, command, mailboxName, identifier, rights);
+ return new SetACLRequest(tag, mailboxName, identifier, rights);
}
-
}
diff --git a/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/SetAnnotationCommandParser.java b/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/SetAnnotationCommandParser.java
index ee34dc6..a3c7f2f 100644
--- a/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/SetAnnotationCommandParser.java
+++ b/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/SetAnnotationCommandParser.java
@@ -22,7 +22,6 @@ package org.apache.james.imap.decode.parser;
import java.util.Optional;
import java.util.function.Function;
-import org.apache.james.imap.api.ImapCommand;
import org.apache.james.imap.api.ImapConstants;
import org.apache.james.imap.api.ImapMessage;
import org.apache.james.imap.api.Tag;
@@ -44,7 +43,7 @@ public class SetAnnotationCommandParser extends AbstractImapCommandParser {
}
@Override
- protected ImapMessage decode(ImapCommand command, ImapRequestLineReader request, Tag tag, ImapSession session)
+ protected ImapMessage decode(ImapRequestLineReader request, Tag tag, ImapSession session)
throws DecodingException {
String mailboxName = request.mailbox();
ImmutableList.Builder<MailboxAnnotation> listMailboxAnnotations = ImmutableList.<MailboxAnnotation>builder();
@@ -60,7 +59,7 @@ public class SetAnnotationCommandParser extends AbstractImapCommandParser {
}
request.eol();
- return new SetAnnotationRequest(tag, command, mailboxName, listMailboxAnnotations.build());
+ return new SetAnnotationRequest(tag, mailboxName, listMailboxAnnotations.build());
}
private MailboxAnnotation readNextAnnotation(ImapRequestLineReader request) throws DecodingException {
diff --git a/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/SetQuotaCommandParser.java b/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/SetQuotaCommandParser.java
index ced2ca0..d44d3b2 100644
--- a/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/SetQuotaCommandParser.java
+++ b/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/SetQuotaCommandParser.java
@@ -19,7 +19,6 @@
package org.apache.james.imap.decode.parser;
-import org.apache.james.imap.api.ImapCommand;
import org.apache.james.imap.api.ImapConstants;
import org.apache.james.imap.api.ImapMessage;
import org.apache.james.imap.api.Tag;
@@ -34,15 +33,14 @@ import org.apache.james.imap.message.request.SetQuotaRequest;
* SETQUOTA command parser
*/
public class SetQuotaCommandParser extends AbstractImapCommandParser {
-
public SetQuotaCommandParser(StatusResponseFactory statusResponseFactory) {
super(ImapConstants.SETQUOTA_COMMAND, statusResponseFactory);
}
@Override
- protected ImapMessage decode(ImapCommand command, ImapRequestLineReader request, Tag tag, ImapSession session) throws DecodingException {
+ protected ImapMessage decode(ImapRequestLineReader request, Tag tag, ImapSession session) throws DecodingException {
final String quotaRoot = request.atom();
- SetQuotaRequest setQuotaRequest = new SetQuotaRequest(tag, command, quotaRoot);
+ SetQuotaRequest setQuotaRequest = new SetQuotaRequest(tag, quotaRoot);
// We now parse resource limit declaration
// It has the following shape : (RESOURCE1 1024000) (RESOURCE2 2048000)\n
request.nextWordChar();
diff --git a/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/StartTLSCommandParser.java b/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/StartTLSCommandParser.java
index ec0fdf0..ea5f77b 100644
--- a/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/StartTLSCommandParser.java
+++ b/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/StartTLSCommandParser.java
@@ -18,7 +18,6 @@
****************************************************************/
package org.apache.james.imap.decode.parser;
-import org.apache.james.imap.api.ImapCommand;
import org.apache.james.imap.api.ImapConstants;
import org.apache.james.imap.api.ImapMessage;
import org.apache.james.imap.api.Tag;
@@ -33,15 +32,13 @@ import org.apache.james.imap.message.request.StartTLSRequest;
* Parse STARTTLS commands
*/
public class StartTLSCommandParser extends AbstractImapCommandParser {
-
public StartTLSCommandParser(StatusResponseFactory statusResponseFactory) {
- super(ImapCommand.nonAuthenticatedStateCommand(ImapConstants.STARTTLS), statusResponseFactory);
+ super(ImapConstants.STARTTLS_COMMAND, statusResponseFactory);
}
@Override
- protected ImapMessage decode(ImapCommand command, ImapRequestLineReader request, Tag tag, ImapSession session) throws DecodingException {
+ protected ImapMessage decode(ImapRequestLineReader request, Tag tag, ImapSession session) throws DecodingException {
request.eol();
- return new StartTLSRequest(tag, command);
+ return new StartTLSRequest(tag);
}
-
}
diff --git a/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/StatusCommandParser.java b/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/StatusCommandParser.java
index 33e81c1..0afbbaf8 100644
--- a/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/StatusCommandParser.java
+++ b/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/StatusCommandParser.java
@@ -20,7 +20,6 @@ package org.apache.james.imap.decode.parser;
import java.util.EnumSet;
-import org.apache.james.imap.api.ImapCommand;
import org.apache.james.imap.api.ImapConstants;
import org.apache.james.imap.api.ImapMessage;
import org.apache.james.imap.api.Tag;
@@ -48,11 +47,11 @@ public class StatusCommandParser extends AbstractImapCommandParser {
}
@Override
- protected ImapMessage decode(ImapCommand command, ImapRequestLineReader request, Tag tag, ImapSession session) throws DecodingException {
+ protected ImapMessage decode(ImapRequestLineReader request, Tag tag, ImapSession session) throws DecodingException {
String mailboxName = request.mailbox();
StatusDataItems statusDataItems = statusDataItems(request);
request.eol();
- return new StatusRequest(command, mailboxName, statusDataItems, tag);
+ return new StatusRequest(mailboxName, statusDataItems, tag);
}
private StatusDataItems statusDataItems(ImapRequestLineReader request) throws DecodingException {
diff --git a/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/StoreCommandParser.java b/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/StoreCommandParser.java
index a2369fd..807385c 100644
--- a/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/StoreCommandParser.java
+++ b/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/StoreCommandParser.java
@@ -20,7 +20,6 @@ package org.apache.james.imap.decode.parser;
import javax.mail.Flags;
-import org.apache.james.imap.api.ImapCommand;
import org.apache.james.imap.api.ImapConstants;
import org.apache.james.imap.api.ImapMessage;
import org.apache.james.imap.api.Tag;
@@ -46,7 +45,7 @@ public class StoreCommandParser extends AbstractUidCommandParser {
}
@Override
- protected ImapMessage decode(ImapCommand command, ImapRequestLineReader request, Tag tag, boolean useUids, ImapSession session) throws DecodingException {
+ protected ImapMessage decode(ImapRequestLineReader request, Tag tag, boolean useUids, ImapSession session) throws DecodingException {
final IdRange[] idSet = request.parseIdRange(session);
boolean silent = false;
long unchangedSince = -1;
@@ -111,6 +110,6 @@ public class StoreCommandParser extends AbstractUidCommandParser {
}
request.eol();
- return new StoreRequest(command, idSet, silent, flags, useUids, tag, flagsUpdateMode, unchangedSince);
+ return new StoreRequest(idSet, silent, flags, useUids, tag, flagsUpdateMode, unchangedSince);
}
}
diff --git a/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/SubscribeCommandParser.java b/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/SubscribeCommandParser.java
index ae092b6..d064bd2 100644
--- a/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/SubscribeCommandParser.java
+++ b/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/SubscribeCommandParser.java
@@ -18,7 +18,6 @@
****************************************************************/
package org.apache.james.imap.decode.parser;
-import org.apache.james.imap.api.ImapCommand;
import org.apache.james.imap.api.ImapConstants;
import org.apache.james.imap.api.ImapMessage;
import org.apache.james.imap.api.Tag;
@@ -33,17 +32,15 @@ import org.apache.james.imap.message.request.SubscribeRequest;
* Parse SUBSCRIBE commands
*/
public class SubscribeCommandParser extends AbstractImapCommandParser {
-
public SubscribeCommandParser(StatusResponseFactory statusResponseFactory) {
super(ImapConstants.SUBSCRIBE_COMMAND, statusResponseFactory);
}
@Override
- protected ImapMessage decode(ImapCommand command, ImapRequestLineReader request, Tag tag, ImapSession session) throws DecodingException {
+ protected ImapMessage decode(ImapRequestLineReader request, Tag tag, ImapSession session) throws DecodingException {
final String mailboxName = request.mailbox();
request.eol();
- return new SubscribeRequest(command, mailboxName, tag);
+ return new SubscribeRequest(mailboxName, tag);
}
-
}
diff --git a/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/UidCommandParser.java b/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/UidCommandParser.java
index 4fc0e3a..abfb501 100644
--- a/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/UidCommandParser.java
+++ b/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/UidCommandParser.java
@@ -18,7 +18,6 @@
****************************************************************/
package org.apache.james.imap.decode.parser;
-import org.apache.james.imap.api.ImapCommand;
import org.apache.james.imap.api.ImapConstants;
import org.apache.james.imap.api.ImapMessage;
import org.apache.james.imap.api.Tag;
@@ -47,7 +46,7 @@ public class UidCommandParser extends AbstractImapCommandParser {
}
@Override
- protected ImapMessage decode(ImapCommand command, ImapRequestLineReader request, Tag tag, ImapSession session) throws DecodingException {
+ protected ImapMessage decode(ImapRequestLineReader request, Tag tag, ImapSession session) throws DecodingException {
// TODO: check the logic against the specification:
// TODO: suspect that it is now bust
// TODO: the command written may be wrong
diff --git a/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/UnselectCommandParser.java b/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/UnselectCommandParser.java
index 10c1daa..453df12 100644
--- a/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/UnselectCommandParser.java
+++ b/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/UnselectCommandParser.java
@@ -18,7 +18,6 @@
****************************************************************/
package org.apache.james.imap.decode.parser;
-import org.apache.james.imap.api.ImapCommand;
import org.apache.james.imap.api.ImapConstants;
import org.apache.james.imap.api.ImapMessage;
import org.apache.james.imap.api.Tag;
@@ -35,19 +34,16 @@ import org.apache.james.imap.message.request.UnselectRequest;
* See RFC3691
*/
public class UnselectCommandParser extends AbstractImapCommandParser {
-
public UnselectCommandParser(StatusResponseFactory statusResponseFactory) {
// from the RFC it seems like the command should be valid in any state.
// At least kind of, as we will return a "BAD" response if no mailbox is
// currently selected in the UnselectProcessor
super(ImapConstants.UNSELECT_COMMAND, statusResponseFactory);
-
}
@Override
- protected ImapMessage decode(ImapCommand command, ImapRequestLineReader request, Tag tag, ImapSession session) throws DecodingException {
+ protected ImapMessage decode(ImapRequestLineReader request, Tag tag, ImapSession session) throws DecodingException {
request.eol();
- return new UnselectRequest(tag, command);
+ return new UnselectRequest(tag);
}
-
}
diff --git a/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/UnsubscribeCommandParser.java b/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/UnsubscribeCommandParser.java
index c1930db..80725da 100644
--- a/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/UnsubscribeCommandParser.java
+++ b/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/UnsubscribeCommandParser.java
@@ -18,7 +18,6 @@
****************************************************************/
package org.apache.james.imap.decode.parser;
-import org.apache.james.imap.api.ImapCommand;
import org.apache.james.imap.api.ImapConstants;
import org.apache.james.imap.api.ImapMessage;
import org.apache.james.imap.api.Tag;
@@ -33,16 +32,14 @@ import org.apache.james.imap.message.request.UnsubscribeRequest;
* Parse UNSUBSCRIBE commands
*/
public class UnsubscribeCommandParser extends AbstractImapCommandParser {
-
public UnsubscribeCommandParser(StatusResponseFactory statusResponseFactory) {
super(ImapConstants.UNSUBSCRIBE_COMMAND, statusResponseFactory);
}
@Override
- protected ImapMessage decode(ImapCommand command, ImapRequestLineReader request, Tag tag, ImapSession session) throws DecodingException {
+ protected ImapMessage decode(ImapRequestLineReader request, Tag tag, ImapSession session) throws DecodingException {
final String mailboxName = request.mailbox();
request.eol();
- return new UnsubscribeRequest(command, mailboxName, tag);
+ return new UnsubscribeRequest(mailboxName, tag);
}
-
}
diff --git a/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/XListCommandParser.java b/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/XListCommandParser.java
index 6c5e7eb..15879fa 100644
--- a/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/XListCommandParser.java
+++ b/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/XListCommandParser.java
@@ -18,7 +18,6 @@
****************************************************************/
package org.apache.james.imap.decode.parser;
-import org.apache.james.imap.api.ImapCommand;
import org.apache.james.imap.api.ImapConstants;
import org.apache.james.imap.api.ImapMessage;
import org.apache.james.imap.api.Tag;
@@ -29,13 +28,12 @@ import org.apache.james.imap.message.request.XListRequest;
* Parse XLIST commands
*/
public class XListCommandParser extends ListCommandParser {
-
public XListCommandParser(StatusResponseFactory statusResponseFactory) {
super(ImapConstants.XLIST_COMMAND, statusResponseFactory);
}
@Override
- protected ImapMessage createMessage(ImapCommand command, String referenceName, String mailboxPattern, Tag tag) {
- return new XListRequest(command, referenceName, mailboxPattern, tag);
+ protected ImapMessage createMessage(String referenceName, String mailboxPattern, Tag tag) {
+ return new XListRequest(referenceName, mailboxPattern, tag);
}
}
diff --git a/protocols/imap/src/main/java/org/apache/james/imap/encode/NamespaceResponseEncoder.java b/protocols/imap/src/main/java/org/apache/james/imap/encode/NamespaceResponseEncoder.java
index 67f9cbb..6d2456b 100644
--- a/protocols/imap/src/main/java/org/apache/james/imap/encode/NamespaceResponseEncoder.java
+++ b/protocols/imap/src/main/java/org/apache/james/imap/encode/NamespaceResponseEncoder.java
@@ -37,7 +37,7 @@ public class NamespaceResponseEncoder implements ImapResponseEncoder<NamespaceRe
@Override
public void encode(NamespaceResponse response, ImapResponseComposer composer) throws IOException {
composer.untagged();
- composer.commandName(ImapConstants.NAMESPACE_COMMAND_NAME);
+ composer.commandName(ImapConstants.NAMESPACE_COMMAND.getName());
final List<NamespaceResponse.Namespace> personal = response.getPersonal();
encode(personal, composer);
diff --git a/protocols/imap/src/main/java/org/apache/james/imap/message/request/AppendRequest.java b/protocols/imap/src/main/java/org/apache/james/imap/message/request/AppendRequest.java
index cefe6b2..839bcea 100644
--- a/protocols/imap/src/main/java/org/apache/james/imap/message/request/AppendRequest.java
+++ b/protocols/imap/src/main/java/org/apache/james/imap/message/request/AppendRequest.java
@@ -23,7 +23,7 @@ import java.util.Date;
import javax.mail.Flags;
-import org.apache.james.imap.api.ImapCommand;
+import org.apache.james.imap.api.ImapConstants;
import org.apache.james.imap.api.Tag;
import org.apache.james.imap.api.message.request.ImapRequest;
@@ -32,15 +32,12 @@ import org.apache.james.imap.api.message.request.ImapRequest;
*/
public class AppendRequest extends AbstractImapRequest {
private final String mailboxName;
-
private final Flags flags;
-
private final Date datetime;
-
private final InputStream message;
- public AppendRequest(ImapCommand command, String mailboxName, Flags flags, Date datetime, InputStream message, Tag tag) {
- super(tag, command);
+ public AppendRequest(String mailboxName, Flags flags, Date datetime, InputStream message, Tag tag) {
+ super(tag, ImapConstants.APPEND_COMMAND);
this.mailboxName = mailboxName;
this.flags = flags;
this.datetime = datetime;
diff --git a/protocols/imap/src/main/java/org/apache/james/imap/message/request/AuthenticateRequest.java b/protocols/imap/src/main/java/org/apache/james/imap/message/request/AuthenticateRequest.java
index b0b2a6a..6bb79f8 100644
--- a/protocols/imap/src/main/java/org/apache/james/imap/message/request/AuthenticateRequest.java
+++ b/protocols/imap/src/main/java/org/apache/james/imap/message/request/AuthenticateRequest.java
@@ -18,15 +18,14 @@
****************************************************************/
package org.apache.james.imap.message.request;
-import org.apache.james.imap.api.ImapCommand;
+import org.apache.james.imap.api.ImapConstants;
import org.apache.james.imap.api.Tag;
public class AuthenticateRequest extends AbstractImapRequest {
-
private final String authType;
- public AuthenticateRequest(ImapCommand command, String authType, Tag tag) {
- super(tag, command);
+ public AuthenticateRequest(String authType, Tag tag) {
+ super(tag, ImapConstants.AUTHENTICATE_COMMAND);
this.authType = authType;
}
diff --git a/protocols/imap/src/main/java/org/apache/james/imap/message/request/CapabilityRequest.java b/protocols/imap/src/main/java/org/apache/james/imap/message/request/CapabilityRequest.java
index 4bf8cf5..52a32d8 100644
--- a/protocols/imap/src/main/java/org/apache/james/imap/message/request/CapabilityRequest.java
+++ b/protocols/imap/src/main/java/org/apache/james/imap/message/request/CapabilityRequest.java
@@ -18,12 +18,11 @@
****************************************************************/
package org.apache.james.imap.message.request;
-import org.apache.james.imap.api.ImapCommand;
+import org.apache.james.imap.api.ImapConstants;
import org.apache.james.imap.api.Tag;
public class CapabilityRequest extends AbstractImapRequest {
-
- public CapabilityRequest(ImapCommand command, Tag tag) {
- super(tag, command);
+ public CapabilityRequest(Tag tag) {
+ super(tag, ImapConstants.CAPABILITY_COMMAND);
}
}
diff --git a/protocols/imap/src/main/java/org/apache/james/imap/message/request/CheckRequest.java b/protocols/imap/src/main/java/org/apache/james/imap/message/request/CheckRequest.java
index 54cd8b6..54be06a 100644
--- a/protocols/imap/src/main/java/org/apache/james/imap/message/request/CheckRequest.java
+++ b/protocols/imap/src/main/java/org/apache/james/imap/message/request/CheckRequest.java
@@ -18,12 +18,11 @@
****************************************************************/
package org.apache.james.imap.message.request;
-import org.apache.james.imap.api.ImapCommand;
+import org.apache.james.imap.api.ImapConstants;
import org.apache.james.imap.api.Tag;
public class CheckRequest extends AbstractImapRequest {
-
- public CheckRequest(ImapCommand command, Tag tag) {
- super(tag, command);
+ public CheckRequest(Tag tag) {
+ super(tag, ImapConstants.CHECK_COMMAND);
}
}
diff --git a/protocols/imap/src/main/java/org/apache/james/imap/message/request/CloseRequest.java b/protocols/imap/src/main/java/org/apache/james/imap/message/request/CloseRequest.java
index 0d076bb..1f5aa50 100644
--- a/protocols/imap/src/main/java/org/apache/james/imap/message/request/CloseRequest.java
+++ b/protocols/imap/src/main/java/org/apache/james/imap/message/request/CloseRequest.java
@@ -18,12 +18,11 @@
****************************************************************/
package org.apache.james.imap.message.request;
-import org.apache.james.imap.api.ImapCommand;
+import org.apache.james.imap.api.ImapConstants;
import org.apache.james.imap.api.Tag;
public class CloseRequest extends AbstractImapRequest {
-
- public CloseRequest(ImapCommand command, Tag tag) {
- super(tag, command);
+ public CloseRequest(Tag tag) {
+ super(tag, ImapConstants.CLOSE_COMMAND);
}
}
diff --git a/protocols/imap/src/main/java/org/apache/james/imap/message/request/CompressRequest.java b/protocols/imap/src/main/java/org/apache/james/imap/message/request/CompressRequest.java
index c193068..0d3beac 100644
--- a/protocols/imap/src/main/java/org/apache/james/imap/message/request/CompressRequest.java
+++ b/protocols/imap/src/main/java/org/apache/james/imap/message/request/CompressRequest.java
@@ -18,15 +18,14 @@
****************************************************************/
package org.apache.james.imap.message.request;
-import org.apache.james.imap.api.ImapCommand;
+import org.apache.james.imap.api.ImapConstants;
import org.apache.james.imap.api.Tag;
public class CompressRequest extends AbstractImapRequest {
-
private final String algorithm;
- public CompressRequest(Tag tag, ImapCommand command, String algorithm) {
- super(tag, command);
+ public CompressRequest(Tag tag, String algorithm) {
+ super(tag, ImapConstants.COMPRESS_COMMAND);
this.algorithm = algorithm;
}
diff --git a/protocols/imap/src/main/java/org/apache/james/imap/message/request/CopyRequest.java b/protocols/imap/src/main/java/org/apache/james/imap/message/request/CopyRequest.java
index ef28ee6..c136aaf 100644
--- a/protocols/imap/src/main/java/org/apache/james/imap/message/request/CopyRequest.java
+++ b/protocols/imap/src/main/java/org/apache/james/imap/message/request/CopyRequest.java
@@ -18,7 +18,7 @@
****************************************************************/
package org.apache.james.imap.message.request;
-import org.apache.james.imap.api.ImapCommand;
+import org.apache.james.imap.api.ImapConstants;
import org.apache.james.imap.api.Tag;
import org.apache.james.imap.api.message.IdRange;
import org.apache.james.imap.api.message.request.ImapRequest;
@@ -27,8 +27,7 @@ import org.apache.james.imap.api.message.request.ImapRequest;
* {@link ImapRequest} which request the copy of messages
*/
public class CopyRequest extends AbstractMessageRangeRequest {
-
- public CopyRequest(ImapCommand command, IdRange[] idSet, String mailboxName, boolean useUids, Tag tag) {
- super(command, idSet, mailboxName, useUids, tag);
+ public CopyRequest(IdRange[] idSet, String mailboxName, boolean useUids, Tag tag) {
+ super(ImapConstants.COPY_COMMAND, idSet, mailboxName, useUids, tag);
}
}
diff --git a/protocols/imap/src/main/java/org/apache/james/imap/message/request/CreateRequest.java b/protocols/imap/src/main/java/org/apache/james/imap/message/request/CreateRequest.java
index b7df81d..6f85aa1 100644
--- a/protocols/imap/src/main/java/org/apache/james/imap/message/request/CreateRequest.java
+++ b/protocols/imap/src/main/java/org/apache/james/imap/message/request/CreateRequest.java
@@ -18,7 +18,7 @@
****************************************************************/
package org.apache.james.imap.message.request;
-import org.apache.james.imap.api.ImapCommand;
+import org.apache.james.imap.api.ImapConstants;
import org.apache.james.imap.api.Tag;
import org.apache.james.imap.api.message.request.ImapRequest;
@@ -28,8 +28,8 @@ import org.apache.james.imap.api.message.request.ImapRequest;
public class CreateRequest extends AbstractImapRequest {
private final String mailboxName;
- public CreateRequest(ImapCommand command, String mailboxName, Tag tag) {
- super(tag, command);
+ public CreateRequest(String mailboxName, Tag tag) {
+ super(tag, ImapConstants.CREATE_COMMAND);
this.mailboxName = mailboxName;
}
diff --git a/protocols/imap/src/main/java/org/apache/james/imap/message/request/DeleteACLRequest.java b/protocols/imap/src/main/java/org/apache/james/imap/message/request/DeleteACLRequest.java
index 26b6d90..ea7f824 100644
--- a/protocols/imap/src/main/java/org/apache/james/imap/message/request/DeleteACLRequest.java
+++ b/protocols/imap/src/main/java/org/apache/james/imap/message/request/DeleteACLRequest.java
@@ -19,7 +19,7 @@
package org.apache.james.imap.message.request;
-import org.apache.james.imap.api.ImapCommand;
+import org.apache.james.imap.api.ImapConstants;
import org.apache.james.imap.api.Tag;
/**
@@ -29,8 +29,8 @@ public class DeleteACLRequest extends AbstractImapRequest {
private final String identifier;
private final String mailboxName;
- public DeleteACLRequest(Tag tag, ImapCommand command, String mailboxName, String identifier) {
- super(tag, command);
+ public DeleteACLRequest(Tag tag, String mailboxName, String identifier) {
+ super(tag, ImapConstants.DELETEACL_COMMAND);
this.mailboxName = mailboxName;
this.identifier = identifier;
}
diff --git a/protocols/imap/src/main/java/org/apache/james/imap/message/request/DeleteRequest.java b/protocols/imap/src/main/java/org/apache/james/imap/message/request/DeleteRequest.java
index 8ccf9cc..20900b6 100644
--- a/protocols/imap/src/main/java/org/apache/james/imap/message/request/DeleteRequest.java
+++ b/protocols/imap/src/main/java/org/apache/james/imap/message/request/DeleteRequest.java
@@ -18,7 +18,7 @@
****************************************************************/
package org.apache.james.imap.message.request;
-import org.apache.james.imap.api.ImapCommand;
+import org.apache.james.imap.api.ImapConstants;
import org.apache.james.imap.api.Tag;
import org.apache.james.imap.api.message.request.ImapRequest;
@@ -28,8 +28,8 @@ import org.apache.james.imap.api.message.request.ImapRequest;
public class DeleteRequest extends AbstractImapRequest {
private final String mailboxName;
- public DeleteRequest(ImapCommand command, String mailboxName, Tag tag) {
- super(tag, command);
+ public DeleteRequest(String mailboxName, Tag tag) {
+ super(tag, ImapConstants.DELETE_COMMAND);
this.mailboxName = mailboxName;
}
diff --git a/protocols/imap/src/main/java/org/apache/james/imap/message/request/EnableRequest.java b/protocols/imap/src/main/java/org/apache/james/imap/message/request/EnableRequest.java
index d05be83..e9e1efe 100644
--- a/protocols/imap/src/main/java/org/apache/james/imap/message/request/EnableRequest.java
+++ b/protocols/imap/src/main/java/org/apache/james/imap/message/request/EnableRequest.java
@@ -20,7 +20,7 @@ package org.apache.james.imap.message.request;
import java.util.List;
-import org.apache.james.imap.api.ImapCommand;
+import org.apache.james.imap.api.ImapConstants;
import org.apache.james.imap.api.Tag;
import org.apache.james.imap.api.message.Capability;
@@ -28,8 +28,8 @@ public class EnableRequest extends AbstractImapRequest {
private final List<Capability> capabilities;
- public EnableRequest(Tag tag, ImapCommand command, List<Capability> capabilities) {
- super(tag, command);
+ public EnableRequest(Tag tag, List<Capability> capabilities) {
+ super(tag, ImapConstants.ENABLE_COMMAND);
this.capabilities = capabilities;
}
diff --git a/protocols/imap/src/main/java/org/apache/james/imap/message/request/ExamineRequest.java b/protocols/imap/src/main/java/org/apache/james/imap/message/request/ExamineRequest.java
index 5776d48..0d81852 100644
--- a/protocols/imap/src/main/java/org/apache/james/imap/message/request/ExamineRequest.java
+++ b/protocols/imap/src/main/java/org/apache/james/imap/message/request/ExamineRequest.java
@@ -18,14 +18,14 @@
****************************************************************/
package org.apache.james.imap.message.request;
-import org.apache.james.imap.api.ImapCommand;
+import org.apache.james.imap.api.ImapConstants;
import org.apache.james.imap.api.Tag;
import org.apache.james.imap.api.message.IdRange;
import org.apache.james.imap.api.message.UidRange;
public class ExamineRequest extends AbstractMailboxSelectionRequest {
- public ExamineRequest(ImapCommand command, String mailboxName, boolean condstore, Long lastKnownUidValidity, Long knownModSeq, UidRange[] uidSet, UidRange[] knownUidSet, IdRange[] knownSequenceSet, Tag tag) {
- super(command, mailboxName, condstore, lastKnownUidValidity, knownModSeq, uidSet, knownUidSet, knownSequenceSet, tag);
+ public ExamineRequest(String mailboxName, boolean condstore, Long lastKnownUidValidity, Long knownModSeq, UidRange[] uidSet, UidRange[] knownUidSet, IdRange[] knownSequenceSet, Tag tag) {
+ super(ImapConstants.EXAMINE_COMMAND, mailboxName, condstore, lastKnownUidValidity, knownModSeq, uidSet, knownUidSet, knownSequenceSet, tag);
}
}
diff --git a/protocols/imap/src/main/java/org/apache/james/imap/message/request/ExpungeRequest.java b/protocols/imap/src/main/java/org/apache/james/imap/message/request/ExpungeRequest.java
index 1f85390..461415e 100644
--- a/protocols/imap/src/main/java/org/apache/james/imap/message/request/ExpungeRequest.java
+++ b/protocols/imap/src/main/java/org/apache/james/imap/message/request/ExpungeRequest.java
@@ -18,7 +18,7 @@
****************************************************************/
package org.apache.james.imap.message.request;
-import org.apache.james.imap.api.ImapCommand;
+import org.apache.james.imap.api.ImapConstants;
import org.apache.james.imap.api.Tag;
import org.apache.james.imap.api.message.IdRange;
import org.apache.james.imap.api.message.request.ImapRequest;
@@ -29,8 +29,8 @@ import org.apache.james.imap.api.message.request.ImapRequest;
public class ExpungeRequest extends AbstractImapRequest {
private final IdRange[] uidRange;
- public ExpungeRequest(ImapCommand command, Tag tag, IdRange[] uidRange) {
- super(tag, command);
+ public ExpungeRequest(Tag tag, IdRange[] uidRange) {
+ super(tag, ImapConstants.EXPUNGE_COMMAND);
this.uidRange = uidRange;
}
diff --git a/protocols/imap/src/main/java/org/apache/james/imap/message/request/FetchRequest.java b/protocols/imap/src/main/java/org/apache/james/imap/message/request/FetchRequest.java
index 0619636..9dce8ee 100644
--- a/protocols/imap/src/main/java/org/apache/james/imap/message/request/FetchRequest.java
+++ b/protocols/imap/src/main/java/org/apache/james/imap/message/request/FetchRequest.java
@@ -18,20 +18,18 @@
****************************************************************/
package org.apache.james.imap.message.request;
-import org.apache.james.imap.api.ImapCommand;
+import org.apache.james.imap.api.ImapConstants;
import org.apache.james.imap.api.Tag;
import org.apache.james.imap.api.message.FetchData;
import org.apache.james.imap.api.message.IdRange;
public class FetchRequest extends AbstractImapRequest {
private final boolean useUids;
-
private final IdRange[] idSet;
-
private final FetchData fetch;
- public FetchRequest(ImapCommand command, boolean useUids, IdRange[] idSet, FetchData fetch, Tag tag) {
- super(tag, command);
+ public FetchRequest(boolean useUids, IdRange[] idSet, FetchData fetch, Tag tag) {
+ super(tag, ImapConstants.FETCH_COMMAND);
this.useUids = useUids;
this.idSet = idSet;
this.fetch = fetch;
diff --git a/protocols/imap/src/main/java/org/apache/james/imap/message/request/GetACLRequest.java b/protocols/imap/src/main/java/org/apache/james/imap/message/request/GetACLRequest.java
index df14fdf..d11262b 100644
--- a/protocols/imap/src/main/java/org/apache/james/imap/message/request/GetACLRequest.java
+++ b/protocols/imap/src/main/java/org/apache/james/imap/message/request/GetACLRequest.java
@@ -19,7 +19,7 @@
package org.apache.james.imap.message.request;
-import org.apache.james.imap.api.ImapCommand;
+import org.apache.james.imap.api.ImapConstants;
import org.apache.james.imap.api.Tag;
/**
@@ -28,8 +28,8 @@ import org.apache.james.imap.api.Tag;
public class GetACLRequest extends AbstractImapRequest {
private final String mailboxName;
- public GetACLRequest(Tag tag, ImapCommand command, String mailboxName) {
- super(tag, command);
+ public GetACLRequest(Tag tag, String mailboxName) {
+ super(tag, ImapConstants.GETACL_COMMAND);
this.mailboxName = mailboxName;
}
diff --git a/protocols/imap/src/main/java/org/apache/james/imap/message/request/GetAnnotationRequest.java b/protocols/imap/src/main/java/org/apache/james/imap/message/request/GetAnnotationRequest.java
index 43bfae8..84f2902 100644
--- a/protocols/imap/src/main/java/org/apache/james/imap/message/request/GetAnnotationRequest.java
+++ b/protocols/imap/src/main/java/org/apache/james/imap/message/request/GetAnnotationRequest.java
@@ -22,7 +22,7 @@ package org.apache.james.imap.message.request;
import java.util.Optional;
import java.util.Set;
-import org.apache.james.imap.api.ImapCommand;
+import org.apache.james.imap.api.ImapConstants;
import org.apache.james.imap.api.Tag;
import org.apache.james.mailbox.model.MailboxAnnotationKey;
@@ -32,7 +32,6 @@ import com.google.common.collect.ImmutableSet;
public class GetAnnotationRequest extends AbstractImapRequest {
public static class Builder {
private Tag tag;
- private ImapCommand command;
private String mailboxName;
private Set<MailboxAnnotationKey> keys;
private Optional<Integer> maxsize;
@@ -49,11 +48,6 @@ public class GetAnnotationRequest extends AbstractImapRequest {
return this;
}
- public Builder command(ImapCommand command) {
- this.command = command;
- return this;
- }
-
public Builder mailboxName(String mailboxName) {
Preconditions.checkNotNull(mailboxName);
this.mailboxName = mailboxName;
@@ -104,7 +98,7 @@ public class GetAnnotationRequest extends AbstractImapRequest {
private final Depth depth;
private GetAnnotationRequest(Builder builder) {
- super(builder.tag, builder.command);
+ super(builder.tag, ImapConstants.GETANNOTATION_COMMAND);
this.mailboxName = builder.mailboxName;
this.depth = builder.depth;
this.maxsize = builder.maxsize;
diff --git a/protocols/imap/src/main/java/org/apache/james/imap/message/request/GetQuotaRequest.java b/protocols/imap/src/main/java/org/apache/james/imap/message/request/GetQuotaRequest.java
index 6e07b96..1760066 100644
--- a/protocols/imap/src/main/java/org/apache/james/imap/message/request/GetQuotaRequest.java
+++ b/protocols/imap/src/main/java/org/apache/james/imap/message/request/GetQuotaRequest.java
@@ -19,7 +19,7 @@
package org.apache.james.imap.message.request;
-import org.apache.james.imap.api.ImapCommand;
+import org.apache.james.imap.api.ImapConstants;
import org.apache.james.imap.api.Tag;
/**
@@ -28,8 +28,8 @@ import org.apache.james.imap.api.Tag;
public class GetQuotaRequest extends AbstractImapRequest {
private final String quotaRoot;
- public GetQuotaRequest(Tag tag, ImapCommand command, String quotaRoot) {
- super(tag, command);
+ public GetQuotaRequest(Tag tag, String quotaRoot) {
+ super(tag, ImapConstants.GETQUOTA_COMMAND);
this.quotaRoot = quotaRoot;
}
diff --git a/protocols/imap/src/main/java/org/apache/james/imap/message/request/GetQuotaRootRequest.java b/protocols/imap/src/main/java/org/apache/james/imap/message/request/GetQuotaRootRequest.java
index fd0faff..b4c3d1f 100644
--- a/protocols/imap/src/main/java/org/apache/james/imap/message/request/GetQuotaRootRequest.java
+++ b/protocols/imap/src/main/java/org/apache/james/imap/message/request/GetQuotaRootRequest.java
@@ -19,7 +19,7 @@
package org.apache.james.imap.message.request;
-import org.apache.james.imap.api.ImapCommand;
+import org.apache.james.imap.api.ImapConstants;
import org.apache.james.imap.api.Tag;
/**
@@ -28,8 +28,8 @@ import org.apache.james.imap.api.Tag;
public class GetQuotaRootRequest extends AbstractImapRequest {
private final String mailboxName;
- public GetQuotaRootRequest(Tag tag, ImapCommand command, String mailboxName) {
- super(tag, command);
+ public GetQuotaRootRequest(Tag tag, String mailboxName) {
+ super(tag, ImapConstants.GETQUOTAROOT_COMMAND);
this.mailboxName = mailboxName;
}
diff --git a/protocols/imap/src/main/java/org/apache/james/imap/message/request/IRAuthenticateRequest.java b/protocols/imap/src/main/java/org/apache/james/imap/message/request/IRAuthenticateRequest.java
index 9958b09..f5ece53 100644
--- a/protocols/imap/src/main/java/org/apache/james/imap/message/request/IRAuthenticateRequest.java
+++ b/protocols/imap/src/main/java/org/apache/james/imap/message/request/IRAuthenticateRequest.java
@@ -18,7 +18,6 @@
****************************************************************/
package org.apache.james.imap.message.request;
-import org.apache.james.imap.api.ImapCommand;
import org.apache.james.imap.api.Tag;
/**
@@ -26,17 +25,14 @@ import org.apache.james.imap.api.Tag;
*
*/
public class IRAuthenticateRequest extends AuthenticateRequest {
-
private final String initialClientResponse;
- public IRAuthenticateRequest(ImapCommand command, String authType, Tag tag, String initialClientResponse) {
- super(command, authType, tag);
+ public IRAuthenticateRequest(String authType, Tag tag, String initialClientResponse) {
+ super(authType, tag);
this.initialClientResponse = initialClientResponse;
}
public String getInitialClientResponse() {
return initialClientResponse;
}
-
-
}
diff --git a/protocols/imap/src/main/java/org/apache/james/imap/message/request/IdleRequest.java b/protocols/imap/src/main/java/org/apache/james/imap/message/request/IdleRequest.java
index eeb194f..e1ad3ed 100644
--- a/protocols/imap/src/main/java/org/apache/james/imap/message/request/IdleRequest.java
+++ b/protocols/imap/src/main/java/org/apache/james/imap/message/request/IdleRequest.java
@@ -18,13 +18,11 @@
****************************************************************/
package org.apache.james.imap.message.request;
-import org.apache.james.imap.api.ImapCommand;
+import org.apache.james.imap.api.ImapConstants;
import org.apache.james.imap.api.Tag;
public class IdleRequest extends AbstractImapRequest {
-
- public IdleRequest(ImapCommand command, Tag tag) {
- super(tag, command);
+ public IdleRequest(Tag tag) {
+ super(tag, ImapConstants.IDLE_COMMAND);
}
-
}
diff --git a/protocols/imap/src/main/java/org/apache/james/imap/message/request/ListRequest.java b/protocols/imap/src/main/java/org/apache/james/imap/message/request/ListRequest.java
index bed357b..31b73e5 100644
--- a/protocols/imap/src/main/java/org/apache/james/imap/message/request/ListRequest.java
+++ b/protocols/imap/src/main/java/org/apache/james/imap/message/request/ListRequest.java
@@ -18,7 +18,7 @@
****************************************************************/
package org.apache.james.imap.message.request;
-import org.apache.james.imap.api.ImapCommand;
+import org.apache.james.imap.api.ImapConstants;
import org.apache.james.imap.api.Tag;
public class ListRequest extends AbstractImapRequest {
@@ -26,8 +26,8 @@ public class ListRequest extends AbstractImapRequest {
private final String mailboxPattern;
- public ListRequest(ImapCommand command, String referenceName, String mailboxPattern, Tag tag) {
- super(tag, command);
+ public ListRequest(String referenceName, String mailboxPattern, Tag tag) {
+ super(tag, ImapConstants.LIST_COMMAND);
this.baseReferenceName = referenceName;
this.mailboxPattern = mailboxPattern;
}
diff --git a/protocols/imap/src/main/java/org/apache/james/imap/message/request/ListRightsRequest.java b/protocols/imap/src/main/java/org/apache/james/imap/message/request/ListRightsRequest.java
index 4c659d5..e63312f 100644
--- a/protocols/imap/src/main/java/org/apache/james/imap/message/request/ListRightsRequest.java
+++ b/protocols/imap/src/main/java/org/apache/james/imap/message/request/ListRightsRequest.java
@@ -19,7 +19,7 @@
package org.apache.james.imap.message.request;
-import org.apache.james.imap.api.ImapCommand;
+import org.apache.james.imap.api.ImapConstants;
import org.apache.james.imap.api.Tag;
/**
@@ -29,8 +29,8 @@ public class ListRightsRequest extends AbstractImapRequest {
private final String identifier;
private final String mailboxName;
- public ListRightsRequest(Tag tag, ImapCommand command, String mailboxName, String identifier) {
- super(tag, command);
+ public ListRightsRequest(Tag tag, String mailboxName, String identifier) {
+ super(tag, ImapConstants.LISTRIGHTS_COMMAND);
this.mailboxName = mailboxName;
this.identifier = identifier;
}
diff --git a/protocols/imap/src/main/java/org/apache/james/imap/message/request/LoginRequest.java b/protocols/imap/src/main/java/org/apache/james/imap/message/request/LoginRequest.java
index 17fee58..ed14d73 100644
--- a/protocols/imap/src/main/java/org/apache/james/imap/message/request/LoginRequest.java
+++ b/protocols/imap/src/main/java/org/apache/james/imap/message/request/LoginRequest.java
@@ -19,7 +19,7 @@
package org.apache.james.imap.message.request;
import org.apache.james.core.Username;
-import org.apache.james.imap.api.ImapCommand;
+import org.apache.james.imap.api.ImapConstants;
import org.apache.james.imap.api.Tag;
import org.apache.james.imap.api.message.request.ImapRequest;
@@ -31,8 +31,8 @@ public class LoginRequest extends AbstractImapRequest {
private final String password;
- public LoginRequest(ImapCommand command, Username userid, String password, Tag tag) {
- super(tag, command);
+ public LoginRequest(Username userid, String password, Tag tag) {
+ super(tag, ImapConstants.LOGIN_COMMAND);
this.userid = userid;
this.password = password;
}
diff --git a/protocols/imap/src/main/java/org/apache/james/imap/message/request/LogoutRequest.java b/protocols/imap/src/main/java/org/apache/james/imap/message/request/LogoutRequest.java
index 2010d5c..94a83b3 100644
--- a/protocols/imap/src/main/java/org/apache/james/imap/message/request/LogoutRequest.java
+++ b/protocols/imap/src/main/java/org/apache/james/imap/message/request/LogoutRequest.java
@@ -18,7 +18,7 @@
****************************************************************/
package org.apache.james.imap.message.request;
-import org.apache.james.imap.api.ImapCommand;
+import org.apache.james.imap.api.ImapConstants;
import org.apache.james.imap.api.Tag;
import org.apache.james.imap.api.message.request.ImapRequest;
@@ -26,9 +26,7 @@ import org.apache.james.imap.api.message.request.ImapRequest;
* {@link ImapRequest} which requests the logout
*/
public class LogoutRequest extends AbstractImapRequest {
-
- public LogoutRequest(ImapCommand command, Tag tag) {
- super(tag, command);
+ public LogoutRequest(Tag tag) {
+ super(tag, ImapConstants.LOGOUT_COMMAND);
}
-
}
diff --git a/protocols/imap/src/main/java/org/apache/james/imap/message/request/LsubRequest.java b/protocols/imap/src/main/java/org/apache/james/imap/message/request/LsubRequest.java
index 7a04d8c..7113dbf 100644
--- a/protocols/imap/src/main/java/org/apache/james/imap/message/request/LsubRequest.java
+++ b/protocols/imap/src/main/java/org/apache/james/imap/message/request/LsubRequest.java
@@ -18,7 +18,7 @@
****************************************************************/
package org.apache.james.imap.message.request;
-import org.apache.james.imap.api.ImapCommand;
+import org.apache.james.imap.api.ImapConstants;
import org.apache.james.imap.api.Tag;
public class LsubRequest extends AbstractImapRequest {
@@ -26,8 +26,8 @@ public class LsubRequest extends AbstractImapRequest {
private final String mailboxPattern;
- public LsubRequest(ImapCommand command, String referenceName, String mailboxPattern, Tag tag) {
- super(tag, command);
+ public LsubRequest(String referenceName, String mailboxPattern, Tag tag) {
+ super(tag, ImapConstants.LSUB_COMMAND);
this.baseReferenceName = referenceName;
this.mailboxPattern = mailboxPattern;
}
diff --git a/protocols/imap/src/main/java/org/apache/james/imap/message/request/MoveRequest.java b/protocols/imap/src/main/java/org/apache/james/imap/message/request/MoveRequest.java
index cc26386..0d303f1 100644
--- a/protocols/imap/src/main/java/org/apache/james/imap/message/request/MoveRequest.java
+++ b/protocols/imap/src/main/java/org/apache/james/imap/message/request/MoveRequest.java
@@ -19,7 +19,7 @@
package org.apache.james.imap.message.request;
-import org.apache.james.imap.api.ImapCommand;
+import org.apache.james.imap.api.ImapConstants;
import org.apache.james.imap.api.Tag;
import org.apache.james.imap.api.message.IdRange;
import org.apache.james.imap.api.message.request.ImapRequest;
@@ -29,8 +29,8 @@ import org.apache.james.imap.api.message.request.ImapRequest;
*/
public class MoveRequest extends AbstractMessageRangeRequest {
- public MoveRequest(ImapCommand command, IdRange[] idSet, String mailboxName, boolean useUids, Tag tag) {
- super(command, idSet, mailboxName, useUids, tag);
+ public MoveRequest(IdRange[] idSet, String mailboxName, boolean useUids, Tag tag) {
+ super(ImapConstants.MOVE_COMMAND, idSet, mailboxName, useUids, tag);
}
}
diff --git a/protocols/imap/src/main/java/org/apache/james/imap/message/request/MyRightsRequest.java b/protocols/imap/src/main/java/org/apache/james/imap/message/request/MyRightsRequest.java
index 3cb4123..fa6f2d0 100644
--- a/protocols/imap/src/main/java/org/apache/james/imap/message/request/MyRightsRequest.java
+++ b/protocols/imap/src/main/java/org/apache/james/imap/message/request/MyRightsRequest.java
@@ -19,7 +19,7 @@
package org.apache.james.imap.message.request;
-import org.apache.james.imap.api.ImapCommand;
+import org.apache.james.imap.api.ImapConstants;
import org.apache.james.imap.api.Tag;
/**
@@ -28,13 +28,12 @@ import org.apache.james.imap.api.Tag;
public class MyRightsRequest extends AbstractImapRequest {
private final String mailboxName;
- public MyRightsRequest(Tag tag, ImapCommand command, String mailboxName) {
- super(tag, command);
+ public MyRightsRequest(Tag tag, String mailboxName) {
+ super(tag, ImapConstants.MYRIGHTS_COMMAND);
this.mailboxName = mailboxName;
}
public String getMailboxName() {
return mailboxName;
}
-
}
diff --git a/protocols/imap/src/main/java/org/apache/james/imap/message/request/NamespaceRequest.java b/protocols/imap/src/main/java/org/apache/james/imap/message/request/NamespaceRequest.java
index 149cbb4..9efcdca 100644
--- a/protocols/imap/src/main/java/org/apache/james/imap/message/request/NamespaceRequest.java
+++ b/protocols/imap/src/main/java/org/apache/james/imap/message/request/NamespaceRequest.java
@@ -18,15 +18,14 @@
****************************************************************/
package org.apache.james.imap.message.request;
-import org.apache.james.imap.api.ImapCommand;
+import org.apache.james.imap.api.ImapConstants;
import org.apache.james.imap.api.Tag;
/**
* Describes a NAMESPACE command.
*/
public class NamespaceRequest extends AbstractImapRequest {
-
- public NamespaceRequest(ImapCommand command, Tag tag) {
- super(tag, command);
+ public NamespaceRequest(Tag tag) {
+ super(tag, ImapConstants.NAMESPACE_COMMAND);
}
}
diff --git a/protocols/imap/src/main/java/org/apache/james/imap/message/request/NoopRequest.java b/protocols/imap/src/main/java/org/apache/james/imap/message/request/NoopRequest.java
index 412c594..b58f110 100644
--- a/protocols/imap/src/main/java/org/apache/james/imap/message/request/NoopRequest.java
+++ b/protocols/imap/src/main/java/org/apache/james/imap/message/request/NoopRequest.java
@@ -18,12 +18,11 @@
****************************************************************/
package org.apache.james.imap.message.request;
-import org.apache.james.imap.api.ImapCommand;
+import org.apache.james.imap.api.ImapConstants;
import org.apache.james.imap.api.Tag;
public class NoopRequest extends AbstractImapRequest {
-
- public NoopRequest(ImapCommand command, Tag tag) {
- super(tag, command);
+ public NoopRequest(Tag tag) {
+ super(tag, ImapConstants.NOOP_COMMAND);
}
}
diff --git a/protocols/imap/src/main/java/org/apache/james/imap/message/request/RenameRequest.java b/protocols/imap/src/main/java/org/apache/james/imap/message/request/RenameRequest.java
index 2ff6bd9..984a4e3 100644
--- a/protocols/imap/src/main/java/org/apache/james/imap/message/request/RenameRequest.java
+++ b/protocols/imap/src/main/java/org/apache/james/imap/message/request/RenameRequest.java
@@ -18,16 +18,15 @@
****************************************************************/
package org.apache.james.imap.message.request;
-import org.apache.james.imap.api.ImapCommand;
+import org.apache.james.imap.api.ImapConstants;
import org.apache.james.imap.api.Tag;
public class RenameRequest extends AbstractImapRequest {
private final String existingName;
-
private final String newName;
- public RenameRequest(ImapCommand command, String existingName, String newName, Tag tag) {
- super(tag, command);
+ public RenameRequest(String existingName, String newName, Tag tag) {
+ super(tag, ImapConstants.RENAME_COMMAND);
this.existingName = existingName;
this.newName = newName;
}
diff --git a/protocols/imap/src/main/java/org/apache/james/imap/message/request/SearchRequest.java b/protocols/imap/src/main/java/org/apache/james/imap/message/request/SearchRequest.java
index 79cfcfa..6fa9176 100644
--- a/protocols/imap/src/main/java/org/apache/james/imap/message/request/SearchRequest.java
+++ b/protocols/imap/src/main/java/org/apache/james/imap/message/request/SearchRequest.java
@@ -18,18 +18,16 @@
****************************************************************/
package org.apache.james.imap.message.request;
-import org.apache.james.imap.api.ImapCommand;
+import org.apache.james.imap.api.ImapConstants;
import org.apache.james.imap.api.Tag;
import org.apache.james.imap.api.message.request.SearchOperation;
public class SearchRequest extends AbstractImapRequest {
-
private final SearchOperation operation;
-
private final boolean useUids;
- public SearchRequest(ImapCommand command, SearchOperation operation, boolean useUids, Tag tag) {
- super(tag, command);
+ public SearchRequest(SearchOperation operation, boolean useUids, Tag tag) {
+ super(tag, ImapConstants.SEARCH_COMMAND);
this.operation = operation;
this.useUids = useUids;
}
diff --git a/protocols/imap/src/main/java/org/apache/james/imap/message/request/SelectRequest.java b/protocols/imap/src/main/java/org/apache/james/imap/message/request/SelectRequest.java
index 3d5519c..44aa85e 100644
--- a/protocols/imap/src/main/java/org/apache/james/imap/message/request/SelectRequest.java
+++ b/protocols/imap/src/main/java/org/apache/james/imap/message/request/SelectRequest.java
@@ -18,14 +18,13 @@
****************************************************************/
package org.apache.james.imap.message.request;
-import org.apache.james.imap.api.ImapCommand;
+import org.apache.james.imap.api.ImapConstants;
import org.apache.james.imap.api.Tag;
import org.apache.james.imap.api.message.IdRange;
import org.apache.james.imap.api.message.UidRange;
public class SelectRequest extends AbstractMailboxSelectionRequest {
-
- public SelectRequest(ImapCommand command, String mailboxName, boolean condstore, Long lastKnownUidValidity, Long knownModSeq, UidRange[] uidSet, UidRange[] knownUidSet, IdRange[] knownSequenceSet, Tag tag) {
- super(command, mailboxName, condstore, lastKnownUidValidity, knownModSeq, uidSet, knownUidSet, knownSequenceSet, tag);
+ public SelectRequest(String mailboxName, boolean condstore, Long lastKnownUidValidity, Long knownModSeq, UidRange[] uidSet, UidRange[] knownUidSet, IdRange[] knownSequenceSet, Tag tag) {
+ super(ImapConstants.SELECT_COMMAND, mailboxName, condstore, lastKnownUidValidity, knownModSeq, uidSet, knownUidSet, knownSequenceSet, tag);
}
}
diff --git a/protocols/imap/src/main/java/org/apache/james/imap/message/request/SetACLRequest.java b/protocols/imap/src/main/java/org/apache/james/imap/message/request/SetACLRequest.java
index 05a70f7..6364234 100644
--- a/protocols/imap/src/main/java/org/apache/james/imap/message/request/SetACLRequest.java
+++ b/protocols/imap/src/main/java/org/apache/james/imap/message/request/SetACLRequest.java
@@ -19,7 +19,7 @@
package org.apache.james.imap.message.request;
-import org.apache.james.imap.api.ImapCommand;
+import org.apache.james.imap.api.ImapConstants;
import org.apache.james.imap.api.Tag;
/**
@@ -30,8 +30,8 @@ public class SetACLRequest extends AbstractImapRequest {
private final String mailboxName;
private final String rights;
- public SetACLRequest(Tag tag, ImapCommand command, String mailboxName, String identifier, String rights) {
- super(tag, command);
+ public SetACLRequest(Tag tag, String mailboxName, String identifier, String rights) {
+ super(tag, ImapConstants.SETACL_COMMAND);
this.mailboxName = mailboxName;
this.identifier = identifier;
this.rights = rights;
diff --git a/protocols/imap/src/main/java/org/apache/james/imap/message/request/SetAnnotationRequest.java b/protocols/imap/src/main/java/org/apache/james/imap/message/request/SetAnnotationRequest.java
index b88e849..d9dc574 100644
--- a/protocols/imap/src/main/java/org/apache/james/imap/message/request/SetAnnotationRequest.java
+++ b/protocols/imap/src/main/java/org/apache/james/imap/message/request/SetAnnotationRequest.java
@@ -21,7 +21,7 @@ package org.apache.james.imap.message.request;
import java.util.List;
-import org.apache.james.imap.api.ImapCommand;
+import org.apache.james.imap.api.ImapConstants;
import org.apache.james.imap.api.Tag;
import org.apache.james.mailbox.model.MailboxAnnotation;
@@ -31,8 +31,8 @@ public class SetAnnotationRequest extends AbstractImapRequest {
private final String mailboxName;
private final List<MailboxAnnotation> mailboxAnnotations;
- public SetAnnotationRequest(Tag tag, ImapCommand command, String mailboxName, List<MailboxAnnotation> mailboxAnnotations) {
- super(tag, command);
+ public SetAnnotationRequest(Tag tag, String mailboxName, List<MailboxAnnotation> mailboxAnnotations) {
+ super(tag, ImapConstants.SETANNOTATION_COMMAND);
this.mailboxName = mailboxName;
this.mailboxAnnotations = ImmutableList.copyOf(mailboxAnnotations);
}
diff --git a/protocols/imap/src/main/java/org/apache/james/imap/message/request/SetQuotaRequest.java b/protocols/imap/src/main/java/org/apache/james/imap/message/request/SetQuotaRequest.java
index 6db1979..756c19e 100644
--- a/protocols/imap/src/main/java/org/apache/james/imap/message/request/SetQuotaRequest.java
+++ b/protocols/imap/src/main/java/org/apache/james/imap/message/request/SetQuotaRequest.java
@@ -22,7 +22,7 @@ package org.apache.james.imap.message.request;
import java.util.ArrayList;
import java.util.List;
-import org.apache.james.imap.api.ImapCommand;
+import org.apache.james.imap.api.ImapConstants;
import org.apache.james.imap.api.Tag;
import com.google.common.base.MoreObjects;
@@ -62,8 +62,8 @@ public class SetQuotaRequest extends AbstractImapRequest {
private final String quotaRoot;
private final List<ResourceLimit> resourceLimits;
- public SetQuotaRequest(Tag tag, ImapCommand command, String quotaRoot) {
- super(tag, command);
+ public SetQuotaRequest(Tag tag, String quotaRoot) {
+ super(tag, ImapConstants.SETQUOTA_COMMAND);
this.quotaRoot = quotaRoot;
this.resourceLimits = new ArrayList<>();
}
diff --git a/protocols/imap/src/main/java/org/apache/james/imap/message/request/StartTLSRequest.java b/protocols/imap/src/main/java/org/apache/james/imap/message/request/StartTLSRequest.java
index 6057d5a..4a95340 100644
--- a/protocols/imap/src/main/java/org/apache/james/imap/message/request/StartTLSRequest.java
+++ b/protocols/imap/src/main/java/org/apache/james/imap/message/request/StartTLSRequest.java
@@ -18,16 +18,14 @@
****************************************************************/
package org.apache.james.imap.message.request;
-import org.apache.james.imap.api.ImapCommand;
+import org.apache.james.imap.api.ImapConstants;
import org.apache.james.imap.api.Tag;
/**
* Request for STARTTLS
*/
public class StartTLSRequest extends AbstractImapRequest {
-
- public StartTLSRequest(Tag tag, ImapCommand command) {
- super(tag, command);
+ public StartTLSRequest(Tag tag) {
+ super(tag, ImapConstants.STARTTLS_COMMAND);
}
-
}
diff --git a/protocols/imap/src/main/java/org/apache/james/imap/message/request/StatusRequest.java b/protocols/imap/src/main/java/org/apache/james/imap/message/request/StatusRequest.java
index 4266bcf..950a024 100644
--- a/protocols/imap/src/main/java/org/apache/james/imap/message/request/StatusRequest.java
+++ b/protocols/imap/src/main/java/org/apache/james/imap/message/request/StatusRequest.java
@@ -18,7 +18,7 @@
****************************************************************/
package org.apache.james.imap.message.request;
-import org.apache.james.imap.api.ImapCommand;
+import org.apache.james.imap.api.ImapConstants;
import org.apache.james.imap.api.Tag;
import org.apache.james.imap.api.message.StatusDataItems;
@@ -27,8 +27,8 @@ public class StatusRequest extends AbstractImapRequest {
private final StatusDataItems statusDataItems;
- public StatusRequest(ImapCommand command, String mailboxName, StatusDataItems statusDataItems, Tag tag) {
- super(tag, command);
+ public StatusRequest(String mailboxName, StatusDataItems statusDataItems, Tag tag) {
+ super(tag, ImapConstants.STATUS_COMMAND);
this.mailboxName = mailboxName;
this.statusDataItems = statusDataItems;
}
diff --git a/protocols/imap/src/main/java/org/apache/james/imap/message/request/StoreRequest.java b/protocols/imap/src/main/java/org/apache/james/imap/message/request/StoreRequest.java
index fb56994..a9ef256 100644
--- a/protocols/imap/src/main/java/org/apache/james/imap/message/request/StoreRequest.java
+++ b/protocols/imap/src/main/java/org/apache/james/imap/message/request/StoreRequest.java
@@ -20,7 +20,7 @@ package org.apache.james.imap.message.request;
import javax.mail.Flags;
-import org.apache.james.imap.api.ImapCommand;
+import org.apache.james.imap.api.ImapConstants;
import org.apache.james.imap.api.Tag;
import org.apache.james.imap.api.message.IdRange;
import org.apache.james.mailbox.MessageManager;
@@ -33,8 +33,8 @@ public class StoreRequest extends AbstractImapRequest {
private final MessageManager.FlagsUpdateMode flagsUpdateMode;
private final long unchangedSince;
- public StoreRequest(ImapCommand command, IdRange[] idSet, boolean silent, Flags flags, boolean useUids, Tag tag, MessageManager.FlagsUpdateMode flagsUpdateMode, long unchangedSince) {
- super(tag, command);
+ public StoreRequest(IdRange[] idSet, boolean silent, Flags flags, boolean useUids, Tag tag, MessageManager.FlagsUpdateMode flagsUpdateMode, long unchangedSince) {
+ super(tag, ImapConstants.STORE_COMMAND);
this.idSet = idSet;
this.silent = silent;
this.flags = flags;
diff --git a/protocols/imap/src/main/java/org/apache/james/imap/message/request/SubscribeRequest.java b/protocols/imap/src/main/java/org/apache/james/imap/message/request/SubscribeRequest.java
index 61f22b7..828c5aa 100644
--- a/protocols/imap/src/main/java/org/apache/james/imap/message/request/SubscribeRequest.java
+++ b/protocols/imap/src/main/java/org/apache/james/imap/message/request/SubscribeRequest.java
@@ -18,14 +18,14 @@
****************************************************************/
package org.apache.james.imap.message.request;
-import org.apache.james.imap.api.ImapCommand;
+import org.apache.james.imap.api.ImapConstants;
import org.apache.james.imap.api.Tag;
public class SubscribeRequest extends AbstractImapRequest {
private final String mailboxName;
- public SubscribeRequest(ImapCommand command, String mailboxName, Tag tag) {
- super(tag, command);
+ public SubscribeRequest(String mailboxName, Tag tag) {
+ super(tag, ImapConstants.SUBSCRIBE_COMMAND);
this.mailboxName = mailboxName;
}
diff --git a/protocols/imap/src/main/java/org/apache/james/imap/message/request/UnselectRequest.java b/protocols/imap/src/main/java/org/apache/james/imap/message/request/UnselectRequest.java
index bcbbd3d..7d89894 100644
--- a/protocols/imap/src/main/java/org/apache/james/imap/message/request/UnselectRequest.java
+++ b/protocols/imap/src/main/java/org/apache/james/imap/message/request/UnselectRequest.java
@@ -18,13 +18,11 @@
****************************************************************/
package org.apache.james.imap.message.request;
-import org.apache.james.imap.api.ImapCommand;
+import org.apache.james.imap.api.ImapConstants;
import org.apache.james.imap.api.Tag;
public class UnselectRequest extends AbstractImapRequest {
-
- public UnselectRequest(Tag tag, ImapCommand command) {
- super(tag, command);
+ public UnselectRequest(Tag tag) {
+ super(tag, ImapConstants.UNSELECT_COMMAND);
}
-
}
diff --git a/protocols/imap/src/main/java/org/apache/james/imap/message/request/UnsubscribeRequest.java b/protocols/imap/src/main/java/org/apache/james/imap/message/request/UnsubscribeRequest.java
index 073a07a..f585c74 100644
--- a/protocols/imap/src/main/java/org/apache/james/imap/message/request/UnsubscribeRequest.java
+++ b/protocols/imap/src/main/java/org/apache/james/imap/message/request/UnsubscribeRequest.java
@@ -18,14 +18,14 @@
****************************************************************/
package org.apache.james.imap.message.request;
-import org.apache.james.imap.api.ImapCommand;
+import org.apache.james.imap.api.ImapConstants;
import org.apache.james.imap.api.Tag;
public class UnsubscribeRequest extends AbstractImapRequest {
private final String mailboxName;
- public UnsubscribeRequest(ImapCommand command, String mailboxName, Tag tag) {
- super(tag, command);
+ public UnsubscribeRequest(String mailboxName, Tag tag) {
+ super(tag, ImapConstants.UNSUBSCRIBE_COMMAND);
this.mailboxName = mailboxName;
}
diff --git a/protocols/imap/src/main/java/org/apache/james/imap/message/request/XListRequest.java b/protocols/imap/src/main/java/org/apache/james/imap/message/request/XListRequest.java
index 8a2e718..6f333e0 100644
--- a/protocols/imap/src/main/java/org/apache/james/imap/message/request/XListRequest.java
+++ b/protocols/imap/src/main/java/org/apache/james/imap/message/request/XListRequest.java
@@ -18,7 +18,6 @@
****************************************************************/
package org.apache.james.imap.message.request;
-import org.apache.james.imap.api.ImapCommand;
import org.apache.james.imap.api.Tag;
/**
@@ -26,8 +25,8 @@ import org.apache.james.imap.api.Tag;
*/
public class XListRequest extends ListRequest {
- public XListRequest(ImapCommand command, String referenceName, String mailboxPattern, Tag tag) {
- super(command, referenceName, mailboxPattern, tag);
+ public XListRequest(String referenceName, String mailboxPattern, Tag tag) {
+ super(referenceName, mailboxPattern, tag);
}
}
diff --git a/protocols/imap/src/main/java/org/apache/james/imap/processor/CompressProcessor.java b/protocols/imap/src/main/java/org/apache/james/imap/processor/CompressProcessor.java
index 5109058..4f4d8a8 100644
--- a/protocols/imap/src/main/java/org/apache/james/imap/processor/CompressProcessor.java
+++ b/protocols/imap/src/main/java/org/apache/james/imap/processor/CompressProcessor.java
@@ -36,7 +36,7 @@ import com.google.common.collect.ImmutableList;
public class CompressProcessor extends AbstractChainedProcessor<CompressRequest> implements CapabilityImplementingProcessor {
private static final String ALGO = "DEFLATE";
- private static final List<Capability> CAPA = ImmutableList.of(Capability.of(ImapConstants.COMPRESS_COMMAND_NAME + "=" + ALGO));
+ private static final List<Capability> CAPA = ImmutableList.of(Capability.of(ImapConstants.COMPRESS_COMMAND.getName() + "=" + ALGO));
private final StatusResponseFactory factory;
private static final String COMPRESSED = "COMPRESSED";
diff --git a/protocols/imap/src/test/java/org/apache/james/imap/decode/parser/CopyParserTest.java b/protocols/imap/src/test/java/org/apache/james/imap/decode/parser/CopyParserTest.java
index bc766a7..0684bcf 100644
--- a/protocols/imap/src/test/java/org/apache/james/imap/decode/parser/CopyParserTest.java
+++ b/protocols/imap/src/test/java/org/apache/james/imap/decode/parser/CopyParserTest.java
@@ -26,7 +26,6 @@ import static org.mockito.Mockito.mock;
import java.io.ByteArrayInputStream;
import java.io.InputStream;
-import org.apache.james.imap.api.ImapCommand;
import org.apache.james.imap.api.message.IdRange;
import org.apache.james.imap.api.message.response.StatusResponseFactory;
import org.apache.james.imap.decode.DecodingException;
@@ -35,17 +34,15 @@ import org.apache.james.imap.message.request.CopyRequest;
import org.junit.Test;
public class CopyParserTest {
-
@Test
public void testQuotaParsing() throws DecodingException {
CopyCommandParser parser = new CopyCommandParser(mock(StatusResponseFactory.class));
- ImapCommand command = ImapCommand.anyStateCommand("Command");
String commandString = " 42:69 foo \n";
InputStream inputStream = new ByteArrayInputStream(commandString.getBytes());
ImapRequestStreamLineReader lineReader = new ImapRequestStreamLineReader(inputStream, null);
- CopyRequest request = (CopyRequest) parser.decode(command, lineReader, TAG, null);
- CopyRequest expected = new CopyRequest(command, new IdRange[] {new IdRange(42, 69)}, "foo", false, TAG);
+ CopyRequest request = (CopyRequest) parser.decode(lineReader, TAG, null);
+ CopyRequest expected = new CopyRequest(new IdRange[] {new IdRange(42, 69)}, "foo", false, TAG);
assertThat(request).isEqualTo(expected);
}
diff --git a/protocols/imap/src/test/java/org/apache/james/imap/decode/parser/CreateCommandParserTest.java b/protocols/imap/src/test/java/org/apache/james/imap/decode/parser/CreateCommandParserTest.java
index 77ef9a1..5c302bc 100644
--- a/protocols/imap/src/test/java/org/apache/james/imap/decode/parser/CreateCommandParserTest.java
+++ b/protocols/imap/src/test/java/org/apache/james/imap/decode/parser/CreateCommandParserTest.java
@@ -30,7 +30,6 @@ import java.io.OutputStream;
import java.nio.charset.StandardCharsets;
import org.apache.james.core.Username;
-import org.apache.james.imap.api.ImapCommand;
import org.apache.james.imap.api.message.response.StatusResponseFactory;
import org.apache.james.imap.decode.DecodingException;
import org.apache.james.imap.decode.ImapRequestStreamLineReader;
@@ -43,7 +42,6 @@ import org.junit.Test;
public class CreateCommandParserTest {
private static final OutputStream outputStream = null;
- private static final ImapCommand command = ImapCommand.anyStateCommand("Command");
private FakeImapSession imapSession;
private CreateCommandParser parser;
@@ -62,7 +60,7 @@ public class CreateCommandParserTest {
InputStream inputStream = new ByteArrayInputStream(" \n".getBytes(StandardCharsets.US_ASCII));
ImapRequestStreamLineReader lineReader = new ImapRequestStreamLineReader(inputStream, outputStream);
- assertThatThrownBy(() -> parser.decode(command, lineReader, TAG, imapSession))
+ assertThatThrownBy(() -> parser.decode(lineReader, TAG, imapSession))
.isInstanceOf(DecodingException.class);
}
@@ -71,7 +69,7 @@ public class CreateCommandParserTest {
InputStream inputStream = new ByteArrayInputStream("..\n".getBytes(StandardCharsets.US_ASCII));
ImapRequestStreamLineReader lineReader = new ImapRequestStreamLineReader(inputStream, outputStream);
- assertThatThrownBy(() -> parser.decode(command, lineReader, TAG, imapSession))
+ assertThatThrownBy(() -> parser.decode(lineReader, TAG, imapSession))
.isInstanceOf(DecodingException.class);
}
@@ -80,7 +78,7 @@ public class CreateCommandParserTest {
InputStream inputStream = new ByteArrayInputStream(".AnyMailbox.\n".getBytes(StandardCharsets.US_ASCII));
ImapRequestStreamLineReader lineReader = new ImapRequestStreamLineReader(inputStream, outputStream);
- CreateRequest imapMessage = (CreateRequest)parser.decode(command, lineReader, TAG, imapSession);
+ CreateRequest imapMessage = (CreateRequest)parser.decode(lineReader, TAG, imapSession);
assertThat(imapMessage.getMailboxName()).isEqualTo(".AnyMailbox");
}
diff --git a/protocols/imap/src/test/java/org/apache/james/imap/decode/parser/FetchCommandParserPartialFetchTest.java b/protocols/imap/src/test/java/org/apache/james/imap/decode/parser/FetchCommandParserPartialFetchTest.java
index 9a2b0e6..c9f6ca0 100644
--- a/protocols/imap/src/test/java/org/apache/james/imap/decode/parser/FetchCommandParserPartialFetchTest.java
+++ b/protocols/imap/src/test/java/org/apache/james/imap/decode/parser/FetchCommandParserPartialFetchTest.java
@@ -27,7 +27,6 @@ import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.nio.charset.StandardCharsets;
-import org.apache.james.imap.api.ImapCommand;
import org.apache.james.imap.api.Tag;
import org.apache.james.imap.api.message.BodyFetchElement;
import org.apache.james.imap.api.message.FetchData;
@@ -45,13 +44,11 @@ import org.junit.Test;
public class FetchCommandParserPartialFetchTest {
FetchCommandParser parser;
- ImapCommand command;
ImapSession session;
@Before
public void setUp() throws Exception {
parser = new FetchCommandParser(mock(StatusResponseFactory.class));
- command = ImapCommand.anyStateCommand("Command");
session = new FakeImapSession();
}
@@ -81,7 +78,7 @@ public class FetchCommandParserPartialFetchTest {
new ByteArrayInputStream("1 (BODY[]<20.0>)\r\n"
.getBytes(StandardCharsets.US_ASCII)), new ByteArrayOutputStream());
- assertThatThrownBy(() -> parser.decode(command, reader, TAG, false, session))
+ assertThatThrownBy(() -> parser.decode(reader, TAG, false, session))
.isInstanceOf(DecodingException.class);
}
@@ -91,6 +88,6 @@ public class FetchCommandParserPartialFetchTest {
new ByteArrayInputStream(input.getBytes(StandardCharsets.US_ASCII)),
new ByteArrayOutputStream());
- parser.decode(command, reader, tag, useUids, session);
+ parser.decode(reader, tag, useUids, session);
}
}
diff --git a/protocols/imap/src/test/java/org/apache/james/imap/decode/parser/GetAnnotationCommandParserTest.java b/protocols/imap/src/test/java/org/apache/james/imap/decode/parser/GetAnnotationCommandParserTest.java
index c5c4ee1..1ae612d 100644
--- a/protocols/imap/src/test/java/org/apache/james/imap/decode/parser/GetAnnotationCommandParserTest.java
+++ b/protocols/imap/src/test/java/org/apache/james/imap/decode/parser/GetAnnotationCommandParserTest.java
@@ -28,7 +28,7 @@ import java.io.InputStream;
import java.io.OutputStream;
import java.nio.charset.StandardCharsets;
-import org.apache.james.imap.api.ImapCommand;
+import org.apache.james.imap.api.ImapConstants;
import org.apache.james.imap.api.message.response.StatusResponseFactory;
import org.apache.james.imap.api.process.ImapSession;
import org.apache.james.imap.decode.DecodingException;
@@ -44,7 +44,6 @@ public class GetAnnotationCommandParserTest {
private static final String INBOX = "anyInboxName";
private static final MailboxAnnotationKey PRIVATE_KEY = new MailboxAnnotationKey("/private/comment");
private static final MailboxAnnotationKey SHARED_KEY = new MailboxAnnotationKey("/shared/comment");
- private static final ImapCommand command = ImapCommand.anyStateCommand("Command");
private static final ImapSession session = new FakeImapSession();
private static final OutputStream outputStream = null;
@@ -60,7 +59,7 @@ public class GetAnnotationCommandParserTest {
InputStream inputStream = new ByteArrayInputStream(" \n".getBytes(StandardCharsets.US_ASCII));
ImapRequestStreamLineReader lineReader = new ImapRequestStreamLineReader(inputStream, outputStream);
- parser.decode(command, lineReader, TAG, session);
+ parser.decode(lineReader, TAG, session);
}
@Test
@@ -68,10 +67,10 @@ public class GetAnnotationCommandParserTest {
InputStream inputStream = new ByteArrayInputStream((INBOX + " \n").getBytes(StandardCharsets.US_ASCII));
ImapRequestStreamLineReader lineReader = new ImapRequestStreamLineReader(inputStream, outputStream);
- GetAnnotationRequest request = (GetAnnotationRequest) parser.decode(command, lineReader, TAG, session);
+ GetAnnotationRequest request = (GetAnnotationRequest) parser.decode(lineReader, TAG, session);
assertThat(request.getTag()).isEqualTo(TAG);
- assertThat(request.getCommand()).isEqualTo(command);
+ assertThat(request.getCommand()).isEqualTo(ImapConstants.GETANNOTATION_COMMAND);
assertThat(request.getMailboxName()).isEqualTo(INBOX);
assertThat(request.getKeys()).isEmpty();
assertThat(request.getDepth()).isEqualTo(Depth.ZERO);
@@ -83,7 +82,7 @@ public class GetAnnotationCommandParserTest {
InputStream inputStream = new ByteArrayInputStream((INBOX + " /private/comment extrastring \n").getBytes(StandardCharsets.US_ASCII));
ImapRequestStreamLineReader lineReader = new ImapRequestStreamLineReader(inputStream, outputStream);
- parser.decode(command, lineReader, TAG, session);
+ parser.decode(lineReader, TAG, session);
}
@Test
@@ -91,10 +90,10 @@ public class GetAnnotationCommandParserTest {
InputStream inputStream = new ByteArrayInputStream((INBOX + " /private/comment \n").getBytes(StandardCharsets.US_ASCII));
ImapRequestStreamLineReader lineReader = new ImapRequestStreamLineReader(inputStream, outputStream);
- GetAnnotationRequest request = (GetAnnotationRequest) parser.decode(command, lineReader, TAG, session);
+ GetAnnotationRequest request = (GetAnnotationRequest) parser.decode(lineReader, TAG, session);
assertThat(request.getTag()).isEqualTo(TAG);
- assertThat(request.getCommand()).isEqualTo(command);
+ assertThat(request.getCommand()).isEqualTo(ImapConstants.GETANNOTATION_COMMAND);
assertThat(request.getMailboxName()).isEqualTo(INBOX);
assertThat(request.getKeys()).containsOnly(PRIVATE_KEY);
assertThat(request.getDepth()).isEqualTo(Depth.ZERO);
@@ -106,7 +105,7 @@ public class GetAnnotationCommandParserTest {
InputStream inputStream = new ByteArrayInputStream((INBOX + "/shared/comment private/comment \n").getBytes(StandardCharsets.US_ASCII));
ImapRequestStreamLineReader lineReader = new ImapRequestStreamLineReader(inputStream, outputStream);
- parser.decode(command, lineReader, TAG, session);
+ parser.decode(lineReader, TAG, session);
}
@Test
@@ -114,10 +113,10 @@ public class GetAnnotationCommandParserTest {
InputStream inputStream = new ByteArrayInputStream((INBOX + " (/shared/comment /private/comment) \n").getBytes(StandardCharsets.US_ASCII));
ImapRequestStreamLineReader lineReader = new ImapRequestStreamLineReader(inputStream, outputStream);
- GetAnnotationRequest request = (GetAnnotationRequest) parser.decode(command, lineReader, TAG, session);
+ GetAnnotationRequest request = (GetAnnotationRequest) parser.decode(lineReader, TAG, session);
assertThat(request.getTag()).isEqualTo(TAG);
- assertThat(request.getCommand()).isEqualTo(command);
+ assertThat(request.getCommand()).isEqualTo(ImapConstants.GETANNOTATION_COMMAND);
assertThat(request.getMailboxName()).isEqualTo(INBOX);
assertThat(request.getKeys()).contains(PRIVATE_KEY, SHARED_KEY);
assertThat(request.getDepth()).isEqualTo(Depth.ZERO);
@@ -129,7 +128,7 @@ public class GetAnnotationCommandParserTest {
InputStream inputStream = new ByteArrayInputStream((INBOX + " (/shared/comment /private/comment) (/another/key/group)\n").getBytes(StandardCharsets.US_ASCII));
ImapRequestStreamLineReader lineReader = new ImapRequestStreamLineReader(inputStream, outputStream);
- parser.decode(command, lineReader, TAG, session);
+ parser.decode(lineReader, TAG, session);
}
@Test(expected = DecodingException.class)
@@ -137,7 +136,7 @@ public class GetAnnotationCommandParserTest {
InputStream inputStream = new ByteArrayInputStream((INBOX + " (/shared/comment /private/comment) /another/key \n").getBytes(StandardCharsets.US_ASCII));
ImapRequestStreamLineReader lineReader = new ImapRequestStreamLineReader(inputStream, outputStream);
- parser.decode(command, lineReader, TAG, session);
+ parser.decode(lineReader, TAG, session);
}
@Test(expected = DecodingException.class)
@@ -145,7 +144,7 @@ public class GetAnnotationCommandParserTest {
InputStream inputStream = new ByteArrayInputStream((INBOX + " /shared/comment /private/comment) \n").getBytes(StandardCharsets.US_ASCII));
ImapRequestStreamLineReader lineReader = new ImapRequestStreamLineReader(inputStream, outputStream);
- parser.decode(command, lineReader, TAG, session);
+ parser.decode(lineReader, TAG, session);
}
@Test(expected = DecodingException.class)
@@ -153,7 +152,7 @@ public class GetAnnotationCommandParserTest {
InputStream inputStream = new ByteArrayInputStream((INBOX + " (/shared/comment /private/comment \n").getBytes(StandardCharsets.US_ASCII));
ImapRequestStreamLineReader lineReader = new ImapRequestStreamLineReader(inputStream, outputStream);
- parser.decode(command, lineReader, TAG, session);
+ parser.decode(lineReader, TAG, session);
}
@Test(expected = DecodingException.class)
@@ -161,7 +160,7 @@ public class GetAnnotationCommandParserTest {
InputStream inputStream = new ByteArrayInputStream((INBOX + " (/shared/comment /private/comment) (MAXSIZE 1024) \n").getBytes(StandardCharsets.US_ASCII));
ImapRequestStreamLineReader lineReader = new ImapRequestStreamLineReader(inputStream, outputStream);
- parser.decode(command, lineReader, TAG, session);
+ parser.decode(lineReader, TAG, session);
}
@Test(expected = DecodingException.class)
@@ -169,7 +168,7 @@ public class GetAnnotationCommandParserTest {
InputStream inputStream = new ByteArrayInputStream((INBOX + " (MAXSIZE invalid) (/shared/comment /private/comment) \n").getBytes(StandardCharsets.US_ASCII));
ImapRequestStreamLineReader lineReader = new ImapRequestStreamLineReader(inputStream, outputStream);
- parser.decode(command, lineReader, TAG, session);
+ parser.decode(lineReader, TAG, session);
}
@Test(expected = DecodingException.class)
@@ -177,7 +176,7 @@ public class GetAnnotationCommandParserTest {
InputStream inputStream = new ByteArrayInputStream((INBOX + " (MAXSIZE) (/shared/comment /private/comment) \n").getBytes(StandardCharsets.US_ASCII));
ImapRequestStreamLineReader lineReader = new ImapRequestStreamLineReader(inputStream, outputStream);
- parser.decode(command, lineReader, TAG, session);
+ parser.decode(lineReader, TAG, session);
}
@Test(expected = DecodingException.class)
@@ -185,7 +184,7 @@ public class GetAnnotationCommandParserTest {
InputStream inputStream = new ByteArrayInputStream((INBOX + " MAXSIZE 1024 (/shared/comment /private/comment) \n").getBytes(StandardCharsets.US_ASCII));
ImapRequestStreamLineReader lineReader = new ImapRequestStreamLineReader(inputStream, outputStream);
- parser.decode(command, lineReader, TAG, session);
+ parser.decode(lineReader, TAG, session);
}
@Test(expected = DecodingException.class)
@@ -193,7 +192,7 @@ public class GetAnnotationCommandParserTest {
InputStream inputStream = new ByteArrayInputStream((INBOX + " MAXSIZE (/shared/comment /private/comment) \n").getBytes(StandardCharsets.US_ASCII));
ImapRequestStreamLineReader lineReader = new ImapRequestStreamLineReader(inputStream, outputStream);
- parser.decode(command, lineReader, TAG, session);
+ parser.decode(lineReader, TAG, session);
}
@Test
@@ -201,10 +200,10 @@ public class GetAnnotationCommandParserTest {
InputStream inputStream = new ByteArrayInputStream((INBOX + " (MAXSIZE 1024) (/shared/comment /private/comment) \n").getBytes(StandardCharsets.US_ASCII));
ImapRequestStreamLineReader lineReader = new ImapRequestStreamLineReader(inputStream, outputStream);
- GetAnnotationRequest request = (GetAnnotationRequest) parser.decode(command, lineReader, TAG, session);
+ GetAnnotationRequest request = (GetAnnotationRequest) parser.decode(lineReader, TAG, session);
assertThat(request.getTag()).isEqualTo(TAG);
- assertThat(request.getCommand()).isEqualTo(command);
+ assertThat(request.getCommand()).isEqualTo(ImapConstants.GETANNOTATION_COMMAND);
assertThat(request.getMailboxName()).isEqualTo(INBOX);
assertThat(request.getKeys()).contains(PRIVATE_KEY, SHARED_KEY);
assertThat(request.getDepth()).isEqualTo(Depth.ZERO);
@@ -216,7 +215,7 @@ public class GetAnnotationCommandParserTest {
InputStream inputStream = new ByteArrayInputStream((INBOX + " (MAXSIZErr 1024) (/shared/comment /private/comment) \n").getBytes(StandardCharsets.US_ASCII));
ImapRequestStreamLineReader lineReader = new ImapRequestStreamLineReader(inputStream, outputStream);
- parser.decode(command, lineReader, TAG, session);
+ parser.decode(lineReader, TAG, session);
}
@Test(expected = DecodingException.class)
@@ -224,7 +223,7 @@ public class GetAnnotationCommandParserTest {
InputStream inputStream = new ByteArrayInputStream((INBOX + " (MAXSIZE 0) (/shared/comment /private/comment) \n").getBytes(StandardCharsets.US_ASCII));
ImapRequestStreamLineReader lineReader = new ImapRequestStreamLineReader(inputStream, outputStream);
- parser.decode(command, lineReader, TAG, session);
+ parser.decode(lineReader, TAG, session);
}
@Test(expected = DecodingException.class)
@@ -232,7 +231,7 @@ public class GetAnnotationCommandParserTest {
InputStream inputStream = new ByteArrayInputStream((INBOX + " (DEPTH -1) (MAXSIZE 1024) (/shared/comment /private/comment) \n").getBytes(StandardCharsets.US_ASCII));
ImapRequestStreamLineReader lineReader = new ImapRequestStreamLineReader(inputStream, outputStream);
- parser.decode(command, lineReader, TAG, session);
+ parser.decode(lineReader, TAG, session);
}
@Test(expected = DecodingException.class)
@@ -240,7 +239,7 @@ public class GetAnnotationCommandParserTest {
InputStream inputStream = new ByteArrayInputStream((INBOX + " (DEPTHerr 1) (MAXSIZE 1024) (/shared/comment /private/comment) \n").getBytes(StandardCharsets.US_ASCII));
ImapRequestStreamLineReader lineReader = new ImapRequestStreamLineReader(inputStream, outputStream);
- parser.decode(command, lineReader, TAG, session);
+ parser.decode(lineReader, TAG, session);
}
@Test(expected = DecodingException.class)
@@ -248,7 +247,7 @@ public class GetAnnotationCommandParserTest {
InputStream inputStream = new ByteArrayInputStream((INBOX + " (DEPTH) (MAXSIZE 1024) (/shared/comment /private/comment) \n").getBytes(StandardCharsets.US_ASCII));
ImapRequestStreamLineReader lineReader = new ImapRequestStreamLineReader(inputStream, outputStream);
- parser.decode(command, lineReader, TAG, session);
+ parser.decode(lineReader, TAG, session);
}
@Test(expected = DecodingException.class)
@@ -256,7 +255,7 @@ public class GetAnnotationCommandParserTest {
InputStream inputStream = new ByteArrayInputStream((INBOX + " (DEPTH invalid) (MAXSIZE 1024) (/shared/comment /private/comment) \n").getBytes(StandardCharsets.US_ASCII));
ImapRequestStreamLineReader lineReader = new ImapRequestStreamLineReader(inputStream, outputStream);
- parser.decode(command, lineReader, TAG, session);
+ parser.decode(lineReader, TAG, session);
}
@Test(expected = DecodingException.class)
@@ -264,7 +263,7 @@ public class GetAnnotationCommandParserTest {
InputStream inputStream = new ByteArrayInputStream((INBOX + " DEPTH (MAXSIZE 1024) (/shared/comment /private/comment) \n").getBytes(StandardCharsets.US_ASCII));
ImapRequestStreamLineReader lineReader = new ImapRequestStreamLineReader(inputStream, outputStream);
- parser.decode(command, lineReader, TAG, session);
+ parser.decode(lineReader, TAG, session);
}
@Test(expected = DecodingException.class)
@@ -272,7 +271,7 @@ public class GetAnnotationCommandParserTest {
InputStream inputStream = new ByteArrayInputStream((INBOX + " DEPTH 1 (MAXSIZE 1024) (/shared/comment /private/comment) \n").getBytes(StandardCharsets.US_ASCII));
ImapRequestStreamLineReader lineReader = new ImapRequestStreamLineReader(inputStream, outputStream);
- parser.decode(command, lineReader, TAG, session);
+ parser.decode(lineReader, TAG, session);
}
@Test
@@ -280,10 +279,10 @@ public class GetAnnotationCommandParserTest {
InputStream inputStream = new ByteArrayInputStream((INBOX + " (DEPTH 0) (MAXSIZE 1024) (/shared/comment /private/comment) \n").getBytes(StandardCharsets.US_ASCII));
ImapRequestStreamLineReader lineReader = new ImapRequestStreamLineReader(inputStream, outputStream);
- GetAnnotationRequest request = (GetAnnotationRequest)parser.decode(command, lineReader, TAG, null);
+ GetAnnotationRequest request = (GetAnnotationRequest)parser.decode(lineReader, TAG, null);
assertThat(request.getTag()).isEqualTo(TAG);
- assertThat(request.getCommand()).isEqualTo(command);
+ assertThat(request.getCommand()).isEqualTo(ImapConstants.GETANNOTATION_COMMAND);
assertThat(request.getMailboxName()).isEqualTo(INBOX);
assertThat(request.getDepth()).isEqualTo(Depth.ZERO);
assertThat(request.getMaxsize()).contains(1024);
@@ -295,10 +294,10 @@ public class GetAnnotationCommandParserTest {
InputStream inputStream = new ByteArrayInputStream((INBOX + " (DEPTH 1) (MAXSIZE 1024) (/shared/comment /private/comment) \n").getBytes(StandardCharsets.US_ASCII));
ImapRequestStreamLineReader lineReader = new ImapRequestStreamLineReader(inputStream, outputStream);
- GetAnnotationRequest request = (GetAnnotationRequest)parser.decode(command, lineReader, TAG, session);
+ GetAnnotationRequest request = (GetAnnotationRequest)parser.decode(lineReader, TAG, session);
assertThat(request.getTag()).isEqualTo(TAG);
- assertThat(request.getCommand()).isEqualTo(command);
+ assertThat(request.getCommand()).isEqualTo(ImapConstants.GETANNOTATION_COMMAND);
assertThat(request.getMailboxName()).isEqualTo(INBOX);
assertThat(request.getDepth()).isEqualTo(Depth.ONE);
assertThat(request.getMaxsize()).contains(1024);
@@ -310,10 +309,10 @@ public class GetAnnotationCommandParserTest {
InputStream inputStream = new ByteArrayInputStream((INBOX + " (MAXSIZE 1024) (DEPTH 1) (/shared/comment /private/comment) \n").getBytes(StandardCharsets.US_ASCII));
ImapRequestStreamLineReader lineReader = new ImapRequestStreamLineReader(inputStream, outputStream);
- GetAnnotationRequest request = (GetAnnotationRequest)parser.decode(command, lineReader, TAG, session);
+ GetAnnotationRequest request = (GetAnnotationRequest)parser.decode(lineReader, TAG, session);
assertThat(request.getTag()).isEqualTo(TAG);
- assertThat(request.getCommand()).isEqualTo(command);
+ assertThat(request.getCommand()).isEqualTo(ImapConstants.GETANNOTATION_COMMAND);
assertThat(request.getMailboxName()).isEqualTo(INBOX);
assertThat(request.getDepth()).isEqualTo(Depth.ONE);
assertThat(request.getMaxsize()).contains(1024);
@@ -325,10 +324,10 @@ public class GetAnnotationCommandParserTest {
InputStream inputStream = new ByteArrayInputStream((INBOX + " (DEPTH infinity) (MAXSIZE 1024) (/shared/comment /private/comment) \n").getBytes(StandardCharsets.US_ASCII));
ImapRequestStreamLineReader lineReader = new ImapRequestStreamLineReader(inputStream, outputStream);
- GetAnnotationRequest request = (GetAnnotationRequest)parser.decode(command, lineReader, TAG, session);
+ GetAnnotationRequest request = (GetAnnotationRequest)parser.decode(lineReader, TAG, session);
assertThat(request.getTag()).isEqualTo(TAG);
- assertThat(request.getCommand()).isEqualTo(command);
+ assertThat(request.getCommand()).isEqualTo(ImapConstants.GETANNOTATION_COMMAND);
assertThat(request.getMailboxName()).isEqualTo(INBOX);
assertThat(request.getDepth()).isEqualTo(Depth.INFINITY);
assertThat(request.getMaxsize()).contains(1024);
@@ -340,10 +339,10 @@ public class GetAnnotationCommandParserTest {
InputStream inputStream = new ByteArrayInputStream((INBOX + " (DEPTH infinity) (/shared/comment /private/comment) \n").getBytes(StandardCharsets.US_ASCII));
ImapRequestStreamLineReader lineReader = new ImapRequestStreamLineReader(inputStream, outputStream);
- GetAnnotationRequest request = (GetAnnotationRequest)parser.decode(command, lineReader, TAG, session);
+ GetAnnotationRequest request = (GetAnnotationRequest)parser.decode(lineReader, TAG, session);
assertThat(request.getTag()).isEqualTo(TAG);
- assertThat(request.getCommand()).isEqualTo(command);
+ assertThat(request.getCommand()).isEqualTo(ImapConstants.GETANNOTATION_COMMAND);
assertThat(request.getMailboxName()).isEqualTo(INBOX);
assertThat(request.getDepth()).isEqualTo(Depth.INFINITY);
assertThat(request.getMaxsize()).isEmpty();
@@ -355,10 +354,10 @@ public class GetAnnotationCommandParserTest {
InputStream inputStream = new ByteArrayInputStream((INBOX + " (MAXSIZE 1024) (/shared/comment /private/comment) \n").getBytes(StandardCharsets.US_ASCII));
ImapRequestStreamLineReader lineReader = new ImapRequestStreamLineReader(inputStream, outputStream);
- GetAnnotationRequest request = (GetAnnotationRequest)parser.decode(command, lineReader, TAG, session);
+ GetAnnotationRequest request = (GetAnnotationRequest)parser.decode(lineReader, TAG, session);
assertThat(request.getTag()).isEqualTo(TAG);
- assertThat(request.getCommand()).isEqualTo(command);
+ assertThat(request.getCommand()).isEqualTo(ImapConstants.GETANNOTATION_COMMAND);
assertThat(request.getMailboxName()).isEqualTo(INBOX);
assertThat(request.getDepth()).isEqualTo(Depth.ZERO);
assertThat(request.getMaxsize()).contains(1024);
@@ -370,7 +369,7 @@ public class GetAnnotationCommandParserTest {
InputStream inputStream = new ByteArrayInputStream((INBOX + " (DEPTH 1) (MAXSIZE 1024) \n").getBytes(StandardCharsets.US_ASCII));
ImapRequestStreamLineReader lineReader = new ImapRequestStreamLineReader(inputStream, outputStream);
- parser.decode(command, lineReader, TAG, session);
+ parser.decode(lineReader, TAG, session);
}
@Test(expected = DecodingException.class)
@@ -378,7 +377,7 @@ public class GetAnnotationCommandParserTest {
InputStream inputStream = new ByteArrayInputStream((INBOX + " (DEPTH infinity) (MAXSIZE 1024) \n").getBytes(StandardCharsets.US_ASCII));
ImapRequestStreamLineReader lineReader = new ImapRequestStreamLineReader(inputStream, outputStream);
- parser.decode(command, lineReader, TAG, session);
+ parser.decode(lineReader, TAG, session);
}
@Test(expected = DecodingException.class)
@@ -386,6 +385,6 @@ public class GetAnnotationCommandParserTest {
InputStream inputStream = new ByteArrayInputStream((INBOX + " (/shared/comment /private/comment) (DEPTH infinity) \n").getBytes(StandardCharsets.US_ASCII));
ImapRequestStreamLineReader lineReader = new ImapRequestStreamLineReader(inputStream, outputStream);
- parser.decode(command, lineReader, TAG, session);
+ parser.decode(lineReader, TAG, session);
}
}
diff --git a/protocols/imap/src/test/java/org/apache/james/imap/decode/parser/GetQuotaParserTest.java b/protocols/imap/src/test/java/org/apache/james/imap/decode/parser/GetQuotaParserTest.java
index 666be6e..119dad4 100644
--- a/protocols/imap/src/test/java/org/apache/james/imap/decode/parser/GetQuotaParserTest.java
+++ b/protocols/imap/src/test/java/org/apache/james/imap/decode/parser/GetQuotaParserTest.java
@@ -26,7 +26,6 @@ import static org.mockito.Mockito.mock;
import java.io.ByteArrayInputStream;
import java.io.InputStream;
-import org.apache.james.imap.api.ImapCommand;
import org.apache.james.imap.api.message.response.StatusResponseFactory;
import org.apache.james.imap.decode.DecodingException;
import org.apache.james.imap.decode.ImapRequestStreamLineReader;
@@ -41,12 +40,11 @@ public class GetQuotaParserTest {
@Test
public void testQuotaParsing() throws DecodingException {
GetQuotaCommandParser parser = new GetQuotaCommandParser(mock(StatusResponseFactory.class));
- ImapCommand command = ImapCommand.anyStateCommand("Command");
String commandString = "quotaRoot \n";
InputStream inputStream = new ByteArrayInputStream(commandString.getBytes());
ImapRequestStreamLineReader lineReader = new ImapRequestStreamLineReader(inputStream, null);
- GetQuotaRequest request = (GetQuotaRequest) parser.decode(command, lineReader, TAG, null);
- GetQuotaRequest expected = new GetQuotaRequest(TAG, command, "quotaRoot");
+ GetQuotaRequest request = (GetQuotaRequest) parser.decode(lineReader, TAG, null);
+ GetQuotaRequest expected = new GetQuotaRequest(TAG, "quotaRoot");
assertThat(request.getQuotaRoot()).isEqualTo(expected.getQuotaRoot());
}
}
diff --git a/protocols/imap/src/test/java/org/apache/james/imap/decode/parser/GetQuotaRootParserTest.java b/protocols/imap/src/test/java/org/apache/james/imap/decode/parser/GetQuotaRootParserTest.java
index 4cc06a1..3f86889 100644
--- a/protocols/imap/src/test/java/org/apache/james/imap/decode/parser/GetQuotaRootParserTest.java
+++ b/protocols/imap/src/test/java/org/apache/james/imap/decode/parser/GetQuotaRootParserTest.java
@@ -26,7 +26,6 @@ import static org.mockito.Mockito.mock;
import java.io.ByteArrayInputStream;
import java.io.InputStream;
-import org.apache.james.imap.api.ImapCommand;
import org.apache.james.imap.api.message.response.StatusResponseFactory;
import org.apache.james.imap.decode.DecodingException;
import org.apache.james.imap.decode.ImapRequestStreamLineReader;
@@ -37,29 +36,25 @@ import org.junit.Test;
* Tests for GetQuotaRootCommandParser
*/
public class GetQuotaRootParserTest {
-
@Test
public void testNonQuotedMailbox() throws DecodingException {
GetQuotaRootCommandParser parser = new GetQuotaRootCommandParser(mock(StatusResponseFactory.class));
- ImapCommand command = ImapCommand.anyStateCommand("Command");
String commandString = "INBOX\n";
InputStream inputStream = new ByteArrayInputStream(commandString.getBytes());
ImapRequestStreamLineReader lineReader = new ImapRequestStreamLineReader(inputStream, null);
- GetQuotaRootRequest request = (GetQuotaRootRequest) parser.decode(command, lineReader, TAG, null);
- GetQuotaRootRequest expected = new GetQuotaRootRequest(TAG, command, "INBOX");
+ GetQuotaRootRequest request = (GetQuotaRootRequest) parser.decode(lineReader, TAG, null);
+ GetQuotaRootRequest expected = new GetQuotaRootRequest(TAG, "INBOX");
assertThat(request.getMailboxName()).isEqualTo(expected.getMailboxName());
}
@Test
public void testQuotedMailbox() throws DecodingException {
GetQuotaRootCommandParser parser = new GetQuotaRootCommandParser(mock(StatusResponseFactory.class));
- ImapCommand command = ImapCommand.anyStateCommand("Command");
String commandString = "\"INBOX\" \n";
InputStream inputStream = new ByteArrayInputStream(commandString.getBytes());
ImapRequestStreamLineReader lineReader = new ImapRequestStreamLineReader(inputStream, null);
- GetQuotaRootRequest request = (GetQuotaRootRequest) parser.decode(command, lineReader, TAG, null);
- GetQuotaRootRequest expected = new GetQuotaRootRequest(TAG, command, "INBOX");
+ GetQuotaRootRequest request = (GetQuotaRootRequest) parser.decode(lineReader, TAG, null);
+ GetQuotaRootRequest expected = new GetQuotaRootRequest(TAG, "INBOX");
assertThat(request.getMailboxName()).isEqualTo(expected.getMailboxName());
}
-
}
diff --git a/protocols/imap/src/test/java/org/apache/james/imap/decode/parser/MoveParserTest.java b/protocols/imap/src/test/java/org/apache/james/imap/decode/parser/MoveParserTest.java
index aa02143..e3bf405 100644
--- a/protocols/imap/src/test/java/org/apache/james/imap/decode/parser/MoveParserTest.java
+++ b/protocols/imap/src/test/java/org/apache/james/imap/decode/parser/MoveParserTest.java
@@ -26,7 +26,6 @@ import static org.mockito.Mockito.mock;
import java.io.ByteArrayInputStream;
import java.io.InputStream;
-import org.apache.james.imap.api.ImapCommand;
import org.apache.james.imap.api.message.IdRange;
import org.apache.james.imap.api.message.response.StatusResponseFactory;
import org.apache.james.imap.decode.DecodingException;
@@ -35,17 +34,15 @@ import org.apache.james.imap.message.request.MoveRequest;
import org.junit.Test;
public class MoveParserTest {
-
@Test
public void testQuotaParsing() throws DecodingException {
MoveCommandParser parser = new MoveCommandParser(mock(StatusResponseFactory.class));
- ImapCommand command = ImapCommand.anyStateCommand("Command");
String commandString = " 42:69 foo \n";
InputStream inputStream = new ByteArrayInputStream(commandString.getBytes());
ImapRequestStreamLineReader lineReader = new ImapRequestStreamLineReader(inputStream, null);
- MoveRequest request = (MoveRequest) parser.decode(command, lineReader, TAG, null);
- MoveRequest expected = new MoveRequest(command, new IdRange[] {new IdRange(42, 69)}, "foo", false, TAG);
+ MoveRequest request = (MoveRequest) parser.decode(lineReader, TAG, null);
+ MoveRequest expected = new MoveRequest(new IdRange[] {new IdRange(42, 69)}, "foo", false, TAG);
assertThat(request).isEqualTo(expected);
}
diff --git a/protocols/imap/src/test/java/org/apache/james/imap/decode/parser/SearchCommandParserCharsetTest.java b/protocols/imap/src/test/java/org/apache/james/imap/decode/parser/SearchCommandParserCharsetTest.java
index ca18b9c..dad9fef 100644
--- a/protocols/imap/src/test/java/org/apache/james/imap/decode/parser/SearchCommandParserCharsetTest.java
+++ b/protocols/imap/src/test/java/org/apache/james/imap/decode/parser/SearchCommandParserCharsetTest.java
@@ -33,7 +33,7 @@ import java.io.ByteArrayOutputStream;
import java.nio.charset.Charset;
import java.nio.charset.StandardCharsets;
-import org.apache.james.imap.api.ImapCommand;
+import org.apache.james.imap.api.ImapConstants;
import org.apache.james.imap.api.ImapMessage;
import org.apache.james.imap.api.display.HumanReadableText;
import org.apache.james.imap.api.message.request.SearchKey;
@@ -67,14 +67,12 @@ public class SearchCommandParserCharsetTest {
SearchCommandParser parser;
StatusResponseFactory mockStatusResponseFactory;
- ImapCommand command;
ImapMessage message;
@Before
public void setUp() throws Exception {
mockStatusResponseFactory = mock(StatusResponseFactory.class);
parser = new SearchCommandParser(mockStatusResponseFactory);
- command = ImapCommand.anyStateCommand("Command");
message = mock(ImapMessage.class);
}
@@ -83,11 +81,11 @@ public class SearchCommandParserCharsetTest {
ImapRequestLineReader reader = new ImapRequestStreamLineReader(
new ByteArrayInputStream("CHARSET BOGUS ".getBytes(StandardCharsets.US_ASCII)),
new ByteArrayOutputStream());
- parser.decode(command, reader, TAG, false, new FakeImapSession());
+ parser.decode(reader, TAG, false, new FakeImapSession());
verify(mockStatusResponseFactory, times(1)).taggedNo(
eq(TAG),
- same(command),
+ same(ImapConstants.SEARCH_COMMAND),
eq(HumanReadableText.BAD_CHARSET),
eq(StatusResponse.ResponseCode.badCharset()));
diff --git a/protocols/imap/src/test/java/org/apache/james/imap/decode/parser/SearchCommandParserQuotedCharsetTest.java b/protocols/imap/src/test/java/org/apache/james/imap/decode/parser/SearchCommandParserQuotedCharsetTest.java
index 8e28d53..b9fc6c6 100644
--- a/protocols/imap/src/test/java/org/apache/james/imap/decode/parser/SearchCommandParserQuotedCharsetTest.java
+++ b/protocols/imap/src/test/java/org/apache/james/imap/decode/parser/SearchCommandParserQuotedCharsetTest.java
@@ -34,7 +34,7 @@ import java.io.ByteArrayOutputStream;
import java.nio.charset.Charset;
import java.nio.charset.StandardCharsets;
-import org.apache.james.imap.api.ImapCommand;
+import org.apache.james.imap.api.ImapConstants;
import org.apache.james.imap.api.ImapMessage;
import org.apache.james.imap.api.display.HumanReadableText;
import org.apache.james.imap.api.message.request.SearchKey;
@@ -128,7 +128,6 @@ public class SearchCommandParserQuotedCharsetTest {
SearchCommandParser parser;
StatusResponseFactory mockStatusResponseFactory;
- ImapCommand command;
ImapMessage message;
private ImapSession session;
@@ -137,7 +136,6 @@ public class SearchCommandParserQuotedCharsetTest {
public void setUp() throws Exception {
mockStatusResponseFactory = mock(StatusResponseFactory.class);
parser = new SearchCommandParser(mockStatusResponseFactory);
- command = ImapCommand.anyStateCommand("Command");
message = mock(ImapMessage.class);
session = new FakeImapSession();
}
@@ -171,11 +169,11 @@ public class SearchCommandParserQuotedCharsetTest {
ImapRequestLineReader reader = new ImapRequestStreamLineReader(
new ByteArrayInputStream("CHARSET BOGUS ".getBytes(StandardCharsets.US_ASCII)),
new ByteArrayOutputStream());
- parser.decode(command, reader, TAG, false, session);
+ parser.decode(reader, TAG, false, session);
verify(mockStatusResponseFactory, times(1)).taggedNo(
eq(TAG),
- same(command),
+ same(ImapConstants.SEARCH_COMMAND),
eq(HumanReadableText.BAD_CHARSET),
eq(StatusResponse.ResponseCode.badCharset()));
verifyNoMoreInteractions(mockStatusResponseFactory);
@@ -188,7 +186,7 @@ public class SearchCommandParserQuotedCharsetTest {
new ByteArrayInputStream(add("CHARSET US-ASCII BCC "
.getBytes(StandardCharsets.US_ASCII), BYTES_NON_ASCII_SEARCH_TERM)),
new ByteArrayOutputStream());
- parser.decode(command, reader, TAG, false, session);
+ parser.decode(reader, TAG, false, session);
fail("A protocol exception should be thrown when charset is incompatible with input");
} catch (DecodingException e) {
// expected
diff --git a/protocols/imap/src/test/java/org/apache/james/imap/decode/parser/SearchCommandParserSearchKeySequenceSetTest.java b/protocols/imap/src/test/java/org/apache/james/imap/decode/parser/SearchCommandParserSearchKeySequenceSetTest.java
index 8fbff9e..cf291e6 100644
--- a/protocols/imap/src/test/java/org/apache/james/imap/decode/parser/SearchCommandParserSearchKeySequenceSetTest.java
+++ b/protocols/imap/src/test/java/org/apache/james/imap/decode/parser/SearchCommandParserSearchKeySequenceSetTest.java
@@ -27,7 +27,6 @@ import java.io.ByteArrayOutputStream;
import java.nio.charset.StandardCharsets;
import java.util.Arrays;
-import org.apache.james.imap.api.ImapCommand;
import org.apache.james.imap.api.message.IdRange;
import org.apache.james.imap.api.message.UidRange;
import org.apache.james.imap.api.message.request.SearchKey;
@@ -39,14 +38,11 @@ import org.junit.Before;
import org.junit.Test;
public class SearchCommandParserSearchKeySequenceSetTest {
-
SearchCommandParser parser;
- ImapCommand command;
@Before
public void setUp() throws Exception {
parser = new SearchCommandParser(mock(StatusResponseFactory.class));
- command = ImapCommand.anyStateCommand("Command");
}
@Test
diff --git a/protocols/imap/src/test/java/org/apache/james/imap/decode/parser/SetAnnotationCommandParserTest.java b/protocols/imap/src/test/java/org/apache/james/imap/decode/parser/SetAnnotationCommandParserTest.java
index 4457684..c45c66d 100644
--- a/protocols/imap/src/test/java/org/apache/james/imap/decode/parser/SetAnnotationCommandParserTest.java
+++ b/protocols/imap/src/test/java/org/apache/james/imap/decode/parser/SetAnnotationCommandParserTest.java
@@ -27,7 +27,6 @@ import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.io.InputStream;
-import org.apache.james.imap.api.ImapCommand;
import org.apache.james.imap.api.message.response.StatusResponseFactory;
import org.apache.james.imap.decode.DecodingException;
import org.apache.james.imap.decode.ImapRequestStreamLineReader;
@@ -45,14 +44,14 @@ public class SetAnnotationCommandParserTest {
private static final MailboxAnnotation PRIVATE_ANNOTATION = MailboxAnnotation.newInstance(PRIVATE_KEY, "This is my comment");
private static final MailboxAnnotation SHARED_ANNOTATION = MailboxAnnotation.newInstance(SHARED_KEY, "This one is for you!");
private static final MailboxAnnotation NIL_ANNOTATION = MailboxAnnotation.nil(PRIVATE_KEY);
+
private SetAnnotationCommandParser parser = new SetAnnotationCommandParser(mock(StatusResponseFactory.class));
- private ImapCommand command = ImapCommand.anyStateCommand("Command");
@Test
public void decodeMessageShouldReturnRequestContainsOneAnnotation() throws DecodingException {
InputStream inputStream = new ByteArrayInputStream((INBOX + " (/private/comment \"This is my comment\") \n").getBytes());
ImapRequestStreamLineReader lineReader = new ImapRequestStreamLineReader(inputStream, null);
- SetAnnotationRequest request = (SetAnnotationRequest) parser.decode(command, lineReader, TAG, null);
+ SetAnnotationRequest request = (SetAnnotationRequest) parser.decode(lineReader, TAG, null);
assertThat(request.getMailboxName()).isEqualTo(INBOX);
assertThat(request.getMailboxAnnotations()).containsOnly(PRIVATE_ANNOTATION);
@@ -63,14 +62,14 @@ public class SetAnnotationCommandParserTest {
InputStream inputStream = new ByteArrayInputStream((INBOX + " (/pri*vate/comment \"This is my comment\") \n").getBytes());
ImapRequestStreamLineReader lineReader = new ImapRequestStreamLineReader(inputStream, null);
- parser.decode(command, lineReader, TAG, null);
+ parser.decode(lineReader, TAG, null);
}
@Test
public void decodeMessageShouldReturnRequestContainsOneNilAnnotation() throws DecodingException {
InputStream inputStream = new ByteArrayInputStream((INBOX + " (/private/comment NIL) \n").getBytes());
ImapRequestStreamLineReader lineReader = new ImapRequestStreamLineReader(inputStream, null);
- SetAnnotationRequest request = (SetAnnotationRequest) parser.decode(command, lineReader, TAG, null);
+ SetAnnotationRequest request = (SetAnnotationRequest) parser.decode(lineReader, TAG, null);
assertThat(request.getMailboxName()).isEqualTo(INBOX);
assertThat(request.getMailboxAnnotations()).containsOnly(NIL_ANNOTATION);
@@ -80,7 +79,7 @@ public class SetAnnotationCommandParserTest {
public void decodeMessageShouldReturnRequestContainsOneAnnotationWithMultiLinesValue() throws DecodingException {
InputStream inputStream = new ByteArrayInputStream((INBOX + " (/private/comment {32}\nMy new comment across two lines.) \n").getBytes());
ImapRequestStreamLineReader lineReader = new ImapRequestStreamLineReader(inputStream, new ByteArrayOutputStream());
- SetAnnotationRequest request = (SetAnnotationRequest) parser.decode(command, lineReader, TAG, null);
+ SetAnnotationRequest request = (SetAnnotationRequest) parser.decode(lineReader, TAG, null);
assertThat(request.getMailboxName()).isEqualTo(INBOX);
assertThat(request.getMailboxAnnotations()).containsOnly(MailboxAnnotation.newInstance(PRIVATE_KEY, "My new comment across two lines."));
@@ -90,7 +89,7 @@ public class SetAnnotationCommandParserTest {
public void decodeMessageShouldReturnRequestContainsMultiAnnotations() throws DecodingException {
InputStream inputStream = new ByteArrayInputStream((INBOX + " (/private/comment \"This is my comment\" /shared/comment \"This one is for you!\") \n").getBytes());
ImapRequestStreamLineReader lineReader = new ImapRequestStreamLineReader(inputStream, new ByteArrayOutputStream());
- SetAnnotationRequest request = (SetAnnotationRequest) parser.decode(command, lineReader, TAG, null);
+ SetAnnotationRequest request = (SetAnnotationRequest) parser.decode(lineReader, TAG, null);
assertThat(request.getMailboxName()).isEqualTo(INBOX);
assertThat(request.getMailboxAnnotations()).containsExactly(PRIVATE_ANNOTATION, SHARED_ANNOTATION);
@@ -100,7 +99,7 @@ public class SetAnnotationCommandParserTest {
public void decodeMessageShouldReturnRequestContainsMultiAnnotationsWithNil() throws DecodingException {
InputStream inputStream = new ByteArrayInputStream((INBOX + " (/private/comment NIL /shared/comment \"This one is for you!\") \n").getBytes());
ImapRequestStreamLineReader lineReader = new ImapRequestStreamLineReader(inputStream, new ByteArrayOutputStream());
- SetAnnotationRequest request = (SetAnnotationRequest) parser.decode(command, lineReader, TAG, null);
+ SetAnnotationRequest request = (SetAnnotationRequest) parser.decode(lineReader, TAG, null);
assertThat(request.getMailboxName()).isEqualTo(INBOX);
assertThat(request.getMailboxAnnotations()).containsExactly(NIL_ANNOTATION, SHARED_ANNOTATION);
@@ -111,7 +110,7 @@ public class SetAnnotationCommandParserTest {
InputStream inputStream = new ByteArrayInputStream("INBOX /private/comment \"This is my comment\") \n".getBytes());
ImapRequestStreamLineReader lineReader = new ImapRequestStreamLineReader(inputStream, null);
- parser.decode(command, lineReader, TAG, null);
+ parser.decode(lineReader, TAG, null);
}
@Test(expected = DecodingException.class)
@@ -119,7 +118,7 @@ public class SetAnnotationCommandParserTest {
InputStream inputStream = new ByteArrayInputStream((INBOX + " (/private/comment \"This is my comment\" \n").getBytes());
ImapRequestStreamLineReader lineReader = new ImapRequestStreamLineReader(inputStream, null);
- parser.decode(command, lineReader, TAG, null);
+ parser.decode(lineReader, TAG, null);
}
@Test(expected = DecodingException.class)
@@ -127,7 +126,7 @@ public class SetAnnotationCommandParserTest {
InputStream inputStream = new ByteArrayInputStream((INBOX + " (/private/comment) \n").getBytes());
ImapRequestStreamLineReader lineReader = new ImapRequestStreamLineReader(inputStream, null);
- parser.decode(command, lineReader, TAG, null);
+ parser.decode(lineReader, TAG, null);
}
@Test
@@ -135,7 +134,7 @@ public class SetAnnotationCommandParserTest {
InputStream inputStream = new ByteArrayInputStream((INBOX + " (/private/comment \" \") \n").getBytes());
ImapRequestStreamLineReader lineReader = new ImapRequestStreamLineReader(inputStream, null);
- SetAnnotationRequest request = (SetAnnotationRequest) parser.decode(command, lineReader, TAG, null);
+ SetAnnotationRequest request = (SetAnnotationRequest) parser.decode(lineReader, TAG, null);
assertThat(request.getMailboxAnnotations().get(0).getValue()).isPresent();
}
@@ -145,7 +144,7 @@ public class SetAnnotationCommandParserTest {
InputStream inputStream = new ByteArrayInputStream((INBOX + " (/private/comment This is my comment) \n").getBytes());
ImapRequestStreamLineReader lineReader = new ImapRequestStreamLineReader(inputStream, null);
- parser.decode(command, lineReader, TAG, null);
+ parser.decode(lineReader, TAG, null);
}
@Test
@@ -153,7 +152,7 @@ public class SetAnnotationCommandParserTest {
InputStream inputStream = new ByteArrayInputStream((INBOX + " (/private/comment \"NIL\") \n").getBytes());
ImapRequestStreamLineReader lineReader = new ImapRequestStreamLineReader(inputStream, null);
- SetAnnotationRequest request = (SetAnnotationRequest) parser.decode(command, lineReader, TAG, null);
+ SetAnnotationRequest request = (SetAnnotationRequest) parser.decode(lineReader, TAG, null);
assertThat(request.getMailboxAnnotations().get(0).getValue()).isPresent();
}
@@ -163,6 +162,6 @@ public class SetAnnotationCommandParserTest {
InputStream inputStream = new ByteArrayInputStream((INBOX + " () \n").getBytes());
ImapRequestStreamLineReader lineReader = new ImapRequestStreamLineReader(inputStream, null);
- parser.decode(command, lineReader, TAG, null);
+ parser.decode(lineReader, TAG, null);
}
}
diff --git a/protocols/imap/src/test/java/org/apache/james/imap/decode/parser/SetQuotaCommandParserTest.java b/protocols/imap/src/test/java/org/apache/james/imap/decode/parser/SetQuotaCommandParserTest.java
index c262d16..fa03550 100644
--- a/protocols/imap/src/test/java/org/apache/james/imap/decode/parser/SetQuotaCommandParserTest.java
+++ b/protocols/imap/src/test/java/org/apache/james/imap/decode/parser/SetQuotaCommandParserTest.java
@@ -27,7 +27,6 @@ import java.io.ByteArrayInputStream;
import java.io.InputStream;
import java.util.List;
-import org.apache.james.imap.api.ImapCommand;
import org.apache.james.imap.api.message.response.StatusResponseFactory;
import org.apache.james.imap.decode.DecodingException;
import org.apache.james.imap.decode.ImapRequestStreamLineReader;
@@ -38,15 +37,13 @@ import org.junit.Test;
* SETQUOTA command parser test...
*/
public class SetQuotaCommandParserTest {
-
@Test
public void testQuotaParsing() throws DecodingException {
SetQuotaCommandParser parser = new SetQuotaCommandParser(mock(StatusResponseFactory.class));
- ImapCommand command = ImapCommand.anyStateCommand("Command");
String commandString = "quotaRoot (STORAGE 512) ( MESSAGE 1024 ) \n";
InputStream inputStream = new ByteArrayInputStream(commandString.getBytes());
ImapRequestStreamLineReader lineReader = new ImapRequestStreamLineReader(inputStream, null);
- SetQuotaRequest request = (SetQuotaRequest) parser.decode(command, lineReader, TAG, null);
+ SetQuotaRequest request = (SetQuotaRequest) parser.decode(lineReader, TAG, null);
assertThat(request.getQuotaRoot()).isEqualTo("quotaRoot");
List<SetQuotaRequest.ResourceLimit> list = request.getResourceLimits();
assertThat(list.get(0).getResource()).isEqualTo("STORAGE");
@@ -55,5 +52,4 @@ public class SetQuotaCommandParserTest {
assertThat(list.get(1).getLimit()).isEqualTo(1024);
assertThat(list.size()).isEqualTo(2);
}
-
}
diff --git a/protocols/imap/src/test/java/org/apache/james/imap/decode/parser/StoreCommandParserTest.java b/protocols/imap/src/test/java/org/apache/james/imap/decode/parser/StoreCommandParserTest.java
index fb6518f..8fd9439 100644
--- a/protocols/imap/src/test/java/org/apache/james/imap/decode/parser/StoreCommandParserTest.java
+++ b/protocols/imap/src/test/java/org/apache/james/imap/decode/parser/StoreCommandParserTest.java
@@ -28,8 +28,6 @@ import java.nio.charset.StandardCharsets;
import javax.mail.Flags;
-import org.apache.james.imap.api.ImapCommand;
-import org.apache.james.imap.api.ImapMessage;
import org.apache.james.imap.api.Tag;
import org.apache.james.imap.api.message.IdRange;
import org.apache.james.imap.api.message.response.StatusResponseFactory;
@@ -42,15 +40,12 @@ import org.junit.Test;
public class StoreCommandParserTest {
StoreCommandParser parser;
- ImapCommand command;
- ImapMessage message;
private ImapSession session;
@Before
public void setUp() throws Exception {
parser = new StoreCommandParser(mock(StatusResponseFactory.class));
- command = ImapCommand.anyStateCommand("Command");
session = mock(ImapSession.class);
}
@@ -82,6 +77,6 @@ public class StoreCommandParserTest {
new ByteArrayInputStream(input.getBytes(StandardCharsets.US_ASCII)),
new ByteArrayOutputStream());
- parser.decode(command, reader, tag, useUids, session);
+ parser.decode(reader, tag, useUids, session);
}
}
diff --git a/protocols/imap/src/test/java/org/apache/james/imap/encode/NamespaceResponseEncoderTest.java b/protocols/imap/src/test/java/org/apache/james/imap/encode/NamespaceResponseEncoderTest.java
index 87281f9..946dae9 100644
--- a/protocols/imap/src/test/java/org/apache/james/imap/encode/NamespaceResponseEncoderTest.java
+++ b/protocols/imap/src/test/java/org/apache/james/imap/encode/NamespaceResponseEncoderTest.java
@@ -56,7 +56,7 @@ public class NamespaceResponseEncoderTest {
InOrder inOrder = Mockito.inOrder(mockComposer);
inOrder.verify(mockComposer, times(1)).untagged();
- inOrder.verify(mockComposer, times(1)).commandName(ImapConstants.NAMESPACE_COMMAND_NAME);
+ inOrder.verify(mockComposer, times(1)).commandName(ImapConstants.NAMESPACE_COMMAND.getName());
inOrder.verify(mockComposer, times(2)).nil();
inOrder.verify(mockComposer, times(2)).openParen();
inOrder.verify(mockComposer, times(1)).quote(aPrefix + aDeliminator);
@@ -79,7 +79,7 @@ public class NamespaceResponseEncoderTest {
InOrder inOrder = Mockito.inOrder(mockComposer);
inOrder.verify(mockComposer, times(1)).untagged();
- inOrder.verify(mockComposer, times(1)).commandName(ImapConstants.NAMESPACE_COMMAND_NAME);
+ inOrder.verify(mockComposer, times(1)).commandName(ImapConstants.NAMESPACE_COMMAND.getName());
inOrder.verify(mockComposer, times(1)).nil();
inOrder.verify(mockComposer, times(2)).openParen();
inOrder.verify(mockComposer, times(1)).quote(aPrefix + aDeliminator);
@@ -103,7 +103,7 @@ public class NamespaceResponseEncoderTest {
InOrder inOrder = Mockito.inOrder(mockComposer);
inOrder.verify(mockComposer, times(1)).untagged();
- inOrder.verify(mockComposer, times(1)).commandName(ImapConstants.NAMESPACE_COMMAND_NAME);
+ inOrder.verify(mockComposer, times(1)).commandName(ImapConstants.NAMESPACE_COMMAND.getName());
inOrder.verify(mockComposer, times(2)).openParen();
inOrder.verify(mockComposer, times(1)).quote(aPrefix + aDeliminator);
inOrder.verify(mockComposer, times(1)).quote(aDeliminator);
@@ -130,7 +130,7 @@ public class NamespaceResponseEncoderTest {
InOrder inOrder = Mockito.inOrder(mockComposer);
inOrder.verify(mockComposer, times(1)).untagged();
- inOrder.verify(mockComposer, times(1)).commandName(ImapConstants.NAMESPACE_COMMAND_NAME);
+ inOrder.verify(mockComposer, times(1)).commandName(ImapConstants.NAMESPACE_COMMAND.getName());
inOrder.verify(mockComposer, times(2)).openParen();
inOrder.verify(mockComposer, times(1)).quote(aPrefix + aDeliminator);
inOrder.verify(mockComposer, times(1)).quote(aDeliminator);
@@ -150,7 +150,7 @@ public class NamespaceResponseEncoderTest {
InOrder inOrder = Mockito.inOrder(mockComposer);
inOrder.verify(mockComposer, times(1)).untagged();
- inOrder.verify(mockComposer, times(1)).commandName(ImapConstants.NAMESPACE_COMMAND_NAME);
+ inOrder.verify(mockComposer, times(1)).commandName(ImapConstants.NAMESPACE_COMMAND.getName());
inOrder.verify(mockComposer, times(3)).nil();
inOrder.verify(mockComposer, times(1)).end();
}
diff --git a/protocols/imap/src/test/java/org/apache/james/imap/processor/CopyProcessorTest.java b/protocols/imap/src/test/java/org/apache/james/imap/processor/CopyProcessorTest.java
index af62fa8..dcca0de 100644
--- a/protocols/imap/src/test/java/org/apache/james/imap/processor/CopyProcessorTest.java
+++ b/protocols/imap/src/test/java/org/apache/james/imap/processor/CopyProcessorTest.java
@@ -85,7 +85,7 @@ public class CopyProcessorTest {
@Test
public void processShouldWork() throws Exception {
- CopyRequest copyRequest = new CopyRequest(ImapCommand.anyStateCommand("Name"), new IdRange[] {new IdRange(4, 6)}, ImapConstants.INBOX_NAME, true, TAG);
+ CopyRequest copyRequest = new CopyRequest(new IdRange[] {new IdRange(4, 6)}, ImapConstants.INBOX_NAME, true, TAG);
MailboxPath selected = new MailboxPath(INBOX, "selected");
SelectedMailbox selectedMailbox = mock(SelectedMailbox.class);
@@ -118,7 +118,7 @@ public class CopyProcessorTest {
@Test
public void processShouldWorkWithMultipleRanges() throws Exception {
- CopyRequest copyRequest = new CopyRequest(ImapCommand.anyStateCommand("Name"), new IdRange[] {new IdRange(5, 6), new IdRange(1, 3)}, ImapConstants.INBOX_NAME, true, TAG);
+ CopyRequest copyRequest = new CopyRequest(new IdRange[] {new IdRange(5, 6), new IdRange(1, 3)}, ImapConstants.INBOX_NAME, true, TAG);
MailboxPath selected = new MailboxPath(INBOX, "selected");
SelectedMailbox selectedMailbox = mock(SelectedMailbox.class);
@@ -150,7 +150,7 @@ public class CopyProcessorTest {
@Test
public void processShouldRespondNoOnUnExistingTargetMailbox() throws Exception {
- CopyRequest copyRequest = new CopyRequest(ImapCommand.anyStateCommand("Name"), new IdRange[] {new IdRange(4, 6)}, ImapConstants.INBOX_NAME, true, TAG);
+ CopyRequest copyRequest = new CopyRequest(new IdRange[] {new IdRange(4, 6)}, ImapConstants.INBOX_NAME, true, TAG);
MailboxPath selected = new MailboxPath(INBOX, "selected");
SelectedMailbox selectedMailbox = mock(SelectedMailbox.class);
@@ -174,7 +174,7 @@ public class CopyProcessorTest {
@Test
public void processShouldRespondNoOnMailboxException() throws Exception {
- CopyRequest copyRequest = new CopyRequest(ImapCommand.anyStateCommand("Name"), new IdRange[] {new IdRange(4, 6)}, ImapConstants.INBOX_NAME, true, TAG);
+ CopyRequest copyRequest = new CopyRequest(new IdRange[] {new IdRange(4, 6)}, ImapConstants.INBOX_NAME, true, TAG);
MailboxPath selected = new MailboxPath(INBOX, "selected");
SelectedMailbox selectedMailbox = mock(SelectedMailbox.class);
@@ -198,7 +198,7 @@ public class CopyProcessorTest {
@Test
public void processShouldNotHandleMoveRequests() {
- MoveRequest moveRequest = new MoveRequest(ImapCommand.anyStateCommand("Name"), new IdRange[] {new IdRange(4, 6)}, ImapConstants.INBOX_NAME, true, TAG);
+ MoveRequest moveRequest = new MoveRequest(new IdRange[] {new IdRange(4, 6)}, ImapConstants.INBOX_NAME, true, TAG);
testee.process(moveRequest, mockResponder, imapSession);
diff --git a/protocols/imap/src/test/java/org/apache/james/imap/processor/DeleteACLProcessorTest.java b/protocols/imap/src/test/java/org/apache/james/imap/processor/DeleteACLProcessorTest.java
index 2769f8c..97241da 100644
--- a/protocols/imap/src/test/java/org/apache/james/imap/processor/DeleteACLProcessorTest.java
+++ b/protocols/imap/src/test/java/org/apache/james/imap/processor/DeleteACLProcessorTest.java
@@ -30,7 +30,6 @@ import static org.mockito.Mockito.verifyNoMoreInteractions;
import static org.mockito.Mockito.when;
import org.apache.james.core.Username;
-import org.apache.james.imap.api.ImapCommand;
import org.apache.james.imap.api.ImapConstants;
import org.apache.james.imap.api.message.response.ImapResponseMessage;
import org.apache.james.imap.api.process.ImapProcessor;
@@ -94,7 +93,6 @@ public class DeleteACLProcessorTest {
.thenReturn(messageManager);
deleteACLRequest = new DeleteACLRequest(TAG,
- ImapCommand.anyStateCommand("Name"),
MAILBOX_NAME,
USER_1.asString());
diff --git a/protocols/imap/src/test/java/org/apache/james/imap/processor/GetACLProcessorTest.java b/protocols/imap/src/test/java/org/apache/james/imap/processor/GetACLProcessorTest.java
index c617d3a..d25f37c 100644
--- a/protocols/imap/src/test/java/org/apache/james/imap/processor/GetACLProcessorTest.java
+++ b/protocols/imap/src/test/java/org/apache/james/imap/processor/GetACLProcessorTest.java
@@ -30,7 +30,6 @@ import static org.mockito.Mockito.verifyNoMoreInteractions;
import static org.mockito.Mockito.when;
import org.apache.james.core.Username;
-import org.apache.james.imap.api.ImapCommand;
import org.apache.james.imap.api.ImapConstants;
import org.apache.james.imap.api.message.response.ImapResponseMessage;
import org.apache.james.imap.api.process.ImapProcessor;
@@ -84,7 +83,7 @@ public class GetACLProcessorTest {
metaData = mock(MetaData.class);
responder = mock(Responder.class);
- getACLRequest = new GetACLRequest(TAG, ImapCommand.anyStateCommand("Name"), MAILBOX_NAME);
+ getACLRequest = new GetACLRequest(TAG, MAILBOX_NAME);
imapSession.authenticated();
imapSession.setMailboxSession(mailboxSession);
diff --git a/protocols/imap/src/test/java/org/apache/james/imap/processor/GetAnnotationProcessorTest.java b/protocols/imap/src/test/java/org/apache/james/imap/processor/GetAnnotationProcessorTest.java
index b950b7a..27a2433 100644
--- a/protocols/imap/src/test/java/org/apache/james/imap/processor/GetAnnotationProcessorTest.java
+++ b/protocols/imap/src/test/java/org/apache/james/imap/processor/GetAnnotationProcessorTest.java
@@ -108,7 +108,6 @@ public class GetAnnotationProcessorTest {
keys = ImmutableSet.of(PRIVATE_KEY);
annotationRequestBuilder = GetAnnotationRequest.builder()
.tag(TAG)
- .command(ImapCommand.anyStateCommand("Name"))
.mailboxName(ImapConstants.INBOX_NAME);
humanTextCaptor = ArgumentCaptor.forClass(HumanReadableText.class);
captorResponsecode = ArgumentCaptor.forClass(ResponseCode.class);
diff --git a/protocols/imap/src/test/java/org/apache/james/imap/processor/GetQuotaProcessorTest.java b/protocols/imap/src/test/java/org/apache/james/imap/processor/GetQuotaProcessorTest.java
index c1cbd79..dd60e61 100644
--- a/protocols/imap/src/test/java/org/apache/james/imap/processor/GetQuotaProcessorTest.java
+++ b/protocols/imap/src/test/java/org/apache/james/imap/processor/GetQuotaProcessorTest.java
@@ -35,7 +35,6 @@ import org.apache.james.core.quota.QuotaCountLimit;
import org.apache.james.core.quota.QuotaCountUsage;
import org.apache.james.core.quota.QuotaSizeLimit;
import org.apache.james.core.quota.QuotaSizeUsage;
-import org.apache.james.imap.api.ImapCommand;
import org.apache.james.imap.api.message.response.ImapResponseMessage;
import org.apache.james.imap.api.process.ImapProcessor;
import org.apache.james.imap.api.process.ImapSession;
@@ -100,7 +99,7 @@ public class GetQuotaProcessorTest {
@Test
public void processorShouldWorkOnValidRights() throws Exception {
- GetQuotaRequest getQuotaRequest = new GetQuotaRequest(TAG, ImapCommand.anyStateCommand("Name"), QUOTA_ROOT.getValue());
+ GetQuotaRequest getQuotaRequest = new GetQuotaRequest(TAG, QUOTA_ROOT.getValue());
when(mockedQuotaRootResolver.retrieveAssociatedMailboxes(QUOTA_ROOT, mailboxSession))
.thenReturn(ImmutableList.of(mailbox));
@@ -127,7 +126,7 @@ public class GetQuotaProcessorTest {
@Test
public void processorShouldWorkOnExceptionThrown() throws Exception {
- GetQuotaRequest getQuotaRequest = new GetQuotaRequest(TAG, ImapCommand.anyStateCommand("Name"), QUOTA_ROOT.getValue());
+ GetQuotaRequest getQuotaRequest = new GetQuotaRequest(TAG, QUOTA_ROOT.getValue());
when(mockedQuotaRootResolver.retrieveAssociatedMailboxes(QUOTA_ROOT, mailboxSession))
.thenReturn(ImmutableList.of(mailbox));
@@ -149,7 +148,7 @@ public class GetQuotaProcessorTest {
@Test
public void processorShouldWorkOnNoRights() throws Exception {
- GetQuotaRequest getQuotaRequest = new GetQuotaRequest(TAG, ImapCommand.anyStateCommand("Name"), QUOTA_ROOT.getValue());
+ GetQuotaRequest getQuotaRequest = new GetQuotaRequest(TAG, QUOTA_ROOT.getValue());
when(mockedQuotaRootResolver.retrieveAssociatedMailboxes(QUOTA_ROOT, mailboxSession))
.thenReturn(ImmutableList.of(mailbox));
diff --git a/protocols/imap/src/test/java/org/apache/james/imap/processor/GetQuotaRootProcessorTest.java b/protocols/imap/src/test/java/org/apache/james/imap/processor/GetQuotaRootProcessorTest.java
index 30b3cd1..1eb5820 100644
--- a/protocols/imap/src/test/java/org/apache/james/imap/processor/GetQuotaRootProcessorTest.java
+++ b/protocols/imap/src/test/java/org/apache/james/imap/processor/GetQuotaRootProcessorTest.java
@@ -36,7 +36,6 @@ import org.apache.james.core.quota.QuotaCountLimit;
import org.apache.james.core.quota.QuotaCountUsage;
import org.apache.james.core.quota.QuotaSizeLimit;
import org.apache.james.core.quota.QuotaSizeUsage;
-import org.apache.james.imap.api.ImapCommand;
import org.apache.james.imap.api.message.response.ImapResponseMessage;
import org.apache.james.imap.api.message.response.StatusResponse;
import org.apache.james.imap.api.process.ImapProcessor;
@@ -93,7 +92,7 @@ public class GetQuotaRootProcessorTest {
@Test
public void processorShouldWorkOnValidRights() throws Exception {
- GetQuotaRootRequest getQuotaRootRequest = new GetQuotaRootRequest(TAG, ImapCommand.anyStateCommand("Name"), "INBOX");
+ GetQuotaRootRequest getQuotaRootRequest = new GetQuotaRootRequest(TAG, "INBOX");
imapSession.authenticated();
imapSession.setMailboxSession(mailboxSession);
@@ -123,7 +122,7 @@ public class GetQuotaRootProcessorTest {
@Test
public void processorShouldWorkOnErrorThrown() throws Exception {
- GetQuotaRootRequest getQuotaRootRequest = new GetQuotaRootRequest(TAG, ImapCommand.anyStateCommand("Name"), "INBOX");
+ GetQuotaRootRequest getQuotaRootRequest = new GetQuotaRootRequest(TAG, "INBOX");
imapSession.authenticated();
imapSession.setMailboxSession(mailboxSession);
@@ -144,7 +143,7 @@ public class GetQuotaRootProcessorTest {
@Test
public void processorShouldWorkOnNonValidRights() throws Exception {
- GetQuotaRootRequest getQuotaRootRequest = new GetQuotaRootRequest(TAG, ImapCommand.anyStateCommand("Name"), "INBOX");
+ GetQuotaRootRequest getQuotaRootRequest = new GetQuotaRootRequest(TAG, "INBOX");
imapSession.authenticated();
imapSession.setMailboxSession(mailboxSession);
diff --git a/protocols/imap/src/test/java/org/apache/james/imap/processor/LSubProcessorTest.java b/protocols/imap/src/test/java/org/apache/james/imap/processor/LSubProcessorTest.java
index 897a98c..80fcc4f 100644
--- a/protocols/imap/src/test/java/org/apache/james/imap/processor/LSubProcessorTest.java
+++ b/protocols/imap/src/test/java/org/apache/james/imap/processor/LSubProcessorTest.java
@@ -30,7 +30,7 @@ import java.util.ArrayList;
import java.util.Collection;
import org.apache.james.core.Username;
-import org.apache.james.imap.api.ImapCommand;
+import org.apache.james.imap.api.ImapConstants;
import org.apache.james.imap.api.display.HumanReadableText;
import org.apache.james.imap.api.message.response.StatusResponse;
import org.apache.james.imap.api.message.response.StatusResponseFactory;
@@ -81,7 +81,6 @@ public class LSubProcessorTest {
StatusResponseFactory serverResponseFactory;
StatusResponse statusResponse;
Collection<String> subscriptions;
- ImapCommand command;
private ImapProcessor.Responder responderImpl;
@Before
@@ -89,7 +88,6 @@ public class LSubProcessorTest {
subscriptions = new ArrayList<>();
serverResponseFactory = mock(StatusResponseFactory.class);
session = new FakeImapSession();
- command = ImapCommand.anyStateCommand("Command");
next = mock(ImapProcessor.class);
responder = mock(ImapProcessor.Responder.class);
result = mock(MailboxMetaData.class);
@@ -111,10 +109,10 @@ public class LSubProcessorTest {
subscriptions.add(CHILD_TWO);
expectSubscriptions();
- when(serverResponseFactory.taggedOk(eq(TAG), same(command), eq(HumanReadableText.COMPLETED)))
+ when(serverResponseFactory.taggedOk(eq(TAG), same(ImapConstants.LSUB_COMMAND), eq(HumanReadableText.COMPLETED)))
.thenReturn(statusResponse);
- LsubRequest request = new LsubRequest(command, "", PARENT
+ LsubRequest request = new LsubRequest("", PARENT
+ HIERARCHY_DELIMITER + "%", TAG);
processor.doProcessRequest(request, session, responderImpl);
@@ -133,10 +131,10 @@ public class LSubProcessorTest {
subscriptions.add(CHILD_TWO);
expectSubscriptions();
- when(serverResponseFactory.taggedOk(eq(TAG), same(command), eq(HumanReadableText.COMPLETED)))
+ when(serverResponseFactory.taggedOk(eq(TAG), same(ImapConstants.LSUB_COMMAND), eq(HumanReadableText.COMPLETED)))
.thenReturn(statusResponse);
- LsubRequest request = new LsubRequest(command, "", ROOT
+ LsubRequest request = new LsubRequest("", ROOT
+ HIERARCHY_DELIMITER + "%", TAG);
processor.doProcessRequest(request, session, responderImpl);
@@ -155,10 +153,10 @@ public class LSubProcessorTest {
subscriptions.add(CHILD_TWO);
expectSubscriptions();
- when(serverResponseFactory.taggedOk(eq(TAG), same(command), eq(HumanReadableText.COMPLETED)))
+ when(serverResponseFactory.taggedOk(eq(TAG), same(ImapConstants.LSUB_COMMAND), eq(HumanReadableText.COMPLETED)))
.thenReturn(statusResponse);
- LsubRequest request = new LsubRequest(command, "", ROOT
+ LsubRequest request = new LsubRequest("", ROOT
+ HIERARCHY_DELIMITER + "%", TAG);
processor.doProcessRequest(request, session, responderImpl);
@@ -172,10 +170,10 @@ public class LSubProcessorTest {
subscriptions.add(MAILBOX_B);
subscriptions.add(MAILBOX_C);
expectSubscriptions();
- when(serverResponseFactory.taggedOk(eq(TAG), same(command), eq(HumanReadableText.COMPLETED)))
+ when(serverResponseFactory.taggedOk(eq(TAG), same(ImapConstants.LSUB_COMMAND), eq(HumanReadableText.COMPLETED)))
.thenReturn(statusResponse);
- LsubRequest request = new LsubRequest(command, "", "*", TAG);
+ LsubRequest request = new LsubRequest("", "*", TAG);
processor.doProcessRequest(request, session, responderImpl);
verify(responder).respond(new LSubResponse(MAILBOX_A, false, HIERARCHY_DELIMITER));
diff --git a/protocols/imap/src/test/java/org/apache/james/imap/processor/ListRightsProcessorTest.java b/protocols/imap/src/test/java/org/apache/james/imap/processor/ListRightsProcessorTest.java
index 6e107b2..5b57277 100644
--- a/protocols/imap/src/test/java/org/apache/james/imap/processor/ListRightsProcessorTest.java
+++ b/protocols/imap/src/test/java/org/apache/james/imap/processor/ListRightsProcessorTest.java
@@ -30,7 +30,6 @@ import static org.mockito.Mockito.verifyNoMoreInteractions;
import static org.mockito.Mockito.when;
import org.apache.james.core.Username;
-import org.apache.james.imap.api.ImapCommand;
import org.apache.james.imap.api.ImapConstants;
import org.apache.james.imap.api.message.response.ImapResponseMessage;
import org.apache.james.imap.api.process.ImapProcessor;
@@ -96,7 +95,7 @@ public class ListRightsProcessorTest {
when(mailboxManager.getMailbox(any(MailboxPath.class), any(MailboxSession.class)))
.thenReturn(messageManager);
- listRightsRequest = new ListRightsRequest(TAG, ImapCommand.anyStateCommand("Name"), MAILBOX_NAME, USER_1.asString());
+ listRightsRequest = new ListRightsRequest(TAG, MAILBOX_NAME, USER_1.asString());
user1Key = EntryKey.deserialize(USER_1.asString());
listRights = new Rfc4314Rights[] {Rfc4314Rights.fromSerializedRfc4314Rights("ae"), Rfc4314Rights.fromSerializedRfc4314Rights("i"), Rfc4314Rights.fromSerializedRfc4314Rights("k")};
diff --git a/protocols/imap/src/test/java/org/apache/james/imap/processor/MoveProcessorTest.java b/protocols/imap/src/test/java/org/apache/james/imap/processor/MoveProcessorTest.java
index 6f2dd62..eeb3e08 100644
--- a/protocols/imap/src/test/java/org/apache/james/imap/processor/MoveProcessorTest.java
+++ b/protocols/imap/src/test/java/org/apache/james/imap/processor/MoveProcessorTest.java
@@ -102,7 +102,7 @@ public class MoveProcessorTest {
@Test
public void processShouldWork() throws Exception {
- MoveRequest moveRequest = new MoveRequest(ImapCommand.anyStateCommand("Name"), new IdRange[] {new IdRange(4, 6)}, ImapConstants.INBOX_NAME, true, TAG);
+ MoveRequest moveRequest = new MoveRequest(new IdRange[] {new IdRange(4, 6)}, ImapConstants.INBOX_NAME, true, TAG);
MailboxPath selected = new MailboxPath(INBOX, "selected");
SelectedMailbox selectedMailbox = mock(SelectedMailbox.class);
when(selectedMailbox.getLastUid()).thenReturn(Optional.of(MessageUid.of(8)));
@@ -135,7 +135,7 @@ public class MoveProcessorTest {
@Test
public void processShouldWorkWithMultipleRanges() throws Exception {
- MoveRequest moveRequest = new MoveRequest(ImapCommand.anyStateCommand("Name"), new IdRange[] {new IdRange(5, 6), new IdRange(1,3)}, ImapConstants.INBOX_NAME, true, TAG);
+ MoveRequest moveRequest = new MoveRequest(new IdRange[] {new IdRange(5, 6), new IdRange(1,3)}, ImapConstants.INBOX_NAME, true, TAG);
MailboxPath selected = new MailboxPath(INBOX, "selected");
SelectedMailbox selectedMailbox = mock(SelectedMailbox.class);
when(selectedMailbox.getLastUid()).thenReturn(Optional.of(MessageUid.of(8)));
@@ -166,7 +166,7 @@ public class MoveProcessorTest {
@Test
public void processShouldRespondNoOnUnExistingTargetMailbox() throws Exception {
- MoveRequest moveRequest = new MoveRequest(ImapCommand.anyStateCommand("Name"), new IdRange[] {new IdRange(5, 6), new IdRange(1,3)}, ImapConstants.INBOX_NAME, true, TAG);
+ MoveRequest moveRequest = new MoveRequest(new IdRange[] {new IdRange(5, 6), new IdRange(1,3)}, ImapConstants.INBOX_NAME, true, TAG);
MailboxPath selected = new MailboxPath(INBOX, "selected");
SelectedMailbox selectedMailbox = mock(SelectedMailbox.class);
when(selectedMailbox.getLastUid()).thenReturn(Optional.of(MessageUid.of(8)));
@@ -189,7 +189,7 @@ public class MoveProcessorTest {
@Test
public void processShouldRespondNoOnMailboxException() throws Exception {
- MoveRequest moveRequest = new MoveRequest(ImapCommand.anyStateCommand("Name"), new IdRange[] {new IdRange(5, 6), new IdRange(1,3)}, ImapConstants.INBOX_NAME, true, TAG);
+ MoveRequest moveRequest = new MoveRequest(new IdRange[] {new IdRange(5, 6), new IdRange(1,3)}, ImapConstants.INBOX_NAME, true, TAG);
MailboxPath selected = new MailboxPath(INBOX, "selected");
SelectedMailbox selectedMailbox = mock(SelectedMailbox.class);
when(selectedMailbox.getLastUid()).thenReturn(Optional.of(MessageUid.of(8)));
@@ -212,7 +212,7 @@ public class MoveProcessorTest {
@Test
public void processShouldNotHandleCopyRequests() {
- CopyRequest copyRequest = new CopyRequest(ImapCommand.anyStateCommand("Name"), new IdRange[] {new IdRange(4, 6)}, ImapConstants.INBOX_NAME, true, TAG);
+ CopyRequest copyRequest = new CopyRequest(new IdRange[] {new IdRange(4, 6)}, ImapConstants.INBOX_NAME, true, TAG);
testee.process(copyRequest, mockResponder, imapSession);
diff --git a/protocols/imap/src/test/java/org/apache/james/imap/processor/NamespaceProcessorTest.java b/protocols/imap/src/test/java/org/apache/james/imap/processor/NamespaceProcessorTest.java
index f6e868d..4c17a5d 100644
--- a/protocols/imap/src/test/java/org/apache/james/imap/processor/NamespaceProcessorTest.java
+++ b/protocols/imap/src/test/java/org/apache/james/imap/processor/NamespaceProcessorTest.java
@@ -75,7 +75,7 @@ public class NamespaceProcessorTest {
imapSession = spy(new FakeImapSession());
mailboxSession = mock(MailboxSession.class);
- namespaceRequest = new NamespaceRequest(ImapCommand.anyStateCommand("Name"), TAG);
+ namespaceRequest = new NamespaceRequest(TAG);
imapSession.setMailboxSession(mailboxSession);
}
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 9a6f3d3..b6f7bfb 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
@@ -40,7 +40,6 @@ import javax.mail.Flags;
import javax.mail.Flags.Flag;
import org.apache.james.core.Username;
-import org.apache.james.imap.api.ImapCommand;
import org.apache.james.imap.api.ImapConstants;
import org.apache.james.imap.api.display.HumanReadableText;
import org.apache.james.imap.api.message.IdRange;
@@ -109,7 +108,6 @@ public class SearchProcessorTest {
ImapProcessor next;
ImapProcessor.Responder responder;
FakeImapSession session;
- ImapCommand command;
StatusResponseFactory serverResponseFactory;
StatusResponse statusResponse;
MessageManager mailbox;
@@ -121,7 +119,6 @@ public class SearchProcessorTest {
public void setUp() throws Exception {
serverResponseFactory = mock(StatusResponseFactory.class);
session = new FakeImapSession();
- command = ImapCommand.anyStateCommand("Command");
next = mock(ImapProcessor.class);
responder = mock(ImapProcessor.Responder.class);
statusResponse = mock(StatusResponse.class);
@@ -471,13 +468,13 @@ public class SearchProcessorTest {
when(selectedMailbox.getApplicableFlags()).thenReturn(new Flags());
when(selectedMailbox.hasNewApplicableFlags()).thenReturn(false);
- SearchRequest message = new SearchRequest(command, new SearchOperation(key, new ArrayList<>()), false, TAG);
+ SearchRequest message = new SearchRequest(new SearchOperation(key, new ArrayList<>()), false, TAG);
processor.processRequest(message, session, responder);
}
private void expectOk() {
when(serverResponseFactory
- .taggedOk(eq(TAG), same(command), eq(HumanReadableText.COMPLETED)))
+ .taggedOk(eq(TAG), same(ImapConstants.SEARCH_COMMAND), eq(HumanReadableText.COMPLETED)))
.thenReturn(statusResponse);
}
diff --git a/protocols/imap/src/test/java/org/apache/james/imap/processor/SetACLProcessorTest.java b/protocols/imap/src/test/java/org/apache/james/imap/processor/SetACLProcessorTest.java
index 24e9232..44b66c9 100644
--- a/protocols/imap/src/test/java/org/apache/james/imap/processor/SetACLProcessorTest.java
+++ b/protocols/imap/src/test/java/org/apache/james/imap/processor/SetACLProcessorTest.java
@@ -30,7 +30,6 @@ import static org.mockito.Mockito.verifyNoMoreInteractions;
import static org.mockito.Mockito.when;
import org.apache.james.core.Username;
-import org.apache.james.imap.api.ImapCommand;
import org.apache.james.imap.api.ImapConstants;
import org.apache.james.imap.api.message.response.ImapResponseMessage;
import org.apache.james.imap.api.process.ImapProcessor;
@@ -98,7 +97,7 @@ public class SetACLProcessorTest {
when(mailboxManager.getMailbox(any(MailboxPath.class), any(MailboxSession.class)))
.thenReturn(messageManager);
- replaceAclRequest = new SetACLRequest(TAG, ImapCommand.anyStateCommand("Name"), MAILBOX_NAME, USER_1.asString(), SET_RIGHTS);
+ replaceAclRequest = new SetACLRequest(TAG, MAILBOX_NAME, USER_1.asString(), SET_RIGHTS);
user1Key = EntryKey.deserialize(USER_1.asString());
setRights = Rfc4314Rights.fromSerializedRfc4314Rights(SET_RIGHTS);
@@ -106,7 +105,7 @@ public class SetACLProcessorTest {
@Test
public void testUnsupportedRight() throws Exception {
- SetACLRequest setACLRequest = new SetACLRequest(TAG, ImapCommand.anyStateCommand("Name"), MAILBOX_NAME, USER_1.asString(), UNSUPPORTED_RIGHT);
+ SetACLRequest setACLRequest = new SetACLRequest(TAG, MAILBOX_NAME, USER_1.asString(), UNSUPPORTED_RIGHT);
when(mailboxManager.hasRight(path, MailboxACL.Right.Lookup, mailboxSession))
.thenReturn(false);
@@ -177,7 +176,7 @@ public class SetACLProcessorTest {
when(mailboxManager.hasRight(path, MailboxACL.Right.Administer, mailboxSession))
.thenReturn(true);
- SetACLRequest r = new SetACLRequest(TAG, ImapCommand.anyStateCommand("Name"), MAILBOX_NAME, USER_1.asString(), prefix + SET_RIGHTS);
+ SetACLRequest r = new SetACLRequest(TAG, MAILBOX_NAME, USER_1.asString(), prefix + SET_RIGHTS);
subject.doProcess(r, responder, imapSession);
verify(mailboxManager).applyRightsCommand(path,
diff --git a/protocols/imap/src/test/java/org/apache/james/imap/processor/SetAnnotationProcessorTest.java b/protocols/imap/src/test/java/org/apache/james/imap/processor/SetAnnotationProcessorTest.java
index e2998bd..010fa3f 100644
--- a/protocols/imap/src/test/java/org/apache/james/imap/processor/SetAnnotationProcessorTest.java
+++ b/protocols/imap/src/test/java/org/apache/james/imap/processor/SetAnnotationProcessorTest.java
@@ -93,7 +93,7 @@ public class SetAnnotationProcessorTest {
mockMailboxSession = MailboxSessionUtil.create(username);
inbox = MailboxPath.inbox(username);
mailboxAnnotations = ImmutableList.of(MailboxAnnotation.newInstance(new MailboxAnnotationKey("/private/key"), "anyValue"));
- request = new SetAnnotationRequest(TAG, ImapCommand.anyStateCommand("Name"), ImapConstants.INBOX_NAME, mailboxAnnotations);
+ request = new SetAnnotationRequest(TAG, ImapConstants.INBOX_NAME, mailboxAnnotations);
humanTextCaptor = ArgumentCaptor.forClass(HumanReadableText.class);
imapSession.authenticated();
diff --git a/protocols/imap/src/test/java/org/apache/james/imap/processor/SetQuotaProcessorTest.java b/protocols/imap/src/test/java/org/apache/james/imap/processor/SetQuotaProcessorTest.java
index a437f2e..30791b8 100644
--- a/protocols/imap/src/test/java/org/apache/james/imap/processor/SetQuotaProcessorTest.java
+++ b/protocols/imap/src/test/java/org/apache/james/imap/processor/SetQuotaProcessorTest.java
@@ -26,7 +26,6 @@ import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.verifyNoMoreInteractions;
import org.apache.james.core.Username;
-import org.apache.james.imap.api.ImapCommand;
import org.apache.james.imap.api.message.response.ImapResponseMessage;
import org.apache.james.imap.api.process.ImapProcessor;
import org.apache.james.imap.encode.FakeImapSession;
@@ -59,7 +58,7 @@ public class SetQuotaProcessorTest {
@Test
public void processorShouldWorkOnNoRights() {
- SetQuotaRequest setQuotaRequest = new SetQuotaRequest(TAG, ImapCommand.anyStateCommand("Name"), "quotaRoot");
+ SetQuotaRequest setQuotaRequest = new SetQuotaRequest(TAG, "quotaRoot");
testee.doProcess(setQuotaRequest, mockedResponder, imapSession);
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org