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 no...@apache.org on 2011/01/12 19:33:03 UTC
svn commit: r1058267 - in /james/imap/trunk:
api/src/main/java/org/apache/james/imap/api/
message/src/main/java/org/apache/james/imap/decode/
message/src/main/java/org/apache/james/imap/decode/base/
message/src/main/java/org/apache/james/imap/decode/ma...
Author: norman
Date: Wed Jan 12 18:33:00 2011
New Revision: 1058267
URL: http://svn.apache.org/viewvc?rev=1058267&view=rev
Log:
Remove ImapMessageFactory and its implementations. It just add complexity without any gain. See IMAP-243
Removed:
james/imap/trunk/api/src/main/java/org/apache/james/imap/api/ImapMessageFactory.java
james/imap/trunk/message/src/main/java/org/apache/james/imap/message/request/BaseImap4Rev1MessageFactory.java
Modified:
james/imap/trunk/message/src/main/java/org/apache/james/imap/decode/MessagingImapCommandParser.java
james/imap/trunk/message/src/main/java/org/apache/james/imap/decode/base/AbstractImapCommandParser.java
james/imap/trunk/message/src/main/java/org/apache/james/imap/decode/main/DefaultImapDecoder.java
james/imap/trunk/message/src/main/java/org/apache/james/imap/decode/parser/AppendCommandParser.java
james/imap/trunk/message/src/main/java/org/apache/james/imap/decode/parser/AuthenticateCommandParser.java
james/imap/trunk/message/src/main/java/org/apache/james/imap/decode/parser/CapabilityCommandParser.java
james/imap/trunk/message/src/main/java/org/apache/james/imap/decode/parser/CheckCommandParser.java
james/imap/trunk/message/src/main/java/org/apache/james/imap/decode/parser/CloseCommandParser.java
james/imap/trunk/message/src/main/java/org/apache/james/imap/decode/parser/CopyCommandParser.java
james/imap/trunk/message/src/main/java/org/apache/james/imap/decode/parser/CreateCommandParser.java
james/imap/trunk/message/src/main/java/org/apache/james/imap/decode/parser/DeleteCommandParser.java
james/imap/trunk/message/src/main/java/org/apache/james/imap/decode/parser/ExamineCommandParser.java
james/imap/trunk/message/src/main/java/org/apache/james/imap/decode/parser/ExpungeCommandParser.java
james/imap/trunk/message/src/main/java/org/apache/james/imap/decode/parser/FetchCommandParser.java
james/imap/trunk/message/src/main/java/org/apache/james/imap/decode/parser/IdleCommandParser.java
james/imap/trunk/message/src/main/java/org/apache/james/imap/decode/parser/ImapParserFactory.java
james/imap/trunk/message/src/main/java/org/apache/james/imap/decode/parser/ListCommandParser.java
james/imap/trunk/message/src/main/java/org/apache/james/imap/decode/parser/LoginCommandParser.java
james/imap/trunk/message/src/main/java/org/apache/james/imap/decode/parser/LogoutCommandParser.java
james/imap/trunk/message/src/main/java/org/apache/james/imap/decode/parser/LsubCommandParser.java
james/imap/trunk/message/src/main/java/org/apache/james/imap/decode/parser/NamespaceCommandParser.java
james/imap/trunk/message/src/main/java/org/apache/james/imap/decode/parser/NoopCommandParser.java
james/imap/trunk/message/src/main/java/org/apache/james/imap/decode/parser/RenameCommandParser.java
james/imap/trunk/message/src/main/java/org/apache/james/imap/decode/parser/SearchCommandParser.java
james/imap/trunk/message/src/main/java/org/apache/james/imap/decode/parser/SelectCommandParser.java
james/imap/trunk/message/src/main/java/org/apache/james/imap/decode/parser/StartTLSCommandParser.java
james/imap/trunk/message/src/main/java/org/apache/james/imap/decode/parser/StatusCommandParser.java
james/imap/trunk/message/src/main/java/org/apache/james/imap/decode/parser/StoreCommandParser.java
james/imap/trunk/message/src/main/java/org/apache/james/imap/decode/parser/SubscribeCommandParser.java
james/imap/trunk/message/src/main/java/org/apache/james/imap/decode/parser/UnsubscribeCommandParser.java
james/imap/trunk/message/src/main/java/org/apache/james/imap/main/DefaultImapDecoderFactory.java
james/imap/trunk/message/src/test/java/org/apache/james/imap/decode/parser/FetchCommandParserPartialFetchTest.java
james/imap/trunk/message/src/test/java/org/apache/james/imap/decode/parser/SearchCommandParserAndParenthesesTest.java
james/imap/trunk/message/src/test/java/org/apache/james/imap/decode/parser/SearchCommandParserCharsetTest.java
james/imap/trunk/message/src/test/java/org/apache/james/imap/decode/parser/SearchCommandParserNotTest.java
james/imap/trunk/message/src/test/java/org/apache/james/imap/decode/parser/SearchCommandParserOrTest.java
james/imap/trunk/message/src/test/java/org/apache/james/imap/decode/parser/SearchCommandParserQuotedCharsetTest.java
james/imap/trunk/message/src/test/java/org/apache/james/imap/decode/parser/SearchCommandParserSearchKeySequenceSetTest.java
james/imap/trunk/message/src/test/java/org/apache/james/imap/decode/parser/SearchCommandParserSearchKeyTest.java
james/imap/trunk/message/src/test/java/org/apache/james/imap/decode/parser/SearchCommandParserTopLevelAndTest.java
james/imap/trunk/message/src/test/java/org/apache/james/imap/decode/parser/StoreCommandParserTest.java
Modified: james/imap/trunk/message/src/main/java/org/apache/james/imap/decode/MessagingImapCommandParser.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/message/src/main/java/org/apache/james/imap/decode/MessagingImapCommandParser.java?rev=1058267&r1=1058266&r2=1058267&view=diff
==============================================================================
--- james/imap/trunk/message/src/main/java/org/apache/james/imap/decode/MessagingImapCommandParser.java (original)
+++ james/imap/trunk/message/src/main/java/org/apache/james/imap/decode/MessagingImapCommandParser.java Wed Jan 12 18:33:00 2011
@@ -18,16 +18,11 @@
****************************************************************/
package org.apache.james.imap.decode;
-import org.apache.james.imap.api.ImapMessageFactory;
import org.apache.james.imap.api.message.response.StatusResponseFactory;
public interface MessagingImapCommandParser {
- public abstract ImapMessageFactory getMessageFactory();
-
- public abstract void setMessageFactory(
- ImapMessageFactory messageFactory);
-
+
public abstract StatusResponseFactory getStatusResponseFactory();
public abstract void setStatusResponseFactory(
Modified: james/imap/trunk/message/src/main/java/org/apache/james/imap/decode/base/AbstractImapCommandParser.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/message/src/main/java/org/apache/james/imap/decode/base/AbstractImapCommandParser.java?rev=1058267&r1=1058266&r2=1058267&view=diff
==============================================================================
--- james/imap/trunk/message/src/main/java/org/apache/james/imap/decode/base/AbstractImapCommandParser.java (original)
+++ james/imap/trunk/message/src/main/java/org/apache/james/imap/decode/base/AbstractImapCommandParser.java Wed Jan 12 18:33:00 2011
@@ -38,7 +38,6 @@ import java.util.List;
import javax.mail.Flags;
import org.apache.commons.io.IOUtils;
-import org.apache.james.imap.api.ImapMessageFactory;
import org.apache.james.imap.api.ImapCommand;
import org.apache.james.imap.api.ImapConstants;
import org.apache.james.imap.api.ImapMessage;
@@ -67,8 +66,6 @@ public abstract class AbstractImapComman
private final ImapCommand command;
- private ImapMessageFactory messageFactory;
-
private StatusResponseFactory statusResponseFactory;
public AbstractImapCommandParser(final ImapCommand command) {
@@ -81,20 +78,6 @@ public abstract class AbstractImapComman
}
- /**
- * @see org.apache.james.imap.decode.MessagingImapCommandParser#getMessageFactory()
- */
- public ImapMessageFactory getMessageFactory() {
- return messageFactory;
- }
-
- /**
- * @see org.apache.james.imap.decode.MessagingImapCommandParser#setMessageFactory(org.apache.james.imap.api.ImapMessageFactory)
- */
- public void setMessageFactory(ImapMessageFactory messageFactory) {
- this.messageFactory = messageFactory;
- }
-
public final StatusResponseFactory getStatusResponseFactory() {
return statusResponseFactory;
}
@@ -122,7 +105,7 @@ public abstract class AbstractImapComman
result = decode(command, request, tag, session);
} catch (DecodingException e) {
session.getLog().debug("Cannot parse protocol ", e);
- result = messageFactory.taggedBad(tag, command, e.getKey());
+ result = statusResponseFactory.taggedBad(tag, command, e.getKey());
}
}
return result;
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=1058267&r1=1058266&r2=1058267&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 Wed Jan 12 18:33:00 2011
@@ -19,10 +19,10 @@
package org.apache.james.imap.decode.main;
import org.apache.commons.logging.Log;
-import org.apache.james.imap.api.ImapMessageFactory;
import org.apache.james.imap.api.ImapMessage;
import org.apache.james.imap.api.ImapSessionState;
import org.apache.james.imap.api.display.HumanReadableText;
+import org.apache.james.imap.api.message.response.StatusResponseFactory;
import org.apache.james.imap.api.process.ImapSession;
import org.apache.james.imap.decode.ImapCommandParser;
import org.apache.james.imap.decode.ImapCommandParserFactory;
@@ -38,13 +38,13 @@ import org.apache.james.imap.decode.base
*/
public class DefaultImapDecoder implements ImapDecoder {
- private final ImapMessageFactory messageFactory;
+ private final StatusResponseFactory responseFactory;
private final ImapCommandParserFactory imapCommands;
- public DefaultImapDecoder(final ImapMessageFactory messageFactory,
+ public DefaultImapDecoder(final StatusResponseFactory responseFactory,
final ImapCommandParserFactory imapCommands) {
- this.messageFactory = messageFactory;
+ this.responseFactory = responseFactory;
this.imapCommands = imapCommands;
}
@@ -65,7 +65,7 @@ public class DefaultImapDecoder implemen
// When the tag cannot be read, there is something seriously wrong.
// It is probably not possible to recover
// and (since this may indicate an attack) wiser not to try
- message = messageFactory.bye(HumanReadableText.ILLEGAL_TAG);
+ message = responseFactory.bye(HumanReadableText.ILLEGAL_TAG);
session.logout();
}
return message;
@@ -94,11 +94,11 @@ public class DefaultImapDecoder implemen
final ImapSession session) {
ImapMessage message;
if (session.getState() == ImapSessionState.NON_AUTHENTICATED) {
- message = messageFactory
+ message = responseFactory
.bye(HumanReadableText.BYE_UNKNOWN_COMMAND);
session.logout();
} else {
- message = messageFactory.taggedBad(tag, null,
+ message = responseFactory.taggedBad(tag, null,
HumanReadableText.UNKNOWN_COMMAND);
}
return message;
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=1058267&r1=1058266&r2=1058267&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 Wed Jan 12 18:33:00 2011
@@ -22,7 +22,6 @@ import java.util.Date;
import javax.mail.Flags;
-import org.apache.james.imap.api.ImapMessageFactory;
import org.apache.james.imap.api.ImapCommand;
import org.apache.james.imap.api.ImapConstants;
import org.apache.james.imap.api.ImapMessage;
@@ -31,6 +30,7 @@ import org.apache.james.imap.decode.Imap
import org.apache.james.imap.decode.DecodingException;
import org.apache.james.imap.decode.base.AbstractImapCommandParser;
import org.apache.james.imap.decode.base.EolInputStream;
+import org.apache.james.imap.message.request.AppendRequest;
/**
* Parses APPEND command
@@ -91,8 +91,7 @@ public class AppendCommandParser extends
// Use a EolInputStream so it will call eol when the message was read
final EolInputStream message = new EolInputStream(request, consumeLiteral(request));
- final ImapMessageFactory factory = getMessageFactory();
- final ImapMessage result = factory.createAppendMessage(command,
+ final ImapMessage result = new AppendRequest(command,
mailboxName, flags, datetime, message, 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=1058267&r1=1058266&r2=1058267&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 Wed Jan 12 18:33:00 2011
@@ -18,7 +18,6 @@
****************************************************************/
package org.apache.james.imap.decode.parser;
-import org.apache.james.imap.api.ImapMessageFactory;
import org.apache.james.imap.api.ImapCommand;
import org.apache.james.imap.api.ImapConstants;
import org.apache.james.imap.api.ImapMessage;
@@ -26,6 +25,7 @@ import org.apache.james.imap.api.process
import org.apache.james.imap.decode.ImapRequestLineReader;
import org.apache.james.imap.decode.DecodingException;
import org.apache.james.imap.decode.base.AbstractImapCommandParser;
+import org.apache.james.imap.message.request.AuthenticateRequest;
/**
*
@@ -47,8 +47,7 @@ public class AuthenticateCommandParser e
ImapRequestLineReader request, String tag, ImapSession session) throws DecodingException {
String authType = astring(request);
endLine(request);
- final ImapMessageFactory factory = getMessageFactory();
- final ImapMessage result = factory.createAuthenticateMessage(command,
+ 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=1058267&r1=1058266&r2=1058267&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 Wed Jan 12 18:33:00 2011
@@ -18,7 +18,6 @@
****************************************************************/
package org.apache.james.imap.decode.parser;
-import org.apache.james.imap.api.ImapMessageFactory;
import org.apache.james.imap.api.ImapCommand;
import org.apache.james.imap.api.ImapConstants;
import org.apache.james.imap.api.ImapMessage;
@@ -26,6 +25,7 @@ import org.apache.james.imap.api.process
import org.apache.james.imap.decode.ImapRequestLineReader;
import org.apache.james.imap.decode.DecodingException;
import org.apache.james.imap.decode.base.AbstractImapCommandParser;
+import org.apache.james.imap.message.request.CapabilityRequest;
/**
* Parses CAPABILITY commands
@@ -45,9 +45,7 @@ public class CapabilityCommandParser ext
protected ImapMessage decode(ImapCommand command,
ImapRequestLineReader request, String tag, ImapSession session) throws DecodingException {
endLine(request);
- final ImapMessageFactory factory = getMessageFactory();
- final ImapMessage result = factory
- .createCapabilityMessage(command, tag);
+ 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=1058267&r1=1058266&r2=1058267&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 Wed Jan 12 18:33:00 2011
@@ -25,6 +25,7 @@ import org.apache.james.imap.api.process
import org.apache.james.imap.decode.ImapRequestLineReader;
import org.apache.james.imap.decode.DecodingException;
import org.apache.james.imap.decode.base.AbstractImapCommandParser;
+import org.apache.james.imap.message.request.CheckRequest;
/**
* Parses CHECK commands
@@ -44,8 +45,7 @@ public class CheckCommandParser extends
protected ImapMessage decode(ImapCommand command,
ImapRequestLineReader request, String tag, ImapSession session) throws DecodingException {
endLine(request);
- final ImapMessage result = getMessageFactory().createCheckMessage(
- command, tag);
+ 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=1058267&r1=1058266&r2=1058267&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 Wed Jan 12 18:33:00 2011
@@ -18,7 +18,6 @@
****************************************************************/
package org.apache.james.imap.decode.parser;
-import org.apache.james.imap.api.ImapMessageFactory;
import org.apache.james.imap.api.ImapCommand;
import org.apache.james.imap.api.ImapConstants;
import org.apache.james.imap.api.ImapMessage;
@@ -26,6 +25,7 @@ import org.apache.james.imap.api.process
import org.apache.james.imap.decode.ImapRequestLineReader;
import org.apache.james.imap.decode.DecodingException;
import org.apache.james.imap.decode.base.AbstractImapCommandParser;
+import org.apache.james.imap.message.request.CloseRequest;
/**
*
@@ -45,8 +45,7 @@ class CloseCommandParser extends Abstrac
protected ImapMessage decode(ImapCommand command,
ImapRequestLineReader request, String tag, ImapSession session) throws DecodingException {
endLine(request);
- final ImapMessageFactory factory = getMessageFactory();
- final ImapMessage result = factory.createCloseMessage(command, tag);
+ final ImapMessage result = new CloseRequest(command, tag);
return result;
}
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=1058267&r1=1058266&r2=1058267&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 Wed Jan 12 18:33:00 2011
@@ -25,6 +25,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.message.request.CopyRequest;
/**
* Parse COPY commands
@@ -46,7 +47,7 @@ public class CopyCommandParser extends A
IdRange[] idSet = parseIdRange(request);
String mailboxName = mailbox(request);
endLine(request);
- final ImapMessage result = getMessageFactory().createCopyMessage(
+ 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=1058267&r1=1058266&r2=1058267&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 Wed Jan 12 18:33:00 2011
@@ -21,12 +21,12 @@ package org.apache.james.imap.decode.par
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.ImapMessageFactory;
import org.apache.james.imap.api.ImapSessionUtils;
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.base.AbstractImapCommandParser;
+import org.apache.james.imap.message.request.CreateRequest;
import org.apache.james.mailbox.MailboxSession;
/**
@@ -62,9 +62,7 @@ public class CreateCommandParser extends
}
}
endLine(request);
- final ImapMessageFactory factory = getMessageFactory();
- final ImapMessage result = factory.createCreateMessage(command,
- mailboxName, tag);
+ final ImapMessage result = new CreateRequest(command, mailboxName, tag);
return result;
}
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=1058267&r1=1058266&r2=1058267&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 Wed Jan 12 18:33:00 2011
@@ -18,7 +18,6 @@
****************************************************************/
package org.apache.james.imap.decode.parser;
-import org.apache.james.imap.api.ImapMessageFactory;
import org.apache.james.imap.api.ImapCommand;
import org.apache.james.imap.api.ImapConstants;
import org.apache.james.imap.api.ImapMessage;
@@ -26,6 +25,7 @@ import org.apache.james.imap.api.process
import org.apache.james.imap.decode.ImapRequestLineReader;
import org.apache.james.imap.decode.DecodingException;
import org.apache.james.imap.decode.base.AbstractImapCommandParser;
+import org.apache.james.imap.message.request.DeleteRequest;
/**
* Parse DELETE commands
@@ -46,8 +46,7 @@ public class DeleteCommandParser extends
ImapRequestLineReader request, String tag, ImapSession session) throws DecodingException {
String mailboxName = mailbox(request);
endLine(request);
- final ImapMessageFactory factory = getMessageFactory();
- final ImapMessage result = factory.createDeleteMessage(command,
+ 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=1058267&r1=1058266&r2=1058267&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 Wed Jan 12 18:33:00 2011
@@ -25,6 +25,7 @@ import org.apache.james.imap.api.process
import org.apache.james.imap.decode.ImapRequestLineReader;
import org.apache.james.imap.decode.DecodingException;
import org.apache.james.imap.decode.base.AbstractImapCommandParser;
+import org.apache.james.imap.message.request.ExamineRequest;
/**
* Parse EXAMINE commands
@@ -44,8 +45,7 @@ public class ExamineCommandParser extend
ImapRequestLineReader request, String tag, ImapSession session) throws DecodingException {
final String mailboxName = mailbox(request);
endLine(request);
- final ImapMessage result = getMessageFactory().createExamineMessage(
- command, mailboxName, tag);
+ final ImapMessage result = new ExamineRequest(command, mailboxName, tag);
return result;
}
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=1058267&r1=1058266&r2=1058267&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 Wed Jan 12 18:33:00 2011
@@ -18,7 +18,6 @@
****************************************************************/
package org.apache.james.imap.decode.parser;
-import org.apache.james.imap.api.ImapMessageFactory;
import org.apache.james.imap.api.ImapCommand;
import org.apache.james.imap.api.ImapConstants;
import org.apache.james.imap.api.ImapMessage;
@@ -26,6 +25,7 @@ import org.apache.james.imap.api.process
import org.apache.james.imap.decode.ImapRequestLineReader;
import org.apache.james.imap.decode.DecodingException;
import org.apache.james.imap.decode.base.AbstractImapCommandParser;
+import org.apache.james.imap.message.request.ExpungeRequest;
/**
* Parse EXPUNGE commands
@@ -45,8 +45,7 @@ public class ExpungeCommandParser extend
protected ImapMessage decode(ImapCommand command,
ImapRequestLineReader request, String tag, ImapSession session) throws DecodingException {
endLine(request);
- final ImapMessageFactory factory = getMessageFactory();
- final ImapMessage result = factory.createExpungeMessage(command, tag);
+ final ImapMessage result = new ExpungeRequest(command, tag);
return result;
}
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=1058267&r1=1058266&r2=1058267&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 Wed Jan 12 18:33:00 2011
@@ -20,7 +20,6 @@ package org.apache.james.imap.decode.par
import java.util.List;
-import org.apache.james.imap.api.ImapMessageFactory;
import org.apache.james.imap.api.ImapCommand;
import org.apache.james.imap.api.ImapConstants;
import org.apache.james.imap.api.ImapMessage;
@@ -32,6 +31,7 @@ import org.apache.james.imap.api.process
import org.apache.james.imap.decode.FetchPartPathDecoder;
import org.apache.james.imap.decode.ImapRequestLineReader;
import org.apache.james.imap.decode.DecodingException;
+import org.apache.james.imap.message.request.FetchRequest;
/**
* Parse FETCH commands
@@ -238,8 +238,7 @@ public class FetchCommandParser extends
FetchData fetch = fetchRequest(request);
endLine(request);
- final ImapMessageFactory factory = getMessageFactory();
- final ImapMessage result = factory.createFetchMessage(command, useUids,
+ 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=1058267&r1=1058266&r2=1058267&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 Wed Jan 12 18:33:00 2011
@@ -25,6 +25,7 @@ import org.apache.james.imap.api.process
import org.apache.james.imap.decode.ImapRequestLineReader;
import org.apache.james.imap.decode.DecodingException;
import org.apache.james.imap.decode.base.AbstractImapCommandParser;
+import org.apache.james.imap.message.request.IdleRequest;
/**
*
@@ -45,7 +46,7 @@ public class IdleCommandParser extends A
protected ImapMessage decode(ImapCommand command,
ImapRequestLineReader request, String tag, ImapSession session) throws DecodingException {
endLine(request);
- final ImapMessage result = getMessageFactory().createIdleMessage(command, request, tag);
+ final ImapMessage result = new IdleRequest(command, request, 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=1058267&r1=1058266&r2=1058267&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 Wed Jan 12 18:33:00 2011
@@ -22,7 +22,6 @@ package org.apache.james.imap.decode.par
import java.util.HashMap;
import java.util.Map;
-import org.apache.james.imap.api.ImapMessageFactory;
import org.apache.james.imap.api.ImapConstants;
import org.apache.james.imap.api.message.response.StatusResponseFactory;
import org.apache.james.imap.decode.DelegatingImapCommandParser;
@@ -39,15 +38,10 @@ public class ImapParserFactory implement
ImapCommandParserFactory {
private Map<String, Class<?>> _imapCommands;
- private final ImapMessageFactory messageFactory;
-
private final StatusResponseFactory statusResponseFactory;
- public ImapParserFactory(
- final ImapMessageFactory messageFactory,
- final StatusResponseFactory statusResponseFactory) {
- this.messageFactory = messageFactory;
+ public ImapParserFactory( final StatusResponseFactory statusResponseFactory) {
this.statusResponseFactory = statusResponseFactory;
_imapCommands = new HashMap<String, Class<?>>();
@@ -161,9 +155,7 @@ public class ImapParserFactory implement
if (cmd instanceof MessagingImapCommandParser) {
final MessagingImapCommandParser messagingImapCommandParser = (MessagingImapCommandParser) cmd;
- messagingImapCommandParser.setMessageFactory(messageFactory);
- messagingImapCommandParser
- .setStatusResponseFactory(statusResponseFactory);
+ messagingImapCommandParser.setStatusResponseFactory(statusResponseFactory);
}
}
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=1058267&r1=1058266&r2=1058267&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 Wed Jan 12 18:33:00 2011
@@ -18,13 +18,13 @@
****************************************************************/
package org.apache.james.imap.decode.parser;
-import org.apache.james.imap.api.ImapMessageFactory;
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.process.ImapSession;
import org.apache.james.imap.decode.ImapRequestLineReader;
import org.apache.james.imap.decode.DecodingException;
+import org.apache.james.imap.message.request.ListRequest;
/**
* Parse LIST commands
@@ -89,8 +89,7 @@ public class ListCommandParser extends A
protected ImapMessage createMessage(ImapCommand command,
final String referenceName, final String mailboxPattern,
final String tag) {
- final ImapMessageFactory factory = getMessageFactory();
- final ImapMessage result = factory.createListMessage(command,
+ 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=1058267&r1=1058266&r2=1058267&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 Wed Jan 12 18:33:00 2011
@@ -25,6 +25,7 @@ import org.apache.james.imap.api.process
import org.apache.james.imap.decode.ImapRequestLineReader;
import org.apache.james.imap.decode.DecodingException;
import org.apache.james.imap.decode.base.AbstractImapCommandParser;
+import org.apache.james.imap.message.request.LoginRequest;
/**
* Parse LOGIN commands
@@ -46,8 +47,7 @@ public class LoginCommandParser extends
final String userid = astring(request);
final String password = astring(request);
endLine(request);
- final ImapMessage result = getMessageFactory().createLoginMessage(
- command, userid, password, tag);
+ 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=1058267&r1=1058266&r2=1058267&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 Wed Jan 12 18:33:00 2011
@@ -25,6 +25,7 @@ import org.apache.james.imap.api.process
import org.apache.james.imap.decode.ImapRequestLineReader;
import org.apache.james.imap.decode.DecodingException;
import org.apache.james.imap.decode.base.AbstractImapCommandParser;
+import org.apache.james.imap.message.request.LogoutRequest;
/**
* Parse LOGOUT commands
@@ -45,8 +46,7 @@ public class LogoutCommandParser extends
protected ImapMessage decode(ImapCommand command,
ImapRequestLineReader request, String tag, ImapSession session) throws DecodingException {
endLine(request);
- final ImapMessage result = getMessageFactory().createLogoutMessage(
- command, tag);
+ 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=1058267&r1=1058266&r2=1058267&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 Wed Jan 12 18:33:00 2011
@@ -21,6 +21,7 @@ package org.apache.james.imap.decode.par
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.message.request.LsubRequest;
/**
* Parse LSUB commands
@@ -38,8 +39,7 @@ public class LsubCommandParser extends L
*/
protected ImapMessage createMessage(ImapCommand command,
String referenceName, String mailboxPattern, String tag) {
- final ImapMessage result = getMessageFactory().createLsubMessage(
- command, referenceName, mailboxPattern, 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=1058267&r1=1058266&r2=1058267&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 Wed Jan 12 18:33:00 2011
@@ -25,6 +25,7 @@ import org.apache.james.imap.api.process
import org.apache.james.imap.decode.ImapRequestLineReader;
import org.apache.james.imap.decode.DecodingException;
import org.apache.james.imap.decode.base.AbstractImapCommandParser;
+import org.apache.james.imap.message.request.NamespaceRequest;
/**
* Parse NAMESPACE commands
@@ -44,6 +45,6 @@ public class NamespaceCommandParser exte
protected ImapMessage decode(ImapCommand command,
ImapRequestLineReader request, String tag, ImapSession session)
throws DecodingException {
- return getMessageFactory().createNamespaceMessage(command, tag);
+ 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=1058267&r1=1058266&r2=1058267&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 Wed Jan 12 18:33:00 2011
@@ -25,6 +25,7 @@ import org.apache.james.imap.api.process
import org.apache.james.imap.decode.ImapRequestLineReader;
import org.apache.james.imap.decode.DecodingException;
import org.apache.james.imap.decode.base.AbstractImapCommandParser;
+import org.apache.james.imap.message.request.NoopRequest;
/**
*
@@ -44,7 +45,7 @@ public class NoopCommandParser extends A
protected ImapMessage decode(ImapCommand command,
ImapRequestLineReader request, String tag, ImapSession session) throws DecodingException {
endLine(request);
- final ImapMessage result = getMessageFactory().createNoopMessage(command, tag);
+ 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=1058267&r1=1058266&r2=1058267&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 Wed Jan 12 18:33:00 2011
@@ -25,6 +25,7 @@ import org.apache.james.imap.api.process
import org.apache.james.imap.decode.ImapRequestLineReader;
import org.apache.james.imap.decode.DecodingException;
import org.apache.james.imap.decode.base.AbstractImapCommandParser;
+import org.apache.james.imap.message.request.RenameRequest;
/**
* Parses RENAME command
@@ -46,8 +47,7 @@ public class RenameCommandParser extends
final String existingName = mailbox(request);
final String newName = mailbox(request);
endLine(request);
- final ImapMessage result = getMessageFactory().createRenameMessage(
- command, existingName, newName, tag);
+ final ImapMessage result =new RenameRequest(command, existingName, newName, tag);
return result;
}
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=1058267&r1=1058266&r2=1058267&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 Wed Jan 12 18:33:00 2011
@@ -41,6 +41,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.message.request.SearchRequest;
/**
* Parse SEARCH commands
@@ -954,8 +955,7 @@ public class SearchCommandParser extends
// Parse the search term from the request
final SearchKey key = decode(request);
- final ImapMessage result = getMessageFactory().createSearchMessage(
- command, key, useUids, tag);
+ final ImapMessage result = new SearchRequest(command, key, useUids, tag);
return result;
} catch (IllegalCharsetNameException e) {
session.getLog().debug("Unable to decode request", e);
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=1058267&r1=1058266&r2=1058267&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 Wed Jan 12 18:33:00 2011
@@ -25,6 +25,7 @@ import org.apache.james.imap.api.process
import org.apache.james.imap.decode.ImapRequestLineReader;
import org.apache.james.imap.decode.DecodingException;
import org.apache.james.imap.decode.base.AbstractImapCommandParser;
+import org.apache.james.imap.message.request.SelectRequest;
/**
* Parse SELECT commands
@@ -44,8 +45,7 @@ public class SelectCommandParser extends
ImapRequestLineReader request, String tag, ImapSession session) throws DecodingException {
final String mailboxName = mailbox(request);
endLine(request);
- final ImapMessage result = getMessageFactory().createSelectMessage(
- command, mailboxName, tag);
+ 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=1058267&r1=1058266&r2=1058267&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 Wed Jan 12 18:33:00 2011
@@ -25,6 +25,7 @@ import org.apache.james.imap.api.process
import org.apache.james.imap.decode.DecodingException;
import org.apache.james.imap.decode.ImapRequestLineReader;
import org.apache.james.imap.decode.base.AbstractImapCommandParser;
+import org.apache.james.imap.message.request.StartTLSRequest;
/**
* Parse STARTTLS commands
@@ -42,7 +43,7 @@ public class StartTLSCommandParser exten
*/
protected ImapMessage decode(ImapCommand command, ImapRequestLineReader request, String tag, ImapSession session) throws DecodingException {
endLine(request);
- return getMessageFactory().createStartTLSMessage(command, tag);
+ 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=1058267&r1=1058266&r2=1058267&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 Wed Jan 12 18:33:00 2011
@@ -18,7 +18,6 @@
****************************************************************/
package org.apache.james.imap.decode.parser;
-import org.apache.james.imap.api.ImapMessageFactory;
import org.apache.james.imap.api.ImapCommand;
import org.apache.james.imap.api.ImapConstants;
import org.apache.james.imap.api.ImapMessage;
@@ -28,6 +27,7 @@ import org.apache.james.imap.api.process
import org.apache.james.imap.decode.ImapRequestLineReader;
import org.apache.james.imap.decode.DecodingException;
import org.apache.james.imap.decode.base.AbstractImapCommandParser;
+import org.apache.james.imap.message.request.StatusRequest;
/**
* Parse STATUS commands
@@ -87,10 +87,6 @@ public class StatusCommandParser extends
final String mailboxName = mailbox(request);
final StatusDataItems statusDataItems = statusDataItems(request);
endLine(request);
- final ImapMessageFactory factory = getMessageFactory();
- final ImapMessage result = factory.createStatusMessage(command,
- mailboxName, statusDataItems, tag);
-
- return result;
+ 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=1058267&r1=1058266&r2=1058267&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 Wed Jan 12 18:33:00 2011
@@ -28,6 +28,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.message.request.StoreRequest;
/**
* Parse STORE commands
@@ -73,8 +74,7 @@ public class StoreCommandParser extends
final Flags flags = flagList(request);
endLine(request);
- final ImapMessage result = getMessageFactory().createStoreMessage(
- command, idSet, silent, sign, flags, useUids, tag);
+ 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=1058267&r1=1058266&r2=1058267&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 Wed Jan 12 18:33:00 2011
@@ -25,6 +25,7 @@ import org.apache.james.imap.api.process
import org.apache.james.imap.decode.ImapRequestLineReader;
import org.apache.james.imap.decode.DecodingException;
import org.apache.james.imap.decode.base.AbstractImapCommandParser;
+import org.apache.james.imap.message.request.SubscribeRequest;
/**
* Parse SUBSCRIBE commands
@@ -45,8 +46,7 @@ public class SubscribeCommandParser exte
final String mailboxName = mailbox(request);
endLine(request);
- final ImapMessage result = getMessageFactory().createSubscribeMessage(
- command, mailboxName, tag);
+ final ImapMessage result = new SubscribeRequest(command, mailboxName, tag);
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=1058267&r1=1058266&r2=1058267&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 Wed Jan 12 18:33:00 2011
@@ -25,6 +25,7 @@ import org.apache.james.imap.api.process
import org.apache.james.imap.decode.ImapRequestLineReader;
import org.apache.james.imap.decode.DecodingException;
import org.apache.james.imap.decode.base.AbstractImapCommandParser;
+import org.apache.james.imap.message.request.UnsubscribeRequest;
/**
* Parse UNSUBSCRIBE commands
@@ -45,9 +46,7 @@ public class UnsubscribeCommandParser ex
ImapRequestLineReader request, String tag, ImapSession session) throws DecodingException {
final String mailboxName = mailbox(request);
endLine(request);
- final ImapMessage result = getMessageFactory()
- .createUnsubscribeMessage(command, mailboxName, tag);
- return result;
+ return new UnsubscribeRequest(command, mailboxName, tag);
}
}
Modified: james/imap/trunk/message/src/main/java/org/apache/james/imap/main/DefaultImapDecoderFactory.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/message/src/main/java/org/apache/james/imap/main/DefaultImapDecoderFactory.java?rev=1058267&r1=1058266&r2=1058267&view=diff
==============================================================================
--- james/imap/trunk/message/src/main/java/org/apache/james/imap/main/DefaultImapDecoderFactory.java (original)
+++ james/imap/trunk/message/src/main/java/org/apache/james/imap/main/DefaultImapDecoderFactory.java Wed Jan 12 18:33:00 2011
@@ -19,13 +19,11 @@
package org.apache.james.imap.main;
-import org.apache.james.imap.api.ImapMessageFactory;
import org.apache.james.imap.decode.ImapCommandParserFactory;
import org.apache.james.imap.decode.ImapDecoder;
import org.apache.james.imap.decode.ImapDecoderFactory;
import org.apache.james.imap.decode.main.DefaultImapDecoder;
import org.apache.james.imap.decode.parser.ImapParserFactory;
-import org.apache.james.imap.message.request.BaseImap4Rev1MessageFactory;
import org.apache.james.imap.message.response.UnpooledStatusResponseFactory;
/**
@@ -36,12 +34,8 @@ public class DefaultImapDecoderFactory i
public static final ImapDecoder createDecoder() {
final UnpooledStatusResponseFactory unpooledStatusResponseFactory = new UnpooledStatusResponseFactory();
- final ImapMessageFactory messageFactory = new BaseImap4Rev1MessageFactory(
- unpooledStatusResponseFactory);
- final ImapCommandParserFactory imapCommands = new ImapParserFactory(
- messageFactory, unpooledStatusResponseFactory);
- final ImapDecoder result = new DefaultImapDecoder(messageFactory,
- imapCommands);
+ final ImapCommandParserFactory imapCommands = new ImapParserFactory(unpooledStatusResponseFactory);
+ final ImapDecoder result = new DefaultImapDecoder(unpooledStatusResponseFactory, imapCommands);
return result;
}
Modified: james/imap/trunk/message/src/test/java/org/apache/james/imap/decode/parser/FetchCommandParserPartialFetchTest.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/message/src/test/java/org/apache/james/imap/decode/parser/FetchCommandParserPartialFetchTest.java?rev=1058267&r1=1058266&r2=1058267&view=diff
==============================================================================
--- james/imap/trunk/message/src/test/java/org/apache/james/imap/decode/parser/FetchCommandParserPartialFetchTest.java (original)
+++ james/imap/trunk/message/src/test/java/org/apache/james/imap/decode/parser/FetchCommandParserPartialFetchTest.java Wed Jan 12 18:33:00 2011
@@ -22,7 +22,6 @@ package org.apache.james.imap.decode.par
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
-import org.apache.james.imap.api.ImapMessageFactory;
import org.apache.james.imap.api.ImapCommand;
import org.apache.james.imap.api.ImapMessage;
import org.apache.james.imap.api.message.BodyFetchElement;
@@ -36,7 +35,6 @@ import org.apache.james.imap.decode.pars
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
-import org.jmock.Expectations;
import org.jmock.Mockery;
import org.jmock.integration.junit4.JMock;
import org.jmock.integration.junit4.JUnit4Mockery;
@@ -48,7 +46,6 @@ public class FetchCommandParserPartialFe
FetchCommandParser parser;
- ImapMessageFactory mockMessageFactory;
ImapCommand command;
ImapMessage message;
@@ -57,12 +54,10 @@ public class FetchCommandParserPartialFe
@Before
public void setUp() throws Exception {
parser = new FetchCommandParser();
- mockMessageFactory = context.mock(ImapMessageFactory.class);
command = ImapCommand.anyStateCommand("Command");
message = context.mock(ImapMessage.class);
session = context.mock(ImapSession.class);
- parser.setMessageFactory(mockMessageFactory);
}
@@ -103,10 +98,7 @@ public class FetchCommandParserPartialFe
ImapRequestLineReader reader = new ImapRequestStreamLineReader(
new ByteArrayInputStream(input.getBytes("US-ASCII")),
new ByteArrayOutputStream());
- context.checking(new Expectations() {{
- oneOf (mockMessageFactory).createFetchMessage( with(equal(command)), with(equal(useUids)),
- with(equal(idSet)),with(equal(data)), with(same(tag)));will(returnValue(message));
- }});
+
parser.decode(command, reader, tag, useUids, session);
}
}
Modified: james/imap/trunk/message/src/test/java/org/apache/james/imap/decode/parser/SearchCommandParserAndParenthesesTest.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/message/src/test/java/org/apache/james/imap/decode/parser/SearchCommandParserAndParenthesesTest.java?rev=1058267&r1=1058266&r2=1058267&view=diff
==============================================================================
--- james/imap/trunk/message/src/test/java/org/apache/james/imap/decode/parser/SearchCommandParserAndParenthesesTest.java (original)
+++ james/imap/trunk/message/src/test/java/org/apache/james/imap/decode/parser/SearchCommandParserAndParenthesesTest.java Wed Jan 12 18:33:00 2011
@@ -27,7 +27,6 @@ import java.io.UnsupportedEncodingExcept
import java.util.ArrayList;
import java.util.List;
-import org.apache.james.imap.api.ImapMessageFactory;
import org.apache.james.imap.api.ImapCommand;
import org.apache.james.imap.api.ImapMessage;
import org.apache.james.imap.api.message.IdRange;
@@ -150,7 +149,6 @@ public class SearchCommandParserAndParen
SearchCommandParser parser;
- ImapMessageFactory mockMessageFactory;
ImapCommand command;
@@ -159,10 +157,8 @@ public class SearchCommandParserAndParen
@Before
public void setUp() throws Exception {
parser = new SearchCommandParser();
- mockMessageFactory = context.mock(ImapMessageFactory.class);
command = ImapCommand.anyStateCommand("Command");
message = context.mock(ImapMessage.class);
- parser.setMessageFactory(mockMessageFactory);
}
@Test
Modified: james/imap/trunk/message/src/test/java/org/apache/james/imap/decode/parser/SearchCommandParserCharsetTest.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/message/src/test/java/org/apache/james/imap/decode/parser/SearchCommandParserCharsetTest.java?rev=1058267&r1=1058266&r2=1058267&view=diff
==============================================================================
--- james/imap/trunk/message/src/test/java/org/apache/james/imap/decode/parser/SearchCommandParserCharsetTest.java (original)
+++ james/imap/trunk/message/src/test/java/org/apache/james/imap/decode/parser/SearchCommandParserCharsetTest.java Wed Jan 12 18:33:00 2011
@@ -29,7 +29,6 @@ import java.util.HashSet;
import java.util.Iterator;
import java.util.Set;
-import org.apache.james.imap.api.ImapMessageFactory;
import org.apache.james.imap.api.ImapCommand;
import org.apache.james.imap.api.ImapMessage;
import org.apache.james.imap.api.display.HumanReadableText;
@@ -76,7 +75,6 @@ public class SearchCommandParserCharsetT
private Mockery context = new JUnit4Mockery();
- ImapMessageFactory mockMessageFactory;
ImapCommand command;
@@ -87,13 +85,11 @@ public class SearchCommandParserCharsetT
@Before
public void setUp() throws Exception {
parser = new SearchCommandParser();
- mockMessageFactory = context.mock(ImapMessageFactory.class);
command = ImapCommand.anyStateCommand("Command");
message = context.mock(ImapMessage.class);
session = context.mock(ImapSession.class);
mockStatusResponseFactory = context.mock(StatusResponseFactory.class);
- parser.setMessageFactory(mockMessageFactory);
parser.setStatusResponseFactory(mockStatusResponseFactory);
}
Modified: james/imap/trunk/message/src/test/java/org/apache/james/imap/decode/parser/SearchCommandParserNotTest.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/message/src/test/java/org/apache/james/imap/decode/parser/SearchCommandParserNotTest.java?rev=1058267&r1=1058266&r2=1058267&view=diff
==============================================================================
--- james/imap/trunk/message/src/test/java/org/apache/james/imap/decode/parser/SearchCommandParserNotTest.java (original)
+++ james/imap/trunk/message/src/test/java/org/apache/james/imap/decode/parser/SearchCommandParserNotTest.java Wed Jan 12 18:33:00 2011
@@ -24,7 +24,6 @@ import static org.junit.Assert.assertEqu
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
-import org.apache.james.imap.api.ImapMessageFactory;
import org.apache.james.imap.api.ImapCommand;
import org.apache.james.imap.api.ImapMessage;
import org.apache.james.imap.api.message.IdRange;
@@ -44,7 +43,6 @@ public class SearchCommandParserNotTest
SearchCommandParser parser;
- ImapMessageFactory mockMessageFactory;
ImapCommand command;
ImapMessage message;
@@ -54,10 +52,8 @@ public class SearchCommandParserNotTest
@Before
public void setUp() throws Exception {
parser = new SearchCommandParser();
- mockMessageFactory = context.mock(ImapMessageFactory.class);
command = ImapCommand.anyStateCommand("Command");
message = context.mock(ImapMessage.class);
- parser.setMessageFactory(mockMessageFactory);
}
@Test
Modified: james/imap/trunk/message/src/test/java/org/apache/james/imap/decode/parser/SearchCommandParserOrTest.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/message/src/test/java/org/apache/james/imap/decode/parser/SearchCommandParserOrTest.java?rev=1058267&r1=1058266&r2=1058267&view=diff
==============================================================================
--- james/imap/trunk/message/src/test/java/org/apache/james/imap/decode/parser/SearchCommandParserOrTest.java (original)
+++ james/imap/trunk/message/src/test/java/org/apache/james/imap/decode/parser/SearchCommandParserOrTest.java Wed Jan 12 18:33:00 2011
@@ -24,7 +24,6 @@ import static org.junit.Assert.assertEqu
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
-import org.apache.james.imap.api.ImapMessageFactory;
import org.apache.james.imap.api.ImapCommand;
import org.apache.james.imap.api.ImapMessage;
import org.apache.james.imap.api.message.IdRange;
@@ -43,8 +42,6 @@ import org.junit.runner.RunWith;
public class SearchCommandParserOrTest {
SearchCommandParser parser;
- ImapMessageFactory mockMessageFactory;
-
ImapCommand command;
ImapMessage message;
@@ -54,10 +51,8 @@ public class SearchCommandParserOrTest {
@Before
public void setUp() throws Exception {
parser = new SearchCommandParser();
- mockMessageFactory = context.mock(ImapMessageFactory.class);
command = ImapCommand.anyStateCommand("Command");
message = context.mock(ImapMessage.class);
- parser.setMessageFactory(mockMessageFactory);
}
public Input sequence() {
Modified: james/imap/trunk/message/src/test/java/org/apache/james/imap/decode/parser/SearchCommandParserQuotedCharsetTest.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/message/src/test/java/org/apache/james/imap/decode/parser/SearchCommandParserQuotedCharsetTest.java?rev=1058267&r1=1058266&r2=1058267&view=diff
==============================================================================
--- james/imap/trunk/message/src/test/java/org/apache/james/imap/decode/parser/SearchCommandParserQuotedCharsetTest.java (original)
+++ james/imap/trunk/message/src/test/java/org/apache/james/imap/decode/parser/SearchCommandParserQuotedCharsetTest.java Wed Jan 12 18:33:00 2011
@@ -29,7 +29,6 @@ import java.util.HashSet;
import java.util.Iterator;
import java.util.Set;
-import org.apache.james.imap.api.ImapMessageFactory;
import org.apache.james.imap.api.ImapCommand;
import org.apache.james.imap.api.ImapMessage;
import org.apache.james.imap.api.display.HumanReadableText;
@@ -138,8 +137,6 @@ public class SearchCommandParserQuotedCh
StatusResponseFactory mockStatusResponseFactory;
- ImapMessageFactory mockMessageFactory;
-
ImapCommand command;
ImapMessage message;
@@ -151,13 +148,11 @@ public class SearchCommandParserQuotedCh
@Before
public void setUp() throws Exception {
parser = new SearchCommandParser();
- mockMessageFactory = mockery.mock(ImapMessageFactory.class);
command = ImapCommand.anyStateCommand("Command");
message = mockery.mock(ImapMessage.class);
mockStatusResponseFactory = mockery.mock(StatusResponseFactory.class);
session = mockery.mock(ImapSession.class);
- parser.setMessageFactory(mockMessageFactory);
parser.setStatusResponseFactory(mockStatusResponseFactory);
}
Modified: james/imap/trunk/message/src/test/java/org/apache/james/imap/decode/parser/SearchCommandParserSearchKeySequenceSetTest.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/message/src/test/java/org/apache/james/imap/decode/parser/SearchCommandParserSearchKeySequenceSetTest.java?rev=1058267&r1=1058266&r2=1058267&view=diff
==============================================================================
--- james/imap/trunk/message/src/test/java/org/apache/james/imap/decode/parser/SearchCommandParserSearchKeySequenceSetTest.java (original)
+++ james/imap/trunk/message/src/test/java/org/apache/james/imap/decode/parser/SearchCommandParserSearchKeySequenceSetTest.java Wed Jan 12 18:33:00 2011
@@ -24,7 +24,6 @@ import static org.junit.Assert.*;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
-import org.apache.james.imap.api.ImapMessageFactory;
import org.apache.james.imap.api.ImapCommand;
import org.apache.james.imap.api.ImapMessage;
import org.apache.james.imap.api.message.IdRange;
@@ -43,7 +42,6 @@ public class SearchCommandParserSearchKe
SearchCommandParser parser;
- ImapMessageFactory mockMessageFactory;
ImapCommand command;
@@ -54,10 +52,8 @@ public class SearchCommandParserSearchKe
@Before
public void setUp() throws Exception {
parser = new SearchCommandParser();
- mockMessageFactory = mockery.mock(ImapMessageFactory.class);
command = ImapCommand.anyStateCommand("Command");
message = mockery.mock(ImapMessage.class);
- parser.setMessageFactory(mockMessageFactory);
}
@Test
Modified: james/imap/trunk/message/src/test/java/org/apache/james/imap/decode/parser/SearchCommandParserSearchKeyTest.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/message/src/test/java/org/apache/james/imap/decode/parser/SearchCommandParserSearchKeyTest.java?rev=1058267&r1=1058266&r2=1058267&view=diff
==============================================================================
--- james/imap/trunk/message/src/test/java/org/apache/james/imap/decode/parser/SearchCommandParserSearchKeyTest.java (original)
+++ james/imap/trunk/message/src/test/java/org/apache/james/imap/decode/parser/SearchCommandParserSearchKeyTest.java Wed Jan 12 18:33:00 2011
@@ -24,7 +24,6 @@ import static org.junit.Assert.*;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
-import org.apache.james.imap.api.ImapMessageFactory;
import org.apache.james.imap.api.ImapCommand;
import org.apache.james.imap.api.ImapMessage;
import org.apache.james.imap.api.message.IdRange;
@@ -46,8 +45,6 @@ public class SearchCommandParserSearchKe
private static final DayMonthYear DATE = new DayMonthYear(1, 1, 2000);
SearchCommandParser parser;
-
- ImapMessageFactory mockMessageFactory;
ImapCommand command;
@@ -58,10 +55,8 @@ public class SearchCommandParserSearchKe
@Before
public void setUp() throws Exception {
parser = new SearchCommandParser();
- mockMessageFactory = mockery.mock(ImapMessageFactory.class);
command = ImapCommand.anyStateCommand("Command");
message = mockery.mock(ImapMessage.class);
- parser.setMessageFactory(mockMessageFactory);
}
Modified: james/imap/trunk/message/src/test/java/org/apache/james/imap/decode/parser/SearchCommandParserTopLevelAndTest.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/message/src/test/java/org/apache/james/imap/decode/parser/SearchCommandParserTopLevelAndTest.java?rev=1058267&r1=1058266&r2=1058267&view=diff
==============================================================================
--- james/imap/trunk/message/src/test/java/org/apache/james/imap/decode/parser/SearchCommandParserTopLevelAndTest.java (original)
+++ james/imap/trunk/message/src/test/java/org/apache/james/imap/decode/parser/SearchCommandParserTopLevelAndTest.java Wed Jan 12 18:33:00 2011
@@ -27,7 +27,6 @@ import java.io.UnsupportedEncodingExcept
import java.util.ArrayList;
import java.util.List;
-import org.apache.james.imap.api.ImapMessageFactory;
import org.apache.james.imap.api.ImapCommand;
import org.apache.james.imap.api.ImapMessage;
import org.apache.james.imap.api.message.IdRange;
@@ -134,8 +133,6 @@ public class SearchCommandParserTopLevel
SearchCommandParser parser;
- ImapMessageFactory mockMessageFactory;
-
ImapCommand command;
ImapMessage message;
@@ -145,10 +142,8 @@ public class SearchCommandParserTopLevel
@Before
public void setUp() throws Exception {
parser = new SearchCommandParser();
- mockMessageFactory = mockery.mock(ImapMessageFactory.class);
command = ImapCommand.anyStateCommand("Command");
message = mockery.mock(ImapMessage.class);
- parser.setMessageFactory(mockMessageFactory);
}
@Test
Modified: james/imap/trunk/message/src/test/java/org/apache/james/imap/decode/parser/StoreCommandParserTest.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/message/src/test/java/org/apache/james/imap/decode/parser/StoreCommandParserTest.java?rev=1058267&r1=1058266&r2=1058267&view=diff
==============================================================================
--- james/imap/trunk/message/src/test/java/org/apache/james/imap/decode/parser/StoreCommandParserTest.java (original)
+++ james/imap/trunk/message/src/test/java/org/apache/james/imap/decode/parser/StoreCommandParserTest.java Wed Jan 12 18:33:00 2011
@@ -24,7 +24,6 @@ import java.io.ByteArrayOutputStream;
import javax.mail.Flags;
-import org.apache.james.imap.api.ImapMessageFactory;
import org.apache.james.imap.api.ImapCommand;
import org.apache.james.imap.api.ImapMessage;
import org.apache.james.imap.api.message.IdRange;
@@ -45,8 +44,6 @@ public class StoreCommandParserTest {
StoreCommandParser parser;
- ImapMessageFactory mockMessageFactory;
-
ImapCommand command;
ImapMessage message;
@@ -59,12 +56,10 @@ public class StoreCommandParserTest {
@Before
public void setUp() throws Exception {
parser = new StoreCommandParser();
- mockMessageFactory = mockery.mock(ImapMessageFactory.class);
command = ImapCommand.anyStateCommand("Command");
message = mockery.mock(ImapMessage.class);
session = mockery.mock(ImapSession.class);
- parser.setMessageFactory(mockMessageFactory);
}
@Test
@@ -84,17 +79,6 @@ public class StoreCommandParserTest {
new ByteArrayInputStream(input.getBytes("US-ASCII")),
new ByteArrayOutputStream());
- mockery.checking(new Expectations() {{
- oneOf (mockMessageFactory).createStoreMessage(
- with(equal(command)),
- with(equal(idSet)),
- with(equal(silent)),
- with(equal(sign)),
- with(equal(flags)),
- with(equal(useUids)),
- with(same(tag))
- );will(returnValue(message));
- }});
parser.decode(command, reader, tag, useUids, session);
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org