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 2018/08/21 02:44:50 UTC

[1/5] james-project git commit: JAMES-2475 Fix Eclipse warnings

Repository: james-project
Updated Branches:
  refs/heads/master 1ac24c097 -> 0a8e0a9dd


JAMES-2475 Fix Eclipse warnings


Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/12f9eb07
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/12f9eb07
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/12f9eb07

Branch: refs/heads/master
Commit: 12f9eb07737ebca596c5c7864ea5084a44362c29
Parents: 1ac24c0
Author: Antoine Duprat <ad...@linagora.com>
Authored: Mon Aug 20 15:38:25 2018 +0200
Committer: Antoine Duprat <ad...@linagora.com>
Committed: Mon Aug 20 15:38:25 2018 +0200

----------------------------------------------------------------------
 .../backends/cassandra/DockerCassandra.java     |  2 --
 .../backends/es/EmbeddedElasticSearch.java      |  1 -
 .../james/mailbox/MailboxManagerTest.java       |  1 +
 ...icSearchListeningMessageSearchIndexTest.java |  2 --
 .../james/transport/mailets/AddFooterTest.java  |  4 ----
 .../transport/mailets/RemoveMimeHeaderTest.java |  1 -
 mpt/impl/imap-mailbox/cyrus/pom.xml             |  2 +-
 .../imap/processor/SearchProcessorTest.java     |  1 +
 .../james/utils/RetryExecutorUtilTest.java      |  3 ---
 .../org/apache/james/MemoryJamesServerTest.java |  3 ---
 .../mailets/remote/delivery/Repeat.java         |  1 -
 .../james/transport/mailets/DSNBounceTest.java  |  1 -
 .../RecipientRewriteTableProcessorTest.java     |  4 ----
 .../jmap/methods/GetMailboxesMethodTest.java    |  5 ++++
 .../jmap/methods/GetMessagesMethodTest.java     |  5 ++++
 .../methods/JmapResponseWriterImplTest.java     |  1 +
 .../jmap/send/PostDequeueDecoratorTest.java     |  1 -
 .../utils/SystemMailboxesProviderImplTest.java  |  1 -
 .../queue/api/ManageableMailQueueContract.java  | 24 ++++++++++----------
 19 files changed, 26 insertions(+), 37 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/james-project/blob/12f9eb07/backends-common/cassandra/src/test/java/org/apache/james/backends/cassandra/DockerCassandra.java
----------------------------------------------------------------------
diff --git a/backends-common/cassandra/src/test/java/org/apache/james/backends/cassandra/DockerCassandra.java b/backends-common/cassandra/src/test/java/org/apache/james/backends/cassandra/DockerCassandra.java
index 9305cdd..78bbd97 100644
--- a/backends-common/cassandra/src/test/java/org/apache/james/backends/cassandra/DockerCassandra.java
+++ b/backends-common/cassandra/src/test/java/org/apache/james/backends/cassandra/DockerCassandra.java
@@ -36,8 +36,6 @@ public class DockerCassandra {
 
     private static final int CASSANDRA_PORT = 9042;
     private static final String CASSANDRA_CONFIG_DIR = "$CASSANDRA_CONFIG";
-    private static final String CASSANDRA_YAML = CASSANDRA_CONFIG_DIR + "/cassandra.yaml";
-    private static final String CASSANDRA_ENV = CASSANDRA_CONFIG_DIR + "/cassandra-env.sh";
     private static final String JVM_OPTIONS = CASSANDRA_CONFIG_DIR + "/jvm.options";
 
     private final GenericContainer<?> cassandraContainer;

http://git-wip-us.apache.org/repos/asf/james-project/blob/12f9eb07/backends-common/elasticsearch/src/test/java/org/apache/james/backends/es/EmbeddedElasticSearch.java
----------------------------------------------------------------------
diff --git a/backends-common/elasticsearch/src/test/java/org/apache/james/backends/es/EmbeddedElasticSearch.java b/backends-common/elasticsearch/src/test/java/org/apache/james/backends/es/EmbeddedElasticSearch.java
index 3bca71c..f2c7de6 100644
--- a/backends-common/elasticsearch/src/test/java/org/apache/james/backends/es/EmbeddedElasticSearch.java
+++ b/backends-common/elasticsearch/src/test/java/org/apache/james/backends/es/EmbeddedElasticSearch.java
@@ -27,7 +27,6 @@ import java.nio.file.Path;
 import java.util.function.Supplier;
 
 import org.awaitility.Duration;
-import org.elasticsearch.action.admin.indices.delete.DeleteIndexRequest;
 import org.elasticsearch.action.admin.indices.flush.FlushAction;
 import org.elasticsearch.action.admin.indices.flush.FlushRequestBuilder;
 import org.elasticsearch.client.Client;

http://git-wip-us.apache.org/repos/asf/james-project/blob/12f9eb07/mailbox/api/src/test/java/org/apache/james/mailbox/MailboxManagerTest.java
----------------------------------------------------------------------
diff --git a/mailbox/api/src/test/java/org/apache/james/mailbox/MailboxManagerTest.java b/mailbox/api/src/test/java/org/apache/james/mailbox/MailboxManagerTest.java
index d950afe..f36b1b3 100644
--- a/mailbox/api/src/test/java/org/apache/james/mailbox/MailboxManagerTest.java
+++ b/mailbox/api/src/test/java/org/apache/james/mailbox/MailboxManagerTest.java
@@ -874,6 +874,7 @@ public abstract class MailboxManagerTest {
     }
 
     @Test
+    @SuppressWarnings("unchecked")
     public void getMetaDataShouldReturnDefaultValueWhenNoReadRight() throws Exception {
         Assume.assumeTrue(mailboxManager.hasCapability(MailboxCapabilities.ACL));
         MailboxSession session1 = mailboxManager.createSystemSession(USER_1);

http://git-wip-us.apache.org/repos/asf/james-project/blob/12f9eb07/mailbox/elasticsearch/src/test/java/org/apache/james/mailbox/elasticsearch/events/ElasticSearchListeningMessageSearchIndexTest.java
----------------------------------------------------------------------
diff --git a/mailbox/elasticsearch/src/test/java/org/apache/james/mailbox/elasticsearch/events/ElasticSearchListeningMessageSearchIndexTest.java b/mailbox/elasticsearch/src/test/java/org/apache/james/mailbox/elasticsearch/events/ElasticSearchListeningMessageSearchIndexTest.java
index 176a617..df7872c 100644
--- a/mailbox/elasticsearch/src/test/java/org/apache/james/mailbox/elasticsearch/events/ElasticSearchListeningMessageSearchIndexTest.java
+++ b/mailbox/elasticsearch/src/test/java/org/apache/james/mailbox/elasticsearch/events/ElasticSearchListeningMessageSearchIndexTest.java
@@ -106,7 +106,6 @@ public class ElasticSearchListeningMessageSearchIndexTest {
         verify(elasticSearchIndexer).index(eq(ELASTIC_SEARCH_ID), eq(EXPECTED_JSON_CONTENT));
     }
 
-    @SuppressWarnings("unchecked")
     @Test
     public void addShouldIndexEmailBodyWhenNotIndexableAttachment() throws Exception {
         //Given
@@ -136,7 +135,6 @@ public class ElasticSearchListeningMessageSearchIndexTest {
         return message;
     }
 
-    @SuppressWarnings("unchecked")
     @Test
     public void addShouldNotPropagateExceptionWhenExceptionOccurs() throws Exception {
         //Given

http://git-wip-us.apache.org/repos/asf/james-project/blob/12f9eb07/mailet/standard/src/test/java/org/apache/james/transport/mailets/AddFooterTest.java
----------------------------------------------------------------------
diff --git a/mailet/standard/src/test/java/org/apache/james/transport/mailets/AddFooterTest.java b/mailet/standard/src/test/java/org/apache/james/transport/mailets/AddFooterTest.java
index 2243686..29b960a 100644
--- a/mailet/standard/src/test/java/org/apache/james/transport/mailets/AddFooterTest.java
+++ b/mailet/standard/src/test/java/org/apache/james/transport/mailets/AddFooterTest.java
@@ -20,9 +20,6 @@
 package org.apache.james.transport.mailets;
 
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.assertj.core.api.Assertions.assertThatThrownBy;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
 
 import java.io.IOException;
 import java.util.List;
@@ -36,7 +33,6 @@ import org.apache.mailet.base.test.FakeMail;
 import org.apache.mailet.base.test.FakeMailetConfig;
 import org.apache.mailet.base.test.MailUtil;
 import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtensionContext;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.Arguments;

http://git-wip-us.apache.org/repos/asf/james-project/blob/12f9eb07/mailet/standard/src/test/java/org/apache/james/transport/mailets/RemoveMimeHeaderTest.java
----------------------------------------------------------------------
diff --git a/mailet/standard/src/test/java/org/apache/james/transport/mailets/RemoveMimeHeaderTest.java b/mailet/standard/src/test/java/org/apache/james/transport/mailets/RemoveMimeHeaderTest.java
index 7e97007..807b2df 100644
--- a/mailet/standard/src/test/java/org/apache/james/transport/mailets/RemoveMimeHeaderTest.java
+++ b/mailet/standard/src/test/java/org/apache/james/transport/mailets/RemoveMimeHeaderTest.java
@@ -133,7 +133,6 @@ class RemoveMimeHeaderTest {
         assertThatThrownBy(() -> mailet.init(mailetConfig)).isInstanceOf(MessagingException.class);
     }
 
-    @SuppressWarnings("unchecked")
     @Test
     void serviceShouldThrowWhenExceptionOccured() throws MessagingException {
         FakeMailetConfig mailetConfig = FakeMailetConfig.builder()

http://git-wip-us.apache.org/repos/asf/james-project/blob/12f9eb07/mpt/impl/imap-mailbox/cyrus/pom.xml
----------------------------------------------------------------------
diff --git a/mpt/impl/imap-mailbox/cyrus/pom.xml b/mpt/impl/imap-mailbox/cyrus/pom.xml
index a6d4385..ae65527 100644
--- a/mpt/impl/imap-mailbox/cyrus/pom.xml
+++ b/mpt/impl/imap-mailbox/cyrus/pom.xml
@@ -53,7 +53,7 @@
         <dependency>
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>
-            <version>20.0</version>
+            <version>20.0</version><!--$NO-MVN-MAN-VER$-->
         </dependency>
     </dependencies>
 </project>

http://git-wip-us.apache.org/repos/asf/james-project/blob/12f9eb07/protocols/imap/src/test/java/org/apache/james/imap/processor/SearchProcessorTest.java
----------------------------------------------------------------------
diff --git a/protocols/imap/src/test/java/org/apache/james/imap/processor/SearchProcessorTest.java b/protocols/imap/src/test/java/org/apache/james/imap/processor/SearchProcessorTest.java
index ccf2cb1..fd9be52 100644
--- a/protocols/imap/src/test/java/org/apache/james/imap/processor/SearchProcessorTest.java
+++ b/protocols/imap/src/test/java/org/apache/james/imap/processor/SearchProcessorTest.java
@@ -189,6 +189,7 @@ public class SearchProcessorTest {
         check(SearchKey.buildAll(), SearchQuery.all());
     }
 
+    @SuppressWarnings("unchecked")
     private void expectsGetSelectedMailbox() throws Exception {
         when(mailboxManager.getMailbox(mailboxPath, mailboxSession)).thenReturn(mailbox, mailbox);
         when(session.getSelected()).thenReturn(selectedMailbox);

http://git-wip-us.apache.org/repos/asf/james-project/blob/12f9eb07/server/container/guice/guice-common/src/test/java/org/apache/james/utils/RetryExecutorUtilTest.java
----------------------------------------------------------------------
diff --git a/server/container/guice/guice-common/src/test/java/org/apache/james/utils/RetryExecutorUtilTest.java b/server/container/guice/guice-common/src/test/java/org/apache/james/utils/RetryExecutorUtilTest.java
index 3f74e84..dac929e 100644
--- a/server/container/guice/guice-common/src/test/java/org/apache/james/utils/RetryExecutorUtilTest.java
+++ b/server/container/guice/guice-common/src/test/java/org/apache/james/utils/RetryExecutorUtilTest.java
@@ -58,7 +58,6 @@ public class RetryExecutorUtilTest {
     }
 
     @Test
-    @SuppressWarnings("unchecked")
     public void retryOnExceptionsAndExecuteShouldRethrowWhenScheduledServiceAlwaysThrowException() throws Exception {
         given(serviceMock.faultyService())
                 .willThrow(IllegalArgumentException.class)
@@ -74,7 +73,6 @@ public class RetryExecutorUtilTest {
     }
 
     @Test
-    @SuppressWarnings("unchecked")
     public void retryOnExceptionsAndExecuteShouldRetryWhenMatchExceptionAndSuccess() throws Exception {
         given(serviceMock.faultyService())
                 .willThrow(IllegalArgumentException.class)
@@ -87,7 +85,6 @@ public class RetryExecutorUtilTest {
     }
 
     @Test
-    @SuppressWarnings("unchecked")
     public void retryOnExceptionsAndExecuteShouldNotRetryWhenDoesNotMatchException() throws Exception {
         given(serviceMock.faultyService())
                 .willThrow(IllegalStateException.class)

http://git-wip-us.apache.org/repos/asf/james-project/blob/12f9eb07/server/container/guice/memory-guice/src/test/java/org/apache/james/MemoryJamesServerTest.java
----------------------------------------------------------------------
diff --git a/server/container/guice/memory-guice/src/test/java/org/apache/james/MemoryJamesServerTest.java b/server/container/guice/memory-guice/src/test/java/org/apache/james/MemoryJamesServerTest.java
index 90e27bd..b8dfd4f 100644
--- a/server/container/guice/memory-guice/src/test/java/org/apache/james/MemoryJamesServerTest.java
+++ b/server/container/guice/memory-guice/src/test/java/org/apache/james/MemoryJamesServerTest.java
@@ -21,11 +21,8 @@ package org.apache.james;
 
 import java.io.IOException;
 
-import org.apache.james.domainlist.lib.DomainListConfiguration;
 import org.junit.Rule;
 
-import com.google.inject.Module;
-
 public class MemoryJamesServerTest extends AbstractJmapJamesServerTest {
     @Rule
     public MemoryJmapTestRule memoryJmap = new MemoryJmapTestRule();

http://git-wip-us.apache.org/repos/asf/james-project/blob/12f9eb07/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/remote/delivery/Repeat.java
----------------------------------------------------------------------
diff --git a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/remote/delivery/Repeat.java b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/remote/delivery/Repeat.java
index 6926c2d..75e7d4f 100644
--- a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/remote/delivery/Repeat.java
+++ b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/remote/delivery/Repeat.java
@@ -27,7 +27,6 @@ import com.google.common.collect.Iterables;
 
 public class Repeat {
 
-    @SuppressWarnings("unchecked")
     public static <T> List<T> repeat(T element, int times) {
         Preconditions.checkArgument(times >= 0, "Times argument should be strictly positive");
         return ImmutableList.copyOf(

http://git-wip-us.apache.org/repos/asf/james-project/blob/12f9eb07/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/DSNBounceTest.java
----------------------------------------------------------------------
diff --git a/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/DSNBounceTest.java b/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/DSNBounceTest.java
index 002c0d6..1d78553 100644
--- a/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/DSNBounceTest.java
+++ b/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/DSNBounceTest.java
@@ -26,7 +26,6 @@ import static org.mockito.Mockito.when;
 
 import java.net.InetAddress;
 import java.nio.charset.StandardCharsets;
-import java.text.DateFormat;
 import java.time.Instant;
 import java.util.Date;
 import java.util.List;

http://git-wip-us.apache.org/repos/asf/james-project/blob/12f9eb07/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/RecipientRewriteTableProcessorTest.java
----------------------------------------------------------------------
diff --git a/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/RecipientRewriteTableProcessorTest.java b/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/RecipientRewriteTableProcessorTest.java
index 448afeb..f0f36ae 100644
--- a/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/RecipientRewriteTableProcessorTest.java
+++ b/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/RecipientRewriteTableProcessorTest.java
@@ -77,7 +77,6 @@ public class RecipientRewriteTableProcessorTest {
         nonDomainWithDefaultLocal = new MailAddress(NONEDOMAIN + "@" + MailAddressFixture.JAMES_LOCAL);
     }
 
-    @SuppressWarnings("unchecked")
     @Test(expected = MessagingException.class)
     public void handleMappingsShouldThrowExceptionWhenMappingsContainAtLeastOneNoneDomainObjectButCannotGetDefaultDomain() throws Exception {
         when(domainList.getDefaultDomain()).thenThrow(DomainListException.class);
@@ -90,7 +89,6 @@ public class RecipientRewriteTableProcessorTest {
         processor.handleMappings(mappings, MailAddressFixture.ANY_AT_JAMES, MailAddressFixture.OTHER_AT_JAMES, message);
     }
 
-    @SuppressWarnings("unchecked")
     @Test
     public void handleMappingsShouldDoNotCareDefaultDomainWhenMappingsDoesNotContainAnyNoneDomainObject() throws Exception {
         when(domainList.getDefaultDomain()).thenThrow(DomainListException.class);
@@ -235,7 +233,6 @@ public class RecipientRewriteTableProcessorTest {
         assertThat(mail.getRecipients()).containsOnly(MailAddressFixture.ANY_AT_JAMES, MailAddressFixture.OTHER_AT_JAMES);
     }
     
-    @SuppressWarnings("unchecked")
     @Test
     public void processShouldSendMailToAllErrorRecipientsWhenErrorMappingException() throws Exception {
         when(virtualTableStore.getMappings(eq("other"), eq(Domain.of(MailAddressFixture.JAMES_LOCAL)))).thenThrow(ErrorMappingException.class);
@@ -260,7 +257,6 @@ public class RecipientRewriteTableProcessorTest {
         assertThat(mail.getRecipients()).containsOnly(MailAddressFixture.ANY_AT_LOCAL);
     }
     
-    @SuppressWarnings("unchecked")
     @Test
     public void processShouldSendMailToAllErrorRecipientsWhenRecipientRewriteTableException() throws Exception {
         when(virtualTableStore.getMappings(eq("other"), eq(Domain.of(MailAddressFixture.JAMES_LOCAL)))).thenThrow(RecipientRewriteTableException.class);

http://git-wip-us.apache.org/repos/asf/james-project/blob/12f9eb07/server/protocols/jmap/src/test/java/org/apache/james/jmap/methods/GetMailboxesMethodTest.java
----------------------------------------------------------------------
diff --git a/server/protocols/jmap/src/test/java/org/apache/james/jmap/methods/GetMailboxesMethodTest.java b/server/protocols/jmap/src/test/java/org/apache/james/jmap/methods/GetMailboxesMethodTest.java
index c09d18e..7abe7fb 100644
--- a/server/protocols/jmap/src/test/java/org/apache/james/jmap/methods/GetMailboxesMethodTest.java
+++ b/server/protocols/jmap/src/test/java/org/apache/james/jmap/methods/GetMailboxesMethodTest.java
@@ -126,6 +126,7 @@ public class GetMailboxesMethodTest {
     }
 
     @Test
+    @SuppressWarnings("unchecked")
     public void getMailboxesShouldReturnMailboxesWhenAvailable() throws Exception {
         MailboxPath mailboxPath = MailboxPath.forUser(USERNAME, "name");
         MailboxSession mailboxSession = mailboxManager.createSystemSession(USERNAME);
@@ -156,6 +157,7 @@ public class GetMailboxesMethodTest {
     }
 
     @Test
+    @SuppressWarnings("unchecked")
     public void getMailboxesShouldReturnOnlyMailboxesOfCurrentUserWhenAvailable() throws Exception {
         MailboxPath mailboxPathToReturn = MailboxPath.forUser(USERNAME, "mailboxToReturn");
         MailboxPath mailboxPathtoSkip = MailboxPath.forUser(USERNAME2, "mailboxToSkip");
@@ -243,6 +245,7 @@ public class GetMailboxesMethodTest {
     }
 
     @Test
+    @SuppressWarnings("unchecked")
     public void getMailboxesShouldReturnMailboxesWithSortOrder() throws Exception {
         MailboxSession mailboxSession = mailboxManager.createSystemSession(USERNAME);
         mailboxManager.createMailbox(MailboxPath.forUser(USERNAME, "INBOX"), mailboxSession);
@@ -278,6 +281,7 @@ public class GetMailboxesMethodTest {
     }
 
     @Test
+    @SuppressWarnings("unchecked")
     public void getMailboxesShouldReturnEmptyMailboxByDefault() throws MailboxException {
         MailboxPath mailboxPath = MailboxPath.forUser(USERNAME, "name");
         MailboxSession mailboxSession = mailboxManager.createSystemSession(USERNAME);
@@ -368,6 +372,7 @@ public class GetMailboxesMethodTest {
     }
 
     @Test
+    @SuppressWarnings("unchecked")
     public void getMailboxesShouldReturnMailboxesWithRoles() throws Exception {
         MailboxSession mailboxSession = mailboxManager.createSystemSession(USERNAME);
         mailboxManager.createMailbox(MailboxPath.forUser(USERNAME, "INBOX"), mailboxSession);

http://git-wip-us.apache.org/repos/asf/james-project/blob/12f9eb07/server/protocols/jmap/src/test/java/org/apache/james/jmap/methods/GetMessagesMethodTest.java
----------------------------------------------------------------------
diff --git a/server/protocols/jmap/src/test/java/org/apache/james/jmap/methods/GetMessagesMethodTest.java b/server/protocols/jmap/src/test/java/org/apache/james/jmap/methods/GetMessagesMethodTest.java
index 3973ed5..6fcac84 100644
--- a/server/protocols/jmap/src/test/java/org/apache/james/jmap/methods/GetMessagesMethodTest.java
+++ b/server/protocols/jmap/src/test/java/org/apache/james/jmap/methods/GetMessagesMethodTest.java
@@ -190,6 +190,7 @@ public class GetMessagesMethodTest {
     }
     
     @Test
+    @SuppressWarnings("unchecked")
     public void processShouldFetchMessages() throws Exception {
         MessageManager inbox = mailboxManager.getMailbox(inboxPath, session);
         ComposedMessageId message1 = inbox.appendMessage(AppendCommand.from(messageContent1), session);
@@ -217,6 +218,7 @@ public class GetMessagesMethodTest {
     }
     
     @Test
+    @SuppressWarnings("unchecked")
     public void processShouldFetchHtmlMessage() throws Exception {
         MessageManager inbox = mailboxManager.getMailbox(inboxPath, session);
         ComposedMessageId message = inbox.appendMessage(
@@ -314,6 +316,7 @@ public class GetMessagesMethodTest {
     }
 
     @Test
+    @SuppressWarnings("unchecked")
     public void processShouldReturnTextBodyWhenEmptyTextBodyAndNotEmptyHtmlBody() throws Exception {
         MessageManager inbox = mailboxManager.getMailbox(inboxPath, session);
 
@@ -340,6 +343,7 @@ public class GetMessagesMethodTest {
     }
 
     @Test
+    @SuppressWarnings("unchecked")
     public void processShouldReturnEmptyTextBodyAndHtmlBodyWhenThoseAreEmpty() throws Exception {
         MessageManager inbox = mailboxManager.getMailbox(inboxPath, session);
 
@@ -365,6 +369,7 @@ public class GetMessagesMethodTest {
     }
 
     @Test
+    @SuppressWarnings("unchecked")
     public void processShouldNotOverrideTextBodyWhenItIsThere() throws Exception {
         MessageManager inbox = mailboxManager.getMailbox(inboxPath, session);
 

http://git-wip-us.apache.org/repos/asf/james-project/blob/12f9eb07/server/protocols/jmap/src/test/java/org/apache/james/jmap/methods/JmapResponseWriterImplTest.java
----------------------------------------------------------------------
diff --git a/server/protocols/jmap/src/test/java/org/apache/james/jmap/methods/JmapResponseWriterImplTest.java b/server/protocols/jmap/src/test/java/org/apache/james/jmap/methods/JmapResponseWriterImplTest.java
index a91df15..4d12608 100644
--- a/server/protocols/jmap/src/test/java/org/apache/james/jmap/methods/JmapResponseWriterImplTest.java
+++ b/server/protocols/jmap/src/test/java/org/apache/james/jmap/methods/JmapResponseWriterImplTest.java
@@ -158,6 +158,7 @@ public class JmapResponseWriterImplTest {
     }
 
     @Test
+    @SuppressWarnings("unchecked")
     public void formatMethodResponseShouldFilterRightFieldsForEachResponse() {
         ObjectResponseClass responseClass = new ObjectResponseClass();
         responseClass.list = ImmutableList.of(new ObjectResponseClass.Foo("id", "name"));

http://git-wip-us.apache.org/repos/asf/james-project/blob/12f9eb07/server/protocols/jmap/src/test/java/org/apache/james/jmap/send/PostDequeueDecoratorTest.java
----------------------------------------------------------------------
diff --git a/server/protocols/jmap/src/test/java/org/apache/james/jmap/send/PostDequeueDecoratorTest.java b/server/protocols/jmap/src/test/java/org/apache/james/jmap/send/PostDequeueDecoratorTest.java
index 844ba85..9bdec79 100644
--- a/server/protocols/jmap/src/test/java/org/apache/james/jmap/send/PostDequeueDecoratorTest.java
+++ b/server/protocols/jmap/src/test/java/org/apache/james/jmap/send/PostDequeueDecoratorTest.java
@@ -273,7 +273,6 @@ public class PostDequeueDecoratorTest {
         verifyNoMoreInteractions(messageIdManager);
     }
 
-    @SuppressWarnings("unchecked")
     @Test(expected = MailQueue.MailQueueException.class)
     public void doneShouldThrowWhenMailboxException() throws Exception {
         MessageIdManager messageIdManager = mock(MessageIdManager.class);

http://git-wip-us.apache.org/repos/asf/james-project/blob/12f9eb07/server/protocols/jmap/src/test/java/org/apache/james/jmap/utils/SystemMailboxesProviderImplTest.java
----------------------------------------------------------------------
diff --git a/server/protocols/jmap/src/test/java/org/apache/james/jmap/utils/SystemMailboxesProviderImplTest.java b/server/protocols/jmap/src/test/java/org/apache/james/jmap/utils/SystemMailboxesProviderImplTest.java
index 1427ed2..04dbaa0 100644
--- a/server/protocols/jmap/src/test/java/org/apache/james/jmap/utils/SystemMailboxesProviderImplTest.java
+++ b/server/protocols/jmap/src/test/java/org/apache/james/jmap/utils/SystemMailboxesProviderImplTest.java
@@ -57,7 +57,6 @@ public class SystemMailboxesProviderImplTest {
     }
 
     @Test
-    @SuppressWarnings("unchecked")
     public void getMailboxByRoleShouldReturnEmptyWhenNoMailbox() throws Exception {
         when(mailboxManager.getMailbox(eq(MailboxFixture.INBOX_ALICE), eq(mailboxSession))).thenThrow(MailboxNotFoundException.class);
 

http://git-wip-us.apache.org/repos/asf/james-project/blob/12f9eb07/server/queue/queue-api/src/test/java/org/apache/james/queue/api/ManageableMailQueueContract.java
----------------------------------------------------------------------
diff --git a/server/queue/queue-api/src/test/java/org/apache/james/queue/api/ManageableMailQueueContract.java b/server/queue/queue-api/src/test/java/org/apache/james/queue/api/ManageableMailQueueContract.java
index 53c4a4e..2877efe 100644
--- a/server/queue/queue-api/src/test/java/org/apache/james/queue/api/ManageableMailQueueContract.java
+++ b/server/queue/queue-api/src/test/java/org/apache/james/queue/api/ManageableMailQueueContract.java
@@ -150,7 +150,7 @@ public interface ManageableMailQueueContract extends MailQueueContract {
             .name("name3")
             .build());
 
-        ManageableMailQueue.MailQueueIterator items = getManageableMailQueue().browse();
+        getManageableMailQueue().browse();
 
         assertThatCode(() -> getManageableMailQueue().deQueue()).doesNotThrowAnyException();
 
@@ -188,7 +188,7 @@ public interface ManageableMailQueueContract extends MailQueueContract {
             .build());
 
         ManageableMailQueue.MailQueueIterator items = getManageableMailQueue().browse();
-        ManageableMailQueue.MailQueueItemView firstItem = items.next();
+        items.next();
 
         assertThatCode(() -> getManageableMailQueue().deQueue()).doesNotThrowAnyException();
 
@@ -207,7 +207,7 @@ public interface ManageableMailQueueContract extends MailQueueContract {
             .build());
 
         ManageableMailQueue.MailQueueIterator items = getManageableMailQueue().browse();
-        ManageableMailQueue.MailQueueItemView firstItem = items.next();
+        items.next();
 
         getManageableMailQueue().deQueue();
 
@@ -226,7 +226,7 @@ public interface ManageableMailQueueContract extends MailQueueContract {
             .name("name3")
             .build());
 
-        ManageableMailQueue.MailQueueIterator items = getManageableMailQueue().browse();
+        getManageableMailQueue().browse();
 
         assertThatCode(() -> getManageableMailQueue().enQueue(defaultMail()
             .name("name4")
@@ -268,7 +268,7 @@ public interface ManageableMailQueueContract extends MailQueueContract {
             .build());
 
         ManageableMailQueue.MailQueueIterator items = getManageableMailQueue().browse();
-        ManageableMailQueue.MailQueueItemView firstItem = items.next();
+        items.next();
 
         assertThatCode(() ->
             getManageableMailQueue().enQueue(defaultMail()
@@ -291,7 +291,7 @@ public interface ManageableMailQueueContract extends MailQueueContract {
             .build());
 
         ManageableMailQueue.MailQueueIterator items = getManageableMailQueue().browse();
-        ManageableMailQueue.MailQueueItemView firstItem = items.next();
+        items.next();
 
         getManageableMailQueue().enQueue(defaultMail()
             .name("name2")
@@ -313,7 +313,7 @@ public interface ManageableMailQueueContract extends MailQueueContract {
             .build());
 
         ManageableMailQueue.MailQueueIterator items = getManageableMailQueue().browse();
-        ManageableMailQueue.MailQueueItemView firstItem = items.next();
+        items.next();
 
         assertThatCode(() -> getManageableMailQueue().clear())
             .doesNotThrowAnyException();
@@ -333,7 +333,7 @@ public interface ManageableMailQueueContract extends MailQueueContract {
             .build());
 
         ManageableMailQueue.MailQueueIterator items = getManageableMailQueue().browse();
-        ManageableMailQueue.MailQueueItemView firstItem = items.next();
+        items.next();
 
         getManageableMailQueue().clear();
 
@@ -353,7 +353,7 @@ public interface ManageableMailQueueContract extends MailQueueContract {
             .build());
 
         ManageableMailQueue.MailQueueIterator items = getManageableMailQueue().browse();
-        ManageableMailQueue.MailQueueItemView firstItem = items.next();
+        items.next();
 
         assertThatCode(() -> getManageableMailQueue().flush())
             .doesNotThrowAnyException();
@@ -373,7 +373,7 @@ public interface ManageableMailQueueContract extends MailQueueContract {
             .build());
 
         ManageableMailQueue.MailQueueIterator items = getManageableMailQueue().browse();
-        ManageableMailQueue.MailQueueItemView firstItem = items.next();
+        items.next();
 
         getManageableMailQueue().flush();
 
@@ -393,7 +393,7 @@ public interface ManageableMailQueueContract extends MailQueueContract {
             .build());
 
         ManageableMailQueue.MailQueueIterator items = getManageableMailQueue().browse();
-        ManageableMailQueue.MailQueueItemView firstItem = items.next();
+        items.next();
 
         assertThatCode(() -> getManageableMailQueue().flush())
             .doesNotThrowAnyException();
@@ -413,7 +413,7 @@ public interface ManageableMailQueueContract extends MailQueueContract {
             .build());
 
         ManageableMailQueue.MailQueueIterator items = getManageableMailQueue().browse();
-        ManageableMailQueue.MailQueueItemView firstItem = items.next();
+        items.next();
 
         getManageableMailQueue().remove(ManageableMailQueue.Type.Name, "name2");
 


---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org


[5/5] james-project git commit: JAMES-2468 Don't update quota when deleting empty mailboxes

Posted by bt...@apache.org.
JAMES-2468 Don't update quota when deleting empty mailboxes

This triggers an error while updating quota


Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/0a8e0a9d
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/0a8e0a9d
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/0a8e0a9d

Branch: refs/heads/master
Commit: 0a8e0a9dd2407430c7e1781c74bb424e2754fcca
Parents: f72d73d
Author: Benoit Tellier <bt...@linagora.com>
Authored: Wed Aug 15 16:15:06 2018 +0700
Committer: Benoit Tellier <bt...@linagora.com>
Committed: Tue Aug 21 09:44:04 2018 +0700

----------------------------------------------------------------------
 .../store/quota/ListeningCurrentQuotaUpdater.java    |  5 ++++-
 .../quota/ListeningCurrentQuotaUpdaterTest.java      | 15 +++++++++++++++
 2 files changed, 19 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/james-project/blob/0a8e0a9d/mailbox/store/src/main/java/org/apache/james/mailbox/store/quota/ListeningCurrentQuotaUpdater.java
----------------------------------------------------------------------
diff --git a/mailbox/store/src/main/java/org/apache/james/mailbox/store/quota/ListeningCurrentQuotaUpdater.java b/mailbox/store/src/main/java/org/apache/james/mailbox/store/quota/ListeningCurrentQuotaUpdater.java
index a6c8308..86d67c3 100644
--- a/mailbox/store/src/main/java/org/apache/james/mailbox/store/quota/ListeningCurrentQuotaUpdater.java
+++ b/mailbox/store/src/main/java/org/apache/james/mailbox/store/quota/ListeningCurrentQuotaUpdater.java
@@ -111,9 +111,12 @@ public class ListeningCurrentQuotaUpdater implements MailboxListener, QuotaUpdat
     }
 
     private void handleMailboxDeletionEvent(MailboxDeletion mailboxDeletionEvent) throws MailboxException {
-        currentQuotaManager.decrease(mailboxDeletionEvent.getQuotaRoot(),
+        boolean mailboxContainedMessages = mailboxDeletionEvent.getDeletedMessageCount().asLong() > 0;
+        if (mailboxContainedMessages) {
+            currentQuotaManager.decrease(mailboxDeletionEvent.getQuotaRoot(),
                 mailboxDeletionEvent.getDeletedMessageCount().asLong(),
                 mailboxDeletionEvent.getTotalDeletedSize().asLong());
+        }
     }
 
 }
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/james-project/blob/0a8e0a9d/mailbox/store/src/test/java/org/apache/james/mailbox/store/quota/ListeningCurrentQuotaUpdaterTest.java
----------------------------------------------------------------------
diff --git a/mailbox/store/src/test/java/org/apache/james/mailbox/store/quota/ListeningCurrentQuotaUpdaterTest.java b/mailbox/store/src/test/java/org/apache/james/mailbox/store/quota/ListeningCurrentQuotaUpdaterTest.java
index f2f2385..2c5de61 100644
--- a/mailbox/store/src/test/java/org/apache/james/mailbox/store/quota/ListeningCurrentQuotaUpdaterTest.java
+++ b/mailbox/store/src/test/java/org/apache/james/mailbox/store/quota/ListeningCurrentQuotaUpdaterTest.java
@@ -22,6 +22,7 @@ package org.apache.james.mailbox.store.quota;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.never;
 import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.verifyZeroInteractions;
 import static org.mockito.Mockito.when;
 
 import java.util.Date;
@@ -118,4 +119,18 @@ public class ListeningCurrentQuotaUpdaterTest {
         testee.event(deletion);
         verify(mockedCurrentQuotaManager).decrease(QUOTA_ROOT, 10, 5);
     }
+
+    @Test
+    public void mailboxDeletionEventShouldDoNothingWhenEmptyMailbox() throws Exception {
+        MailboxListener.MailboxDeletion deletion = mock(MailboxListener.MailboxDeletion.class);
+        when(deletion.getMailboxPath()).thenReturn(MAILBOX_PATH);
+        when(deletion.getQuotaRoot()).thenReturn(QUOTA_ROOT);
+        when(deletion.getDeletedMessageCount()).thenReturn(QuotaCount.count(0));
+        when(deletion.getTotalDeletedSize()).thenReturn(QuotaSize.size(0));
+        when(mockedQuotaRootResolver.getQuotaRoot(MAILBOX_PATH)).thenReturn(QUOTA_ROOT);
+
+        testee.event(deletion);
+
+        verifyZeroInteractions(mockedCurrentQuotaManager);
+    }
 }


---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org


[3/5] james-project git commit: JAMES-2426 Update commons-compress to 1.18

Posted by bt...@apache.org.
JAMES-2426 Update commons-compress to 1.18

This fixes CVE-2018-11771 which reported a denial of service.

>From CVE announcement:

When reading a specially crafted ZIP archive, the read method of
ZipArchiveInputStream can fail to return the correct EOF indication
after the end of the stream has been reached.  When combined with a
java.io.InputStreamReader this can lead to an infinite stream, which
can be used to mount a denial of service attack against services that
use Compress' zip package.


Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/82c630b5
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/82c630b5
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/82c630b5

Branch: refs/heads/master
Commit: 82c630b5ec633d5720861790b5616f77ba844b0e
Parents: bec7e45
Author: Benoit Tellier <bt...@linagora.com>
Authored: Fri Aug 17 10:54:06 2018 +0700
Committer: Benoit Tellier <bt...@linagora.com>
Committed: Tue Aug 21 09:42:39 2018 +0700

----------------------------------------------------------------------
 mailbox/backup/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/james-project/blob/82c630b5/mailbox/backup/pom.xml
----------------------------------------------------------------------
diff --git a/mailbox/backup/pom.xml b/mailbox/backup/pom.xml
index 7118ae5..82cc587 100644
--- a/mailbox/backup/pom.xml
+++ b/mailbox/backup/pom.xml
@@ -63,7 +63,7 @@
         <dependency>
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-compress</artifactId>
-            <version>1.17</version>
+            <version>1.18</version>
         </dependency>
         <dependency>
             <groupId>org.assertj</groupId>


---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org


[4/5] james-project git commit: JAMES-2514 Improve configuration handling for guice Cassandra

Posted by bt...@apache.org.
JAMES-2514 Improve configuration handling for guice Cassandra

 - A property file was crafted as a default. Using builder is cleaner.
 - The warning 'default to 127.0.0.1:9042' was issued twice

 Furthermore, tests were providing a ClusterConfiguration without a CassandraConfiguration.
 The warning was issued even if not applicable...


Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/f72d73da
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/f72d73da
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/f72d73da

Branch: refs/heads/master
Commit: f72d73da0f5773a0431e4d73120f8b4bb232dcf7
Parents: 82c630b
Author: Benoit Tellier <bt...@linagora.com>
Authored: Mon Aug 13 11:39:23 2018 +0700
Committer: Benoit Tellier <bt...@linagora.com>
Committed: Tue Aug 21 09:44:04 2018 +0700

----------------------------------------------------------------------
 .../modules/mailbox/CassandraSessionModule.java | 24 +++++++++++---------
 1 file changed, 13 insertions(+), 11 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/james-project/blob/f72d73da/server/container/guice/cassandra-guice/src/main/java/org/apache/james/modules/mailbox/CassandraSessionModule.java
----------------------------------------------------------------------
diff --git a/server/container/guice/cassandra-guice/src/main/java/org/apache/james/modules/mailbox/CassandraSessionModule.java b/server/container/guice/cassandra-guice/src/main/java/org/apache/james/modules/mailbox/CassandraSessionModule.java
index b018bdb..50ec323 100644
--- a/server/container/guice/cassandra-guice/src/main/java/org/apache/james/modules/mailbox/CassandraSessionModule.java
+++ b/server/container/guice/cassandra-guice/src/main/java/org/apache/james/modules/mailbox/CassandraSessionModule.java
@@ -38,6 +38,7 @@ import org.apache.james.backends.cassandra.versions.CassandraSchemaVersionModule
 import org.apache.james.lifecycle.api.Configurable;
 import org.apache.james.mailbox.store.BatchSizes;
 import org.apache.james.server.CassandraProbe;
+import org.apache.james.util.Host;
 import org.apache.james.utils.ConfigurationPerformer;
 import org.apache.james.utils.GuiceProbe;
 import org.apache.james.utils.PropertiesProvider;
@@ -62,7 +63,8 @@ public class CassandraSessionModule extends AbstractModule {
 
     private static final String LOCALHOST = "127.0.0.1";
     private static final String BATCHSIZES_FILE_NAME = "batchsizes";
-    private static final String CASSANDRA_NODES = "cassandra.nodes";
+    private static final String CASSANDRA_FILE_NAME = "cassandra";
+    private static final int CASSANDRA_PORT = 9042;
 
     @Override
     protected void configure() {
@@ -120,23 +122,23 @@ public class CassandraSessionModule extends AbstractModule {
     @Provides
     @Singleton
     CassandraConfiguration provideCassandraConfiguration(PropertiesProvider propertiesProvider) throws ConfigurationException {
-        return CassandraConfiguration.from(getConfiguration(propertiesProvider));
+        try {
+            return CassandraConfiguration.from(propertiesProvider.getConfiguration(CASSANDRA_FILE_NAME));
+        } catch (FileNotFoundException e) {
+            return CassandraConfiguration.DEFAULT_CONFIGURATION;
+        }
     }
 
     @Provides
     @Singleton
     ClusterConfiguration provideClusterConfiguration(PropertiesProvider propertiesProvider) throws ConfigurationException {
-        return ClusterConfiguration.from(getConfiguration(propertiesProvider));
-    }
-
-    private PropertiesConfiguration getConfiguration(PropertiesProvider propertiesProvider) throws ConfigurationException {
         try {
-            return propertiesProvider.getConfiguration("cassandra");
+            return ClusterConfiguration.from(propertiesProvider.getConfiguration(CASSANDRA_FILE_NAME));
         } catch (FileNotFoundException e) {
-            LOGGER.warn("Could not locate cassandra configuration file. Defaulting to node " + LOCALHOST + ":9042");
-            PropertiesConfiguration propertiesConfiguration = new PropertiesConfiguration();
-            propertiesConfiguration.addProperty(CASSANDRA_NODES, LOCALHOST);
-            return propertiesConfiguration;
+            LOGGER.warn("Could not locate cassandra configuration file. Defaulting to node " + LOCALHOST + ":" + CASSANDRA_PORT);
+            return ClusterConfiguration.builder()
+                .host(Host.from(LOCALHOST, CASSANDRA_PORT))
+                .build();
         }
     }
 


---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org


[2/5] james-project git commit: JAMES-2514 DateTieredCompactionStrategy is deprecated in Cassandra 3.0.8/3.8 and later

Posted by bt...@apache.org.
JAMES-2514 DateTieredCompactionStrategy is deprecated in Cassandra 3.0.8/3.8 and later

See https://docs.datastax.com/en/cassandra/3.0/cassandra/operations/opsConfigureCompaction.html


Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/bec7e458
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/bec7e458
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/bec7e458

Branch: refs/heads/master
Commit: bec7e458aa0ee9d7f8b1486294597eea48a7ab77
Parents: 12f9eb0
Author: Benoit Tellier <bt...@linagora.com>
Authored: Thu Aug 16 09:24:23 2018 +0700
Committer: Benoit Tellier <bt...@linagora.com>
Committed: Tue Aug 21 09:42:21 2018 +0700

----------------------------------------------------------------------
 .../mailbox/cassandra/modules/CassandraRegistrationModule.java     | 2 +-
 .../cassandra/vacation/CassandraNotificationRegistryModule.java    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/james-project/blob/bec7e458/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/modules/CassandraRegistrationModule.java
----------------------------------------------------------------------
diff --git a/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/modules/CassandraRegistrationModule.java b/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/modules/CassandraRegistrationModule.java
index 2f39dfb..8384890 100644
--- a/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/modules/CassandraRegistrationModule.java
+++ b/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/modules/CassandraRegistrationModule.java
@@ -36,7 +36,7 @@ public interface CassandraRegistrationModule {
         .table(CassandraMailboxPathRegisterTable.TABLE_NAME)
         .comment("Holds node mailboxPath registration for distributed events")
         .options(options -> options
-            .compactionOptions(SchemaBuilder.dateTieredStrategy()))
+            .compactionOptions(SchemaBuilder.timeWindowCompactionStrategy()))
         .statement(statement -> statement
             .addUDTPartitionKey(CassandraMailboxPathRegisterTable.MAILBOX_PATH, SchemaBuilder.frozen(CassandraMailboxPathRegisterTable.MAILBOX_PATH))
             .addClusteringColumn(CassandraMailboxPathRegisterTable.TOPIC, text()))

http://git-wip-us.apache.org/repos/asf/james-project/blob/bec7e458/server/data/data-jmap-cassandra/src/main/java/org/apache/james/jmap/cassandra/vacation/CassandraNotificationRegistryModule.java
----------------------------------------------------------------------
diff --git a/server/data/data-jmap-cassandra/src/main/java/org/apache/james/jmap/cassandra/vacation/CassandraNotificationRegistryModule.java b/server/data/data-jmap-cassandra/src/main/java/org/apache/james/jmap/cassandra/vacation/CassandraNotificationRegistryModule.java
index e73e0a1..9dde14e 100644
--- a/server/data/data-jmap-cassandra/src/main/java/org/apache/james/jmap/cassandra/vacation/CassandraNotificationRegistryModule.java
+++ b/server/data/data-jmap-cassandra/src/main/java/org/apache/james/jmap/cassandra/vacation/CassandraNotificationRegistryModule.java
@@ -31,7 +31,7 @@ public interface CassandraNotificationRegistryModule {
     CassandraModule MODULE = CassandraModule.table(CassandraNotificationTable.TABLE_NAME)
         .comment("Stores registry of vacation notification being sent.")
         .options(options -> options
-            .compactionOptions(SchemaBuilder.dateTieredStrategy())
+            .compactionOptions(SchemaBuilder.timeWindowCompactionStrategy())
             .caching(SchemaBuilder.KeyCaching.ALL,
                 SchemaBuilder.rows(CassandraConstants.DEFAULT_CACHED_ROW_PER_PARTITION)))
         .statement(statement -> statement


---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org