Modified: james/imap/trunk/message/src/main/java/org/apache/james/imap/decode/parser/SearchCommandParser.java URL: http://svn.apache.org/viewvc/james/imap/trunk/message/src/main/java/org/apache/james/imap/decode/parser/SearchCommandParser.java?rev=1060264&r1=1060263&r2=1060264&view=diff ============================================================================== --- james/imap/trunk/message/src/main/java/org/apache/james/imap/decode/parser/SearchCommandParser.java (original) +++ james/imap/trunk/message/src/main/java/org/apache/james/imap/decode/parser/SearchCommandParser.java Tue Jan 18 09:24:06 2011 @@ -156,7 +156,7 @@ public class SearchCommandParser extends throws DecodingException { final SearchKey result; nextIsSpace(request); - final String value = astring(request, charset); + final String value = request.astring(charset); result = SearchKey.buildCc(value); return result; } @@ -189,7 +189,7 @@ public class SearchCommandParser extends if (!isFirstToken) { throw new DecodingException(HumanReadableText.ILLEGAL_ARGUMENTS, "Unknown search key"); } - final String value = astring(request); + final String value = request.astring(); final Charset charset = Charset.forName(value); request.nextWordChar(); result = searchKey(request, charset, false); @@ -372,7 +372,7 @@ public class SearchCommandParser extends nextIsR(request); nextIsD(request); nextIsSpace(request); - final String value = atom(request); + final String value = request.atom(); result = SearchKey.buildKeyword(value); return result; } @@ -387,7 +387,7 @@ public class SearchCommandParser extends nextIsR(request); nextIsD(request); nextIsSpace(request); - final String value = atom(request); + final String value = request.atom(); result = SearchKey.buildUnkeyword(value); return result; } @@ -401,9 +401,9 @@ public class SearchCommandParser extends nextIsE(request); nextIsR(request); nextIsSpace(request); - final String field = astring(request, charset); + final String field = request.astring(charset); nextIsSpace(request); - final String value = astring(request, charset); + final String value = request.astring(charset); result = SearchKey.buildHeader(field, value); return result; } @@ -417,7 +417,7 @@ public class SearchCommandParser extends nextIsE(request); nextIsR(request); nextIsSpace(request); - final long value = number(request); + final long value = request.number(); result = SearchKey.buildLarger(value); return result; } @@ -431,7 +431,7 @@ public class SearchCommandParser extends nextIsE(request); nextIsR(request); nextIsSpace(request); - final long value = number(request); + final long value = request.number(); result = SearchKey.buildSmaller(value); return result; } @@ -442,7 +442,7 @@ public class SearchCommandParser extends nextIsO(request); nextIsM(request); nextIsSpace(request); - final String value = astring(request, charset); + final String value = request.astring(charset); result = SearchKey.buildFrom(value); return result; } @@ -618,7 +618,7 @@ public class SearchCommandParser extends nextIsD(request); nextIsY(request); nextIsSpace(request); - final String value = astring(request, charset); + final String value = request.astring(charset); result = SearchKey.buildBody(value); return result; } @@ -627,7 +627,7 @@ public class SearchCommandParser extends throws DecodingException { final SearchKey result; nextIsSpace(request); - final DayMonthYear value = date(request); + final DayMonthYear value = request.date(); result = SearchKey.buildOn(value); return result; } @@ -641,7 +641,7 @@ public class SearchCommandParser extends nextIsR(request); nextIsE(request); nextIsSpace(request); - final DayMonthYear value = date(request); + final DayMonthYear value = request.date(); result = SearchKey.buildSentBefore(value); return result; } @@ -654,7 +654,7 @@ public class SearchCommandParser extends nextIsC(request); nextIsE(request); nextIsSpace(request); - final DayMonthYear value = date(request); + final DayMonthYear value = request.date(); result = SearchKey.buildSentSince(value); return result; } @@ -666,7 +666,7 @@ public class SearchCommandParser extends nextIsC(request); nextIsE(request); nextIsSpace(request); - final DayMonthYear value = date(request); + final DayMonthYear value = request.date(); result = SearchKey.buildSince(value); return result; } @@ -676,7 +676,7 @@ public class SearchCommandParser extends final SearchKey result; nextIsN(request); nextIsSpace(request); - final DayMonthYear value = date(request); + final DayMonthYear value = request.date(); result = SearchKey.buildSentOn(value); return result; } @@ -689,7 +689,7 @@ public class SearchCommandParser extends nextIsR(request); nextIsE(request); nextIsSpace(request); - final DayMonthYear value = date(request); + final DayMonthYear value = request.date(); result = SearchKey.buildBefore(value); return result; } @@ -699,7 +699,7 @@ public class SearchCommandParser extends final SearchKey result; nextIsC(request); nextIsSpace(request); - final String value = astring(request, charset); + final String value = request.astring(charset); result = SearchKey.buildBcc(value); return result; } @@ -710,7 +710,7 @@ public class SearchCommandParser extends nextIsX(request); nextIsT(request); nextIsSpace(request); - final String value = astring(request, charset); + final String value = request.astring(charset); result = SearchKey.buildText(value); return result; } @@ -720,14 +720,14 @@ public class SearchCommandParser extends final SearchKey result; nextIsD(request); nextIsSpace(request); - final IdRange[] range = parseIdRange(request); + final IdRange[] range = request.parseIdRange(); result = SearchKey.buildUidSet(range); return result; } private SearchKey sequenceSet(ImapRequestLineReader request) throws DecodingException { - final IdRange[] range = parseIdRange(request); + final IdRange[] range = request.parseIdRange(); final SearchKey result = SearchKey.buildSequenceSet(range); return result; } @@ -736,7 +736,7 @@ public class SearchCommandParser extends throws DecodingException { final SearchKey result; nextIsSpace(request); - final String value = astring(request, charset); + final String value = request.astring(charset); result = SearchKey.buildTo(value); return result; } @@ -750,7 +750,7 @@ public class SearchCommandParser extends nextIsC(request); nextIsT(request); nextIsSpace(request); - final String value = astring(request, charset); + final String value = request.astring(charset); result = SearchKey.buildSubject(value); return result; } @@ -917,7 +917,7 @@ public class SearchCommandParser extends } else { result = firstKey; } - endLine(request); + request.eol(); return result; }
Modified: james/imap/trunk/message/src/main/java/org/apache/james/imap/decode/parser/SelectCommandParser.java URL: http://svn.apache.org/viewvc/james/imap/trunk/message/src/main/java/org/apache/james/imap/decode/parser/SelectCommandParser.java?rev=1060264&r1=1060263&r2=1060264&view=diff ============================================================================== --- james/imap/trunk/message/src/main/java/org/apache/james/imap/decode/parser/SelectCommandParser.java (original) +++ james/imap/trunk/message/src/main/java/org/apache/james/imap/decode/parser/SelectCommandParser.java Tue Jan 18 09:24:06 2011 @@ -43,8 +43,8 @@ public class SelectCommandParser extends */ protected ImapMessage decode(ImapCommand command, ImapRequestLineReader request, String tag, ImapSession session) throws DecodingException { - final String mailboxName = mailbox(request); - endLine(request); + final String mailboxName = request.mailbox(); + request.eol(); final ImapMessage result = new SelectRequest(command, mailboxName, tag); return result; } Modified: james/imap/trunk/message/src/main/java/org/apache/james/imap/decode/parser/StartTLSCommandParser.java URL: http://svn.apache.org/viewvc/james/imap/trunk/message/src/main/java/org/apache/james/imap/decode/parser/StartTLSCommandParser.java?rev=1060264&r1=1060263&r2=1060264&view=diff ============================================================================== --- james/imap/trunk/message/src/main/java/org/apache/james/imap/decode/parser/StartTLSCommandParser.java (original) +++ james/imap/trunk/message/src/main/java/org/apache/james/imap/decode/parser/StartTLSCommandParser.java Tue Jan 18 09:24:06 2011 @@ -42,7 +42,7 @@ public class StartTLSCommandParser exten * @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.commons.logging.Log, org.apache.james.imap.api.process.ImapSession) */ protected ImapMessage decode(ImapCommand command, ImapRequestLineReader request, String tag, ImapSession session) throws DecodingException { - endLine(request); + request.eol(); return new StartTLSRequest(tag, command); } Modified: james/imap/trunk/message/src/main/java/org/apache/james/imap/decode/parser/StatusCommandParser.java URL: http://svn.apache.org/viewvc/james/imap/trunk/message/src/main/java/org/apache/james/imap/decode/parser/StatusCommandParser.java?rev=1060264&r1=1060263&r2=1060264&view=diff ============================================================================== --- james/imap/trunk/message/src/main/java/org/apache/james/imap/decode/parser/StatusCommandParser.java (original) +++ james/imap/trunk/message/src/main/java/org/apache/james/imap/decode/parser/StatusCommandParser.java Tue Jan 18 09:24:06 2011 @@ -26,6 +26,7 @@ import org.apache.james.imap.api.message import org.apache.james.imap.api.process.ImapSession; import org.apache.james.imap.decode.ImapRequestLineReader; import org.apache.james.imap.decode.DecodingException; +import org.apache.james.imap.decode.ImapRequestLineReader.CharacterValidator; import org.apache.james.imap.decode.base.AbstractImapCommandParser; import org.apache.james.imap.message.request.StatusRequest; @@ -43,13 +44,13 @@ public class StatusCommandParser extends StatusDataItems items = new StatusDataItems(); request.nextWordChar(); - consumeChar(request, '('); - CharacterValidator validator = new NoopCharValidator(); - String nextWord = consumeWord(request, validator); + request.consumeChar('('); + CharacterValidator validator = new ImapRequestLineReader.NoopCharValidator(); + String nextWord = request.consumeWord(validator); while (!nextWord.endsWith(")")) { addItem(nextWord, items); - nextWord = consumeWord(request, validator); + nextWord = request.consumeWord(validator); } // Got the closing ")", may be attached to a word. if (nextWord.length() > 1) { @@ -84,9 +85,9 @@ public class StatusCommandParser extends */ protected ImapMessage decode(ImapCommand command, ImapRequestLineReader request, String tag, ImapSession session) throws DecodingException { - final String mailboxName = mailbox(request); + final String mailboxName = request.mailbox(); final StatusDataItems statusDataItems = statusDataItems(request); - endLine(request); + request.eol(); return new StatusRequest(command, mailboxName, statusDataItems, tag); } } Modified: james/imap/trunk/message/src/main/java/org/apache/james/imap/decode/parser/StoreCommandParser.java URL: http://svn.apache.org/viewvc/james/imap/trunk/message/src/main/java/org/apache/james/imap/decode/parser/StoreCommandParser.java?rev=1060264&r1=1060263&r2=1060264&view=diff ============================================================================== --- james/imap/trunk/message/src/main/java/org/apache/james/imap/decode/parser/StoreCommandParser.java (original) +++ james/imap/trunk/message/src/main/java/org/apache/james/imap/decode/parser/StoreCommandParser.java Tue Jan 18 09:24:06 2011 @@ -47,7 +47,7 @@ public class StoreCommandParser extends protected ImapMessage decode(ImapCommand command, ImapRequestLineReader request, String tag, boolean useUids, ImapSession session) throws DecodingException { - final IdRange[] idSet = parseIdRange(request); + final IdRange[] idSet = request.parseIdRange(); final Boolean sign; boolean silent = false; @@ -62,7 +62,7 @@ public class StoreCommandParser extends sign = null; } - String directive = consumeWord(request, new NoopCharValidator()); + String directive = request.consumeWord(new ImapRequestLineReader.NoopCharValidator()); if ("FLAGS".equalsIgnoreCase(directive)) { silent = false; } else if ("FLAGS.SILENT".equalsIgnoreCase(directive)) { @@ -72,8 +72,8 @@ public class StoreCommandParser extends "Invalid Store Directive: '" + directive + "'"); } - final Flags flags = flagList(request); - endLine(request); + final Flags flags = request.flagList(); + request.eol(); final ImapMessage result = new StoreRequest(command, idSet, silent, flags, useUids, tag, sign); return result; } Modified: james/imap/trunk/message/src/main/java/org/apache/james/imap/decode/parser/SubscribeCommandParser.java URL: http://svn.apache.org/viewvc/james/imap/trunk/message/src/main/java/org/apache/james/imap/decode/parser/SubscribeCommandParser.java?rev=1060264&r1=1060263&r2=1060264&view=diff ============================================================================== --- james/imap/trunk/message/src/main/java/org/apache/james/imap/decode/parser/SubscribeCommandParser.java (original) +++ james/imap/trunk/message/src/main/java/org/apache/james/imap/decode/parser/SubscribeCommandParser.java Tue Jan 18 09:24:06 2011 @@ -43,8 +43,8 @@ public class SubscribeCommandParser exte */ protected ImapMessage decode(ImapCommand command, ImapRequestLineReader request, String tag, ImapSession session) throws DecodingException { - final String mailboxName = mailbox(request); - endLine(request); + final String mailboxName = request.mailbox(); + request.eol(); final ImapMessage result = new SubscribeRequest(command, mailboxName, tag); return result; Modified: james/imap/trunk/message/src/main/java/org/apache/james/imap/decode/parser/UidCommandParser.java URL: http://svn.apache.org/viewvc/james/imap/trunk/message/src/main/java/org/apache/james/imap/decode/parser/UidCommandParser.java?rev=1060264&r1=1060263&r2=1060264&view=diff ============================================================================== --- james/imap/trunk/message/src/main/java/org/apache/james/imap/decode/parser/UidCommandParser.java (original) +++ james/imap/trunk/message/src/main/java/org/apache/james/imap/decode/parser/UidCommandParser.java Tue Jan 18 09:24:06 2011 @@ -69,7 +69,7 @@ public class UidCommandParser extends Ab // TODO: the command written may be wrong // TODO: this will be easier to fix a little later // TODO: also not sure whether the old implementation shares this flaw - String commandName = atom(request); + String commandName = request.atom(); ImapCommandParser helperCommand = parserFactory.getParser(commandName); // TODO: replace abstract class with interface if (helperCommand == null Modified: james/imap/trunk/message/src/main/java/org/apache/james/imap/decode/parser/UnselectCommandParser.java URL: http://svn.apache.org/viewvc/james/imap/trunk/message/src/main/java/org/apache/james/imap/decode/parser/UnselectCommandParser.java?rev=1060264&r1=1060263&r2=1060264&view=diff ============================================================================== --- james/imap/trunk/message/src/main/java/org/apache/james/imap/decode/parser/UnselectCommandParser.java (original) +++ james/imap/trunk/message/src/main/java/org/apache/james/imap/decode/parser/UnselectCommandParser.java Tue Jan 18 09:24:06 2011 @@ -50,7 +50,7 @@ public class UnselectCommandParser exten */ protected ImapMessage decode(ImapCommand command, ImapRequestLineReader request, String tag, ImapSession session) throws DecodingException { - endLine(request); + request.eol(); final ImapMessage result = new UnselectRequest(tag, command); return result; } Modified: james/imap/trunk/message/src/main/java/org/apache/james/imap/decode/parser/UnsubscribeCommandParser.java URL: http://svn.apache.org/viewvc/james/imap/trunk/message/src/main/java/org/apache/james/imap/decode/parser/UnsubscribeCommandParser.java?rev=1060264&r1=1060263&r2=1060264&view=diff ============================================================================== --- james/imap/trunk/message/src/main/java/org/apache/james/imap/decode/parser/UnsubscribeCommandParser.java (original) +++ james/imap/trunk/message/src/main/java/org/apache/james/imap/decode/parser/UnsubscribeCommandParser.java Tue Jan 18 09:24:06 2011 @@ -44,8 +44,8 @@ public class UnsubscribeCommandParser ex */ protected ImapMessage decode(ImapCommand command, ImapRequestLineReader request, String tag, ImapSession session) throws DecodingException { - final String mailboxName = mailbox(request); - endLine(request); + final String mailboxName = request.mailbox(); + request.eol(); return new UnsubscribeRequest(command, mailboxName, tag); } Modified: james/imap/trunk/message/src/test/java/org/apache/james/imap/decode/main/IdRangeParseTest.java URL: http://svn.apache.org/viewvc/james/imap/trunk/message/src/test/java/org/apache/james/imap/decode/main/IdRangeParseTest.java?rev=1060264&r1=1060263&r2=1060264&view=diff ============================================================================== --- james/imap/trunk/message/src/test/java/org/apache/james/imap/decode/main/IdRangeParseTest.java (original) +++ james/imap/trunk/message/src/test/java/org/apache/james/imap/decode/main/IdRangeParseTest.java Tue Jan 18 09:24:06 2011 @@ -25,30 +25,15 @@ import java.io.ByteArrayOutputStream; import junit.framework.Assert; -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.message.IdRange; -import org.apache.james.imap.api.process.ImapSession; import org.apache.james.imap.decode.DecodingException; import org.apache.james.imap.decode.ImapRequestLineReader; import org.apache.james.imap.decode.ImapRequestStreamLineReader; -import org.apache.james.imap.decode.base.AbstractImapCommandParser; import org.junit.Test; public class IdRangeParseTest { - private final AbstractImapCommandParser parser = new AbstractImapCommandParser(null) { - - @Override - protected ImapMessage decode(ImapCommand command, - ImapRequestLineReader request, String tag, ImapSession session) - throws DecodingException { - return null; - } - - }; - /** * Test for https://issues.apache.org/jira/browse/IMAP-212 @@ -106,6 +91,6 @@ public class IdRangeParseTest { new ByteArrayInputStream((rangesAsString + "\r\n").getBytes()), new ByteArrayOutputStream()); - return parser.parseIdRange(reader); + return reader.parseIdRange(); } } --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
