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 rd...@apache.org on 2009/03/31 20:26:16 UTC
svn commit: r760562 - in /james/imap/trunk:
api/src/main/java/org/apache/james/imap/api/
decode/src/main/java/org/apache/james/imap/decode/
decode/src/main/java/org/apache/james/imap/decode/parser/
decode/src/test/java/org/apache/james/imap/decode/pars...
Author: rdonkin
Date: Tue Mar 31 18:26:15 2009
New Revision: 760562
URL: http://svn.apache.org/viewvc?rev=760562&view=rev
Log:
Nothing really gained by these interfaces so simply code by their removal
Removed:
james/imap/trunk/api/src/main/java/org/apache/james/imap/api/Imap4Rev1CommandFactory.java
james/imap/trunk/decode/src/main/java/org/apache/james/imap/decode/InitialisableCommandFactory.java
james/imap/trunk/message/src/main/java/org/apache/james/imap/command/imap4rev1/ImapCommandImpl.java
james/imap/trunk/message/src/main/java/org/apache/james/imap/command/imap4rev1/StandardImap4Rev1CommandFactory.java
Modified:
james/imap/trunk/decode/src/main/java/org/apache/james/imap/decode/parser/AppendCommandParser.java
james/imap/trunk/decode/src/main/java/org/apache/james/imap/decode/parser/AuthenticateCommandParser.java
james/imap/trunk/decode/src/main/java/org/apache/james/imap/decode/parser/CapabilityCommandParser.java
james/imap/trunk/decode/src/main/java/org/apache/james/imap/decode/parser/CheckCommandParser.java
james/imap/trunk/decode/src/main/java/org/apache/james/imap/decode/parser/CloseCommandParser.java
james/imap/trunk/decode/src/main/java/org/apache/james/imap/decode/parser/CopyCommandParser.java
james/imap/trunk/decode/src/main/java/org/apache/james/imap/decode/parser/CreateCommandParser.java
james/imap/trunk/decode/src/main/java/org/apache/james/imap/decode/parser/DeleteCommandParser.java
james/imap/trunk/decode/src/main/java/org/apache/james/imap/decode/parser/ExamineCommandParser.java
james/imap/trunk/decode/src/main/java/org/apache/james/imap/decode/parser/ExpungeCommandParser.java
james/imap/trunk/decode/src/main/java/org/apache/james/imap/decode/parser/FetchCommandParser.java
james/imap/trunk/decode/src/main/java/org/apache/james/imap/decode/parser/Imap4Rev1CommandParserFactory.java
james/imap/trunk/decode/src/main/java/org/apache/james/imap/decode/parser/ListCommandParser.java
james/imap/trunk/decode/src/main/java/org/apache/james/imap/decode/parser/LoginCommandParser.java
james/imap/trunk/decode/src/main/java/org/apache/james/imap/decode/parser/LogoutCommandParser.java
james/imap/trunk/decode/src/main/java/org/apache/james/imap/decode/parser/LsubCommandParser.java
james/imap/trunk/decode/src/main/java/org/apache/james/imap/decode/parser/NoopCommandParser.java
james/imap/trunk/decode/src/main/java/org/apache/james/imap/decode/parser/RenameCommandParser.java
james/imap/trunk/decode/src/main/java/org/apache/james/imap/decode/parser/SearchCommandParser.java
james/imap/trunk/decode/src/main/java/org/apache/james/imap/decode/parser/SelectCommandParser.java
james/imap/trunk/decode/src/main/java/org/apache/james/imap/decode/parser/StatusCommandParser.java
james/imap/trunk/decode/src/main/java/org/apache/james/imap/decode/parser/StoreCommandParser.java
james/imap/trunk/decode/src/main/java/org/apache/james/imap/decode/parser/SubscribeCommandParser.java
james/imap/trunk/decode/src/main/java/org/apache/james/imap/decode/parser/UidCommandParser.java
james/imap/trunk/decode/src/main/java/org/apache/james/imap/decode/parser/UnsubscribeCommandParser.java
james/imap/trunk/decode/src/test/java/org/apache/james/imap/decode/parser/FetchCommandParserPartialFetchTest.java
james/imap/trunk/decode/src/test/java/org/apache/james/imap/decode/parser/SearchCommandParserAndParenthesesTest.java
james/imap/trunk/decode/src/test/java/org/apache/james/imap/decode/parser/SearchCommandParserCharsetTest.java
james/imap/trunk/decode/src/test/java/org/apache/james/imap/decode/parser/SearchCommandParserNotTest.java
james/imap/trunk/decode/src/test/java/org/apache/james/imap/decode/parser/SearchCommandParserOrTest.java
james/imap/trunk/decode/src/test/java/org/apache/james/imap/decode/parser/SearchCommandParserQuotedCharsetTest.java
james/imap/trunk/decode/src/test/java/org/apache/james/imap/decode/parser/SearchCommandParserSearchKeySequenceSetTest.java
james/imap/trunk/decode/src/test/java/org/apache/james/imap/decode/parser/SearchCommandParserSearchKeyTest.java
james/imap/trunk/decode/src/test/java/org/apache/james/imap/decode/parser/SearchCommandParserTopLevelAndTest.java
james/imap/trunk/decode/src/test/java/org/apache/james/imap/decode/parser/StoreCommandParserTest.java
james/imap/trunk/seda/src/main/java/org/apache/james/imap/main/DefaultImapDecoderFactory.java
Modified: james/imap/trunk/decode/src/main/java/org/apache/james/imap/decode/parser/AppendCommandParser.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/decode/src/main/java/org/apache/james/imap/decode/parser/AppendCommandParser.java?rev=760562&r1=760561&r2=760562&view=diff
==============================================================================
--- james/imap/trunk/decode/src/main/java/org/apache/james/imap/decode/parser/AppendCommandParser.java (original)
+++ james/imap/trunk/decode/src/main/java/org/apache/james/imap/decode/parser/AppendCommandParser.java Tue Mar 31 18:26:15 2009
@@ -23,27 +23,20 @@
import javax.mail.Flags;
import org.apache.commons.logging.Log;
-import org.apache.james.imap.api.Imap4Rev1CommandFactory;
import org.apache.james.imap.api.Imap4Rev1MessageFactory;
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.decode.ImapRequestLineReader;
-import org.apache.james.imap.decode.InitialisableCommandFactory;
import org.apache.james.imap.decode.ProtocolException;
import org.apache.james.imap.decode.base.AbstractImapCommandParser;
-class AppendCommandParser extends AbstractImapCommandParser implements
- InitialisableCommandFactory {
+class AppendCommandParser extends AbstractImapCommandParser {
+ private final ImapCommand append = ImapCommand.authenticatedStateCommand(ImapConstants.APPEND_COMMAND_NAME);
+
public AppendCommandParser() {
- }
-
- /**
- * @see org.apache.james.imap.decode.InitialisableCommandFactory#init(org.apache.james.imap.api.Imap4Rev1CommandFactory)
- */
- public void init(Imap4Rev1CommandFactory factory) {
- final ImapCommand command = factory.getAppend();
- setCommand(command);
+ setCommand(append);
}
/**
Modified: james/imap/trunk/decode/src/main/java/org/apache/james/imap/decode/parser/AuthenticateCommandParser.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/decode/src/main/java/org/apache/james/imap/decode/parser/AuthenticateCommandParser.java?rev=760562&r1=760561&r2=760562&view=diff
==============================================================================
--- james/imap/trunk/decode/src/main/java/org/apache/james/imap/decode/parser/AuthenticateCommandParser.java (original)
+++ james/imap/trunk/decode/src/main/java/org/apache/james/imap/decode/parser/AuthenticateCommandParser.java Tue Mar 31 18:26:15 2009
@@ -19,27 +19,20 @@
package org.apache.james.imap.decode.parser;
import org.apache.commons.logging.Log;
-import org.apache.james.imap.api.Imap4Rev1CommandFactory;
import org.apache.james.imap.api.Imap4Rev1MessageFactory;
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.decode.ImapRequestLineReader;
-import org.apache.james.imap.decode.InitialisableCommandFactory;
import org.apache.james.imap.decode.ProtocolException;
import org.apache.james.imap.decode.base.AbstractImapCommandParser;
-class AuthenticateCommandParser extends AbstractImapCommandParser implements
- InitialisableCommandFactory {
+class AuthenticateCommandParser extends AbstractImapCommandParser {
+ private final ImapCommand authenticate = ImapCommand.nonAuthenticatedStateCommand(ImapConstants.AUTHENTICATE_COMMAND_NAME);
+
public AuthenticateCommandParser() {
- }
-
- /**
- * @see org.apache.james.imap.decode.InitialisableCommandFactory#init(org.apache.james.imap.api.Imap4Rev1CommandFactory)
- */
- public void init(Imap4Rev1CommandFactory factory) {
- final ImapCommand command = factory.getAuthenticate();
- setCommand(command);
+ setCommand(authenticate);
}
protected ImapMessage decode(ImapCommand command,
Modified: james/imap/trunk/decode/src/main/java/org/apache/james/imap/decode/parser/CapabilityCommandParser.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/decode/src/main/java/org/apache/james/imap/decode/parser/CapabilityCommandParser.java?rev=760562&r1=760561&r2=760562&view=diff
==============================================================================
--- james/imap/trunk/decode/src/main/java/org/apache/james/imap/decode/parser/CapabilityCommandParser.java (original)
+++ james/imap/trunk/decode/src/main/java/org/apache/james/imap/decode/parser/CapabilityCommandParser.java Tue Mar 31 18:26:15 2009
@@ -19,27 +19,20 @@
package org.apache.james.imap.decode.parser;
import org.apache.commons.logging.Log;
-import org.apache.james.imap.api.Imap4Rev1CommandFactory;
import org.apache.james.imap.api.Imap4Rev1MessageFactory;
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.decode.ImapRequestLineReader;
-import org.apache.james.imap.decode.InitialisableCommandFactory;
import org.apache.james.imap.decode.ProtocolException;
import org.apache.james.imap.decode.base.AbstractImapCommandParser;
-class CapabilityCommandParser extends AbstractImapCommandParser implements
- InitialisableCommandFactory {
+class CapabilityCommandParser extends AbstractImapCommandParser {
+ private final ImapCommand capability = ImapCommand.anyStateCommand(ImapConstants.CAPABILITY_COMMAND_NAME);
+
public CapabilityCommandParser() {
- }
-
- /**
- * @see org.apache.james.imap.decode.InitialisableCommandFactory#init(org.apache.james.imap.api.Imap4Rev1CommandFactory)
- */
- public void init(Imap4Rev1CommandFactory factory) {
- final ImapCommand command = factory.getCapability();
- setCommand(command);
+ setCommand(capability);
}
protected ImapMessage decode(ImapCommand command,
Modified: james/imap/trunk/decode/src/main/java/org/apache/james/imap/decode/parser/CheckCommandParser.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/decode/src/main/java/org/apache/james/imap/decode/parser/CheckCommandParser.java?rev=760562&r1=760561&r2=760562&view=diff
==============================================================================
--- james/imap/trunk/decode/src/main/java/org/apache/james/imap/decode/parser/CheckCommandParser.java (original)
+++ james/imap/trunk/decode/src/main/java/org/apache/james/imap/decode/parser/CheckCommandParser.java Tue Mar 31 18:26:15 2009
@@ -19,26 +19,20 @@
package org.apache.james.imap.decode.parser;
import org.apache.commons.logging.Log;
-import org.apache.james.imap.api.Imap4Rev1CommandFactory;
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.decode.ImapRequestLineReader;
-import org.apache.james.imap.decode.InitialisableCommandFactory;
import org.apache.james.imap.decode.ProtocolException;
import org.apache.james.imap.decode.base.AbstractImapCommandParser;
-class CheckCommandParser extends AbstractImapCommandParser implements
- InitialisableCommandFactory {
+class CheckCommandParser extends AbstractImapCommandParser {
+ private final ImapCommand check = ImapCommand
+ .selectedStateCommand(ImapConstants.CHECK_COMMAND_NAME);
+
public CheckCommandParser() {
- }
-
- /**
- * @see org.apache.james.imap.decode.InitialisableCommandFactory#init(org.apache.james.imap.api.Imap4Rev1CommandFactory)
- */
- public void init(Imap4Rev1CommandFactory factory) {
- final ImapCommand command = factory.getCheck();
- setCommand(command);
+ setCommand(check);
}
protected ImapMessage decode(ImapCommand command,
Modified: james/imap/trunk/decode/src/main/java/org/apache/james/imap/decode/parser/CloseCommandParser.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/decode/src/main/java/org/apache/james/imap/decode/parser/CloseCommandParser.java?rev=760562&r1=760561&r2=760562&view=diff
==============================================================================
--- james/imap/trunk/decode/src/main/java/org/apache/james/imap/decode/parser/CloseCommandParser.java (original)
+++ james/imap/trunk/decode/src/main/java/org/apache/james/imap/decode/parser/CloseCommandParser.java Tue Mar 31 18:26:15 2009
@@ -19,27 +19,21 @@
package org.apache.james.imap.decode.parser;
import org.apache.commons.logging.Log;
-import org.apache.james.imap.api.Imap4Rev1CommandFactory;
import org.apache.james.imap.api.Imap4Rev1MessageFactory;
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.decode.ImapRequestLineReader;
-import org.apache.james.imap.decode.InitialisableCommandFactory;
import org.apache.james.imap.decode.ProtocolException;
import org.apache.james.imap.decode.base.AbstractImapCommandParser;
-class CloseCommandParser extends AbstractImapCommandParser implements
- InitialisableCommandFactory {
+class CloseCommandParser extends AbstractImapCommandParser {
+ private final ImapCommand close = ImapCommand
+ .selectedStateCommand(ImapConstants.CLOSE_COMMAND_NAME);
+
public CloseCommandParser() {
- }
-
- /**
- * @see org.apache.james.imap.decode.InitialisableCommandFactory#init(org.apache.james.imap.api.Imap4Rev1CommandFactory)
- */
- public void init(Imap4Rev1CommandFactory factory) {
- final ImapCommand command = factory.getClose();
- setCommand(command);
+ setCommand(close);
}
protected ImapMessage decode(ImapCommand command,
Modified: james/imap/trunk/decode/src/main/java/org/apache/james/imap/decode/parser/CopyCommandParser.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/decode/src/main/java/org/apache/james/imap/decode/parser/CopyCommandParser.java?rev=760562&r1=760561&r2=760562&view=diff
==============================================================================
--- james/imap/trunk/decode/src/main/java/org/apache/james/imap/decode/parser/CopyCommandParser.java (original)
+++ james/imap/trunk/decode/src/main/java/org/apache/james/imap/decode/parser/CopyCommandParser.java Tue Mar 31 18:26:15 2009
@@ -19,26 +19,20 @@
package org.apache.james.imap.decode.parser;
import org.apache.commons.logging.Log;
-import org.apache.james.imap.api.Imap4Rev1CommandFactory;
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.decode.ImapRequestLineReader;
-import org.apache.james.imap.decode.InitialisableCommandFactory;
import org.apache.james.imap.decode.ProtocolException;
-class CopyCommandParser extends AbstractUidCommandParser implements
- InitialisableCommandFactory {
+class CopyCommandParser extends AbstractUidCommandParser {
+ private final ImapCommand copy = ImapCommand
+ .selectedStateCommand(ImapConstants.COPY_COMMAND_NAME);
+
public CopyCommandParser() {
- }
-
- /**
- * @see org.apache.james.imap.decode.InitialisableCommandFactory#init(org.apache.james.imap.api.Imap4Rev1CommandFactory)
- */
- public void init(Imap4Rev1CommandFactory factory) {
- final ImapCommand command = factory.getCopy();
- setCommand(command);
+ setCommand(copy);
}
protected ImapMessage decode(ImapCommand command,
Modified: james/imap/trunk/decode/src/main/java/org/apache/james/imap/decode/parser/CreateCommandParser.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/decode/src/main/java/org/apache/james/imap/decode/parser/CreateCommandParser.java?rev=760562&r1=760561&r2=760562&view=diff
==============================================================================
--- james/imap/trunk/decode/src/main/java/org/apache/james/imap/decode/parser/CreateCommandParser.java (original)
+++ james/imap/trunk/decode/src/main/java/org/apache/james/imap/decode/parser/CreateCommandParser.java Tue Mar 31 18:26:15 2009
@@ -19,27 +19,21 @@
package org.apache.james.imap.decode.parser;
import org.apache.commons.logging.Log;
-import org.apache.james.imap.api.Imap4Rev1CommandFactory;
import org.apache.james.imap.api.Imap4Rev1MessageFactory;
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.decode.ImapRequestLineReader;
-import org.apache.james.imap.decode.InitialisableCommandFactory;
import org.apache.james.imap.decode.ProtocolException;
import org.apache.james.imap.decode.base.AbstractImapCommandParser;
-class CreateCommandParser extends AbstractImapCommandParser implements
- InitialisableCommandFactory {
+class CreateCommandParser extends AbstractImapCommandParser {
+ private final ImapCommand create = ImapCommand
+ .authenticatedStateCommand(ImapConstants.CREATE_COMMAND_NAME);
+
public CreateCommandParser() {
- }
-
- /**
- * @see org.apache.james.imap.decode.InitialisableCommandFactory#init(org.apache.james.imap.api.Imap4Rev1CommandFactory)
- */
- public void init(Imap4Rev1CommandFactory factory) {
- final ImapCommand command = factory.getCreate();
- setCommand(command);
+ setCommand(create);
}
protected ImapMessage decode(ImapCommand command,
Modified: james/imap/trunk/decode/src/main/java/org/apache/james/imap/decode/parser/DeleteCommandParser.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/decode/src/main/java/org/apache/james/imap/decode/parser/DeleteCommandParser.java?rev=760562&r1=760561&r2=760562&view=diff
==============================================================================
--- james/imap/trunk/decode/src/main/java/org/apache/james/imap/decode/parser/DeleteCommandParser.java (original)
+++ james/imap/trunk/decode/src/main/java/org/apache/james/imap/decode/parser/DeleteCommandParser.java Tue Mar 31 18:26:15 2009
@@ -19,27 +19,21 @@
package org.apache.james.imap.decode.parser;
import org.apache.commons.logging.Log;
-import org.apache.james.imap.api.Imap4Rev1CommandFactory;
import org.apache.james.imap.api.Imap4Rev1MessageFactory;
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.decode.ImapRequestLineReader;
-import org.apache.james.imap.decode.InitialisableCommandFactory;
import org.apache.james.imap.decode.ProtocolException;
import org.apache.james.imap.decode.base.AbstractImapCommandParser;
-class DeleteCommandParser extends AbstractImapCommandParser implements
- InitialisableCommandFactory {
+class DeleteCommandParser extends AbstractImapCommandParser {
+ private final ImapCommand delete = ImapCommand
+ .authenticatedStateCommand(ImapConstants.DELETE_COMMAND_NAME);
+
public DeleteCommandParser() {
- }
-
- /**
- * @see org.apache.james.imap.decode.InitialisableCommandFactory#init(org.apache.james.imap.api.Imap4Rev1CommandFactory)
- */
- public void init(Imap4Rev1CommandFactory factory) {
- final ImapCommand command = factory.getDelete();
- setCommand(command);
+ setCommand(delete);
}
protected ImapMessage decode(ImapCommand command,
Modified: james/imap/trunk/decode/src/main/java/org/apache/james/imap/decode/parser/ExamineCommandParser.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/decode/src/main/java/org/apache/james/imap/decode/parser/ExamineCommandParser.java?rev=760562&r1=760561&r2=760562&view=diff
==============================================================================
--- james/imap/trunk/decode/src/main/java/org/apache/james/imap/decode/parser/ExamineCommandParser.java (original)
+++ james/imap/trunk/decode/src/main/java/org/apache/james/imap/decode/parser/ExamineCommandParser.java Tue Mar 31 18:26:15 2009
@@ -19,26 +19,20 @@
package org.apache.james.imap.decode.parser;
import org.apache.commons.logging.Log;
-import org.apache.james.imap.api.Imap4Rev1CommandFactory;
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.decode.ImapRequestLineReader;
-import org.apache.james.imap.decode.InitialisableCommandFactory;
import org.apache.james.imap.decode.ProtocolException;
import org.apache.james.imap.decode.base.AbstractImapCommandParser;
-class ExamineCommandParser extends AbstractImapCommandParser implements
- InitialisableCommandFactory {
+class ExamineCommandParser extends AbstractImapCommandParser {
+ private final ImapCommand examine = ImapCommand
+ .authenticatedStateCommand(ImapConstants.EXAMINE_COMMAND_NAME);
+
public ExamineCommandParser() {
- }
-
- /**
- * @see org.apache.james.imap.decode.InitialisableCommandFactory#init(org.apache.james.imap.api.Imap4Rev1CommandFactory)
- */
- public void init(Imap4Rev1CommandFactory factory) {
- final ImapCommand command = factory.getExamine();
- setCommand(command);
+ setCommand(examine);
}
protected ImapMessage decode(ImapCommand command,
Modified: james/imap/trunk/decode/src/main/java/org/apache/james/imap/decode/parser/ExpungeCommandParser.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/decode/src/main/java/org/apache/james/imap/decode/parser/ExpungeCommandParser.java?rev=760562&r1=760561&r2=760562&view=diff
==============================================================================
--- james/imap/trunk/decode/src/main/java/org/apache/james/imap/decode/parser/ExpungeCommandParser.java (original)
+++ james/imap/trunk/decode/src/main/java/org/apache/james/imap/decode/parser/ExpungeCommandParser.java Tue Mar 31 18:26:15 2009
@@ -19,27 +19,21 @@
package org.apache.james.imap.decode.parser;
import org.apache.commons.logging.Log;
-import org.apache.james.imap.api.Imap4Rev1CommandFactory;
import org.apache.james.imap.api.Imap4Rev1MessageFactory;
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.decode.ImapRequestLineReader;
-import org.apache.james.imap.decode.InitialisableCommandFactory;
import org.apache.james.imap.decode.ProtocolException;
import org.apache.james.imap.decode.base.AbstractImapCommandParser;
-class ExpungeCommandParser extends AbstractImapCommandParser implements
- InitialisableCommandFactory {
+class ExpungeCommandParser extends AbstractImapCommandParser {
+ private final ImapCommand expunge = ImapCommand
+ .selectedStateCommand(ImapConstants.EXPUNGE_COMMAND_NAME);
+
public ExpungeCommandParser() {
- }
-
- /**
- * @see org.apache.james.imap.decode.InitialisableCommandFactory#init(org.apache.james.imap.api.Imap4Rev1CommandFactory)
- */
- public void init(Imap4Rev1CommandFactory factory) {
- final ImapCommand command = factory.getExpunge();
- setCommand(command);
+ setCommand(expunge);
}
protected ImapMessage decode(ImapCommand command,
Modified: james/imap/trunk/decode/src/main/java/org/apache/james/imap/decode/parser/FetchCommandParser.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/decode/src/main/java/org/apache/james/imap/decode/parser/FetchCommandParser.java?rev=760562&r1=760561&r2=760562&view=diff
==============================================================================
--- james/imap/trunk/decode/src/main/java/org/apache/james/imap/decode/parser/FetchCommandParser.java (original)
+++ james/imap/trunk/decode/src/main/java/org/apache/james/imap/decode/parser/FetchCommandParser.java Tue Mar 31 18:26:15 2009
@@ -21,29 +21,24 @@
import java.util.List;
import org.apache.commons.logging.Log;
-import org.apache.james.imap.api.Imap4Rev1CommandFactory;
import org.apache.james.imap.api.Imap4Rev1MessageFactory;
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.BodyFetchElement;
import org.apache.james.imap.api.message.FetchData;
import org.apache.james.imap.api.message.IdRange;
import org.apache.james.imap.decode.FetchPartPathDecoder;
import org.apache.james.imap.decode.ImapRequestLineReader;
-import org.apache.james.imap.decode.InitialisableCommandFactory;
import org.apache.james.imap.decode.ProtocolException;
-class FetchCommandParser extends AbstractUidCommandParser implements
- InitialisableCommandFactory {
- public FetchCommandParser() {
- }
+class FetchCommandParser extends AbstractUidCommandParser {
- /**
- * @see org.apache.james.imap.decode.InitialisableCommandFactory#init(org.apache.james.imap.api.Imap4Rev1CommandFactory)
- */
- public void init(Imap4Rev1CommandFactory factory) {
- final ImapCommand command = factory.getFetch();
- setCommand(command);
+ private final ImapCommand fetch = ImapCommand.selectedStateCommand(ImapConstants.FETCH_COMMAND_NAME);
+
+
+ public FetchCommandParser() {
+ setCommand(fetch);
}
public FetchData fetchRequest(ImapRequestLineReader request)
Modified: james/imap/trunk/decode/src/main/java/org/apache/james/imap/decode/parser/Imap4Rev1CommandParserFactory.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/decode/src/main/java/org/apache/james/imap/decode/parser/Imap4Rev1CommandParserFactory.java?rev=760562&r1=760561&r2=760562&view=diff
==============================================================================
--- james/imap/trunk/decode/src/main/java/org/apache/james/imap/decode/parser/Imap4Rev1CommandParserFactory.java (original)
+++ james/imap/trunk/decode/src/main/java/org/apache/james/imap/decode/parser/Imap4Rev1CommandParserFactory.java Tue Mar 31 18:26:15 2009
@@ -22,14 +22,12 @@
import java.util.HashMap;
import java.util.Map;
-import org.apache.james.imap.api.Imap4Rev1CommandFactory;
import org.apache.james.imap.api.Imap4Rev1MessageFactory;
import org.apache.james.imap.api.ImapConstants;
import org.apache.james.imap.api.message.response.StatusResponseFactory;
import org.apache.james.imap.decode.DelegatingImapCommandParser;
import org.apache.james.imap.decode.ImapCommandParser;
import org.apache.james.imap.decode.ImapCommandParserFactory;
-import org.apache.james.imap.decode.InitialisableCommandFactory;
import org.apache.james.imap.decode.MessagingImapCommandParser;
/**
@@ -46,14 +44,11 @@
private final StatusResponseFactory statusResponseFactory;
- private final Imap4Rev1CommandFactory commandFactory;
public Imap4Rev1CommandParserFactory(
final Imap4Rev1MessageFactory messageFactory,
- final Imap4Rev1CommandFactory commandFactory,
final StatusResponseFactory statusResponseFactory) {
this.messageFactory = messageFactory;
- this.commandFactory = commandFactory;
this.statusResponseFactory = statusResponseFactory;
_imapCommands = new HashMap<String, Class>();
@@ -168,10 +163,6 @@
messagingImapCommandParser
.setStatusResponseFactory(statusResponseFactory);
}
-
- if (cmd instanceof InitialisableCommandFactory) {
- ((InitialisableCommandFactory) cmd).init(commandFactory);
- }
}
}
Modified: james/imap/trunk/decode/src/main/java/org/apache/james/imap/decode/parser/ListCommandParser.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/decode/src/main/java/org/apache/james/imap/decode/parser/ListCommandParser.java?rev=760562&r1=760561&r2=760562&view=diff
==============================================================================
--- james/imap/trunk/decode/src/main/java/org/apache/james/imap/decode/parser/ListCommandParser.java (original)
+++ james/imap/trunk/decode/src/main/java/org/apache/james/imap/decode/parser/ListCommandParser.java Tue Mar 31 18:26:15 2009
@@ -19,27 +19,23 @@
package org.apache.james.imap.decode.parser;
import org.apache.commons.logging.Log;
-import org.apache.james.imap.api.Imap4Rev1CommandFactory;
import org.apache.james.imap.api.Imap4Rev1MessageFactory;
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.decode.ImapRequestLineReader;
-import org.apache.james.imap.decode.InitialisableCommandFactory;
import org.apache.james.imap.decode.ProtocolException;
-class ListCommandParser extends AbstractUidCommandParser implements
- InitialisableCommandFactory {
- public ListCommandParser() {
- }
+class ListCommandParser extends AbstractUidCommandParser {
+
+ private final ImapCommand list = ImapCommand
+ .authenticatedStateCommand(ImapConstants.LIST_COMMAND_NAME);
- /**
- * @see org.apache.james.imap.decode.InitialisableCommandFactory#init(org.apache.james.imap.api.Imap4Rev1CommandFactory)
- */
- public void init(Imap4Rev1CommandFactory factory) {
- final ImapCommand command = factory.getList();
- setCommand(command);
+ public ListCommandParser() {
+ setCommand(list);
}
+
/**
* 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"
Modified: james/imap/trunk/decode/src/main/java/org/apache/james/imap/decode/parser/LoginCommandParser.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/decode/src/main/java/org/apache/james/imap/decode/parser/LoginCommandParser.java?rev=760562&r1=760561&r2=760562&view=diff
==============================================================================
--- james/imap/trunk/decode/src/main/java/org/apache/james/imap/decode/parser/LoginCommandParser.java (original)
+++ james/imap/trunk/decode/src/main/java/org/apache/james/imap/decode/parser/LoginCommandParser.java Tue Mar 31 18:26:15 2009
@@ -19,26 +19,20 @@
package org.apache.james.imap.decode.parser;
import org.apache.commons.logging.Log;
-import org.apache.james.imap.api.Imap4Rev1CommandFactory;
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.decode.ImapRequestLineReader;
-import org.apache.james.imap.decode.InitialisableCommandFactory;
import org.apache.james.imap.decode.ProtocolException;
import org.apache.james.imap.decode.base.AbstractImapCommandParser;
-class LoginCommandParser extends AbstractImapCommandParser implements
- InitialisableCommandFactory {
+class LoginCommandParser extends AbstractImapCommandParser {
+ private final ImapCommand login = ImapCommand
+ .nonAuthenticatedStateCommand(ImapConstants.LOGIN_COMMAND_NAME);
+
public LoginCommandParser() {
- }
-
- /**
- * @see org.apache.james.imap.decode.InitialisableCommandFactory#init(org.apache.james.imap.api.Imap4Rev1CommandFactory)
- */
- public void init(Imap4Rev1CommandFactory factory) {
- final ImapCommand command = factory.getLogin();
- setCommand(command);
+ setCommand(login);
}
protected ImapMessage decode(ImapCommand command,
Modified: james/imap/trunk/decode/src/main/java/org/apache/james/imap/decode/parser/LogoutCommandParser.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/decode/src/main/java/org/apache/james/imap/decode/parser/LogoutCommandParser.java?rev=760562&r1=760561&r2=760562&view=diff
==============================================================================
--- james/imap/trunk/decode/src/main/java/org/apache/james/imap/decode/parser/LogoutCommandParser.java (original)
+++ james/imap/trunk/decode/src/main/java/org/apache/james/imap/decode/parser/LogoutCommandParser.java Tue Mar 31 18:26:15 2009
@@ -19,26 +19,20 @@
package org.apache.james.imap.decode.parser;
import org.apache.commons.logging.Log;
-import org.apache.james.imap.api.Imap4Rev1CommandFactory;
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.decode.ImapRequestLineReader;
-import org.apache.james.imap.decode.InitialisableCommandFactory;
import org.apache.james.imap.decode.ProtocolException;
import org.apache.james.imap.decode.base.AbstractImapCommandParser;
-class LogoutCommandParser extends AbstractImapCommandParser implements
- InitialisableCommandFactory {
+class LogoutCommandParser extends AbstractImapCommandParser {
+
+ private final ImapCommand logout = ImapCommand
+ .anyStateCommand(ImapConstants.LOGOUT_COMMAND_NAME);
public LogoutCommandParser() {
- }
-
- /**
- * @see org.apache.james.imap.decode.InitialisableCommandFactory#init(org.apache.james.imap.api.Imap4Rev1CommandFactory)
- */
- public void init(Imap4Rev1CommandFactory factory) {
- final ImapCommand command = factory.getLogout();
- setCommand(command);
+ setCommand(logout);
}
protected ImapMessage decode(ImapCommand command,
Modified: james/imap/trunk/decode/src/main/java/org/apache/james/imap/decode/parser/LsubCommandParser.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/decode/src/main/java/org/apache/james/imap/decode/parser/LsubCommandParser.java?rev=760562&r1=760561&r2=760562&view=diff
==============================================================================
--- james/imap/trunk/decode/src/main/java/org/apache/james/imap/decode/parser/LsubCommandParser.java (original)
+++ james/imap/trunk/decode/src/main/java/org/apache/james/imap/decode/parser/LsubCommandParser.java Tue Mar 31 18:26:15 2009
@@ -18,23 +18,18 @@
****************************************************************/
package org.apache.james.imap.decode.parser;
-import org.apache.james.imap.api.Imap4Rev1CommandFactory;
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.decode.InitialisableCommandFactory;
-class LsubCommandParser extends ListCommandParser implements
- InitialisableCommandFactory {
+class LsubCommandParser extends ListCommandParser {
- public LsubCommandParser() {
- }
- /**
- * @see org.apache.james.imap.decode.InitialisableCommandFactory#init(org.apache.james.imap.api.Imap4Rev1CommandFactory)
- */
- public void init(Imap4Rev1CommandFactory factory) {
- final ImapCommand command = factory.getLsub();
- setCommand(command);
+ private final ImapCommand lsub = ImapCommand
+ .authenticatedStateCommand(ImapConstants.LSUB_COMMAND_NAME);
+
+ public LsubCommandParser() {
+ setCommand(lsub);
}
protected ImapMessage createMessage(ImapCommand command,
Modified: james/imap/trunk/decode/src/main/java/org/apache/james/imap/decode/parser/NoopCommandParser.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/decode/src/main/java/org/apache/james/imap/decode/parser/NoopCommandParser.java?rev=760562&r1=760561&r2=760562&view=diff
==============================================================================
--- james/imap/trunk/decode/src/main/java/org/apache/james/imap/decode/parser/NoopCommandParser.java (original)
+++ james/imap/trunk/decode/src/main/java/org/apache/james/imap/decode/parser/NoopCommandParser.java Tue Mar 31 18:26:15 2009
@@ -19,26 +19,19 @@
package org.apache.james.imap.decode.parser;
import org.apache.commons.logging.Log;
-import org.apache.james.imap.api.Imap4Rev1CommandFactory;
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.decode.ImapRequestLineReader;
-import org.apache.james.imap.decode.InitialisableCommandFactory;
import org.apache.james.imap.decode.ProtocolException;
import org.apache.james.imap.decode.base.AbstractImapCommandParser;
-class NoopCommandParser extends AbstractImapCommandParser implements
- InitialisableCommandFactory {
-
+class NoopCommandParser extends AbstractImapCommandParser {
+
+ private final ImapCommand noop = ImapCommand.anyStateCommand(ImapConstants.NOOP_COMMAND_NAME);
+
public NoopCommandParser() {
- }
-
- /**
- * @see org.apache.james.imap.decode.InitialisableCommandFactory#init(org.apache.james.imap.api.Imap4Rev1CommandFactory)
- */
- public void init(Imap4Rev1CommandFactory factory) {
- final ImapCommand command = factory.getNoop();
- setCommand(command);
+ setCommand(noop);
}
protected ImapMessage decode(ImapCommand command,
Modified: james/imap/trunk/decode/src/main/java/org/apache/james/imap/decode/parser/RenameCommandParser.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/decode/src/main/java/org/apache/james/imap/decode/parser/RenameCommandParser.java?rev=760562&r1=760561&r2=760562&view=diff
==============================================================================
--- james/imap/trunk/decode/src/main/java/org/apache/james/imap/decode/parser/RenameCommandParser.java (original)
+++ james/imap/trunk/decode/src/main/java/org/apache/james/imap/decode/parser/RenameCommandParser.java Tue Mar 31 18:26:15 2009
@@ -19,26 +19,19 @@
package org.apache.james.imap.decode.parser;
import org.apache.commons.logging.Log;
-import org.apache.james.imap.api.Imap4Rev1CommandFactory;
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.decode.ImapRequestLineReader;
-import org.apache.james.imap.decode.InitialisableCommandFactory;
import org.apache.james.imap.decode.ProtocolException;
import org.apache.james.imap.decode.base.AbstractImapCommandParser;
-class RenameCommandParser extends AbstractImapCommandParser implements
- InitialisableCommandFactory {
+class RenameCommandParser extends AbstractImapCommandParser {
+ private final ImapCommand rename = ImapCommand.authenticatedStateCommand(ImapConstants.RENAME_COMMAND_NAME);
+
public RenameCommandParser() {
- }
-
- /**
- * @see org.apache.james.imap.decode.InitialisableCommandFactory#init(org.apache.james.imap.api.Imap4Rev1CommandFactory)
- */
- public void init(Imap4Rev1CommandFactory factory) {
- final ImapCommand command = factory.getRename();
- setCommand(command);
+ setCommand(rename);
}
protected ImapMessage decode(ImapCommand command,
Modified: james/imap/trunk/decode/src/main/java/org/apache/james/imap/decode/parser/SearchCommandParser.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/decode/src/main/java/org/apache/james/imap/decode/parser/SearchCommandParser.java?rev=760562&r1=760561&r2=760562&view=diff
==============================================================================
--- james/imap/trunk/decode/src/main/java/org/apache/james/imap/decode/parser/SearchCommandParser.java (original)
+++ james/imap/trunk/decode/src/main/java/org/apache/james/imap/decode/parser/SearchCommandParser.java Tue Mar 31 18:26:15 2009
@@ -29,8 +29,8 @@
import java.util.Set;
import org.apache.commons.logging.Log;
-import org.apache.james.imap.api.Imap4Rev1CommandFactory;
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.HumanReadableTextKey;
import org.apache.james.imap.api.message.IdRange;
@@ -40,23 +40,17 @@
import org.apache.james.imap.api.message.response.StatusResponseFactory;
import org.apache.james.imap.api.message.response.StatusResponse.ResponseCode;
import org.apache.james.imap.decode.ImapRequestLineReader;
-import org.apache.james.imap.decode.InitialisableCommandFactory;
import org.apache.james.imap.decode.ProtocolException;
-class SearchCommandParser extends AbstractUidCommandParser implements
- InitialisableCommandFactory {
+class SearchCommandParser extends AbstractUidCommandParser {
+
+ private final ImapCommand search = ImapCommand.selectedStateCommand(ImapConstants.SEARCH_COMMAND_NAME);
+
/** Lazy loaded */
private Collection<String> charsetNames;
public SearchCommandParser() {
- }
-
- /**
- * @see org.apache.james.imap.decode.InitialisableCommandFactory#init(org.apache.james.imap.api.Imap4Rev1CommandFactory)
- */
- public void init(Imap4Rev1CommandFactory factory) {
- final ImapCommand command = factory.getSearch();
- setCommand(command);
+ setCommand(search);
}
/**
Modified: james/imap/trunk/decode/src/main/java/org/apache/james/imap/decode/parser/SelectCommandParser.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/decode/src/main/java/org/apache/james/imap/decode/parser/SelectCommandParser.java?rev=760562&r1=760561&r2=760562&view=diff
==============================================================================
--- james/imap/trunk/decode/src/main/java/org/apache/james/imap/decode/parser/SelectCommandParser.java (original)
+++ james/imap/trunk/decode/src/main/java/org/apache/james/imap/decode/parser/SelectCommandParser.java Tue Mar 31 18:26:15 2009
@@ -19,26 +19,20 @@
package org.apache.james.imap.decode.parser;
import org.apache.commons.logging.Log;
-import org.apache.james.imap.api.Imap4Rev1CommandFactory;
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.decode.ImapRequestLineReader;
-import org.apache.james.imap.decode.InitialisableCommandFactory;
import org.apache.james.imap.decode.ProtocolException;
import org.apache.james.imap.decode.base.AbstractImapCommandParser;
-class SelectCommandParser extends AbstractImapCommandParser implements
- InitialisableCommandFactory {
+class SelectCommandParser extends AbstractImapCommandParser {
+ private final ImapCommand select = ImapCommand
+ .authenticatedStateCommand(ImapConstants.SELECT_COMMAND_NAME);
+
public SelectCommandParser() {
- }
-
- /**
- * @see org.apache.james.imap.decode.InitialisableCommandFactory#init(org.apache.james.imap.api.Imap4Rev1CommandFactory)
- */
- public void init(Imap4Rev1CommandFactory factory) {
- final ImapCommand command = factory.getSelect();
- setCommand(command);
+ setCommand(select);
}
protected ImapMessage decode(ImapCommand command,
Modified: james/imap/trunk/decode/src/main/java/org/apache/james/imap/decode/parser/StatusCommandParser.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/decode/src/main/java/org/apache/james/imap/decode/parser/StatusCommandParser.java?rev=760562&r1=760561&r2=760562&view=diff
==============================================================================
--- james/imap/trunk/decode/src/main/java/org/apache/james/imap/decode/parser/StatusCommandParser.java (original)
+++ james/imap/trunk/decode/src/main/java/org/apache/james/imap/decode/parser/StatusCommandParser.java Tue Mar 31 18:26:15 2009
@@ -19,28 +19,21 @@
package org.apache.james.imap.decode.parser;
import org.apache.commons.logging.Log;
-import org.apache.james.imap.api.Imap4Rev1CommandFactory;
import org.apache.james.imap.api.Imap4Rev1MessageFactory;
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.StatusDataItems;
import org.apache.james.imap.decode.ImapRequestLineReader;
-import org.apache.james.imap.decode.InitialisableCommandFactory;
import org.apache.james.imap.decode.ProtocolException;
import org.apache.james.imap.decode.base.AbstractImapCommandParser;
-class StatusCommandParser extends AbstractImapCommandParser implements
- InitialisableCommandFactory {
+class StatusCommandParser extends AbstractImapCommandParser {
+
+ private final ImapCommand status = ImapCommand.authenticatedStateCommand(ImapConstants.STATUS_COMMAND_NAME);
+
public StatusCommandParser() {
- }
-
- /**
- * @see org.apache.james.imap.decode.InitialisableCommandFactory#init(org.apache.james.imap.api.Imap4Rev1CommandFactory)
- */
- public void init(Imap4Rev1CommandFactory factory) {
- final ImapCommand command = factory.getStatus();
- setCommand(command);
+ setCommand(status);
}
StatusDataItems statusDataItems(ImapRequestLineReader request)
Modified: james/imap/trunk/decode/src/main/java/org/apache/james/imap/decode/parser/StoreCommandParser.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/decode/src/main/java/org/apache/james/imap/decode/parser/StoreCommandParser.java?rev=760562&r1=760561&r2=760562&view=diff
==============================================================================
--- james/imap/trunk/decode/src/main/java/org/apache/james/imap/decode/parser/StoreCommandParser.java (original)
+++ james/imap/trunk/decode/src/main/java/org/apache/james/imap/decode/parser/StoreCommandParser.java Tue Mar 31 18:26:15 2009
@@ -21,25 +21,19 @@
import javax.mail.Flags;
import org.apache.commons.logging.Log;
-import org.apache.james.imap.api.Imap4Rev1CommandFactory;
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.decode.ImapRequestLineReader;
-import org.apache.james.imap.decode.InitialisableCommandFactory;
import org.apache.james.imap.decode.ProtocolException;
-class StoreCommandParser extends AbstractUidCommandParser implements
- InitialisableCommandFactory {
+class StoreCommandParser extends AbstractUidCommandParser {
+ private final ImapCommand store = ImapCommand
+ .selectedStateCommand(ImapConstants.STORE_COMMAND_NAME);
+
public StoreCommandParser() {
- }
-
- /**
- * @see org.apache.james.imap.decode.InitialisableCommandFactory#init(org.apache.james.imap.api.Imap4Rev1CommandFactory)
- */
- public void init(Imap4Rev1CommandFactory factory) {
- final ImapCommand command = factory.getStore();
- setCommand(command);
+ setCommand(store);
}
protected ImapMessage decode(ImapCommand command,
Modified: james/imap/trunk/decode/src/main/java/org/apache/james/imap/decode/parser/SubscribeCommandParser.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/decode/src/main/java/org/apache/james/imap/decode/parser/SubscribeCommandParser.java?rev=760562&r1=760561&r2=760562&view=diff
==============================================================================
--- james/imap/trunk/decode/src/main/java/org/apache/james/imap/decode/parser/SubscribeCommandParser.java (original)
+++ james/imap/trunk/decode/src/main/java/org/apache/james/imap/decode/parser/SubscribeCommandParser.java Tue Mar 31 18:26:15 2009
@@ -19,26 +19,20 @@
package org.apache.james.imap.decode.parser;
import org.apache.commons.logging.Log;
-import org.apache.james.imap.api.Imap4Rev1CommandFactory;
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.decode.ImapRequestLineReader;
-import org.apache.james.imap.decode.InitialisableCommandFactory;
import org.apache.james.imap.decode.ProtocolException;
import org.apache.james.imap.decode.base.AbstractImapCommandParser;
-class SubscribeCommandParser extends AbstractImapCommandParser implements
- InitialisableCommandFactory {
+class SubscribeCommandParser extends AbstractImapCommandParser {
+ private final ImapCommand subscribe = ImapCommand
+ .authenticatedStateCommand(ImapConstants.SUBSCRIBE_COMMAND_NAME);
+
public SubscribeCommandParser() {
- }
-
- /**
- * @see org.apache.james.imap.decode.InitialisableCommandFactory#init(org.apache.james.imap.api.Imap4Rev1CommandFactory)
- */
- public void init(Imap4Rev1CommandFactory factory) {
- final ImapCommand command = factory.getSubscribe();
- setCommand(command);
+ setCommand(subscribe);
}
protected ImapMessage decode(ImapCommand command,
Modified: james/imap/trunk/decode/src/main/java/org/apache/james/imap/decode/parser/UidCommandParser.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/decode/src/main/java/org/apache/james/imap/decode/parser/UidCommandParser.java?rev=760562&r1=760561&r2=760562&view=diff
==============================================================================
--- james/imap/trunk/decode/src/main/java/org/apache/james/imap/decode/parser/UidCommandParser.java (original)
+++ james/imap/trunk/decode/src/main/java/org/apache/james/imap/decode/parser/UidCommandParser.java Tue Mar 31 18:26:15 2009
@@ -19,30 +19,25 @@
package org.apache.james.imap.decode.parser;
import org.apache.commons.logging.Log;
-import org.apache.james.imap.api.Imap4Rev1CommandFactory;
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.decode.DelegatingImapCommandParser;
import org.apache.james.imap.decode.ImapCommandParser;
import org.apache.james.imap.decode.ImapCommandParserFactory;
import org.apache.james.imap.decode.ImapRequestLineReader;
-import org.apache.james.imap.decode.InitialisableCommandFactory;
import org.apache.james.imap.decode.ProtocolException;
import org.apache.james.imap.decode.base.AbstractImapCommandParser;
class UidCommandParser extends AbstractImapCommandParser implements
- DelegatingImapCommandParser, InitialisableCommandFactory {
- private ImapCommandParserFactory parserFactory;
+ DelegatingImapCommandParser {
+
+ private final ImapCommand uid = ImapCommand.selectedStateCommand(ImapConstants.UID_COMMAND_NAME);
+
+ private ImapCommandParserFactory parserFactory;
public UidCommandParser() {
- }
-
- /**
- * @see org.apache.james.imap.decode.InitialisableCommandFactory#init(org.apache.james.imap.api.Imap4Rev1CommandFactory)
- */
- public void init(Imap4Rev1CommandFactory factory) {
- final ImapCommand command = factory.getUid();
- setCommand(command);
+ setCommand(uid);
}
/**
Modified: james/imap/trunk/decode/src/main/java/org/apache/james/imap/decode/parser/UnsubscribeCommandParser.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/decode/src/main/java/org/apache/james/imap/decode/parser/UnsubscribeCommandParser.java?rev=760562&r1=760561&r2=760562&view=diff
==============================================================================
--- james/imap/trunk/decode/src/main/java/org/apache/james/imap/decode/parser/UnsubscribeCommandParser.java (original)
+++ james/imap/trunk/decode/src/main/java/org/apache/james/imap/decode/parser/UnsubscribeCommandParser.java Tue Mar 31 18:26:15 2009
@@ -19,26 +19,20 @@
package org.apache.james.imap.decode.parser;
import org.apache.commons.logging.Log;
-import org.apache.james.imap.api.Imap4Rev1CommandFactory;
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.decode.ImapRequestLineReader;
-import org.apache.james.imap.decode.InitialisableCommandFactory;
import org.apache.james.imap.decode.ProtocolException;
import org.apache.james.imap.decode.base.AbstractImapCommandParser;
-class UnsubscribeCommandParser extends AbstractImapCommandParser implements
- InitialisableCommandFactory {
+class UnsubscribeCommandParser extends AbstractImapCommandParser {
+
+ private final ImapCommand unsubscribe = ImapCommand
+ .authenticatedStateCommand(ImapConstants.UNSUBSCRIBE_COMMAND_NAME);
public UnsubscribeCommandParser() {
- }
-
- /**
- * @see org.apache.james.imap.decode.InitialisableCommandFactory#init(org.apache.james.imap.api.Imap4Rev1CommandFactory)
- */
- public void init(Imap4Rev1CommandFactory factory) {
- final ImapCommand command = factory.getUnsubscribe();
- setCommand(command);
+ setCommand(unsubscribe);
}
protected ImapMessage decode(ImapCommand command,
Modified: james/imap/trunk/decode/src/test/java/org/apache/james/imap/decode/parser/FetchCommandParserPartialFetchTest.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/decode/src/test/java/org/apache/james/imap/decode/parser/FetchCommandParserPartialFetchTest.java?rev=760562&r1=760561&r2=760562&view=diff
==============================================================================
--- james/imap/trunk/decode/src/test/java/org/apache/james/imap/decode/parser/FetchCommandParserPartialFetchTest.java (original)
+++ james/imap/trunk/decode/src/test/java/org/apache/james/imap/decode/parser/FetchCommandParserPartialFetchTest.java Tue Mar 31 18:26:15 2009
@@ -22,7 +22,6 @@
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
-import org.apache.james.imap.api.Imap4Rev1CommandFactory;
import org.apache.james.imap.api.Imap4Rev1MessageFactory;
import org.apache.james.imap.api.ImapCommand;
import org.apache.james.imap.api.ImapMessage;
@@ -39,8 +38,6 @@
FetchCommandParser parser;
- Imap4Rev1CommandFactory mockCommandFactory;
-
Imap4Rev1MessageFactory mockMessageFactory;
ImapCommand command;
@@ -49,14 +46,9 @@
protected void setUp() throws Exception {
super.setUp();
parser = new FetchCommandParser();
- mockCommandFactory = mock(Imap4Rev1CommandFactory.class);
- checking(new Expectations() {{
- oneOf (mockCommandFactory).getFetch();
- }});
mockMessageFactory = mock(Imap4Rev1MessageFactory.class);
command = ImapCommand.anyStateCommand("Command");
message = mock(ImapMessage.class);
- parser.init(mockCommandFactory);
parser.setMessageFactory(mockMessageFactory);
}
Modified: james/imap/trunk/decode/src/test/java/org/apache/james/imap/decode/parser/SearchCommandParserAndParenthesesTest.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/decode/src/test/java/org/apache/james/imap/decode/parser/SearchCommandParserAndParenthesesTest.java?rev=760562&r1=760561&r2=760562&view=diff
==============================================================================
--- james/imap/trunk/decode/src/test/java/org/apache/james/imap/decode/parser/SearchCommandParserAndParenthesesTest.java (original)
+++ james/imap/trunk/decode/src/test/java/org/apache/james/imap/decode/parser/SearchCommandParserAndParenthesesTest.java Tue Mar 31 18:26:15 2009
@@ -25,7 +25,6 @@
import java.util.ArrayList;
import java.util.List;
-import org.apache.james.imap.api.Imap4Rev1CommandFactory;
import org.apache.james.imap.api.Imap4Rev1MessageFactory;
import org.apache.james.imap.api.ImapCommand;
import org.apache.james.imap.api.ImapMessage;
@@ -34,8 +33,6 @@
import org.apache.james.imap.api.message.request.SearchKey;
import org.apache.james.imap.decode.ImapRequestLineReader;
import org.apache.james.imap.decode.ProtocolException;
-import org.apache.james.imap.decode.parser.SearchCommandParser;
-import org.jmock.Expectations;
import org.jmock.integration.junit3.MockObjectTestCase;
public class SearchCommandParserAndParenthesesTest extends MockObjectTestCase {
@@ -143,8 +140,6 @@
SearchCommandParser parser;
- Imap4Rev1CommandFactory mockCommandFactory;
-
Imap4Rev1MessageFactory mockMessageFactory;
ImapCommand command;
@@ -154,14 +149,9 @@
protected void setUp() throws Exception {
super.setUp();
parser = new SearchCommandParser();
- mockCommandFactory = mock(Imap4Rev1CommandFactory.class);
- checking(new Expectations() {{
- oneOf (mockCommandFactory).getSearch();
- }});
mockMessageFactory = mock(Imap4Rev1MessageFactory.class);
command = ImapCommand.anyStateCommand("Command");
message = mock(ImapMessage.class);
- parser.init(mockCommandFactory);
parser.setMessageFactory(mockMessageFactory);
}
Modified: james/imap/trunk/decode/src/test/java/org/apache/james/imap/decode/parser/SearchCommandParserCharsetTest.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/decode/src/test/java/org/apache/james/imap/decode/parser/SearchCommandParserCharsetTest.java?rev=760562&r1=760561&r2=760562&view=diff
==============================================================================
--- james/imap/trunk/decode/src/test/java/org/apache/james/imap/decode/parser/SearchCommandParserCharsetTest.java (original)
+++ james/imap/trunk/decode/src/test/java/org/apache/james/imap/decode/parser/SearchCommandParserCharsetTest.java Tue Mar 31 18:26:15 2009
@@ -27,7 +27,6 @@
import java.util.Iterator;
import java.util.Set;
-import org.apache.james.imap.api.Imap4Rev1CommandFactory;
import org.apache.james.imap.api.Imap4Rev1MessageFactory;
import org.apache.james.imap.api.ImapCommand;
import org.apache.james.imap.api.ImapMessage;
@@ -36,7 +35,6 @@
import org.apache.james.imap.api.message.response.StatusResponse;
import org.apache.james.imap.api.message.response.StatusResponseFactory;
import org.apache.james.imap.decode.ImapRequestLineReader;
-import org.apache.james.imap.decode.parser.SearchCommandParser;
import org.jmock.Expectations;
import org.jmock.integration.junit3.MockObjectTestCase;
@@ -66,7 +64,6 @@
StatusResponseFactory mockStatusResponseFactory;
- Imap4Rev1CommandFactory mockCommandFactory;
Imap4Rev1MessageFactory mockMessageFactory;
@@ -77,15 +74,10 @@
protected void setUp() throws Exception {
super.setUp();
parser = new SearchCommandParser();
- mockCommandFactory = mock(Imap4Rev1CommandFactory.class);
- checking(new Expectations() {{
- oneOf (mockCommandFactory).getSearch();
- }});
mockMessageFactory = mock(Imap4Rev1MessageFactory.class);
command = ImapCommand.anyStateCommand("Command");
message = mock(ImapMessage.class);
mockStatusResponseFactory = mock(StatusResponseFactory.class);
- parser.init(mockCommandFactory);
parser.setMessageFactory(mockMessageFactory);
parser.setStatusResponseFactory(mockStatusResponseFactory);
}
Modified: james/imap/trunk/decode/src/test/java/org/apache/james/imap/decode/parser/SearchCommandParserNotTest.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/decode/src/test/java/org/apache/james/imap/decode/parser/SearchCommandParserNotTest.java?rev=760562&r1=760561&r2=760562&view=diff
==============================================================================
--- james/imap/trunk/decode/src/test/java/org/apache/james/imap/decode/parser/SearchCommandParserNotTest.java (original)
+++ james/imap/trunk/decode/src/test/java/org/apache/james/imap/decode/parser/SearchCommandParserNotTest.java Tue Mar 31 18:26:15 2009
@@ -22,7 +22,6 @@
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
-import org.apache.james.imap.api.Imap4Rev1CommandFactory;
import org.apache.james.imap.api.Imap4Rev1MessageFactory;
import org.apache.james.imap.api.ImapCommand;
import org.apache.james.imap.api.ImapMessage;
@@ -30,16 +29,12 @@
import org.apache.james.imap.api.message.request.DayMonthYear;
import org.apache.james.imap.api.message.request.SearchKey;
import org.apache.james.imap.decode.ImapRequestLineReader;
-import org.apache.james.imap.decode.parser.SearchCommandParser;
-import org.jmock.Expectations;
import org.jmock.integration.junit3.MockObjectTestCase;
public class SearchCommandParserNotTest extends MockObjectTestCase {
SearchCommandParser parser;
- Imap4Rev1CommandFactory mockCommandFactory;
-
Imap4Rev1MessageFactory mockMessageFactory;
ImapCommand command;
@@ -48,14 +43,9 @@
protected void setUp() throws Exception {
super.setUp();
parser = new SearchCommandParser();
- mockCommandFactory = mock(Imap4Rev1CommandFactory.class);
- checking(new Expectations() {{
- oneOf (mockCommandFactory).getSearch();
- }});
mockMessageFactory = mock(Imap4Rev1MessageFactory.class);
command = ImapCommand.anyStateCommand("Command");
message = mock(ImapMessage.class);
- parser.init(mockCommandFactory);
parser.setMessageFactory(mockMessageFactory);
}
Modified: james/imap/trunk/decode/src/test/java/org/apache/james/imap/decode/parser/SearchCommandParserOrTest.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/decode/src/test/java/org/apache/james/imap/decode/parser/SearchCommandParserOrTest.java?rev=760562&r1=760561&r2=760562&view=diff
==============================================================================
--- james/imap/trunk/decode/src/test/java/org/apache/james/imap/decode/parser/SearchCommandParserOrTest.java (original)
+++ james/imap/trunk/decode/src/test/java/org/apache/james/imap/decode/parser/SearchCommandParserOrTest.java Tue Mar 31 18:26:15 2009
@@ -22,7 +22,6 @@
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
-import org.apache.james.imap.api.Imap4Rev1CommandFactory;
import org.apache.james.imap.api.Imap4Rev1MessageFactory;
import org.apache.james.imap.api.ImapCommand;
import org.apache.james.imap.api.ImapMessage;
@@ -30,15 +29,11 @@
import org.apache.james.imap.api.message.request.DayMonthYear;
import org.apache.james.imap.api.message.request.SearchKey;
import org.apache.james.imap.decode.ImapRequestLineReader;
-import org.apache.james.imap.decode.parser.SearchCommandParser;
-import org.jmock.Expectations;
import org.jmock.integration.junit3.MockObjectTestCase;
public class SearchCommandParserOrTest extends MockObjectTestCase {
SearchCommandParser parser;
- Imap4Rev1CommandFactory mockCommandFactory;
-
Imap4Rev1MessageFactory mockMessageFactory;
ImapCommand command;
@@ -48,14 +43,9 @@
protected void setUp() throws Exception {
super.setUp();
parser = new SearchCommandParser();
- mockCommandFactory = mock(Imap4Rev1CommandFactory.class);
- checking(new Expectations() {{
- oneOf (mockCommandFactory).getSearch();
- }});
mockMessageFactory = mock(Imap4Rev1MessageFactory.class);
command = ImapCommand.anyStateCommand("Command");
message = mock(ImapMessage.class);
- parser.init(mockCommandFactory);
parser.setMessageFactory(mockMessageFactory);
}
Modified: james/imap/trunk/decode/src/test/java/org/apache/james/imap/decode/parser/SearchCommandParserQuotedCharsetTest.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/decode/src/test/java/org/apache/james/imap/decode/parser/SearchCommandParserQuotedCharsetTest.java?rev=760562&r1=760561&r2=760562&view=diff
==============================================================================
--- james/imap/trunk/decode/src/test/java/org/apache/james/imap/decode/parser/SearchCommandParserQuotedCharsetTest.java (original)
+++ james/imap/trunk/decode/src/test/java/org/apache/james/imap/decode/parser/SearchCommandParserQuotedCharsetTest.java Tue Mar 31 18:26:15 2009
@@ -27,7 +27,6 @@
import java.util.Iterator;
import java.util.Set;
-import org.apache.james.imap.api.Imap4Rev1CommandFactory;
import org.apache.james.imap.api.Imap4Rev1MessageFactory;
import org.apache.james.imap.api.ImapCommand;
import org.apache.james.imap.api.ImapMessage;
@@ -37,7 +36,6 @@
import org.apache.james.imap.api.message.response.StatusResponseFactory;
import org.apache.james.imap.decode.ImapRequestLineReader;
import org.apache.james.imap.decode.ProtocolException;
-import org.apache.james.imap.decode.parser.SearchCommandParser;
import org.jmock.Expectations;
import org.jmock.integration.junit3.MockObjectTestCase;
@@ -130,8 +128,6 @@
StatusResponseFactory mockStatusResponseFactory;
- Imap4Rev1CommandFactory mockCommandFactory;
-
Imap4Rev1MessageFactory mockMessageFactory;
ImapCommand command;
@@ -141,15 +137,10 @@
protected void setUp() throws Exception {
super.setUp();
parser = new SearchCommandParser();
- mockCommandFactory = mock(Imap4Rev1CommandFactory.class);
- checking(new Expectations() {{
- oneOf (mockCommandFactory).getSearch();
- }});
mockMessageFactory = mock(Imap4Rev1MessageFactory.class);
command = ImapCommand.anyStateCommand("Command");
message = mock(ImapMessage.class);
mockStatusResponseFactory = mock(StatusResponseFactory.class);
- parser.init(mockCommandFactory);
parser.setMessageFactory(mockMessageFactory);
parser.setStatusResponseFactory(mockStatusResponseFactory);
}
Modified: james/imap/trunk/decode/src/test/java/org/apache/james/imap/decode/parser/SearchCommandParserSearchKeySequenceSetTest.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/decode/src/test/java/org/apache/james/imap/decode/parser/SearchCommandParserSearchKeySequenceSetTest.java?rev=760562&r1=760561&r2=760562&view=diff
==============================================================================
--- james/imap/trunk/decode/src/test/java/org/apache/james/imap/decode/parser/SearchCommandParserSearchKeySequenceSetTest.java (original)
+++ james/imap/trunk/decode/src/test/java/org/apache/james/imap/decode/parser/SearchCommandParserSearchKeySequenceSetTest.java Tue Mar 31 18:26:15 2009
@@ -22,23 +22,18 @@
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
-import org.apache.james.imap.api.Imap4Rev1CommandFactory;
import org.apache.james.imap.api.Imap4Rev1MessageFactory;
import org.apache.james.imap.api.ImapCommand;
import org.apache.james.imap.api.ImapMessage;
import org.apache.james.imap.api.message.IdRange;
import org.apache.james.imap.api.message.request.SearchKey;
import org.apache.james.imap.decode.ImapRequestLineReader;
-import org.apache.james.imap.decode.parser.SearchCommandParser;
-import org.jmock.Expectations;
import org.jmock.integration.junit3.MockObjectTestCase;
public class SearchCommandParserSearchKeySequenceSetTest extends MockObjectTestCase {
SearchCommandParser parser;
- Imap4Rev1CommandFactory mockCommandFactory;
-
Imap4Rev1MessageFactory mockMessageFactory;
ImapCommand command;
@@ -48,14 +43,9 @@
protected void setUp() throws Exception {
super.setUp();
parser = new SearchCommandParser();
- mockCommandFactory = mock(Imap4Rev1CommandFactory.class);
- checking(new Expectations() {{
- oneOf (mockCommandFactory).getSearch();
- }});
mockMessageFactory = mock(Imap4Rev1MessageFactory.class);
command = ImapCommand.anyStateCommand("Command");
message = mock(ImapMessage.class);
- parser.init(mockCommandFactory);
parser.setMessageFactory(mockMessageFactory);
}
Modified: james/imap/trunk/decode/src/test/java/org/apache/james/imap/decode/parser/SearchCommandParserSearchKeyTest.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/decode/src/test/java/org/apache/james/imap/decode/parser/SearchCommandParserSearchKeyTest.java?rev=760562&r1=760561&r2=760562&view=diff
==============================================================================
--- james/imap/trunk/decode/src/test/java/org/apache/james/imap/decode/parser/SearchCommandParserSearchKeyTest.java (original)
+++ james/imap/trunk/decode/src/test/java/org/apache/james/imap/decode/parser/SearchCommandParserSearchKeyTest.java Tue Mar 31 18:26:15 2009
@@ -22,7 +22,6 @@
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
-import org.apache.james.imap.api.Imap4Rev1CommandFactory;
import org.apache.james.imap.api.Imap4Rev1MessageFactory;
import org.apache.james.imap.api.ImapCommand;
import org.apache.james.imap.api.ImapMessage;
@@ -31,8 +30,6 @@
import org.apache.james.imap.api.message.request.SearchKey;
import org.apache.james.imap.decode.ImapRequestLineReader;
import org.apache.james.imap.decode.ProtocolException;
-import org.apache.james.imap.decode.parser.SearchCommandParser;
-import org.jmock.Expectations;
import org.jmock.integration.junit3.MockObjectTestCase;
public class SearchCommandParserSearchKeyTest extends MockObjectTestCase {
@@ -41,8 +38,6 @@
SearchCommandParser parser;
- Imap4Rev1CommandFactory mockCommandFactory;
-
Imap4Rev1MessageFactory mockMessageFactory;
ImapCommand command;
@@ -52,14 +47,9 @@
protected void setUp() throws Exception {
super.setUp();
parser = new SearchCommandParser();
- mockCommandFactory = mock(Imap4Rev1CommandFactory.class);
- checking(new Expectations() {{
- oneOf (mockCommandFactory).getSearch();
- }});
mockMessageFactory = mock(Imap4Rev1MessageFactory.class);
command = ImapCommand.anyStateCommand("Command");
message = mock(ImapMessage.class);
- parser.init(mockCommandFactory);
parser.setMessageFactory(mockMessageFactory);
}
Modified: james/imap/trunk/decode/src/test/java/org/apache/james/imap/decode/parser/SearchCommandParserTopLevelAndTest.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/decode/src/test/java/org/apache/james/imap/decode/parser/SearchCommandParserTopLevelAndTest.java?rev=760562&r1=760561&r2=760562&view=diff
==============================================================================
--- james/imap/trunk/decode/src/test/java/org/apache/james/imap/decode/parser/SearchCommandParserTopLevelAndTest.java (original)
+++ james/imap/trunk/decode/src/test/java/org/apache/james/imap/decode/parser/SearchCommandParserTopLevelAndTest.java Tue Mar 31 18:26:15 2009
@@ -25,7 +25,6 @@
import java.util.ArrayList;
import java.util.List;
-import org.apache.james.imap.api.Imap4Rev1CommandFactory;
import org.apache.james.imap.api.Imap4Rev1MessageFactory;
import org.apache.james.imap.api.ImapCommand;
import org.apache.james.imap.api.ImapMessage;
@@ -34,8 +33,6 @@
import org.apache.james.imap.api.message.request.SearchKey;
import org.apache.james.imap.decode.ImapRequestLineReader;
import org.apache.james.imap.decode.ProtocolException;
-import org.apache.james.imap.decode.parser.SearchCommandParser;
-import org.jmock.Expectations;
import org.jmock.integration.junit3.MockObjectTestCase;
public class SearchCommandParserTopLevelAndTest extends MockObjectTestCase {
@@ -128,8 +125,6 @@
SearchCommandParser parser;
- Imap4Rev1CommandFactory mockCommandFactory;
-
Imap4Rev1MessageFactory mockMessageFactory;
ImapCommand command;
@@ -139,14 +134,9 @@
protected void setUp() throws Exception {
super.setUp();
parser = new SearchCommandParser();
- mockCommandFactory = mock(Imap4Rev1CommandFactory.class);
- checking(new Expectations() {{
- oneOf (mockCommandFactory).getSearch();
- }});
mockMessageFactory = mock(Imap4Rev1MessageFactory.class);
command = ImapCommand.anyStateCommand("Command");
message = mock(ImapMessage.class);
- parser.init(mockCommandFactory);
parser.setMessageFactory(mockMessageFactory);
}
Modified: james/imap/trunk/decode/src/test/java/org/apache/james/imap/decode/parser/StoreCommandParserTest.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/decode/src/test/java/org/apache/james/imap/decode/parser/StoreCommandParserTest.java?rev=760562&r1=760561&r2=760562&view=diff
==============================================================================
--- james/imap/trunk/decode/src/test/java/org/apache/james/imap/decode/parser/StoreCommandParserTest.java (original)
+++ james/imap/trunk/decode/src/test/java/org/apache/james/imap/decode/parser/StoreCommandParserTest.java Tue Mar 31 18:26:15 2009
@@ -24,13 +24,11 @@
import javax.mail.Flags;
-import org.apache.james.imap.api.Imap4Rev1CommandFactory;
import org.apache.james.imap.api.Imap4Rev1MessageFactory;
import org.apache.james.imap.api.ImapCommand;
import org.apache.james.imap.api.ImapMessage;
import org.apache.james.imap.api.message.IdRange;
import org.apache.james.imap.decode.ImapRequestLineReader;
-import org.apache.james.imap.decode.parser.StoreCommandParser;
import org.jmock.Expectations;
import org.jmock.integration.junit3.MockObjectTestCase;
@@ -38,7 +36,6 @@
StoreCommandParser parser;
- Imap4Rev1CommandFactory mockCommandFactory;
Imap4Rev1MessageFactory mockMessageFactory;
@@ -49,14 +46,9 @@
protected void setUp() throws Exception {
super.setUp();
parser = new StoreCommandParser();
- mockCommandFactory = mock(Imap4Rev1CommandFactory.class);
- checking(new Expectations() {{
- oneOf (mockCommandFactory).getStore();
- }});
mockMessageFactory = mock(Imap4Rev1MessageFactory.class);
command = ImapCommand.anyStateCommand("Command");
message = mock(ImapMessage.class);
- parser.init(mockCommandFactory);
parser.setMessageFactory(mockMessageFactory);
}
Modified: james/imap/trunk/seda/src/main/java/org/apache/james/imap/main/DefaultImapDecoderFactory.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/seda/src/main/java/org/apache/james/imap/main/DefaultImapDecoderFactory.java?rev=760562&r1=760561&r2=760562&view=diff
==============================================================================
--- james/imap/trunk/seda/src/main/java/org/apache/james/imap/main/DefaultImapDecoderFactory.java (original)
+++ james/imap/trunk/seda/src/main/java/org/apache/james/imap/main/DefaultImapDecoderFactory.java Tue Mar 31 18:26:15 2009
@@ -19,9 +19,7 @@
package org.apache.james.imap.main;
-import org.apache.james.imap.api.Imap4Rev1CommandFactory;
import org.apache.james.imap.api.Imap4Rev1MessageFactory;
-import org.apache.james.imap.command.imap4rev1.StandardImap4Rev1CommandFactory;
import org.apache.james.imap.decode.ImapCommandParserFactory;
import org.apache.james.imap.decode.ImapDecoder;
import org.apache.james.imap.decode.ImapDecoderFactory;
@@ -40,9 +38,8 @@
final UnpooledStatusResponseFactory unpooledStatusResponseFactory = new UnpooledStatusResponseFactory();
final Imap4Rev1MessageFactory messageFactory = new BaseImap4Rev1MessageFactory(
unpooledStatusResponseFactory);
- final Imap4Rev1CommandFactory commandFactory = new StandardImap4Rev1CommandFactory();
final ImapCommandParserFactory imapCommands = new Imap4Rev1CommandParserFactory(
- messageFactory, commandFactory, unpooledStatusResponseFactory);
+ messageFactory, unpooledStatusResponseFactory);
final ImapDecoder result = new DefaultImapDecoder(messageFactory,
imapCommands);
return result;
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org