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 2008/09/18 23:45:03 UTC
svn commit: r696828 [14/32] - in /james/protocols/imap/trunk:
api/src/main/java/org/apache/james/api/imap/
api/src/main/java/org/apache/james/api/imap/display/
api/src/main/java/org/apache/james/api/imap/imap4rev1/
api/src/main/java/org/apache/james/ap...
Modified: james/protocols/imap/trunk/message/src/test/java/org/apache/james/imapserver/codec/encode/imap4rev1/StatusResponseEncoderTest.java
URL: http://svn.apache.org/viewvc/james/protocols/imap/trunk/message/src/test/java/org/apache/james/imapserver/codec/encode/imap4rev1/StatusResponseEncoderTest.java?rev=696828&r1=696827&r2=696828&view=diff
==============================================================================
--- james/protocols/imap/trunk/message/src/test/java/org/apache/james/imapserver/codec/encode/imap4rev1/StatusResponseEncoderTest.java (original)
+++ james/protocols/imap/trunk/message/src/test/java/org/apache/james/imapserver/codec/encode/imap4rev1/StatusResponseEncoderTest.java Thu Sep 18 14:44:56 2008
@@ -34,23 +34,32 @@
public class StatusResponseEncoderTest extends MockObjectTestCase {
private static final String COMMAND = "COMMAND";
+
private static final String TAG = "TAG";
- private static final HumanReadableTextKey KEY = new HumanReadableTextKey("KEY", "TEXT");
-
+
+ private static final HumanReadableTextKey KEY = new HumanReadableTextKey(
+ "KEY", "TEXT");
+
MockImapResponseWriter writer;
+
ImapResponseComposer response;
+
Mock mockNextEncoder;
+
Mock mockStatusResponse;
+
StatusResponseEncoder encoder;
+
Mock mockCommand;
-
+
protected void setUp() throws Exception {
super.setUp();
writer = new MockImapResponseWriter();
response = new ImapResponseComposerImpl(writer);
mockNextEncoder = mock(ImapEncoder.class);
mockStatusResponse = mock(StatusResponse.class);
- encoder = new StatusResponseEncoder((ImapEncoder) mockNextEncoder.proxy());
+ encoder = new StatusResponseEncoder((ImapEncoder) mockNextEncoder
+ .proxy());
mockCommand = mock(ImapCommand.class);
}
@@ -59,223 +68,252 @@
}
public void testTaggedOkCode() throws Exception {
- execute(StatusResponse.Type.OK, StatusResponse.ResponseCode.alert(), KEY, TAG);
+ execute(StatusResponse.Type.OK, StatusResponse.ResponseCode.alert(),
+ KEY, TAG);
assertEquals(8, this.writer.operations.size());
- assertEquals(new MockImapResponseWriter.TagOperation(TAG), writer.operations.get(0));
- assertEquals(new MockImapResponseWriter.TextMessageOperation(ImapConstants.OK),
- writer.operations.get(1));
+ assertEquals(new MockImapResponseWriter.TagOperation(TAG),
+ writer.operations.get(0));
+ assertEquals(new MockImapResponseWriter.TextMessageOperation(
+ ImapConstants.OK), writer.operations.get(1));
assertEquals(MockImapResponseWriter.BracketOperation.openSquare(),
writer.operations.get(2));
- assertEquals(new MockImapResponseWriter.TextMessageOperation(StatusResponse.ResponseCode.alert().getCode()),
+ assertEquals(new MockImapResponseWriter.TextMessageOperation(
+ StatusResponse.ResponseCode.alert().getCode()),
writer.operations.get(3));
assertEquals(MockImapResponseWriter.BracketOperation.closeSquare(),
writer.operations.get(4));
assertEquals(new MockImapResponseWriter.CommandNameOperation(COMMAND),
writer.operations.get(5));
- assertEquals(new MockImapResponseWriter.TextMessageOperation(KEY.getDefaultValue()),
- writer.operations.get(6));
- assertEquals(new MockImapResponseWriter.EndOperation(),
- writer.operations.get(7));
+ assertEquals(new MockImapResponseWriter.TextMessageOperation(KEY
+ .getDefaultValue()), writer.operations.get(6));
+ assertEquals(new MockImapResponseWriter.EndOperation(),
+ writer.operations.get(7));
}
-
+
public void testTaggedOkNoCode() throws Exception {
execute(StatusResponse.Type.OK, null, KEY, TAG);
assertEquals(5, this.writer.operations.size());
- assertEquals(new MockImapResponseWriter.TagOperation(TAG), writer.operations.get(0));
- assertEquals(new MockImapResponseWriter.TextMessageOperation(ImapConstants.OK),
- writer.operations.get(1));
+ assertEquals(new MockImapResponseWriter.TagOperation(TAG),
+ writer.operations.get(0));
+ assertEquals(new MockImapResponseWriter.TextMessageOperation(
+ ImapConstants.OK), writer.operations.get(1));
assertEquals(new MockImapResponseWriter.CommandNameOperation(COMMAND),
writer.operations.get(2));
- assertEquals(new MockImapResponseWriter.TextMessageOperation(KEY.getDefaultValue()),
- writer.operations.get(3));
- assertEquals(new MockImapResponseWriter.EndOperation(),
- writer.operations.get(4));
+ assertEquals(new MockImapResponseWriter.TextMessageOperation(KEY
+ .getDefaultValue()), writer.operations.get(3));
+ assertEquals(new MockImapResponseWriter.EndOperation(),
+ writer.operations.get(4));
}
public void testTaggedBadCode() throws Exception {
- execute(StatusResponse.Type.BAD, StatusResponse.ResponseCode.alert(), KEY, TAG);
+ execute(StatusResponse.Type.BAD, StatusResponse.ResponseCode.alert(),
+ KEY, TAG);
assertEquals(8, this.writer.operations.size());
- assertEquals(new MockImapResponseWriter.TagOperation(TAG), writer.operations.get(0));
- assertEquals(new MockImapResponseWriter.TextMessageOperation(ImapConstants.BAD),
- writer.operations.get(1));
+ assertEquals(new MockImapResponseWriter.TagOperation(TAG),
+ writer.operations.get(0));
+ assertEquals(new MockImapResponseWriter.TextMessageOperation(
+ ImapConstants.BAD), writer.operations.get(1));
assertEquals(MockImapResponseWriter.BracketOperation.openSquare(),
writer.operations.get(2));
- assertEquals(new MockImapResponseWriter.TextMessageOperation(StatusResponse.ResponseCode.alert().getCode()),
+ assertEquals(new MockImapResponseWriter.TextMessageOperation(
+ StatusResponse.ResponseCode.alert().getCode()),
writer.operations.get(3));
assertEquals(MockImapResponseWriter.BracketOperation.closeSquare(),
writer.operations.get(4));
assertEquals(new MockImapResponseWriter.CommandNameOperation(COMMAND),
writer.operations.get(5));
- assertEquals(new MockImapResponseWriter.TextMessageOperation(KEY.getDefaultValue()),
- writer.operations.get(6));
- assertEquals(new MockImapResponseWriter.EndOperation(),
- writer.operations.get(7));
+ assertEquals(new MockImapResponseWriter.TextMessageOperation(KEY
+ .getDefaultValue()), writer.operations.get(6));
+ assertEquals(new MockImapResponseWriter.EndOperation(),
+ writer.operations.get(7));
}
-
+
public void testTaggedBadNoCode() throws Exception {
execute(StatusResponse.Type.BAD, null, KEY, TAG);
assertEquals(5, this.writer.operations.size());
- assertEquals(new MockImapResponseWriter.TagOperation(TAG), writer.operations.get(0));
- assertEquals(new MockImapResponseWriter.TextMessageOperation(ImapConstants.BAD),
- writer.operations.get(1));
+ assertEquals(new MockImapResponseWriter.TagOperation(TAG),
+ writer.operations.get(0));
+ assertEquals(new MockImapResponseWriter.TextMessageOperation(
+ ImapConstants.BAD), writer.operations.get(1));
assertEquals(new MockImapResponseWriter.CommandNameOperation(COMMAND),
writer.operations.get(2));
- assertEquals(new MockImapResponseWriter.TextMessageOperation(KEY.getDefaultValue()),
- writer.operations.get(3));
- assertEquals(new MockImapResponseWriter.EndOperation(),
- writer.operations.get(4));
+ assertEquals(new MockImapResponseWriter.TextMessageOperation(KEY
+ .getDefaultValue()), writer.operations.get(3));
+ assertEquals(new MockImapResponseWriter.EndOperation(),
+ writer.operations.get(4));
}
public void testTaggedNoCode() throws Exception {
- execute(StatusResponse.Type.NO, StatusResponse.ResponseCode.alert(), KEY, TAG);
+ execute(StatusResponse.Type.NO, StatusResponse.ResponseCode.alert(),
+ KEY, TAG);
assertEquals(8, this.writer.operations.size());
- assertEquals(new MockImapResponseWriter.TagOperation(TAG), writer.operations.get(0));
- assertEquals(new MockImapResponseWriter.TextMessageOperation(ImapConstants.NO),
- writer.operations.get(1));
+ assertEquals(new MockImapResponseWriter.TagOperation(TAG),
+ writer.operations.get(0));
+ assertEquals(new MockImapResponseWriter.TextMessageOperation(
+ ImapConstants.NO), writer.operations.get(1));
assertEquals(MockImapResponseWriter.BracketOperation.openSquare(),
writer.operations.get(2));
- assertEquals(new MockImapResponseWriter.TextMessageOperation(StatusResponse.ResponseCode.alert().getCode()),
+ assertEquals(new MockImapResponseWriter.TextMessageOperation(
+ StatusResponse.ResponseCode.alert().getCode()),
writer.operations.get(3));
assertEquals(MockImapResponseWriter.BracketOperation.closeSquare(),
writer.operations.get(4));
assertEquals(new MockImapResponseWriter.CommandNameOperation(COMMAND),
writer.operations.get(5));
- assertEquals(new MockImapResponseWriter.TextMessageOperation(KEY.getDefaultValue()),
- writer.operations.get(6));
- assertEquals(new MockImapResponseWriter.EndOperation(),
- writer.operations.get(7));
+ assertEquals(new MockImapResponseWriter.TextMessageOperation(KEY
+ .getDefaultValue()), writer.operations.get(6));
+ assertEquals(new MockImapResponseWriter.EndOperation(),
+ writer.operations.get(7));
}
-
+
public void testTaggedNoNoCode() throws Exception {
execute(StatusResponse.Type.NO, null, KEY, TAG);
assertEquals(5, this.writer.operations.size());
- assertEquals(new MockImapResponseWriter.TagOperation(TAG), writer.operations.get(0));
- assertEquals(new MockImapResponseWriter.TextMessageOperation(ImapConstants.NO),
- writer.operations.get(1));
+ assertEquals(new MockImapResponseWriter.TagOperation(TAG),
+ writer.operations.get(0));
+ assertEquals(new MockImapResponseWriter.TextMessageOperation(
+ ImapConstants.NO), writer.operations.get(1));
assertEquals(new MockImapResponseWriter.CommandNameOperation(COMMAND),
writer.operations.get(2));
- assertEquals(new MockImapResponseWriter.TextMessageOperation(KEY.getDefaultValue()),
- writer.operations.get(3));
- assertEquals(new MockImapResponseWriter.EndOperation(),
- writer.operations.get(4));
+ assertEquals(new MockImapResponseWriter.TextMessageOperation(KEY
+ .getDefaultValue()), writer.operations.get(3));
+ assertEquals(new MockImapResponseWriter.EndOperation(),
+ writer.operations.get(4));
}
-
public void testUntaggedOkCode() throws Exception {
- execute(StatusResponse.Type.OK, StatusResponse.ResponseCode.alert(), KEY, null);
+ execute(StatusResponse.Type.OK, StatusResponse.ResponseCode.alert(),
+ KEY, null);
assertEquals(7, this.writer.operations.size());
- assertEquals(new MockImapResponseWriter.UntaggedOperation(), writer.operations.get(0));
- assertEquals(new MockImapResponseWriter.TextMessageOperation(ImapConstants.OK),
- writer.operations.get(1));
+ assertEquals(new MockImapResponseWriter.UntaggedOperation(),
+ writer.operations.get(0));
+ assertEquals(new MockImapResponseWriter.TextMessageOperation(
+ ImapConstants.OK), writer.operations.get(1));
assertEquals(MockImapResponseWriter.BracketOperation.openSquare(),
writer.operations.get(2));
- assertEquals(new MockImapResponseWriter.TextMessageOperation(StatusResponse.ResponseCode.alert().getCode()),
+ assertEquals(new MockImapResponseWriter.TextMessageOperation(
+ StatusResponse.ResponseCode.alert().getCode()),
writer.operations.get(3));
assertEquals(MockImapResponseWriter.BracketOperation.closeSquare(),
writer.operations.get(4));
- assertEquals(new MockImapResponseWriter.TextMessageOperation(KEY.getDefaultValue()),
- writer.operations.get(5));
- assertEquals(new MockImapResponseWriter.EndOperation(),
- writer.operations.get(6));
+ assertEquals(new MockImapResponseWriter.TextMessageOperation(KEY
+ .getDefaultValue()), writer.operations.get(5));
+ assertEquals(new MockImapResponseWriter.EndOperation(),
+ writer.operations.get(6));
}
-
+
public void testUntaggedOkNoCode() throws Exception {
execute(StatusResponse.Type.OK, null, KEY, null);
assertEquals(4, this.writer.operations.size());
- assertEquals(new MockImapResponseWriter.UntaggedOperation(), writer.operations.get(0));
- assertEquals(new MockImapResponseWriter.TextMessageOperation(ImapConstants.OK),
- writer.operations.get(1));
- assertEquals(new MockImapResponseWriter.TextMessageOperation(KEY.getDefaultValue()),
- writer.operations.get(2));
- assertEquals(new MockImapResponseWriter.EndOperation(),
- writer.operations.get(3));
+ assertEquals(new MockImapResponseWriter.UntaggedOperation(),
+ writer.operations.get(0));
+ assertEquals(new MockImapResponseWriter.TextMessageOperation(
+ ImapConstants.OK), writer.operations.get(1));
+ assertEquals(new MockImapResponseWriter.TextMessageOperation(KEY
+ .getDefaultValue()), writer.operations.get(2));
+ assertEquals(new MockImapResponseWriter.EndOperation(),
+ writer.operations.get(3));
}
public void testUntaggedBadCode() throws Exception {
- execute(StatusResponse.Type.BAD, StatusResponse.ResponseCode.alert(), KEY, null);
+ execute(StatusResponse.Type.BAD, StatusResponse.ResponseCode.alert(),
+ KEY, null);
assertEquals(7, this.writer.operations.size());
- assertEquals(new MockImapResponseWriter.UntaggedOperation(), writer.operations.get(0));
- assertEquals(new MockImapResponseWriter.TextMessageOperation(ImapConstants.BAD),
- writer.operations.get(1));
+ assertEquals(new MockImapResponseWriter.UntaggedOperation(),
+ writer.operations.get(0));
+ assertEquals(new MockImapResponseWriter.TextMessageOperation(
+ ImapConstants.BAD), writer.operations.get(1));
assertEquals(MockImapResponseWriter.BracketOperation.openSquare(),
writer.operations.get(2));
- assertEquals(new MockImapResponseWriter.TextMessageOperation(StatusResponse.ResponseCode.alert().getCode()),
+ assertEquals(new MockImapResponseWriter.TextMessageOperation(
+ StatusResponse.ResponseCode.alert().getCode()),
writer.operations.get(3));
assertEquals(MockImapResponseWriter.BracketOperation.closeSquare(),
writer.operations.get(4));
- assertEquals(new MockImapResponseWriter.TextMessageOperation(KEY.getDefaultValue()),
- writer.operations.get(5));
- assertEquals(new MockImapResponseWriter.EndOperation(),
- writer.operations.get(6));
+ assertEquals(new MockImapResponseWriter.TextMessageOperation(KEY
+ .getDefaultValue()), writer.operations.get(5));
+ assertEquals(new MockImapResponseWriter.EndOperation(),
+ writer.operations.get(6));
}
-
+
public void testUntaggedBadNoCode() throws Exception {
execute(StatusResponse.Type.BAD, null, KEY, null);
assertEquals(4, this.writer.operations.size());
- assertEquals(new MockImapResponseWriter.UntaggedOperation(), writer.operations.get(0));
- assertEquals(new MockImapResponseWriter.TextMessageOperation(ImapConstants.BAD),
- writer.operations.get(1));
- assertEquals(new MockImapResponseWriter.TextMessageOperation(KEY.getDefaultValue()),
- writer.operations.get(2));
- assertEquals(new MockImapResponseWriter.EndOperation(),
- writer.operations.get(3));
+ assertEquals(new MockImapResponseWriter.UntaggedOperation(),
+ writer.operations.get(0));
+ assertEquals(new MockImapResponseWriter.TextMessageOperation(
+ ImapConstants.BAD), writer.operations.get(1));
+ assertEquals(new MockImapResponseWriter.TextMessageOperation(KEY
+ .getDefaultValue()), writer.operations.get(2));
+ assertEquals(new MockImapResponseWriter.EndOperation(),
+ writer.operations.get(3));
}
public void testUntaggedNoCode() throws Exception {
- execute(StatusResponse.Type.NO, StatusResponse.ResponseCode.alert(), KEY, null);
+ execute(StatusResponse.Type.NO, StatusResponse.ResponseCode.alert(),
+ KEY, null);
assertEquals(7, this.writer.operations.size());
- assertEquals(new MockImapResponseWriter.UntaggedOperation(), writer.operations.get(0));
- assertEquals(new MockImapResponseWriter.TextMessageOperation(ImapConstants.NO),
- writer.operations.get(1));
+ assertEquals(new MockImapResponseWriter.UntaggedOperation(),
+ writer.operations.get(0));
+ assertEquals(new MockImapResponseWriter.TextMessageOperation(
+ ImapConstants.NO), writer.operations.get(1));
assertEquals(MockImapResponseWriter.BracketOperation.openSquare(),
writer.operations.get(2));
- assertEquals(new MockImapResponseWriter.TextMessageOperation(StatusResponse.ResponseCode.alert().getCode()),
+ assertEquals(new MockImapResponseWriter.TextMessageOperation(
+ StatusResponse.ResponseCode.alert().getCode()),
writer.operations.get(3));
assertEquals(MockImapResponseWriter.BracketOperation.closeSquare(),
writer.operations.get(4));
- assertEquals(new MockImapResponseWriter.TextMessageOperation(KEY.getDefaultValue()),
- writer.operations.get(5));
- assertEquals(new MockImapResponseWriter.EndOperation(),
- writer.operations.get(6));
+ assertEquals(new MockImapResponseWriter.TextMessageOperation(KEY
+ .getDefaultValue()), writer.operations.get(5));
+ assertEquals(new MockImapResponseWriter.EndOperation(),
+ writer.operations.get(6));
}
-
+
public void testUntaggedNoNoCode() throws Exception {
execute(StatusResponse.Type.NO, null, KEY, null);
assertEquals(4, this.writer.operations.size());
- assertEquals(new MockImapResponseWriter.UntaggedOperation(), writer.operations.get(0));
- assertEquals(new MockImapResponseWriter.TextMessageOperation(ImapConstants.NO),
- writer.operations.get(1));
- assertEquals(new MockImapResponseWriter.TextMessageOperation(KEY.getDefaultValue()),
- writer.operations.get(2));
- assertEquals(new MockImapResponseWriter.EndOperation(),
- writer.operations.get(3));
- }
-
-
-
- private void execute(StatusResponse.Type type, StatusResponse.ResponseCode code,
- HumanReadableTextKey key, String tag) throws Exception {
+ assertEquals(new MockImapResponseWriter.UntaggedOperation(),
+ writer.operations.get(0));
+ assertEquals(new MockImapResponseWriter.TextMessageOperation(
+ ImapConstants.NO), writer.operations.get(1));
+ assertEquals(new MockImapResponseWriter.TextMessageOperation(KEY
+ .getDefaultValue()), writer.operations.get(2));
+ assertEquals(new MockImapResponseWriter.EndOperation(),
+ writer.operations.get(3));
+ }
+
+ private void execute(StatusResponse.Type type,
+ StatusResponse.ResponseCode code, HumanReadableTextKey key,
+ String tag) throws Exception {
configure(type, code, key, tag);
compose();
}
-
-
+
private void compose() throws Exception {
- encoder.doEncode((ImapMessage) mockStatusResponse.proxy(), response);
+ encoder.doEncode((ImapMessage) mockStatusResponse.proxy(), response);
}
-
- private void configure(StatusResponse.Type type, StatusResponse.ResponseCode code,
- HumanReadableTextKey key, String tag) {
- mockStatusResponse.expects(once()).method("getServerResponseType").will(returnValue(type));
- mockStatusResponse.expects(once()).method("getTag").will(returnValue(tag));
- mockStatusResponse.expects(once()).method("getTextKey").will(returnValue(key));
- mockStatusResponse.expects(once()).method("getResponseCode").will(returnValue(code));
+
+ private void configure(StatusResponse.Type type,
+ StatusResponse.ResponseCode code, HumanReadableTextKey key,
+ String tag) {
+ mockStatusResponse.expects(once()).method("getServerResponseType")
+ .will(returnValue(type));
+ mockStatusResponse.expects(once()).method("getTag").will(
+ returnValue(tag));
+ mockStatusResponse.expects(once()).method("getTextKey").will(
+ returnValue(key));
+ mockStatusResponse.expects(once()).method("getResponseCode").will(
+ returnValue(code));
if (tag == null) {
- mockStatusResponse.expects(once()).method("getCommand").will(returnValue(null));
+ mockStatusResponse.expects(once()).method("getCommand").will(
+ returnValue(null));
} else {
- mockCommand.expects(once()).method("getName").will(returnValue(COMMAND));
- mockStatusResponse.expects(once()).method("getCommand").will(returnValue(mockCommand.proxy()));
+ mockCommand.expects(once()).method("getName").will(
+ returnValue(COMMAND));
+ mockStatusResponse.expects(once()).method("getCommand").will(
+ returnValue(mockCommand.proxy()));
}
}
}
Modified: james/protocols/imap/trunk/message/src/test/java/org/apache/james/imapserver/codec/encode/imap4rev1/legacy/MockImapResponseWriter.java
URL: http://svn.apache.org/viewvc/james/protocols/imap/trunk/message/src/test/java/org/apache/james/imapserver/codec/encode/imap4rev1/legacy/MockImapResponseWriter.java?rev=696828&r1=696827&r2=696828&view=diff
==============================================================================
--- james/protocols/imap/trunk/message/src/test/java/org/apache/james/imapserver/codec/encode/imap4rev1/legacy/MockImapResponseWriter.java (original)
+++ james/protocols/imap/trunk/message/src/test/java/org/apache/james/imapserver/codec/encode/imap4rev1/legacy/MockImapResponseWriter.java Thu Sep 18 14:44:56 2008
@@ -29,7 +29,7 @@
public class MockImapResponseWriter implements ImapResponseWriter {
public final List operations = new ArrayList();
-
+
public void commandName(String commandName) {
operations.add(new CommandNameOperation(commandName));
@@ -67,15 +67,16 @@
public int hashCode() {
return 3;
}
-
+
}
-
+
public void quote(String message) {
operations.add(new QuoteMessageOperation(message));
}
-
+
public static class QuoteMessageOperation {
public final String message;
+
public QuoteMessageOperation(final String message) {
this.message = message;
}
@@ -83,7 +84,8 @@
public int hashCode() {
final int PRIME = 31;
int result = 1;
- result = PRIME * result + ((message == null) ? 0 : message.hashCode());
+ result = PRIME * result
+ + ((message == null) ? 0 : message.hashCode());
return result;
}
@@ -103,18 +105,21 @@
return true;
}
}
-
+
public static class TextMessageOperation {
public final String text;
+
public TextMessageOperation(String text) {
this.text = text;
}
+
public int hashCode() {
final int PRIME = 31;
int result = 1;
result = PRIME * result + ((text == null) ? 0 : text.hashCode());
return result;
}
+
public boolean equals(Object obj) {
if (this == obj)
return true;
@@ -130,20 +135,23 @@
return false;
return true;
}
-
+
}
-
+
public static class NumericMessageOperation {
public final long number;
+
public NumericMessageOperation(long number) {
this.number = number;
}
+
public int hashCode() {
final int PRIME = 31;
int result = 1;
result = (int) (PRIME * result + number);
return result;
}
+
public boolean equals(Object obj) {
if (this == obj)
return true;
@@ -156,10 +164,9 @@
return false;
return true;
}
-
+
}
-
-
+
public static class ResponseCodeOperation {
public final String responseCode;
@@ -171,7 +178,8 @@
public int hashCode() {
final int PRIME = 31;
int result = 1;
- result = PRIME * result + ((responseCode == null) ? 0 : responseCode.hashCode());
+ result = PRIME * result
+ + ((responseCode == null) ? 0 : responseCode.hashCode());
return result;
}
@@ -190,9 +198,9 @@
return false;
return true;
}
-
+
}
-
+
public static class CommandNameOperation {
public final String commandName;
@@ -204,7 +212,8 @@
public int hashCode() {
final int PRIME = 31;
int result = 1;
- result = PRIME * result + ((commandName == null) ? 0 : commandName.hashCode());
+ result = PRIME * result
+ + ((commandName == null) ? 0 : commandName.hashCode());
return result;
}
@@ -223,9 +232,9 @@
return false;
return true;
}
-
+
}
-
+
public static class UntaggedOperation {
public boolean equals(Object obj) {
return obj instanceof UntaggedOperation;
@@ -234,21 +243,24 @@
public int hashCode() {
return 2;
}
-
+
}
-
+
public static class TagOperation {
private final String tag;
+
public TagOperation(String tag) {
this.tag = tag;
}
+
public int hashCode() {
final int PRIME = 31;
int result = 1;
result = PRIME * result + ((tag == null) ? 0 : tag.hashCode());
return result;
}
+
public boolean equals(Object obj) {
if (this == obj)
return true;
@@ -264,7 +276,7 @@
return false;
return true;
}
-
+
}
public void closeParen() {
@@ -276,24 +288,27 @@
}
public static class BracketOperation {
-
+
public static BracketOperation openSquare() {
return new BracketOperation(true, true);
}
-
+
public static BracketOperation closeSquare() {
return new BracketOperation(false, true);
}
-
+
private final boolean open;
+
private final boolean square;
+
public BracketOperation(final boolean open, boolean square) {
this.open = open;
this.square = square;
}
-
+
/**
* Is this an open paren?
+ *
* @return the open
*/
public final boolean isOpen() {
@@ -302,8 +317,8 @@
/**
* Is this a square bracket?
- * @return true if this is a square bracket,
- * false otherwise
+ *
+ * @return true if this is a square bracket, false otherwise
*/
public final boolean isSquare() {
return square;
@@ -332,15 +347,15 @@
return true;
}
-
}
public void literal(Literal literal) throws IOException {
operations.add(new LiteralOperation(literal));
}
-
+
public static final class LiteralOperation {
public final Literal literal;
+
public LiteralOperation(Literal literal) {
this.literal = literal;
}
@@ -348,10 +363,11 @@
public int hashCode() {
final int PRIME = 31;
int result = 1;
- result = PRIME * result + ((literal == null) ? 0 : literal.hashCode());
+ result = PRIME * result
+ + ((literal == null) ? 0 : literal.hashCode());
return result;
}
-
+
public boolean equals(Object obj) {
if (this == obj)
return true;
@@ -383,10 +399,12 @@
public void upperCaseAscii(String message) throws IOException {
operations.add(new UpperCaseASCIIOperation(message, false));
}
-
+
public static final class UpperCaseASCIIOperation {
public final String message;
+
public final boolean quote;
+
public UpperCaseASCIIOperation(String message, boolean quote) {
this.message = message;
this.quote = quote;
@@ -395,10 +413,11 @@
public int hashCode() {
final int PRIME = 31;
int result = 1;
- result = PRIME * result + ((message == null) ? 0 : message.hashCode());
+ result = PRIME * result
+ + ((message == null) ? 0 : message.hashCode());
return result;
}
-
+
public boolean equals(Object obj) {
if (this == obj)
return true;
@@ -414,8 +433,7 @@
return false;
return true;
}
-
-
+
}
public void quoteUpperCaseAscii(String message) throws IOException {
@@ -423,5 +441,5 @@
}
public void space() {
- }
+ }
}
Modified: james/protocols/imap/trunk/message/src/test/java/org/apache/james/imapserver/codec/encode/imap4rev1/server/LSubResponseEncoderTest.java
URL: http://svn.apache.org/viewvc/james/protocols/imap/trunk/message/src/test/java/org/apache/james/imapserver/codec/encode/imap4rev1/server/LSubResponseEncoderTest.java?rev=696828&r1=696827&r2=696828&view=diff
==============================================================================
--- james/protocols/imap/trunk/message/src/test/java/org/apache/james/imapserver/codec/encode/imap4rev1/server/LSubResponseEncoderTest.java (original)
+++ james/protocols/imap/trunk/message/src/test/java/org/apache/james/imapserver/codec/encode/imap4rev1/server/LSubResponseEncoderTest.java Thu Sep 18 14:44:56 2008
@@ -33,13 +33,15 @@
public class LSubResponseEncoderTest extends MockObjectTestCase {
LSubResponseEncoder encoder;
+
Mock mockNextEncoder;
+
Mock composer;
-
+
protected void setUp() throws Exception {
super.setUp();
mockNextEncoder = mock(ImapEncoder.class);
- composer = mock(ImapResponseComposer.class);
+ composer = mock(ImapResponseComposer.class);
encoder = new LSubResponseEncoder((ImapEncoder) mockNextEncoder.proxy());
}
@@ -48,30 +50,40 @@
}
public void testIsAcceptable() {
- assertFalse(encoder.isAcceptable(new ListResponse(true, true, true, true, ".", "name")));
+ assertFalse(encoder.isAcceptable(new ListResponse(true, true, true,
+ true, ".", "name")));
assertTrue(encoder.isAcceptable(new LSubResponse("name", ".", true)));
- assertFalse(encoder.isAcceptable((ImapMessage) mock(ImapMessage.class).proxy()));
+ assertFalse(encoder.isAcceptable((ImapMessage) mock(ImapMessage.class)
+ .proxy()));
assertFalse(encoder.isAcceptable(null));
}
-
+
public void testName() throws Exception {
- composer.expects(once()).method("listResponse").with(same("LSUB"), NULL, same("."), same("INBOX.name"));
- encoder.encode(new LSubResponse("INBOX.name", ".", false), (ImapResponseComposer) composer.proxy());
+ composer.expects(once()).method("listResponse").with(same("LSUB"),
+ NULL, same("."), same("INBOX.name"));
+ encoder.encode(new LSubResponse("INBOX.name", ".", false),
+ (ImapResponseComposer) composer.proxy());
}
-
+
public void testDelimiter() throws Exception {
- composer.expects(once()).method("listResponse").with(same("LSUB"), NULL, same("@"), same("INBOX.name"));
- encoder.encode(new LSubResponse("INBOX.name", "@", false), (ImapResponseComposer) composer.proxy());
+ composer.expects(once()).method("listResponse").with(same("LSUB"),
+ NULL, same("@"), same("INBOX.name"));
+ encoder.encode(new LSubResponse("INBOX.name", "@", false),
+ (ImapResponseComposer) composer.proxy());
}
-
+
public void testNoDelimiter() throws Exception {
- composer.expects(once()).method("listResponse").with(same("LSUB"), NULL, NULL, same("INBOX.name"));
- encoder.encode(new LSubResponse("INBOX.name", null, false), (ImapResponseComposer) composer.proxy());
+ composer.expects(once()).method("listResponse").with(same("LSUB"),
+ NULL, NULL, same("INBOX.name"));
+ encoder.encode(new LSubResponse("INBOX.name", null, false),
+ (ImapResponseComposer) composer.proxy());
}
-
+
public void testNoSelect() throws Exception {
- String[] values = {ImapConstants.NAME_ATTRIBUTE_NOSELECT};
- composer.expects(once()).method("listResponse").with(same("LSUB"), eq(Arrays.asList(values)), same("."), same("INBOX.name"));
- encoder.encode(new LSubResponse("INBOX.name", ".", true), (ImapResponseComposer) composer.proxy());
+ String[] values = { ImapConstants.NAME_ATTRIBUTE_NOSELECT };
+ composer.expects(once()).method("listResponse").with(same("LSUB"),
+ eq(Arrays.asList(values)), same("."), same("INBOX.name"));
+ encoder.encode(new LSubResponse("INBOX.name", ".", true),
+ (ImapResponseComposer) composer.proxy());
}
}
Modified: james/protocols/imap/trunk/message/src/test/java/org/apache/james/imapserver/codec/encode/imap4rev1/server/ListResponseEncoderTest.java
URL: http://svn.apache.org/viewvc/james/protocols/imap/trunk/message/src/test/java/org/apache/james/imapserver/codec/encode/imap4rev1/server/ListResponseEncoderTest.java?rev=696828&r1=696827&r2=696828&view=diff
==============================================================================
--- james/protocols/imap/trunk/message/src/test/java/org/apache/james/imapserver/codec/encode/imap4rev1/server/ListResponseEncoderTest.java (original)
+++ james/protocols/imap/trunk/message/src/test/java/org/apache/james/imapserver/codec/encode/imap4rev1/server/ListResponseEncoderTest.java Thu Sep 18 14:44:56 2008
@@ -28,19 +28,23 @@
public class ListResponseEncoderTest extends MockObjectTestCase {
- private static final long[] IDS = {1, 4, 9, 16};
-
+ private static final long[] IDS = { 1, 4, 9, 16 };
+
SearchResponse response;
+
SearchResponseEncoder encoder;
+
Mock mockNextEncoder;
+
Mock composer;
-
+
protected void setUp() throws Exception {
super.setUp();
mockNextEncoder = mock(ImapEncoder.class);
- composer = mock(ImapResponseComposer.class);
+ composer = mock(ImapResponseComposer.class);
response = new SearchResponse(IDS);
- encoder = new SearchResponseEncoder((ImapEncoder) mockNextEncoder.proxy());
+ encoder = new SearchResponseEncoder((ImapEncoder) mockNextEncoder
+ .proxy());
}
protected void tearDown() throws Exception {
@@ -49,12 +53,13 @@
public void testIsAcceptable() {
assertTrue(encoder.isAcceptable(response));
- assertFalse(encoder.isAcceptable((ImapMessage) mock(ImapMessage.class).proxy()));
+ assertFalse(encoder.isAcceptable((ImapMessage) mock(ImapMessage.class)
+ .proxy()));
assertFalse(encoder.isAcceptable(null));
}
-
+
public void testEncode() throws Exception {
- composer.expects(once()).method("searchResponse").with(same(IDS));
+ composer.expects(once()).method("searchResponse").with(same(IDS));
encoder.encode(response, (ImapResponseComposer) composer.proxy());
}
}
Modified: james/protocols/imap/trunk/message/src/test/java/org/apache/james/imapserver/codec/encode/imap4rev1/server/STATUSResponseEncoderTest.java
URL: http://svn.apache.org/viewvc/james/protocols/imap/trunk/message/src/test/java/org/apache/james/imapserver/codec/encode/imap4rev1/server/STATUSResponseEncoderTest.java?rev=696828&r1=696827&r2=696828&view=diff
==============================================================================
--- james/protocols/imap/trunk/message/src/test/java/org/apache/james/imapserver/codec/encode/imap4rev1/server/STATUSResponseEncoderTest.java (original)
+++ james/protocols/imap/trunk/message/src/test/java/org/apache/james/imapserver/codec/encode/imap4rev1/server/STATUSResponseEncoderTest.java Thu Sep 18 14:44:56 2008
@@ -27,29 +27,34 @@
import org.jmock.MockObjectTestCase;
import org.jmock.core.Constraint;
-public class STATUSResponseEncoderTest extends MockObjectTestCase{
+public class STATUSResponseEncoderTest extends MockObjectTestCase {
STATUSResponseEncoder encoder;
+
Mock mockNextEncoder;
+
Mock composer;
-
+
protected void setUp() throws Exception {
super.setUp();
mockNextEncoder = mock(ImapEncoder.class);
- composer = mock(ImapResponseComposer.class);
- encoder = new STATUSResponseEncoder((ImapEncoder) mockNextEncoder.proxy());
+ composer = mock(ImapResponseComposer.class);
+ encoder = new STATUSResponseEncoder((ImapEncoder) mockNextEncoder
+ .proxy());
}
protected void tearDown() throws Exception {
super.tearDown();
}
-
+
public void testIsAcceptable() throws Exception {
- assertTrue(encoder.isAcceptable(new STATUSResponse(null, null, null, null, null,"mailbox")));
- assertFalse(encoder.isAcceptable((ImapMessage) mock(ImapMessage.class).proxy()));
+ assertTrue(encoder.isAcceptable(new STATUSResponse(null, null, null,
+ null, null, "mailbox")));
+ assertFalse(encoder.isAcceptable((ImapMessage) mock(ImapMessage.class)
+ .proxy()));
assertFalse(encoder.isAcceptable(null));
}
-
+
public void testDoEncode() throws Exception {
Long messages = new Long(2);
Long recent = new Long(3);
@@ -57,11 +62,12 @@
Long uidValidity = new Long(7);
Long unseen = new Long(11);
String mailbox = "A mailbox named desire";
- Constraint[] args = {same(messages), same(recent), same(uidNext),
- same(uidValidity), same(unseen), same(mailbox)};
-
+ Constraint[] args = { same(messages), same(recent), same(uidNext),
+ same(uidValidity), same(unseen), same(mailbox) };
+
composer.expects(once()).method("statusResponse").with(args);
- encoder.encode(new STATUSResponse(messages, recent, uidNext, uidValidity, unseen, mailbox),
- (ImapResponseComposer) composer.proxy());
+ encoder.encode(new STATUSResponse(messages, recent, uidNext,
+ uidValidity, unseen, mailbox), (ImapResponseComposer) composer
+ .proxy());
}
}
Modified: james/protocols/imap/trunk/message/src/test/java/org/apache/james/imapserver/codec/encode/imap4rev1/server/SearchResponseEncoderTest.java
URL: http://svn.apache.org/viewvc/james/protocols/imap/trunk/message/src/test/java/org/apache/james/imapserver/codec/encode/imap4rev1/server/SearchResponseEncoderTest.java?rev=696828&r1=696827&r2=696828&view=diff
==============================================================================
--- james/protocols/imap/trunk/message/src/test/java/org/apache/james/imapserver/codec/encode/imap4rev1/server/SearchResponseEncoderTest.java (original)
+++ james/protocols/imap/trunk/message/src/test/java/org/apache/james/imapserver/codec/encode/imap4rev1/server/SearchResponseEncoderTest.java Thu Sep 18 14:44:56 2008
@@ -33,13 +33,15 @@
public class SearchResponseEncoderTest extends MockObjectTestCase {
ListResponseEncoder encoder;
+
Mock mockNextEncoder;
+
Mock composer;
-
+
protected void setUp() throws Exception {
super.setUp();
mockNextEncoder = mock(ImapEncoder.class);
- composer = mock(ImapResponseComposer.class);
+ composer = mock(ImapResponseComposer.class);
encoder = new ListResponseEncoder((ImapEncoder) mockNextEncoder.proxy());
}
@@ -48,55 +50,75 @@
}
public void testIsAcceptable() {
- assertTrue(encoder.isAcceptable(new ListResponse(true, true, true, true, ".", "name")));
+ assertTrue(encoder.isAcceptable(new ListResponse(true, true, true,
+ true, ".", "name")));
assertFalse(encoder.isAcceptable(new LSubResponse("name", ".", true)));
- assertFalse(encoder.isAcceptable((ImapMessage) mock(ImapMessage.class).proxy()));
+ assertFalse(encoder.isAcceptable((ImapMessage) mock(ImapMessage.class)
+ .proxy()));
assertFalse(encoder.isAcceptable(null));
}
-
+
public void testName() throws Exception {
- composer.expects(once()).method("listResponse").with(same("LIST"), NULL, same("."), same("INBOX.name"));
- encoder.encode(new ListResponse(false, false, false, false, ".", "INBOX.name"), (ImapResponseComposer) composer.proxy());
+ composer.expects(once()).method("listResponse").with(same("LIST"),
+ NULL, same("."), same("INBOX.name"));
+ encoder.encode(new ListResponse(false, false, false, false, ".",
+ "INBOX.name"), (ImapResponseComposer) composer.proxy());
}
-
+
public void testDelimiter() throws Exception {
- composer.expects(once()).method("listResponse").with(same("LIST"), NULL, same("@"), same("INBOX.name"));
- encoder.encode(new ListResponse(false, false, false, false, "@", "INBOX.name"), (ImapResponseComposer) composer.proxy());
+ composer.expects(once()).method("listResponse").with(same("LIST"),
+ NULL, same("@"), same("INBOX.name"));
+ encoder.encode(new ListResponse(false, false, false, false, "@",
+ "INBOX.name"), (ImapResponseComposer) composer.proxy());
}
-
+
public void testNoDelimiter() throws Exception {
- composer.expects(once()).method("listResponse").with(same("LIST"), NULL, NULL, same("INBOX.name"));
- encoder.encode(new ListResponse(false, false, false, false, null, "INBOX.name"), (ImapResponseComposer) composer.proxy());
+ composer.expects(once()).method("listResponse").with(same("LIST"),
+ NULL, NULL, same("INBOX.name"));
+ encoder.encode(new ListResponse(false, false, false, false, null,
+ "INBOX.name"), (ImapResponseComposer) composer.proxy());
}
-
+
public void testAllAttributes() throws Exception {
- String[] all = {ImapConstants.NAME_ATTRIBUTE_NOINFERIORS, ImapConstants.NAME_ATTRIBUTE_NOSELECT,
- ImapConstants.NAME_ATTRIBUTE_MARKED, ImapConstants.NAME_ATTRIBUTE_UNMARKED};
- composer.expects(once()).method("listResponse").with(same("LIST"), eq(Arrays.asList(all)), same("."), same("INBOX.name"));
- encoder.encode(new ListResponse(true, true, true, true, ".", "INBOX.name"), (ImapResponseComposer) composer.proxy());
+ String[] all = { ImapConstants.NAME_ATTRIBUTE_NOINFERIORS,
+ ImapConstants.NAME_ATTRIBUTE_NOSELECT,
+ ImapConstants.NAME_ATTRIBUTE_MARKED,
+ ImapConstants.NAME_ATTRIBUTE_UNMARKED };
+ composer.expects(once()).method("listResponse").with(same("LIST"),
+ eq(Arrays.asList(all)), same("."), same("INBOX.name"));
+ encoder.encode(new ListResponse(true, true, true, true, ".",
+ "INBOX.name"), (ImapResponseComposer) composer.proxy());
}
-
+
public void testNoInferiors() throws Exception {
- String[] values = {ImapConstants.NAME_ATTRIBUTE_NOINFERIORS};
- composer.expects(once()).method("listResponse").with(same("LIST"), eq(Arrays.asList(values)), same("."), same("INBOX.name"));
- encoder.encode(new ListResponse(true, false, false, false, ".", "INBOX.name"), (ImapResponseComposer) composer.proxy());
+ String[] values = { ImapConstants.NAME_ATTRIBUTE_NOINFERIORS };
+ composer.expects(once()).method("listResponse").with(same("LIST"),
+ eq(Arrays.asList(values)), same("."), same("INBOX.name"));
+ encoder.encode(new ListResponse(true, false, false, false, ".",
+ "INBOX.name"), (ImapResponseComposer) composer.proxy());
}
-
+
public void testNoSelect() throws Exception {
- String[] values = {ImapConstants.NAME_ATTRIBUTE_NOSELECT};
- composer.expects(once()).method("listResponse").with(same("LIST"), eq(Arrays.asList(values)), same("."), same("INBOX.name"));
- encoder.encode(new ListResponse(false, true, false, false, ".", "INBOX.name"), (ImapResponseComposer) composer.proxy());
+ String[] values = { ImapConstants.NAME_ATTRIBUTE_NOSELECT };
+ composer.expects(once()).method("listResponse").with(same("LIST"),
+ eq(Arrays.asList(values)), same("."), same("INBOX.name"));
+ encoder.encode(new ListResponse(false, true, false, false, ".",
+ "INBOX.name"), (ImapResponseComposer) composer.proxy());
}
-
+
public void testMarked() throws Exception {
- String[] values = {ImapConstants.NAME_ATTRIBUTE_MARKED};
- composer.expects(once()).method("listResponse").with(same("LIST"), eq(Arrays.asList(values)), same("."), same("INBOX.name"));
- encoder.encode(new ListResponse(false, false, true, false, ".", "INBOX.name"), (ImapResponseComposer) composer.proxy());
+ String[] values = { ImapConstants.NAME_ATTRIBUTE_MARKED };
+ composer.expects(once()).method("listResponse").with(same("LIST"),
+ eq(Arrays.asList(values)), same("."), same("INBOX.name"));
+ encoder.encode(new ListResponse(false, false, true, false, ".",
+ "INBOX.name"), (ImapResponseComposer) composer.proxy());
}
-
+
public void testUnmarked() throws Exception {
- String[] values = {ImapConstants.NAME_ATTRIBUTE_UNMARKED};
- composer.expects(once()).method("listResponse").with(same("LIST"), eq(Arrays.asList(values)), same("."), same("INBOX.name"));
- encoder.encode(new ListResponse(false, false, false, true, ".", "INBOX.name"), (ImapResponseComposer) composer.proxy());
+ String[] values = { ImapConstants.NAME_ATTRIBUTE_UNMARKED };
+ composer.expects(once()).method("listResponse").with(same("LIST"),
+ eq(Arrays.asList(values)), same("."), same("INBOX.name"));
+ encoder.encode(new ListResponse(false, false, false, true, ".",
+ "INBOX.name"), (ImapResponseComposer) composer.proxy());
}
}
Modified: james/protocols/imap/trunk/processor/src/main/java/org/apache/james/imapserver/processor/base/AbstractChainedImapProcessor.java
URL: http://svn.apache.org/viewvc/james/protocols/imap/trunk/processor/src/main/java/org/apache/james/imapserver/processor/base/AbstractChainedImapProcessor.java?rev=696828&r1=696827&r2=696828&view=diff
==============================================================================
--- james/protocols/imap/trunk/processor/src/main/java/org/apache/james/imapserver/processor/base/AbstractChainedImapProcessor.java (original)
+++ james/protocols/imap/trunk/processor/src/main/java/org/apache/james/imapserver/processor/base/AbstractChainedImapProcessor.java Thu Sep 18 14:44:56 2008
@@ -45,7 +45,8 @@
setupLogger(next);
}
- public void process(ImapMessage message, Responder responder, ImapSession session) {
+ public void process(ImapMessage message, Responder responder,
+ ImapSession session) {
final boolean isAcceptable = isAcceptable(message);
if (isAcceptable) {
doProcess(message, responder, session);
@@ -53,7 +54,7 @@
next.process(message, responder, session);
}
}
-
+
/**
* Is the given message acceptable?
*
@@ -69,11 +70,12 @@
*
* @param acceptableMessage
* <code>ImapMessage</code>, not null
- * @param responder <code>Responder</code>, not null
+ * @param responder
+ * <code>Responder</code>, not null
* @param session
* <code>ImapSession</code>, not null
* @return <code>ImapResponseMessage</code>, not null
*/
- abstract protected void doProcess(
- final ImapMessage acceptableMessage, final Responder responder, final ImapSession session);
+ abstract protected void doProcess(final ImapMessage acceptableMessage,
+ final Responder responder, final ImapSession session);
}
Modified: james/protocols/imap/trunk/processor/src/main/java/org/apache/james/imapserver/processor/base/AbstractImapRequestProcessor.java
URL: http://svn.apache.org/viewvc/james/protocols/imap/trunk/processor/src/main/java/org/apache/james/imapserver/processor/base/AbstractImapRequestProcessor.java?rev=696828&r1=696827&r2=696828&view=diff
==============================================================================
--- james/protocols/imap/trunk/processor/src/main/java/org/apache/james/imapserver/processor/base/AbstractImapRequestProcessor.java (original)
+++ james/protocols/imap/trunk/processor/src/main/java/org/apache/james/imapserver/processor/base/AbstractImapRequestProcessor.java Thu Sep 18 14:44:56 2008
@@ -40,104 +40,119 @@
abstract public class AbstractImapRequestProcessor extends
AbstractChainedImapProcessor implements ImapConstants {
- private final StatusResponseFactory factory;
- public AbstractImapRequestProcessor(final ImapProcessor next, final StatusResponseFactory factory) {
+ private final StatusResponseFactory factory;
+
+ public AbstractImapRequestProcessor(final ImapProcessor next,
+ final StatusResponseFactory factory) {
super(next);
this.factory = factory;
}
- protected final void doProcess(
- final ImapMessage acceptableMessage, final Responder responder,
- final ImapSession session) {
+ protected final void doProcess(final ImapMessage acceptableMessage,
+ final Responder responder, final ImapSession session) {
final ImapRequest request = (ImapRequest) acceptableMessage;
process(request, responder, session);
}
- protected final void process(final ImapRequest message, final Responder responder,
- final ImapSession session) {
+ protected final void process(final ImapRequest message,
+ final Responder responder, final ImapSession session) {
final ImapCommand command = message.getCommand();
final String tag = message.getTag();
doProcess(message, command, tag, responder, session);
}
- protected void no(final ImapCommand command, final String tag, final Responder responder, final MessagingException e) {
+ protected void no(final ImapCommand command, final String tag,
+ final Responder responder, final MessagingException e) {
final Log logger = getLog();
final ImapResponseMessage response;
if (e instanceof MailboxExistsException) {
- response = factory.taggedNo(tag, command, HumanReadableTextKey.FAILURE_MAILBOX_EXISTS);
+ response = factory.taggedNo(tag, command,
+ HumanReadableTextKey.FAILURE_MAILBOX_EXISTS);
} else if (e instanceof MailboxNotFoundException) {
- response = factory.taggedNo(tag, command, HumanReadableTextKey.FAILURE_NO_SUCH_MAILBOX);
+ response = factory.taggedNo(tag, command,
+ HumanReadableTextKey.FAILURE_NO_SUCH_MAILBOX);
} else {
if (logger != null) {
logger.info(e.getMessage());
logger.debug("Processing failed:", e);
}
- response = factory.taggedNo(tag, command, HumanReadableTextKey.GENERIC_FAILURE_DURING_PROCESSING);
+ response = factory.taggedNo(tag, command,
+ HumanReadableTextKey.GENERIC_FAILURE_DURING_PROCESSING);
}
responder.respond(response);
}
- final void doProcess(final ImapRequest message,
- final ImapCommand command, final String tag, Responder responder, ImapSession session) {
+ final void doProcess(final ImapRequest message, final ImapCommand command,
+ final String tag, Responder responder, ImapSession session) {
if (!command.validForState(session.getState())) {
- ImapResponseMessage response = factory.taggedNo(tag, command, HumanReadableTextKey.INVALID_COMMAND);
+ ImapResponseMessage response = factory.taggedNo(tag, command,
+ HumanReadableTextKey.INVALID_COMMAND);
responder.respond(response);
-
+
} else {
doProcess(message, session, tag, command, responder);
}
}
-
- protected void unsolicitedResponses(final ImapSession session,
- final ImapProcessor.Responder responder, boolean omitExpunged, boolean useUids) {
- final List responses = session.unsolicitedResponses(omitExpunged, useUids);
+
+ protected void unsolicitedResponses(final ImapSession session,
+ final ImapProcessor.Responder responder, boolean omitExpunged,
+ boolean useUids) {
+ final List responses = session.unsolicitedResponses(omitExpunged,
+ useUids);
respond(responder, responses);
}
-
- protected void unsolicitedResponses(final ImapSession session,
+
+ protected void unsolicitedResponses(final ImapSession session,
final ImapProcessor.Responder responder, boolean useUids) {
final List responses = session.unsolicitedResponses(useUids);
respond(responder, responses);
}
- private void respond(final ImapProcessor.Responder responder, final List responses) {
- for (final Iterator it=responses.iterator(); it.hasNext();) {
+ private void respond(final ImapProcessor.Responder responder,
+ final List responses) {
+ for (final Iterator it = responses.iterator(); it.hasNext();) {
ImapResponseMessage message = (ImapResponseMessage) it.next();
responder.respond(message);
}
}
- protected void okComplete(final ImapCommand command, final String tag,
+ protected void okComplete(final ImapCommand command, final String tag,
final ImapProcessor.Responder responder) {
- final StatusResponse response = factory.taggedOk(tag, command, HumanReadableTextKey.COMPLETED);
+ final StatusResponse response = factory.taggedOk(tag, command,
+ HumanReadableTextKey.COMPLETED);
responder.respond(response);
}
-
- protected void no(final ImapCommand command, final String tag,
- final ImapProcessor.Responder responder, final HumanReadableTextKey displayTextKey) {
- final StatusResponse response = factory.taggedNo(tag, command, displayTextKey);
+
+ protected void no(final ImapCommand command, final String tag,
+ final ImapProcessor.Responder responder,
+ final HumanReadableTextKey displayTextKey) {
+ final StatusResponse response = factory.taggedNo(tag, command,
+ displayTextKey);
responder.respond(response);
}
-
- protected void no(final ImapCommand command, final String tag,
- final ImapProcessor.Responder responder, final HumanReadableTextKey displayTextKey,
+
+ protected void no(final ImapCommand command, final String tag,
+ final ImapProcessor.Responder responder,
+ final HumanReadableTextKey displayTextKey,
final StatusResponse.ResponseCode responseCode) {
- final StatusResponse response = factory.taggedNo(tag, command, displayTextKey, responseCode);
+ final StatusResponse response = factory.taggedNo(tag, command,
+ displayTextKey, responseCode);
responder.respond(response);
}
-
+
protected void bye(final ImapProcessor.Responder responder) {
final StatusResponse response = factory.bye(HumanReadableTextKey.BYE);
responder.respond(response);
}
-
- protected void bye(final ImapProcessor.Responder responder, final HumanReadableTextKey key) {
+
+ protected void bye(final ImapProcessor.Responder responder,
+ final HumanReadableTextKey key) {
final StatusResponse response = factory.bye(key);
responder.respond(response);
}
-
+
protected abstract void doProcess(final ImapRequest message,
- ImapSession session, String tag, ImapCommand command, Responder responder);
-
+ ImapSession session, String tag, ImapCommand command,
+ Responder responder);
}
Modified: james/protocols/imap/trunk/processor/src/main/java/org/apache/james/imapserver/processor/base/AbstractMailboxAwareProcessor.java
URL: http://svn.apache.org/viewvc/james/protocols/imap/trunk/processor/src/main/java/org/apache/james/imapserver/processor/base/AbstractMailboxAwareProcessor.java?rev=696828&r1=696827&r2=696828&view=diff
==============================================================================
--- james/protocols/imap/trunk/processor/src/main/java/org/apache/james/imapserver/processor/base/AbstractMailboxAwareProcessor.java (original)
+++ james/protocols/imap/trunk/processor/src/main/java/org/apache/james/imapserver/processor/base/AbstractMailboxAwareProcessor.java Thu Sep 18 14:44:56 2008
@@ -26,34 +26,42 @@
import org.apache.james.mailboxmanager.manager.MailboxManager;
import org.apache.james.mailboxmanager.manager.MailboxManagerProvider;
-abstract public class AbstractMailboxAwareProcessor extends AbstractImapRequestProcessor {
+abstract public class AbstractMailboxAwareProcessor extends
+ AbstractImapRequestProcessor {
private final MailboxManagerProvider mailboxManagerProvider;
-
- public AbstractMailboxAwareProcessor(final ImapProcessor next,
- final MailboxManagerProvider mailboxManagerProvider, final StatusResponseFactory factory) {
+
+ public AbstractMailboxAwareProcessor(final ImapProcessor next,
+ final MailboxManagerProvider mailboxManagerProvider,
+ final StatusResponseFactory factory) {
super(next, factory);
this.mailboxManagerProvider = mailboxManagerProvider;
}
-
- public String buildFullName(final ImapSession session, String mailboxName) throws MailboxManagerException {
+
+ public String buildFullName(final ImapSession session, String mailboxName)
+ throws MailboxManagerException {
final String user = ImapSessionUtils.getUserName(session);
return buildFullName(mailboxName, user);
}
- private String buildFullName(String mailboxName, String user) throws MailboxManagerException {
+ private String buildFullName(String mailboxName, String user)
+ throws MailboxManagerException {
if (!mailboxName.startsWith(NAMESPACE_PREFIX)) {
- mailboxName = mailboxManagerProvider.getMailboxManager().resolve(user,mailboxName);
+ mailboxName = mailboxManagerProvider.getMailboxManager().resolve(
+ user, mailboxName);
}
return mailboxName;
}
- public MailboxManager getMailboxManager( final ImapSession session ) throws MailboxManagerException {
- // TODO: removed badly implemented and ineffective check that mailbox user matches current user
+ public MailboxManager getMailboxManager(final ImapSession session)
+ throws MailboxManagerException {
+ // TODO: removed badly implemented and ineffective check that mailbox
+ // user matches current user
// TODO: add check into user login methods
// TODO: shouldn't need to cache mailbox manager
// TODO: consolidate API by deleting provider and supply manager direct
- MailboxManager result = (MailboxManager) session.getAttribute( ImapSessionUtils.MAILBOX_MANAGER_ATTRIBUTE_SESSION_KEY );
+ MailboxManager result = (MailboxManager) session
+ .getAttribute(ImapSessionUtils.MAILBOX_MANAGER_ATTRIBUTE_SESSION_KEY);
if (result == null) {
result = mailboxManagerProvider.getMailboxManager();
//
@@ -61,23 +69,27 @@
// But not need to create mailbox until user is logged in
//
final String user = ImapSessionUtils.getUserName(session);
- if (user != null)
- {
- result.getMailbox(buildFullName(MailboxManager.INBOX, user), true);
+ if (user != null) {
+ result.getMailbox(buildFullName(MailboxManager.INBOX, user),
+ true);
// TODO: reconsider decision not to sunchronise
// TODO: mailbox creation is ATM an expensive operation
// TODO: so caching is required
- // TODO: caching in the session seems like the wrong design decision, though
- // TODO: the mailbox provider should perform any caching that is required
- session.setAttribute( ImapSessionUtils.MAILBOX_MANAGER_ATTRIBUTE_SESSION_KEY, result );
+ // TODO: caching in the session seems like the wrong design
+ // decision, though
+ // TODO: the mailbox provider should perform any caching that is
+ // required
+ session.setAttribute(
+ ImapSessionUtils.MAILBOX_MANAGER_ATTRIBUTE_SESSION_KEY,
+ result);
if (ImapSessionUtils.getMailboxSession(session) == null) {
- final MailboxSession mailboxSession = (MailboxSession) result.createSession();
+ final MailboxSession mailboxSession = (MailboxSession) result
+ .createSession();
ImapSessionUtils.setMailboxSession(session, mailboxSession);
}
}
}
return result;
}
-
}
Modified: james/protocols/imap/trunk/processor/src/main/java/org/apache/james/imapserver/processor/base/AuthorizationException.java
URL: http://svn.apache.org/viewvc/james/protocols/imap/trunk/processor/src/main/java/org/apache/james/imapserver/processor/base/AuthorizationException.java?rev=696828&r1=696827&r2=696828&view=diff
==============================================================================
--- james/protocols/imap/trunk/processor/src/main/java/org/apache/james/imapserver/processor/base/AuthorizationException.java (original)
+++ james/protocols/imap/trunk/processor/src/main/java/org/apache/james/imapserver/processor/base/AuthorizationException.java Thu Sep 18 14:44:56 2008
@@ -23,17 +23,15 @@
* Thrown when a user attempts to do something (e.g. alter mailbox) for which
* they do not have appropriate rights.
*/
-public class AuthorizationException
- extends Exception
-{
+public class AuthorizationException extends Exception {
/**
* Construct a new <code>AuthorizationException</code> instance.
- *
- * @param message The detail message for this exception (mandatory).
+ *
+ * @param message
+ * The detail message for this exception (mandatory).
*/
- public AuthorizationException( final String message )
- {
- super( message );
+ public AuthorizationException(final String message) {
+ super(message);
}
}
Modified: james/protocols/imap/trunk/processor/src/main/java/org/apache/james/imapserver/processor/base/ImapResponseMessageProcessor.java
URL: http://svn.apache.org/viewvc/james/protocols/imap/trunk/processor/src/main/java/org/apache/james/imapserver/processor/base/ImapResponseMessageProcessor.java?rev=696828&r1=696827&r2=696828&view=diff
==============================================================================
--- james/protocols/imap/trunk/processor/src/main/java/org/apache/james/imapserver/processor/base/ImapResponseMessageProcessor.java (original)
+++ james/protocols/imap/trunk/processor/src/main/java/org/apache/james/imapserver/processor/base/ImapResponseMessageProcessor.java Thu Sep 18 14:44:56 2008
@@ -35,7 +35,8 @@
return result;
}
- protected void doProcess(ImapMessage acceptableMessage, Responder responder, ImapSession session) {
+ protected void doProcess(ImapMessage acceptableMessage,
+ Responder responder, ImapSession session) {
final ImapResponseMessage result = (ImapResponseMessage) acceptableMessage;
responder.respond(result);
}
Modified: james/protocols/imap/trunk/processor/src/main/java/org/apache/james/imapserver/processor/base/ImapSessionUtils.java
URL: http://svn.apache.org/viewvc/james/protocols/imap/trunk/processor/src/main/java/org/apache/james/imapserver/processor/base/ImapSessionUtils.java?rev=696828&r1=696827&r2=696828&view=diff
==============================================================================
--- james/protocols/imap/trunk/processor/src/main/java/org/apache/james/imapserver/processor/base/ImapSessionUtils.java (original)
+++ james/protocols/imap/trunk/processor/src/main/java/org/apache/james/imapserver/processor/base/ImapSessionUtils.java Thu Sep 18 14:44:56 2008
@@ -30,50 +30,56 @@
import org.apache.james.mailboxmanager.mailbox.Mailbox;
public class ImapSessionUtils {
-
- public static final String MAILBOX_USER_ATTRIBUTE_SESSION_KEY
- = "org.apache.james.api.imap.MAILBOX_USER_ATTRIBUTE_SESSION_KEY";
- public static final String MAILBOX_MANAGER_ATTRIBUTE_SESSION_KEY
- = "org.apache.james.api.imap.MAILBOX_MANAGER_ATTRIBUTE_SESSION_KEY";
- public static final String SELECTED_MAILBOX_ATTRIBUTE_SESSION_KEY
- = "org.apache.james.api.imap.SELECTED_MAILBOX_ATTRIBUTE_SESSION_KEY";
- public static final String MAILBOX_SESSION_ATTRIBUTE_SESSION_KEY
- = "org.apache.james.api.imap.MAILBOX_SESSION_ATTRIBUTE_SESSION_KEY";
-
- public static void addUnsolicitedResponses(AbstractImapResponse response, ImapSession session, boolean useUids) {
+
+ public static final String MAILBOX_USER_ATTRIBUTE_SESSION_KEY = "org.apache.james.api.imap.MAILBOX_USER_ATTRIBUTE_SESSION_KEY";
+
+ public static final String MAILBOX_MANAGER_ATTRIBUTE_SESSION_KEY = "org.apache.james.api.imap.MAILBOX_MANAGER_ATTRIBUTE_SESSION_KEY";
+
+ public static final String SELECTED_MAILBOX_ATTRIBUTE_SESSION_KEY = "org.apache.james.api.imap.SELECTED_MAILBOX_ATTRIBUTE_SESSION_KEY";
+
+ public static final String MAILBOX_SESSION_ATTRIBUTE_SESSION_KEY = "org.apache.james.api.imap.MAILBOX_SESSION_ATTRIBUTE_SESSION_KEY";
+
+ public static void addUnsolicitedResponses(AbstractImapResponse response,
+ ImapSession session, boolean useUids) {
List unsolicitedResponses = session.unsolicitedResponses(useUids);
response.addUnsolicitedResponses(unsolicitedResponses);
}
-
- public static void addUnsolicitedResponses(ImapSession session, boolean useUids, final Responder responder) {
+
+ public static void addUnsolicitedResponses(ImapSession session,
+ boolean useUids, final Responder responder) {
final List unsolicitedResponses = session.unsolicitedResponses(useUids);
- for (Iterator it = unsolicitedResponses.iterator();it.hasNext();) {
+ for (Iterator it = unsolicitedResponses.iterator(); it.hasNext();) {
ImapResponseMessage message = (ImapResponseMessage) it.next();
responder.respond(message);
}
}
-
- public static Mailbox getMailbox( final ImapSession session ) {
- Mailbox result
- = (Mailbox) session.getAttribute(SELECTED_MAILBOX_ATTRIBUTE_SESSION_KEY);
+
+ public static Mailbox getMailbox(final ImapSession session) {
+ Mailbox result = (Mailbox) session
+ .getAttribute(SELECTED_MAILBOX_ATTRIBUTE_SESSION_KEY);
return result;
}
- public static MailboxSession getMailboxSession( final ImapSession session) {
- final MailboxSession result = (MailboxSession) session.getAttribute( ImapSessionUtils.MAILBOX_SESSION_ATTRIBUTE_SESSION_KEY );
+ public static MailboxSession getMailboxSession(final ImapSession session) {
+ final MailboxSession result = (MailboxSession) session
+ .getAttribute(ImapSessionUtils.MAILBOX_SESSION_ATTRIBUTE_SESSION_KEY);
return result;
}
-
- public static void setMailboxSession(final ImapSession session, final MailboxSession mailboxSession) {
- session.setAttribute(ImapSessionUtils.MAILBOX_SESSION_ATTRIBUTE_SESSION_KEY, mailboxSession);
- }
-
- public static String getUserName( final ImapSession session ) {
- final String result = (String) session.getAttribute(MAILBOX_USER_ATTRIBUTE_SESSION_KEY);
+
+ public static void setMailboxSession(final ImapSession session,
+ final MailboxSession mailboxSession) {
+ session.setAttribute(
+ ImapSessionUtils.MAILBOX_SESSION_ATTRIBUTE_SESSION_KEY,
+ mailboxSession);
+ }
+
+ public static String getUserName(final ImapSession session) {
+ final String result = (String) session
+ .getAttribute(MAILBOX_USER_ATTRIBUTE_SESSION_KEY);
return result;
}
-
- public static void setUserName( final ImapSession session, final String user) {
+
+ public static void setUserName(final ImapSession session, final String user) {
session.setAttribute(MAILBOX_USER_ATTRIBUTE_SESSION_KEY, user);
}
Modified: james/protocols/imap/trunk/processor/src/main/java/org/apache/james/imapserver/processor/base/SelectedMailboxSessionImpl.java
URL: http://svn.apache.org/viewvc/james/protocols/imap/trunk/processor/src/main/java/org/apache/james/imapserver/processor/base/SelectedMailboxSessionImpl.java?rev=696828&r1=696827&r2=696828&view=diff
==============================================================================
--- james/protocols/imap/trunk/processor/src/main/java/org/apache/james/imapserver/processor/base/SelectedMailboxSessionImpl.java (original)
+++ james/protocols/imap/trunk/processor/src/main/java/org/apache/james/imapserver/processor/base/SelectedMailboxSessionImpl.java Thu Sep 18 14:44:56 2008
@@ -45,18 +45,23 @@
import org.apache.james.mailboxmanager.util.MailboxEventAnalyser;
import org.apache.james.mailboxmanager.util.UidToMsnConverter;
-//TODO: deal with deleted or renamed mailboxes
-public class SelectedMailboxSessionImpl extends AbstractLogEnabled implements SelectedImapMailbox {
+// TODO: deal with deleted or renamed mailboxes
+public class SelectedMailboxSessionImpl extends AbstractLogEnabled implements
+ SelectedImapMailbox {
private final Mailbox mailbox;
-
+
private final MailboxEventAnalyser events;
- private final UidToMsnConverter converter;
+
+ private final UidToMsnConverter converter;
+
private final MailboxSession mailboxSession;
+
private final Set recentUids;
+
private boolean recentUidRemoved;
-
- public SelectedMailboxSessionImpl(Mailbox mailbox, List uids,
+
+ public SelectedMailboxSessionImpl(Mailbox mailbox, List uids,
MailboxSession mailboxSession) throws MailboxManagerException {
this.mailbox = mailbox;
this.mailboxSession = mailboxSession;
@@ -81,13 +86,14 @@
public boolean isSizeChanged() {
return events.isSizeChanged();
}
-
+
public Mailbox getMailbox() {
return mailbox;
}
/**
- * @see org.apache.james.api.imap.process.SelectedImapMailbox#unsolicitedResponses(boolean, boolean)
+ * @see org.apache.james.api.imap.process.SelectedImapMailbox#unsolicitedResponses(boolean,
+ * boolean)
*/
public List unsolicitedResponses(boolean omitExpunged, boolean useUid) {
final List results = new ArrayList();
@@ -101,14 +107,14 @@
if (!omitExpunged) {
addExpungedResponses(results, mailbox);
}
- if(sizeChanged || (recentUidRemoved && !omitExpunged)) {
+ if (sizeChanged || (recentUidRemoved && !omitExpunged)) {
addRecentResponses(results, mailbox);
recentUidRemoved = false;
}
-
+
// Message updates
addFlagsResponses(results, useUid, mailbox);
-
+
events.reset();
return results;
}
@@ -116,18 +122,19 @@
public int msn(long uid) {
return converter.getMsn(uid);
}
-
+
/**
* Is the mailbox deleted?
- * @return true when the mailbox has been deleted by another session,
- * false otherwise
+ *
+ * @return true when the mailbox has been deleted by another session, false
+ * otherwise
*/
public boolean isDeletedByOtherSession() {
return events.isDeletedByOtherSession();
}
-
+
private void addExpungedResponses(List responses, final Mailbox mailbox) {
- for (Iterator it = events.expungedUids(); it.hasNext();) {
+ for (Iterator it = events.expungedUids(); it.hasNext();) {
final Long uid = (Long) it.next();
final long uidValue = uid.longValue();
final int msn = msn(uidValue);
@@ -135,19 +142,21 @@
ExpungeResponse response = new ExpungeResponse(msn);
responses.add(response);
}
-
- for (Iterator it = events.expungedUids(); it.hasNext();) {
+
+ for (Iterator it = events.expungedUids(); it.hasNext();) {
final Long uid = (Long) it.next();
final long uidValue = uid.longValue();
converter.expunge(uidValue);
}
}
- private void addFlagsResponses(final List responses, boolean useUid, final Mailbox mailbox) {
+ private void addFlagsResponses(final List responses, boolean useUid,
+ final Mailbox mailbox) {
try {
for (final Iterator it = events.flagUpdateUids(); it.hasNext();) {
Long uid = (Long) it.next();
- MessageRange messageSet = MessageRangeImpl.oneUid(uid.longValue());
+ MessageRange messageSet = MessageRangeImpl.oneUid(uid
+ .longValue());
addFlagsResponses(responses, useUid, mailbox, messageSet);
}
} catch (MessagingException e) {
@@ -156,8 +165,11 @@
}
}
- private void addFlagsResponses(final List responses, boolean useUid, final Mailbox mailbox, MessageRange messageSet) throws MailboxManagerException {
- final Iterator it = mailbox.getMessages(messageSet, FetchGroupImpl.FLAGS, mailboxSession);
+ private void addFlagsResponses(final List responses, boolean useUid,
+ final Mailbox mailbox, MessageRange messageSet)
+ throws MailboxManagerException {
+ final Iterator it = mailbox.getMessages(messageSet,
+ FetchGroupImpl.FLAGS, mailboxSession);
while (it.hasNext()) {
MessageResult mr = (MessageResult) it.next();
final long uid = mr.getUid();
@@ -174,7 +186,8 @@
} else {
flags.remove(Flags.Flag.RECENT);
}
- FetchResponse response = new FetchResponse(msn, flags, uidOut, null, null, null, null, null, null);
+ FetchResponse response = new FetchResponse(msn, flags, uidOut,
+ null, null, null, null, null, null);
responses.add(response);
}
}
@@ -186,7 +199,8 @@
responses.add(response);
}
- private void handleResponseException(final List responses, MessagingException e, final String message) {
+ private void handleResponseException(final List responses,
+ MessagingException e, final String message) {
getLog().info(message);
getLog().debug(message, e);
// TODO: consider whether error message should be passed to the user
@@ -195,15 +209,15 @@
}
private void addExistsResponses(final List responses, final Mailbox mailbox) {
- try {
- final int messageCount = mailbox.getMessageCount(mailboxSession);
- // TODO: use factory
- ExistsResponse response = new ExistsResponse(messageCount);
- responses.add(response);
- } catch (MailboxManagerException e) {
- final String message = "Failed to retrieve exists count data";
- handleResponseException(responses, e, message);
- }
+ try {
+ final int messageCount = mailbox.getMessageCount(mailboxSession);
+ // TODO: use factory
+ ExistsResponse response = new ExistsResponse(messageCount);
+ responses.add(response);
+ } catch (MailboxManagerException e) {
+ final String message = "Failed to retrieve exists count data";
+ handleResponseException(responses, e, message);
+ }
}
public long uid(int msn) {
@@ -217,7 +231,7 @@
}
return result;
}
-
+
public boolean addRecent(long uid) {
final boolean result = recentUids.add(new Long(uid));
return result;
@@ -227,7 +241,7 @@
checkExpungedRecents();
final long[] results = new long[recentUids.size()];
int count = 0;
- for (Iterator it=recentUids.iterator();it.hasNext();) {
+ for (Iterator it = recentUids.iterator(); it.hasNext();) {
Long uid = (Long) it.next();
results[count++] = uid.longValue();
}
@@ -242,9 +256,9 @@
public String getName() {
return mailbox.getName();
}
-
+
private void checkExpungedRecents() {
- for(final Iterator it = events.expungedUids();it.hasNext();) {
+ for (final Iterator it = events.expungedUids(); it.hasNext();) {
final Long uid = (Long) it.next();
removeRecent(uid.longValue());
}
Modified: james/protocols/imap/trunk/processor/src/main/java/org/apache/james/imapserver/processor/base/UnknownRequestImapProcessor.java
URL: http://svn.apache.org/viewvc/james/protocols/imap/trunk/processor/src/main/java/org/apache/james/imapserver/processor/base/UnknownRequestImapProcessor.java?rev=696828&r1=696827&r2=696828&view=diff
==============================================================================
--- james/protocols/imap/trunk/processor/src/main/java/org/apache/james/imapserver/processor/base/UnknownRequestImapProcessor.java (original)
+++ james/protocols/imap/trunk/processor/src/main/java/org/apache/james/imapserver/processor/base/UnknownRequestImapProcessor.java Thu Sep 18 14:44:56 2008
@@ -30,10 +30,11 @@
import org.apache.james.api.imap.process.ImapProcessor;
import org.apache.james.api.imap.process.ImapSession;
-public class UnknownRequestImapProcessor extends AbstractLogEnabled implements ImapProcessor {
+public class UnknownRequestImapProcessor extends AbstractLogEnabled implements
+ ImapProcessor {
private final StatusResponseFactory factory;
-
+
public UnknownRequestImapProcessor(StatusResponseFactory factory) {
super();
this.factory = factory;
@@ -49,14 +50,16 @@
ImapRequest request = (ImapRequest) message;
final String tag = request.getTag();
final ImapCommand command = request.getCommand();
- result = factory.taggedBad(tag, command, HumanReadableTextKey.UNKNOWN_COMMAND);
+ result = factory.taggedBad(tag, command,
+ HumanReadableTextKey.UNKNOWN_COMMAND);
} else {
result = factory.untaggedBad(HumanReadableTextKey.UNKNOWN_COMMAND);
}
return result;
}
- public void process(ImapMessage message, Responder responder, ImapSession session) {
+ public void process(ImapMessage message, Responder responder,
+ ImapSession session) {
final ImapResponseMessage response = process(message, session);
responder.respond(response);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org