JAMES-2414 remove Attachment Capability
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/ef463dd6 Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/ef463dd6 Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/ef463dd6 Branch: refs/heads/master Commit: ef463dd6de59af1de47675580458da0bc17a2a39 Parents: 2724e89 Author: Matthieu Baechler <[email protected]> Authored: Mon Jun 18 18:13:20 2018 +0200 Committer: benwa <[email protected]> Committed: Tue Jun 19 15:09:53 2018 +0700 ---------------------------------------------------------------------- .../java/org/apache/james/mailbox/MailboxManager.java | 1 - .../mailbox/cassandra/CassandraMailboxManager.java | 2 +- .../james/mailbox/inmemory/InMemoryMailboxManager.java | 2 +- .../james/mailbox/store/ImmutableMailboxMessage.java | 5 +---- .../mailbox/store/search/SimpleMessageSearchIndex.java | 12 ++++-------- .../org/apache/james/JamesCapabilitiesServerTest.java | 2 +- .../src/main/java/org/apache/james/jmap/JMAPModule.java | 2 -- 7 files changed, 8 insertions(+), 18 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/james-project/blob/ef463dd6/mailbox/api/src/main/java/org/apache/james/mailbox/MailboxManager.java ---------------------------------------------------------------------- diff --git a/mailbox/api/src/main/java/org/apache/james/mailbox/MailboxManager.java b/mailbox/api/src/main/java/org/apache/james/mailbox/MailboxManager.java index e00deb2..1d13791 100644 --- a/mailbox/api/src/main/java/org/apache/james/mailbox/MailboxManager.java +++ b/mailbox/api/src/main/java/org/apache/james/mailbox/MailboxManager.java @@ -84,7 +84,6 @@ public interface MailboxManager extends RequestAware, MailboxListenerSupport, Ri boolean hasCapability(MailboxCapabilities capability); enum MessageCapabilities { - Attachment, UniqueID } http://git-wip-us.apache.org/repos/asf/james-project/blob/ef463dd6/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/CassandraMailboxManager.java ---------------------------------------------------------------------- diff --git a/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/CassandraMailboxManager.java b/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/CassandraMailboxManager.java index 7b071a5..81e543b 100644 --- a/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/CassandraMailboxManager.java +++ b/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/CassandraMailboxManager.java @@ -53,7 +53,7 @@ public class CassandraMailboxManager extends StoreMailboxManager { MailboxCapabilities.Annotation, MailboxCapabilities.ACL, MailboxCapabilities.Quota); - public static final EnumSet<MessageCapabilities> MESSAGE_CAPABILITIES = EnumSet.of(MessageCapabilities.Attachment, MessageCapabilities.UniqueID); + public static final EnumSet<MessageCapabilities> MESSAGE_CAPABILITIES = EnumSet.of(MessageCapabilities.UniqueID); private final MailboxPathLocker locker; private final CassandraMailboxSessionMapperFactory mapperFactory; http://git-wip-us.apache.org/repos/asf/james-project/blob/ef463dd6/mailbox/memory/src/main/java/org/apache/james/mailbox/inmemory/InMemoryMailboxManager.java ---------------------------------------------------------------------- diff --git a/mailbox/memory/src/main/java/org/apache/james/mailbox/inmemory/InMemoryMailboxManager.java b/mailbox/memory/src/main/java/org/apache/james/mailbox/inmemory/InMemoryMailboxManager.java index 5f02b28..69736ac 100644 --- a/mailbox/memory/src/main/java/org/apache/james/mailbox/inmemory/InMemoryMailboxManager.java +++ b/mailbox/memory/src/main/java/org/apache/james/mailbox/inmemory/InMemoryMailboxManager.java @@ -47,7 +47,7 @@ public class InMemoryMailboxManager extends StoreMailboxManager { MailboxCapabilities.Annotation, MailboxCapabilities.ACL, MailboxCapabilities.Quota); - public static final EnumSet<MessageCapabilities> MESSAGE_CAPABILITIES = EnumSet.of(MessageCapabilities.Attachment, MessageCapabilities.UniqueID); + public static final EnumSet<MessageCapabilities> MESSAGE_CAPABILITIES = EnumSet.of(MessageCapabilities.UniqueID); @Inject public InMemoryMailboxManager(MailboxSessionMapperFactory mailboxSessionMapperFactory, Authenticator authenticator, Authorizator authorizator, http://git-wip-us.apache.org/repos/asf/james-project/blob/ef463dd6/mailbox/store/src/main/java/org/apache/james/mailbox/store/ImmutableMailboxMessage.java ---------------------------------------------------------------------- diff --git a/mailbox/store/src/main/java/org/apache/james/mailbox/store/ImmutableMailboxMessage.java b/mailbox/store/src/main/java/org/apache/james/mailbox/store/ImmutableMailboxMessage.java index 15330c7..dcc1e96 100644 --- a/mailbox/store/src/main/java/org/apache/james/mailbox/store/ImmutableMailboxMessage.java +++ b/mailbox/store/src/main/java/org/apache/james/mailbox/store/ImmutableMailboxMessage.java @@ -83,10 +83,7 @@ public class ImmutableMailboxMessage implements MailboxMessage { } private ImmutableList<MessageAttachment> attachments(MailboxMessage message) { - if (mailboxManager.getSupportedMessageCapabilities().contains(MailboxManager.MessageCapabilities.Attachment)) { - return ImmutableList.copyOf(message.getAttachments()); - } - return ImmutableList.of(); + return ImmutableList.copyOf(message.getAttachments()); } } http://git-wip-us.apache.org/repos/asf/james-project/blob/ef463dd6/mailbox/store/src/main/java/org/apache/james/mailbox/store/search/SimpleMessageSearchIndex.java ---------------------------------------------------------------------- diff --git a/mailbox/store/src/main/java/org/apache/james/mailbox/store/search/SimpleMessageSearchIndex.java b/mailbox/store/src/main/java/org/apache/james/mailbox/store/search/SimpleMessageSearchIndex.java index 724c575..ce22aa9 100644 --- a/mailbox/store/src/main/java/org/apache/james/mailbox/store/search/SimpleMessageSearchIndex.java +++ b/mailbox/store/src/main/java/org/apache/james/mailbox/store/search/SimpleMessageSearchIndex.java @@ -77,15 +77,11 @@ public class SimpleMessageSearchIndex implements MessageSearchIndex { @Override public EnumSet<SearchCapabilities> getSupportedCapabilities(EnumSet<MessageCapabilities> messageCapabilities) { - if (messageCapabilities.contains(MessageCapabilities.Attachment)) { - return EnumSet.of(SearchCapabilities.MultimailboxSearch, - SearchCapabilities.Text, - SearchCapabilities.Attachment, - SearchCapabilities.PartialEmailMatch, - SearchCapabilities.AttachmentFileName); - } return EnumSet.of(SearchCapabilities.MultimailboxSearch, - SearchCapabilities.Text); + SearchCapabilities.Text, + SearchCapabilities.Attachment, + SearchCapabilities.PartialEmailMatch, + SearchCapabilities.AttachmentFileName); } /** http://git-wip-us.apache.org/repos/asf/james-project/blob/ef463dd6/server/container/guice/cassandra-guice/src/test/java/org/apache/james/JamesCapabilitiesServerTest.java ---------------------------------------------------------------------- diff --git a/server/container/guice/cassandra-guice/src/test/java/org/apache/james/JamesCapabilitiesServerTest.java b/server/container/guice/cassandra-guice/src/test/java/org/apache/james/JamesCapabilitiesServerTest.java index 80132c1..45cc1a8 100644 --- a/server/container/guice/cassandra-guice/src/test/java/org/apache/james/JamesCapabilitiesServerTest.java +++ b/server/container/guice/cassandra-guice/src/test/java/org/apache/james/JamesCapabilitiesServerTest.java @@ -111,7 +111,7 @@ public class JamesCapabilitiesServerTest { when(mailboxManager.getSupportedMailboxCapabilities()) .thenReturn(EnumSet.allOf(MailboxManager.MailboxCapabilities.class)); when(mailboxManager.getSupportedMessageCapabilities()) - .thenReturn(EnumSet.complementOf(EnumSet.of(MailboxManager.MessageCapabilities.Attachment))); + .thenReturn(EnumSet.allOf(MailboxManager.MessageCapabilities.class)); when(mailboxManager.getSupportedSearchCapabilities()) .thenReturn(EnumSet.allOf(MailboxManager.SearchCapabilities.class)); http://git-wip-us.apache.org/repos/asf/james-project/blob/ef463dd6/server/container/guice/protocols/jmap/src/main/java/org/apache/james/jmap/JMAPModule.java ---------------------------------------------------------------------- diff --git a/server/container/guice/protocols/jmap/src/main/java/org/apache/james/jmap/JMAPModule.java b/server/container/guice/protocols/jmap/src/main/java/org/apache/james/jmap/JMAPModule.java index 111b2f7..b70c953 100644 --- a/server/container/guice/protocols/jmap/src/main/java/org/apache/james/jmap/JMAPModule.java +++ b/server/container/guice/protocols/jmap/src/main/java/org/apache/james/jmap/JMAPModule.java @@ -148,8 +148,6 @@ public class JMAPModule extends AbstractModule { "ACL support in MailboxManager is required by JMAP Module"); EnumSet<MailboxManager.MessageCapabilities> messageCapabilities = mailboxManager.getSupportedMessageCapabilities(); - Preconditions.checkArgument(messageCapabilities.contains(MailboxManager.MessageCapabilities.Attachment), - "Attachment support in MailboxManager is required by JMAP Module"); Preconditions.checkArgument(messageCapabilities.contains(MailboxManager.MessageCapabilities.UniqueID), "MessageIdManager is not defined by this Mailbox implementation"); --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
