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 [10/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/mailbox/src/main/java/org/apache/james/mailboxmanager/util/UidRange.java
URL: http://svn.apache.org/viewvc/james/protocols/imap/trunk/mailbox/src/main/java/org/apache/james/mailboxmanager/util/UidRange.java?rev=696828&r1=696827&r2=696828&view=diff
==============================================================================
--- james/protocols/imap/trunk/mailbox/src/main/java/org/apache/james/mailboxmanager/util/UidRange.java (original)
+++ james/protocols/imap/trunk/mailbox/src/main/java/org/apache/james/mailboxmanager/util/UidRange.java Thu Sep 18 14:44:56 2008
@@ -20,14 +20,14 @@
package org.apache.james.mailboxmanager.util;
public class UidRange implements Comparable {
-
+
private long fromUid;
-
+
private long toUid;
-
- public UidRange(long fromUid,long toUid) {
- this.fromUid=fromUid;
- this.toUid=toUid;
+
+ public UidRange(long fromUid, long toUid) {
+ this.fromUid = fromUid;
+ this.toUid = toUid;
}
public long getFromUid() {
@@ -37,9 +37,9 @@
public long getToUid() {
return toUid;
}
-
+
public String toString() {
- return fromUid+":"+toUid;
+ return fromUid + ":" + toUid;
}
public int compareTo(Object o) {
Modified: james/protocols/imap/trunk/mailbox/src/main/java/org/apache/james/mailboxmanager/util/UidToMsnConverter.java
URL: http://svn.apache.org/viewvc/james/protocols/imap/trunk/mailbox/src/main/java/org/apache/james/mailboxmanager/util/UidToMsnConverter.java?rev=696828&r1=696827&r2=696828&view=diff
==============================================================================
--- james/protocols/imap/trunk/mailbox/src/main/java/org/apache/james/mailboxmanager/util/UidToMsnConverter.java (original)
+++ james/protocols/imap/trunk/mailbox/src/main/java/org/apache/james/mailboxmanager/util/UidToMsnConverter.java Thu Sep 18 14:44:56 2008
@@ -36,7 +36,7 @@
protected SortedMap uidToMsn;
protected long highestUid = 0;
-
+
protected int highestMsn = 0;
public UidToMsnConverter(final Collection uids) {
@@ -46,7 +46,7 @@
int msn = 1;
List uidsInOrder = new ArrayList(uids);
Collections.sort(uidsInOrder);
- for (final Iterator it=uidsInOrder.iterator();it.hasNext();msn++) {
+ for (final Iterator it = uidsInOrder.iterator(); it.hasNext(); msn++) {
final Long uid = (Long) it.next();
highestUid = uid.longValue();
highestMsn = msn;
@@ -93,32 +93,32 @@
uidToMsn.put(uidLong, msnInteger);
}
-
-
public synchronized void expunge(long uid) {
- int msn=getMsn(uid);
- remove(msn,uid);
- List renumberMsns=new ArrayList(msnToUid.tailMap(new Integer(msn+1)).keySet());
+ int msn = getMsn(uid);
+ remove(msn, uid);
+ List renumberMsns = new ArrayList(msnToUid
+ .tailMap(new Integer(msn + 1)).keySet());
for (Iterator iter = renumberMsns.iterator(); iter.hasNext();) {
int aMsn = ((Integer) iter.next()).intValue();
- long aUid= getUid(aMsn);
- remove(aMsn,aUid);
- add(aMsn-1,aUid);
+ long aUid = getUid(aMsn);
+ remove(aMsn, aUid);
+ add(aMsn - 1, aUid);
}
highestMsn--;
assertValidity();
}
-
- protected void remove(int msn,long uid) {
+
+ protected void remove(int msn, long uid) {
uidToMsn.remove(new Long(uid));
msnToUid.remove(new Integer(msn));
}
-
+
synchronized void assertValidity() {
- Integer[] msns=(Integer[])msnToUid.keySet().toArray(new Integer[0]);
+ Integer[] msns = (Integer[]) msnToUid.keySet().toArray(new Integer[0]);
for (int i = 0; i < msns.length; i++) {
- if (msns[i].intValue()!=(i+1)) {
- throw new AssertionError("Msn at position "+(i+1)+" was "+msns[i].intValue());
+ if (msns[i].intValue() != (i + 1)) {
+ throw new AssertionError("Msn at position " + (i + 1) + " was "
+ + msns[i].intValue());
}
}
if (msns.length > 0) {
@@ -136,12 +136,14 @@
if (!msnToUid.keySet().equals(new TreeSet(uidToMsn.values()))) {
System.out.println(msnToUid.keySet());
System.out.println(uidToMsn.values());
- throw new AssertionError("msnToUid.keySet() does not equal uidToMsn.values()");
+ throw new AssertionError(
+ "msnToUid.keySet() does not equal uidToMsn.values()");
}
if (!uidToMsn.keySet().equals(new TreeSet(msnToUid.values()))) {
System.out.println(uidToMsn.keySet());
System.out.println(msnToUid.values());
- throw new AssertionError("uidToMsn.keySet() does not equal msnToUid.values()");
+ throw new AssertionError(
+ "uidToMsn.keySet() does not equal msnToUid.values()");
}
}
Modified: james/protocols/imap/trunk/mailbox/src/test/java/org/apache/james/mailboxmanager/MessageResultImplIncludedResultsTest.java
URL: http://svn.apache.org/viewvc/james/protocols/imap/trunk/mailbox/src/test/java/org/apache/james/mailboxmanager/MessageResultImplIncludedResultsTest.java?rev=696828&r1=696827&r2=696828&view=diff
==============================================================================
--- james/protocols/imap/trunk/mailbox/src/test/java/org/apache/james/mailboxmanager/MessageResultImplIncludedResultsTest.java (original)
+++ james/protocols/imap/trunk/mailbox/src/test/java/org/apache/james/mailboxmanager/MessageResultImplIncludedResultsTest.java Thu Sep 18 14:44:56 2008
@@ -32,12 +32,14 @@
public class MessageResultImplIncludedResultsTest extends MockObjectTestCase {
MessageResultImpl result;
+
MessageResult.Content content;
-
+
protected void setUp() throws Exception {
super.setUp();
result = new MessageResultImpl();
- content = (MessageResult.Content) mock(MessageResult.Content.class).proxy();
+ content = (MessageResult.Content) mock(MessageResult.Content.class)
+ .proxy();
}
protected void tearDown() throws Exception {
@@ -68,9 +70,11 @@
assertEquals(FetchGroup.MINIMAL, result.getIncludedResults().content());
Date date = new Date();
result.setInternalDate(date);
- assertEquals(FetchGroup.INTERNAL_DATE, result.getIncludedResults().content());
+ assertEquals(FetchGroup.INTERNAL_DATE, result.getIncludedResults()
+ .content());
result = new MessageResultImpl(this.result);
- assertEquals(FetchGroup.INTERNAL_DATE, result.getIncludedResults().content());
+ assertEquals(FetchGroup.INTERNAL_DATE, result.getIncludedResults()
+ .content());
}
public void testShouldIncludedResultsWhenHeadersSet() throws Exception {
@@ -81,25 +85,29 @@
result = new MessageResultImpl(this.result);
assertEquals(FetchGroup.HEADERS, result.getIncludedResults().content());
}
-
- public void testShouldIncludedResultsWhenFullMessageSet() throws Exception {
+
+ public void testShouldIncludedResultsWhenFullMessageSet() throws Exception {
result.setFullContent(null);
assertEquals(FetchGroup.MINIMAL, result.getIncludedResults().content());
result.setFullContent(content);
- assertEquals(FetchGroup.FULL_CONTENT, result.getIncludedResults().content());
+ assertEquals(FetchGroup.FULL_CONTENT, result.getIncludedResults()
+ .content());
result = new MessageResultImpl(this.result);
- assertEquals(FetchGroup.FULL_CONTENT, result.getIncludedResults().content());
+ assertEquals(FetchGroup.FULL_CONTENT, result.getIncludedResults()
+ .content());
}
public void testShouldIncludedResultsWhenMessageBodySet() throws Exception {
result.setBody(null);
assertEquals(FetchGroup.MINIMAL, result.getIncludedResults().content());
result.setBody(content);
- assertEquals(FetchGroup.BODY_CONTENT, result.getIncludedResults().content());
+ assertEquals(FetchGroup.BODY_CONTENT, result.getIncludedResults()
+ .content());
result = new MessageResultImpl(this.result);
- assertEquals(FetchGroup.BODY_CONTENT, result.getIncludedResults().content());
+ assertEquals(FetchGroup.BODY_CONTENT, result.getIncludedResults()
+ .content());
}
-
+
public void testShouldIncludedResultsWhenAllSet() {
Flags flags = new Flags();
result.setFlags(flags);
@@ -109,37 +117,40 @@
assertEquals(FetchGroup.FLAGS, result.getIncludedResults().content());
assertTrue(MessageResultUtils.isFlagsIncluded(result));
result.setBody(content);
- assertEquals(FetchGroup.FLAGS | FetchGroup.BODY_CONTENT, result.getIncludedResults().content());
+ assertEquals(FetchGroup.FLAGS | FetchGroup.BODY_CONTENT, result
+ .getIncludedResults().content());
assertTrue(MessageResultUtils.isFlagsIncluded(result));
assertTrue(MessageResultUtils.isBodyContentIncluded(result));
result.setFullContent(content);
- assertEquals(FetchGroup.FLAGS |
- FetchGroup.BODY_CONTENT | FetchGroup.FULL_CONTENT, result.getIncludedResults().content());
+ assertEquals(FetchGroup.FLAGS | FetchGroup.BODY_CONTENT
+ | FetchGroup.FULL_CONTENT, result.getIncludedResults()
+ .content());
assertTrue(MessageResultUtils.isFlagsIncluded(result));
assertTrue(MessageResultUtils.isBodyContentIncluded(result));
assertTrue(MessageResultUtils.isFullContentIncluded(result));
result.setHeaders(new ArrayList());
- assertEquals(FetchGroup.FLAGS |
- FetchGroup.BODY_CONTENT | FetchGroup.FULL_CONTENT
- | FetchGroup.HEADERS, result.getIncludedResults().content());
+ assertEquals(FetchGroup.FLAGS | FetchGroup.BODY_CONTENT
+ | FetchGroup.FULL_CONTENT | FetchGroup.HEADERS, result
+ .getIncludedResults().content());
assertTrue(MessageResultUtils.isFlagsIncluded(result));
assertTrue(MessageResultUtils.isBodyContentIncluded(result));
assertTrue(MessageResultUtils.isFullContentIncluded(result));
assertTrue(MessageResultUtils.isHeadersIncluded(result));
result.setInternalDate(new Date());
- assertEquals(FetchGroup.FLAGS |
- FetchGroup.BODY_CONTENT | FetchGroup.FULL_CONTENT
- | FetchGroup.HEADERS | FetchGroup.INTERNAL_DATE, result.getIncludedResults().content());
+ assertEquals(FetchGroup.FLAGS | FetchGroup.BODY_CONTENT
+ | FetchGroup.FULL_CONTENT | FetchGroup.HEADERS
+ | FetchGroup.INTERNAL_DATE, result.getIncludedResults()
+ .content());
assertTrue(MessageResultUtils.isFlagsIncluded(result));
assertTrue(MessageResultUtils.isBodyContentIncluded(result));
assertTrue(MessageResultUtils.isFullContentIncluded(result));
assertTrue(MessageResultUtils.isHeadersIncluded(result));
assertTrue(MessageResultUtils.isInternalDateIncluded(result));
result.setSize(100);
- assertEquals(FetchGroup.FLAGS |
- FetchGroup.BODY_CONTENT | FetchGroup.FULL_CONTENT
- | FetchGroup.HEADERS | FetchGroup.INTERNAL_DATE
- | FetchGroup.SIZE, result.getIncludedResults().content());
+ assertEquals(FetchGroup.FLAGS | FetchGroup.BODY_CONTENT
+ | FetchGroup.FULL_CONTENT | FetchGroup.HEADERS
+ | FetchGroup.INTERNAL_DATE | FetchGroup.SIZE, result
+ .getIncludedResults().content());
assertTrue(MessageResultUtils.isFlagsIncluded(result));
assertTrue(MessageResultUtils.isBodyContentIncluded(result));
assertTrue(MessageResultUtils.isFullContentIncluded(result));
Modified: james/protocols/imap/trunk/mailbox/src/test/java/org/apache/james/mailboxmanager/MessageResultUtilsIsIncludedTest.java
URL: http://svn.apache.org/viewvc/james/protocols/imap/trunk/mailbox/src/test/java/org/apache/james/mailboxmanager/MessageResultUtilsIsIncludedTest.java?rev=696828&r1=696827&r2=696828&view=diff
==============================================================================
--- james/protocols/imap/trunk/mailbox/src/test/java/org/apache/james/mailboxmanager/MessageResultUtilsIsIncludedTest.java (original)
+++ james/protocols/imap/trunk/mailbox/src/test/java/org/apache/james/mailboxmanager/MessageResultUtilsIsIncludedTest.java Thu Sep 18 14:44:56 2008
@@ -38,55 +38,80 @@
public void testShouldReturnFalseWhenNull() throws Exception {
assertFalse(MessageResultUtils.isIncluded(null, FetchGroup.FLAGS));
}
-
+
public void testBodyContentIncluded() throws Exception {
- assertFalse(MessageResultUtils.isIncluded(mock(FetchGroupImpl.MINIMAL), FetchGroup.BODY_CONTENT));
- assertFalse(MessageResultUtils.isIncluded(mock(FetchGroupImpl.FLAGS), FetchGroup.BODY_CONTENT));
- assertTrue(MessageResultUtils.isIncluded(mock(FetchGroupImpl.BODY_CONTENT), FetchGroup.BODY_CONTENT));
+ assertFalse(MessageResultUtils.isIncluded(mock(FetchGroupImpl.MINIMAL),
+ FetchGroup.BODY_CONTENT));
+ assertFalse(MessageResultUtils.isIncluded(mock(FetchGroupImpl.FLAGS),
+ FetchGroup.BODY_CONTENT));
+ assertTrue(MessageResultUtils.isIncluded(
+ mock(FetchGroupImpl.BODY_CONTENT), FetchGroup.BODY_CONTENT));
}
-
+
public void testFlagsIncluded() throws Exception {
- assertFalse(MessageResultUtils.isIncluded(mock(FetchGroupImpl.MINIMAL), FetchGroup.FLAGS));
- assertFalse(MessageResultUtils.isIncluded(mock(FetchGroupImpl.BODY_CONTENT), FetchGroup.FLAGS));
- assertTrue(MessageResultUtils.isIncluded(mock(FetchGroupImpl.FLAGS), FetchGroup.FLAGS));
- assertTrue(MessageResultUtils.isIncluded(mock(new FetchGroupImpl(FetchGroup.FLAGS | FetchGroup.BODY_CONTENT)), FetchGroup.FLAGS));
+ assertFalse(MessageResultUtils.isIncluded(mock(FetchGroupImpl.MINIMAL),
+ FetchGroup.FLAGS));
+ assertFalse(MessageResultUtils.isIncluded(
+ mock(FetchGroupImpl.BODY_CONTENT), FetchGroup.FLAGS));
+ assertTrue(MessageResultUtils.isIncluded(mock(FetchGroupImpl.FLAGS),
+ FetchGroup.FLAGS));
+ assertTrue(MessageResultUtils.isIncluded(mock(new FetchGroupImpl(
+ FetchGroup.FLAGS | FetchGroup.BODY_CONTENT)), FetchGroup.FLAGS));
}
-
+
public void testFULL_CONTENTIncluded() throws Exception {
- assertFalse(MessageResultUtils.isIncluded(mock(FetchGroupImpl.MINIMAL), FetchGroup.FULL_CONTENT));
- assertFalse(MessageResultUtils.isIncluded(mock(FetchGroupImpl.BODY_CONTENT), FetchGroup.FULL_CONTENT));
- assertTrue(MessageResultUtils.isIncluded(mock(FetchGroupImpl.FULL_CONTENT), FetchGroup.FULL_CONTENT));
- assertTrue(MessageResultUtils.isIncluded(mock(new FetchGroupImpl(FetchGroup.FLAGS | FetchGroup.FULL_CONTENT)), FetchGroup.FULL_CONTENT));
+ assertFalse(MessageResultUtils.isIncluded(mock(FetchGroupImpl.MINIMAL),
+ FetchGroup.FULL_CONTENT));
+ assertFalse(MessageResultUtils.isIncluded(
+ mock(FetchGroupImpl.BODY_CONTENT), FetchGroup.FULL_CONTENT));
+ assertTrue(MessageResultUtils.isIncluded(
+ mock(FetchGroupImpl.FULL_CONTENT), FetchGroup.FULL_CONTENT));
+ assertTrue(MessageResultUtils.isIncluded(mock(new FetchGroupImpl(
+ FetchGroup.FLAGS | FetchGroup.FULL_CONTENT)),
+ FetchGroup.FULL_CONTENT));
}
-
+
public void testHEADERSIncluded() throws Exception {
- assertFalse(MessageResultUtils.isIncluded(mock(FetchGroupImpl.MINIMAL), FetchGroup.HEADERS));
- assertFalse(MessageResultUtils.isIncluded(mock(FetchGroupImpl.BODY_CONTENT), FetchGroup.HEADERS));
- assertTrue(MessageResultUtils.isIncluded(mock(FetchGroupImpl.HEADERS), FetchGroup.HEADERS));
- assertTrue(MessageResultUtils.isIncluded(mock(new FetchGroupImpl(FetchGroup.FLAGS | FetchGroup.HEADERS)), FetchGroup.HEADERS));
+ assertFalse(MessageResultUtils.isIncluded(mock(FetchGroupImpl.MINIMAL),
+ FetchGroup.HEADERS));
+ assertFalse(MessageResultUtils.isIncluded(
+ mock(FetchGroupImpl.BODY_CONTENT), FetchGroup.HEADERS));
+ assertTrue(MessageResultUtils.isIncluded(mock(FetchGroupImpl.HEADERS),
+ FetchGroup.HEADERS));
+ assertTrue(MessageResultUtils.isIncluded(mock(new FetchGroupImpl(
+ FetchGroup.FLAGS | FetchGroup.HEADERS)), FetchGroup.HEADERS));
}
-
+
public void testINTERNAL_DATEIncluded() throws Exception {
- assertFalse(MessageResultUtils.isIncluded(mock(FetchGroupImpl.MINIMAL), FetchGroup.INTERNAL_DATE));
- assertFalse(MessageResultUtils.isIncluded(mock(FetchGroupImpl.BODY_CONTENT), FetchGroup.INTERNAL_DATE));
- assertTrue(MessageResultUtils.isIncluded(mock(FetchGroupImpl.INTERNAL_DATE), FetchGroup.INTERNAL_DATE));
- assertTrue(MessageResultUtils.isIncluded(mock(new FetchGroupImpl(FetchGroup.FLAGS | FetchGroup.INTERNAL_DATE)), FetchGroup.INTERNAL_DATE));
+ assertFalse(MessageResultUtils.isIncluded(mock(FetchGroupImpl.MINIMAL),
+ FetchGroup.INTERNAL_DATE));
+ assertFalse(MessageResultUtils.isIncluded(
+ mock(FetchGroupImpl.BODY_CONTENT), FetchGroup.INTERNAL_DATE));
+ assertTrue(MessageResultUtils.isIncluded(
+ mock(FetchGroupImpl.INTERNAL_DATE), FetchGroup.INTERNAL_DATE));
+ assertTrue(MessageResultUtils.isIncluded(mock(new FetchGroupImpl(
+ FetchGroup.FLAGS | FetchGroup.INTERNAL_DATE)),
+ FetchGroup.INTERNAL_DATE));
}
-
+
public void testShouldNOTHINGAlwaysBeIncluded() throws Exception {
- assertTrue(MessageResultUtils.isIncluded(mock(FetchGroupImpl.MINIMAL, false), FetchGroup.MINIMAL));
- assertTrue(MessageResultUtils.isIncluded(mock(FetchGroupImpl.BODY_CONTENT, false), FetchGroup.MINIMAL));
- assertTrue(MessageResultUtils.isIncluded(mock(FetchGroupImpl.INTERNAL_DATE, false), FetchGroup.MINIMAL));
+ assertTrue(MessageResultUtils.isIncluded(mock(FetchGroupImpl.MINIMAL,
+ false), FetchGroup.MINIMAL));
+ assertTrue(MessageResultUtils.isIncluded(mock(
+ FetchGroupImpl.BODY_CONTENT, false), FetchGroup.MINIMAL));
+ assertTrue(MessageResultUtils.isIncluded(mock(
+ FetchGroupImpl.INTERNAL_DATE, false), FetchGroup.MINIMAL));
}
-
+
private MessageResult mock(FetchGroup included) {
return mock(included, true);
}
-
+
private MessageResult mock(FetchGroup included, boolean willBeCalled) {
Mock result = mock(MessageResult.class);
if (willBeCalled) {
- result.expects(once()).method("getIncludedResults").will(returnValue(included));
+ result.expects(once()).method("getIncludedResults").will(
+ returnValue(included));
}
return (MessageResult) result.proxy();
}
Modified: james/protocols/imap/trunk/mailbox/src/test/java/org/apache/james/mailboxmanager/MessageResultUtilsTest.java
URL: http://svn.apache.org/viewvc/james/protocols/imap/trunk/mailbox/src/test/java/org/apache/james/mailboxmanager/MessageResultUtilsTest.java?rev=696828&r1=696827&r2=696828&view=diff
==============================================================================
--- james/protocols/imap/trunk/mailbox/src/test/java/org/apache/james/mailboxmanager/MessageResultUtilsTest.java (original)
+++ james/protocols/imap/trunk/mailbox/src/test/java/org/apache/james/mailboxmanager/MessageResultUtilsTest.java Thu Sep 18 14:44:56 2008
@@ -30,30 +30,34 @@
public class MessageResultUtilsTest extends TestCase {
- private static final String[] NAMES = {"One", "Three"};
-
+ private static final String[] NAMES = { "One", "Three" };
+
Header headerOne;
+
Header headerTwo;
+
Header headerThree;
+
List headers;
-
+
private static class Header implements MessageResult.Header {
public String name;
+
public String value;
-
+
public Header(String name) {
this.name = name;
value = "Value";
}
-
+
public long size() {
return 0;
}
public void writeTo(StringBuffer buffer) {
}
-
+
public String getName() {
return name;
}
@@ -63,11 +67,11 @@
}
public void writeTo(WritableByteChannel channel) throws IOException {
-
+
}
-
+
}
-
+
protected void setUp() throws Exception {
super.setUp();
headerOne = new Header("One");
@@ -92,24 +96,29 @@
}
public void testGetMatching() throws Exception {
-
- List results = MessageResultUtils.getMatching(NAMES, headers.iterator());
+
+ List results = MessageResultUtils
+ .getMatching(NAMES, headers.iterator());
assertEquals(2, results.size());
assertEquals(headerOne, results.get(0));
assertEquals(headerThree, results.get(1));
}
public void testGetNotMatching() throws Exception {
-
- List results = MessageResultUtils.getNotMatching(NAMES, headers.iterator());
+
+ List results = MessageResultUtils.getNotMatching(NAMES, headers
+ .iterator());
assertEquals(1, results.size());
assertEquals(headerTwo, results.get(0));
}
public void testGetMatchingSingle() throws Exception {
- assertEquals(headerOne, MessageResultUtils.getMatching("One", headers.iterator()));
- assertEquals(headerThree, MessageResultUtils.getMatching("Three", headers.iterator()));
- assertNull(MessageResultUtils.getMatching("Missing", headers.iterator()));
+ assertEquals(headerOne, MessageResultUtils.getMatching("One", headers
+ .iterator()));
+ assertEquals(headerThree, MessageResultUtils.getMatching("Three",
+ headers.iterator()));
+ assertNull(MessageResultUtils
+ .getMatching("Missing", headers.iterator()));
}
}
Modified: james/protocols/imap/trunk/mailbox/src/test/java/org/apache/james/mailboxmanager/MockMailboxListenerAdded.java
URL: http://svn.apache.org/viewvc/james/protocols/imap/trunk/mailbox/src/test/java/org/apache/james/mailboxmanager/MockMailboxListenerAdded.java?rev=696828&r1=696827&r2=696828&view=diff
==============================================================================
--- james/protocols/imap/trunk/mailbox/src/test/java/org/apache/james/mailboxmanager/MockMailboxListenerAdded.java (original)
+++ james/protocols/imap/trunk/mailbox/src/test/java/org/apache/james/mailboxmanager/MockMailboxListenerAdded.java Thu Sep 18 14:44:56 2008
@@ -22,8 +22,9 @@
public class MockMailboxListenerAdded extends MailboxListener.Added {
public long subjectUid;
+
public long sessionId;
-
+
public MockMailboxListenerAdded(long subjectUid, long sessionId) {
super();
this.subjectUid = subjectUid;
Modified: james/protocols/imap/trunk/mailbox/src/test/java/org/apache/james/mailboxmanager/MockMailboxListenerFlagsUpdate.java
URL: http://svn.apache.org/viewvc/james/protocols/imap/trunk/mailbox/src/test/java/org/apache/james/mailboxmanager/MockMailboxListenerFlagsUpdate.java?rev=696828&r1=696827&r2=696828&view=diff
==============================================================================
--- james/protocols/imap/trunk/mailbox/src/test/java/org/apache/james/mailboxmanager/MockMailboxListenerFlagsUpdate.java (original)
+++ james/protocols/imap/trunk/mailbox/src/test/java/org/apache/james/mailboxmanager/MockMailboxListenerFlagsUpdate.java Thu Sep 18 14:44:56 2008
@@ -27,15 +27,18 @@
import org.apache.james.mailboxmanager.MailboxListener.FlagsUpdated;
-public class MockMailboxListenerFlagsUpdate extends FlagsUpdated {
+public class MockMailboxListenerFlagsUpdate extends FlagsUpdated {
- public List flags = new ArrayList();
+ public List flags = new ArrayList();
public long subjectUid;
+
public long sessionId;
+
public Flags newFlags;
-
- public MockMailboxListenerFlagsUpdate(long subjectUid, Flags newFlags, long sessionId) {
+
+ public MockMailboxListenerFlagsUpdate(long subjectUid, Flags newFlags,
+ long sessionId) {
super();
this.subjectUid = subjectUid;
this.sessionId = sessionId;
@@ -49,7 +52,7 @@
public long getSessionId() {
return sessionId;
}
-
+
public Iterator flagsIterator() {
return flags.iterator();
}
Modified: james/protocols/imap/trunk/mailbox/src/test/java/org/apache/james/mailboxmanager/impl/EventCollector.java
URL: http://svn.apache.org/viewvc/james/protocols/imap/trunk/mailbox/src/test/java/org/apache/james/mailboxmanager/impl/EventCollector.java?rev=696828&r1=696827&r2=696828&view=diff
==============================================================================
--- james/protocols/imap/trunk/mailbox/src/test/java/org/apache/james/mailboxmanager/impl/EventCollector.java (original)
+++ james/protocols/imap/trunk/mailbox/src/test/java/org/apache/james/mailboxmanager/impl/EventCollector.java Thu Sep 18 14:44:56 2008
@@ -27,13 +27,15 @@
public class EventCollector implements MailboxListener {
public final List events = new ArrayList();
-
+
public void event(Event event) {
events.add(event);
}
- public void mailboxDeleted() {}
+ public void mailboxDeleted() {
+ }
- public void mailboxRenamed(String origName, String newName) {}
+ public void mailboxRenamed(String origName, String newName) {
+ }
}
Modified: james/protocols/imap/trunk/mailbox/src/test/java/org/apache/james/mailboxmanager/impl/MailboxEventDispatcherFlagsTest.java
URL: http://svn.apache.org/viewvc/james/protocols/imap/trunk/mailbox/src/test/java/org/apache/james/mailboxmanager/impl/MailboxEventDispatcherFlagsTest.java?rev=696828&r1=696827&r2=696828&view=diff
==============================================================================
--- james/protocols/imap/trunk/mailbox/src/test/java/org/apache/james/mailboxmanager/impl/MailboxEventDispatcherFlagsTest.java (original)
+++ james/protocols/imap/trunk/mailbox/src/test/java/org/apache/james/mailboxmanager/impl/MailboxEventDispatcherFlagsTest.java Thu Sep 18 14:44:56 2008
@@ -31,18 +31,23 @@
public class MailboxEventDispatcherFlagsTest extends MockObjectTestCase {
MailboxEventDispatcher dispatcher;
+
EventCollector collector;
+
MessageResult result;
+
int sessionId = 10;
+
Mock mockMessageResult;
-
+
protected void setUp() throws Exception {
super.setUp();
dispatcher = new MailboxEventDispatcher();
collector = new EventCollector();
dispatcher.addMailboxListener(collector);
mockMessageResult = mock(MessageResult.class);
- mockMessageResult.expects(once()).method("getUid").will(returnValue(23L));
+ mockMessageResult.expects(once()).method("getUid").will(
+ returnValue(23L));
result = (MessageResult) mockMessageResult.proxy();
}
@@ -51,171 +56,197 @@
}
public void testShouldReturnNoChangesWhenOriginalNull() throws Exception {
- dispatcher.flagsUpdated(result.getUid(), sessionId, null, new Flags(Flags.Flag.DELETED));
+ dispatcher.flagsUpdated(result.getUid(), sessionId, null, new Flags(
+ Flags.Flag.DELETED));
assertEquals(1, collector.events.size());
assertTrue(collector.events.get(0) instanceof MailboxListener.FlagsUpdated);
- MailboxListener.FlagsUpdated event = (MailboxListener.FlagsUpdated) collector.events.get(0);
+ MailboxListener.FlagsUpdated event = (MailboxListener.FlagsUpdated) collector.events
+ .get(0);
Iterator iterator = event.flagsIterator();
assertNotNull(iterator);
assertFalse(iterator.hasNext());
}
-
+
public void testShouldReturnNoChangesWhenSystemFlagsUnchanged() {
- dispatcher.flagsUpdated(result.getUid(), sessionId, new Flags(Flags.Flag.DELETED), new Flags(Flags.Flag.DELETED));
+ dispatcher.flagsUpdated(result.getUid(), sessionId, new Flags(
+ Flags.Flag.DELETED), new Flags(Flags.Flag.DELETED));
assertEquals(1, collector.events.size());
assertTrue(collector.events.get(0) instanceof MailboxListener.FlagsUpdated);
- MailboxListener.FlagsUpdated event = (MailboxListener.FlagsUpdated) collector.events.get(0);
+ MailboxListener.FlagsUpdated event = (MailboxListener.FlagsUpdated) collector.events
+ .get(0);
Iterator iterator = event.flagsIterator();
assertNotNull(iterator);
assertFalse(iterator.hasNext());
}
-
+
public void testShouldShowAnsweredAdded() {
- dispatcher.flagsUpdated(result.getUid(), sessionId, new Flags(), new Flags(Flags.Flag.ANSWERED));
+ dispatcher.flagsUpdated(result.getUid(), sessionId, new Flags(),
+ new Flags(Flags.Flag.ANSWERED));
assertEquals(1, collector.events.size());
assertTrue(collector.events.get(0) instanceof MailboxListener.FlagsUpdated);
- MailboxListener.FlagsUpdated event = (MailboxListener.FlagsUpdated) collector.events.get(0);
+ MailboxListener.FlagsUpdated event = (MailboxListener.FlagsUpdated) collector.events
+ .get(0);
Iterator iterator = event.flagsIterator();
assertNotNull(iterator);
assertTrue(iterator.hasNext());
assertEquals(Flags.Flag.ANSWERED, iterator.next());
assertFalse(iterator.hasNext());
}
-
+
public void testShouldShowAnsweredRemoved() {
- dispatcher.flagsUpdated(result.getUid(), sessionId, new Flags(Flags.Flag.ANSWERED), new Flags());
+ dispatcher.flagsUpdated(result.getUid(), sessionId, new Flags(
+ Flags.Flag.ANSWERED), new Flags());
assertEquals(1, collector.events.size());
assertTrue(collector.events.get(0) instanceof MailboxListener.FlagsUpdated);
- MailboxListener.FlagsUpdated event = (MailboxListener.FlagsUpdated) collector.events.get(0);
+ MailboxListener.FlagsUpdated event = (MailboxListener.FlagsUpdated) collector.events
+ .get(0);
Iterator iterator = event.flagsIterator();
assertNotNull(iterator);
assertTrue(iterator.hasNext());
assertEquals(Flags.Flag.ANSWERED, iterator.next());
assertFalse(iterator.hasNext());
}
-
+
public void testShouldShowDeletedAdded() {
- dispatcher.flagsUpdated(result.getUid(), sessionId, new Flags(), new Flags(Flags.Flag.DELETED));
+ dispatcher.flagsUpdated(result.getUid(), sessionId, new Flags(),
+ new Flags(Flags.Flag.DELETED));
assertEquals(1, collector.events.size());
assertTrue(collector.events.get(0) instanceof MailboxListener.FlagsUpdated);
- MailboxListener.FlagsUpdated event = (MailboxListener.FlagsUpdated) collector.events.get(0);
+ MailboxListener.FlagsUpdated event = (MailboxListener.FlagsUpdated) collector.events
+ .get(0);
Iterator iterator = event.flagsIterator();
assertNotNull(iterator);
assertTrue(iterator.hasNext());
assertEquals(Flags.Flag.DELETED, iterator.next());
assertFalse(iterator.hasNext());
}
-
+
public void testShouldShowDeletedRemoved() {
- dispatcher.flagsUpdated(result.getUid(), sessionId, new Flags(Flags.Flag.DELETED), new Flags());
+ dispatcher.flagsUpdated(result.getUid(), sessionId, new Flags(
+ Flags.Flag.DELETED), new Flags());
assertEquals(1, collector.events.size());
assertTrue(collector.events.get(0) instanceof MailboxListener.FlagsUpdated);
- MailboxListener.FlagsUpdated event = (MailboxListener.FlagsUpdated) collector.events.get(0);
+ MailboxListener.FlagsUpdated event = (MailboxListener.FlagsUpdated) collector.events
+ .get(0);
Iterator iterator = event.flagsIterator();
assertNotNull(iterator);
assertTrue(iterator.hasNext());
assertEquals(Flags.Flag.DELETED, iterator.next());
assertFalse(iterator.hasNext());
}
-
+
public void testShouldShowDraftAdded() {
- dispatcher.flagsUpdated(result.getUid(), sessionId, new Flags(), new Flags(Flags.Flag.DRAFT));
+ dispatcher.flagsUpdated(result.getUid(), sessionId, new Flags(),
+ new Flags(Flags.Flag.DRAFT));
assertEquals(1, collector.events.size());
assertTrue(collector.events.get(0) instanceof MailboxListener.FlagsUpdated);
- MailboxListener.FlagsUpdated event = (MailboxListener.FlagsUpdated) collector.events.get(0);
+ MailboxListener.FlagsUpdated event = (MailboxListener.FlagsUpdated) collector.events
+ .get(0);
Iterator iterator = event.flagsIterator();
assertNotNull(iterator);
assertTrue(iterator.hasNext());
assertEquals(Flags.Flag.DRAFT, iterator.next());
assertFalse(iterator.hasNext());
}
-
+
public void testShouldShowDraftRemoved() {
- dispatcher.flagsUpdated(result.getUid(), sessionId, new Flags(Flags.Flag.DRAFT), new Flags());
+ dispatcher.flagsUpdated(result.getUid(), sessionId, new Flags(
+ Flags.Flag.DRAFT), new Flags());
assertEquals(1, collector.events.size());
assertTrue(collector.events.get(0) instanceof MailboxListener.FlagsUpdated);
- MailboxListener.FlagsUpdated event = (MailboxListener.FlagsUpdated) collector.events.get(0);
+ MailboxListener.FlagsUpdated event = (MailboxListener.FlagsUpdated) collector.events
+ .get(0);
Iterator iterator = event.flagsIterator();
assertNotNull(iterator);
assertTrue(iterator.hasNext());
assertEquals(Flags.Flag.DRAFT, iterator.next());
assertFalse(iterator.hasNext());
}
-
+
public void testShouldShowFlaggedAdded() {
- dispatcher.flagsUpdated(result.getUid(), sessionId, new Flags(), new Flags(Flags.Flag.FLAGGED));
+ dispatcher.flagsUpdated(result.getUid(), sessionId, new Flags(),
+ new Flags(Flags.Flag.FLAGGED));
assertEquals(1, collector.events.size());
assertTrue(collector.events.get(0) instanceof MailboxListener.FlagsUpdated);
- MailboxListener.FlagsUpdated event = (MailboxListener.FlagsUpdated) collector.events.get(0);
+ MailboxListener.FlagsUpdated event = (MailboxListener.FlagsUpdated) collector.events
+ .get(0);
Iterator iterator = event.flagsIterator();
assertNotNull(iterator);
assertTrue(iterator.hasNext());
assertEquals(Flags.Flag.FLAGGED, iterator.next());
assertFalse(iterator.hasNext());
}
-
+
public void testShouldShowFlaggedRemoved() {
- dispatcher.flagsUpdated(result.getUid(), sessionId, new Flags(Flags.Flag.FLAGGED), new Flags());
+ dispatcher.flagsUpdated(result.getUid(), sessionId, new Flags(
+ Flags.Flag.FLAGGED), new Flags());
assertEquals(1, collector.events.size());
assertTrue(collector.events.get(0) instanceof MailboxListener.FlagsUpdated);
- MailboxListener.FlagsUpdated event = (MailboxListener.FlagsUpdated) collector.events.get(0);
+ MailboxListener.FlagsUpdated event = (MailboxListener.FlagsUpdated) collector.events
+ .get(0);
Iterator iterator = event.flagsIterator();
assertNotNull(iterator);
assertTrue(iterator.hasNext());
assertEquals(Flags.Flag.FLAGGED, iterator.next());
assertFalse(iterator.hasNext());
}
-
-
+
public void testShouldShowRecentAdded() {
- dispatcher.flagsUpdated(result.getUid(), sessionId, new Flags(), new Flags(Flags.Flag.RECENT));
+ dispatcher.flagsUpdated(result.getUid(), sessionId, new Flags(),
+ new Flags(Flags.Flag.RECENT));
assertEquals(1, collector.events.size());
assertTrue(collector.events.get(0) instanceof MailboxListener.FlagsUpdated);
- MailboxListener.FlagsUpdated event = (MailboxListener.FlagsUpdated) collector.events.get(0);
+ MailboxListener.FlagsUpdated event = (MailboxListener.FlagsUpdated) collector.events
+ .get(0);
Iterator iterator = event.flagsIterator();
assertNotNull(iterator);
assertTrue(iterator.hasNext());
assertEquals(Flags.Flag.RECENT, iterator.next());
assertFalse(iterator.hasNext());
}
-
+
public void testShouldShowRecentRemoved() {
- dispatcher.flagsUpdated(result.getUid(), sessionId, new Flags(Flags.Flag.RECENT), new Flags());
+ dispatcher.flagsUpdated(result.getUid(), sessionId, new Flags(
+ Flags.Flag.RECENT), new Flags());
assertEquals(1, collector.events.size());
assertTrue(collector.events.get(0) instanceof MailboxListener.FlagsUpdated);
- MailboxListener.FlagsUpdated event = (MailboxListener.FlagsUpdated) collector.events.get(0);
+ MailboxListener.FlagsUpdated event = (MailboxListener.FlagsUpdated) collector.events
+ .get(0);
Iterator iterator = event.flagsIterator();
assertNotNull(iterator);
assertTrue(iterator.hasNext());
assertEquals(Flags.Flag.RECENT, iterator.next());
assertFalse(iterator.hasNext());
}
-
-
+
public void testShouldShowSeenAdded() {
- dispatcher.flagsUpdated(result.getUid(), sessionId, new Flags(), new Flags(Flags.Flag.SEEN));
+ dispatcher.flagsUpdated(result.getUid(), sessionId, new Flags(),
+ new Flags(Flags.Flag.SEEN));
assertEquals(1, collector.events.size());
assertTrue(collector.events.get(0) instanceof MailboxListener.FlagsUpdated);
- MailboxListener.FlagsUpdated event = (MailboxListener.FlagsUpdated) collector.events.get(0);
+ MailboxListener.FlagsUpdated event = (MailboxListener.FlagsUpdated) collector.events
+ .get(0);
Iterator iterator = event.flagsIterator();
assertNotNull(iterator);
assertTrue(iterator.hasNext());
assertEquals(Flags.Flag.SEEN, iterator.next());
assertFalse(iterator.hasNext());
}
-
+
public void testShouldShowSeenRemoved() {
- dispatcher.flagsUpdated(result.getUid(), sessionId, new Flags(Flags.Flag.SEEN), new Flags());
+ dispatcher.flagsUpdated(result.getUid(), sessionId, new Flags(
+ Flags.Flag.SEEN), new Flags());
assertEquals(1, collector.events.size());
assertTrue(collector.events.get(0) instanceof MailboxListener.FlagsUpdated);
- MailboxListener.FlagsUpdated event = (MailboxListener.FlagsUpdated) collector.events.get(0);
+ MailboxListener.FlagsUpdated event = (MailboxListener.FlagsUpdated) collector.events
+ .get(0);
Iterator iterator = event.flagsIterator();
assertNotNull(iterator);
assertTrue(iterator.hasNext());
assertEquals(Flags.Flag.SEEN, iterator.next());
assertFalse(iterator.hasNext());
}
-
+
public void testShouldShowMixedChanges() {
Flags originals = new Flags();
originals.add(Flags.Flag.DRAFT);
@@ -224,11 +255,12 @@
updated.add(Flags.Flag.ANSWERED);
updated.add(Flags.Flag.DRAFT);
updated.add(Flags.Flag.SEEN);
-
+
dispatcher.flagsUpdated(result.getUid(), sessionId, originals, updated);
assertEquals(1, collector.events.size());
assertTrue(collector.events.get(0) instanceof MailboxListener.FlagsUpdated);
- MailboxListener.FlagsUpdated event = (MailboxListener.FlagsUpdated) collector.events.get(0);
+ MailboxListener.FlagsUpdated event = (MailboxListener.FlagsUpdated) collector.events
+ .get(0);
Iterator iterator = event.flagsIterator();
assertNotNull(iterator);
assertTrue(iterator.hasNext());
Modified: james/protocols/imap/trunk/mailbox/src/test/java/org/apache/james/mailboxmanager/manager/MailboxExpressionTest.java
URL: http://svn.apache.org/viewvc/james/protocols/imap/trunk/mailbox/src/test/java/org/apache/james/mailboxmanager/manager/MailboxExpressionTest.java?rev=696828&r1=696827&r2=696828&view=diff
==============================================================================
--- james/protocols/imap/trunk/mailbox/src/test/java/org/apache/james/mailboxmanager/manager/MailboxExpressionTest.java (original)
+++ james/protocols/imap/trunk/mailbox/src/test/java/org/apache/james/mailboxmanager/manager/MailboxExpressionTest.java Thu Sep 18 14:44:56 2008
@@ -26,7 +26,9 @@
public class MailboxExpressionTest extends TestCase {
private static final String PART = "mailbox";
+
private static final String SECOND_PART = "sub";
+
private static final String BASE = "BASE";
protected void setUp() throws Exception {
@@ -40,7 +42,7 @@
private MailboxExpression create(String expression) {
return new MailboxExpression(BASE, expression, '*', '%');
}
-
+
public void testIsWild() throws Exception {
assertTrue(create("*").isWild());
assertTrue(create("%").isWild());
@@ -54,43 +56,47 @@
assertFalse(create(null).isWild());
assertFalse(create("ONE").isWild());
}
-
+
public void testCombinedNameEmptyPart() throws Exception {
MailboxExpression expression = new MailboxExpression(BASE, "", '*', '%');
assertEquals(BASE, expression.getCombinedName('.'));
- }
-
+ }
+
public void testNullCombinedName() throws Exception {
- MailboxExpression expression = new MailboxExpression(null, null, '*', '%');
+ MailboxExpression expression = new MailboxExpression(null, null, '*',
+ '%');
assertNotNull(expression.getCombinedName('.'));
}
-
+
public void testSimpleCombinedName() throws Exception {
MailboxExpression expression = create(PART);
assertEquals(BASE + "." + PART, expression.getCombinedName('.'));
assertEquals(BASE + "/" + PART, expression.getCombinedName('/'));
}
-
- public void testCombinedNamePartStartsWithDelimiter () throws Exception {
+
+ public void testCombinedNamePartStartsWithDelimiter() throws Exception {
MailboxExpression expression = create("." + PART);
assertEquals(BASE + "." + PART, expression.getCombinedName('.'));
assertEquals(BASE + "/." + PART, expression.getCombinedName('/'));
}
-
+
public void testCombinedNameBaseEndsWithDelimiter() throws Exception {
- MailboxExpression expression = new MailboxExpression(BASE + '.', PART, '*', '%');
+ MailboxExpression expression = new MailboxExpression(BASE + '.', PART,
+ '*', '%');
assertEquals(BASE + "." + PART, expression.getCombinedName('.'));
assertEquals(BASE + "./" + PART, expression.getCombinedName('/'));
}
-
- public void testCombinedNameBaseEndsWithDelimiterPartStarts() throws Exception {
- MailboxExpression expression = new MailboxExpression(BASE + '.', '.' + PART, '*', '%');
+
+ public void testCombinedNameBaseEndsWithDelimiterPartStarts()
+ throws Exception {
+ MailboxExpression expression = new MailboxExpression(BASE + '.',
+ '.' + PART, '*', '%');
assertEquals(BASE + "." + PART, expression.getCombinedName('.'));
assertEquals(BASE + "./." + PART, expression.getCombinedName('/'));
}
-
+
public void testSimpleExpression() throws Exception {
MailboxExpression expression = create(PART);
assertTrue(expression.isExpressionMatch(PART, '.'));
@@ -99,7 +105,7 @@
assertFalse(expression.isExpressionMatch(PART + '.', '.'));
assertFalse(expression.isExpressionMatch(SECOND_PART, '.'));
}
-
+
public void testEmptyExpression() throws Exception {
MailboxExpression expression = create("");
assertTrue(expression.isExpressionMatch("", '.'));
@@ -108,7 +114,7 @@
assertFalse(expression.isExpressionMatch(BASE + '.' + "whatever", '.'));
assertFalse(expression.isExpressionMatch(BASE + "whatever", '.'));
}
-
+
public void testOnlyLocalWildcard() throws Exception {
MailboxExpression expression = create("%");
assertTrue(expression.isExpressionMatch("", '.'));
@@ -118,8 +124,7 @@
assertFalse(expression.isExpressionMatch(PART + '.' + SECOND_PART, '.'));
assertTrue(expression.isExpressionMatch(PART + '/' + SECOND_PART, '.'));
}
-
-
+
public void testOnlyFreeWildcard() throws Exception {
MailboxExpression expression = create("*");
assertTrue(expression.isExpressionMatch("", '.'));
@@ -130,8 +135,7 @@
assertTrue(expression.isExpressionMatch(PART + '/' + SECOND_PART, '.'));
assertTrue(expression.isExpressionMatch(PART + '.' + SECOND_PART, '.'));
}
-
-
+
public void testEndsWithLocalWildcard() throws Exception {
MailboxExpression expression = create(PART + '%');
assertFalse(expression.isExpressionMatch("", '.'));
@@ -142,7 +146,7 @@
assertTrue(expression.isExpressionMatch(PART + '/' + SECOND_PART, '.'));
assertFalse(expression.isExpressionMatch(PART + '.' + SECOND_PART, '.'));
}
-
+
public void testStartsWithLocalWildcard() throws Exception {
MailboxExpression expression = create('%' + PART);
assertFalse(expression.isExpressionMatch("", '.'));
@@ -150,10 +154,11 @@
assertTrue(expression.isExpressionMatch(PART, '.'));
assertTrue(expression.isExpressionMatch(SECOND_PART + PART, '.'));
assertFalse(expression.isExpressionMatch(SECOND_PART + '.' + PART, '.'));
- assertFalse(expression.isExpressionMatch(SECOND_PART + '.' + PART + '.' + SECOND_PART, '.'));
+ assertFalse(expression.isExpressionMatch(SECOND_PART + '.' + PART + '.'
+ + SECOND_PART, '.'));
assertFalse(expression.isExpressionMatch(SECOND_PART, '.'));
}
-
+
public void testContainsLocalWildcard() throws Exception {
MailboxExpression expression = create(SECOND_PART + '%' + PART);
assertFalse(expression.isExpressionMatch("", '.'));
@@ -162,10 +167,10 @@
assertFalse(expression.isExpressionMatch(SECOND_PART + '.' + PART, '.'));
assertTrue(expression.isExpressionMatch(SECOND_PART + '/' + PART, '.'));
assertFalse(expression.isExpressionMatch(PART, '.'));
- assertFalse(expression.isExpressionMatch(SECOND_PART + "w.hat.eve.r" + PART, '.'));
+ assertFalse(expression.isExpressionMatch(SECOND_PART + "w.hat.eve.r"
+ + PART, '.'));
}
-
-
+
public void testEndsWithFreeWildcard() throws Exception {
MailboxExpression expression = create(PART + '*');
assertFalse(expression.isExpressionMatch("", '.'));
@@ -176,7 +181,7 @@
assertTrue(expression.isExpressionMatch(PART + '/' + SECOND_PART, '.'));
assertTrue(expression.isExpressionMatch(PART + '.' + SECOND_PART, '.'));
}
-
+
public void testStartsWithFreeWildcard() throws Exception {
MailboxExpression expression = create('*' + PART);
assertFalse(expression.isExpressionMatch("", '.'));
@@ -186,7 +191,7 @@
assertTrue(expression.isExpressionMatch(SECOND_PART + '.' + PART, '.'));
assertFalse(expression.isExpressionMatch(SECOND_PART, '.'));
}
-
+
public void testContainsFreeWildcard() throws Exception {
MailboxExpression expression = create(SECOND_PART + '*' + PART);
assertFalse(expression.isExpressionMatch("", '.'));
@@ -195,9 +200,10 @@
assertTrue(expression.isExpressionMatch(SECOND_PART + '.' + PART, '.'));
assertTrue(expression.isExpressionMatch(SECOND_PART + '/' + PART, '.'));
assertFalse(expression.isExpressionMatch(PART, '.'));
- assertTrue(expression.isExpressionMatch(SECOND_PART + "w.hat.eve.r" + PART, '.'));
+ assertTrue(expression.isExpressionMatch(SECOND_PART + "w.hat.eve.r"
+ + PART, '.'));
}
-
+
public void testDoubleFreeWildcard() throws Exception {
MailboxExpression expression = create(SECOND_PART + "**" + PART);
assertFalse(expression.isExpressionMatch("", '.'));
@@ -206,9 +212,10 @@
assertTrue(expression.isExpressionMatch(SECOND_PART + '.' + PART, '.'));
assertTrue(expression.isExpressionMatch(SECOND_PART + '/' + PART, '.'));
assertFalse(expression.isExpressionMatch(PART, '.'));
- assertTrue(expression.isExpressionMatch(SECOND_PART + "w.hat.eve.r" + PART, '.'));
+ assertTrue(expression.isExpressionMatch(SECOND_PART + "w.hat.eve.r"
+ + PART, '.'));
}
-
+
public void testFreeLocalWildcard() throws Exception {
MailboxExpression expression = create(SECOND_PART + "*%" + PART);
assertFalse(expression.isExpressionMatch("", '.'));
@@ -217,9 +224,10 @@
assertTrue(expression.isExpressionMatch(SECOND_PART + '.' + PART, '.'));
assertTrue(expression.isExpressionMatch(SECOND_PART + '/' + PART, '.'));
assertFalse(expression.isExpressionMatch(PART, '.'));
- assertTrue(expression.isExpressionMatch(SECOND_PART + "w.hat.eve.r" + PART, '.'));
+ assertTrue(expression.isExpressionMatch(SECOND_PART + "w.hat.eve.r"
+ + PART, '.'));
}
-
+
public void testLocalFreeWildcard() throws Exception {
MailboxExpression expression = create(SECOND_PART + "%*" + PART);
assertFalse(expression.isExpressionMatch("", '.'));
@@ -228,39 +236,69 @@
assertTrue(expression.isExpressionMatch(SECOND_PART + '.' + PART, '.'));
assertTrue(expression.isExpressionMatch(SECOND_PART + '/' + PART, '.'));
assertFalse(expression.isExpressionMatch(PART, '.'));
- assertTrue(expression.isExpressionMatch(SECOND_PART + "w.hat.eve.r" + PART, '.'));
+ assertTrue(expression.isExpressionMatch(SECOND_PART + "w.hat.eve.r"
+ + PART, '.'));
}
-
+
public void testMultipleFreeWildcards() throws Exception {
- MailboxExpression expression = create(SECOND_PART + '*' + PART + '*' + SECOND_PART + "**");
- assertTrue(expression.isExpressionMatch(SECOND_PART + PART + SECOND_PART, '.'));
- assertTrue(expression.isExpressionMatch(SECOND_PART + '.' + PART + '.' + SECOND_PART, '.'));
- assertTrue(expression.isExpressionMatch(SECOND_PART + "tosh.bosh" + PART + "tosh.bosh" + SECOND_PART + "boshtosh", '.'));
- assertFalse(expression.isExpressionMatch(SECOND_PART + '.' + PART.substring(1) + '.' + SECOND_PART, '.'));
- assertTrue(expression.isExpressionMatch(SECOND_PART + '.' + PART.substring(1) + '.' + SECOND_PART + PART + '.' + SECOND_PART + "toshbosh", '.'));
- assertFalse(expression.isExpressionMatch(SECOND_PART + '.' + PART.substring(1) + '.' + SECOND_PART + PART + '.' + SECOND_PART.substring(1), '.'));
- assertTrue(expression.isExpressionMatch(SECOND_PART + "tosh.bosh" + PART + "tosh.bosh" + PART + SECOND_PART + "boshtosh" + PART + SECOND_PART, '.'));
- assertFalse(expression.isExpressionMatch(SECOND_PART.substring(1) + "tosh.bosh" + PART + "tosh.bosh" + SECOND_PART + PART.substring(1) + SECOND_PART + "boshtosh" + PART + SECOND_PART.substring(1), '.'));
+ MailboxExpression expression = create(SECOND_PART + '*' + PART + '*'
+ + SECOND_PART + "**");
+ assertTrue(expression.isExpressionMatch(SECOND_PART + PART
+ + SECOND_PART, '.'));
+ assertTrue(expression.isExpressionMatch(SECOND_PART + '.' + PART + '.'
+ + SECOND_PART, '.'));
+ assertTrue(expression.isExpressionMatch(SECOND_PART + "tosh.bosh"
+ + PART + "tosh.bosh" + SECOND_PART + "boshtosh", '.'));
+ assertFalse(expression.isExpressionMatch(SECOND_PART + '.'
+ + PART.substring(1) + '.' + SECOND_PART, '.'));
+ assertTrue(expression.isExpressionMatch(SECOND_PART + '.'
+ + PART.substring(1) + '.' + SECOND_PART + PART + '.'
+ + SECOND_PART + "toshbosh", '.'));
+ assertFalse(expression.isExpressionMatch(SECOND_PART + '.'
+ + PART.substring(1) + '.' + SECOND_PART + PART + '.'
+ + SECOND_PART.substring(1), '.'));
+ assertTrue(expression.isExpressionMatch(SECOND_PART + "tosh.bosh"
+ + PART + "tosh.bosh" + PART + SECOND_PART + "boshtosh" + PART
+ + SECOND_PART, '.'));
+ assertFalse(expression.isExpressionMatch(SECOND_PART.substring(1)
+ + "tosh.bosh" + PART + "tosh.bosh" + SECOND_PART
+ + PART.substring(1) + SECOND_PART + "boshtosh" + PART
+ + SECOND_PART.substring(1), '.'));
}
-
+
public void testSimpleMixedWildcards() throws Exception {
- MailboxExpression expression = create(SECOND_PART + '%' + PART + '*' + SECOND_PART);
- assertTrue(expression.isExpressionMatch(SECOND_PART + PART + SECOND_PART, '.'));
- assertFalse(expression.isExpressionMatch(SECOND_PART + '.' + PART + SECOND_PART, '.'));
- assertTrue(expression.isExpressionMatch(SECOND_PART + PART + '.' + SECOND_PART, '.'));
- assertTrue(expression.isExpressionMatch(SECOND_PART + PART + SECOND_PART + "Whatever", '.'));
- assertTrue(expression.isExpressionMatch(SECOND_PART + PART + SECOND_PART + ".Whatever.", '.'));
+ MailboxExpression expression = create(SECOND_PART + '%' + PART + '*'
+ + SECOND_PART);
+ assertTrue(expression.isExpressionMatch(SECOND_PART + PART
+ + SECOND_PART, '.'));
+ assertFalse(expression.isExpressionMatch(SECOND_PART + '.' + PART
+ + SECOND_PART, '.'));
+ assertTrue(expression.isExpressionMatch(SECOND_PART + PART + '.'
+ + SECOND_PART, '.'));
+ assertTrue(expression.isExpressionMatch(SECOND_PART + PART
+ + SECOND_PART + "Whatever", '.'));
+ assertTrue(expression.isExpressionMatch(SECOND_PART + PART
+ + SECOND_PART + ".Whatever.", '.'));
}
-
+
public void testFreeLocalMixedWildcards() throws Exception {
- MailboxExpression expression = create(SECOND_PART + '*' + PART + '%' + SECOND_PART);
- assertTrue(expression.isExpressionMatch(SECOND_PART + PART + SECOND_PART, '.'));
- assertTrue(expression.isExpressionMatch(SECOND_PART + '.' + PART + SECOND_PART, '.'));
- assertFalse(expression.isExpressionMatch(SECOND_PART + PART + '.' + SECOND_PART, '.'));
- assertTrue(expression.isExpressionMatch(SECOND_PART + PART + "Whatever" + SECOND_PART, '.'));
- assertFalse(expression.isExpressionMatch(SECOND_PART + PART + SECOND_PART + ".Whatever.", '.'));
- assertTrue(expression.isExpressionMatch(SECOND_PART + '.' + PART + SECOND_PART, '.'));
- assertFalse(expression.isExpressionMatch(SECOND_PART + '.' + PART + SECOND_PART + '.' + SECOND_PART, '.'));
- assertTrue(expression.isExpressionMatch(SECOND_PART + '.' + PART + '.' + SECOND_PART + PART + SECOND_PART, '.'));
+ MailboxExpression expression = create(SECOND_PART + '*' + PART + '%'
+ + SECOND_PART);
+ assertTrue(expression.isExpressionMatch(SECOND_PART + PART
+ + SECOND_PART, '.'));
+ assertTrue(expression.isExpressionMatch(SECOND_PART + '.' + PART
+ + SECOND_PART, '.'));
+ assertFalse(expression.isExpressionMatch(SECOND_PART + PART + '.'
+ + SECOND_PART, '.'));
+ assertTrue(expression.isExpressionMatch(SECOND_PART + PART + "Whatever"
+ + SECOND_PART, '.'));
+ assertFalse(expression.isExpressionMatch(SECOND_PART + PART
+ + SECOND_PART + ".Whatever.", '.'));
+ assertTrue(expression.isExpressionMatch(SECOND_PART + '.' + PART
+ + SECOND_PART, '.'));
+ assertFalse(expression.isExpressionMatch(SECOND_PART + '.' + PART
+ + SECOND_PART + '.' + SECOND_PART, '.'));
+ assertTrue(expression.isExpressionMatch(SECOND_PART + '.' + PART + '.'
+ + SECOND_PART + PART + SECOND_PART, '.'));
}
}
Modified: james/protocols/imap/trunk/mailbox/src/test/java/org/apache/james/mailboxmanager/util/MailboxEventAnalyserTest.java
URL: http://svn.apache.org/viewvc/james/protocols/imap/trunk/mailbox/src/test/java/org/apache/james/mailboxmanager/util/MailboxEventAnalyserTest.java?rev=696828&r1=696827&r2=696828&view=diff
==============================================================================
--- james/protocols/imap/trunk/mailbox/src/test/java/org/apache/james/mailboxmanager/util/MailboxEventAnalyserTest.java (original)
+++ james/protocols/imap/trunk/mailbox/src/test/java/org/apache/james/mailboxmanager/util/MailboxEventAnalyserTest.java Thu Sep 18 14:44:56 2008
@@ -32,9 +32,9 @@
public class MailboxEventAnalyserTest extends MockObjectTestCase {
private static final long BASE_SESSION_ID = 99;
-
+
MailboxEventAnalyser analyser;
-
+
protected void setUp() throws Exception {
super.setUp();
analyser = new MailboxEventAnalyser(BASE_SESSION_ID);
@@ -46,33 +46,35 @@
public void testShouldBeNoSizeChangeOnOtherEvent() throws Exception {
final Mock mock = mock(MailboxListener.Event.class);
- mock.expects(atLeastOnce()).method("getSessionId").will(returnValue(11L));
+ mock.expects(atLeastOnce()).method("getSessionId").will(
+ returnValue(11L));
analyser.event((MailboxListener.Event) mock.proxy());
assertFalse(analyser.isSizeChanged());
}
-
+
public void testShouldBeNoSizeChangeOnAdded() throws Exception {
analyser.event(new MockMailboxListenerAdded(78, 11));
assertTrue(analyser.isSizeChanged());
}
-
+
public void testShouldNoSizeChangeAfterReset() throws Exception {
analyser.event(new MockMailboxListenerAdded(99, 11));
analyser.reset();
assertFalse(analyser.isSizeChanged());
}
-
+
public void testShouldNotSetUidWhenNoSystemFlagChange() throws Exception {
- final MockMailboxListenerFlagsUpdate update
- = new MockMailboxListenerFlagsUpdate(90, new Flags(), 11);
+ final MockMailboxListenerFlagsUpdate update = new MockMailboxListenerFlagsUpdate(
+ 90, new Flags(), 11);
analyser.event(update);
assertNotNull(analyser.flagUpdateUids());
assertFalse(analyser.flagUpdateUids().hasNext());
}
-
+
public void testShouldSetUidWhenSystemFlagChange() throws Exception {
final long uid = 900L;
- final MockMailboxListenerFlagsUpdate update = new MockMailboxListenerFlagsUpdate(uid, new Flags(), 11);
+ final MockMailboxListenerFlagsUpdate update = new MockMailboxListenerFlagsUpdate(
+ uid, new Flags(), 11);
update.flags.add(Flags.Flag.ANSWERED);
analyser.event(update);
final Iterator iterator = analyser.flagUpdateUids();
@@ -81,20 +83,23 @@
assertEquals(new Long(uid), iterator.next());
assertFalse(iterator.hasNext());
}
-
+
public void testShouldClearFlagUidsUponReset() throws Exception {
final long uid = 900L;
- final MockMailboxListenerFlagsUpdate update = new MockMailboxListenerFlagsUpdate(uid, new Flags(), 11);
+ final MockMailboxListenerFlagsUpdate update = new MockMailboxListenerFlagsUpdate(
+ uid, new Flags(), 11);
update.flags.add(Flags.Flag.ANSWERED);
analyser.event(update);
analyser.reset();
assertNotNull(analyser.flagUpdateUids());
assertFalse(analyser.flagUpdateUids().hasNext());
}
-
- public void testShouldNotSetUidWhenSystemFlagChangeDifferentSessionInSilentMode() throws Exception {
+
+ public void testShouldNotSetUidWhenSystemFlagChangeDifferentSessionInSilentMode()
+ throws Exception {
final long uid = 900L;
- final MockMailboxListenerFlagsUpdate update = new MockMailboxListenerFlagsUpdate(uid, new Flags(), 11);
+ final MockMailboxListenerFlagsUpdate update = new MockMailboxListenerFlagsUpdate(
+ uid, new Flags(), 11);
update.flags.add(Flags.Flag.ANSWERED);
analyser.setSilentFlagChanges(true);
analyser.event(update);
@@ -104,9 +109,11 @@
assertEquals(new Long(uid), iterator.next());
assertFalse(iterator.hasNext());
}
-
- public void testShouldNotSetUidWhenSystemFlagChangeSameSessionInSilentMode() throws Exception {
- final MockMailboxListenerFlagsUpdate update = new MockMailboxListenerFlagsUpdate(345, new Flags(), BASE_SESSION_ID);
+
+ public void testShouldNotSetUidWhenSystemFlagChangeSameSessionInSilentMode()
+ throws Exception {
+ final MockMailboxListenerFlagsUpdate update = new MockMailboxListenerFlagsUpdate(
+ 345, new Flags(), BASE_SESSION_ID);
update.flags.add(Flags.Flag.ANSWERED);
analyser.setSilentFlagChanges(true);
analyser.event(update);
@@ -114,13 +121,14 @@
assertNotNull(iterator);
assertFalse(iterator.hasNext());
}
-
+
public void testShouldNotSetUidWhenOnlyRecentFlagUpdated() throws Exception {
- final MockMailboxListenerFlagsUpdate update = new MockMailboxListenerFlagsUpdate(886, new Flags(), BASE_SESSION_ID);
+ final MockMailboxListenerFlagsUpdate update = new MockMailboxListenerFlagsUpdate(
+ 886, new Flags(), BASE_SESSION_ID);
update.flags.add(Flags.Flag.RECENT);
analyser.event(update);
final Iterator iterator = analyser.flagUpdateUids();
assertNotNull(iterator);
- assertFalse(iterator.hasNext());
+ assertFalse(iterator.hasNext());
}
}
Modified: james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/command/imap4rev1/ImapCommandImpl.java
URL: http://svn.apache.org/viewvc/james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/command/imap4rev1/ImapCommandImpl.java?rev=696828&r1=696827&r2=696828&view=diff
==============================================================================
--- james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/command/imap4rev1/ImapCommandImpl.java (original)
+++ james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/command/imap4rev1/ImapCommandImpl.java Thu Sep 18 14:44:56 2008
@@ -31,26 +31,30 @@
public static ImapCommand nonAuthenticatedStateCommand(final String name) {
return new ImapCommandImpl(false, false, true, name);
}
-
+
public static ImapCommand authenticatedStateCommand(final String name) {
return new ImapCommandImpl(true, true, false, name);
}
-
+
public static ImapCommand selectedStateCommand(final String name) {
return new ImapCommandImpl(false, true, false, name);
}
-
+
public static ImapCommand anyStateCommand(final String name) {
return new ImapCommandImpl(true, true, true, name);
}
-
+
private final boolean validInAuthenticated;
+
private final boolean validInSelected;
+
private final boolean validInNonAuthenticated;
+
private final String name;
-
- private ImapCommandImpl(boolean validInAuthenticated, boolean validInSelected,
- boolean validInNonAuthenticated, final String name) {
+
+ private ImapCommandImpl(boolean validInAuthenticated,
+ boolean validInSelected, boolean validInNonAuthenticated,
+ final String name) {
super();
this.validInAuthenticated = validInAuthenticated;
this.validInSelected = validInSelected;
@@ -66,12 +70,12 @@
final boolean result;
if (state == ImapSessionState.AUTHENTICATED) {
result = validInAuthenticated;
- } else if (state == ImapSessionState.NON_AUTHENTICATED ) {
+ } else if (state == ImapSessionState.NON_AUTHENTICATED) {
result = validInNonAuthenticated;
} else if (state == ImapSessionState.SELECTED) {
result = validInSelected;
} else {
- result = false;
+ result = false;
}
return result;
}
Modified: james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/command/imap4rev1/StandardImap4Rev1CommandFactory.java
URL: http://svn.apache.org/viewvc/james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/command/imap4rev1/StandardImap4Rev1CommandFactory.java?rev=696828&r1=696827&r2=696828&view=diff
==============================================================================
--- james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/command/imap4rev1/StandardImap4Rev1CommandFactory.java (original)
+++ james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/command/imap4rev1/StandardImap4Rev1CommandFactory.java Thu Sep 18 14:44:56 2008
@@ -24,115 +24,162 @@
public class StandardImap4Rev1CommandFactory implements Imap4Rev1CommandFactory {
- private final ImapCommand append = ImapCommandImpl.authenticatedStateCommand(ImapConstants.APPEND_COMMAND_NAME);
- private final ImapCommand authenticate = ImapCommandImpl.nonAuthenticatedStateCommand(ImapConstants.AUTHENTICATE_COMMAND_NAME);
- private final ImapCommand capability = ImapCommandImpl.anyStateCommand(ImapConstants.CAPABILITY_COMMAND_NAME);
- private final ImapCommand check = ImapCommandImpl.selectedStateCommand(ImapConstants.CHECK_COMMAND_NAME);
- private final ImapCommand close = ImapCommandImpl.selectedStateCommand(ImapConstants.CLOSE_COMMAND_NAME);
- private final ImapCommand copy = ImapCommandImpl.selectedStateCommand(ImapConstants.COPY_COMMAND_NAME);
- private final ImapCommand create = ImapCommandImpl.authenticatedStateCommand(ImapConstants.CREATE_COMMAND_NAME);
- private final ImapCommand delete = ImapCommandImpl.authenticatedStateCommand(ImapConstants.DELETE_COMMAND_NAME);
- private final ImapCommand examine = ImapCommandImpl.authenticatedStateCommand(ImapConstants.EXAMINE_COMMAND_NAME);
- private final ImapCommand expunge = ImapCommandImpl.selectedStateCommand(ImapConstants.EXPUNGE_COMMAND_NAME);
- private final ImapCommand fetch = ImapCommandImpl.selectedStateCommand(ImapConstants.FETCH_COMMAND_NAME);
- private final ImapCommand list = ImapCommandImpl.authenticatedStateCommand(ImapConstants.LIST_COMMAND_NAME);
- private final ImapCommand login = ImapCommandImpl.nonAuthenticatedStateCommand(ImapConstants.LOGIN_COMMAND_NAME);
- private final ImapCommand logout = ImapCommandImpl.anyStateCommand(ImapConstants.LOGOUT_COMMAND_NAME);
- private final ImapCommand lsub = ImapCommandImpl.authenticatedStateCommand(ImapConstants.LSUB_COMMAND_NAME);
- private final ImapCommand noop = ImapCommandImpl.anyStateCommand(ImapConstants.NOOP_COMMAND_NAME);
- private final ImapCommand rename = ImapCommandImpl.authenticatedStateCommand(ImapConstants.RENAME_COMMAND_NAME);
- private final ImapCommand search = ImapCommandImpl.selectedStateCommand(ImapConstants.SEARCH_COMMAND_NAME);
- private final ImapCommand select = ImapCommandImpl.authenticatedStateCommand(ImapConstants.SELECT_COMMAND_NAME);
- private final ImapCommand status = ImapCommandImpl.authenticatedStateCommand(ImapConstants.STATUS_COMMAND_NAME);
- private final ImapCommand store = ImapCommandImpl.selectedStateCommand(ImapConstants.STORE_COMMAND_NAME);
- private final ImapCommand subscribe = ImapCommandImpl.authenticatedStateCommand(ImapConstants.SUBSCRIBE_COMMAND_NAME);
- private final ImapCommand uid = ImapCommandImpl.selectedStateCommand(ImapConstants.UID_COMMAND_NAME);
- private final ImapCommand unsubscribe = ImapCommandImpl.authenticatedStateCommand(ImapConstants.UNSUBSCRIBE_COMMAND_NAME);
-
+ private final ImapCommand append = ImapCommandImpl
+ .authenticatedStateCommand(ImapConstants.APPEND_COMMAND_NAME);
+
+ private final ImapCommand authenticate = ImapCommandImpl
+ .nonAuthenticatedStateCommand(ImapConstants.AUTHENTICATE_COMMAND_NAME);
+
+ private final ImapCommand capability = ImapCommandImpl
+ .anyStateCommand(ImapConstants.CAPABILITY_COMMAND_NAME);
+
+ private final ImapCommand check = ImapCommandImpl
+ .selectedStateCommand(ImapConstants.CHECK_COMMAND_NAME);
+
+ private final ImapCommand close = ImapCommandImpl
+ .selectedStateCommand(ImapConstants.CLOSE_COMMAND_NAME);
+
+ private final ImapCommand copy = ImapCommandImpl
+ .selectedStateCommand(ImapConstants.COPY_COMMAND_NAME);
+
+ private final ImapCommand create = ImapCommandImpl
+ .authenticatedStateCommand(ImapConstants.CREATE_COMMAND_NAME);
+
+ private final ImapCommand delete = ImapCommandImpl
+ .authenticatedStateCommand(ImapConstants.DELETE_COMMAND_NAME);
+
+ private final ImapCommand examine = ImapCommandImpl
+ .authenticatedStateCommand(ImapConstants.EXAMINE_COMMAND_NAME);
+
+ private final ImapCommand expunge = ImapCommandImpl
+ .selectedStateCommand(ImapConstants.EXPUNGE_COMMAND_NAME);
+
+ private final ImapCommand fetch = ImapCommandImpl
+ .selectedStateCommand(ImapConstants.FETCH_COMMAND_NAME);
+
+ private final ImapCommand list = ImapCommandImpl
+ .authenticatedStateCommand(ImapConstants.LIST_COMMAND_NAME);
+
+ private final ImapCommand login = ImapCommandImpl
+ .nonAuthenticatedStateCommand(ImapConstants.LOGIN_COMMAND_NAME);
+
+ private final ImapCommand logout = ImapCommandImpl
+ .anyStateCommand(ImapConstants.LOGOUT_COMMAND_NAME);
+
+ private final ImapCommand lsub = ImapCommandImpl
+ .authenticatedStateCommand(ImapConstants.LSUB_COMMAND_NAME);
+
+ private final ImapCommand noop = ImapCommandImpl
+ .anyStateCommand(ImapConstants.NOOP_COMMAND_NAME);
+
+ private final ImapCommand rename = ImapCommandImpl
+ .authenticatedStateCommand(ImapConstants.RENAME_COMMAND_NAME);
+
+ private final ImapCommand search = ImapCommandImpl
+ .selectedStateCommand(ImapConstants.SEARCH_COMMAND_NAME);
+
+ private final ImapCommand select = ImapCommandImpl
+ .authenticatedStateCommand(ImapConstants.SELECT_COMMAND_NAME);
+
+ private final ImapCommand status = ImapCommandImpl
+ .authenticatedStateCommand(ImapConstants.STATUS_COMMAND_NAME);
+
+ private final ImapCommand store = ImapCommandImpl
+ .selectedStateCommand(ImapConstants.STORE_COMMAND_NAME);
+
+ private final ImapCommand subscribe = ImapCommandImpl
+ .authenticatedStateCommand(ImapConstants.SUBSCRIBE_COMMAND_NAME);
+
+ private final ImapCommand uid = ImapCommandImpl
+ .selectedStateCommand(ImapConstants.UID_COMMAND_NAME);
+
+ private final ImapCommand unsubscribe = ImapCommandImpl
+ .authenticatedStateCommand(ImapConstants.UNSUBSCRIBE_COMMAND_NAME);
+
/**
* @see org.apache.james.api.imap.imap4rev1.Imap4Rev1CommandFactory#getAppend()
*/
public ImapCommand getAppend() {
return append;
}
-
+
/**
* @see org.apache.james.api.imap.imap4rev1.Imap4Rev1CommandFactory#getAuthenticate()
*/
public ImapCommand getAuthenticate() {
return authenticate;
}
-
+
/**
* @see org.apache.james.api.imap.imap4rev1.Imap4Rev1CommandFactory#getCapability()
*/
public ImapCommand getCapability() {
return capability;
}
-
+
/**
* @see org.apache.james.api.imap.imap4rev1.Imap4Rev1CommandFactory#getCheck()
*/
public ImapCommand getCheck() {
return check;
}
-
+
/**
* @see org.apache.james.api.imap.imap4rev1.Imap4Rev1CommandFactory#getClose()
*/
public ImapCommand getClose() {
return close;
}
-
+
/**
* @see org.apache.james.api.imap.imap4rev1.Imap4Rev1CommandFactory#getCopy()
*/
public ImapCommand getCopy() {
return copy;
}
-
+
/**
* @see org.apache.james.api.imap.imap4rev1.Imap4Rev1CommandFactory#getCreate()
*/
public ImapCommand getCreate() {
return create;
}
-
+
/**
* @see org.apache.james.api.imap.imap4rev1.Imap4Rev1CommandFactory#getDelete()
*/
public ImapCommand getDelete() {
return delete;
}
-
+
/**
* @see org.apache.james.api.imap.imap4rev1.Imap4Rev1CommandFactory#getExamine()
*/
public ImapCommand getExamine() {
return examine;
}
-
+
/**
* @see org.apache.james.api.imap.imap4rev1.Imap4Rev1CommandFactory#getExpunge()
*/
public ImapCommand getExpunge() {
return expunge;
}
-
+
/**
* @see org.apache.james.api.imap.imap4rev1.Imap4Rev1CommandFactory#getFetch()
*/
public ImapCommand getFetch() {
return fetch;
}
-
+
/**
* @see org.apache.james.api.imap.imap4rev1.Imap4Rev1CommandFactory#getList()
*/
public ImapCommand getList() {
return list;
}
-
+
/**
* @see org.apache.james.api.imap.imap4rev1.Imap4Rev1CommandFactory#getLogin()
*/
@@ -146,70 +193,70 @@
public ImapCommand getLogout() {
return logout;
}
-
+
/**
* @see org.apache.james.api.imap.imap4rev1.Imap4Rev1CommandFactory#getLsub()
*/
public ImapCommand getLsub() {
return lsub;
}
-
+
/**
* @see org.apache.james.api.imap.imap4rev1.Imap4Rev1CommandFactory#getNoop()
*/
public ImapCommand getNoop() {
return noop;
}
-
+
/**
* @see org.apache.james.api.imap.imap4rev1.Imap4Rev1CommandFactory#getRename()
*/
public ImapCommand getRename() {
return rename;
}
-
+
/**
* @see org.apache.james.api.imap.imap4rev1.Imap4Rev1CommandFactory#getSearch()
*/
public ImapCommand getSearch() {
return search;
}
-
+
/**
* @see org.apache.james.api.imap.imap4rev1.Imap4Rev1CommandFactory#getSelect()
*/
public ImapCommand getSelect() {
return select;
}
-
+
/**
* @see org.apache.james.api.imap.imap4rev1.Imap4Rev1CommandFactory#getStatus()
*/
public ImapCommand getStatus() {
return status;
}
-
+
/**
* @see org.apache.james.api.imap.imap4rev1.Imap4Rev1CommandFactory#getStore()
*/
public ImapCommand getStore() {
return store;
}
-
+
/**
* @see org.apache.james.api.imap.imap4rev1.Imap4Rev1CommandFactory#getSubscribe()
*/
public ImapCommand getSubscribe() {
return subscribe;
}
-
+
/**
* @see org.apache.james.api.imap.imap4rev1.Imap4Rev1CommandFactory#getUid()
*/
public ImapCommand getUid() {
return uid;
}
-
+
/**
* @see org.apache.james.api.imap.imap4rev1.Imap4Rev1CommandFactory#getUnsubscribe()
*/
Modified: james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/message/request/imap4rev1/AbstractMailboxSelectionRequest.java
URL: http://svn.apache.org/viewvc/james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/message/request/imap4rev1/AbstractMailboxSelectionRequest.java?rev=696828&r1=696827&r2=696828&view=diff
==============================================================================
--- james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/message/request/imap4rev1/AbstractMailboxSelectionRequest.java (original)
+++ james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/message/request/imap4rev1/AbstractMailboxSelectionRequest.java Thu Sep 18 14:44:56 2008
@@ -25,8 +25,8 @@
AbstractImapRequest {
private final String mailboxName;
- public AbstractMailboxSelectionRequest(final ImapCommand command, final String mailboxName,
- final String tag) {
+ public AbstractMailboxSelectionRequest(final ImapCommand command,
+ final String mailboxName, final String tag) {
super(tag, command);
this.mailboxName = mailboxName;
}
Modified: james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/message/request/imap4rev1/BaseImap4Rev1MessageFactory.java
URL: http://svn.apache.org/viewvc/james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/message/request/imap4rev1/BaseImap4Rev1MessageFactory.java?rev=696828&r1=696827&r2=696828&view=diff
==============================================================================
--- james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/message/request/imap4rev1/BaseImap4Rev1MessageFactory.java (original)
+++ james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/message/request/imap4rev1/BaseImap4Rev1MessageFactory.java Thu Sep 18 14:44:56 2008
@@ -15,7 +15,7 @@
* KIND, either express or implied. See the License for the *
* specific language governing permissions and limitations *
* under the License. *
- ****************************************************************/
+ ****************************************************************/
package org.apache.james.imap.message.request.imap4rev1;
import java.util.Date;
@@ -38,21 +38,24 @@
* Naive, factory creates unpooled instances.
*/
public class BaseImap4Rev1MessageFactory implements Imap4Rev1MessageFactory {
-
+
private StatusResponseFactory statusResponseFactory;
-
+
public BaseImap4Rev1MessageFactory(
StatusResponseFactory statusResponseFactory) {
super();
this.statusResponseFactory = statusResponseFactory;
}
- public ImapMessage createAppendMessage(ImapCommand command, String mailboxName, Flags flags, Date datetime, MimeMessage message, String tag) {
- return new AppendRequest(command, mailboxName,
- flags, datetime, message, tag);
+ public ImapMessage createAppendMessage(ImapCommand command,
+ String mailboxName, Flags flags, Date datetime,
+ MimeMessage message, String tag) {
+ return new AppendRequest(command, mailboxName, flags, datetime,
+ message, tag);
}
- public ImapMessage createAuthenticateMessage(ImapCommand command, String authType, String tag) {
+ public ImapMessage createAuthenticateMessage(ImapCommand command,
+ String authType, String tag) {
return new AuthenticateRequest(command, authType, tag);
}
@@ -68,19 +71,23 @@
return new CloseRequest(command, tag);
}
- public ImapMessage createCopyMessage(ImapCommand command, IdRange[] idSet, String mailboxName, boolean useUids, String tag) {
+ public ImapMessage createCopyMessage(ImapCommand command, IdRange[] idSet,
+ String mailboxName, boolean useUids, String tag) {
return new CopyRequest(command, idSet, mailboxName, useUids, tag);
}
- public ImapMessage createCreateMessage(ImapCommand command, String mailboxName, String tag) {
+ public ImapMessage createCreateMessage(ImapCommand command,
+ String mailboxName, String tag) {
return new CreateRequest(command, mailboxName, tag);
}
- public ImapMessage createDeleteMessage(ImapCommand command, String mailboxName, String tag) {
- return new DeleteRequest( command, mailboxName, tag );
+ public ImapMessage createDeleteMessage(ImapCommand command,
+ String mailboxName, String tag) {
+ return new DeleteRequest(command, mailboxName, tag);
}
- public ImapMessage createExamineMessage(ImapCommand command, String mailboxName, String tag) {
+ public ImapMessage createExamineMessage(ImapCommand command,
+ String mailboxName, String tag) {
return new ExamineRequest(command, mailboxName, tag);
}
@@ -88,15 +95,18 @@
return new ExpungeRequest(command, tag);
}
- public ImapMessage createFetchMessage(ImapCommand command, boolean useUids, IdRange[] idSet, FetchData fetch, String tag) {
+ public ImapMessage createFetchMessage(ImapCommand command, boolean useUids,
+ IdRange[] idSet, FetchData fetch, String tag) {
return new FetchRequest(command, useUids, idSet, fetch, tag);
}
- public ImapMessage createListMessage(ImapCommand command, String referenceName, String mailboxPattern, String tag) {
+ public ImapMessage createListMessage(ImapCommand command,
+ String referenceName, String mailboxPattern, String tag) {
return new ListRequest(command, referenceName, mailboxPattern, tag);
}
- public ImapMessage createLoginMessage(ImapCommand command, String userid, String password, String tag) {
+ public ImapMessage createLoginMessage(ImapCommand command, String userid,
+ String password, String tag) {
return new LoginRequest(command, userid, password, tag);
}
@@ -104,38 +114,48 @@
return new LogoutRequest(command, tag);
}
- public ImapMessage createLsubMessage(ImapCommand command, String referenceName, String mailboxPattern, String tag) {
+ public ImapMessage createLsubMessage(ImapCommand command,
+ String referenceName, String mailboxPattern, String tag) {
return new LsubRequest(command, referenceName, mailboxPattern, tag);
}
- public ImapMessage createRenameMessage(ImapCommand command, String existingName, String newName, String tag) {
+ public ImapMessage createRenameMessage(ImapCommand command,
+ String existingName, String newName, String tag) {
return new RenameRequest(command, existingName, newName, tag);
}
- public ImapMessage createSearchMessage(ImapCommand command, SearchKey key, boolean useUids, String tag) {
+ public ImapMessage createSearchMessage(ImapCommand command, SearchKey key,
+ boolean useUids, String tag) {
return new SearchRequest(command, key, useUids, tag);
}
- public ImapMessage createSelectMessage(ImapCommand command, String mailboxName, String tag) {
- return new SelectRequest(command, mailboxName, tag);
+ public ImapMessage createSelectMessage(ImapCommand command,
+ String mailboxName, String tag) {
+ return new SelectRequest(command, mailboxName, tag);
}
- public ImapMessage createStatusMessage(ImapCommand command, String mailboxName, StatusDataItems statusDataItems, String tag) {
+ public ImapMessage createStatusMessage(ImapCommand command,
+ String mailboxName, StatusDataItems statusDataItems, String tag) {
return new StatusRequest(command, mailboxName, statusDataItems, tag);
}
- public ImapMessage createStoreMessage(ImapCommand command, IdRange[] idSet, boolean silent, Boolean sign, Flags flags, boolean useUids, String tag) {
- return new StoreRequest(command, idSet, silent, flags, useUids, tag, sign);
+ public ImapMessage createStoreMessage(ImapCommand command, IdRange[] idSet,
+ boolean silent, Boolean sign, Flags flags, boolean useUids,
+ String tag) {
+ return new StoreRequest(command, idSet, silent, flags, useUids, tag,
+ sign);
}
- public ImapMessage createSubscribeMessage(ImapCommand command, String mailboxName, String tag) {
+ public ImapMessage createSubscribeMessage(ImapCommand command,
+ String mailboxName, String tag) {
return new SubscribeRequest(command, mailboxName, tag);
}
- public ImapMessage createUnsubscribeMessage(ImapCommand command, String mailboxName, String tag) {
+ public ImapMessage createUnsubscribeMessage(ImapCommand command,
+ String mailboxName, String tag) {
return new UnsubscribeRequest(command, mailboxName, tag);
}
-
+
public ImapMessage createCheckMessage(ImapCommand command, String tag) {
return new CheckRequest(command, tag);
}
Modified: james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/message/request/imap4rev1/SearchRequest.java
URL: http://svn.apache.org/viewvc/james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/message/request/imap4rev1/SearchRequest.java?rev=696828&r1=696827&r2=696828&view=diff
==============================================================================
--- james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/message/request/imap4rev1/SearchRequest.java (original)
+++ james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/message/request/imap4rev1/SearchRequest.java Thu Sep 18 14:44:56 2008
@@ -18,7 +18,6 @@
****************************************************************/
package org.apache.james.imap.message.request.imap4rev1;
-
import org.apache.james.api.imap.ImapCommand;
import org.apache.james.api.imap.message.request.SearchKey;
@@ -28,8 +27,8 @@
private final boolean useUids;
- public SearchRequest(final ImapCommand command,
- final SearchKey SearchKey, final boolean useUids, final String tag) {
+ public SearchRequest(final ImapCommand command, final SearchKey SearchKey,
+ final boolean useUids, final String tag) {
super(tag, command);
this.searchKey = SearchKey;
this.useUids = useUids;
Modified: james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/message/request/imap4rev1/StoreRequest.java
URL: http://svn.apache.org/viewvc/james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/message/request/imap4rev1/StoreRequest.java?rev=696828&r1=696827&r2=696828&view=diff
==============================================================================
--- james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/message/request/imap4rev1/StoreRequest.java (original)
+++ james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/message/request/imap4rev1/StoreRequest.java Thu Sep 18 14:44:56 2008
@@ -24,20 +24,22 @@
import org.apache.james.api.imap.message.IdRange;
public class StoreRequest extends AbstractImapRequest {
-
+
private final IdRange[] idSet;
private final Flags flags;
private final boolean useUids;
-
+
private final boolean silent;
+
private final boolean signedMinus;
+
private final boolean signedPlus;
public StoreRequest(final ImapCommand command, final IdRange[] idSet,
- final boolean silent, final Flags flags,
- final boolean useUids, final String tag, final Boolean sign) {
+ final boolean silent, final Flags flags, final boolean useUids,
+ final String tag, final Boolean sign) {
super(tag, command);
this.idSet = idSet;
this.silent = silent;
@@ -57,17 +59,17 @@
/**
* Is this store silent?
- * @return true if store silent,
- * false otherwise
+ *
+ * @return true if store silent, false otherwise
*/
public final boolean isSilent() {
return silent;
}
-
+
/**
- * Is the store signed MINUS?
- * Note that {@link #isSignedPlus()} must be false
- * when this property is true.
+ * Is the store signed MINUS? Note that {@link #isSignedPlus()} must be
+ * false when this property is true.
+ *
* @return true if the store is subtractive
*/
public final boolean isSignedMinus() {
@@ -75,9 +77,9 @@
}
/**
- * Is the store signed PLUS?
- * Note that {@link #isSignedMinus()} must be false
- * when this property is true.
+ * Is the store signed PLUS? Note that {@link #isSignedMinus()} must be
+ * false when this property is true.
+ *
* @return true if the store is additive
*/
public final boolean isSignedPlus() {
@@ -95,7 +97,7 @@
public final boolean isUseUids() {
return useUids;
}
-
+
public String toString() {
final StringBuffer buffer = new StringBuffer(100);
buffer.append("STORE ");
@@ -104,7 +106,7 @@
}
if (isSilent()) {
buffer.append("SILENT ");
-
+
}
if (isSignedPlus()) {
buffer.append("+ ");
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org