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 fe...@apache.org on 2011/04/14 13:21:16 UTC
svn commit: r1092137 [3/9] - in /james/imap/trunk:
api/src/main/java/org/apache/james/imap/api/
api/src/main/java/org/apache/james/imap/api/display/
api/src/main/java/org/apache/james/imap/api/message/
api/src/main/java/org/apache/james/imap/api/messag...
Modified: james/imap/trunk/message/src/main/java/org/apache/james/imap/decode/main/DefaultImapDecoder.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/message/src/main/java/org/apache/james/imap/decode/main/DefaultImapDecoder.java?rev=1092137&r1=1092136&r2=1092137&view=diff
==============================================================================
--- james/imap/trunk/message/src/main/java/org/apache/james/imap/decode/main/DefaultImapDecoder.java (original)
+++ james/imap/trunk/message/src/main/java/org/apache/james/imap/decode/main/DefaultImapDecoder.java Thu Apr 14 11:21:11 2011
@@ -31,9 +31,9 @@ import org.apache.james.imap.decode.Deco
import org.slf4j.Logger;
/**
- * {@link ImapDecoder} implementation which parse the data via lookup the right {@link ImapCommandParser} via an {@link ImapCommandParserFactory}. The
+ * {@link ImapDecoder} implementation which parse the data via lookup the right
+ * {@link ImapCommandParser} via an {@link ImapCommandParserFactory}. The
* response will get generated via the {@link ImapMessageFactory}.
- *
*/
public class DefaultImapDecoder implements ImapDecoder {
@@ -46,21 +46,23 @@ public class DefaultImapDecoder implemen
private final static String INVALID_COMMAND_COUNT = "INVALID_COMMAND_COUNT";
public final static int DEFAULT_MAX_INVALID_COMMANDS = 9;
- public DefaultImapDecoder(final StatusResponseFactory responseFactory,
- final ImapCommandParserFactory imapCommands) {
+ public DefaultImapDecoder(final StatusResponseFactory responseFactory, final ImapCommandParserFactory imapCommands) {
this(responseFactory, imapCommands, DEFAULT_MAX_INVALID_COMMANDS);
}
-
- public DefaultImapDecoder(final StatusResponseFactory responseFactory,
- final ImapCommandParserFactory imapCommands, int maxInvalidCommands) {
+
+ public DefaultImapDecoder(final StatusResponseFactory responseFactory, final ImapCommandParserFactory imapCommands, int maxInvalidCommands) {
this.responseFactory = responseFactory;
this.imapCommands = imapCommands;
this.maxInvalidCommands = maxInvalidCommands;
}
-
+
/*
* (non-Javadoc)
- * @see org.apache.james.imap.decode.ImapDecoder#decode(org.apache.james.imap.decode.ImapRequestLineReader, org.apache.james.imap.api.process.ImapSession)
+ *
+ * @see
+ * org.apache.james.imap.decode.ImapDecoder#decode(org.apache.james.imap
+ * .decode.ImapRequestLineReader,
+ * org.apache.james.imap.api.process.ImapSession)
*/
public ImapMessage decode(ImapRequestLineReader request, ImapSession session) {
ImapMessage message;
@@ -76,18 +78,14 @@ public class DefaultImapDecoder implemen
return message;
}
-
- private ImapMessage decodeCommandTagged(
- final ImapRequestLineReader request,
- final String tag, final ImapSession session) {
+ private ImapMessage decodeCommandTagged(final ImapRequestLineReader request, final String tag, final ImapSession session) {
ImapMessage message;
if (session.getLog().isDebugEnabled()) {
session.getLog().debug("Got <tag>: " + tag);
}
try {
final String commandName = request.atom();
- message = decodeCommandNamed(request, tag, commandName,
- session);
+ message = decodeCommandNamed(request, tag, commandName, session);
} catch (DecodingException e) {
session.getLog().debug("Error during initial request parsing", e);
message = unknownCommand(tag, session);
@@ -95,8 +93,7 @@ public class DefaultImapDecoder implemen
return message;
}
- private ImapMessage unknownCommand(final String tag,
- final ImapSession session) {
+ private ImapMessage unknownCommand(final String tag, final ImapSession session) {
ImapMessage message;
Object c = session.getAttribute(INVALID_COMMAND_COUNT);
int count = 0;
@@ -105,27 +102,22 @@ public class DefaultImapDecoder implemen
}
count++;
if (count > maxInvalidCommands || session.getState() == ImapSessionState.NON_AUTHENTICATED) {
- message = responseFactory
- .bye(HumanReadableText.BYE_UNKNOWN_COMMAND);
+ message = responseFactory.bye(HumanReadableText.BYE_UNKNOWN_COMMAND);
session.logout();
} else {
session.setAttribute(INVALID_COMMAND_COUNT, count);
if (tag == null) {
- message = responseFactory.untaggedBad(HumanReadableText.UNKNOWN_COMMAND);
+ message = responseFactory.untaggedBad(HumanReadableText.UNKNOWN_COMMAND);
} else {
- message = responseFactory.taggedBad(tag, null,
- HumanReadableText.UNKNOWN_COMMAND);
+ message = responseFactory.taggedBad(tag, null, HumanReadableText.UNKNOWN_COMMAND);
}
}
-
return message;
}
- private ImapMessage decodeCommandNamed(final ImapRequestLineReader request,
- final String tag, String commandName,
- final ImapSession session) {
+ private ImapMessage decodeCommandNamed(final ImapRequestLineReader request, final String tag, String commandName, final ImapSession session) {
ImapMessage message;
if (session.getLog().isDebugEnabled()) {
session.getLog().debug("Got <command>: " + commandName);
Modified: james/imap/trunk/message/src/main/java/org/apache/james/imap/decode/parser/AbstractUidCommandParser.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/message/src/main/java/org/apache/james/imap/decode/parser/AbstractUidCommandParser.java?rev=1092137&r1=1092136&r2=1092137&view=diff
==============================================================================
--- james/imap/trunk/message/src/main/java/org/apache/james/imap/decode/parser/AbstractUidCommandParser.java (original)
+++ james/imap/trunk/message/src/main/java/org/apache/james/imap/decode/parser/AbstractUidCommandParser.java Thu Apr 14 11:21:11 2011
@@ -29,23 +29,19 @@ import org.apache.james.imap.decode.base
abstract class AbstractUidCommandParser extends AbstractImapCommandParser {
public AbstractUidCommandParser(final ImapCommand command) {
- super(command);
+ super(command);
}
- protected ImapMessage decode(ImapCommand command,
- ImapRequestLineReader request, String tag, ImapSession session) throws DecodingException {
+ protected ImapMessage decode(ImapCommand command, ImapRequestLineReader request, String tag, ImapSession session) throws DecodingException {
final ImapMessage result = decode(command, request, tag, false, session);
return result;
}
- public ImapMessage decode(ImapRequestLineReader request, String tag,
- boolean useUids, ImapSession session) throws DecodingException {
+ public ImapMessage decode(ImapRequestLineReader request, String tag, boolean useUids, ImapSession session) throws DecodingException {
final ImapCommand command = getCommand();
final ImapMessage result = decode(command, request, tag, useUids, session);
return result;
}
- protected abstract ImapMessage decode(ImapCommand command,
- ImapRequestLineReader request, String tag, boolean useUids, ImapSession session)
- throws DecodingException;
+ protected abstract ImapMessage decode(ImapCommand command, ImapRequestLineReader request, String tag, boolean useUids, ImapSession session) throws DecodingException;
}
Modified: james/imap/trunk/message/src/main/java/org/apache/james/imap/decode/parser/AppendCommandParser.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/message/src/main/java/org/apache/james/imap/decode/parser/AppendCommandParser.java?rev=1092137&r1=1092136&r2=1092137&view=diff
==============================================================================
--- james/imap/trunk/message/src/main/java/org/apache/james/imap/decode/parser/AppendCommandParser.java (original)
+++ james/imap/trunk/message/src/main/java/org/apache/james/imap/decode/parser/AppendCommandParser.java Thu Apr 14 11:21:11 2011
@@ -33,12 +33,11 @@ import org.apache.james.imap.message.req
/**
* Parses APPEND command
- *
*/
public class AppendCommandParser extends AbstractImapCommandParser {
public AppendCommandParser() {
- super(ImapCommand.authenticatedStateCommand(ImapConstants.APPEND_COMMAND_NAME));
+ super(ImapCommand.authenticatedStateCommand(ImapConstants.APPEND_COMMAND_NAME));
}
/**
@@ -46,8 +45,7 @@ public class AppendCommandParser extends
* "flag_list" argument from the request. If not, returns a MessageFlags
* with no flags set.
*/
- public Flags optionalAppendFlags(ImapRequestLineReader request)
- throws DecodingException {
+ public Flags optionalAppendFlags(ImapRequestLineReader request) throws DecodingException {
char next = request.nextWordChar();
if (next == '(') {
return request.flagList();
@@ -60,8 +58,7 @@ public class AppendCommandParser extends
* If the next character in the request is a '"', tries to read a DateTime
* argument. If not, returns null.
*/
- public Date optionalDateTime(ImapRequestLineReader request)
- throws DecodingException {
+ public Date optionalDateTime(ImapRequestLineReader request) throws DecodingException {
char next = request.nextWordChar();
if (next == '"') {
return request.dateTime();
@@ -70,13 +67,16 @@ public class AppendCommandParser extends
}
}
-
/*
* (non-Javadoc)
- * @see org.apache.james.imap.decode.base.AbstractImapCommandParser#decode(org.apache.james.imap.api.ImapCommand, org.apache.james.imap.decode.ImapRequestLineReader, java.lang.String, org.apache.james.imap.api.process.ImapSession)
+ *
+ * @see
+ * org.apache.james.imap.decode.base.AbstractImapCommandParser#decode(org
+ * .apache.james.imap.api.ImapCommand,
+ * org.apache.james.imap.decode.ImapRequestLineReader, java.lang.String,
+ * org.apache.james.imap.api.process.ImapSession)
*/
- protected ImapMessage decode(ImapCommand command,
- ImapRequestLineReader request, String tag, ImapSession session) throws DecodingException {
+ protected ImapMessage decode(ImapCommand command, ImapRequestLineReader request, String tag, ImapSession session) throws DecodingException {
String mailboxName = request.mailbox();
Flags flags = optionalAppendFlags(request);
if (flags == null) {
@@ -87,9 +87,8 @@ public class AppendCommandParser extends
datetime = new Date();
}
request.nextWordChar();
-
- final ImapMessage result = new AppendRequest(command,
- mailboxName, flags, datetime, request.consumeLiteral(true), tag);
+
+ final ImapMessage result = new AppendRequest(command, mailboxName, flags, datetime, request.consumeLiteral(true), tag);
return result;
}
}
Modified: james/imap/trunk/message/src/main/java/org/apache/james/imap/decode/parser/AuthenticateCommandParser.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/message/src/main/java/org/apache/james/imap/decode/parser/AuthenticateCommandParser.java?rev=1092137&r1=1092136&r2=1092137&view=diff
==============================================================================
--- james/imap/trunk/message/src/main/java/org/apache/james/imap/decode/parser/AuthenticateCommandParser.java (original)
+++ james/imap/trunk/message/src/main/java/org/apache/james/imap/decode/parser/AuthenticateCommandParser.java Thu Apr 14 11:21:11 2011
@@ -28,27 +28,27 @@ import org.apache.james.imap.decode.base
import org.apache.james.imap.message.request.AuthenticateRequest;
/**
- *
* Parses AUTHENTICATE commands
- *
*/
public class AuthenticateCommandParser extends AbstractImapCommandParser {
public AuthenticateCommandParser() {
- super(ImapCommand.nonAuthenticatedStateCommand(ImapConstants.AUTHENTICATE_COMMAND_NAME));
+ super(ImapCommand.nonAuthenticatedStateCommand(ImapConstants.AUTHENTICATE_COMMAND_NAME));
}
-
/*
* (non-Javadoc)
- * @see org.apache.james.imap.decode.base.AbstractImapCommandParser#decode(org.apache.james.imap.api.ImapCommand, org.apache.james.imap.decode.ImapRequestLineReader, java.lang.String, org.apache.james.imap.api.process.ImapSession)
+ *
+ * @see
+ * org.apache.james.imap.decode.base.AbstractImapCommandParser#decode(org
+ * .apache.james.imap.api.ImapCommand,
+ * org.apache.james.imap.decode.ImapRequestLineReader, java.lang.String,
+ * org.apache.james.imap.api.process.ImapSession)
*/
- protected ImapMessage decode(ImapCommand command,
- ImapRequestLineReader request, String tag, ImapSession session) throws DecodingException {
+ protected ImapMessage decode(ImapCommand command, ImapRequestLineReader request, String tag, ImapSession session) throws DecodingException {
String authType = request.astring();
request.eol();
- final ImapMessage result = new AuthenticateRequest(command,
- authType, tag);
+ final ImapMessage result = new AuthenticateRequest(command, authType, tag);
return result;
}
Modified: james/imap/trunk/message/src/main/java/org/apache/james/imap/decode/parser/CapabilityCommandParser.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/message/src/main/java/org/apache/james/imap/decode/parser/CapabilityCommandParser.java?rev=1092137&r1=1092136&r2=1092137&view=diff
==============================================================================
--- james/imap/trunk/message/src/main/java/org/apache/james/imap/decode/parser/CapabilityCommandParser.java (original)
+++ james/imap/trunk/message/src/main/java/org/apache/james/imap/decode/parser/CapabilityCommandParser.java Thu Apr 14 11:21:11 2011
@@ -29,21 +29,23 @@ import org.apache.james.imap.message.req
/**
* Parses CAPABILITY commands
- *
*/
public class CapabilityCommandParser extends AbstractImapCommandParser {
public CapabilityCommandParser() {
- super(ImapCommand.anyStateCommand(ImapConstants.CAPABILITY_COMMAND_NAME));
+ super(ImapCommand.anyStateCommand(ImapConstants.CAPABILITY_COMMAND_NAME));
}
-
/*
* (non-Javadoc)
- * @see org.apache.james.imap.decode.base.AbstractImapCommandParser#decode(org.apache.james.imap.api.ImapCommand, org.apache.james.imap.decode.ImapRequestLineReader, java.lang.String, org.apache.james.imap.api.process.ImapSession)
+ *
+ * @see
+ * org.apache.james.imap.decode.base.AbstractImapCommandParser#decode(org
+ * .apache.james.imap.api.ImapCommand,
+ * org.apache.james.imap.decode.ImapRequestLineReader, java.lang.String,
+ * org.apache.james.imap.api.process.ImapSession)
*/
- protected ImapMessage decode(ImapCommand command,
- ImapRequestLineReader request, String tag, ImapSession session) throws DecodingException {
+ protected ImapMessage decode(ImapCommand command, ImapRequestLineReader request, String tag, ImapSession session) throws DecodingException {
request.eol();
final ImapMessage result = new CapabilityRequest(command, tag);
return result;
Modified: james/imap/trunk/message/src/main/java/org/apache/james/imap/decode/parser/CheckCommandParser.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/message/src/main/java/org/apache/james/imap/decode/parser/CheckCommandParser.java?rev=1092137&r1=1092136&r2=1092137&view=diff
==============================================================================
--- james/imap/trunk/message/src/main/java/org/apache/james/imap/decode/parser/CheckCommandParser.java (original)
+++ james/imap/trunk/message/src/main/java/org/apache/james/imap/decode/parser/CheckCommandParser.java Thu Apr 14 11:21:11 2011
@@ -29,7 +29,6 @@ import org.apache.james.imap.message.req
/**
* Parses CHECK commands
- *
*/
public class CheckCommandParser extends AbstractImapCommandParser {
@@ -37,13 +36,16 @@ public class CheckCommandParser extends
super(ImapCommand.selectedStateCommand(ImapConstants.CHECK_COMMAND_NAME));
}
-
/*
* (non-Javadoc)
- * @see org.apache.james.imap.decode.base.AbstractImapCommandParser#decode(org.apache.james.imap.api.ImapCommand, org.apache.james.imap.decode.ImapRequestLineReader, java.lang.String, org.apache.james.imap.api.process.ImapSession)
+ *
+ * @see
+ * org.apache.james.imap.decode.base.AbstractImapCommandParser#decode(org
+ * .apache.james.imap.api.ImapCommand,
+ * org.apache.james.imap.decode.ImapRequestLineReader, java.lang.String,
+ * org.apache.james.imap.api.process.ImapSession)
*/
- protected ImapMessage decode(ImapCommand command,
- ImapRequestLineReader request, String tag, ImapSession session) throws DecodingException {
+ protected ImapMessage decode(ImapCommand command, ImapRequestLineReader request, String tag, ImapSession session) throws DecodingException {
request.eol();
final ImapMessage result = new CheckRequest(command, tag);
return result;
Modified: james/imap/trunk/message/src/main/java/org/apache/james/imap/decode/parser/CloseCommandParser.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/message/src/main/java/org/apache/james/imap/decode/parser/CloseCommandParser.java?rev=1092137&r1=1092136&r2=1092137&view=diff
==============================================================================
--- james/imap/trunk/message/src/main/java/org/apache/james/imap/decode/parser/CloseCommandParser.java (original)
+++ james/imap/trunk/message/src/main/java/org/apache/james/imap/decode/parser/CloseCommandParser.java Thu Apr 14 11:21:11 2011
@@ -28,22 +28,24 @@ import org.apache.james.imap.decode.base
import org.apache.james.imap.message.request.CloseRequest;
/**
- *
- * Parse CLOSE commands
- *
+ * Parse CLOSE commands
*/
-class CloseCommandParser extends AbstractImapCommandParser {
-
+class CloseCommandParser extends AbstractImapCommandParser {
+
public CloseCommandParser() {
- super(ImapCommand.selectedStateCommand(ImapConstants.CLOSE_COMMAND_NAME));
+ super(ImapCommand.selectedStateCommand(ImapConstants.CLOSE_COMMAND_NAME));
}
/*
* (non-Javadoc)
- * @see org.apache.james.imap.decode.base.AbstractImapCommandParser#decode(org.apache.james.imap.api.ImapCommand, org.apache.james.imap.decode.ImapRequestLineReader, java.lang.String, org.apache.james.imap.api.process.ImapSession)
+ *
+ * @see
+ * org.apache.james.imap.decode.base.AbstractImapCommandParser#decode(org
+ * .apache.james.imap.api.ImapCommand,
+ * org.apache.james.imap.decode.ImapRequestLineReader, java.lang.String,
+ * org.apache.james.imap.api.process.ImapSession)
*/
- protected ImapMessage decode(ImapCommand command,
- ImapRequestLineReader request, String tag, ImapSession session) throws DecodingException {
+ protected ImapMessage decode(ImapCommand command, ImapRequestLineReader request, String tag, ImapSession session) throws DecodingException {
request.eol();
final ImapMessage result = new CloseRequest(command, tag);
return result;
Modified: james/imap/trunk/message/src/main/java/org/apache/james/imap/decode/parser/CompressCommandParser.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/message/src/main/java/org/apache/james/imap/decode/parser/CompressCommandParser.java?rev=1092137&r1=1092136&r2=1092137&view=diff
==============================================================================
--- james/imap/trunk/message/src/main/java/org/apache/james/imap/decode/parser/CompressCommandParser.java (original)
+++ james/imap/trunk/message/src/main/java/org/apache/james/imap/decode/parser/CompressCommandParser.java Thu Apr 14 11:21:11 2011
@@ -27,15 +27,20 @@ import org.apache.james.imap.decode.Imap
import org.apache.james.imap.decode.base.AbstractImapCommandParser;
import org.apache.james.imap.message.request.CompressRequest;
-public class CompressCommandParser extends AbstractImapCommandParser{
+public class CompressCommandParser extends AbstractImapCommandParser {
public CompressCommandParser() {
super(ImapCommand.anyStateCommand(ImapConstants.COMPRESS_COMMAND_NAME));
}
-
+
/*
* (non-Javadoc)
- * @see org.apache.james.imap.decode.base.AbstractImapCommandParser#decode(org.apache.james.imap.api.ImapCommand, org.apache.james.imap.decode.ImapRequestLineReader, java.lang.String, org.apache.james.imap.api.process.ImapSession)
+ *
+ * @see
+ * org.apache.james.imap.decode.base.AbstractImapCommandParser#decode(org
+ * .apache.james.imap.api.ImapCommand,
+ * org.apache.james.imap.decode.ImapRequestLineReader, java.lang.String,
+ * org.apache.james.imap.api.process.ImapSession)
*/
protected ImapMessage decode(ImapCommand command, ImapRequestLineReader request, String tag, ImapSession session) throws DecodingException {
String algorithm = request.atom();
Modified: james/imap/trunk/message/src/main/java/org/apache/james/imap/decode/parser/CopyCommandParser.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/message/src/main/java/org/apache/james/imap/decode/parser/CopyCommandParser.java?rev=1092137&r1=1092136&r2=1092137&view=diff
==============================================================================
--- james/imap/trunk/message/src/main/java/org/apache/james/imap/decode/parser/CopyCommandParser.java (original)
+++ james/imap/trunk/message/src/main/java/org/apache/james/imap/decode/parser/CopyCommandParser.java Thu Apr 14 11:21:11 2011
@@ -29,7 +29,6 @@ import org.apache.james.imap.message.req
/**
* Parse COPY commands
- *
*/
public class CopyCommandParser extends AbstractUidCommandParser {
@@ -39,16 +38,18 @@ public class CopyCommandParser extends A
/*
* (non-Javadoc)
- * @see org.apache.james.imap.decode.parser.AbstractUidCommandParser#decode(org.apache.james.imap.api.ImapCommand, org.apache.james.imap.decode.ImapRequestLineReader, java.lang.String, boolean, org.apache.james.imap.api.process.ImapSession)
+ *
+ * @see
+ * org.apache.james.imap.decode.parser.AbstractUidCommandParser#decode(org
+ * .apache.james.imap.api.ImapCommand,
+ * org.apache.james.imap.decode.ImapRequestLineReader, java.lang.String,
+ * boolean, org.apache.james.imap.api.process.ImapSession)
*/
- protected ImapMessage decode(ImapCommand command,
- ImapRequestLineReader request, String tag, boolean useUids, ImapSession session)
- throws DecodingException {
+ protected ImapMessage decode(ImapCommand command, ImapRequestLineReader request, String tag, boolean useUids, ImapSession session) throws DecodingException {
IdRange[] idSet = request.parseIdRange();
String mailboxName = request.mailbox();
request.eol();
- final ImapMessage result = new CopyRequest(
- command, idSet, mailboxName, useUids, tag);
+ final ImapMessage result = new CopyRequest(command, idSet, mailboxName, useUids, tag);
return result;
}
Modified: james/imap/trunk/message/src/main/java/org/apache/james/imap/decode/parser/CreateCommandParser.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/message/src/main/java/org/apache/james/imap/decode/parser/CreateCommandParser.java?rev=1092137&r1=1092136&r2=1092137&view=diff
==============================================================================
--- james/imap/trunk/message/src/main/java/org/apache/james/imap/decode/parser/CreateCommandParser.java (original)
+++ james/imap/trunk/message/src/main/java/org/apache/james/imap/decode/parser/CreateCommandParser.java Thu Apr 14 11:21:11 2011
@@ -31,34 +31,38 @@ import org.apache.james.mailbox.MailboxS
/**
* Parse CREATE commands
- *
*/
-public class CreateCommandParser extends AbstractImapCommandParser {
+public class CreateCommandParser extends AbstractImapCommandParser {
public CreateCommandParser() {
super(ImapCommand.authenticatedStateCommand(ImapConstants.CREATE_COMMAND_NAME));
}
-
/*
* (non-Javadoc)
- * @see org.apache.james.imap.decode.base.AbstractImapCommandParser#decode(org.apache.james.imap.api.ImapCommand, org.apache.james.imap.decode.ImapRequestLineReader, java.lang.String, org.apache.james.imap.api.process.ImapSession)
+ *
+ * @see
+ * org.apache.james.imap.decode.base.AbstractImapCommandParser#decode(org
+ * .apache.james.imap.api.ImapCommand,
+ * org.apache.james.imap.decode.ImapRequestLineReader, java.lang.String,
+ * org.apache.james.imap.api.process.ImapSession)
*/
- protected ImapMessage decode(ImapCommand command,
- ImapRequestLineReader request, String tag, ImapSession session) throws DecodingException {
+ protected ImapMessage decode(ImapCommand command, ImapRequestLineReader request, String tag, ImapSession session) throws DecodingException {
String mailboxName = request.mailbox();
-
MailboxSession mailboxSession = ImapSessionUtils.getMailboxSession(session);
- // Check if we have an mailboxsession. This is a workaround for IMAP-240:
+ // Check if we have an mailboxsession. This is a workaround for
+ // IMAP-240:
// https://issues.apache.org/jira/browse/IMAP-240
if (mailboxSession != null) {
// RFC3501@6.3.3p2
// When mailbox name is suffixed with hierarchy separator
// name created must remove tailing delimiter
- if (mailboxName.endsWith(Character.toString(mailboxSession.getPathDelimiter()))) { // NOPMD keep comment
- mailboxName = mailboxName.substring(0, mailboxName.length() -1);
+ if (mailboxName.endsWith(Character.toString(mailboxSession.getPathDelimiter()))) { // NOPMD
+ // keep
+ // comment
+ mailboxName = mailboxName.substring(0, mailboxName.length() - 1);
}
}
request.eol();
Modified: james/imap/trunk/message/src/main/java/org/apache/james/imap/decode/parser/DeleteCommandParser.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/message/src/main/java/org/apache/james/imap/decode/parser/DeleteCommandParser.java?rev=1092137&r1=1092136&r2=1092137&view=diff
==============================================================================
--- james/imap/trunk/message/src/main/java/org/apache/james/imap/decode/parser/DeleteCommandParser.java (original)
+++ james/imap/trunk/message/src/main/java/org/apache/james/imap/decode/parser/DeleteCommandParser.java Thu Apr 14 11:21:11 2011
@@ -29,26 +29,27 @@ import org.apache.james.imap.message.req
/**
* Parse DELETE commands
- *
*/
public class DeleteCommandParser extends AbstractImapCommandParser {
-
+
public DeleteCommandParser() {
super(ImapCommand.authenticatedStateCommand(ImapConstants.DELETE_COMMAND_NAME));
}
-
/*
* (non-Javadoc)
- * @see org.apache.james.imap.decode.base.AbstractImapCommandParser#decode(org.apache.james.imap.api.ImapCommand, org.apache.james.imap.decode.ImapRequestLineReader, java.lang.String, org.apache.james.imap.api.process.ImapSession)
+ *
+ * @see
+ * org.apache.james.imap.decode.base.AbstractImapCommandParser#decode(org
+ * .apache.james.imap.api.ImapCommand,
+ * org.apache.james.imap.decode.ImapRequestLineReader, java.lang.String,
+ * org.apache.james.imap.api.process.ImapSession)
*/
- protected ImapMessage decode(ImapCommand command,
- ImapRequestLineReader request, String tag, ImapSession session) throws DecodingException {
+ protected ImapMessage decode(ImapCommand command, ImapRequestLineReader request, String tag, ImapSession session) throws DecodingException {
String mailboxName = request.mailbox();
request.eol();
- final ImapMessage result = new DeleteRequest(command,
- mailboxName, tag);
+ final ImapMessage result = new DeleteRequest(command, mailboxName, tag);
return result;
}
Modified: james/imap/trunk/message/src/main/java/org/apache/james/imap/decode/parser/ExamineCommandParser.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/message/src/main/java/org/apache/james/imap/decode/parser/ExamineCommandParser.java?rev=1092137&r1=1092136&r2=1092137&view=diff
==============================================================================
--- james/imap/trunk/message/src/main/java/org/apache/james/imap/decode/parser/ExamineCommandParser.java (original)
+++ james/imap/trunk/message/src/main/java/org/apache/james/imap/decode/parser/ExamineCommandParser.java Thu Apr 14 11:21:11 2011
@@ -29,7 +29,6 @@ import org.apache.james.imap.message.req
/**
* Parse EXAMINE commands
- *
*/
public class ExamineCommandParser extends AbstractImapCommandParser {
@@ -39,10 +38,14 @@ public class ExamineCommandParser extend
/*
* (non-Javadoc)
- * @see org.apache.james.imap.decode.base.AbstractImapCommandParser#decode(org.apache.james.imap.api.ImapCommand, org.apache.james.imap.decode.ImapRequestLineReader, java.lang.String, org.apache.james.imap.api.process.ImapSession)
+ *
+ * @see
+ * org.apache.james.imap.decode.base.AbstractImapCommandParser#decode(org
+ * .apache.james.imap.api.ImapCommand,
+ * org.apache.james.imap.decode.ImapRequestLineReader, java.lang.String,
+ * org.apache.james.imap.api.process.ImapSession)
*/
- protected ImapMessage decode(ImapCommand command,
- ImapRequestLineReader request, String tag, ImapSession session) throws DecodingException {
+ protected ImapMessage decode(ImapCommand command, ImapRequestLineReader request, String tag, ImapSession session) throws DecodingException {
final String mailboxName = request.mailbox();
request.eol();
final ImapMessage result = new ExamineRequest(command, mailboxName, tag);
Modified: james/imap/trunk/message/src/main/java/org/apache/james/imap/decode/parser/ExpungeCommandParser.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/message/src/main/java/org/apache/james/imap/decode/parser/ExpungeCommandParser.java?rev=1092137&r1=1092136&r2=1092137&view=diff
==============================================================================
--- james/imap/trunk/message/src/main/java/org/apache/james/imap/decode/parser/ExpungeCommandParser.java (original)
+++ james/imap/trunk/message/src/main/java/org/apache/james/imap/decode/parser/ExpungeCommandParser.java Thu Apr 14 11:21:11 2011
@@ -29,7 +29,6 @@ import org.apache.james.imap.message.req
/**
* Parse EXPUNGE commands
- *
*/
public class ExpungeCommandParser extends AbstractUidCommandParser {
@@ -37,11 +36,14 @@ public class ExpungeCommandParser extend
super(ImapCommand.selectedStateCommand(ImapConstants.EXPUNGE_COMMAND_NAME));
}
-
-
/*
* (non-Javadoc)
- * @see org.apache.james.imap.decode.parser.AbstractUidCommandParser#decode(org.apache.james.imap.api.ImapCommand, org.apache.james.imap.decode.ImapRequestLineReader, java.lang.String, boolean, org.apache.james.imap.api.process.ImapSession)
+ *
+ * @see
+ * org.apache.james.imap.decode.parser.AbstractUidCommandParser#decode(org
+ * .apache.james.imap.api.ImapCommand,
+ * org.apache.james.imap.decode.ImapRequestLineReader, java.lang.String,
+ * boolean, org.apache.james.imap.api.process.ImapSession)
*/
protected ImapMessage decode(ImapCommand command, ImapRequestLineReader request, String tag, boolean useUids, ImapSession session) throws DecodingException {
IdRange[] uidSet = null;
Modified: james/imap/trunk/message/src/main/java/org/apache/james/imap/decode/parser/FetchCommandParser.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/message/src/main/java/org/apache/james/imap/decode/parser/FetchCommandParser.java?rev=1092137&r1=1092136&r2=1092137&view=diff
==============================================================================
--- james/imap/trunk/message/src/main/java/org/apache/james/imap/decode/parser/FetchCommandParser.java (original)
+++ james/imap/trunk/message/src/main/java/org/apache/james/imap/decode/parser/FetchCommandParser.java Thu Apr 14 11:21:11 2011
@@ -35,7 +35,6 @@ import org.apache.james.imap.message.req
/**
* Parse FETCH commands
- *
*/
public class FetchCommandParser extends AbstractUidCommandParser {
@@ -44,14 +43,14 @@ public class FetchCommandParser extends
}
/**
- * Create a {@link FetchData} by reading from the {@link ImapRequestLineReader}
+ * Create a {@link FetchData} by reading from the
+ * {@link ImapRequestLineReader}
*
* @param request
* @return fetchData
* @throws DecodingException
*/
- protected FetchData fetchRequest(ImapRequestLineReader request)
- throws DecodingException {
+ protected FetchData fetchRequest(ImapRequestLineReader request) throws DecodingException {
FetchData fetch = new FetchData();
char next = nextNonSpaceChar(request);
@@ -72,8 +71,7 @@ public class FetchCommandParser extends
return fetch;
}
- private void addNextElement(ImapRequestLineReader reader, FetchData fetch)
- throws DecodingException {
+ private void addNextElement(ImapRequestLineReader reader, FetchData fetch) throws DecodingException {
// String name = element.toString();
String name = readWord(reader, " [)\r\n");
char next = reader.nextChar();
@@ -141,8 +139,7 @@ public class FetchCommandParser extends
numberOfOctets = null;
}
- final BodyFetchElement bodyFetchElement = createBodyElement(
- parameter, firstOctet, numberOfOctets);
+ final BodyFetchElement bodyFetchElement = createBodyElement(parameter, firstOctet, numberOfOctets);
final boolean isPeek = isPeek(name);
fetch.add(bodyFetchElement, isPeek);
}
@@ -155,14 +152,12 @@ public class FetchCommandParser extends
} else if ("BODY.PEEK".equalsIgnoreCase(name)) {
isPeek = true;
} else {
- throw new DecodingException(HumanReadableText.ILLEGAL_ARGUMENTS,
- "Invalid fetch attibute: " + name + "[]");
+ throw new DecodingException(HumanReadableText.ILLEGAL_ARGUMENTS, "Invalid fetch attibute: " + name + "[]");
}
return isPeek;
}
- private BodyFetchElement createBodyElement(String parameter,
- Long firstOctet, Long numberOfOctets) throws DecodingException {
+ private BodyFetchElement createBodyElement(String parameter, Long firstOctet, Long numberOfOctets) throws DecodingException {
final String responseName = "BODY[" + parameter + "]";
FetchPartPathDecoder decoder = new FetchPartPathDecoder();
decoder.decode(parameter);
@@ -170,43 +165,39 @@ public class FetchCommandParser extends
final List<String> names = decoder.getNames();
final int[] path = decoder.getPath();
- final BodyFetchElement bodyFetchElement = new BodyFetchElement(
- responseName, sectionType, path, names, firstOctet,
- numberOfOctets);
+ final BodyFetchElement bodyFetchElement = new BodyFetchElement(responseName, sectionType, path, names, firstOctet, numberOfOctets);
return bodyFetchElement;
}
- private int getSectionType(FetchPartPathDecoder decoder)
- throws DecodingException {
+ private int getSectionType(FetchPartPathDecoder decoder) throws DecodingException {
final int specifier = decoder.getSpecifier();
final int sectionType;
switch (specifier) {
- case FetchPartPathDecoder.CONTENT:
- sectionType = BodyFetchElement.CONTENT;
- break;
- case FetchPartPathDecoder.HEADER:
- sectionType = BodyFetchElement.HEADER;
- break;
- case FetchPartPathDecoder.HEADER_FIELDS:
- sectionType = BodyFetchElement.HEADER_FIELDS;
- break;
- case FetchPartPathDecoder.HEADER_NOT_FIELDS:
- sectionType = BodyFetchElement.HEADER_NOT_FIELDS;
- break;
- case FetchPartPathDecoder.MIME:
- sectionType = BodyFetchElement.MIME;
- break;
- case FetchPartPathDecoder.TEXT:
- sectionType = BodyFetchElement.TEXT;
- break;
- default:
- throw new DecodingException(HumanReadableText.ILLEGAL_ARGUMENTS, "Section type is unsupported.");
+ case FetchPartPathDecoder.CONTENT:
+ sectionType = BodyFetchElement.CONTENT;
+ break;
+ case FetchPartPathDecoder.HEADER:
+ sectionType = BodyFetchElement.HEADER;
+ break;
+ case FetchPartPathDecoder.HEADER_FIELDS:
+ sectionType = BodyFetchElement.HEADER_FIELDS;
+ break;
+ case FetchPartPathDecoder.HEADER_NOT_FIELDS:
+ sectionType = BodyFetchElement.HEADER_NOT_FIELDS;
+ break;
+ case FetchPartPathDecoder.MIME:
+ sectionType = BodyFetchElement.MIME;
+ break;
+ case FetchPartPathDecoder.TEXT:
+ sectionType = BodyFetchElement.TEXT;
+ break;
+ default:
+ throw new DecodingException(HumanReadableText.ILLEGAL_ARGUMENTS, "Section type is unsupported.");
}
return sectionType;
}
- private String readWord(ImapRequestLineReader request, String terminator)
- throws DecodingException {
+ private String readWord(ImapRequestLineReader request, String terminator) throws DecodingException {
StringBuffer buf = new StringBuffer();
char next = request.nextChar();
while (terminator.indexOf(next) == -1) {
@@ -217,8 +208,7 @@ public class FetchCommandParser extends
return buf.toString();
}
- private char nextNonSpaceChar(ImapRequestLineReader request)
- throws DecodingException {
+ private char nextNonSpaceChar(ImapRequestLineReader request) throws DecodingException {
char next = request.nextChar();
while (next == ' ') {
request.consume();
@@ -229,17 +219,19 @@ public class FetchCommandParser extends
/*
* (non-Javadoc)
- * @see org.apache.james.imap.decode.parser.AbstractUidCommandParser#decode(org.apache.james.imap.api.ImapCommand, org.apache.james.imap.decode.ImapRequestLineReader, java.lang.String, boolean, org.apache.james.imap.api.process.ImapSession)
+ *
+ * @see
+ * org.apache.james.imap.decode.parser.AbstractUidCommandParser#decode(org
+ * .apache.james.imap.api.ImapCommand,
+ * org.apache.james.imap.decode.ImapRequestLineReader, java.lang.String,
+ * boolean, org.apache.james.imap.api.process.ImapSession)
*/
- protected ImapMessage decode(ImapCommand command,
- ImapRequestLineReader request, String tag, boolean useUids, ImapSession session)
- throws DecodingException {
+ protected ImapMessage decode(ImapCommand command, ImapRequestLineReader request, String tag, boolean useUids, ImapSession session) throws DecodingException {
IdRange[] idSet = request.parseIdRange();
FetchData fetch = fetchRequest(request);
request.eol();
-
- final ImapMessage result = new FetchRequest(command, useUids,
- idSet, fetch, tag);
+
+ final ImapMessage result = new FetchRequest(command, useUids, idSet, fetch, tag);
return result;
}
Modified: james/imap/trunk/message/src/main/java/org/apache/james/imap/decode/parser/IdleCommandParser.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/message/src/main/java/org/apache/james/imap/decode/parser/IdleCommandParser.java?rev=1092137&r1=1092136&r2=1092137&view=diff
==============================================================================
--- james/imap/trunk/message/src/main/java/org/apache/james/imap/decode/parser/IdleCommandParser.java (original)
+++ james/imap/trunk/message/src/main/java/org/apache/james/imap/decode/parser/IdleCommandParser.java Thu Apr 14 11:21:11 2011
@@ -28,23 +28,24 @@ import org.apache.james.imap.decode.base
import org.apache.james.imap.message.request.IdleRequest;
/**
- *
* Parses IDLE commands
- *
*/
public class IdleCommandParser extends AbstractImapCommandParser {
public IdleCommandParser() {
- super(ImapCommand.authenticatedStateCommand(ImapConstants.IDLE_COMMAND_NAME));
+ super(ImapCommand.authenticatedStateCommand(ImapConstants.IDLE_COMMAND_NAME));
}
-
/*
* (non-Javadoc)
- * @see org.apache.james.imap.decode.base.AbstractImapCommandParser#decode(org.apache.james.imap.api.ImapCommand, org.apache.james.imap.decode.ImapRequestLineReader, java.lang.String, org.apache.james.imap.api.process.ImapSession)
+ *
+ * @see
+ * org.apache.james.imap.decode.base.AbstractImapCommandParser#decode(org
+ * .apache.james.imap.api.ImapCommand,
+ * org.apache.james.imap.decode.ImapRequestLineReader, java.lang.String,
+ * org.apache.james.imap.api.process.ImapSession)
*/
- protected ImapMessage decode(ImapCommand command,
- ImapRequestLineReader request, String tag, ImapSession session) throws DecodingException {
+ protected ImapMessage decode(ImapCommand command, ImapRequestLineReader request, String tag, ImapSession session) throws DecodingException {
request.eol();
final ImapMessage result = new IdleRequest(command, tag);
return result;
Modified: james/imap/trunk/message/src/main/java/org/apache/james/imap/decode/parser/ImapParserFactory.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/message/src/main/java/org/apache/james/imap/decode/parser/ImapParserFactory.java?rev=1092137&r1=1092136&r2=1092137&view=diff
==============================================================================
--- james/imap/trunk/message/src/main/java/org/apache/james/imap/decode/parser/ImapParserFactory.java (original)
+++ james/imap/trunk/message/src/main/java/org/apache/james/imap/decode/parser/ImapParserFactory.java Thu Apr 14 11:21:11 2011
@@ -32,65 +32,45 @@ import org.apache.james.imap.decode.Mess
/**
* A factory for ImapCommand instances, provided based on the command name.
* Command instances are created on demand, when first accessed.
- *
*/
-public class ImapParserFactory implements
- ImapCommandParserFactory {
+public class ImapParserFactory implements ImapCommandParserFactory {
private Map<String, Class<?>> _imapCommands;
private final StatusResponseFactory statusResponseFactory;
-
- public ImapParserFactory( final StatusResponseFactory statusResponseFactory) {
+ public ImapParserFactory(final StatusResponseFactory statusResponseFactory) {
this.statusResponseFactory = statusResponseFactory;
_imapCommands = new HashMap<String, Class<?>>();
// Commands valid in any state
// CAPABILITY, NOOP, and LOGOUT
- _imapCommands.put(ImapConstants.CAPABILITY_COMMAND_NAME,
- CapabilityCommandParser.class);
- _imapCommands.put(ImapConstants.NOOP_COMMAND_NAME,
- NoopCommandParser.class);
- _imapCommands.put(ImapConstants.LOGOUT_COMMAND_NAME,
- LogoutCommandParser.class);
+ _imapCommands.put(ImapConstants.CAPABILITY_COMMAND_NAME, CapabilityCommandParser.class);
+ _imapCommands.put(ImapConstants.NOOP_COMMAND_NAME, NoopCommandParser.class);
+ _imapCommands.put(ImapConstants.LOGOUT_COMMAND_NAME, LogoutCommandParser.class);
// Commands valid in NON_AUTHENTICATED state.
// AUTHENTICATE and LOGIN
- _imapCommands.put(ImapConstants.AUTHENTICATE_COMMAND_NAME,
- AuthenticateCommandParser.class);
- _imapCommands.put(ImapConstants.LOGIN_COMMAND_NAME,
- LoginCommandParser.class);
+ _imapCommands.put(ImapConstants.AUTHENTICATE_COMMAND_NAME, AuthenticateCommandParser.class);
+ _imapCommands.put(ImapConstants.LOGIN_COMMAND_NAME, LoginCommandParser.class);
// Commands valid in AUTHENTICATED or SELECTED state.
// RFC2060: SELECT, EXAMINE, CREATE, DELETE, RENAME, SUBSCRIBE,
// UNSUBSCRIBE, LIST, LSUB, STATUS, and APPEND
- _imapCommands.put(ImapConstants.SELECT_COMMAND_NAME,
- SelectCommandParser.class);
- _imapCommands.put(ImapConstants.EXAMINE_COMMAND_NAME,
- ExamineCommandParser.class);
- _imapCommands.put(ImapConstants.CREATE_COMMAND_NAME,
- CreateCommandParser.class);
- _imapCommands.put(ImapConstants.DELETE_COMMAND_NAME,
- DeleteCommandParser.class);
- _imapCommands.put(ImapConstants.RENAME_COMMAND_NAME,
- RenameCommandParser.class);
- _imapCommands.put(ImapConstants.SUBSCRIBE_COMMAND_NAME,
- SubscribeCommandParser.class);
- _imapCommands.put(ImapConstants.UNSUBSCRIBE_COMMAND_NAME,
- UnsubscribeCommandParser.class);
- _imapCommands.put(ImapConstants.LIST_COMMAND_NAME,
- ListCommandParser.class);
- _imapCommands.put(ImapConstants.XLIST_COMMAND_NAME,
- XListCommandParser.class);
- _imapCommands.put(ImapConstants.LSUB_COMMAND_NAME,
- LsubCommandParser.class);
- _imapCommands.put(ImapConstants.STATUS_COMMAND_NAME,
- StatusCommandParser.class);
- _imapCommands.put(ImapConstants.APPEND_COMMAND_NAME,
- AppendCommandParser.class);
+ _imapCommands.put(ImapConstants.SELECT_COMMAND_NAME, SelectCommandParser.class);
+ _imapCommands.put(ImapConstants.EXAMINE_COMMAND_NAME, ExamineCommandParser.class);
+ _imapCommands.put(ImapConstants.CREATE_COMMAND_NAME, CreateCommandParser.class);
+ _imapCommands.put(ImapConstants.DELETE_COMMAND_NAME, DeleteCommandParser.class);
+ _imapCommands.put(ImapConstants.RENAME_COMMAND_NAME, RenameCommandParser.class);
+ _imapCommands.put(ImapConstants.SUBSCRIBE_COMMAND_NAME, SubscribeCommandParser.class);
+ _imapCommands.put(ImapConstants.UNSUBSCRIBE_COMMAND_NAME, UnsubscribeCommandParser.class);
+ _imapCommands.put(ImapConstants.LIST_COMMAND_NAME, ListCommandParser.class);
+ _imapCommands.put(ImapConstants.XLIST_COMMAND_NAME, XListCommandParser.class);
+ _imapCommands.put(ImapConstants.LSUB_COMMAND_NAME, LsubCommandParser.class);
+ _imapCommands.put(ImapConstants.STATUS_COMMAND_NAME, StatusCommandParser.class);
+ _imapCommands.put(ImapConstants.APPEND_COMMAND_NAME, AppendCommandParser.class);
// RFC2342 NAMESPACE
- _imapCommands.put( ImapConstants.NAMESPACE_COMMAND_NAME, NamespaceCommandParser.class );
+ _imapCommands.put(ImapConstants.NAMESPACE_COMMAND_NAME, NamespaceCommandParser.class);
// RFC2086 GETACL, SETACL, DELETEACL, LISTRIGHTS, MYRIGHTS
// _imapCommands.put( "GETACL", GetAclCommand.class );
@@ -101,34 +81,24 @@ public class ImapParserFactory implement
// Commands only valid in SELECTED state.
// CHECK, CLOSE, EXPUNGE, SEARCH, FETCH, STORE, COPY, UID and IDLE
- _imapCommands.put(ImapConstants.CHECK_COMMAND_NAME,
- CheckCommandParser.class);
- _imapCommands.put(ImapConstants.CLOSE_COMMAND_NAME,
- CloseCommandParser.class);
- _imapCommands.put(ImapConstants.EXPUNGE_COMMAND_NAME,
- ExpungeCommandParser.class);
- _imapCommands.put(ImapConstants.COPY_COMMAND_NAME,
- CopyCommandParser.class);
- _imapCommands.put(ImapConstants.SEARCH_COMMAND_NAME,
- SearchCommandParser.class);
- _imapCommands.put(ImapConstants.FETCH_COMMAND_NAME,
- FetchCommandParser.class);
- _imapCommands.put(ImapConstants.STORE_COMMAND_NAME,
- StoreCommandParser.class);
- _imapCommands.put(ImapConstants.UID_COMMAND_NAME,
- UidCommandParser.class);
- _imapCommands.put(ImapConstants.IDLE_COMMAND_NAME,
- IdleCommandParser.class);
+ _imapCommands.put(ImapConstants.CHECK_COMMAND_NAME, CheckCommandParser.class);
+ _imapCommands.put(ImapConstants.CLOSE_COMMAND_NAME, CloseCommandParser.class);
+ _imapCommands.put(ImapConstants.EXPUNGE_COMMAND_NAME, ExpungeCommandParser.class);
+ _imapCommands.put(ImapConstants.COPY_COMMAND_NAME, CopyCommandParser.class);
+ _imapCommands.put(ImapConstants.SEARCH_COMMAND_NAME, SearchCommandParser.class);
+ _imapCommands.put(ImapConstants.FETCH_COMMAND_NAME, FetchCommandParser.class);
+ _imapCommands.put(ImapConstants.STORE_COMMAND_NAME, StoreCommandParser.class);
+ _imapCommands.put(ImapConstants.UID_COMMAND_NAME, UidCommandParser.class);
+ _imapCommands.put(ImapConstants.IDLE_COMMAND_NAME, IdleCommandParser.class);
_imapCommands.put(ImapConstants.STARTTLS, StartTLSCommandParser.class);
-
- // RFC3691
+
+ // RFC3691
_imapCommands.put(ImapConstants.UNSELECT_COMMAND_NAME, UnselectCommandParser.class);
-
+
// RFC4978
_imapCommands.put(ImapConstants.COMPRESS_COMMAND_NAME, CompressCommandParser.class);
}
-
/**
* @see org.apache.james.imap.decode.parser.ImapCommandParserFactory#getParser(java.lang.String)
@@ -145,20 +115,18 @@ public class ImapParserFactory implement
private ImapCommandParser createCommand(Class<?> commandClass) {
try {
- ImapCommandParser cmd = (ImapCommandParser) commandClass
- .newInstance();
+ ImapCommandParser cmd = (ImapCommandParser) commandClass.newInstance();
initialiseParser(cmd);
return cmd;
} catch (Exception e) {
// TODO: would probably be better to manage this in protocol
// TODO: this runtime will produce a nasty disconnect for the client
- throw new RuntimeException("Could not create command instance: "
- + commandClass.getName(), e);
+ throw new RuntimeException("Could not create command instance: " + commandClass.getName(), e);
}
}
protected void initialiseParser(ImapCommandParser cmd) {
-
+
if (cmd instanceof DelegatingImapCommandParser) {
((DelegatingImapCommandParser) cmd).setParserFactory(this);
}
Modified: james/imap/trunk/message/src/main/java/org/apache/james/imap/decode/parser/ListCommandParser.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/message/src/main/java/org/apache/james/imap/decode/parser/ListCommandParser.java?rev=1092137&r1=1092136&r2=1092137&view=diff
==============================================================================
--- james/imap/trunk/message/src/main/java/org/apache/james/imap/decode/parser/ListCommandParser.java (original)
+++ james/imap/trunk/message/src/main/java/org/apache/james/imap/decode/parser/ListCommandParser.java Thu Apr 14 11:21:11 2011
@@ -29,7 +29,6 @@ import org.apache.james.imap.message.req
/**
* Parse LIST commands
- *
*/
public class ListCommandParser extends AbstractUidCommandParser {
@@ -41,7 +40,6 @@ public class ListCommandParser extends A
super(command);
}
-
/**
* Reads an argument of type "list_mailbox" from the request, which is the
* second argument for a LIST or LSUB command. Valid values are a "string"
@@ -49,16 +47,15 @@ public class ListCommandParser extends A
*
* @return An argument of type "list_mailbox"
*/
- public String listMailbox(ImapRequestLineReader request)
- throws DecodingException {
+ public String listMailbox(ImapRequestLineReader request) throws DecodingException {
char next = request.nextWordChar();
switch (next) {
- case '"':
- return request.consumeQuoted();
- case '{':
- return request.consumeLiteral(null);
- default:
- return request.consumeWord(new ListCharValidator());
+ case '"':
+ return request.consumeQuoted();
+ case '{':
+ return request.consumeLiteral(null);
+ default:
+ return request.consumeWord(new ListCharValidator());
}
}
@@ -71,27 +68,25 @@ public class ListCommandParser extends A
}
}
-
/*
* (non-Javadoc)
- * @see org.apache.james.imap.decode.parser.AbstractUidCommandParser#decode(org.apache.james.imap.api.ImapCommand, org.apache.james.imap.decode.ImapRequestLineReader, java.lang.String, boolean, org.apache.james.imap.api.process.ImapSession)
+ *
+ * @see
+ * org.apache.james.imap.decode.parser.AbstractUidCommandParser#decode(org
+ * .apache.james.imap.api.ImapCommand,
+ * org.apache.james.imap.decode.ImapRequestLineReader, java.lang.String,
+ * boolean, org.apache.james.imap.api.process.ImapSession)
*/
- protected ImapMessage decode(ImapCommand command,
- ImapRequestLineReader request, String tag, boolean useUids, ImapSession session)
- throws DecodingException {
+ protected ImapMessage decode(ImapCommand command, ImapRequestLineReader request, String tag, boolean useUids, ImapSession session) throws DecodingException {
String referenceName = request.mailbox();
String mailboxPattern = listMailbox(request);
request.eol();
- final ImapMessage result = createMessage(command, referenceName,
- mailboxPattern, tag);
+ final ImapMessage result = createMessage(command, referenceName, mailboxPattern, tag);
return result;
}
- protected ImapMessage createMessage(ImapCommand command,
- final String referenceName, final String mailboxPattern,
- final String tag) {
- final ImapMessage result = new ListRequest(command,
- referenceName, mailboxPattern, tag);
+ protected ImapMessage createMessage(ImapCommand command, final String referenceName, final String mailboxPattern, final String tag) {
+ final ImapMessage result = new ListRequest(command, referenceName, mailboxPattern, tag);
return result;
}
}
Modified: james/imap/trunk/message/src/main/java/org/apache/james/imap/decode/parser/LoginCommandParser.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/message/src/main/java/org/apache/james/imap/decode/parser/LoginCommandParser.java?rev=1092137&r1=1092136&r2=1092137&view=diff
==============================================================================
--- james/imap/trunk/message/src/main/java/org/apache/james/imap/decode/parser/LoginCommandParser.java (original)
+++ james/imap/trunk/message/src/main/java/org/apache/james/imap/decode/parser/LoginCommandParser.java Thu Apr 14 11:21:11 2011
@@ -29,7 +29,6 @@ import org.apache.james.imap.message.req
/**
* Parse LOGIN commands
- *
*/
public class LoginCommandParser extends AbstractImapCommandParser {
@@ -37,17 +36,20 @@ public class LoginCommandParser extends
super(ImapCommand.nonAuthenticatedStateCommand(ImapConstants.LOGIN_COMMAND_NAME));
}
-
/*
* (non-Javadoc)
- * @see org.apache.james.imap.decode.base.AbstractImapCommandParser#decode(org.apache.james.imap.api.ImapCommand, org.apache.james.imap.decode.ImapRequestLineReader, java.lang.String, org.apache.james.imap.api.process.ImapSession)
+ *
+ * @see
+ * org.apache.james.imap.decode.base.AbstractImapCommandParser#decode(org
+ * .apache.james.imap.api.ImapCommand,
+ * org.apache.james.imap.decode.ImapRequestLineReader, java.lang.String,
+ * org.apache.james.imap.api.process.ImapSession)
*/
- protected ImapMessage decode(ImapCommand command,
- ImapRequestLineReader request, String tag, ImapSession session) throws DecodingException {
+ protected ImapMessage decode(ImapCommand command, ImapRequestLineReader request, String tag, ImapSession session) throws DecodingException {
final String userid = request.astring();
final String password = request.astring();
request.eol();
-
+
final ImapMessage result = new LoginRequest(command, userid, password, tag);
return result;
}
Modified: james/imap/trunk/message/src/main/java/org/apache/james/imap/decode/parser/LogoutCommandParser.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/message/src/main/java/org/apache/james/imap/decode/parser/LogoutCommandParser.java?rev=1092137&r1=1092136&r2=1092137&view=diff
==============================================================================
--- james/imap/trunk/message/src/main/java/org/apache/james/imap/decode/parser/LogoutCommandParser.java (original)
+++ james/imap/trunk/message/src/main/java/org/apache/james/imap/decode/parser/LogoutCommandParser.java Thu Apr 14 11:21:11 2011
@@ -29,7 +29,6 @@ import org.apache.james.imap.message.req
/**
* Parse LOGOUT commands
- *
*/
public class LogoutCommandParser extends AbstractImapCommandParser {
@@ -37,14 +36,16 @@ public class LogoutCommandParser extends
super(ImapCommand.anyStateCommand(ImapConstants.LOGOUT_COMMAND_NAME));
}
-
-
/*
* (non-Javadoc)
- * @see org.apache.james.imap.decode.base.AbstractImapCommandParser#decode(org.apache.james.imap.api.ImapCommand, org.apache.james.imap.decode.ImapRequestLineReader, java.lang.String, org.apache.james.imap.api.process.ImapSession)
+ *
+ * @see
+ * org.apache.james.imap.decode.base.AbstractImapCommandParser#decode(org
+ * .apache.james.imap.api.ImapCommand,
+ * org.apache.james.imap.decode.ImapRequestLineReader, java.lang.String,
+ * org.apache.james.imap.api.process.ImapSession)
*/
- protected ImapMessage decode(ImapCommand command,
- ImapRequestLineReader request, String tag, ImapSession session) throws DecodingException {
+ protected ImapMessage decode(ImapCommand command, ImapRequestLineReader request, String tag, ImapSession session) throws DecodingException {
request.eol();
final ImapMessage result = new LogoutRequest(command, tag);
return result;
Modified: james/imap/trunk/message/src/main/java/org/apache/james/imap/decode/parser/LsubCommandParser.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/message/src/main/java/org/apache/james/imap/decode/parser/LsubCommandParser.java?rev=1092137&r1=1092136&r2=1092137&view=diff
==============================================================================
--- james/imap/trunk/message/src/main/java/org/apache/james/imap/decode/parser/LsubCommandParser.java (original)
+++ james/imap/trunk/message/src/main/java/org/apache/james/imap/decode/parser/LsubCommandParser.java Thu Apr 14 11:21:11 2011
@@ -25,7 +25,6 @@ import org.apache.james.imap.message.req
/**
* Parse LSUB commands
- *
*/
public class LsubCommandParser extends ListCommandParser {
@@ -35,10 +34,13 @@ public class LsubCommandParser extends L
/*
* (non-Javadoc)
- * @see org.apache.james.imap.decode.parser.ListCommandParser#createMessage(org.apache.james.imap.api.ImapCommand, java.lang.String, java.lang.String, java.lang.String)
+ *
+ * @see
+ * org.apache.james.imap.decode.parser.ListCommandParser#createMessage(org
+ * .apache.james.imap.api.ImapCommand, java.lang.String, java.lang.String,
+ * java.lang.String)
*/
- protected ImapMessage createMessage(ImapCommand command,
- String referenceName, String mailboxPattern, String tag) {
+ protected ImapMessage createMessage(ImapCommand command, String referenceName, String mailboxPattern, String tag) {
final ImapMessage result = new LsubRequest(command, referenceName, mailboxPattern, tag);
return result;
}
Modified: james/imap/trunk/message/src/main/java/org/apache/james/imap/decode/parser/NamespaceCommandParser.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/message/src/main/java/org/apache/james/imap/decode/parser/NamespaceCommandParser.java?rev=1092137&r1=1092136&r2=1092137&view=diff
==============================================================================
--- james/imap/trunk/message/src/main/java/org/apache/james/imap/decode/parser/NamespaceCommandParser.java (original)
+++ james/imap/trunk/message/src/main/java/org/apache/james/imap/decode/parser/NamespaceCommandParser.java Thu Apr 14 11:21:11 2011
@@ -29,7 +29,6 @@ import org.apache.james.imap.message.req
/**
* Parse NAMESPACE commands
- *
*/
public class NamespaceCommandParser extends AbstractImapCommandParser {
@@ -37,14 +36,16 @@ public class NamespaceCommandParser exte
super(ImapCommand.authenticatedStateCommand(ImapConstants.NAMESPACE_COMMAND_NAME));
}
-
/*
* (non-Javadoc)
- * @see org.apache.james.imap.decode.base.AbstractImapCommandParser#decode(org.apache.james.imap.api.ImapCommand, org.apache.james.imap.decode.ImapRequestLineReader, java.lang.String, org.apache.james.imap.api.process.ImapSession)
+ *
+ * @see
+ * org.apache.james.imap.decode.base.AbstractImapCommandParser#decode(org
+ * .apache.james.imap.api.ImapCommand,
+ * org.apache.james.imap.decode.ImapRequestLineReader, java.lang.String,
+ * org.apache.james.imap.api.process.ImapSession)
*/
- protected ImapMessage decode(ImapCommand command,
- ImapRequestLineReader request, String tag, ImapSession session)
- throws DecodingException {
+ protected ImapMessage decode(ImapCommand command, ImapRequestLineReader request, String tag, ImapSession session) throws DecodingException {
return new NamespaceRequest(command, tag);
}
}
Modified: james/imap/trunk/message/src/main/java/org/apache/james/imap/decode/parser/NoopCommandParser.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/message/src/main/java/org/apache/james/imap/decode/parser/NoopCommandParser.java?rev=1092137&r1=1092136&r2=1092137&view=diff
==============================================================================
--- james/imap/trunk/message/src/main/java/org/apache/james/imap/decode/parser/NoopCommandParser.java (original)
+++ james/imap/trunk/message/src/main/java/org/apache/james/imap/decode/parser/NoopCommandParser.java Thu Apr 14 11:21:11 2011
@@ -28,9 +28,7 @@ import org.apache.james.imap.decode.base
import org.apache.james.imap.message.request.NoopRequest;
/**
- *
* Parses NOOP commands
- *
*/
public class NoopCommandParser extends AbstractImapCommandParser {
@@ -40,10 +38,14 @@ public class NoopCommandParser extends A
/*
* (non-Javadoc)
- * @see org.apache.james.imap.decode.base.AbstractImapCommandParser#decode(org.apache.james.imap.api.ImapCommand, org.apache.james.imap.decode.ImapRequestLineReader, java.lang.String, org.apache.james.imap.api.process.ImapSession)
+ *
+ * @see
+ * org.apache.james.imap.decode.base.AbstractImapCommandParser#decode(org
+ * .apache.james.imap.api.ImapCommand,
+ * org.apache.james.imap.decode.ImapRequestLineReader, java.lang.String,
+ * org.apache.james.imap.api.process.ImapSession)
*/
- protected ImapMessage decode(ImapCommand command,
- ImapRequestLineReader request, String tag, ImapSession session) throws DecodingException {
+ protected ImapMessage decode(ImapCommand command, ImapRequestLineReader request, String tag, ImapSession session) throws DecodingException {
request.eol();
final ImapMessage result = new NoopRequest(command, tag);
return result;
Modified: james/imap/trunk/message/src/main/java/org/apache/james/imap/decode/parser/RenameCommandParser.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/message/src/main/java/org/apache/james/imap/decode/parser/RenameCommandParser.java?rev=1092137&r1=1092136&r2=1092137&view=diff
==============================================================================
--- james/imap/trunk/message/src/main/java/org/apache/james/imap/decode/parser/RenameCommandParser.java (original)
+++ james/imap/trunk/message/src/main/java/org/apache/james/imap/decode/parser/RenameCommandParser.java Thu Apr 14 11:21:11 2011
@@ -29,7 +29,6 @@ import org.apache.james.imap.message.req
/**
* Parses RENAME command
- *
*/
public class RenameCommandParser extends AbstractImapCommandParser {
@@ -37,17 +36,20 @@ public class RenameCommandParser extends
super(ImapCommand.authenticatedStateCommand(ImapConstants.RENAME_COMMAND_NAME));
}
-
/*
* (non-Javadoc)
- * @see org.apache.james.imap.decode.base.AbstractImapCommandParser#decode(org.apache.james.imap.api.ImapCommand, org.apache.james.imap.decode.ImapRequestLineReader, java.lang.String, org.apache.james.imap.api.process.ImapSession)
+ *
+ * @see
+ * org.apache.james.imap.decode.base.AbstractImapCommandParser#decode(org
+ * .apache.james.imap.api.ImapCommand,
+ * org.apache.james.imap.decode.ImapRequestLineReader, java.lang.String,
+ * org.apache.james.imap.api.process.ImapSession)
*/
- protected ImapMessage decode(ImapCommand command,
- ImapRequestLineReader request, String tag, ImapSession session) throws DecodingException {
+ protected ImapMessage decode(ImapCommand command, ImapRequestLineReader request, String tag, ImapSession session) throws DecodingException {
final String existingName = request.mailbox();
final String newName = request.mailbox();
request.eol();
- final ImapMessage result =new RenameRequest(command, existingName, newName, tag);
+ final ImapMessage result = new RenameRequest(command, existingName, newName, tag);
return result;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org