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 bt...@apache.org on 2019/01/15 03:22:01 UTC
[26/30] james-project git commit: JAMES-2641 Ship knowledge about
serializability along in MessageId
JAMES-2641 Ship knowledge about serializability along in MessageId
JPA integration test issues some failed logs about "fake" messageId serializing
that should have been prevented.
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/dc426a56
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/dc426a56
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/dc426a56
Branch: refs/heads/master
Commit: dc426a56f67a9746952cc19539a3e3edbcfedbf0
Parents: df10904
Author: Benoit Tellier <bt...@linagora.com>
Authored: Fri Jan 11 15:53:06 2019 +0700
Committer: Benoit Tellier <bt...@linagora.com>
Committed: Tue Jan 15 10:10:05 2019 +0700
----------------------------------------------------------------------
.../apache/james/mailbox/model/MessageId.java | 2 ++
.../ComposedMessageIdWithMetaDataTest.java | 5 +++++
.../james/mailbox/model/TestMessageId.java | 5 +++++
.../cassandra/ids/CassandraMessageId.java | 5 +++++
.../cassandra/ids/CassandraMessageIdTest.java | 5 +++++
.../lucene/search/LuceneMessageSearchIndex.java | 6 +++++-
.../mailbox/inmemory/InMemoryMessageId.java | 5 +++++
.../mailbox/inmemory/InMemoryMessageIdTest.java | 7 +++++++
.../store/mail/model/DefaultMessageId.java | 5 +++++
.../james/mailbox/store/search/SearchUtil.java | 2 +-
.../store/mail/model/DefaultMessageIdTest.java | 7 +++++++
.../mailbox/store/search/SearchUtilTest.java | 21 ++++++++++++++++++--
12 files changed, 71 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/james-project/blob/dc426a56/mailbox/api/src/main/java/org/apache/james/mailbox/model/MessageId.java
----------------------------------------------------------------------
diff --git a/mailbox/api/src/main/java/org/apache/james/mailbox/model/MessageId.java b/mailbox/api/src/main/java/org/apache/james/mailbox/model/MessageId.java
index f531f0a..36e2c47 100644
--- a/mailbox/api/src/main/java/org/apache/james/mailbox/model/MessageId.java
+++ b/mailbox/api/src/main/java/org/apache/james/mailbox/model/MessageId.java
@@ -30,4 +30,6 @@ public interface MessageId {
}
String serialize();
+
+ boolean isSerializable();
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/dc426a56/mailbox/api/src/test/java/org/apache/james/mailbox/model/ComposedMessageIdWithMetaDataTest.java
----------------------------------------------------------------------
diff --git a/mailbox/api/src/test/java/org/apache/james/mailbox/model/ComposedMessageIdWithMetaDataTest.java b/mailbox/api/src/test/java/org/apache/james/mailbox/model/ComposedMessageIdWithMetaDataTest.java
index 62b6cd2..8df2ba4 100644
--- a/mailbox/api/src/test/java/org/apache/james/mailbox/model/ComposedMessageIdWithMetaDataTest.java
+++ b/mailbox/api/src/test/java/org/apache/james/mailbox/model/ComposedMessageIdWithMetaDataTest.java
@@ -111,6 +111,11 @@ public class ComposedMessageIdWithMetaDataTest {
public String serialize() {
return id;
}
+
+ @Override
+ public boolean isSerializable() {
+ return true;
+ }
}
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/dc426a56/mailbox/api/src/test/java/org/apache/james/mailbox/model/TestMessageId.java
----------------------------------------------------------------------
diff --git a/mailbox/api/src/test/java/org/apache/james/mailbox/model/TestMessageId.java b/mailbox/api/src/test/java/org/apache/james/mailbox/model/TestMessageId.java
index 9913e20..52da632 100644
--- a/mailbox/api/src/test/java/org/apache/james/mailbox/model/TestMessageId.java
+++ b/mailbox/api/src/test/java/org/apache/james/mailbox/model/TestMessageId.java
@@ -61,6 +61,11 @@ public class TestMessageId implements MessageId {
}
@Override
+ public boolean isSerializable() {
+ return true;
+ }
+
+ @Override
public int hashCode() {
return Objects.hashCode(value);
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/dc426a56/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/ids/CassandraMessageId.java
----------------------------------------------------------------------
diff --git a/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/ids/CassandraMessageId.java b/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/ids/CassandraMessageId.java
index 54b190f..be359a4 100644
--- a/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/ids/CassandraMessageId.java
+++ b/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/ids/CassandraMessageId.java
@@ -62,6 +62,11 @@ public class CassandraMessageId implements MessageId {
}
@Override
+ public boolean isSerializable() {
+ return true;
+ }
+
+ @Override
public final boolean equals(Object o) {
if (o instanceof CassandraMessageId) {
CassandraMessageId other = (CassandraMessageId) o;
http://git-wip-us.apache.org/repos/asf/james-project/blob/dc426a56/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/ids/CassandraMessageIdTest.java
----------------------------------------------------------------------
diff --git a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/ids/CassandraMessageIdTest.java b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/ids/CassandraMessageIdTest.java
index ff4ac82..bb7551a 100644
--- a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/ids/CassandraMessageIdTest.java
+++ b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/ids/CassandraMessageIdTest.java
@@ -62,4 +62,9 @@ public class CassandraMessageIdTest {
String expected = uuid.toString();
assertThat(cassandraMessageId.serialize()).isEqualTo(expected);
}
+
+ @Test
+ public void shouldBeSerializable() {
+ assertThat(new CassandraMessageId.Factory().generate().isSerializable()).isTrue();
+ }
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/dc426a56/mailbox/lucene/src/main/java/org/apache/james/mailbox/lucene/search/LuceneMessageSearchIndex.java
----------------------------------------------------------------------
diff --git a/mailbox/lucene/src/main/java/org/apache/james/mailbox/lucene/search/LuceneMessageSearchIndex.java b/mailbox/lucene/src/main/java/org/apache/james/mailbox/lucene/search/LuceneMessageSearchIndex.java
index 9ff285f..7fffb74 100644
--- a/mailbox/lucene/src/main/java/org/apache/james/mailbox/lucene/search/LuceneMessageSearchIndex.java
+++ b/mailbox/lucene/src/main/java/org/apache/james/mailbox/lucene/search/LuceneMessageSearchIndex.java
@@ -548,7 +548,11 @@ public class LuceneMessageSearchIndex extends ListeningMessageSearchIndex {
doc.add(new Field(MAILBOX_ID_FIELD, membership.getMailboxId().serialize().toUpperCase(Locale.US), Store.YES, Index.NOT_ANALYZED));
doc.add(new NumericField(UID_FIELD,Store.YES, true).setLongValue(membership.getUid().asLong()));
doc.add(new Field(HAS_ATTACHMENT_FIELD, Boolean.toString(hasAttachment(membership)), Store.YES, Index.NOT_ANALYZED));
- doc.add(new Field(MESSAGE_ID_FIELD, SearchUtil.getSerializedMessageIdIfSupportedByUnderlyingStorageOrNull(membership), Store.YES, Index.NOT_ANALYZED));
+
+ String serializedMessageId = SearchUtil.getSerializedMessageIdIfSupportedByUnderlyingStorageOrNull(membership);
+ if (serializedMessageId != null) {
+ doc.add(new Field(MESSAGE_ID_FIELD, serializedMessageId, Store.YES, Index.NOT_ANALYZED));
+ }
// create an unqiue key for the document which can be used later on updates to find the document
doc.add(new Field(ID_FIELD, membership.getMailboxId().serialize().toUpperCase(Locale.US) + "-" + Long.toString(membership.getUid().asLong()), Store.YES, Index.NOT_ANALYZED));
http://git-wip-us.apache.org/repos/asf/james-project/blob/dc426a56/mailbox/memory/src/main/java/org/apache/james/mailbox/inmemory/InMemoryMessageId.java
----------------------------------------------------------------------
diff --git a/mailbox/memory/src/main/java/org/apache/james/mailbox/inmemory/InMemoryMessageId.java b/mailbox/memory/src/main/java/org/apache/james/mailbox/inmemory/InMemoryMessageId.java
index f1a3ab5..789e933 100644
--- a/mailbox/memory/src/main/java/org/apache/james/mailbox/inmemory/InMemoryMessageId.java
+++ b/mailbox/memory/src/main/java/org/apache/james/mailbox/inmemory/InMemoryMessageId.java
@@ -62,6 +62,11 @@ public class InMemoryMessageId implements MessageId {
}
@Override
+ public boolean isSerializable() {
+ return true;
+ }
+
+ @Override
public final int hashCode() {
return Objects.hashCode(value);
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/dc426a56/mailbox/memory/src/test/java/org/apache/james/mailbox/inmemory/InMemoryMessageIdTest.java
----------------------------------------------------------------------
diff --git a/mailbox/memory/src/test/java/org/apache/james/mailbox/inmemory/InMemoryMessageIdTest.java b/mailbox/memory/src/test/java/org/apache/james/mailbox/inmemory/InMemoryMessageIdTest.java
index fd64e12..59303a9 100644
--- a/mailbox/memory/src/test/java/org/apache/james/mailbox/inmemory/InMemoryMessageIdTest.java
+++ b/mailbox/memory/src/test/java/org/apache/james/mailbox/inmemory/InMemoryMessageIdTest.java
@@ -18,6 +18,8 @@
****************************************************************/
package org.apache.james.mailbox.inmemory;
+import static org.assertj.core.api.Assertions.assertThat;
+
import org.junit.Test;
import nl.jqno.equalsverifier.EqualsVerifier;
@@ -28,4 +30,9 @@ public class InMemoryMessageIdTest {
public void shouldRespectJavaBeanContract() {
EqualsVerifier.forClass(InMemoryMessageId.class).verify();
}
+
+ @Test
+ public void shouldBeSerializable() {
+ assertThat(new InMemoryMessageId.Factory().generate().isSerializable()).isTrue();
+ }
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/dc426a56/mailbox/store/src/main/java/org/apache/james/mailbox/store/mail/model/DefaultMessageId.java
----------------------------------------------------------------------
diff --git a/mailbox/store/src/main/java/org/apache/james/mailbox/store/mail/model/DefaultMessageId.java b/mailbox/store/src/main/java/org/apache/james/mailbox/store/mail/model/DefaultMessageId.java
index 51fff2d..c163ec6 100644
--- a/mailbox/store/src/main/java/org/apache/james/mailbox/store/mail/model/DefaultMessageId.java
+++ b/mailbox/store/src/main/java/org/apache/james/mailbox/store/mail/model/DefaultMessageId.java
@@ -22,6 +22,11 @@ public class DefaultMessageId implements MessageId {
}
@Override
+ public boolean isSerializable() {
+ return false;
+ }
+
+ @Override
public String serialize() {
throw new IllegalStateException("Capabilities should prevent calling this method");
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/dc426a56/mailbox/store/src/main/java/org/apache/james/mailbox/store/search/SearchUtil.java
----------------------------------------------------------------------
diff --git a/mailbox/store/src/main/java/org/apache/james/mailbox/store/search/SearchUtil.java b/mailbox/store/src/main/java/org/apache/james/mailbox/store/search/SearchUtil.java
index 1dbecda..44519ed 100644
--- a/mailbox/store/src/main/java/org/apache/james/mailbox/store/search/SearchUtil.java
+++ b/mailbox/store/src/main/java/org/apache/james/mailbox/store/search/SearchUtil.java
@@ -180,7 +180,7 @@ public class SearchUtil {
public static String getSerializedMessageIdIfSupportedByUnderlyingStorageOrNull(MailboxMessage mailboxMessage) {
MessageId messageId = mailboxMessage.getMessageId();
- if (messageId != null) {
+ if (messageId != null && messageId.isSerializable()) {
return messageId.serialize();
}
return null;
http://git-wip-us.apache.org/repos/asf/james-project/blob/dc426a56/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/DefaultMessageIdTest.java
----------------------------------------------------------------------
diff --git a/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/DefaultMessageIdTest.java b/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/DefaultMessageIdTest.java
index 3ae48e9..85aa49f 100644
--- a/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/DefaultMessageIdTest.java
+++ b/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/DefaultMessageIdTest.java
@@ -19,6 +19,8 @@
package org.apache.james.mailbox.store.mail.model;
+import static org.assertj.core.api.Assertions.assertThat;
+
import org.apache.james.mailbox.MessageUid;
import org.apache.james.mailbox.model.ComposedMessageId;
import org.apache.james.mailbox.model.TestId;
@@ -36,4 +38,9 @@ public class DefaultMessageIdTest {
composedMessageId.toString();
}
+ @Test
+ public void shouldNotBeSerializable() {
+ assertThat(new DefaultMessageId().isSerializable()).isFalse();
+ }
+
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/james-project/blob/dc426a56/mailbox/store/src/test/java/org/apache/james/mailbox/store/search/SearchUtilTest.java
----------------------------------------------------------------------
diff --git a/mailbox/store/src/test/java/org/apache/james/mailbox/store/search/SearchUtilTest.java b/mailbox/store/src/test/java/org/apache/james/mailbox/store/search/SearchUtilTest.java
index 3995a0a..b5210e6 100644
--- a/mailbox/store/src/test/java/org/apache/james/mailbox/store/search/SearchUtilTest.java
+++ b/mailbox/store/src/test/java/org/apache/james/mailbox/store/search/SearchUtilTest.java
@@ -107,8 +107,8 @@ public class SearchUtilTest {
//given
String messageIdString = "http://www.labraxeenne.com/#/";
MessageId messageId = mock(MessageId.class);
- when(messageId.serialize())
- .thenReturn(messageIdString);
+ when(messageId.serialize()).thenReturn(messageIdString);
+ when(messageId.isSerializable()).thenReturn(true);
MailboxMessage message = mock(MailboxMessage.class);
when(message.getMessageId())
@@ -121,4 +121,21 @@ public class SearchUtilTest {
assertThat(messageIdString).isEqualTo(serialiazedMessageId);
}
+ @Test
+ public void getSerializedMessageIdIfSupportedByUnderlyingStorageOrNullForValidMessageIdShouldReturnNullWhenNotSupported() {
+ //given
+ MessageId messageId = mock(MessageId.class);
+ when(messageId.isSerializable()).thenReturn(false);
+
+ MailboxMessage message = mock(MailboxMessage.class);
+ when(message.getMessageId())
+ .thenReturn(messageId);
+
+ //when
+ String serialiazedMessageId = SearchUtil.getSerializedMessageIdIfSupportedByUnderlyingStorageOrNull(message);
+
+ //expect
+ assertThat(serialiazedMessageId).isNull();
+ }
+
}
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org