You are viewing a plain text version of this content. The canonical link for it is here.
Posted to server-dev@james.apache.org by no...@apache.org on 2010/03/22 19:24:49 UTC
svn commit: r926244 - in /james/imap/trunk:
mailbox/src/main/java/org/apache/james/imap/mailbox/util/
message/src/main/java/org/apache/james/imap/encode/
processor/src/main/java/org/apache/james/imap/processor/
processor/src/test/java/org/apache/james/...
Author: norman
Date: Mon Mar 22 18:24:49 2010
New Revision: 926244
URL: http://svn.apache.org/viewvc?rev=926244&view=rev
Log:
Fix warnings
Modified:
james/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/util/MessageResultImpl.java
james/imap/trunk/message/src/main/java/org/apache/james/imap/encode/StatusResponseEncoder.java
james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/SubscribeProcessor.java
james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/UnsubscribeProcessor.java
james/imap/trunk/processor/src/test/java/org/apache/james/imap/processor/base/MailboxEventAnalyserTest.java
james/imap/trunk/processor/src/test/java/org/apache/james/imap/processor/fetch/MessageResultUtilsTest.java
james/imap/trunk/protocol-tester/src/main/java/org/apache/james/test/functional/AbstractProtocolTestFramework.java
james/imap/trunk/store/src/test/java/org/apache/james/imap/store/MessageBuilder.java
james/imap/trunk/store/src/test/java/org/apache/james/imap/store/MessageRowUtilsTest.java
james/imap/trunk/store/src/test/java/org/apache/james/imap/store/SearchUtilsMultipartMixedTest.java
james/imap/trunk/store/src/test/java/org/apache/james/imap/store/SearchUtilsRFC822Test.java
james/imap/trunk/store/src/test/java/org/apache/james/imap/store/SearchUtilsTest.java
Modified: james/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/util/MessageResultImpl.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/util/MessageResultImpl.java?rev=926244&r1=926243&r2=926244&view=diff
==============================================================================
--- james/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/util/MessageResultImpl.java (original)
+++ james/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/util/MessageResultImpl.java Mon Mar 22 18:24:49 2010
@@ -333,7 +333,6 @@ public class MessageResultImpl implement
private int content;
- @SuppressWarnings("unused")
public final int getContent() {
return content;
}
Modified: james/imap/trunk/message/src/main/java/org/apache/james/imap/encode/StatusResponseEncoder.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/message/src/main/java/org/apache/james/imap/encode/StatusResponseEncoder.java?rev=926244&r1=926243&r2=926244&view=diff
==============================================================================
--- james/imap/trunk/message/src/main/java/org/apache/james/imap/encode/StatusResponseEncoder.java (original)
+++ james/imap/trunk/message/src/main/java/org/apache/james/imap/encode/StatusResponseEncoder.java Mon Mar 22 18:24:49 2010
@@ -20,8 +20,9 @@
package org.apache.james.imap.encode;
import java.io.IOException;
+import java.util.ArrayList;
import java.util.Collection;
-import java.util.Collections;
+import java.util.Locale;
import org.apache.james.imap.api.ImapCommand;
import org.apache.james.imap.api.ImapMessage;
@@ -54,7 +55,7 @@ public class StatusResponseEncoder exten
final ImapCommand command = response.getCommand();
final HumanReadableText textKey = response.getTextKey();
final String text = asString(textKey, session);
- final Collection parameters;
+ final Collection<String> parameters;
final long number;
if (responseCode == null) {
parameters = null;
@@ -67,10 +68,9 @@ public class StatusResponseEncoder exten
text);
}
- @SuppressWarnings("unchecked")
private String asString(HumanReadableText text, ImapSession session) {
// TODO: calculate locales
- return localizer.localize(text, new Locales(Collections.EMPTY_LIST, null));
+ return localizer.localize(text, new Locales(new ArrayList<Locale>(), null));
}
private String asString(StatusResponse.ResponseCode code) {
Modified: james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/SubscribeProcessor.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/SubscribeProcessor.java?rev=926244&r1=926243&r2=926244&view=diff
==============================================================================
--- james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/SubscribeProcessor.java (original)
+++ james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/SubscribeProcessor.java Mon Mar 22 18:24:49 2010
@@ -26,7 +26,6 @@ import org.apache.james.imap.api.message
import org.apache.james.imap.api.message.response.StatusResponseFactory;
import org.apache.james.imap.api.process.ImapProcessor;
import org.apache.james.imap.api.process.ImapSession;
-import org.apache.james.imap.mailbox.MailboxException;
import org.apache.james.imap.mailbox.MailboxManager;
import org.apache.james.imap.mailbox.MailboxSession;
import org.apache.james.imap.mailbox.SubscriptionException;
@@ -69,12 +68,6 @@ public class SubscribeProcessor extends
displayTextKey = exceptionKey;
}
no(command, tag, responder, displayTextKey);
- } catch (MailboxException e) {
- session.getLog().debug("Subscription failed", e);
- unsolicitedResponses(session, responder, false);
-
- final HumanReadableText displayTextKey = HumanReadableText.GENERIC_SUBSCRIPTION_FAILURE;
- no(command, tag, responder, displayTextKey);
}
}
}
Modified: james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/UnsubscribeProcessor.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/UnsubscribeProcessor.java?rev=926244&r1=926243&r2=926244&view=diff
==============================================================================
--- james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/UnsubscribeProcessor.java (original)
+++ james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/UnsubscribeProcessor.java Mon Mar 22 18:24:49 2010
@@ -26,7 +26,6 @@ import org.apache.james.imap.api.message
import org.apache.james.imap.api.message.response.StatusResponseFactory;
import org.apache.james.imap.api.process.ImapProcessor;
import org.apache.james.imap.api.process.ImapSession;
-import org.apache.james.imap.mailbox.MailboxException;
import org.apache.james.imap.mailbox.MailboxManager;
import org.apache.james.imap.mailbox.MailboxSession;
import org.apache.james.imap.mailbox.SubscriptionException;
@@ -69,12 +68,6 @@ public class UnsubscribeProcessor extend
displayTextKey = exceptionKey;
}
no(command, tag, responder, displayTextKey);
- } catch (MailboxException e) {
- session.getLog().debug("Subscription failed", e);
- unsolicitedResponses(session, responder, false);
-
- final HumanReadableText displayTextKey = HumanReadableText.GENERIC_SUBSCRIPTION_FAILURE;
- no(command, tag, responder, displayTextKey);
}
}
}
Modified: james/imap/trunk/processor/src/test/java/org/apache/james/imap/processor/base/MailboxEventAnalyserTest.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/processor/src/test/java/org/apache/james/imap/processor/base/MailboxEventAnalyserTest.java?rev=926244&r1=926243&r2=926244&view=diff
==============================================================================
--- james/imap/trunk/processor/src/test/java/org/apache/james/imap/processor/base/MailboxEventAnalyserTest.java (original)
+++ james/imap/trunk/processor/src/test/java/org/apache/james/imap/processor/base/MailboxEventAnalyserTest.java Mon Mar 22 18:24:49 2010
@@ -87,7 +87,7 @@ public class MailboxEventAnalyserTest {
uid, new Flags(), 11);
update.flags.add(Flags.Flag.ANSWERED);
analyser.event(update);
- final Iterator iterator = analyser.flagUpdateUids().iterator();
+ final Iterator<Long> iterator = analyser.flagUpdateUids().iterator();
assertNotNull(iterator);
assertTrue(iterator.hasNext());
assertEquals(new Long(uid), iterator.next());
@@ -115,7 +115,7 @@ public class MailboxEventAnalyserTest {
update.flags.add(Flags.Flag.ANSWERED);
analyser.setSilentFlagChanges(true);
analyser.event(update);
- final Iterator iterator = analyser.flagUpdateUids().iterator();
+ final Iterator<Long> iterator = analyser.flagUpdateUids().iterator();
assertNotNull(iterator);
assertTrue(iterator.hasNext());
assertEquals(new Long(uid), iterator.next());
@@ -130,7 +130,7 @@ public class MailboxEventAnalyserTest {
update.flags.add(Flags.Flag.ANSWERED);
analyser.setSilentFlagChanges(true);
analyser.event(update);
- final Iterator iterator = analyser.flagUpdateUids().iterator();
+ final Iterator<Long> iterator = analyser.flagUpdateUids().iterator();
assertNotNull(iterator);
assertFalse(iterator.hasNext());
}
@@ -141,7 +141,7 @@ public class MailboxEventAnalyserTest {
886, new Flags(), BASE_SESSION_ID);
update.flags.add(Flags.Flag.RECENT);
analyser.event(update);
- final Iterator iterator = analyser.flagUpdateUids().iterator();
+ final Iterator<Long> iterator = analyser.flagUpdateUids().iterator();
assertNotNull(iterator);
assertFalse(iterator.hasNext());
}
Modified: james/imap/trunk/processor/src/test/java/org/apache/james/imap/processor/fetch/MessageResultUtilsTest.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/processor/src/test/java/org/apache/james/imap/processor/fetch/MessageResultUtilsTest.java?rev=926244&r1=926243&r2=926244&view=diff
==============================================================================
--- james/imap/trunk/processor/src/test/java/org/apache/james/imap/processor/fetch/MessageResultUtilsTest.java (original)
+++ james/imap/trunk/processor/src/test/java/org/apache/james/imap/processor/fetch/MessageResultUtilsTest.java Mon Mar 22 18:24:49 2010
@@ -105,7 +105,7 @@ public class MessageResultUtilsTest {
@Test
public void testGetNotMatching() throws Exception {
- List results = MessageResultUtils.getNotMatching(NAMES, headers
+ List<MessageResult.Header> results = MessageResultUtils.getNotMatching(NAMES, headers
.iterator());
assertEquals(1, results.size());
assertEquals(headerTwo, results.get(0));
Modified: james/imap/trunk/protocol-tester/src/main/java/org/apache/james/test/functional/AbstractProtocolTestFramework.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/protocol-tester/src/main/java/org/apache/james/test/functional/AbstractProtocolTestFramework.java?rev=926244&r1=926243&r2=926244&view=diff
==============================================================================
--- james/imap/trunk/protocol-tester/src/main/java/org/apache/james/test/functional/AbstractProtocolTestFramework.java (original)
+++ james/imap/trunk/protocol-tester/src/main/java/org/apache/james/test/functional/AbstractProtocolTestFramework.java Mon Mar 22 18:24:49 2010
@@ -20,7 +20,6 @@
package org.apache.james.test.functional;
import org.junit.After;
-import org.junit.AfterClass;
import org.junit.Before;
/**
Modified: james/imap/trunk/store/src/test/java/org/apache/james/imap/store/MessageBuilder.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/store/src/test/java/org/apache/james/imap/store/MessageBuilder.java?rev=926244&r1=926243&r2=926244&view=diff
==============================================================================
--- james/imap/trunk/store/src/test/java/org/apache/james/imap/store/MessageBuilder.java (original)
+++ james/imap/trunk/store/src/test/java/org/apache/james/imap/store/MessageBuilder.java Mon Mar 22 18:24:49 2010
@@ -38,8 +38,8 @@ public class MessageBuilder {
public final List<SimpleHeader> headers = new ArrayList<SimpleHeader>();
public int lineNumber = 0;
- public MailboxMembership build() throws Exception {
- MailboxMembership result = new SimpleMailboxMembership(mailboxId, uid, internalDate, size, flags, body, headers);
+ public MailboxMembership<Long> build() throws Exception {
+ MailboxMembership<Long> result = new SimpleMailboxMembership(mailboxId, uid, internalDate, size, flags, body, headers);
return result;
}
Modified: james/imap/trunk/store/src/test/java/org/apache/james/imap/store/MessageRowUtilsTest.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/store/src/test/java/org/apache/james/imap/store/MessageRowUtilsTest.java?rev=926244&r1=926243&r2=926244&view=diff
==============================================================================
--- james/imap/trunk/store/src/test/java/org/apache/james/imap/store/MessageRowUtilsTest.java (original)
+++ james/imap/trunk/store/src/test/java/org/apache/james/imap/store/MessageRowUtilsTest.java Mon Mar 22 18:24:49 2010
@@ -29,12 +29,12 @@ public class MessageRowUtilsTest {
@Test
public void testShouldReturnPositiveWhenFirstGreaterThanSecond()
throws Exception {
- MailboxMembership one = buildMessage(100);
- MailboxMembership two = buildMessage(99);
+ MailboxMembership<Long> one = buildMessage(100);
+ MailboxMembership<Long> two = buildMessage(99);
assertTrue(ResultUtils.getUidComparator().compare(one, two) > 0);
}
- private MailboxMembership buildMessage(int uid) throws Exception {
+ private MailboxMembership<Long> buildMessage(int uid) throws Exception {
MessageBuilder builder = new MessageBuilder();
builder.uid = uid;
return builder.build();
@@ -43,15 +43,15 @@ public class MessageRowUtilsTest {
@Test
public void testShouldReturnNegativeWhenFirstLessThanSecond()
throws Exception {
- MailboxMembership one = buildMessage(98);
- MailboxMembership two = buildMessage(99);
+ MailboxMembership<Long> one = buildMessage(98);
+ MailboxMembership<Long> two = buildMessage(99);
assertTrue(ResultUtils.getUidComparator().compare(one, two) < 0);
}
@Test
public void testShouldReturnZeroWhenFirstEqualsSecond() throws Exception {
- MailboxMembership one = buildMessage(90);
- MailboxMembership two = buildMessage(90);
+ MailboxMembership<Long> one = buildMessage(90);
+ MailboxMembership<Long> two = buildMessage(90);
assertEquals(0, ResultUtils.getUidComparator().compare(one, two));
}
}
Modified: james/imap/trunk/store/src/test/java/org/apache/james/imap/store/SearchUtilsMultipartMixedTest.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/store/src/test/java/org/apache/james/imap/store/SearchUtilsMultipartMixedTest.java?rev=926244&r1=926243&r2=926244&view=diff
==============================================================================
--- james/imap/trunk/store/src/test/java/org/apache/james/imap/store/SearchUtilsMultipartMixedTest.java (original)
+++ james/imap/trunk/store/src/test/java/org/apache/james/imap/store/SearchUtilsMultipartMixedTest.java Mon Mar 22 18:24:49 2010
@@ -105,11 +105,11 @@ public class SearchUtilsMultipartMixedTe
+ " Than both your poets can in praise devise.\r\n"
+ "\r\n--2.50290787509--\r\n" + "\r\n--1729--\r\n";
- MailboxMembership row;
+ MailboxMembership<Long> row;
MessageSearches searches;
- Collection recent;
+ Collection<Long> recent;
@Before
public void setUp() throws Exception {
@@ -123,7 +123,7 @@ public class SearchUtilsMultipartMixedTe
builder.body = Charset.forName("us-ascii").encode(BODY).array();
row = builder.build();
searches = new MessageSearches();
- recent = new ArrayList();
+ recent = new ArrayList<Long>();
}
Modified: james/imap/trunk/store/src/test/java/org/apache/james/imap/store/SearchUtilsRFC822Test.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/store/src/test/java/org/apache/james/imap/store/SearchUtilsRFC822Test.java?rev=926244&r1=926243&r2=926244&view=diff
==============================================================================
--- james/imap/trunk/store/src/test/java/org/apache/james/imap/store/SearchUtilsRFC822Test.java (original)
+++ james/imap/trunk/store/src/test/java/org/apache/james/imap/store/SearchUtilsRFC822Test.java Mon Mar 22 18:24:49 2010
@@ -45,15 +45,15 @@ public class SearchUtilsRFC822Test {
+ "It has " + RHUBARD + ".\r\n" + "It has " + CUSTARD + ".\r\n"
+ "It needs naught else.\r\n";
- MailboxMembership row;
+ MailboxMembership<Long> row;
MessageSearches searches;
- Collection recent;
+ Collection<Long> recent;
@Before
public void setUp() throws Exception {
- recent = new ArrayList();
+ recent = new ArrayList<Long>();
MessageBuilder builder = new MessageBuilder();
builder.header(ImapConstants.RFC822_FROM, "Alex <alex@example.org");
builder.header(ImapConstants.RFC822_TO, FROM_ADDRESS);
Modified: james/imap/trunk/store/src/test/java/org/apache/james/imap/store/SearchUtilsTest.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/store/src/test/java/org/apache/james/imap/store/SearchUtilsTest.java?rev=926244&r1=926243&r2=926244&view=diff
==============================================================================
--- james/imap/trunk/store/src/test/java/org/apache/james/imap/store/SearchUtilsTest.java (original)
+++ james/imap/trunk/store/src/test/java/org/apache/james/imap/store/SearchUtilsTest.java Mon Mar 22 18:24:49 2010
@@ -68,7 +68,7 @@ public class SearchUtilsTest {
@Test
public void testMatchSizeLessThan() throws Exception {
builder.size = SIZE;
- MailboxMembership row = builder.build();
+ MailboxMembership<Long> row = builder.build();
assertFalse(searches.isMatch(SearchQuery.sizeLessThan(SIZE - 1), row,
recent));
assertFalse(searches.isMatch(SearchQuery.sizeLessThan(SIZE), row,
@@ -82,7 +82,7 @@ public class SearchUtilsTest {
@Test
public void testMatchSizeMoreThan() throws Exception {
builder.size = SIZE;
- MailboxMembership row = builder.build();
+ MailboxMembership<Long> row = builder.build();
assertTrue(searches.isMatch(SearchQuery.sizeGreaterThan(SIZE - 1), row,
recent));
assertFalse(searches.isMatch(SearchQuery.sizeGreaterThan(SIZE), row,
@@ -96,7 +96,7 @@ public class SearchUtilsTest {
@Test
public void testMatchSizeEquals() throws Exception {
builder.size = SIZE;
- MailboxMembership row = builder.build();
+ MailboxMembership<Long> row = builder.build();
assertFalse(searches.isMatch(SearchQuery.sizeEquals(SIZE - 1), row,
recent));
assertTrue(searches.isMatch(SearchQuery.sizeEquals(SIZE), row, recent));
@@ -109,7 +109,7 @@ public class SearchUtilsTest {
@Test
public void testMatchInternalDateEquals() throws Exception {
builder.internalDate = SUN_SEP_9TH_2001;
- MailboxMembership row = builder.build();
+ MailboxMembership<Long> row = builder.build();
assertFalse(searches.isMatch(SearchQuery.internalDateOn(9, 9, 2000),
row, recent));
assertFalse(searches.isMatch(SearchQuery.internalDateOn(8, 9, 2001),
@@ -125,7 +125,7 @@ public class SearchUtilsTest {
@Test
public void testMatchInternalDateBefore() throws Exception {
builder.internalDate = SUN_SEP_9TH_2001;
- MailboxMembership row = builder.build();
+ MailboxMembership<Long> row = builder.build();
assertFalse(searches.isMatch(
SearchQuery.internalDateBefore(9, 9, 2000), row, recent));
assertFalse(searches.isMatch(
@@ -141,7 +141,7 @@ public class SearchUtilsTest {
@Test
public void testMatchInternalDateAfter() throws Exception {
builder.internalDate = SUN_SEP_9TH_2001;
- MailboxMembership row = builder.build();
+ MailboxMembership<Long> row = builder.build();
assertTrue(searches.isMatch(SearchQuery.internalDateAfter(9, 9, 2000),
row, recent));
assertTrue(searches.isMatch(SearchQuery.internalDateAfter(8, 9, 2001),
@@ -157,7 +157,7 @@ public class SearchUtilsTest {
@Test
public void testMatchHeaderDateAfter() throws Exception {
builder.header(DATE_FIELD, RFC822_SUN_SEP_9TH_2001);
- MailboxMembership row = builder.build();
+ MailboxMembership<Long> row = builder.build();
assertTrue(searches.isMatch(SearchQuery.headerDateAfter(DATE_FIELD, 9,
9, 2000), row, recent));
assertTrue(searches.isMatch(SearchQuery.headerDateAfter(DATE_FIELD, 8,
@@ -175,7 +175,7 @@ public class SearchUtilsTest {
@Test
public void testShouldMatchCapsHeaderDateAfter() throws Exception {
builder.header(DATE_FIELD.toUpperCase(), RFC822_SUN_SEP_9TH_2001);
- MailboxMembership row = builder.build();
+ MailboxMembership<Long> row = builder.build();
assertTrue(searches.isMatch(SearchQuery.headerDateAfter(DATE_FIELD, 9,
9, 2000), row, recent));
assertTrue(searches.isMatch(SearchQuery.headerDateAfter(DATE_FIELD, 8,
@@ -193,7 +193,7 @@ public class SearchUtilsTest {
@Test
public void testShouldMatchLowersHeaderDateAfter() throws Exception {
builder.header(DATE_FIELD.toLowerCase(), RFC822_SUN_SEP_9TH_2001);
- MailboxMembership row = builder.build();
+ MailboxMembership<Long> row = builder.build();
assertTrue(searches.isMatch(SearchQuery.headerDateAfter(DATE_FIELD, 9,
9, 2000), row, recent));
assertTrue(searches.isMatch(SearchQuery.headerDateAfter(DATE_FIELD, 8,
@@ -211,7 +211,7 @@ public class SearchUtilsTest {
@Test
public void testMatchHeaderDateOn() throws Exception {
builder.header(DATE_FIELD, RFC822_SUN_SEP_9TH_2001);
- MailboxMembership row = builder.build();
+ MailboxMembership<Long> row = builder.build();
assertFalse(searches.isMatch(SearchQuery.headerDateOn(DATE_FIELD, 9, 9,
2000), row, recent));
assertFalse(searches.isMatch(SearchQuery.headerDateOn(DATE_FIELD, 8, 9,
@@ -229,7 +229,7 @@ public class SearchUtilsTest {
@Test
public void testShouldMatchCapsHeaderDateOn() throws Exception {
builder.header(DATE_FIELD.toUpperCase(), RFC822_SUN_SEP_9TH_2001);
- MailboxMembership row = builder.build();
+ MailboxMembership<Long> row = builder.build();
assertFalse(searches.isMatch(SearchQuery.headerDateOn(DATE_FIELD, 9, 9,
2000), row, recent));
assertFalse(searches.isMatch(SearchQuery.headerDateOn(DATE_FIELD, 8, 9,
@@ -247,7 +247,7 @@ public class SearchUtilsTest {
@Test
public void testShouldMatchLowersHeaderDateOn() throws Exception {
builder.header(DATE_FIELD.toLowerCase(), RFC822_SUN_SEP_9TH_2001);
- MailboxMembership row = builder.build();
+ MailboxMembership<Long> row = builder.build();
assertFalse(searches.isMatch(SearchQuery.headerDateOn(DATE_FIELD, 9, 9,
2000), row, recent));
assertFalse(searches.isMatch(SearchQuery.headerDateOn(DATE_FIELD, 8, 9,
@@ -265,7 +265,7 @@ public class SearchUtilsTest {
@Test
public void testMatchHeaderDateBefore() throws Exception {
builder.header(DATE_FIELD.toLowerCase(), RFC822_SUN_SEP_9TH_2001);
- MailboxMembership row = builder.build();
+ MailboxMembership<Long> row = builder.build();
assertFalse(searches.isMatch(SearchQuery.headerDateBefore(DATE_FIELD,
9, 9, 2000), row, recent));
assertFalse(searches.isMatch(SearchQuery.headerDateBefore(DATE_FIELD,
@@ -283,7 +283,7 @@ public class SearchUtilsTest {
@Test
public void testShouldMatchCapsHeaderDateBefore() throws Exception {
builder.header(DATE_FIELD.toLowerCase(), RFC822_SUN_SEP_9TH_2001);
- MailboxMembership row = builder.build();
+ MailboxMembership<Long> row = builder.build();
assertFalse(searches.isMatch(SearchQuery.headerDateBefore(DATE_FIELD,
9, 9, 2000), row, recent));
assertFalse(searches.isMatch(SearchQuery.headerDateBefore(DATE_FIELD,
@@ -301,7 +301,7 @@ public class SearchUtilsTest {
@Test
public void testShouldMatchLowersHeaderDateBefore() throws Exception {
builder.header(DATE_FIELD.toLowerCase(), RFC822_SUN_SEP_9TH_2001);
- MailboxMembership row = builder.build();
+ MailboxMembership<Long> row = builder.build();
assertFalse(searches.isMatch(SearchQuery.headerDateBefore(DATE_FIELD,
9, 9, 2000), row, recent));
assertFalse(searches.isMatch(SearchQuery.headerDateBefore(DATE_FIELD,
@@ -319,7 +319,7 @@ public class SearchUtilsTest {
@Test
public void testMatchHeaderContainsCaps() throws Exception {
builder.header(SUBJECT_FIELD, TEXT.toUpperCase());
- MailboxMembership row = builder.build();
+ MailboxMembership<Long> row = builder.build();
assertFalse(searches.isMatch(SearchQuery.headerContains(DATE_FIELD,
CUSTARD), row, recent));
assertFalse(searches.isMatch(SearchQuery.headerContains(DATE_FIELD,
@@ -335,7 +335,7 @@ public class SearchUtilsTest {
@Test
public void testMatchHeaderContainsLowers() throws Exception {
builder.header(SUBJECT_FIELD, TEXT.toUpperCase());
- MailboxMembership row = builder.build();
+ MailboxMembership<Long> row = builder.build();
assertFalse(searches.isMatch(SearchQuery.headerContains(DATE_FIELD,
CUSTARD), row, recent));
assertFalse(searches.isMatch(SearchQuery.headerContains(DATE_FIELD,
@@ -351,7 +351,7 @@ public class SearchUtilsTest {
@Test
public void testMatchHeaderContains() throws Exception {
builder.header(SUBJECT_FIELD, TEXT.toUpperCase());
- MailboxMembership row = builder.build();
+ MailboxMembership<Long> row = builder.build();
assertFalse(searches.isMatch(SearchQuery.headerContains(DATE_FIELD,
CUSTARD), row, recent));
assertFalse(searches.isMatch(SearchQuery.headerContains(DATE_FIELD,
@@ -367,7 +367,7 @@ public class SearchUtilsTest {
@Test
public void testShouldMatchLowerHeaderContains() throws Exception {
builder.header(SUBJECT_FIELD.toLowerCase(), TEXT);
- MailboxMembership row = builder.build();
+ MailboxMembership<Long> row = builder.build();
assertFalse(searches.isMatch(SearchQuery.headerContains(DATE_FIELD,
CUSTARD), row, recent));
assertFalse(searches.isMatch(SearchQuery.headerContains(DATE_FIELD,
@@ -383,7 +383,7 @@ public class SearchUtilsTest {
@Test
public void testShouldMatchCapsHeaderContains() throws Exception {
builder.header(SUBJECT_FIELD.toUpperCase(), TEXT);
- MailboxMembership row = builder.build();
+ MailboxMembership<Long> row = builder.build();
assertFalse(searches.isMatch(SearchQuery.headerContains(DATE_FIELD,
CUSTARD), row, recent));
assertFalse(searches.isMatch(SearchQuery.headerContains(DATE_FIELD,
@@ -399,7 +399,7 @@ public class SearchUtilsTest {
@Test
public void testMatchHeaderExists() throws Exception {
builder.header(SUBJECT_FIELD, TEXT);
- MailboxMembership row = builder.build();
+ MailboxMembership<Long> row = builder.build();
assertFalse(searches.isMatch(SearchQuery.headerExists(DATE_FIELD), row,
recent));
assertTrue(searches.isMatch(SearchQuery.headerExists(SUBJECT_FIELD),
@@ -409,7 +409,7 @@ public class SearchUtilsTest {
@Test
public void testShouldMatchLowersHeaderExists() throws Exception {
builder.header(SUBJECT_FIELD.toLowerCase(), TEXT);
- MailboxMembership row = builder.build();
+ MailboxMembership<Long> row = builder.build();
assertFalse(searches.isMatch(SearchQuery.headerExists(DATE_FIELD), row,
recent));
assertTrue(searches.isMatch(SearchQuery.headerExists(SUBJECT_FIELD),
@@ -419,7 +419,7 @@ public class SearchUtilsTest {
@Test
public void testShouldMatchUppersHeaderExists() throws Exception {
builder.header(SUBJECT_FIELD.toLowerCase(), TEXT);
- MailboxMembership row = builder.build();
+ MailboxMembership<Long> row = builder.build();
assertFalse(searches.isMatch(SearchQuery.headerExists(DATE_FIELD), row,
recent));
assertTrue(searches.isMatch(SearchQuery.headerExists(SUBJECT_FIELD),
@@ -429,7 +429,7 @@ public class SearchUtilsTest {
@Test
public void testShouldMatchUidRange() throws Exception {
builder.setKey(1, 1729);
- MailboxMembership row = builder.build();
+ MailboxMembership<Long> row = builder.build();
assertFalse(searches.isMatch(SearchQuery.uid(range(1, 1)), row, recent));
assertFalse(searches.isMatch(SearchQuery.uid(range(1728, 1728)), row,
recent));
@@ -460,7 +460,7 @@ public class SearchUtilsTest {
@Test
public void testShouldMatchSeenFlagSet() throws Exception {
builder.setFlags(true, false, false, false, false, false);
- MailboxMembership row = builder.build();
+ MailboxMembership<Long> row = builder.build();
assertTrue(searches.isMatch(SearchQuery.flagIsSet(Flags.Flag.SEEN),
row, recent));
assertFalse(searches.isMatch(SearchQuery.flagIsSet(Flags.Flag.FLAGGED),
@@ -478,7 +478,7 @@ public class SearchUtilsTest {
@Test
public void testShouldMatchAnsweredFlagSet() throws Exception {
builder.setFlags(false, false, true, false, false, false);
- MailboxMembership row = builder.build();
+ MailboxMembership<Long> row = builder.build();
assertFalse(searches.isMatch(SearchQuery.flagIsSet(Flags.Flag.SEEN),
row, recent));
assertFalse(searches.isMatch(SearchQuery.flagIsSet(Flags.Flag.FLAGGED),
@@ -496,7 +496,7 @@ public class SearchUtilsTest {
@Test
public void testShouldMatchFlaggedFlagSet() throws Exception {
builder.setFlags(false, true, false, false, false, false);
- MailboxMembership row = builder.build();
+ MailboxMembership<Long> row = builder.build();
assertFalse(searches.isMatch(SearchQuery.flagIsSet(Flags.Flag.SEEN),
row, recent));
assertTrue(searches.isMatch(SearchQuery.flagIsSet(Flags.Flag.FLAGGED),
@@ -514,7 +514,7 @@ public class SearchUtilsTest {
@Test
public void testShouldMatchDraftFlagSet() throws Exception {
builder.setFlags(false, false, false, true, false, false);
- MailboxMembership row = builder.build();
+ MailboxMembership<Long> row = builder.build();
assertFalse(searches.isMatch(SearchQuery.flagIsSet(Flags.Flag.SEEN),
row, recent));
assertFalse(searches.isMatch(SearchQuery.flagIsSet(Flags.Flag.FLAGGED),
@@ -533,7 +533,7 @@ public class SearchUtilsTest {
@Test
public void testShouldMatchDeletedFlagSet() throws Exception {
builder.setFlags(false, false, false, false, true, false);
- MailboxMembership row = builder.build();
+ MailboxMembership<Long> row = builder.build();
assertFalse(searches.isMatch(SearchQuery.flagIsSet(Flags.Flag.SEEN),
row, recent));
assertFalse(searches.isMatch(SearchQuery.flagIsSet(Flags.Flag.FLAGGED),
@@ -551,7 +551,7 @@ public class SearchUtilsTest {
@Test
public void testShouldMatchSeenRecentSet() throws Exception {
builder.setFlags(false, false, false, false, false, false);
- MailboxMembership row = builder.build();
+ MailboxMembership<Long> row = builder.build();
recent.add(new Long(row.getUid()));
assertFalse(searches.isMatch(SearchQuery.flagIsSet(Flags.Flag.SEEN),
row, recent));
@@ -570,7 +570,7 @@ public class SearchUtilsTest {
@Test
public void testShouldMatchSeenFlagUnSet() throws Exception {
builder.setFlags(false, true, true, true, true, true);
- MailboxMembership row = builder.build();
+ MailboxMembership<Long> row = builder.build();
recent.add(new Long(row.getUid()));
assertTrue(searches.isMatch(SearchQuery.flagIsUnSet(Flags.Flag.SEEN),
row, recent));
@@ -589,7 +589,7 @@ public class SearchUtilsTest {
@Test
public void testShouldMatchAnsweredFlagUnSet() throws Exception {
builder.setFlags(true, true, false, true, true, true);
- MailboxMembership row = builder.build();
+ MailboxMembership<Long> row = builder.build();
recent.add(new Long(row.getUid()));
assertFalse(searches.isMatch(SearchQuery.flagIsUnSet(Flags.Flag.SEEN),
row, recent));
@@ -608,7 +608,7 @@ public class SearchUtilsTest {
@Test
public void testShouldMatchFlaggedFlagUnSet() throws Exception {
builder.setFlags(true, false, true, true, true, true);
- MailboxMembership row = builder.build();
+ MailboxMembership<Long> row = builder.build();
recent.add(new Long(row.getUid()));
assertFalse(searches.isMatch(SearchQuery.flagIsUnSet(Flags.Flag.SEEN),
row, recent));
@@ -627,7 +627,7 @@ public class SearchUtilsTest {
@Test
public void testShouldMatchDraftFlagUnSet() throws Exception {
builder.setFlags(true, true, true, false, true, true);
- MailboxMembership row = builder.build();
+ MailboxMembership<Long> row = builder.build();
recent.add(new Long(row.getUid()));
assertFalse(searches.isMatch(SearchQuery.flagIsUnSet(Flags.Flag.SEEN),
row, recent));
@@ -646,7 +646,7 @@ public class SearchUtilsTest {
@Test
public void testShouldMatchDeletedFlagUnSet() throws Exception {
builder.setFlags(true, true, true, true, false, true);
- MailboxMembership row = builder.build();
+ MailboxMembership<Long> row = builder.build();
recent.add(new Long(row.getUid()));
assertFalse(searches.isMatch(SearchQuery.flagIsUnSet(Flags.Flag.SEEN),
row, recent));
@@ -665,7 +665,7 @@ public class SearchUtilsTest {
@Test
public void testShouldMatchSeenRecentUnSet() throws Exception {
builder.setFlags(true, true, true, true, true, true);
- MailboxMembership row = builder.build();
+ MailboxMembership<Long> row = builder.build();
recent.add(new Long(row.getUid() + 1));
assertFalse(searches.isMatch(SearchQuery.flagIsUnSet(Flags.Flag.SEEN),
row, recent));
@@ -683,13 +683,13 @@ public class SearchUtilsTest {
@Test
public void testShouldMatchAll() throws Exception {
- MailboxMembership row = builder.build();
+ MailboxMembership<Long> row = builder.build();
assertTrue(searches.isMatch(SearchQuery.all(), row, recent));
}
@Test
public void testShouldMatchNot() throws Exception {
- MailboxMembership row = builder.build();
+ MailboxMembership<Long> row = builder.build();
assertFalse(searches.isMatch(SearchQuery.not(SearchQuery.all()), row,
recent));
assertTrue(searches.isMatch(SearchQuery.not(SearchQuery
@@ -698,7 +698,7 @@ public class SearchUtilsTest {
@Test
public void testShouldMatchOr() throws Exception {
- MailboxMembership row = builder.build();
+ MailboxMembership<Long> row = builder.build();
assertTrue(searches.isMatch(SearchQuery.or(SearchQuery.all(),
SearchQuery.headerExists(DATE_FIELD)), row, recent));
assertTrue(searches.isMatch(SearchQuery.or(SearchQuery
@@ -712,7 +712,7 @@ public class SearchUtilsTest {
@Test
public void testShouldMatchAnd() throws Exception {
- MailboxMembership row = builder.build();
+ MailboxMembership<Long> row = builder.build();
assertFalse(searches.isMatch(SearchQuery.and(SearchQuery.all(),
SearchQuery.headerExists(DATE_FIELD)), row, recent));
assertFalse(searches.isMatch(SearchQuery.and(SearchQuery
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org