Author: rdonkin
Date: Fri Jan 23 10:52:42 2009
New Revision: 737143
URL: http://svn.apache.org/viewvc?rev=737143&view=rev
Log:
Removed SIZE and INTERNAL_DATE fecth groups.
Modified:
james/protocols/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/MessageResult.java
james/protocols/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/util/FetchGroupImpl.java
james/protocols/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/util/MessageResultImpl.java
james/protocols/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/util/MessageResultUtils.java
james/protocols/imap/trunk/mailbox/src/test/java/org/apache/james/imap/mailbox/MessageResultImplIncludedResultsTest.java
james/protocols/imap/trunk/mailbox/src/test/java/org/apache/james/imap/mailbox/MessageResultUtilsIsIncludedTest.java
james/protocols/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/imap4rev1/fetch/FetchProcessor.java
james/protocols/imap/trunk/store/src/main/java/org/apache/james/imap/store/ResultIterator.java
james/protocols/imap/trunk/store/src/main/java/org/apache/james/imap/store/ResultUtils.java
james/protocols/imap/trunk/torque/src/main/java/org/apache/james/mailboxmanager/torque/MessageRowUtils.java
james/protocols/imap/trunk/torque/src/main/java/org/apache/james/mailboxmanager/torque/TorqueResultIterator.java
Modified:
james/protocols/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/MessageResult.java
URL:
http://svn.apache.org/viewvc/james/protocols/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/MessageResult.java?rev=737143&r1=737142&r2=737143&view=diff
==============================================================================
---
james/protocols/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/MessageResult.java
(original)
+++
james/protocols/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/MessageResult.java
Fri Jan 23 10:52:42 2009
@@ -79,10 +79,6 @@
*/
public static final int MIME_DESCRIPTOR = 0x01;
- public static final int SIZE = 0x20;
-
- public static final int INTERNAL_DATE = 0x40;
-
public static final int FLAGS = 0x80;
public static final int HEADERS = 0x100;
@@ -102,8 +98,6 @@
* @see #MINIMAL
* @see #MIME_MESSAGE
* @see #KEY
- * @see #SIZE
- * @see #INTERNAL_DATE
* @see #FLAGS
* @see #HEADERS
* @see #FULL_CONTENT
@@ -134,8 +128,6 @@
* @see #MINIMAL
* @see #MIME_MESSAGE
* @see #KEY
- * @see #SIZE
- * @see #INTERNAL_DATE
* @see #FLAGS
* @see #HEADERS
* @see #FULL_CONTENT
Modified:
james/protocols/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/util/FetchGroupImpl.java
URL:
http://svn.apache.org/viewvc/james/protocols/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/util/FetchGroupImpl.java?rev=737143&r1=737142&r2=737143&view=diff
==============================================================================
---
james/protocols/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/util/FetchGroupImpl.java
(original)
+++
james/protocols/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/util/FetchGroupImpl.java
Fri Jan 23 10:52:42 2009
@@ -35,12 +35,6 @@
public static final MessageResult.FetchGroup MINIMAL = new FetchGroupImpl(
MessageResult.FetchGroup.MINIMAL);
- public static final MessageResult.FetchGroup SIZE = new FetchGroupImpl(
- MessageResult.FetchGroup.SIZE);
-
- public static final MessageResult.FetchGroup INTERNAL_DATE = new
FetchGroupImpl(
- MessageResult.FetchGroup.INTERNAL_DATE);
-
public static final MessageResult.FetchGroup FLAGS = new FetchGroupImpl(
MessageResult.FetchGroup.FLAGS);
Modified:
james/protocols/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/util/MessageResultImpl.java
URL:
http://svn.apache.org/viewvc/james/protocols/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/util/MessageResultImpl.java?rev=737143&r1=737142&r2=737143&view=diff
==============================================================================
---
james/protocols/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/util/MessageResultImpl.java
(original)
+++
james/protocols/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/util/MessageResultImpl.java
Fri Jan 23 10:52:42 2009
@@ -79,12 +79,8 @@
if (MessageResultUtils.isFlagsIncluded(result)) {
setFlags(result.getFlags());
}
- if (MessageResultUtils.isSizeIncluded(result)) {
- setSize(result.getSize());
- }
- if (MessageResultUtils.isInternalDateIncluded(result)) {
- setInternalDate(result.getInternalDate());
- }
+ setSize(result.getSize());
+ setInternalDate(result.getInternalDate());
if (MessageResultUtils.isHeadersIncluded(result)) {
setHeaders(toList(result.headers()));
}
@@ -165,14 +161,10 @@
public void setSize(int size) {
this.size = size;
- includedResults |= FetchGroup.SIZE;
}
public void setInternalDate(Date internalDate) {
this.internalDate = internalDate;
- if (internalDate != null) {
- includedResults |= FetchGroup.INTERNAL_DATE;
- }
}
public Iterator<Header> headers() {
Modified:
james/protocols/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/util/MessageResultUtils.java
URL:
http://svn.apache.org/viewvc/james/protocols/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/util/MessageResultUtils.java?rev=737143&r1=737142&r2=737143&view=diff
==============================================================================
---
james/protocols/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/util/MessageResultUtils.java
(original)
+++
james/protocols/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/util/MessageResultUtils.java
Fri Jan 23 10:52:42 2009
@@ -301,31 +301,4 @@
public static boolean isHeadersIncluded(final MessageResult message) {
return isIncluded(message, FetchGroup.HEADERS);
}
-
- /**
- * Is {...@link FetchGroup#INTERNAL_DATE} included in these results?
- *
- * @param message
- * <code>MessageResult</code>, possibly null
- * @return true if <code>MessageResult</code> includes INTERNAL_DATE,
- * false if <code>MessageResult</code> is null or does not contain
- * INTERNAL_DATE
- * @see #isIncluded(MessageResult, int)
- */
- public static boolean isInternalDateIncluded(final MessageResult message) {
- return isIncluded(message, FetchGroup.INTERNAL_DATE);
- }
-
- /**
- * Is {...@link FetchGroup#SIZE} included in these results?
- *
- * @param message
- * <code>MessageResult</code>, possibly null
- * @return true if <code>MessageResult</code> includes SIZE, false if
- * <code>MessageResult</code> is null or does not contain SIZE
- * @see #isIncluded(MessageResult, int)
- */
- public static boolean isSizeIncluded(final MessageResult message) {
- return isIncluded(message, FetchGroup.SIZE);
- }
}
Modified:
james/protocols/imap/trunk/mailbox/src/test/java/org/apache/james/imap/mailbox/MessageResultImplIncludedResultsTest.java
URL:
http://svn.apache.org/viewvc/james/protocols/imap/trunk/mailbox/src/test/java/org/apache/james/imap/mailbox/MessageResultImplIncludedResultsTest.java?rev=737143&r1=737142&r2=737143&view=diff
==============================================================================
---
james/protocols/imap/trunk/mailbox/src/test/java/org/apache/james/imap/mailbox/MessageResultImplIncludedResultsTest.java
(original)
+++
james/protocols/imap/trunk/mailbox/src/test/java/org/apache/james/imap/mailbox/MessageResultImplIncludedResultsTest.java
Fri Jan 23 10:52:42 2009
@@ -58,25 +58,6 @@
assertEquals(FetchGroup.FLAGS, result.getIncludedResults().content());
}
- public void testShouldIncludedResultsWhenSizeSet() throws Exception {
- result.setSize(100);
- assertEquals(FetchGroup.SIZE, result.getIncludedResults().content());
- MessageResultImpl result = new MessageResultImpl(this.result);
- assertEquals(FetchGroup.SIZE, result.getIncludedResults().content());
- }
-
- public void testShouldIncludedResultsWhenInternalDateSet() throws
Exception {
- result.setInternalDate(null);
- assertEquals(FetchGroup.MINIMAL,
result.getIncludedResults().content());
- Date date = new Date();
- result.setInternalDate(date);
- assertEquals(FetchGroup.INTERNAL_DATE, result.getIncludedResults()
- .content());
- result = new MessageResultImpl(this.result);
- assertEquals(FetchGroup.INTERNAL_DATE, result.getIncludedResults()
- .content());
- }
-
public void testShouldIncludedResultsWhenHeadersSet() throws Exception {
result.setHeaders(null);
assertEquals(FetchGroup.MINIMAL,
result.getIncludedResults().content());
@@ -138,24 +119,19 @@
assertTrue(MessageResultUtils.isHeadersIncluded(result));
result.setInternalDate(new Date());
assertEquals(FetchGroup.FLAGS | FetchGroup.BODY_CONTENT
- | FetchGroup.FULL_CONTENT | FetchGroup.HEADERS
- | FetchGroup.INTERNAL_DATE, result.getIncludedResults()
+ | FetchGroup.FULL_CONTENT | FetchGroup.HEADERS,
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
+ | FetchGroup.FULL_CONTENT | FetchGroup.HEADERS, result
.getIncludedResults().content());
assertTrue(MessageResultUtils.isFlagsIncluded(result));
assertTrue(MessageResultUtils.isBodyContentIncluded(result));
assertTrue(MessageResultUtils.isFullContentIncluded(result));
assertTrue(MessageResultUtils.isHeadersIncluded(result));
- assertTrue(MessageResultUtils.isInternalDateIncluded(result));
- assertTrue(MessageResultUtils.isSizeIncluded(result));
}
}
Modified:
james/protocols/imap/trunk/mailbox/src/test/java/org/apache/james/imap/mailbox/MessageResultUtilsIsIncludedTest.java
URL:
http://svn.apache.org/viewvc/james/protocols/imap/trunk/mailbox/src/test/java/org/apache/james/imap/mailbox/MessageResultUtilsIsIncludedTest.java?rev=737143&r1=737142&r2=737143&view=diff
==============================================================================
---
james/protocols/imap/trunk/mailbox/src/test/java/org/apache/james/imap/mailbox/MessageResultUtilsIsIncludedTest.java
(original)
+++
james/protocols/imap/trunk/mailbox/src/test/java/org/apache/james/imap/mailbox/MessageResultUtilsIsIncludedTest.java
Fri Jan 23 10:52:42 2009
@@ -83,25 +83,11 @@
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));
- }
-
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));
}
private MessageResult mock(FetchGroup included) {
Modified:
james/protocols/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/imap4rev1/fetch/FetchProcessor.java
URL:
http://svn.apache.org/viewvc/james/protocols/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/imap4rev1/fetch/FetchProcessor.java?rev=737143&r1=737142&r2=737143&view=diff
==============================================================================
---
james/protocols/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/imap4rev1/fetch/FetchProcessor.java
(original)
+++
james/protocols/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/imap4rev1/fetch/FetchProcessor.java
Fri Jan 23 10:52:42 2009
@@ -113,12 +113,7 @@
if (fetch.isFlags() || fetch.isSetSeen()) {
result.or(FetchGroup.FLAGS);
}
- if (fetch.isInternalDate()) {
- result.or(FetchGroup.INTERNAL_DATE);
- }
- if (fetch.isSize()) {
- result.or(FetchGroup.SIZE);
- }
+
if (fetch.isEnvelope()) {
result.or(FetchGroup.HEADERS);
}
Modified:
james/protocols/imap/trunk/store/src/main/java/org/apache/james/imap/store/ResultIterator.java
URL:
http://svn.apache.org/viewvc/james/protocols/imap/trunk/store/src/main/java/org/apache/james/imap/store/ResultIterator.java?rev=737143&r1=737142&r2=737143&view=diff
==============================================================================
---
james/protocols/imap/trunk/store/src/main/java/org/apache/james/imap/store/ResultIterator.java
(original)
+++
james/protocols/imap/trunk/store/src/main/java/org/apache/james/imap/store/ResultIterator.java
Fri Jan 23 10:52:42 2009
@@ -96,8 +96,7 @@
}
private static final class UnloadedMessageResult implements MessageResult {
- private static final FetchGroup FETCH_GROUP = new FetchGroupImpl(
- FetchGroup.INTERNAL_DATE | FetchGroup.SIZE);
+ private static final FetchGroup FETCH_GROUP = FetchGroupImpl.MINIMAL;
private final MailboxException exception;
Modified:
james/protocols/imap/trunk/store/src/main/java/org/apache/james/imap/store/ResultUtils.java
URL:
http://svn.apache.org/viewvc/james/protocols/imap/trunk/store/src/main/java/org/apache/james/imap/store/ResultUtils.java?rev=737143&r1=737142&r2=737143&view=diff
==============================================================================
---
james/protocols/imap/trunk/store/src/main/java/org/apache/james/imap/store/ResultUtils.java
(original)
+++
james/protocols/imap/trunk/store/src/main/java/org/apache/james/imap/store/ResultUtils.java
Fri Jan 23 10:52:42 2009
@@ -110,14 +110,8 @@
messageResult.setFlags(message.createFlags());
content -= FetchGroup.FLAGS;
}
- if ((content & FetchGroup.SIZE) > 0) {
- messageResult.setSize(message.getSize());
- content -= FetchGroup.SIZE;
- }
- if ((content & FetchGroup.INTERNAL_DATE) > 0) {
- messageResult.setInternalDate(message.getInternalDate());
- content -= FetchGroup.INTERNAL_DATE;
- }
+ messageResult.setSize(message.getSize());
+ messageResult.setInternalDate(message.getInternalDate());
if ((content & FetchGroup.HEADERS) > 0) {
addHeaders(message, messageResult);
content -= FetchGroup.HEADERS;
Modified:
james/protocols/imap/trunk/torque/src/main/java/org/apache/james/mailboxmanager/torque/MessageRowUtils.java
URL:
http://svn.apache.org/viewvc/james/protocols/imap/trunk/torque/src/main/java/org/apache/james/mailboxmanager/torque/MessageRowUtils.java?rev=737143&r1=737142&r2=737143&view=diff
==============================================================================
---
james/protocols/imap/trunk/torque/src/main/java/org/apache/james/mailboxmanager/torque/MessageRowUtils.java
(original)
+++
james/protocols/imap/trunk/torque/src/main/java/org/apache/james/mailboxmanager/torque/MessageRowUtils.java
Fri Jan 23 10:52:42 2009
@@ -138,14 +138,8 @@
}
content -= FetchGroup.FLAGS;
}
- if ((content & FetchGroup.SIZE) > 0) {
- messageResult.setSize(messageRow.getSize());
- content -= FetchGroup.SIZE;
- }
- if ((content & FetchGroup.INTERNAL_DATE) > 0) {
- messageResult.setInternalDate(messageRow.getInternalDate());
- content -= FetchGroup.INTERNAL_DATE;
- }
+ messageResult.setSize(messageRow.getSize());
+ messageResult.setInternalDate(messageRow.getInternalDate());
if ((content & FetchGroup.HEADERS) > 0) {
addHeaders(messageRow, messageResult);
content -= FetchGroup.HEADERS;
Modified:
james/protocols/imap/trunk/torque/src/main/java/org/apache/james/mailboxmanager/torque/TorqueResultIterator.java
URL:
http://svn.apache.org/viewvc/james/protocols/imap/trunk/torque/src/main/java/org/apache/james/mailboxmanager/torque/TorqueResultIterator.java?rev=737143&r1=737142&r2=737143&view=diff
==============================================================================
---
james/protocols/imap/trunk/torque/src/main/java/org/apache/james/mailboxmanager/torque/TorqueResultIterator.java
(original)
+++
james/protocols/imap/trunk/torque/src/main/java/org/apache/james/mailboxmanager/torque/TorqueResultIterator.java
Fri Jan 23 10:52:42 2009
@@ -33,7 +33,6 @@
import org.apache.james.imap.mailbox.MailboxException;
import org.apache.james.imap.mailbox.MessageResult;
import org.apache.james.imap.mailbox.MessageResult.FetchGroup;
-import org.apache.james.imap.mailbox.MessageResult.Header;
import org.apache.james.imap.mailbox.util.FetchGroupImpl;
import org.apache.james.imap.mailbox.util.MessageFlags;
import org.apache.james.mailboxmanager.torque.om.MessageRow;
@@ -99,8 +98,7 @@
}
private static final class UnloadedMessageResult implements MessageResult {
- private static final FetchGroup FETCH_GROUP = new FetchGroupImpl(
- FetchGroup.INTERNAL_DATE | FetchGroup.SIZE);
+ private static final FetchGroup FETCH_GROUP = FetchGroupImpl.MINIMAL;
private final MailboxException exception;
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
