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 ro...@apache.org on 2019/03/25 15:25:50 UTC
[james-project] branch master updated: Fix Eclipse and checkstyle
warnings
This is an automated email from the ASF dual-hosted git repository.
rouazana pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/james-project.git
The following commit(s) were added to refs/heads/master by this push:
new c2ace25 Fix Eclipse and checkstyle warnings
c2ace25 is described below
commit c2ace25aa12dc3749ab4e6579555287632b8d171
Author: Raphael Ouazana <ra...@linagora.com>
AuthorDate: Thu Mar 21 17:50:18 2019 +0100
Fix Eclipse and checkstyle warnings
---
.../james/backend/rabbitmq/RabbitMQExtension.java | 1 -
.../mailbox/manager/ManagerTestProvisionner.java | 4 +-
.../apache/james/mailbox/backup/ZipAssertTest.java | 3 +-
.../CassandraMailboxManagerStressTest.java | 1 -
.../cassandra/CassandraTestSystemFixture.java | 3 -
.../maildir/MaildirMailboxManagerProvider.java | 1 -
.../inmemory/InMemoryMessageManagerTestSystem.java | 17 ----
.../java/org/apache/james/vault/search/Query.java | 8 +-
.../vault/DeletedMessageVaultSearchContract.java | 96 +++++++++++-----------
.../mailbox/store/StoreMailboxManagerTest.java | 1 -
.../store/mail/model/MessageMapperTest.java | 2 -
.../java/org/apache/mailet/AttributeValue.java | 4 +-
.../maildir/host/MaildirHostSystem.java | 1 -
.../org/apache/james/server/core/MailImpl.java | 2 +
.../ObjectStorageBlobConfigurationTest.java | 14 ----
.../swift/ObjectStorageBlobConfigurationTest.java | 6 --
.../java/org/apache/james/vault/MailConverter.java | 2 +
.../CassandraMailRepositoryMailDaoV2.java | 5 +-
.../integration/DeletedMessagesVaultTest.java | 2 +-
.../ReindexingWithEventDeadLettersTest.java | 6 +-
.../vault/routes/query/QueryTranslator.java | 12 +--
.../queue/activemq/ActiveMQMailQueueTest.java | 2 -
.../james/queue/api/DelayedMailQueueContract.java | 3 +-
.../apache/james/queue/api/MailQueueContract.java | 1 +
.../james/queue/api/MailQueueMetricContract.java | 2 -
.../james/queue/memory/MemoryMailQueueFactory.java | 2 -
26 files changed, 74 insertions(+), 127 deletions(-)
diff --git a/backends-common/rabbitmq/src/test/java/org/apache/james/backend/rabbitmq/RabbitMQExtension.java b/backends-common/rabbitmq/src/test/java/org/apache/james/backend/rabbitmq/RabbitMQExtension.java
index 37083b4..3c4f3a5 100644
--- a/backends-common/rabbitmq/src/test/java/org/apache/james/backend/rabbitmq/RabbitMQExtension.java
+++ b/backends-common/rabbitmq/src/test/java/org/apache/james/backend/rabbitmq/RabbitMQExtension.java
@@ -21,7 +21,6 @@ package org.apache.james.backend.rabbitmq;
import static org.apache.james.backend.rabbitmq.RabbitMQFixture.DEFAULT_MANAGEMENT_CREDENTIAL;
import java.net.URISyntaxException;
-import java.util.Collection;
import org.junit.jupiter.api.extension.AfterAllCallback;
import org.junit.jupiter.api.extension.AfterEachCallback;
diff --git a/mailbox/api/src/test/java/org/apache/james/mailbox/manager/ManagerTestProvisionner.java b/mailbox/api/src/test/java/org/apache/james/mailbox/manager/ManagerTestProvisionner.java
index 13e30a4..1d793bf 100644
--- a/mailbox/api/src/test/java/org/apache/james/mailbox/manager/ManagerTestProvisionner.java
+++ b/mailbox/api/src/test/java/org/apache/james/mailbox/manager/ManagerTestProvisionner.java
@@ -46,7 +46,7 @@ public class ManagerTestProvisionner {
public static final String OTHER_USER = "otherUser@domain.org";
public static final String OTHER_USER_PASS = "otherPass";
- private IntegrationResources integrationResources;
+ private IntegrationResources<?> integrationResources;
private MailboxPath inbox;
private MessageManager messageManager;
@@ -54,7 +54,7 @@ public class ManagerTestProvisionner {
private MailboxSession session;
- public ManagerTestProvisionner(IntegrationResources integrationResources) throws Exception {
+ public ManagerTestProvisionner(IntegrationResources<?> integrationResources) throws Exception {
this.integrationResources = integrationResources;
session = integrationResources.getMailboxManager().login(USER, USER_PASS);
diff --git a/mailbox/backup/src/test/java/org/apache/james/mailbox/backup/ZipAssertTest.java b/mailbox/backup/src/test/java/org/apache/james/mailbox/backup/ZipAssertTest.java
index 1cc03a8..4e391fa 100644
--- a/mailbox/backup/src/test/java/org/apache/james/mailbox/backup/ZipAssertTest.java
+++ b/mailbox/backup/src/test/java/org/apache/james/mailbox/backup/ZipAssertTest.java
@@ -61,7 +61,8 @@ public class ZipAssertTest {
ExtraFieldUtils.register(SizeExtraField.class);
}
- private void buildZipFile(SimpleImmutableEntry<String, byte[]>... entries) throws Exception {
+ @SafeVarargs
+ private final void buildZipFile(SimpleImmutableEntry<String, byte[]>... entries) throws Exception {
try (ZipArchiveOutputStream archiveOutputStream = new ZipArchiveOutputStream(destination)) {
for (SimpleImmutableEntry<String, byte[]> entry : entries) {
ZipArchiveEntry archiveEntry = (ZipArchiveEntry) archiveOutputStream.createArchiveEntry(new File("any"), entry.getKey());
diff --git a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/CassandraMailboxManagerStressTest.java b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/CassandraMailboxManagerStressTest.java
index fefc07a..360005d 100644
--- a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/CassandraMailboxManagerStressTest.java
+++ b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/CassandraMailboxManagerStressTest.java
@@ -24,7 +24,6 @@ import org.apache.james.backends.cassandra.DockerCassandraRule;
import org.apache.james.mailbox.MailboxManagerStressTest;
import org.apache.james.mailbox.cassandra.mail.MailboxAggregateModule;
import org.apache.james.mailbox.events.EventBus;
-import org.apache.james.mailbox.extension.PreDeletionHook;
import org.apache.james.mailbox.store.PreDeletionHooks;
import org.junit.After;
import org.junit.AfterClass;
diff --git a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/CassandraTestSystemFixture.java b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/CassandraTestSystemFixture.java
index 403d780..4b1c956 100644
--- a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/CassandraTestSystemFixture.java
+++ b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/CassandraTestSystemFixture.java
@@ -21,8 +21,6 @@ package org.apache.james.mailbox.cassandra;
import static org.mockito.Mockito.mock;
-import java.util.Set;
-
import org.apache.james.backends.cassandra.CassandraCluster;
import org.apache.james.mailbox.acl.SimpleGroupMembershipResolver;
import org.apache.james.mailbox.acl.UnionMailboxACLResolver;
@@ -35,7 +33,6 @@ import org.apache.james.mailbox.cassandra.quota.CassandraPerUserMaxQuotaManager;
import org.apache.james.mailbox.events.EventBus;
import org.apache.james.mailbox.events.InVMEventBus;
import org.apache.james.mailbox.events.delivery.InVmEventDelivery;
-import org.apache.james.mailbox.extension.PreDeletionHook;
import org.apache.james.mailbox.quota.CurrentQuotaManager;
import org.apache.james.mailbox.quota.MaxQuotaManager;
import org.apache.james.mailbox.quota.QuotaManager;
diff --git a/mailbox/maildir/src/test/java/org/apache/james/mailbox/maildir/MaildirMailboxManagerProvider.java b/mailbox/maildir/src/test/java/org/apache/james/mailbox/maildir/MaildirMailboxManagerProvider.java
index c63ae42..6e8a407 100644
--- a/mailbox/maildir/src/test/java/org/apache/james/mailbox/maildir/MaildirMailboxManagerProvider.java
+++ b/mailbox/maildir/src/test/java/org/apache/james/mailbox/maildir/MaildirMailboxManagerProvider.java
@@ -29,7 +29,6 @@ import org.apache.james.mailbox.acl.UnionMailboxACLResolver;
import org.apache.james.mailbox.events.InVMEventBus;
import org.apache.james.mailbox.events.delivery.InVmEventDelivery;
import org.apache.james.mailbox.exception.MailboxException;
-import org.apache.james.mailbox.extension.PreDeletionHook;
import org.apache.james.mailbox.store.Authenticator;
import org.apache.james.mailbox.store.Authorizator;
import org.apache.james.mailbox.store.JVMMailboxPathLocker;
diff --git a/mailbox/memory/src/test/java/org/apache/james/mailbox/inmemory/InMemoryMessageManagerTestSystem.java b/mailbox/memory/src/test/java/org/apache/james/mailbox/inmemory/InMemoryMessageManagerTestSystem.java
index 3aa9e19..d95f3f5 100644
--- a/mailbox/memory/src/test/java/org/apache/james/mailbox/inmemory/InMemoryMessageManagerTestSystem.java
+++ b/mailbox/memory/src/test/java/org/apache/james/mailbox/inmemory/InMemoryMessageManagerTestSystem.java
@@ -18,8 +18,6 @@
****************************************************************/
package org.apache.james.mailbox.inmemory;
-import java.io.IOException;
-import java.nio.charset.StandardCharsets;
import java.util.Optional;
import org.apache.james.mailbox.MailboxManager;
@@ -29,36 +27,21 @@ import org.apache.james.mailbox.exception.MailboxException;
import org.apache.james.mailbox.model.MailboxId;
import org.apache.james.mailbox.model.MailboxMetaData;
import org.apache.james.mailbox.model.MailboxPath;
-import org.apache.james.mailbox.model.MessageId;
import org.apache.james.mailbox.model.search.MailboxQuery;
import org.apache.james.mailbox.model.search.Wildcard;
import org.apache.james.mailbox.store.MessageManagerTestSystem;
import org.apache.james.mailbox.store.mail.model.Mailbox;
import org.apache.james.mailbox.store.mail.model.impl.SimpleMailbox;
-import org.apache.james.mime4j.dom.Message;
public class InMemoryMessageManagerTestSystem extends MessageManagerTestSystem {
- private static final MessageId FIRST_MESSAGE_ID = InMemoryMessageId.of(1);
- private static final long ONE_HUNDRED = 100;
private static final int UID_VALIDITY = 1024;
private final MailboxManager mailboxManager;
- private Optional<MessageId> lastMessageIdUsed;
- private final Message message;
public InMemoryMessageManagerTestSystem(MailboxManager mailboxManager) {
super(mailboxManager);
this.mailboxManager = mailboxManager;
- this.lastMessageIdUsed = Optional.empty();
- try {
- this.message = Message.Builder.of()
- .setSubject("test")
- .setBody("testmail", StandardCharsets.UTF_8)
- .build();
- } catch (IOException e) {
- throw new RuntimeException(e);
- }
}
@Override
diff --git a/mailbox/plugin/deleted-messages-vault/src/main/java/org/apache/james/vault/search/Query.java b/mailbox/plugin/deleted-messages-vault/src/main/java/org/apache/james/vault/search/Query.java
index 3092cb9..ecc9b6c 100644
--- a/mailbox/plugin/deleted-messages-vault/src/main/java/org/apache/james/vault/search/Query.java
+++ b/mailbox/plugin/deleted-messages-vault/src/main/java/org/apache/james/vault/search/Query.java
@@ -30,17 +30,17 @@ public class Query {
public static final Query ALL = new Query(ImmutableList.of());
private static final Predicate<DeletedMessage> MATCH_ALL = any -> true;
- public static Query and(List<Criterion> criteria) {
+ public static Query and(List<Criterion<?>> criteria) {
return new Query(criteria);
}
- public static Query of(Criterion... criteria) {
+ public static Query of(Criterion<?>... criteria) {
return new Query(ImmutableList.copyOf(criteria));
}
- private final List<Criterion> criteria;
+ private final List<Criterion<?>> criteria;
- private Query(List<Criterion> criteria) {
+ private Query(List<Criterion<?>> criteria) {
this.criteria = criteria;
}
diff --git a/mailbox/plugin/deleted-messages-vault/src/test/java/org/apache/james/vault/DeletedMessageVaultSearchContract.java b/mailbox/plugin/deleted-messages-vault/src/test/java/org/apache/james/vault/DeletedMessageVaultSearchContract.java
index f85effd..11822d7 100644
--- a/mailbox/plugin/deleted-messages-vault/src/test/java/org/apache/james/vault/DeletedMessageVaultSearchContract.java
+++ b/mailbox/plugin/deleted-messages-vault/src/test/java/org/apache/james/vault/DeletedMessageVaultSearchContract.java
@@ -67,7 +67,7 @@ public interface DeletedMessageVaultSearchContract {
@Test
default void shouldReturnMessagesWithDeliveryBeforeDateWhenBeforeOrEquals() {
DeletedMessage message1 = storeMessageWithDeliveryDate(DELIVERY_DATE);
- DeletedMessage message2 = storeMessageWithDeliveryDate(DELIVERY_DATE.plusMinutes(60));
+ storeMessageWithDeliveryDate(DELIVERY_DATE.plusMinutes(60));
assertThat(search(Query.of(CriterionFactory.deliveryDate().beforeOrEquals(DELIVERY_DATE.plusMinutes(30)))))
.containsOnly(message1);
@@ -76,7 +76,7 @@ public interface DeletedMessageVaultSearchContract {
@Test
default void shouldReturnMessagesWithDeliveryEqualDateWhenBeforeOrEquals() {
DeletedMessage message1 = storeMessageWithDeliveryDate(DELIVERY_DATE);
- DeletedMessage message2 = storeMessageWithDeliveryDate(DELIVERY_DATE.plusMinutes(60));
+ storeMessageWithDeliveryDate(DELIVERY_DATE.plusMinutes(60));
assertThat(search(Query.of(CriterionFactory.deliveryDate().beforeOrEquals(DELIVERY_DATE))))
.containsOnly(message1);
@@ -84,7 +84,7 @@ public interface DeletedMessageVaultSearchContract {
@Test
default void shouldReturnMessagesWithDeliveryAfterDateWhenAfterOrEquals() {
- DeletedMessage message1 = storeMessageWithDeliveryDate(DELIVERY_DATE);
+ storeMessageWithDeliveryDate(DELIVERY_DATE);
DeletedMessage message2 = storeMessageWithDeliveryDate(DELIVERY_DATE.plusMinutes(60));
assertThat(search(Query.of(CriterionFactory.deliveryDate().afterOrEquals(DELIVERY_DATE.plusMinutes(30)))))
@@ -93,7 +93,7 @@ public interface DeletedMessageVaultSearchContract {
@Test
default void shouldReturnMessagesWithDeliveryEqualDateWhenAfterOrEquals() {
- DeletedMessage message1 = storeMessageWithDeliveryDate(DELIVERY_DATE);
+ storeMessageWithDeliveryDate(DELIVERY_DATE);
DeletedMessage message2 = storeMessageWithDeliveryDate(DELIVERY_DATE.plusMinutes(60));
assertThat(search(Query.of(CriterionFactory.deliveryDate().afterOrEquals(DELIVERY_DATE.plusMinutes(60)))))
@@ -106,7 +106,7 @@ public interface DeletedMessageVaultSearchContract {
@Test
default void shouldReturnMessagesWithDeletionBeforeDateWhenBeforeOrEquals() {
DeletedMessage message1 = storeMessageWithDeletionDate(DELIVERY_DATE);
- DeletedMessage message2 = storeMessageWithDeletionDate(DELIVERY_DATE.plusMinutes(60));
+ storeMessageWithDeletionDate(DELIVERY_DATE.plusMinutes(60));
assertThat(search(Query.of(CriterionFactory.deletionDate().beforeOrEquals(DELIVERY_DATE.plusMinutes(30)))))
.containsOnly(message1);
@@ -115,7 +115,7 @@ public interface DeletedMessageVaultSearchContract {
@Test
default void shouldReturnMessagesWithDeletionEqualDateWhenBeforeOrEquals() {
DeletedMessage message1 = storeMessageWithDeletionDate(DELIVERY_DATE);
- DeletedMessage message2 = storeMessageWithDeletionDate(DELIVERY_DATE.plusMinutes(60));
+ storeMessageWithDeletionDate(DELIVERY_DATE.plusMinutes(60));
assertThat(search(Query.of(CriterionFactory.deletionDate().beforeOrEquals(DELIVERY_DATE))))
.containsOnly(message1);
@@ -123,7 +123,7 @@ public interface DeletedMessageVaultSearchContract {
@Test
default void shouldReturnMessagesWithDeletionAfterDateWhenAfterOrEquals() {
- DeletedMessage message1 = storeMessageWithDeletionDate(DELIVERY_DATE);
+ storeMessageWithDeletionDate(DELIVERY_DATE);
DeletedMessage message2 = storeMessageWithDeletionDate(DELIVERY_DATE.plusMinutes(60));
assertThat(search(Query.of(CriterionFactory.deletionDate().afterOrEquals(DELIVERY_DATE.plusMinutes(30)))))
@@ -132,7 +132,7 @@ public interface DeletedMessageVaultSearchContract {
@Test
default void shouldReturnMessagesWithDeletionEqualDateWhenAfterOrEquals() {
- DeletedMessage message1 = storeMessageWithDeletionDate(DELIVERY_DATE);
+ storeMessageWithDeletionDate(DELIVERY_DATE);
DeletedMessage message2 = storeMessageWithDeletionDate(DELIVERY_DATE.plusMinutes(60));
assertThat(search(Query.of(CriterionFactory.deletionDate().afterOrEquals(DELIVERY_DATE.plusMinutes(60)))))
@@ -146,7 +146,7 @@ public interface DeletedMessageVaultSearchContract {
default void shouldReturnMessagesWithRecipientWhenContains() {
DeletedMessage message1 = storeMessageWithRecipients(RECIPIENT1, RECIPIENT2);
DeletedMessage message2 = storeMessageWithRecipients(RECIPIENT1);
- DeletedMessage message3 = storeMessageWithRecipients(RECIPIENT3);
+ storeMessageWithRecipients(RECIPIENT3);
assertThat(search(Query.of(CriterionFactory.containsRecipient(RECIPIENT1))))
.containsOnly(message1, message2);
@@ -169,7 +169,7 @@ public interface DeletedMessageVaultSearchContract {
@Test
default void shouldReturnMessagesWithSenderWhenEquals() {
DeletedMessage message1 = storeMessageWithSender(MaybeSender.of(SENDER));
- DeletedMessage message2 = storeMessageWithSender(MaybeSender.of(SENDER2));
+ storeMessageWithSender(MaybeSender.of(SENDER2));
assertThat(search(Query.of(CriterionFactory.hasSender(SENDER))))
.containsOnly(message1);
@@ -202,7 +202,7 @@ public interface DeletedMessageVaultSearchContract {
@Test
default void shouldReturnMessagesWithAttachmentWhenHasAttachment() {
DeletedMessage message1 = storeMessageWithHasAttachment(true);
- DeletedMessage message2 = storeMessageWithHasAttachment(false);
+ storeMessageWithHasAttachment(false);
DeletedMessage message3 = storeMessageWithHasAttachment(true);
assertThat(search(Query.of(CriterionFactory.hasAttachment())))
@@ -213,7 +213,7 @@ public interface DeletedMessageVaultSearchContract {
default void shouldReturnMessagesWithOutAttachmentWhenHasNoAttachement() {
DeletedMessage message1 = storeMessageWithHasAttachment(false);
DeletedMessage message2 = storeMessageWithHasAttachment(false);
- DeletedMessage message3 = storeMessageWithHasAttachment(true);
+ storeMessageWithHasAttachment(true);
assertThat(search(Query.of(CriterionFactory.hasNoAttachment())))
.containsOnly(message1, message2);
@@ -226,7 +226,7 @@ public interface DeletedMessageVaultSearchContract {
default void shouldReturnMessagesWithOriginMailboxesWhenContains() {
DeletedMessage message1 = storeMessageWithOriginMailboxes(MAILBOX_ID_1, MAILBOX_ID_2);
DeletedMessage message2 = storeMessageWithOriginMailboxes(MAILBOX_ID_1);
- DeletedMessage message3 = storeMessageWithOriginMailboxes(MAILBOX_ID_3);
+ storeMessageWithOriginMailboxes(MAILBOX_ID_3);
assertThat(search(Query.of(CriterionFactory.containsOriginMailbox(MAILBOX_ID_1))))
.containsOnly(message1, message2);
@@ -252,7 +252,7 @@ public interface DeletedMessageVaultSearchContract {
@Test
default void shouldReturnMessagesContainsAtTheMiddle() {
DeletedMessage message1 = storeMessageWithSubject(APACHE_JAMES_PROJECT);
- DeletedMessage message2 = storeMessageWithSubject(OPEN_SOURCE_SOFTWARE);
+ storeMessageWithSubject(OPEN_SOURCE_SOFTWARE);
assertThat(search(Query.of(CriterionFactory.subject().contains("james"))))
.containsOnly(message1);
@@ -261,7 +261,7 @@ public interface DeletedMessageVaultSearchContract {
@Test
default void shouldReturnMessagesContainsAtTheBeginning() {
DeletedMessage message1 = storeMessageWithSubject(APACHE_JAMES_PROJECT);
- DeletedMessage message2 = storeMessageWithSubject(OPEN_SOURCE_SOFTWARE);
+ storeMessageWithSubject(OPEN_SOURCE_SOFTWARE);
assertThat(search(Query.of(CriterionFactory.subject().contains("apache"))))
.containsOnly(message1);
@@ -269,7 +269,7 @@ public interface DeletedMessageVaultSearchContract {
@Test
default void shouldReturnMessagesContainsAtTheEnd() {
- DeletedMessage message1 = storeMessageWithSubject(APACHE_JAMES_PROJECT);
+ storeMessageWithSubject(APACHE_JAMES_PROJECT);
DeletedMessage message2 = storeMessageWithSubject(OPEN_SOURCE_SOFTWARE);
assertThat(search(Query.of(CriterionFactory.subject().contains("software"))))
@@ -279,7 +279,7 @@ public interface DeletedMessageVaultSearchContract {
@Test
default void shouldNotReturnMissingSubjectMessagesWhenContains() {
DeletedMessage message1 = storeMessageWithSubject(APACHE_JAMES_PROJECT);
- DeletedMessage message2 = storeMessageNoSubject();
+ storeMessageNoSubject();
assertThat(search(Query.of(CriterionFactory.subject().contains("james"))))
.containsOnly(message1);
@@ -287,8 +287,8 @@ public interface DeletedMessageVaultSearchContract {
@Test
default void shouldNotReturnMessagesContainsIgnoreCaseWhenContains() {
- DeletedMessage message1 = storeMessageWithSubject(APACHE_JAMES_PROJECT);
- DeletedMessage message2 = storeMessageWithSubject(OPEN_SOURCE_SOFTWARE);
+ storeMessageWithSubject(APACHE_JAMES_PROJECT);
+ storeMessageWithSubject(OPEN_SOURCE_SOFTWARE);
assertThat(search(Query.of(CriterionFactory.subject().contains("SoftWare"))))
.isEmpty();
@@ -297,7 +297,7 @@ public interface DeletedMessageVaultSearchContract {
@Test
default void shouldReturnMessagesContainsIgnoreCaseAtTheMiddle() {
DeletedMessage message1 = storeMessageWithSubject(APACHE_JAMES_PROJECT);
- DeletedMessage message2 = storeMessageWithSubject(OPEN_SOURCE_SOFTWARE);
+ storeMessageWithSubject(OPEN_SOURCE_SOFTWARE);
assertThat(search(Query.of(CriterionFactory.subject().containsIgnoreCase("JAmEs"))))
.containsOnly(message1);
@@ -305,7 +305,7 @@ public interface DeletedMessageVaultSearchContract {
@Test
default void shouldReturnMessagesContainsIgnoreCaseAtTheBeginning() {
- DeletedMessage message1 = storeMessageWithSubject(APACHE_JAMES_PROJECT);
+ storeMessageWithSubject(APACHE_JAMES_PROJECT);
DeletedMessage message2 = storeMessageWithSubject(OPEN_SOURCE_SOFTWARE);
assertThat(search(Query.of(CriterionFactory.subject().containsIgnoreCase("SouRCE"))))
@@ -315,7 +315,7 @@ public interface DeletedMessageVaultSearchContract {
@Test
default void shouldReturnMessagesContainsIgnoreCaseAtTheEnd() {
DeletedMessage message1 = storeMessageWithSubject(APACHE_JAMES_PROJECT);
- DeletedMessage message2 = storeMessageWithSubject(OPEN_SOURCE_SOFTWARE);
+ storeMessageWithSubject(OPEN_SOURCE_SOFTWARE);
assertThat(search(Query.of(
CriterionFactory.subject().containsIgnoreCase("ProJECT"))))
@@ -325,7 +325,7 @@ public interface DeletedMessageVaultSearchContract {
@Test
default void shouldReturnMessagesContainsWhenContainsIgnoreCase() {
DeletedMessage message1 = storeMessageWithSubject(APACHE_JAMES_PROJECT);
- DeletedMessage message2 = storeMessageWithSubject(OPEN_SOURCE_SOFTWARE);
+ storeMessageWithSubject(OPEN_SOURCE_SOFTWARE);
assertThat(search(Query.of(
CriterionFactory.subject().containsIgnoreCase("project"))))
@@ -335,7 +335,7 @@ public interface DeletedMessageVaultSearchContract {
@Test
default void shouldNotReturnMissingSubjectMessagesWhenContainsIgnoreCase() {
DeletedMessage message1 = storeMessageWithSubject(APACHE_JAMES_PROJECT);
- DeletedMessage message2 = storeMessageNoSubject();
+ storeMessageNoSubject();
assertThat(search(Query.of(CriterionFactory.subject().containsIgnoreCase("JAMes"))))
.containsOnly(message1);
@@ -344,7 +344,7 @@ public interface DeletedMessageVaultSearchContract {
@Test
default void shouldReturnMessagesStrictlyEquals() {
DeletedMessage message1 = storeMessageWithSubject(APACHE_JAMES_PROJECT);
- DeletedMessage message2 = storeMessageWithSubject(OPEN_SOURCE_SOFTWARE);
+ storeMessageWithSubject(OPEN_SOURCE_SOFTWARE);
assertThat(search(Query.of(CriterionFactory.subject().equals(APACHE_JAMES_PROJECT))))
.containsOnly(message1);
@@ -352,8 +352,8 @@ public interface DeletedMessageVaultSearchContract {
@Test
default void shouldNotReturnMessagesContainsWhenEquals() {
- DeletedMessage message1 = storeMessageWithSubject(APACHE_JAMES_PROJECT);
- DeletedMessage message2 = storeMessageWithSubject(OPEN_SOURCE_SOFTWARE);
+ storeMessageWithSubject(APACHE_JAMES_PROJECT);
+ storeMessageWithSubject(OPEN_SOURCE_SOFTWARE);
assertThat(search(Query.of(CriterionFactory.subject().equals("james"))))
.isEmpty();
@@ -361,8 +361,8 @@ public interface DeletedMessageVaultSearchContract {
@Test
default void shouldNotReturnMessagesContainsIgnoreCaseWhenEquals() {
- DeletedMessage message1 = storeMessageWithSubject(APACHE_JAMES_PROJECT);
- DeletedMessage message2 = storeMessageWithSubject(OPEN_SOURCE_SOFTWARE);
+ storeMessageWithSubject(APACHE_JAMES_PROJECT);
+ storeMessageWithSubject(OPEN_SOURCE_SOFTWARE);
assertThat(search(Query.of(CriterionFactory.subject().equals("proJECT"))))
.isEmpty();
@@ -370,8 +370,8 @@ public interface DeletedMessageVaultSearchContract {
@Test
default void shouldNotReturnMessagesEqualsIgnoreCaseWhenEquals() {
- DeletedMessage message1 = storeMessageWithSubject(APACHE_JAMES_PROJECT);
- DeletedMessage message2 = storeMessageWithSubject(OPEN_SOURCE_SOFTWARE);
+ storeMessageWithSubject(APACHE_JAMES_PROJECT);
+ storeMessageWithSubject(OPEN_SOURCE_SOFTWARE);
assertThat(search(Query.of(CriterionFactory.subject().equals("Apache James Project"))))
.isEmpty();
@@ -379,8 +379,8 @@ public interface DeletedMessageVaultSearchContract {
@Test
default void shouldReturnMessagesWhenEqualsIgnoreCase() {
- DeletedMessage message1 = storeMessageWithSubject(APACHE_JAMES_PROJECT);
- DeletedMessage message2 = storeMessageWithSubject(OPEN_SOURCE_SOFTWARE);
+ storeMessageWithSubject(APACHE_JAMES_PROJECT);
+ storeMessageWithSubject(OPEN_SOURCE_SOFTWARE);
assertThat(search(Query.of(CriterionFactory.subject().equals("Apache James PROJECT"))))
.isEmpty();
@@ -389,7 +389,7 @@ public interface DeletedMessageVaultSearchContract {
@Test
default void shouldReturnMessagesStrictlyEqualsWhenEqualsIgnoreCase() {
DeletedMessage message1 = storeMessageWithSubject(APACHE_JAMES_PROJECT);
- DeletedMessage message2 = storeMessageWithSubject(OPEN_SOURCE_SOFTWARE);
+ storeMessageWithSubject(OPEN_SOURCE_SOFTWARE);
assertThat(search(Query.of(CriterionFactory.subject().equalsIgnoreCase(APACHE_JAMES_PROJECT))))
.containsOnly(message1);
@@ -397,8 +397,8 @@ public interface DeletedMessageVaultSearchContract {
@Test
default void shouldNotReturnMessagesContainsWhenEqualsIgnoreCase() {
- DeletedMessage message1 = storeMessageWithSubject(APACHE_JAMES_PROJECT);
- DeletedMessage message2 = storeMessageWithSubject(OPEN_SOURCE_SOFTWARE);
+ storeMessageWithSubject(APACHE_JAMES_PROJECT);
+ storeMessageWithSubject(OPEN_SOURCE_SOFTWARE);
assertThat(search(Query.of(CriterionFactory.subject().equalsIgnoreCase("james"))))
.isEmpty();
@@ -406,8 +406,8 @@ public interface DeletedMessageVaultSearchContract {
@Test
default void shouldNotReturnMessagesContainsIgnoreCaseWhenEqualsIgnoreCase() {
- DeletedMessage message1 = storeMessageWithSubject(APACHE_JAMES_PROJECT);
- DeletedMessage message2 = storeMessageWithSubject(OPEN_SOURCE_SOFTWARE);
+ storeMessageWithSubject(APACHE_JAMES_PROJECT);
+ storeMessageWithSubject(OPEN_SOURCE_SOFTWARE);
assertThat(search(Query.of(CriterionFactory.subject().equalsIgnoreCase("proJECT"))))
.isEmpty();
@@ -416,7 +416,7 @@ public interface DeletedMessageVaultSearchContract {
@Test
default void shouldNotReturnMissingSubjectMessagesWhenEquals() {
DeletedMessage message1 = storeMessageWithSubject(APACHE_JAMES_PROJECT);
- DeletedMessage message2 = storeMessageNoSubject();
+ storeMessageNoSubject();
assertThat(search(Query.of(CriterionFactory.subject().equals(APACHE_JAMES_PROJECT))))
.containsOnly(message1);
@@ -430,9 +430,9 @@ public interface DeletedMessageVaultSearchContract {
DeletedMessage message1 = storeDefaultMessage();
DeletedMessage message2 = storeDefaultMessage();
DeletedMessage message3 = storeDefaultMessage();
- DeletedMessage message4 = storeMessageWithOriginMailboxes(MAILBOX_ID_2);
- DeletedMessage message5 = storeMessageWithSender(MaybeSender.of(SENDER2));
- DeletedMessage message6 = storeMessageWithDeletionDate(DELETION_DATE.minusHours(1));
+ storeMessageWithOriginMailboxes(MAILBOX_ID_2);
+ storeMessageWithSender(MaybeSender.of(SENDER2));
+ storeMessageWithDeletionDate(DELETION_DATE.minusHours(1));
assertThat(search(Query.of(
CriterionFactory.containsOriginMailbox(MAILBOX_ID_1),
@@ -480,7 +480,7 @@ public interface DeletedMessageVaultSearchContract {
default void searchShouldReturnMessageWhenHavingSameCriterionTypes() {
DeletedMessage message1 = storeMessageWithRecipients(RECIPIENT1, RECIPIENT2, RECIPIENT3);
DeletedMessage message2 = storeMessageWithRecipients(RECIPIENT1, RECIPIENT2);
- DeletedMessage message3 = storeMessageWithRecipients(RECIPIENT1);
+ storeMessageWithRecipients(RECIPIENT1);
assertThat(search(Query.of(
CriterionFactory.containsRecipient(RECIPIENT1),
@@ -490,10 +490,10 @@ public interface DeletedMessageVaultSearchContract {
@Test
default void searchShouldReturnEmptyWhenHavingSameCriterionTypesButOppositeMatching() {
- DeletedMessage message1 = storeMessageWithDeletionDate(DELETION_DATE);
- DeletedMessage message2 = storeMessageWithDeletionDate(DELETION_DATE);
- DeletedMessage message3 = storeMessageWithDeletionDate(DELETION_DATE.plusHours(2));
- DeletedMessage message4 = storeMessageWithDeletionDate(DELETION_DATE.minusHours(2));
+ storeMessageWithDeletionDate(DELETION_DATE);
+ storeMessageWithDeletionDate(DELETION_DATE);
+ storeMessageWithDeletionDate(DELETION_DATE.plusHours(2));
+ storeMessageWithDeletionDate(DELETION_DATE.minusHours(2));
assertThat(search(Query.of(
CriterionFactory.deletionDate().afterOrEquals(DELETION_DATE.plusHours(1)),
@@ -516,7 +516,7 @@ public interface DeletedMessageVaultSearchContract {
default void searchForAnUserShouldNotReturnMessagesFromAnotherUser() {
DeletedMessage message1 = storeMessageWithUser(USER);
DeletedMessage message2 = storeMessageWithUser(USER);
- DeletedMessage message3 = storeMessageWithUser(USER_2);
+ storeMessageWithUser(USER_2);
assertThat(search(USER, Query.ALL))
.containsOnly(message1, message2);
diff --git a/mailbox/store/src/test/java/org/apache/james/mailbox/store/StoreMailboxManagerTest.java b/mailbox/store/src/test/java/org/apache/james/mailbox/store/StoreMailboxManagerTest.java
index a90ba4d..7af2289 100644
--- a/mailbox/store/src/test/java/org/apache/james/mailbox/store/StoreMailboxManagerTest.java
+++ b/mailbox/store/src/test/java/org/apache/james/mailbox/store/StoreMailboxManagerTest.java
@@ -36,7 +36,6 @@ import org.apache.james.mailbox.exception.MailboxException;
import org.apache.james.mailbox.exception.MailboxNotFoundException;
import org.apache.james.mailbox.exception.NotAdminException;
import org.apache.james.mailbox.exception.UserDoesNotExistException;
-import org.apache.james.mailbox.extension.PreDeletionHook;
import org.apache.james.mailbox.model.MailboxACL;
import org.apache.james.mailbox.model.MailboxId;
import org.apache.james.mailbox.model.MailboxPath;
diff --git a/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/MessageMapperTest.java b/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/MessageMapperTest.java
index acc55b0..622e6ba 100644
--- a/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/MessageMapperTest.java
+++ b/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/MessageMapperTest.java
@@ -31,7 +31,6 @@ import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.Optional;
-import java.util.function.Consumer;
import javax.mail.Flags;
import javax.mail.Flags.Flag;
@@ -60,7 +59,6 @@ import org.junit.Rule;
import org.junit.Test;
import org.junit.rules.ExpectedException;
-import com.github.fge.lambdas.Throwing;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.Lists;
diff --git a/mailet/api/src/main/java/org/apache/mailet/AttributeValue.java b/mailet/api/src/main/java/org/apache/mailet/AttributeValue.java
index dd496f6..d935d46 100644
--- a/mailet/api/src/main/java/org/apache/mailet/AttributeValue.java
+++ b/mailet/api/src/main/java/org/apache/mailet/AttributeValue.java
@@ -208,11 +208,11 @@ public class AttributeValue<T> {
return value;
}
- public <T> Optional<T> valueAs(Class<T> type) {
+ public <U> Optional<U> valueAs(Class<U> type) {
return tryToCast(type, value);
}
- private static <T> Optional<T> tryToCast(Class<T> type, Object value) {
+ private static <U> Optional<U> tryToCast(Class<U> type, Object value) {
if (type.isInstance(value)) {
return Optional.of(type.cast(value));
} else {
diff --git a/mpt/impl/imap-mailbox/maildir/src/test/java/org/apache/james/mpt/imapmailbox/maildir/host/MaildirHostSystem.java b/mpt/impl/imap-mailbox/maildir/src/test/java/org/apache/james/mpt/imapmailbox/maildir/host/MaildirHostSystem.java
index adc1671..3fe55dd 100644
--- a/mpt/impl/imap-mailbox/maildir/src/test/java/org/apache/james/mpt/imapmailbox/maildir/host/MaildirHostSystem.java
+++ b/mpt/impl/imap-mailbox/maildir/src/test/java/org/apache/james/mpt/imapmailbox/maildir/host/MaildirHostSystem.java
@@ -35,7 +35,6 @@ import org.apache.james.mailbox.acl.SimpleGroupMembershipResolver;
import org.apache.james.mailbox.acl.UnionMailboxACLResolver;
import org.apache.james.mailbox.events.InVMEventBus;
import org.apache.james.mailbox.events.delivery.InVmEventDelivery;
-import org.apache.james.mailbox.extension.PreDeletionHook;
import org.apache.james.mailbox.maildir.MaildirMailboxSessionMapperFactory;
import org.apache.james.mailbox.maildir.MaildirStore;
import org.apache.james.mailbox.store.JVMMailboxPathLocker;
diff --git a/server/container/core/src/main/java/org/apache/james/server/core/MailImpl.java b/server/container/core/src/main/java/org/apache/james/server/core/MailImpl.java
index de17b86..5c60f92 100644
--- a/server/container/core/src/main/java/org/apache/james/server/core/MailImpl.java
+++ b/server/container/core/src/main/java/org/apache/james/server/core/MailImpl.java
@@ -611,6 +611,7 @@ public class MailImpl implements Disposable, Mail {
* Thus, rather than Java deserializing attributes we deserialize them as Json using AttributeValue capabilities.
*/
private void setAttributesUsingJsonable(ObjectInputStream in) throws IOException, ClassNotFoundException {
+ @SuppressWarnings("unchecked")
Map<String, String> attributesAsJson = (Map<String, String>) in.readObject();
this.attributes = attributesAsJson.entrySet().stream()
@@ -623,6 +624,7 @@ public class MailImpl implements Disposable, Mail {
/**
* Fallback to Java deserialization if {@link MailImpl#setAttributesUsingJsonable(ObjectInputStream)} fails.
*/
+ @SuppressWarnings("unchecked")
private void setAttributesUsingJavaSerializable(ObjectInputStream in) throws IOException, ClassNotFoundException {
// the following is under try/catch to be backwards compatible
// with messages created with James version <= 2.2.0a8
diff --git a/server/container/guice/blob-objectstorage-guice/src/test/java/org/apache/james/modules/objectstorage/ObjectStorageBlobConfigurationTest.java b/server/container/guice/blob-objectstorage-guice/src/test/java/org/apache/james/modules/objectstorage/ObjectStorageBlobConfigurationTest.java
index 2396eae..4d2798f 100644
--- a/server/container/guice/blob-objectstorage-guice/src/test/java/org/apache/james/modules/objectstorage/ObjectStorageBlobConfigurationTest.java
+++ b/server/container/guice/blob-objectstorage-guice/src/test/java/org/apache/james/modules/objectstorage/ObjectStorageBlobConfigurationTest.java
@@ -3,25 +3,11 @@ package org.apache.james.modules.objectstorage;
import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThatThrownBy;
-import java.net.URI;
import java.util.Map;
import java.util.stream.Stream;
import org.apache.commons.configuration.ConfigurationException;
import org.apache.commons.configuration.MapConfiguration;
-import org.apache.james.blob.objectstorage.ContainerName;
-import org.apache.james.blob.objectstorage.swift.Credentials;
-import org.apache.james.blob.objectstorage.swift.DomainName;
-import org.apache.james.blob.objectstorage.swift.IdentityV3;
-import org.apache.james.blob.objectstorage.swift.PassHeaderName;
-import org.apache.james.blob.objectstorage.swift.Project;
-import org.apache.james.blob.objectstorage.swift.ProjectName;
-import org.apache.james.blob.objectstorage.swift.SwiftKeystone2ObjectStorage;
-import org.apache.james.blob.objectstorage.swift.SwiftKeystone3ObjectStorage;
-import org.apache.james.blob.objectstorage.swift.SwiftTempAuthObjectStorage;
-import org.apache.james.blob.objectstorage.swift.TenantName;
-import org.apache.james.blob.objectstorage.swift.UserHeaderName;
-import org.apache.james.blob.objectstorage.swift.UserName;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtensionContext;
import org.junit.jupiter.params.ParameterizedTest;
diff --git a/server/container/guice/blob-objectstorage-guice/src/test/java/org/apache/james/modules/objectstorage/swift/ObjectStorageBlobConfigurationTest.java b/server/container/guice/blob-objectstorage-guice/src/test/java/org/apache/james/modules/objectstorage/swift/ObjectStorageBlobConfigurationTest.java
index 631ae4c..901bb1f 100644
--- a/server/container/guice/blob-objectstorage-guice/src/test/java/org/apache/james/modules/objectstorage/swift/ObjectStorageBlobConfigurationTest.java
+++ b/server/container/guice/blob-objectstorage-guice/src/test/java/org/apache/james/modules/objectstorage/swift/ObjectStorageBlobConfigurationTest.java
@@ -20,15 +20,12 @@
package org.apache.james.modules.objectstorage.swift;
import static org.assertj.core.api.Assertions.assertThat;
-import static org.assertj.core.api.Assertions.assertThatThrownBy;
import java.net.URI;
-import java.util.Map;
import java.util.Optional;
import java.util.stream.Stream;
import org.apache.commons.configuration.ConfigurationException;
-import org.apache.commons.configuration.MapConfiguration;
import org.apache.james.blob.objectstorage.ContainerName;
import org.apache.james.blob.objectstorage.swift.Credentials;
import org.apache.james.blob.objectstorage.swift.DomainName;
@@ -48,13 +45,10 @@ import org.apache.james.modules.objectstorage.ObjectStorageProvider;
import org.apache.james.modules.objectstorage.PayloadCodecFactory;
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;
import org.junit.jupiter.params.provider.ArgumentsProvider;
-import org.junit.jupiter.params.provider.ArgumentsSource;
import com.google.common.collect.ImmutableMap;
-import com.google.common.collect.Maps;
class ObjectStorageBlobConfigurationTest {
diff --git a/server/mailrepository/deleted-messages-vault-repository/src/main/java/org/apache/james/vault/MailConverter.java b/server/mailrepository/deleted-messages-vault-repository/src/main/java/org/apache/james/vault/MailConverter.java
index f680377..cfd6d41 100644
--- a/server/mailrepository/deleted-messages-vault-repository/src/main/java/org/apache/james/vault/MailConverter.java
+++ b/server/mailrepository/deleted-messages-vault-repository/src/main/java/org/apache/james/vault/MailConverter.java
@@ -110,6 +110,7 @@ class MailConverter {
}
private String castSubjectToString(Object object) {
+ @SuppressWarnings("unchecked")
Optional<String> optional = Optional.of(object)
.filter(obj -> obj instanceof AttributeValue)
.map(AttributeValue.class::cast)
@@ -149,6 +150,7 @@ class MailConverter {
}
private MailboxId retrieveMailboxId(Object object) {
+ @SuppressWarnings("unchecked")
Optional<String> serializedMailboxId = Optional.of(object)
.filter(obj -> obj instanceof AttributeValue)
.map(AttributeValue.class::cast)
diff --git a/server/mailrepository/mailrepository-cassandra/src/main/java/org/apache/james/mailrepository/cassandra/CassandraMailRepositoryMailDaoV2.java b/server/mailrepository/mailrepository-cassandra/src/main/java/org/apache/james/mailrepository/cassandra/CassandraMailRepositoryMailDaoV2.java
index daff824..046434b 100644
--- a/server/mailrepository/mailrepository-cassandra/src/main/java/org/apache/james/mailrepository/cassandra/CassandraMailRepositoryMailDaoV2.java
+++ b/server/mailrepository/mailrepository-cassandra/src/main/java/org/apache/james/mailrepository/cassandra/CassandraMailRepositoryMailDaoV2.java
@@ -57,6 +57,7 @@ import org.apache.commons.lang3.tuple.Pair;
import org.apache.james.backends.cassandra.utils.CassandraAsyncExecutor;
import org.apache.james.blob.api.BlobId;
import org.apache.james.core.MailAddress;
+import org.apache.james.core.MaybeSender;
import org.apache.james.mailrepository.api.MailKey;
import org.apache.james.mailrepository.api.MailRepositoryUrl;
import org.apache.james.server.core.MailImpl;
@@ -166,9 +167,7 @@ public class CassandraMailRepositoryMailDaoV2 implements CassandraMailRepository
}
private MailDTO toMail(Row row) {
- MailAddress sender = Optional.ofNullable(row.getString(SENDER))
- .map(MailAddress::getMailSender)
- .orElse(null);
+ MaybeSender sender = MaybeSender.getMailSender(row.getString(SENDER));
List<MailAddress> recipients = row.getList(RECIPIENTS, String.class)
.stream()
.map(Throwing.function(MailAddress::new))
diff --git a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/DeletedMessagesVaultTest.java b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/DeletedMessagesVaultTest.java
index 22ae7b1..67f91a9 100644
--- a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/DeletedMessagesVaultTest.java
+++ b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/DeletedMessagesVaultTest.java
@@ -59,9 +59,9 @@ import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
import org.junit.experimental.categories.Category;
-import org.testcontainers.shaded.com.google.common.collect.ImmutableList;
import com.google.common.base.Strings;
+import com.google.common.collect.ImmutableList;
import io.restassured.RestAssured;
import io.restassured.parsing.Parser;
diff --git a/server/protocols/jmap-integration-testing/rabbitmq-jmap-integration-testing/src/test/java/org/apache/james/jmap/rabbitmq/ReindexingWithEventDeadLettersTest.java b/server/protocols/jmap-integration-testing/rabbitmq-jmap-integration-testing/src/test/java/org/apache/james/jmap/rabbitmq/ReindexingWithEventDeadLettersTest.java
index ef9df20..490cbcd 100644
--- a/server/protocols/jmap-integration-testing/rabbitmq-jmap-integration-testing/src/test/java/org/apache/james/jmap/rabbitmq/ReindexingWithEventDeadLettersTest.java
+++ b/server/protocols/jmap-integration-testing/rabbitmq-jmap-integration-testing/src/test/java/org/apache/james/jmap/rabbitmq/ReindexingWithEventDeadLettersTest.java
@@ -28,14 +28,10 @@ import static org.apache.james.jmap.JmapCommonRequests.listMessageIdsForAccount;
import static org.apache.james.jmap.JmapURIBuilder.baseUri;
import static org.apache.james.jmap.TestingConstants.ALICE;
import static org.apache.james.jmap.TestingConstants.ALICE_PASSWORD;
-import static org.apache.james.jmap.TestingConstants.ARGUMENTS;
import static org.apache.james.jmap.TestingConstants.DOMAIN;
-import static org.apache.james.jmap.TestingConstants.NAME;
import static org.apache.james.jmap.TestingConstants.jmapRequestSpecBuilder;
import static org.assertj.core.api.Assertions.assertThat;
import static org.awaitility.Duration.ONE_HUNDRED_MILLISECONDS;
-import static org.hamcrest.Matchers.equalTo;
-import static org.hamcrest.collection.IsMapWithSize.aMapWithSize;
import java.util.List;
@@ -43,8 +39,8 @@ import org.apache.james.CassandraExtension;
import org.apache.james.CassandraRabbitMQJamesServerMain;
import org.apache.james.DockerElasticSearchExtension;
import org.apache.james.GuiceJamesServer;
-import org.apache.james.JamesServerExtension;
import org.apache.james.JamesServerBuilder;
+import org.apache.james.JamesServerExtension;
import org.apache.james.JmapJamesServerContract;
import org.apache.james.jmap.api.access.AccessToken;
import org.apache.james.modules.RabbitMQExtension;
diff --git a/server/protocols/webadmin/webadmin-mailbox-deleted-message-vault/src/main/java/org/apache/james/webadmin/vault/routes/query/QueryTranslator.java b/server/protocols/webadmin/webadmin-mailbox-deleted-message-vault/src/main/java/org/apache/james/webadmin/vault/routes/query/QueryTranslator.java
index f9ee073..3494b7e 100644
--- a/server/protocols/webadmin/webadmin-mailbox-deleted-message-vault/src/main/java/org/apache/james/webadmin/vault/routes/query/QueryTranslator.java
+++ b/server/protocols/webadmin/webadmin-mailbox-deleted-message-vault/src/main/java/org/apache/james/webadmin/vault/routes/query/QueryTranslator.java
@@ -165,7 +165,7 @@ public class QueryTranslator {
T parse(String input);
}
- private final ImmutableTable<FieldName, Operator, Function<String, Criterion>> criterionRegistry;
+ private final ImmutableTable<FieldName, Operator, Function<String, Criterion<?>>> criterionRegistry;
@Inject
@VisibleForTesting
@@ -173,7 +173,7 @@ public class QueryTranslator {
criterionRegistry = withMailboxIdCriterionParser(mailboxIdFactory);
}
- private ImmutableTable<FieldName, Operator, Function<String, Criterion>> withMailboxIdCriterionParser(MailboxId.Factory mailboxIdFactor) {
+ private ImmutableTable<FieldName, Operator, Function<String, Criterion<?>>> withMailboxIdCriterionParser(MailboxId.Factory mailboxIdFactor) {
FieldValueParser.MailboxIdValueParser mailboxIdParser = new FieldValueParser.MailboxIdValueParser(mailboxIdFactor);
return defaultRegistryBuilder()
@@ -181,8 +181,8 @@ public class QueryTranslator {
.build();
}
- private ImmutableTable.Builder<FieldName, Operator, Function<String, Criterion>> defaultRegistryBuilder() {
- return ImmutableTable.<FieldName, Operator, Function<String, Criterion>>builder()
+ private ImmutableTable.Builder<FieldName, Operator, Function<String, Criterion<?>>> defaultRegistryBuilder() {
+ return ImmutableTable.<FieldName, Operator, Function<String, Criterion<?>>>builder()
.put(DELETION_DATE, BEFORE_OR_EQUALS, testedValue -> CriterionFactory.deletionDate().beforeOrEquals(ZONED_DATE_TIME_PARSER.parse(testedValue)))
.put(DELETION_DATE, AFTER_OR_EQUALS, testedValue -> CriterionFactory.deletionDate().afterOrEquals(ZONED_DATE_TIME_PARSER.parse(testedValue)))
.put(DELIVERY_DATE, BEFORE_OR_EQUALS, testedValue -> CriterionFactory.deliveryDate().beforeOrEquals(ZONED_DATE_TIME_PARSER.parse(testedValue)))
@@ -196,13 +196,13 @@ public class QueryTranslator {
.put(SUBJECT, CONTAINS_IGNORE_CASE, testedValue -> CriterionFactory.subject().containsIgnoreCase(STRING_PARSER.parse(testedValue)));
}
- private Criterion translate(CriterionDTO dto) throws QueryTranslatorException {
+ private Criterion<?> translate(CriterionDTO dto) throws QueryTranslatorException {
return Optional.ofNullable(getCriterionParser(dto))
.map(criterionGeneratingFunction -> criterionGeneratingFunction.apply(dto.getValue()))
.orElseThrow(() -> new QueryTranslatorException("pair of fieldName: '" + dto.getFieldName() + "' and operator: '" + dto.getOperator() + "' is not supported"));
}
- private Function<String, Criterion> getCriterionParser(CriterionDTO dto) {
+ private Function<String, Criterion<?>> getCriterionParser(CriterionDTO dto) {
return criterionRegistry.get(
FieldName.getField(dto.getFieldName()),
Operator.getOperator(dto.getOperator()));
diff --git a/server/queue/queue-activemq/src/test/java/org/apache/james/queue/activemq/ActiveMQMailQueueTest.java b/server/queue/queue-activemq/src/test/java/org/apache/james/queue/activemq/ActiveMQMailQueueTest.java
index 3c109cf..df671ab 100644
--- a/server/queue/queue-activemq/src/test/java/org/apache/james/queue/activemq/ActiveMQMailQueueTest.java
+++ b/server/queue/queue-activemq/src/test/java/org/apache/james/queue/activemq/ActiveMQMailQueueTest.java
@@ -18,8 +18,6 @@
****************************************************************/
package org.apache.james.queue.activemq;
-import java.util.concurrent.ExecutorService;
-
import javax.jms.ConnectionFactory;
import org.apache.activemq.ActiveMQConnectionFactory;
diff --git a/server/queue/queue-api/src/test/java/org/apache/james/queue/api/DelayedMailQueueContract.java b/server/queue/queue-api/src/test/java/org/apache/james/queue/api/DelayedMailQueueContract.java
index fff18aa..5cfc026 100644
--- a/server/queue/queue-api/src/test/java/org/apache/james/queue/api/DelayedMailQueueContract.java
+++ b/server/queue/queue-api/src/test/java/org/apache/james/queue/api/DelayedMailQueueContract.java
@@ -25,13 +25,12 @@ import static org.assertj.core.api.Assertions.assertThatCode;
import static org.assertj.core.api.Assertions.assertThatThrownBy;
import java.time.Duration;
-import java.time.ZonedDateTime;
import java.util.concurrent.TimeUnit;
import org.junit.jupiter.api.Test;
-import org.slf4j.LoggerFactory;
import com.google.common.base.Stopwatch;
+
import reactor.core.publisher.Flux;
import reactor.core.publisher.Mono;
import reactor.core.scheduler.Schedulers;
diff --git a/server/queue/queue-api/src/test/java/org/apache/james/queue/api/MailQueueContract.java b/server/queue/queue-api/src/test/java/org/apache/james/queue/api/MailQueueContract.java
index d9c615e..c09d292 100644
--- a/server/queue/queue-api/src/test/java/org/apache/james/queue/api/MailQueueContract.java
+++ b/server/queue/queue-api/src/test/java/org/apache/james/queue/api/MailQueueContract.java
@@ -397,6 +397,7 @@ public interface MailQueueContract {
try {
itemQueue.put(e);
} catch (InterruptedException ignored) {
+ //ignored
}
return Mono.empty();
}).subscribe();
diff --git a/server/queue/queue-api/src/test/java/org/apache/james/queue/api/MailQueueMetricContract.java b/server/queue/queue-api/src/test/java/org/apache/james/queue/api/MailQueueMetricContract.java
index b4c436d..a367946 100644
--- a/server/queue/queue-api/src/test/java/org/apache/james/queue/api/MailQueueMetricContract.java
+++ b/server/queue/queue-api/src/test/java/org/apache/james/queue/api/MailQueueMetricContract.java
@@ -23,7 +23,6 @@ import static org.apache.james.queue.api.Mails.defaultMail;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.verifyNoMoreInteractions;
import java.util.stream.IntStream;
@@ -32,7 +31,6 @@ import javax.mail.MessagingException;
import org.apache.james.metrics.api.Gauge;
import org.apache.mailet.base.test.FakeMail;
import org.assertj.core.api.Assertions;
-import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import org.mockito.ArgumentCaptor;
diff --git a/server/queue/queue-memory/src/main/java/org/apache/james/queue/memory/MemoryMailQueueFactory.java b/server/queue/queue-memory/src/main/java/org/apache/james/queue/memory/MemoryMailQueueFactory.java
index 5c7551f..b534459 100644
--- a/server/queue/queue-memory/src/main/java/org/apache/james/queue/memory/MemoryMailQueueFactory.java
+++ b/server/queue/queue-memory/src/main/java/org/apache/james/queue/memory/MemoryMailQueueFactory.java
@@ -85,7 +85,6 @@ public class MemoryMailQueueFactory implements MailQueueFactory<ManageableMailQu
public static class MemoryMailQueue implements ManageableMailQueue {
private final DelayQueue<MemoryMailQueueItem> mailItems;
private final LinkedBlockingDeque<MemoryMailQueueItem> inProcessingMailItems;
- private final MailQueueItemDecoratorFactory mailQueueItemDecoratorFactory;
private final String name;
private final Flux<MailQueueItem> flux;
@@ -93,7 +92,6 @@ public class MemoryMailQueueFactory implements MailQueueFactory<ManageableMailQu
this.mailItems = new DelayQueue<>();
this.inProcessingMailItems = new LinkedBlockingDeque<>();
this.name = name;
- this.mailQueueItemDecoratorFactory = mailQueueItemDecoratorFactory;
this.flux = Mono.fromCallable(mailItems::take)
.repeat()
.flatMap(item -> Mono.just(inProcessingMailItems.add(item)).thenReturn(item))
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org