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 ma...@apache.org on 2016/01/12 14:17:05 UTC
svn commit: r1724225 [5/5] - in /james/project/trunk:
dockerfiles/run/guice/destination/conf/META-INF/
dockerfiles/run/spring/destination/conf/META-INF/
mailbox/caching/src/main/java/org/apache/james/mailbox/caching/
mailbox/cassandra/src/main/java/org...
Modified: james/project/trunk/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/AbstractMessageMapperTest.java
URL: http://svn.apache.org/viewvc/james/project/trunk/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/AbstractMessageMapperTest.java?rev=1724225&r1=1724224&r2=1724225&view=diff
==============================================================================
--- james/project/trunk/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/AbstractMessageMapperTest.java (original)
+++ james/project/trunk/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/AbstractMessageMapperTest.java Tue Jan 12 13:17:03 2016
@@ -41,7 +41,7 @@ import org.apache.james.mailbox.store.ma
import org.apache.james.mailbox.store.mail.MessageMapper.FetchType;
import org.apache.james.mailbox.store.mail.model.impl.PropertyBuilder;
import org.apache.james.mailbox.store.mail.model.impl.SimpleMailbox;
-import org.apache.james.mailbox.store.mail.model.impl.SimpleMessage;
+import org.apache.james.mailbox.store.mail.model.impl.SimpleMailboxMessage;
import org.junit.After;
import org.junit.Before;
import org.junit.Ignore;
@@ -61,12 +61,12 @@ public abstract class AbstractMessageMap
private SimpleMailbox<Id> benwaInboxMailbox;
private SimpleMailbox<Id> benwaWorkMailbox;
- private SimpleMessage<Id> message1;
- private SimpleMessage<Id> message2;
- private SimpleMessage<Id> message3;
- private SimpleMessage<Id> message4;
- private SimpleMessage<Id> message5;
- private SimpleMessage<Id> message6;
+ private SimpleMailboxMessage<Id> message1;
+ private SimpleMailboxMessage<Id> message2;
+ private SimpleMailboxMessage<Id> message3;
+ private SimpleMailboxMessage<Id> message4;
+ private SimpleMailboxMessage<Id> message5;
+ private SimpleMailboxMessage<Id> message6;
public AbstractMessageMapperTest(MapperProvider<Id> mapperProvider) {
this.mapperProvider = mapperProvider;
@@ -177,7 +177,7 @@ public abstract class AbstractMessageMap
@Test
public void messagesCanBeRetrievedInMailboxWithRangeTypeRange() throws MailboxException, IOException{
saveMessages();
- Iterator<Message<Id>> retrievedMessageIterator = messageMapper
+ Iterator<MailboxMessage<Id>> retrievedMessageIterator = messageMapper
.findInMailbox(benwaInboxMailbox, MessageRange.range(message1.getUid(), message4.getUid()), MessageMapper.FetchType.Full, LIMIT);
assertThat(retrievedMessageIterator).containsOnly(message1, message2, message3, message4);
}
@@ -187,7 +187,7 @@ public abstract class AbstractMessageMap
public void messagesCanBeRetrievedInMailboxWithRangeTypeRangeContainingAHole() throws MailboxException, IOException {
saveMessages();
messageMapper.delete(benwaInboxMailbox, message3);
- Iterator<Message<Id>> retrievedMessageIterator = messageMapper
+ Iterator<MailboxMessage<Id>> retrievedMessageIterator = messageMapper
.findInMailbox(benwaInboxMailbox, MessageRange.range(message1.getUid(), message4.getUid()), MessageMapper.FetchType.Full, LIMIT);
assertThat(retrievedMessageIterator).containsOnly(message1, message2, message4);
}
@@ -196,7 +196,7 @@ public abstract class AbstractMessageMap
@Test
public void messagesCanBeRetrievedInMailboxWithRangeTypeFrom() throws MailboxException, IOException {
saveMessages();
- Iterator<Message<Id>> retrievedMessageIterator = messageMapper
+ Iterator<MailboxMessage<Id>> retrievedMessageIterator = messageMapper
.findInMailbox(benwaInboxMailbox, MessageRange.from(message3.getUid()), MessageMapper.FetchType.Full, LIMIT);
assertThat(retrievedMessageIterator).containsOnly(message3, message4, message5);
}
@@ -206,7 +206,7 @@ public abstract class AbstractMessageMap
public void messagesCanBeRetrievedInMailboxWithRangeTypeFromContainingAHole() throws MailboxException, IOException {
saveMessages();
messageMapper.delete(benwaInboxMailbox, message4);
- Iterator<Message<Id>> retrievedMessageIterator = messageMapper
+ Iterator<MailboxMessage<Id>> retrievedMessageIterator = messageMapper
.findInMailbox(benwaInboxMailbox, MessageRange.from(message3.getUid()), MessageMapper.FetchType.Full, LIMIT);
assertThat(retrievedMessageIterator).containsOnly(message3, message5);
}
@@ -224,7 +224,7 @@ public abstract class AbstractMessageMap
public void messagesCanBeRetrievedInMailboxWithRangeTypeAllContainingHole() throws MailboxException, IOException {
saveMessages();
messageMapper.delete(benwaInboxMailbox, message1);
- Iterator<Message<Id>> retrievedMessageIterator = messageMapper
+ Iterator<MailboxMessage<Id>> retrievedMessageIterator = messageMapper
.findInMailbox(benwaInboxMailbox, MessageRange.all(), MessageMapper.FetchType.Full, LIMIT);
assertThat(retrievedMessageIterator).containsOnly(message2, message3, message4, message5);
}
@@ -233,7 +233,7 @@ public abstract class AbstractMessageMap
public void messagesRetrievedUsingFetchTypeMetadataShouldHaveAtLastMetadataDataLoaded() throws MailboxException, IOException{
saveMessages();
MessageMapper.FetchType fetchType = MessageMapper.FetchType.Metadata;
- Iterator<Message<Id>> retrievedMessageIterator = messageMapper.findInMailbox(benwaInboxMailbox, MessageRange.one(message1.getUid()), fetchType, LIMIT);
+ Iterator<MailboxMessage<Id>> retrievedMessageIterator = messageMapper.findInMailbox(benwaInboxMailbox, MessageRange.one(message1.getUid()), fetchType, LIMIT);
MessageAssert.assertThat(retrievedMessageIterator.next()).isEqualTo(message1, fetchType);
assertThat(retrievedMessageIterator).isEmpty();
}
@@ -242,7 +242,7 @@ public abstract class AbstractMessageMap
public void messagesRetrievedUsingFetchTypeHeaderShouldHaveHeaderDataLoaded() throws MailboxException, IOException{
saveMessages();
MessageMapper.FetchType fetchType = MessageMapper.FetchType.Headers;
- Iterator<Message<Id>> retrievedMessageIterator = messageMapper.findInMailbox(benwaInboxMailbox, MessageRange.one(message1.getUid()), fetchType, LIMIT);
+ Iterator<MailboxMessage<Id>> retrievedMessageIterator = messageMapper.findInMailbox(benwaInboxMailbox, MessageRange.one(message1.getUid()), fetchType, LIMIT);
MessageAssert.assertThat(retrievedMessageIterator.next()).isEqualTo(message1, fetchType);
assertThat(retrievedMessageIterator).isEmpty();
}
@@ -251,7 +251,7 @@ public abstract class AbstractMessageMap
public void messagesRetrievedUsingFetchTypeBodyShouldHaveBodyDataLoaded() throws MailboxException, IOException{
saveMessages();
MessageMapper.FetchType fetchType = MessageMapper.FetchType.Body;
- Iterator<Message<Id>> retrievedMessageIterator = messageMapper.findInMailbox(benwaInboxMailbox, MessageRange.one(message1.getUid()), fetchType, LIMIT);
+ Iterator<MailboxMessage<Id>> retrievedMessageIterator = messageMapper.findInMailbox(benwaInboxMailbox, MessageRange.one(message1.getUid()), fetchType, LIMIT);
MessageAssert.assertThat(retrievedMessageIterator.next()).isEqualTo(message1, fetchType);
assertThat(retrievedMessageIterator).isEmpty();
}
@@ -413,21 +413,21 @@ public abstract class AbstractMessageMap
public void copyShouldIncrementUid() throws MailboxException, IOException {
saveMessages();
long uid = messageMapper.getLastUid(benwaInboxMailbox);
- messageMapper.copy(benwaInboxMailbox, SimpleMessage.copy(benwaInboxMailbox.getMailboxId(), message6));
+ messageMapper.copy(benwaInboxMailbox, SimpleMailboxMessage.copy(benwaInboxMailbox.getMailboxId(), message6));
assertThat(messageMapper.getLastUid(benwaInboxMailbox)).isGreaterThan(uid);
}
@Test
public void copyShouldIncrementMessageCount() throws MailboxException, IOException {
saveMessages();
- messageMapper.copy(benwaInboxMailbox, SimpleMessage.copy(benwaInboxMailbox.getMailboxId(), message6));
+ messageMapper.copy(benwaInboxMailbox, SimpleMailboxMessage.copy(benwaInboxMailbox.getMailboxId(), message6));
assertThat(messageMapper.countMessagesInMailbox(benwaInboxMailbox)).isEqualTo(6);
}
@Test
public void copyOfUnSeenMessageShouldIncrementUnSeenMessageCount() throws MailboxException, IOException {
saveMessages();
- messageMapper.copy(benwaInboxMailbox, SimpleMessage.copy(benwaInboxMailbox.getMailboxId(), message6));
+ messageMapper.copy(benwaInboxMailbox, SimpleMailboxMessage.copy(benwaInboxMailbox.getMailboxId(), message6));
assertThat(messageMapper.countUnseenMessagesInMailbox(benwaInboxMailbox)).isEqualTo(6);
}
@@ -435,14 +435,14 @@ public abstract class AbstractMessageMap
public void copyShouldIncrementModSeq() throws MailboxException, IOException {
saveMessages();
long modSeq = messageMapper.getHighestModSeq(benwaInboxMailbox);
- messageMapper.copy(benwaInboxMailbox, SimpleMessage.copy(benwaInboxMailbox.getMailboxId(), message6));
+ messageMapper.copy(benwaInboxMailbox, SimpleMailboxMessage.copy(benwaInboxMailbox.getMailboxId(), message6));
assertThat(messageMapper.getHighestModSeq(benwaInboxMailbox)).isGreaterThan(modSeq);
}
@Test
public void copyShouldCreateAMessageInDestination() throws MailboxException, IOException {
saveMessages();
- Message<Id> message7 = SimpleMessage.copy(benwaInboxMailbox.getMailboxId(), message6);
+ MailboxMessage<Id> message7 = SimpleMailboxMessage.copy(benwaInboxMailbox.getMailboxId(), message6);
messageMapper.copy(benwaInboxMailbox, message7);
message7.setModSeq(messageMapper.getHighestModSeq(benwaInboxMailbox));
MessageAssert.assertThat(messageMapper.findInMailbox(benwaInboxMailbox, MessageRange.one(message7.getUid()), MessageMapper.FetchType.Full, LIMIT).next())
@@ -452,13 +452,13 @@ public abstract class AbstractMessageMap
@Test
public void copyOfSeenMessageShouldNotIncrementUnSeenMessageCount() throws MailboxException {
message6.setFlags(new Flags(Flags.Flag.SEEN));
- messageMapper.copy(benwaInboxMailbox, SimpleMessage.copy(benwaInboxMailbox.getMailboxId(), message6));
+ messageMapper.copy(benwaInboxMailbox, SimpleMailboxMessage.copy(benwaInboxMailbox.getMailboxId(), message6));
assertThat(messageMapper.countUnseenMessagesInMailbox(benwaInboxMailbox)).isEqualTo(0);
}
@Test
public void copiedMessageShouldBeMarkedAsRecent() throws MailboxException {
- MessageMetaData metaData = messageMapper.copy(benwaInboxMailbox, SimpleMessage.copy(benwaInboxMailbox.getMailboxId(), message6));
+ MessageMetaData metaData = messageMapper.copy(benwaInboxMailbox, SimpleMailboxMessage.copy(benwaInboxMailbox.getMailboxId(), message6));
assertThat(
messageMapper.findInMailbox(benwaInboxMailbox,
MessageRange.one(metaData.getUid()),
@@ -472,7 +472,7 @@ public abstract class AbstractMessageMap
@Test
public void copiedRecentMessageShouldBeMarkedAsRecent() throws MailboxException {
message6.setFlags(new Flags(Flags.Flag.RECENT));
- MessageMetaData metaData = messageMapper.copy(benwaInboxMailbox, SimpleMessage.copy(benwaInboxMailbox.getMailboxId(), message6));
+ MessageMetaData metaData = messageMapper.copy(benwaInboxMailbox, SimpleMailboxMessage.copy(benwaInboxMailbox.getMailboxId(), message6));
assertThat(
messageMapper.findInMailbox(benwaInboxMailbox,
MessageRange.one(metaData.getUid()),
@@ -560,9 +560,9 @@ public abstract class AbstractMessageMap
propBuilder.setProperty(StandardNames.NAMESPACE_RFC_2045, StandardNames.MIME_CONTENT_TRANSFER_ENCODING_NAME, "7bit");
propBuilder.setProperty(StandardNames.MIME_CONTENT_TYPE_PARAMETER_SPACE, StandardNames.MIME_CONTENT_TYPE_PARAMETER_CHARSET_NAME, "US-ASCII");
- SimpleMessage<Id> messageWithProperties = createMessage(benwaWorkMailbox, "Subject: messagePropertiesShouldBeStored \n\nBody\n.\n", BODY_START, propBuilder);
+ SimpleMailboxMessage<Id> messageWithProperties = createMessage(benwaWorkMailbox, "Subject: messagePropertiesShouldBeStored \n\nBody\n.\n", BODY_START, propBuilder);
MessageMetaData messageMetaData = messageMapper.add(benwaInboxMailbox, messageWithProperties);
- Message<Id> message = messageMapper.findInMailbox(benwaInboxMailbox, MessageRange.one(messageMetaData.getUid()), FetchType.Body, 1).next();
+ MailboxMessage<Id> message = messageMapper.findInMailbox(benwaInboxMailbox, MessageRange.one(messageMetaData.getUid()), FetchType.Body, 1).next();
assertThat(message.getProperties()).containsOnlyElementsOf(propBuilder.toProperties());
}
@@ -572,17 +572,17 @@ public abstract class AbstractMessageMap
propBuilder.setProperty(StandardNames.MIME_CONTENT_LANGUAGE_SPACE, StandardNames.MIME_CONTENT_LANGUAGE_NAME, "us");
propBuilder.setProperty(StandardNames.MIME_CONTENT_LANGUAGE_SPACE, StandardNames.MIME_CONTENT_LANGUAGE_NAME, "fr");
- SimpleMessage<Id> messageWithProperties = createMessage(benwaWorkMailbox, "Subject: messagePropertiesShouldBeStoredWhenDuplicateEntries \n\nBody\n.\n", BODY_START, propBuilder);
+ SimpleMailboxMessage<Id> messageWithProperties = createMessage(benwaWorkMailbox, "Subject: messagePropertiesShouldBeStoredWhenDuplicateEntries \n\nBody\n.\n", BODY_START, propBuilder);
MessageMetaData messageMetaData = messageMapper.add(benwaInboxMailbox, messageWithProperties);
- Message<Id> message = messageMapper.findInMailbox(benwaInboxMailbox, MessageRange.one(messageMetaData.getUid()), FetchType.Body, 1).next();
+ MailboxMessage<Id> message = messageMapper.findInMailbox(benwaInboxMailbox, MessageRange.one(messageMetaData.getUid()), FetchType.Body, 1).next();
assertThat(message.getProperties()).containsOnlyElementsOf(propBuilder.toProperties());
}
@Test
public void messagePropertiesShouldBeStoredWhenNoProperty() throws Exception {
- SimpleMessage<Id> messageWithProperties = createMessage(benwaWorkMailbox, "Subject: messagePropertiesShouldBeStoredWhenNoProperty \n\nBody\n.\n", BODY_START, new PropertyBuilder());
+ SimpleMailboxMessage<Id> messageWithProperties = createMessage(benwaWorkMailbox, "Subject: messagePropertiesShouldBeStoredWhenNoProperty \n\nBody\n.\n", BODY_START, new PropertyBuilder());
MessageMetaData messageMetaData = messageMapper.add(benwaInboxMailbox, messageWithProperties);
- Message<Id> message = messageMapper.findInMailbox(benwaInboxMailbox, MessageRange.one(messageMetaData.getUid()), FetchType.Body, 1).next();
+ MailboxMessage<Id> message = messageMapper.findInMailbox(benwaInboxMailbox, MessageRange.one(messageMetaData.getUid()), FetchType.Body, 1).next();
assertThat(message.getProperties()).isEmpty();
}
@@ -592,9 +592,9 @@ public abstract class AbstractMessageMap
PropertyBuilder propBuilder = new PropertyBuilder();
propBuilder.setTextualLineCount(textualLineCount);
- SimpleMessage<Id> messageWithProperties = createMessage(benwaWorkMailbox, "Subject: messagePropertiesShouldBeStoredWhenDuplicateEntries \n\nBody\n.\n", BODY_START, propBuilder);
+ SimpleMailboxMessage<Id> messageWithProperties = createMessage(benwaWorkMailbox, "Subject: messagePropertiesShouldBeStoredWhenDuplicateEntries \n\nBody\n.\n", BODY_START, propBuilder);
MessageMetaData messageMetaData = messageMapper.add(benwaInboxMailbox, messageWithProperties);
- Message<Id> message = messageMapper.findInMailbox(benwaInboxMailbox, MessageRange.one(messageMetaData.getUid()), FetchType.Body, 1).next();
+ MailboxMessage<Id> message = messageMapper.findInMailbox(benwaInboxMailbox, MessageRange.one(messageMetaData.getUid()), FetchType.Body, 1).next();
assertThat(message.getTextualLineCount()).isEqualTo(textualLineCount);
}
@@ -604,9 +604,9 @@ public abstract class AbstractMessageMap
PropertyBuilder propBuilder = new PropertyBuilder();
propBuilder.setMediaType(mediaType);
- SimpleMessage<Id> messageWithProperties = createMessage(benwaWorkMailbox, "Subject: messagePropertiesShouldBeStoredWhenDuplicateEntries \n\nBody\n.\n", BODY_START, propBuilder);
+ SimpleMailboxMessage<Id> messageWithProperties = createMessage(benwaWorkMailbox, "Subject: messagePropertiesShouldBeStoredWhenDuplicateEntries \n\nBody\n.\n", BODY_START, propBuilder);
MessageMetaData messageMetaData = messageMapper.add(benwaInboxMailbox, messageWithProperties);
- Message<Id> message = messageMapper.findInMailbox(benwaInboxMailbox, MessageRange.one(messageMetaData.getUid()), FetchType.Body, 1).next();
+ MailboxMessage<Id> message = messageMapper.findInMailbox(benwaInboxMailbox, MessageRange.one(messageMetaData.getUid()), FetchType.Body, 1).next();
assertThat(message.getMediaType()).isEqualTo(mediaType);
}
@@ -616,9 +616,9 @@ public abstract class AbstractMessageMap
PropertyBuilder propBuilder = new PropertyBuilder();
propBuilder.setSubType(subType);
- SimpleMessage<Id> messageWithProperties = createMessage(benwaWorkMailbox, "Subject: messagePropertiesShouldBeStoredWhenDuplicateEntries \n\nBody\n.\n", BODY_START, propBuilder);
+ SimpleMailboxMessage<Id> messageWithProperties = createMessage(benwaWorkMailbox, "Subject: messagePropertiesShouldBeStoredWhenDuplicateEntries \n\nBody\n.\n", BODY_START, propBuilder);
MessageMetaData messageMetaData = messageMapper.add(benwaInboxMailbox, messageWithProperties);
- Message<Id> message = messageMapper.findInMailbox(benwaInboxMailbox, MessageRange.one(messageMetaData.getUid()), FetchType.Body, 1).next();
+ MailboxMessage<Id> message = messageMapper.findInMailbox(benwaInboxMailbox, MessageRange.one(messageMetaData.getUid()), FetchType.Body, 1).next();
assertThat(message.getSubType()).isEqualTo(subType);
}
@@ -639,7 +639,7 @@ public abstract class AbstractMessageMap
@Test
public void messagesShouldBeSavedWithTheirUserFlags() throws Exception {
- Message<Id> message = SimpleMessage.copy(benwaInboxMailbox.getMailboxId(), message1);
+ MailboxMessage<Id> message = SimpleMailboxMessage.copy(benwaInboxMailbox.getMailboxId(), message1);
messageMapper.add(benwaInboxMailbox, message);
MessageAssert.assertThat(retrieveMessageFromStorage(message)).hasFlags(new Flags(USER_FLAG));
}
@@ -672,11 +672,11 @@ public abstract class AbstractMessageMap
message6.setModSeq(messageMapper.getHighestModSeq(benwaWorkMailbox));
}
- private Message<Id> retrieveMessageFromStorage(Message<Id> message) throws MailboxException {
+ private MailboxMessage<Id> retrieveMessageFromStorage(MailboxMessage<Id> message) throws MailboxException {
return messageMapper.findInMailbox(benwaInboxMailbox, MessageRange.one(message.getUid()), MessageMapper.FetchType.Metadata, LIMIT).next();
}
- private SimpleMessage<Id> createMessage(Mailbox<Id> mailbox, String content, int bodyStart, PropertyBuilder propertyBuilder) {
- return new SimpleMessage<Id>(new Date(), content.length(), bodyStart, new SharedByteArrayInputStream(content.getBytes()), new Flags(), propertyBuilder, mailbox.getMailboxId());
+ private SimpleMailboxMessage<Id> createMessage(Mailbox<Id> mailbox, String content, int bodyStart, PropertyBuilder propertyBuilder) {
+ return new SimpleMailboxMessage<Id>(new Date(), content.length(), bodyStart, new SharedByteArrayInputStream(content.getBytes()), new Flags(), propertyBuilder, mailbox.getMailboxId());
}
}
Copied: james/project/trunk/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/DefaultMailboxMessageIdTest.java (from r1724224, james/project/trunk/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/DefaultMessageIdTest.java)
URL: http://svn.apache.org/viewvc/james/project/trunk/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/DefaultMailboxMessageIdTest.java?p2=james/project/trunk/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/DefaultMailboxMessageIdTest.java&p1=james/project/trunk/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/DefaultMessageIdTest.java&r1=1724224&r2=1724225&rev=1724225&view=diff
==============================================================================
--- james/project/trunk/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/DefaultMessageIdTest.java (original)
+++ james/project/trunk/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/DefaultMailboxMessageIdTest.java Tue Jan 12 13:17:03 2016
@@ -25,7 +25,7 @@ import org.junit.Test;
import nl.jqno.equalsverifier.EqualsVerifier;
-public class DefaultMessageIdTest {
+public class DefaultMailboxMessageIdTest {
@Test(expected=NullPointerException.class)
public void constructorShouldThrowWhenNullMailboxId() {
Copied: james/project/trunk/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/MailboxMessageAssertTest.java (from r1724224, james/project/trunk/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/MessageAssertTest.java)
URL: http://svn.apache.org/viewvc/james/project/trunk/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/MailboxMessageAssertTest.java?p2=james/project/trunk/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/MailboxMessageAssertTest.java&p1=james/project/trunk/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/MessageAssertTest.java&r1=1724224&r2=1724225&rev=1724225&view=diff
==============================================================================
--- james/project/trunk/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/MessageAssertTest.java (original)
+++ james/project/trunk/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/MailboxMessageAssertTest.java Tue Jan 12 13:17:03 2016
@@ -22,7 +22,7 @@ package org.apache.james.mailbox.store.m
import org.apache.james.mailbox.store.TestId;
import org.apache.james.mailbox.store.mail.MessageMapper;
import org.apache.james.mailbox.store.mail.model.impl.PropertyBuilder;
-import org.apache.james.mailbox.store.mail.model.impl.SimpleMessage;
+import org.apache.james.mailbox.store.mail.model.impl.SimpleMailboxMessage;
import org.junit.Test;
import javax.mail.Flags;
@@ -31,7 +31,7 @@ import javax.mail.util.SharedByteArrayIn
import java.io.IOException;
import java.util.Date;
-public class MessageAssertTest {
+public class MailboxMessageAssertTest {
public static final TestId MAILBOX_ID = TestId.of(42L);
public static final long UID = 24L;
@@ -41,10 +41,10 @@ public class MessageAssertTest {
String headerString = "name: headerName\n\n";
String bodyString = "body\n.\n";
Date date = new Date();
- SimpleMessage<TestId> message1 = new SimpleMessage<TestId>(date, headerString.length() + bodyString.length(),
+ SimpleMailboxMessage<TestId> message1 = new SimpleMailboxMessage<TestId>(date, headerString.length() + bodyString.length(),
headerString.length(), new SharedByteArrayInputStream((headerString + bodyString).getBytes()), new Flags(), new PropertyBuilder(), MAILBOX_ID);
message1.setUid(UID);
- SimpleMessage<TestId> message2 = new SimpleMessage<TestId>(date, headerString.length() + bodyString.length(),
+ SimpleMailboxMessage<TestId> message2 = new SimpleMailboxMessage<TestId>(date, headerString.length() + bodyString.length(),
headerString.length(), new SharedByteArrayInputStream((headerString + bodyString).getBytes()), new Flags(), new PropertyBuilder(), MAILBOX_ID);
message2.setUid(UID);
MessageAssert.assertThat(message1).isEqualTo(message2, MessageMapper.FetchType.Full);
@@ -55,11 +55,11 @@ public class MessageAssertTest {
String headerString = "name: headerName\n\n";
String bodyString = "body\n.\n";
Date date = new Date();
- SimpleMessage<TestId> message1 = new SimpleMessage<TestId>(date, headerString.length() + bodyString.length(),
+ SimpleMailboxMessage<TestId> message1 = new SimpleMailboxMessage<TestId>(date, headerString.length() + bodyString.length(),
headerString.length(), new SharedByteArrayInputStream((headerString + bodyString).getBytes()), new Flags(), new PropertyBuilder(), MAILBOX_ID);
message1.setUid(UID);
bodyString = "work\n.\n";
- SimpleMessage<TestId> message2 = new SimpleMessage<TestId>(date, headerString.length() + bodyString.length(),
+ SimpleMailboxMessage<TestId> message2 = new SimpleMailboxMessage<TestId>(date, headerString.length() + bodyString.length(),
headerString.length(), new SharedByteArrayInputStream((headerString + bodyString).getBytes()), new Flags(), new PropertyBuilder(), MAILBOX_ID);
message2.setUid(UID);
MessageAssert.assertThat(message1).isEqualTo(message2, MessageMapper.FetchType.Headers);
@@ -70,11 +70,11 @@ public class MessageAssertTest {
String headerString = "name: headerName\n\n";
String bodyString = "body\n.\n";
Date date = new Date();
- SimpleMessage<TestId> message1 = new SimpleMessage<TestId>(date, headerString.length() + bodyString.length(),
+ SimpleMailboxMessage<TestId> message1 = new SimpleMailboxMessage<TestId>(date, headerString.length() + bodyString.length(),
headerString.length(), new SharedByteArrayInputStream((headerString + bodyString).getBytes()), new Flags(), new PropertyBuilder(), MAILBOX_ID);
message1.setUid(UID);
bodyString = "work\n.\n";
- SimpleMessage<TestId> message2 = new SimpleMessage<TestId>(date, headerString.length() + bodyString.length(),
+ SimpleMailboxMessage<TestId> message2 = new SimpleMailboxMessage<TestId>(date, headerString.length() + bodyString.length(),
headerString.length(), new SharedByteArrayInputStream((headerString + bodyString).getBytes()), new Flags(), new PropertyBuilder(), MAILBOX_ID);
message2.setUid(UID);
MessageAssert.assertThat(message1).isEqualTo(message2, MessageMapper.FetchType.Body);
Modified: james/project/trunk/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/MessageAssert.java
URL: http://svn.apache.org/viewvc/james/project/trunk/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/MessageAssert.java?rev=1724225&r1=1724224&r2=1724225&view=diff
==============================================================================
--- james/project/trunk/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/MessageAssert.java (original)
+++ james/project/trunk/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/MessageAssert.java Tue Jan 12 13:17:03 2016
@@ -26,17 +26,17 @@ import org.assertj.core.api.AbstractAsse
import javax.mail.Flags;
import java.io.IOException;
-public class MessageAssert extends AbstractAssert<MessageAssert, Message<?>> {
+public class MessageAssert extends AbstractAssert<MessageAssert, MailboxMessage<?>> {
- public MessageAssert(Message<?> actual) {
+ public MessageAssert(MailboxMessage<?> actual) {
super(actual, MessageAssert.class);
}
- public static MessageAssert assertThat(Message<?> actual) {
+ public static MessageAssert assertThat(MailboxMessage<?> actual) {
return new MessageAssert(actual);
}
- public MessageAssert isEqualTo(Message<?> expected, MessageMapper.FetchType usedFetchType) throws IOException {
+ public MessageAssert isEqualTo(MailboxMessage<?> expected, MessageMapper.FetchType usedFetchType) throws IOException {
isNotNull();
if (!equals(actual.getMailboxId(), expected.getMailboxId())) {
failWithMessage("Expected Mailbox ID to be <%s> but was <%s>", expected.getMailboxId().toString(), actual.getMailboxId().toString());
@@ -58,7 +58,7 @@ public class MessageAssert extends Abstr
}
if (usedFetchType == MessageMapper.FetchType.Full) {
if (!equals(actual.getFullContentOctets(), expected.getFullContentOctets())) {
- failWithMessage("Expected Message size to be <%s> but was <%s>", expected.getFullContentOctets(), actual.getFullContentOctets());
+ failWithMessage("Expected MailboxMessage size to be <%s> but was <%s>", expected.getFullContentOctets(), actual.getFullContentOctets());
}
if (!equals(IOUtils.toString(actual.getFullContent()), IOUtils.toString(expected.getFullContent()))) {
failWithMessage("Expected Full content to be <%s> but was <%s>", IOUtils.toString(actual.getFullContent()), IOUtils.toString(expected.getFullContent()));
Modified: james/project/trunk/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/MetadataMapAssert.java
URL: http://svn.apache.org/viewvc/james/project/trunk/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/MetadataMapAssert.java?rev=1724225&r1=1724224&r2=1724225&view=diff
==============================================================================
--- james/project/trunk/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/MetadataMapAssert.java (original)
+++ james/project/trunk/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/MetadataMapAssert.java Tue Jan 12 13:17:03 2016
@@ -42,8 +42,8 @@ public class MetadataMapAssert extends A
}
@SuppressWarnings("rawtypes")
- public MetadataMapAssert containsMetadataForMessages(Message... messages) {
- for(Message message : messages) {
+ public MetadataMapAssert containsMetadataForMessages(MailboxMessage... messages) {
+ for(MailboxMessage message : messages) {
if (actual.get(message.getUid()).getUid() != message.getUid()) {
failWithMessage("Expected UID stored in MessageMetadata to be <%s> but was <%s>", actual.get(message.getUid()).getUid(), message.getUid());
}
Modified: james/project/trunk/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/MetadataMapAssertTest.java
URL: http://svn.apache.org/viewvc/james/project/trunk/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/MetadataMapAssertTest.java?rev=1724225&r1=1724224&r2=1724225&view=diff
==============================================================================
--- james/project/trunk/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/MetadataMapAssertTest.java (original)
+++ james/project/trunk/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/MetadataMapAssertTest.java Tue Jan 12 13:17:03 2016
@@ -23,7 +23,7 @@ import org.apache.james.mailbox.model.Me
import org.apache.james.mailbox.store.SimpleMessageMetaData;
import org.apache.james.mailbox.store.TestId;
import org.apache.james.mailbox.store.mail.model.impl.PropertyBuilder;
-import org.apache.james.mailbox.store.mail.model.impl.SimpleMessage;
+import org.apache.james.mailbox.store.mail.model.impl.SimpleMailboxMessage;
import org.junit.Before;
import org.junit.Test;
@@ -43,11 +43,11 @@ public class MetadataMapAssertTest {
private static final String BODY_STRING = "body\\n.\\n";
private static final TestId MAILBOX_ID = TestId.of(12L);
- private SimpleMessage<TestId> message1;
+ private SimpleMailboxMessage<TestId> message1;
@Before
public void setUp() {
- message1 = new SimpleMessage<TestId>(DATE, HEADER_STRING.length() + BODY_STRING.length(),
+ message1 = new SimpleMailboxMessage<TestId>(DATE, HEADER_STRING.length() + BODY_STRING.length(),
HEADER_STRING.length(), new SharedByteArrayInputStream((HEADER_STRING + BODY_STRING).getBytes()), new Flags(), new PropertyBuilder(), MAILBOX_ID);
message1.setUid(UID);
message1.setModSeq(MODSEQ);
Copied: james/project/trunk/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/impl/SimpleMailboxMessageTest.java (from r1724224, james/project/trunk/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/impl/SimpleMessageTest.java)
URL: http://svn.apache.org/viewvc/james/project/trunk/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/impl/SimpleMailboxMessageTest.java?p2=james/project/trunk/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/impl/SimpleMailboxMessageTest.java&p1=james/project/trunk/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/impl/SimpleMessageTest.java&r1=1724224&r2=1724225&rev=1724225&view=diff
==============================================================================
--- james/project/trunk/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/impl/SimpleMessageTest.java (original)
+++ james/project/trunk/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/impl/SimpleMailboxMessageTest.java Tue Jan 12 13:17:03 2016
@@ -37,12 +37,12 @@ import org.apache.james.mailbox.store.Te
import org.junit.Before;
import org.junit.Test;
-public class SimpleMessageTest {
+public class SimpleMailboxMessageTest {
private static final Charset MESSAGE_CHARSET = Charset.forName("UTF-8");
private static final String MESSAGE_CONTENT = "Simple message content without special characters";
private static final String MESSAGE_CONTENT_SPECIAL_CHAR = "Simple message content with special characters: \"'(§è!çà $*`";
- private SimpleMessage<TestId> MESSAGE;
- private SimpleMessage<TestId> MESSAGE_SPECIAL_CHAR;
+ private SimpleMailboxMessage<TestId> MESSAGE;
+ private SimpleMailboxMessage<TestId> MESSAGE_SPECIAL_CHAR;
@Before
public void setUp() {
@@ -91,17 +91,16 @@ public class SimpleMessageTest {
@Test
public void copyShouldReturnFieldByFieldEqualsObject() throws MailboxException {
- SimpleMessage<TestId> original = buildMessage("my content");
- SimpleMessage<TestId> copy = SimpleMessage.copy(TestId.of(1337), original);
+ SimpleMailboxMessage<TestId> original = buildMessage("my content");
+ SimpleMailboxMessage<TestId> copy = SimpleMailboxMessage.copy(TestId.of(1337), original);
assertThat((Object)copy).isEqualToIgnoringGivenFields(original, "mailboxId").isNotSameAs(original);
- assertThat(copy.getMailboxId()).isEqualTo(TestId.of(1337));
}
- private static SimpleMessage<TestId> buildMessage(String content) {
- return new SimpleMessage<TestId>(Calendar.getInstance().getTime(),
- content.length(), 0, new SharedByteArrayInputStream(
- content.getBytes(MESSAGE_CHARSET)), new Flags(),
- new PropertyBuilder(), TestId.of(1L));
+ private static SimpleMailboxMessage<TestId> buildMessage(String content) {
+ return new SimpleMailboxMessage<TestId>(Calendar.getInstance().getTime(),
+ content.length(), 0, new SharedByteArrayInputStream(
+ content.getBytes(MESSAGE_CHARSET)), new Flags(),
+ new PropertyBuilder(), TestId.of(1L));
}
}
Modified: james/project/trunk/mailbox/tool/src/main/java/org/apache/james/mailbox/copier/MailboxCopierImpl.java
URL: http://svn.apache.org/viewvc/james/project/trunk/mailbox/tool/src/main/java/org/apache/james/mailbox/copier/MailboxCopierImpl.java?rev=1724225&r1=1724224&r2=1724225&view=diff
==============================================================================
--- james/project/trunk/mailbox/tool/src/main/java/org/apache/james/mailbox/copier/MailboxCopierImpl.java (original)
+++ james/project/trunk/mailbox/tool/src/main/java/org/apache/james/mailbox/copier/MailboxCopierImpl.java Tue Jan 12 13:17:03 2016
@@ -128,7 +128,7 @@ public class MailboxCopierImpl implement
dstMailboxManager.startProcessingRequest(dstMailboxSession);
dstMessageManager.appendMessage(content.getInputStream(), messageResult.getInternalDate(), dstMailboxSession, messageResult.getFlags().contains(Flag.RECENT), messageResult.getFlags());
dstMailboxManager.endProcessingRequest(dstMailboxSession);
- log.info("Message #" + j + " appended in destination mailbox with path=" + mailboxPath.toString());
+ log.info("MailboxMessage #" + j + " appended in destination mailbox with path=" + mailboxPath.toString());
j++;
}
Modified: james/project/trunk/mailbox/tool/src/main/java/org/apache/james/mailbox/indexer/ReIndexerImpl.java
URL: http://svn.apache.org/viewvc/james/project/trunk/mailbox/tool/src/main/java/org/apache/james/mailbox/indexer/ReIndexerImpl.java?rev=1724225&r1=1724224&r2=1724225&view=diff
==============================================================================
--- james/project/trunk/mailbox/tool/src/main/java/org/apache/james/mailbox/indexer/ReIndexerImpl.java (original)
+++ james/project/trunk/mailbox/tool/src/main/java/org/apache/james/mailbox/indexer/ReIndexerImpl.java Tue Jan 12 13:17:03 2016
@@ -35,7 +35,7 @@ import org.apache.james.mailbox.store.Ma
import org.apache.james.mailbox.store.mail.MessageMapper;
import org.apache.james.mailbox.store.mail.model.Mailbox;
import org.apache.james.mailbox.store.mail.model.MailboxId;
-import org.apache.james.mailbox.store.mail.model.Message;
+import org.apache.james.mailbox.store.mail.model.MailboxMessage;
import org.apache.james.mailbox.store.search.ListeningMessageSearchIndex;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -127,9 +127,9 @@ public class ReIndexerImpl<Id extends Ma
}
}
- private void handleMailboxIndexingIterations(MailboxSession mailboxSession, MailboxRegistration mailboxRegistration, Mailbox<Id> mailbox, Iterator<Message<Id>> iterator) throws MailboxException {
+ private void handleMailboxIndexingIterations(MailboxSession mailboxSession, MailboxRegistration mailboxRegistration, Mailbox<Id> mailbox, Iterator<MailboxMessage<Id>> iterator) throws MailboxException {
while (iterator.hasNext()) {
- Message<Id> message = iterator.next();
+ MailboxMessage<Id> message = iterator.next();
ImpactingMessageEvent impactingMessageEvent = findMostRelevant(mailboxRegistration.getImpactingEvents(message.getUid()));
if (impactingMessageEvent == null) {
messageSearchIndex.add(mailboxSession, mailbox, message);
Modified: james/project/trunk/mailbox/tool/src/test/java/org/apache/james/mailbox/indexer/ReIndexerImplTest.java
URL: http://svn.apache.org/viewvc/james/project/trunk/mailbox/tool/src/test/java/org/apache/james/mailbox/indexer/ReIndexerImplTest.java?rev=1724225&r1=1724224&r2=1724225&view=diff
==============================================================================
--- james/project/trunk/mailbox/tool/src/test/java/org/apache/james/mailbox/indexer/ReIndexerImplTest.java (original)
+++ james/project/trunk/mailbox/tool/src/test/java/org/apache/james/mailbox/indexer/ReIndexerImplTest.java Tue Jan 12 13:17:03 2016
@@ -38,7 +38,7 @@ import org.apache.james.mailbox.store.Te
import org.apache.james.mailbox.store.mail.MailboxMapper;
import org.apache.james.mailbox.store.mail.MessageMapper;
import org.apache.james.mailbox.store.mail.model.Mailbox;
-import org.apache.james.mailbox.store.mail.model.Message;
+import org.apache.james.mailbox.store.mail.model.MailboxMessage;
import org.apache.james.mailbox.store.mail.model.impl.SimpleMailbox;
import org.apache.james.mailbox.store.search.ListeningMessageSearchIndex;
import org.assertj.core.util.Lists;
@@ -93,7 +93,7 @@ public class ReIndexerImplTest {
return mailboxMapper;
}
});
- final Message<TestId> message = new MessageBuilder().build();
+ final MailboxMessage<TestId> message = new MessageBuilder().build();
final SimpleMailbox<TestId> mailbox = new SimpleMailbox<TestId>(INBOX, 42);
mailbox.setMailboxId(message.getMailboxId());
when(mailboxMapper.findMailboxByPath(INBOX)).thenAnswer(new Answer<Mailbox<TestId>>() {
@@ -102,9 +102,9 @@ public class ReIndexerImplTest {
return mailbox;
}
});
- when(messageMapper.findInMailbox(mailbox, MessageRange.all(), MessageMapper.FetchType.Full, LIMIT)).thenAnswer(new Answer<Iterator<Message<TestId>>>() {
+ when(messageMapper.findInMailbox(mailbox, MessageRange.all(), MessageMapper.FetchType.Full, LIMIT)).thenAnswer(new Answer<Iterator<MailboxMessage<TestId>>>() {
@Override
- public Iterator<Message<TestId>> answer(InvocationOnMock invocationOnMock) throws Throwable {
+ public Iterator<MailboxMessage<TestId>> answer(InvocationOnMock invocationOnMock) throws Throwable {
return Lists.newArrayList(message).iterator();
}
});
Modified: james/project/trunk/mpt/impl/imap-mailbox/cyrus/src/test/java/org/apache/james/mpt/imapmailbox/cyrus/host/MailboxMessageAppenderOnCyrusHost.java
URL: http://svn.apache.org/viewvc/james/project/trunk/mpt/impl/imap-mailbox/cyrus/src/test/java/org/apache/james/mpt/imapmailbox/cyrus/host/MailboxMessageAppenderOnCyrusHost.java?rev=1724225&r1=1724224&r2=1724225&view=diff
==============================================================================
--- james/project/trunk/mpt/impl/imap-mailbox/cyrus/src/test/java/org/apache/james/mpt/imapmailbox/cyrus/host/MailboxMessageAppenderOnCyrusHost.java (original)
+++ james/project/trunk/mpt/impl/imap-mailbox/cyrus/src/test/java/org/apache/james/mpt/imapmailbox/cyrus/host/MailboxMessageAppenderOnCyrusHost.java Tue Jan 12 13:17:03 2016
@@ -53,7 +53,7 @@ public class MailboxMessageAppenderOnCyr
protocolSession.CL("From: Fred Foobar <fo...@Blurdybloop.COM>");
protocolSession.CL("Subject: afternoon meeting 2");
protocolSession.CL("To: mooch@owatagu.siam.edu");
- protocolSession.CL("Message-Id: <B2...@Blurdybloop.COM>");
+ protocolSession.CL("MailboxMessage-Id: <B2...@Blurdybloop.COM>");
protocolSession.CL("MIME-Version: 1.0");
protocolSession.CL("Content-Type: TEXT/PLAIN; CHARSET=US-ASCII");
protocolSession.CL("");
Modified: james/project/trunk/mpt/impl/imap-mailbox/jpa/src/test/java/org/apache/james/mpt/imapmailbox/jpa/host/JPAHostSystem.java
URL: http://svn.apache.org/viewvc/james/project/trunk/mpt/impl/imap-mailbox/jpa/src/test/java/org/apache/james/mpt/imapmailbox/jpa/host/JPAHostSystem.java?rev=1724225&r1=1724224&r2=1724225&view=diff
==============================================================================
--- james/project/trunk/mpt/impl/imap-mailbox/jpa/src/test/java/org/apache/james/mpt/imapmailbox/jpa/host/JPAHostSystem.java (original)
+++ james/project/trunk/mpt/impl/imap-mailbox/jpa/src/test/java/org/apache/james/mpt/imapmailbox/jpa/host/JPAHostSystem.java Tue Jan 12 13:17:03 2016
@@ -42,8 +42,8 @@ import org.apache.james.mailbox.jpa.mail
import org.apache.james.mailbox.jpa.mail.model.JPAMailbox;
import org.apache.james.mailbox.jpa.mail.model.JPAProperty;
import org.apache.james.mailbox.jpa.mail.model.JPAUserFlag;
-import org.apache.james.mailbox.jpa.mail.model.openjpa.AbstractJPAMessage;
-import org.apache.james.mailbox.jpa.mail.model.openjpa.JPAMessage;
+import org.apache.james.mailbox.jpa.mail.model.openjpa.AbstractJPAMailboxMessage;
+import org.apache.james.mailbox.jpa.mail.model.openjpa.JPAMailboxMessage;
import org.apache.james.mailbox.jpa.openjpa.OpenJPAMailboxManager;
import org.apache.james.mailbox.jpa.user.model.JPASubscription;
import org.apache.james.mailbox.model.MailboxPath;
@@ -106,8 +106,8 @@ public class JPAHostSystem extends James
// Configure OpenJPA Metadata
properties.put("openjpa.MetaDataFactory", "jpa(Types=" +
JPAMailbox.class.getName() + ";" +
- AbstractJPAMessage.class.getName() + ";" +
- JPAMessage.class.getName() + ";" +
+ AbstractJPAMailboxMessage.class.getName() + ";" +
+ JPAMailboxMessage.class.getName() + ";" +
JPAProperty.class.getName() + ";" +
JPAUserFlag.class.getName() + ";" +
JPASubscription.class.getName() + ")");
Modified: james/project/trunk/protocols/imap/src/main/java/org/apache/james/imap/api/display/HumanReadableText.java
URL: http://svn.apache.org/viewvc/james/project/trunk/protocols/imap/src/main/java/org/apache/james/imap/api/display/HumanReadableText.java?rev=1724225&r1=1724224&r2=1724225&view=diff
==============================================================================
--- james/project/trunk/protocols/imap/src/main/java/org/apache/james/imap/api/display/HumanReadableText.java (original)
+++ james/project/trunk/protocols/imap/src/main/java/org/apache/james/imap/api/display/HumanReadableText.java Tue Jan 12 13:17:03 2016
@@ -35,7 +35,7 @@ public class HumanReadableText {
public static final HumanReadableText SELECT = new HumanReadableText("org.apache.james.imap.SELECT", "completed.");
public static final HumanReadableText unseen(long numberUnseen) {
- return new HumanReadableText("org.apache.james.imap.UNSEEN", "Message " + numberUnseen + " is first unseen");
+ return new HumanReadableText("org.apache.james.imap.UNSEEN", "MailboxMessage " + numberUnseen + " is first unseen");
}
public static final HumanReadableText UIDNEXT = new HumanReadableText("org.apache.james.imap.UIDNEXT", "Predicted next UID");
Copied: james/project/trunk/protocols/imap/src/test/java/org/apache/james/imap/processor/fetch/MailboxMessageResultUtilsTest.java (from r1724224, james/project/trunk/protocols/imap/src/test/java/org/apache/james/imap/processor/fetch/MessageResultUtilsTest.java)
URL: http://svn.apache.org/viewvc/james/project/trunk/protocols/imap/src/test/java/org/apache/james/imap/processor/fetch/MailboxMessageResultUtilsTest.java?p2=james/project/trunk/protocols/imap/src/test/java/org/apache/james/imap/processor/fetch/MailboxMessageResultUtilsTest.java&p1=james/project/trunk/protocols/imap/src/test/java/org/apache/james/imap/processor/fetch/MessageResultUtilsTest.java&r1=1724224&r2=1724225&rev=1724225&view=diff
==============================================================================
--- james/project/trunk/protocols/imap/src/test/java/org/apache/james/imap/processor/fetch/MessageResultUtilsTest.java (original)
+++ james/project/trunk/protocols/imap/src/test/java/org/apache/james/imap/processor/fetch/MailboxMessageResultUtilsTest.java Tue Jan 12 13:17:03 2016
@@ -31,7 +31,7 @@ import org.apache.james.mailbox.model.Me
import org.junit.Before;
import org.junit.Test;
-public class MessageResultUtilsTest {
+public class MailboxMessageResultUtilsTest {
private static final String[] NAMES = { "One", "Three" };
Modified: james/project/trunk/server/app/src/main/resources/META-INF/persistence-template.xml
URL: http://svn.apache.org/viewvc/james/project/trunk/server/app/src/main/resources/META-INF/persistence-template.xml?rev=1724225&r1=1724224&r2=1724225&view=diff
==============================================================================
--- james/project/trunk/server/app/src/main/resources/META-INF/persistence-template.xml (original)
+++ james/project/trunk/server/app/src/main/resources/META-INF/persistence-template.xml Tue Jan 12 13:17:03 2016
@@ -31,18 +31,18 @@
<!-- Mailbox stuff-->
<class>org.apache.james.mailbox.jpa.mail.model.JPAMailbox</class>
<class>org.apache.james.mailbox.jpa.mail.model.JPAUserFlag</class>
- <class>org.apache.james.mailbox.jpa.mail.model.openjpa.AbstractJPAMessage</class>
+ <class>org.apache.james.mailbox.jpa.mail.model.openjpa.AbstractJPAMailboxMessage</class>
<!--
- <class>org.apache.james.mailbox.jpa.mail.model.openjpa.JPAEncryptedMessage</class>
+ <class>org.apache.james.mailbox.jpa.mail.model.openjpa.JPAEncryptedMailboxMessageMessage</class>
-->
<!-- This needs to get used when you want to use streaming. Remember to comment the following classes
- org.apache.james.mailbox.jpa.mail.model.JPAMessage
+ org.apache.james.mailbox.jpa.mail.model.JPAMailboxMessage
If you don't do this the EntityManager will get confused!
- <class>org.apache.james.mailbox.jpa.mail.model.openjpa.JPAStreamingMessage</class>
+ <class>org.apache.james.mailbox.jpa.mail.model.openjpa.JPAStreamingMailboxMessageMessage</class>
-->
<!-- Comment if you want to use streaming -->
- <class>org.apache.james.mailbox.jpa.mail.model.openjpa.JPAMessage</class>
+ <class>org.apache.james.mailbox.jpa.mail.model.openjpa.JPAMailboxMessage</class>
<class>org.apache.james.mailbox.jpa.mail.model.JPAProperty</class>
<class>org.apache.james.mailbox.jpa.user.model.JPASubscription</class>
Modified: james/project/trunk/server/app/src/main/resources/META-INF/persistence.xml
URL: http://svn.apache.org/viewvc/james/project/trunk/server/app/src/main/resources/META-INF/persistence.xml?rev=1724225&r1=1724224&r2=1724225&view=diff
==============================================================================
--- james/project/trunk/server/app/src/main/resources/META-INF/persistence.xml (original)
+++ james/project/trunk/server/app/src/main/resources/META-INF/persistence.xml Tue Jan 12 13:17:03 2016
@@ -27,8 +27,8 @@
<!-- Mailbox stuff-->
<class>org.apache.james.mailbox.jpa.mail.model.JPAMailbox</class>
<class>org.apache.james.mailbox.jpa.mail.model.JPAUserFlag</class>
- <class>org.apache.james.mailbox.jpa.mail.model.openjpa.AbstractJPAMessage</class>
- <class>org.apache.james.mailbox.jpa.mail.model.openjpa.JPAMessage</class>
+ <class>org.apache.james.mailbox.jpa.mail.model.openjpa.AbstractJPAMailboxMessage</class>
+ <class>org.apache.james.mailbox.jpa.mail.model.openjpa.JPAMailboxMessage</class>
<class>org.apache.james.mailbox.jpa.mail.model.JPAProperty</class>
<class>org.apache.james.mailbox.jpa.user.model.JPASubscription</class>
<class>org.apache.james.domainlist.jpa.model.JPADomain</class>
Modified: james/project/trunk/server/container/cli/src/main/java/org/apache/james/cli/ServerCmd.java
URL: http://svn.apache.org/viewvc/james/project/trunk/server/container/cli/src/main/java/org/apache/james/cli/ServerCmd.java?rev=1724225&r1=1724224&r2=1724225&view=diff
==============================================================================
--- james/project/trunk/server/container/cli/src/main/java/org/apache/james/cli/ServerCmd.java (original)
+++ james/project/trunk/server/container/cli/src/main/java/org/apache/james/cli/ServerCmd.java Tue Jan 12 13:17:03 2016
@@ -239,7 +239,7 @@ public class ServerCmd {
+ formatStorageValue(probe.getMaxStorage(arguments[1])));
break;
case GETMAXMESSAGECOUNTQUOTA:
- System.out.println("Message count allowed for Quota Root " + arguments[1] + " : " + formatMessageValue(probe.getMaxMessageCount(arguments[1])));
+ System.out.println("MailboxMessage count allowed for Quota Root " + arguments[1] + " : " + formatMessageValue(probe.getMaxMessageCount(arguments[1])));
break;
case SETMAXSTORAGEQUOTA:
probe.setMaxStorage(arguments[1], ValueWithUnit.parse(arguments[2]).getConvertedValue());
@@ -291,7 +291,7 @@ public class ServerCmd {
}
private void printMessageQuota(String quotaRootString, SerializableQuota quota) {
- System.out.println(String.format("Message count quota for %s is : %s / %s",
+ System.out.println(String.format("MailboxMessage count quota for %s is : %s / %s",
quotaRootString,
formatMessageValue(quota.getUsed()),
formatMessageValue(quota.getMax())));
Copied: james/project/trunk/server/protocols/jmap-integration-testing/src/test/java/org/apache/james/jmap/methods/cassandra/CassandraGetMailboxMessageListMethodTest.java (from r1724224, james/project/trunk/server/protocols/jmap-integration-testing/src/test/java/org/apache/james/jmap/methods/cassandra/CassandraGetMessageListMethodTest.java)
URL: http://svn.apache.org/viewvc/james/project/trunk/server/protocols/jmap-integration-testing/src/test/java/org/apache/james/jmap/methods/cassandra/CassandraGetMailboxMessageListMethodTest.java?p2=james/project/trunk/server/protocols/jmap-integration-testing/src/test/java/org/apache/james/jmap/methods/cassandra/CassandraGetMailboxMessageListMethodTest.java&p1=james/project/trunk/server/protocols/jmap-integration-testing/src/test/java/org/apache/james/jmap/methods/cassandra/CassandraGetMessageListMethodTest.java&r1=1724224&r2=1724225&rev=1724225&view=diff
==============================================================================
--- james/project/trunk/server/protocols/jmap-integration-testing/src/test/java/org/apache/james/jmap/methods/cassandra/CassandraGetMessageListMethodTest.java (original)
+++ james/project/trunk/server/protocols/jmap-integration-testing/src/test/java/org/apache/james/jmap/methods/cassandra/CassandraGetMailboxMessageListMethodTest.java Tue Jan 12 13:17:03 2016
@@ -26,7 +26,7 @@ import org.apache.james.jmap.methods.Get
import org.apache.james.mailbox.elasticsearch.EmbeddedElasticSearch;
import org.junit.rules.TemporaryFolder;
-public class CassandraGetMessageListMethodTest extends GetMessageListMethodTest {
+public class CassandraGetMailboxMessageListMethodTest extends GetMessageListMethodTest {
@Override
protected JmapServer jmapServer(TemporaryFolder temporaryFolder, EmbeddedElasticSearch embeddedElasticSearch, EmbeddedCassandra cassandra) {
Modified: james/project/trunk/server/protocols/jmap/src/main/java/org/apache/james/jmap/methods/GetMessageListMethod.java
URL: http://svn.apache.org/viewvc/james/project/trunk/server/protocols/jmap/src/main/java/org/apache/james/jmap/methods/GetMessageListMethod.java?rev=1724225&r1=1724224&r2=1724225&view=diff
==============================================================================
--- james/project/trunk/server/protocols/jmap/src/main/java/org/apache/james/jmap/methods/GetMessageListMethod.java (original)
+++ james/project/trunk/server/protocols/jmap/src/main/java/org/apache/james/jmap/methods/GetMessageListMethod.java Tue Jan 12 13:17:03 2016
@@ -45,7 +45,7 @@ import org.apache.james.mailbox.store.ma
import org.apache.james.mailbox.store.mail.MessageMapper.FetchType;
import org.apache.james.mailbox.store.mail.model.Mailbox;
import org.apache.james.mailbox.store.mail.model.MailboxId;
-import org.apache.james.mailbox.store.mail.model.Message;
+import org.apache.james.mailbox.store.mail.model.MailboxMessage;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -128,7 +128,7 @@ public class GetMessageListMethod<Id ext
return limit.orElse(maximumLimit);
}
- private Comparator<Message<Id>> comparatorFor(GetMessageListRequest jmapRequest) {
+ private Comparator<MailboxMessage<Id>> comparatorFor(GetMessageListRequest jmapRequest) {
return SortToComparatorConvertor.comparatorFor(jmapRequest.getSort());
}
@@ -157,7 +157,7 @@ public class GetMessageListMethod<Id ext
}
}
- private List<Message<Id>> getMessages(MailboxPath mailboxPath, MailboxSession mailboxSession) {
+ private List<MailboxMessage<Id>> getMessages(MailboxPath mailboxPath, MailboxSession mailboxSession) {
SearchQuery searchQuery = new SearchQuery();
searchQuery.andCriteria(SearchQuery.all());
try {
@@ -173,7 +173,7 @@ public class GetMessageListMethod<Id ext
}
}
- private Message<Id> getMessage(MailboxPath mailboxPath, MailboxSession mailboxSession, MessageMapper<Id> messageMapper, long messageId) throws MailboxException {
+ private MailboxMessage<Id> getMessage(MailboxPath mailboxPath, MailboxSession mailboxSession, MessageMapper<Id> messageMapper, long messageId) throws MailboxException {
try {
return ImmutableList.copyOf(messageMapper.findInMailbox(
getMailbox(mailboxPath, mailboxSession).get(),
Modified: james/project/trunk/server/protocols/jmap/src/main/java/org/apache/james/jmap/methods/GetMessagesMethod.java
URL: http://svn.apache.org/viewvc/james/project/trunk/server/protocols/jmap/src/main/java/org/apache/james/jmap/methods/GetMessagesMethod.java?rev=1724225&r1=1724224&r2=1724225&view=diff
==============================================================================
--- james/project/trunk/server/protocols/jmap/src/main/java/org/apache/james/jmap/methods/GetMessagesMethod.java (original)
+++ james/project/trunk/server/protocols/jmap/src/main/java/org/apache/james/jmap/methods/GetMessagesMethod.java Tue Jan 12 13:17:03 2016
@@ -41,6 +41,7 @@ import org.apache.james.mailbox.store.ma
import org.apache.james.mailbox.store.mail.MessageMapperFactory;
import org.apache.james.mailbox.store.mail.model.Mailbox;
import org.apache.james.mailbox.store.mail.model.MailboxId;
+import org.apache.james.mailbox.store.mail.model.MailboxMessage;
import org.javatuples.Pair;
import com.github.fge.lambdas.Throwing;
@@ -86,8 +87,8 @@ public class GetMessagesMethod<Id extend
GetMessagesRequest getMessagesRequest = (GetMessagesRequest) request;
getMessagesRequest.getAccountId().ifPresent(GetMessagesMethod::notImplemented);
- Function<MessageId, Stream<Pair<org.apache.james.mailbox.store.mail.model.Message<Id>, MailboxPath>>> loadMessages = loadMessage(mailboxSession);
- Function<Pair<org.apache.james.mailbox.store.mail.model.Message<Id>, MailboxPath>, Message> convertToJmapMessage = toJmapMessage(mailboxSession);
+ Function<MessageId, Stream<Pair<MailboxMessage<Id>, MailboxPath>>> loadMessages = loadMessage(mailboxSession);
+ Function<Pair<MailboxMessage<Id>, MailboxPath>, Message> convertToJmapMessage = toJmapMessage(mailboxSession);
List<Message> result = getMessagesRequest.getIds().stream()
.flatMap(loadMessages)
@@ -102,16 +103,16 @@ public class GetMessagesMethod<Id extend
}
- private Function<Pair<org.apache.james.mailbox.store.mail.model.Message<Id>, MailboxPath>, Message> toJmapMessage(MailboxSession mailboxSession) {
+ private Function<Pair<MailboxMessage<Id>, MailboxPath>, Message> toJmapMessage(MailboxSession mailboxSession) {
return (value) -> {
- org.apache.james.mailbox.store.mail.model.Message<Id> messageResult = value.getValue0();
+ MailboxMessage<Id> messageResult = value.getValue0();
MailboxPath mailboxPath = value.getValue1();
return Message.fromMailboxMessage(messageResult, uid -> new MessageId(mailboxSession.getUser(), mailboxPath , uid));
};
}
private Function<MessageId, Stream<
- Pair<org.apache.james.mailbox.store.mail.model.Message<Id>,
+ Pair<MailboxMessage<Id>,
MailboxPath>>>
loadMessage(MailboxSession mailboxSession) {
@@ -128,9 +129,9 @@ public class GetMessagesMethod<Id extend
.andThen(this::iteratorToStream);
}
- private Stream<Pair<org.apache.james.mailbox.store.mail.model.Message<Id>, MailboxPath>> iteratorToStream(Pair<Iterator<org.apache.james.mailbox.store.mail.model.Message<Id>>, MailboxPath> value) {
- Iterable<org.apache.james.mailbox.store.mail.model.Message<Id>> iterable = () -> value.getValue0();
- Stream<org.apache.james.mailbox.store.mail.model.Message<Id>> targetStream = StreamSupport.stream(iterable.spliterator(), false);
+ private Stream<Pair<MailboxMessage<Id>, MailboxPath>> iteratorToStream(Pair<Iterator<MailboxMessage<Id>>, MailboxPath> value) {
+ Iterable<MailboxMessage<Id>> iterable = () -> value.getValue0();
+ Stream<MailboxMessage<Id>> targetStream = StreamSupport.stream(iterable.spliterator(), false);
MailboxPath mailboxPath = value.getValue1();
return targetStream.map(x -> Pair.with(x, mailboxPath));
Modified: james/project/trunk/server/protocols/jmap/src/main/java/org/apache/james/jmap/model/Message.java
URL: http://svn.apache.org/viewvc/james/project/trunk/server/protocols/jmap/src/main/java/org/apache/james/jmap/model/Message.java?rev=1724225&r1=1724224&r2=1724225&view=diff
==============================================================================
--- james/project/trunk/server/protocols/jmap/src/main/java/org/apache/james/jmap/model/Message.java (original)
+++ james/project/trunk/server/protocols/jmap/src/main/java/org/apache/james/jmap/model/Message.java Tue Jan 12 13:17:03 2016
@@ -42,6 +42,7 @@ import com.google.common.base.Strings;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableMap;
import com.google.common.collect.Multimap;
+import org.apache.james.mailbox.store.mail.model.MailboxMessage;
@JsonDeserialize(builder = Message.Builder.class)
public class Message {
@@ -54,7 +55,7 @@ public class Message {
return new Builder();
}
- public static Message fromMailboxMessage(org.apache.james.mailbox.store.mail.model.Message<? extends MailboxId> mailboxMessage,
+ public static Message fromMailboxMessage(MailboxMessage<? extends MailboxId> mailboxMessage,
Function<Long, MessageId> uidToMessageId) {
IndexableMessage im = IndexableMessage.from(mailboxMessage, new DefaultTextExtractor(), UTC_ZONE_ID);
if (im.getHasAttachment()) {
@@ -145,7 +146,7 @@ public class Message {
return String.join(MULTIVALUED_HEADERS_SEPARATOR, iterable);
}
- private static ZonedDateTime getInternalDate(org.apache.james.mailbox.store.mail.model.Message<? extends MailboxId> mailboxMessage, IndexableMessage im) {
+ private static ZonedDateTime getInternalDate(MailboxMessage<? extends MailboxId> mailboxMessage, IndexableMessage im) {
return ZonedDateTime.ofInstant(mailboxMessage.getInternalDate().toInstant(), UTC_ZONE_ID);
}
Modified: james/project/trunk/server/protocols/jmap/src/main/java/org/apache/james/jmap/model/message/IndexableMessage.java
URL: http://svn.apache.org/viewvc/james/project/trunk/server/protocols/jmap/src/main/java/org/apache/james/jmap/model/message/IndexableMessage.java?rev=1724225&r1=1724224&r2=1724225&view=diff
==============================================================================
--- james/project/trunk/server/protocols/jmap/src/main/java/org/apache/james/jmap/model/message/IndexableMessage.java (original)
+++ james/project/trunk/server/protocols/jmap/src/main/java/org/apache/james/jmap/model/message/IndexableMessage.java Tue Jan 12 13:17:03 2016
@@ -25,7 +25,7 @@ import com.google.common.base.Throwables
import com.google.common.collect.Multimap;
import org.apache.james.mailbox.store.extractor.TextExtractor;
import org.apache.james.mailbox.store.mail.model.MailboxId;
-import org.apache.james.mailbox.store.mail.model.Message;
+import org.apache.james.mailbox.store.mail.model.MailboxMessage;
import org.apache.james.mailbox.store.mail.model.Property;
import org.apache.james.mime4j.MimeException;
@@ -41,7 +41,7 @@ import java.util.stream.Collectors;
public class IndexableMessage {
- public static IndexableMessage from(Message<? extends MailboxId> message, TextExtractor textExtractor, ZoneId zoneId) {
+ public static IndexableMessage from(MailboxMessage<? extends MailboxId> message, TextExtractor textExtractor, ZoneId zoneId) {
Preconditions.checkNotNull(message.getMailboxId());
IndexableMessage indexableMessage = new IndexableMessage();
try {
@@ -72,7 +72,7 @@ public class IndexableMessage {
this.sentDate = DateResolutionFormater.DATE_TIME_FOMATTER.format(headerCollection.getSentDate().orElse(internalDate));
}
- private void copyMessageFields(Message<? extends MailboxId> message, ZoneId zoneId) {
+ private void copyMessageFields(MailboxMessage<? extends MailboxId> message, ZoneId zoneId) {
this.id = message.getUid();
this.mailboxId = message.getMailboxId().serialize();
this.modSeq = message.getModSeq();
@@ -90,7 +90,7 @@ public class IndexableMessage {
this.properties = message.getProperties();
}
- private static ZonedDateTime getSanitizedInternalDate(Message<? extends MailboxId> message, ZoneId zoneId) {
+ private static ZonedDateTime getSanitizedInternalDate(MailboxMessage<? extends MailboxId> message, ZoneId zoneId) {
if (message.getInternalDate() == null) {
return ZonedDateTime.now();
}
Modified: james/project/trunk/server/protocols/jmap/src/main/java/org/apache/james/jmap/model/message/MimePartParser.java
URL: http://svn.apache.org/viewvc/james/project/trunk/server/protocols/jmap/src/main/java/org/apache/james/jmap/model/message/MimePartParser.java?rev=1724225&r1=1724224&r2=1724225&view=diff
==============================================================================
--- james/project/trunk/server/protocols/jmap/src/main/java/org/apache/james/jmap/model/message/MimePartParser.java (original)
+++ james/project/trunk/server/protocols/jmap/src/main/java/org/apache/james/jmap/model/message/MimePartParser.java Tue Jan 12 13:17:03 2016
@@ -22,7 +22,7 @@ package org.apache.james.jmap.model.mess
import com.google.common.base.Preconditions;
import org.apache.james.mailbox.store.extractor.TextExtractor;
import org.apache.james.mailbox.store.mail.model.MailboxId;
-import org.apache.james.mailbox.store.mail.model.Message;
+import org.apache.james.mailbox.store.mail.model.MailboxMessage;
import org.apache.james.mime4j.MimeException;
import org.apache.james.mime4j.message.DefaultBodyDescriptorBuilder;
import org.apache.james.mime4j.message.MaximalBodyDescriptor;
@@ -36,14 +36,14 @@ import java.util.LinkedList;
public class MimePartParser {
- private final Message<? extends MailboxId> message;
+ private final MailboxMessage<? extends MailboxId> message;
private final TextExtractor textExtractor;
private final MimeTokenStream stream;
private final Deque<MimePartContainerBuilder> builderStack;
private MimePart result;
private MimePartContainerBuilder currentlyBuildMimePart;
- public MimePartParser(Message<? extends MailboxId> message, TextExtractor textExtractor) {
+ public MimePartParser(MailboxMessage<? extends MailboxId> message, TextExtractor textExtractor) {
this.message = message;
this.textExtractor = textExtractor;
this.builderStack = new LinkedList<>();
Modified: james/project/trunk/server/protocols/jmap/src/main/java/org/apache/james/jmap/utils/SortToComparatorConvertor.java
URL: http://svn.apache.org/viewvc/james/project/trunk/server/protocols/jmap/src/main/java/org/apache/james/jmap/utils/SortToComparatorConvertor.java?rev=1724225&r1=1724224&r2=1724225&view=diff
==============================================================================
--- james/project/trunk/server/protocols/jmap/src/main/java/org/apache/james/jmap/utils/SortToComparatorConvertor.java (original)
+++ james/project/trunk/server/protocols/jmap/src/main/java/org/apache/james/jmap/utils/SortToComparatorConvertor.java Tue Jan 12 13:17:03 2016
@@ -25,7 +25,7 @@ import java.util.Map;
import java.util.function.Function;
import org.apache.james.mailbox.store.mail.model.MailboxId;
-import org.apache.james.mailbox.store.mail.model.Message;
+import org.apache.james.mailbox.store.mail.model.MailboxMessage;
import com.google.common.base.Preconditions;
import com.google.common.base.Splitter;
@@ -40,18 +40,18 @@ public class SortToComparatorConvertor {
}
@SuppressWarnings("rawtypes")
- private static final Map<String, Function<Message<?>, Comparable>> fieldsMessageFunctionMap = ImmutableMap.of(
- "date", Message::getInternalDate,
- "id", Message::getUid);
+ private static final Map<String, Function<MailboxMessage<?>, Comparable>> fieldsMessageFunctionMap = ImmutableMap.of(
+ "date", MailboxMessage::getInternalDate,
+ "id", MailboxMessage::getUid);
- public static <M extends Message<Id>, Id extends MailboxId> Comparator<M> comparatorFor(List<String> sort) {
+ public static <M extends MailboxMessage<Id>, Id extends MailboxId> Comparator<M> comparatorFor(List<String> sort) {
return sort.stream()
.map(SortToComparatorConvertor::<M, Id> comparatorForField)
.reduce(new EmptyComparator<M>(), (x, y) -> x.thenComparing(y));
}
@SuppressWarnings("unchecked")
- private static <M extends Message<Id>, Id extends MailboxId> Comparator<M> comparatorForField(String field) {
+ private static <M extends MailboxMessage<Id>, Id extends MailboxId> Comparator<M> comparatorForField(String field) {
List<String> splitToList = Splitter.on(SEPARATOR).splitToList(field);
checkField(splitToList);
Comparator<M> fieldComparator = Comparator.comparing(functionForField(splitToList.get(0)));
@@ -62,7 +62,7 @@ public class SortToComparatorConvertor {
}
@SuppressWarnings("rawtypes")
- private static Function<Message<?>, Comparable> functionForField(String field) {
+ private static Function<MailboxMessage<?>, Comparable> functionForField(String field) {
if (!fieldsMessageFunctionMap.containsKey(field)) {
throw new IllegalArgumentException("Unknown sorting field");
}
Copied: james/project/trunk/server/protocols/jmap/src/test/java/org/apache/james/jmap/model/GetMailboxMessageListRequestTest.java (from r1724224, james/project/trunk/server/protocols/jmap/src/test/java/org/apache/james/jmap/model/GetMessageListRequestTest.java)
URL: http://svn.apache.org/viewvc/james/project/trunk/server/protocols/jmap/src/test/java/org/apache/james/jmap/model/GetMailboxMessageListRequestTest.java?p2=james/project/trunk/server/protocols/jmap/src/test/java/org/apache/james/jmap/model/GetMailboxMessageListRequestTest.java&p1=james/project/trunk/server/protocols/jmap/src/test/java/org/apache/james/jmap/model/GetMessageListRequestTest.java&r1=1724224&r2=1724225&rev=1724225&view=diff
==============================================================================
--- james/project/trunk/server/protocols/jmap/src/test/java/org/apache/james/jmap/model/GetMessageListRequestTest.java (original)
+++ james/project/trunk/server/protocols/jmap/src/test/java/org/apache/james/jmap/model/GetMailboxMessageListRequestTest.java Tue Jan 12 13:17:03 2016
@@ -29,7 +29,7 @@ import org.junit.Test;
import com.google.common.collect.ImmutableList;
-public class GetMessageListRequestTest {
+public class GetMailboxMessageListRequestTest {
@Test(expected=IllegalStateException.class)
public void builderShouldThrowWhenPositionIsNegative() {
Copied: james/project/trunk/server/protocols/jmap/src/test/java/org/apache/james/jmap/model/GetMailboxMessageListResponseTest.java (from r1724224, james/project/trunk/server/protocols/jmap/src/test/java/org/apache/james/jmap/model/GetMessageListResponseTest.java)
URL: http://svn.apache.org/viewvc/james/project/trunk/server/protocols/jmap/src/test/java/org/apache/james/jmap/model/GetMailboxMessageListResponseTest.java?p2=james/project/trunk/server/protocols/jmap/src/test/java/org/apache/james/jmap/model/GetMailboxMessageListResponseTest.java&p1=james/project/trunk/server/protocols/jmap/src/test/java/org/apache/james/jmap/model/GetMessageListResponseTest.java&r1=1724224&r2=1724225&rev=1724225&view=diff
==============================================================================
--- james/project/trunk/server/protocols/jmap/src/test/java/org/apache/james/jmap/model/GetMessageListResponseTest.java (original)
+++ james/project/trunk/server/protocols/jmap/src/test/java/org/apache/james/jmap/model/GetMailboxMessageListResponseTest.java Tue Jan 12 13:17:03 2016
@@ -28,7 +28,7 @@ import org.junit.Test;
import com.google.common.collect.ImmutableList;
-public class GetMessageListResponseTest {
+public class GetMailboxMessageListResponseTest {
@Test(expected=NotImplementedException.class)
public void builderShouldThrowWhenAccountId() {
Copied: james/project/trunk/server/protocols/jmap/src/test/java/org/apache/james/jmap/model/MailboxMessageTest.java (from r1724224, james/project/trunk/server/protocols/jmap/src/test/java/org/apache/james/jmap/model/MessageTest.java)
URL: http://svn.apache.org/viewvc/james/project/trunk/server/protocols/jmap/src/test/java/org/apache/james/jmap/model/MailboxMessageTest.java?p2=james/project/trunk/server/protocols/jmap/src/test/java/org/apache/james/jmap/model/MailboxMessageTest.java&p1=james/project/trunk/server/protocols/jmap/src/test/java/org/apache/james/jmap/model/MessageTest.java&r1=1724224&r2=1724225&rev=1724225&view=diff
==============================================================================
--- james/project/trunk/server/protocols/jmap/src/test/java/org/apache/james/jmap/model/MessageTest.java (original)
+++ james/project/trunk/server/protocols/jmap/src/test/java/org/apache/james/jmap/model/MailboxMessageTest.java Tue Jan 12 13:17:03 2016
@@ -32,14 +32,15 @@ import javax.mail.util.SharedByteArrayIn
import org.apache.commons.io.IOUtils;
import org.apache.commons.lang.NotImplementedException;
import org.apache.james.mailbox.store.TestId;
+import org.apache.james.mailbox.store.mail.model.MailboxMessage;
import org.apache.james.mailbox.store.mail.model.impl.PropertyBuilder;
-import org.apache.james.mailbox.store.mail.model.impl.SimpleMessage;
+import org.apache.james.mailbox.store.mail.model.impl.SimpleMailboxMessage;
import org.junit.Test;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableMap;
-public class MessageTest {
+public class MailboxMessageTest {
private static final TestId MAILBOX_ID = TestId.of(18L);
private static final long MOD_SEQ = 42L;
private static final ZoneId UTC_ZONE_ID = ZoneId.of("Z");
@@ -232,7 +233,7 @@ public class MessageTest {
@Test
public void emptyMailShouldBeLoadedIntoMessage() throws Exception {
- org.apache.james.mailbox.store.mail.model.Message<TestId> testMail = new SimpleMessage<>(
+ MailboxMessage<TestId> testMail = new SimpleMailboxMessage<>(
INTERNAL_DATE,
0,
0,
@@ -263,7 +264,7 @@ public class MessageTest {
flags.add(Flag.ANSWERED);
flags.add(Flag.FLAGGED);
flags.add(Flag.DRAFT);
- org.apache.james.mailbox.store.mail.model.Message<TestId> testMail = new SimpleMessage<>(
+ MailboxMessage<TestId> testMail = new SimpleMailboxMessage<>(
INTERNAL_DATE,
0,
0,
@@ -302,7 +303,7 @@ public class MessageTest {
+ "Reply-To: \"user to reply to\" <us...@domain>\n"
+ "In-Reply-To: <SN...@phx.gbl>\n"
+ "Other-header: other header value";
- org.apache.james.mailbox.store.mail.model.Message<TestId> testMail = new SimpleMessage<>(
+ MailboxMessage<TestId> testMail = new SimpleMailboxMessage<>(
INTERNAL_DATE,
headers.length(),
headers.length(),
@@ -354,7 +355,7 @@ public class MessageTest {
String headers = "Subject: test subject\n";
String body = "Mail body";
String mail = headers + "\n" + body;
- org.apache.james.mailbox.store.mail.model.Message<TestId> testMail = new SimpleMessage<>(
+ MailboxMessage<TestId> testMail = new SimpleMailboxMessage<>(
INTERNAL_DATE,
mail.length(),
headers.length(),
@@ -414,7 +415,7 @@ public class MessageTest {
assertThat(body300.length()).isEqualTo(300);
assertThat(expectedPreview.length()).isEqualTo(256);
String mail = headers + "\n" + body300;
- org.apache.james.mailbox.store.mail.model.Message<TestId> testMail = new SimpleMessage<>(
+ MailboxMessage<TestId> testMail = new SimpleMailboxMessage<>(
INTERNAL_DATE,
mail.length(),
headers.length(),
@@ -442,7 +443,7 @@ public class MessageTest {
@Test(expected=NotImplementedException.class)
public void attachmentsShouldNotBeHandledForNow() throws Exception {
- org.apache.james.mailbox.store.mail.model.Message<TestId> testMail = new SimpleMessage<>(
+ MailboxMessage<TestId> testMail = new SimpleMailboxMessage<>(
INTERNAL_DATE,
0,
0,
Copied: james/project/trunk/server/protocols/jmap/src/test/java/org/apache/james/jmap/model/SubMailboxMessageTest.java (from r1724224, james/project/trunk/server/protocols/jmap/src/test/java/org/apache/james/jmap/model/SubMessageTest.java)
URL: http://svn.apache.org/viewvc/james/project/trunk/server/protocols/jmap/src/test/java/org/apache/james/jmap/model/SubMailboxMessageTest.java?p2=james/project/trunk/server/protocols/jmap/src/test/java/org/apache/james/jmap/model/SubMailboxMessageTest.java&p1=james/project/trunk/server/protocols/jmap/src/test/java/org/apache/james/jmap/model/SubMessageTest.java&r1=1724224&r2=1724225&rev=1724225&view=diff
==============================================================================
--- james/project/trunk/server/protocols/jmap/src/test/java/org/apache/james/jmap/model/SubMessageTest.java (original)
+++ james/project/trunk/server/protocols/jmap/src/test/java/org/apache/james/jmap/model/SubMailboxMessageTest.java Tue Jan 12 13:17:03 2016
@@ -28,7 +28,7 @@ import org.junit.Test;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableMap;
-public class SubMessageTest {
+public class SubMailboxMessageTest {
@Test(expected=IllegalStateException.class)
public void buildShouldThrowWhenHeadersIsNull() {
SubMessage.builder().build();
Modified: james/project/trunk/server/protocols/jmap/src/test/java/org/apache/james/jmap/utils/SortToComparatorConvertorTest.java
URL: http://svn.apache.org/viewvc/james/project/trunk/server/protocols/jmap/src/test/java/org/apache/james/jmap/utils/SortToComparatorConvertorTest.java?rev=1724225&r1=1724224&r2=1724225&view=diff
==============================================================================
--- james/project/trunk/server/protocols/jmap/src/test/java/org/apache/james/jmap/utils/SortToComparatorConvertorTest.java (original)
+++ james/project/trunk/server/protocols/jmap/src/test/java/org/apache/james/jmap/utils/SortToComparatorConvertorTest.java Tue Jan 12 13:17:03 2016
@@ -29,9 +29,9 @@ import java.util.List;
import javax.mail.Flags;
import org.apache.james.mailbox.store.TestId;
-import org.apache.james.mailbox.store.mail.model.Message;
+import org.apache.james.mailbox.store.mail.model.MailboxMessage;
import org.apache.james.mailbox.store.mail.model.impl.PropertyBuilder;
-import org.apache.james.mailbox.store.mail.model.impl.SimpleMessage;
+import org.apache.james.mailbox.store.mail.model.impl.SimpleMailboxMessage;
import org.junit.Before;
import org.junit.Test;
@@ -40,17 +40,17 @@ import com.google.common.collect.Lists;
public class SortToComparatorConvertorTest {
- private List<SimpleMessage<TestId>> messages;
- private SimpleMessage<TestId> firstMessage;
- private SimpleMessage<TestId> secondMessage;
+ private List<SimpleMailboxMessage<TestId>> messages;
+ private SimpleMailboxMessage<TestId> firstMessage;
+ private SimpleMailboxMessage<TestId> secondMessage;
@Before
@SuppressWarnings("unchecked")
public void setup() {
LocalDate date = LocalDate.now();
- firstMessage = new SimpleMessage<TestId>(new Date(date.toEpochDay()), 0, 0, null, new Flags(), new PropertyBuilder(), null);
+ firstMessage = new SimpleMailboxMessage<TestId>(new Date(date.toEpochDay()), 0, 0, null, new Flags(), new PropertyBuilder(), null);
firstMessage.setUid(1);
- secondMessage = new SimpleMessage<TestId>(new Date(date.plusDays(1).toEpochDay()), 0, 0, null, new Flags(), new PropertyBuilder(), null);
+ secondMessage = new SimpleMailboxMessage<TestId>(new Date(date.plusDays(1).toEpochDay()), 0, 0, null, new Flags(), new PropertyBuilder(), null);
secondMessage.setUid(2);
messages = Lists.newArrayList(firstMessage, secondMessage);
}
@@ -58,7 +58,7 @@ public class SortToComparatorConvertorTe
@Test
@SuppressWarnings("unchecked")
public void comparatorForShouldBeInitialOrderWhenEmptyList() {
- Comparator<SimpleMessage<TestId>> comparator = SortToComparatorConvertor.comparatorFor(ImmutableList.of());
+ Comparator<SimpleMailboxMessage<TestId>> comparator = SortToComparatorConvertor.comparatorFor(ImmutableList.of());
messages.sort(comparator);
assertThat(messages).containsExactly(firstMessage, secondMessage);
}
@@ -66,7 +66,7 @@ public class SortToComparatorConvertorTe
@Test
@SuppressWarnings("unchecked")
public void comparatorForShouldBeDescByDateWhenOnlyDateInList() {
- Comparator<Message<TestId>> comparator = SortToComparatorConvertor.comparatorFor(ImmutableList.of("date"));
+ Comparator<MailboxMessage<TestId>> comparator = SortToComparatorConvertor.comparatorFor(ImmutableList.of("date"));
messages.sort(comparator);
assertThat(messages).containsExactly(secondMessage, firstMessage);
}
@@ -74,7 +74,7 @@ public class SortToComparatorConvertorTe
@Test
@SuppressWarnings("unchecked")
public void comparatorForShouldBeDescByDateWhenOnlyDateDescInList() {
- Comparator<Message<TestId>> comparator = SortToComparatorConvertor.comparatorFor(ImmutableList.of("date desc"));
+ Comparator<MailboxMessage<TestId>> comparator = SortToComparatorConvertor.comparatorFor(ImmutableList.of("date desc"));
messages.sort(comparator);
assertThat(messages).containsExactly(secondMessage, firstMessage);
}
@@ -82,7 +82,7 @@ public class SortToComparatorConvertorTe
@Test
@SuppressWarnings("unchecked")
public void comparatorForShouldBeAscByDateWhenOnlyDateAscInList() {
- Comparator<Message<TestId>> comparator = SortToComparatorConvertor.comparatorFor(ImmutableList.of("date asc"));
+ Comparator<MailboxMessage<TestId>> comparator = SortToComparatorConvertor.comparatorFor(ImmutableList.of("date asc"));
messages.sort(comparator);
assertThat(messages).containsExactly(firstMessage, secondMessage);
}
@@ -90,11 +90,11 @@ public class SortToComparatorConvertorTe
@Test
@SuppressWarnings("unchecked")
public void comparatorForShouldChainComparatorsWhenOnlyMultipleElementInList() {
- SimpleMessage<TestId> thirdMessage = new SimpleMessage<TestId>(secondMessage.getInternalDate(), 0, 0, null, new Flags(), new PropertyBuilder(), null);
+ SimpleMailboxMessage<TestId> thirdMessage = new SimpleMailboxMessage<TestId>(secondMessage.getInternalDate(), 0, 0, null, new Flags(), new PropertyBuilder(), null);
thirdMessage.setUid(3);
messages.add(thirdMessage);
- Comparator<Message<TestId>> comparator = SortToComparatorConvertor.comparatorFor(ImmutableList.of("date asc", "id desc"));
+ Comparator<MailboxMessage<TestId>> comparator = SortToComparatorConvertor.comparatorFor(ImmutableList.of("date asc", "id desc"));
messages.sort(comparator);
assertThat(messages).containsExactly(firstMessage, thirdMessage, secondMessage);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org