This is an automated email from the ASF dual-hosted git repository. btellier pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/james-project.git
commit 6a1f838a4dd304821f452ef49353935f3e9b2092 Author: Raphael Ouazana <[email protected]> AuthorDate: Fri May 24 18:02:21 2019 +0200 Fix Eclipse warnings --- .../cassandra/components/CassandraTableTest.java | 1 - .../org/apache/james/mailbox/MailboxManagerTest.java | 2 +- .../james/mailbox/backup/ZipMailArchiveRestorer.java | 3 +++ .../mailbox/backup/zip/ZippedMailAccountIterator.java | 1 - .../mailbox/backup/DefaultMailboxBackupTest.java | 4 ---- .../apache/james/mailbox/backup/ZipAssertTest.java | 3 ++- .../elasticsearch/search/ElasticSearchSearcher.java | 2 +- .../maildir/DomainUserMaildirMailboxManagerTest.java | 4 ++-- .../maildir/FullUserMaildirMailboxManagerTest.java | 4 ++-- .../apache/james/metrics/tests/RecordingMetric.java | 4 +--- .../james/metrics/tests/RecordingMetricFactory.java | 2 +- .../james/blob/objectstorage/AESPayloadCodec.java | 3 --- .../blob/objectstorage/ObjectStorageBlobsDAO.java | 1 - .../james/GuiceJamesServerStartUpCheckTest.java | 1 + .../java/org/apache/james/jmap/JMAPModuleTest.java | 1 + .../org/apache/james/smtp/SmtpRandomStoringTest.java | 6 +++++- .../james/transport/mailets/AliasMappingTest.java | 1 - .../methods/integration/DeletedMessagesVaultTest.java | 12 ++++++------ .../apache/james/webadmin/routes/GroupsRoutes.java | 5 +---- .../james/webadmin/routes/GroupsRoutesTest.java | 4 ++-- .../test/java/org/apache/james/linshare/Linshare.java | 19 ++++++++++++------- .../apache/james/linshare/client/LinshareAPITest.java | 3 ++- 22 files changed, 43 insertions(+), 43 deletions(-) diff --git a/backends-common/cassandra/src/test/java/org/apache/james/backends/cassandra/components/CassandraTableTest.java b/backends-common/cassandra/src/test/java/org/apache/james/backends/cassandra/components/CassandraTableTest.java index 55d6666..8a5868f 100644 --- a/backends-common/cassandra/src/test/java/org/apache/james/backends/cassandra/components/CassandraTableTest.java +++ b/backends-common/cassandra/src/test/java/org/apache/james/backends/cassandra/components/CassandraTableTest.java @@ -91,7 +91,6 @@ class CassandraTableTest { assertThat(left.reduce(right)).isEqualByComparingTo(expectedResult); } - @SuppressWarnings("unused") private static Stream<Arguments> initializationStatusReduceShouldFallIntoTheRightState() { return Stream.of( Arguments.of(ALREADY_DONE, ALREADY_DONE, ALREADY_DONE), 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 d2fa727..c152e99 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 @@ -1194,7 +1194,7 @@ public abstract class MailboxManagerTest<T extends MailboxManager> { } @Test - void renameMailboxShouldChangeTheMailboxPathOfAMailbox() throws Exception { + protected void renameMailboxShouldChangeTheMailboxPathOfAMailbox() throws Exception { MailboxSession session = mailboxManager.createSystemSession(USER_1); MailboxPath mailboxPath1 = MailboxPath.forUser(USER_1, "mbx1"); diff --git a/mailbox/backup/src/main/java/org/apache/james/mailbox/backup/ZipMailArchiveRestorer.java b/mailbox/backup/src/main/java/org/apache/james/mailbox/backup/ZipMailArchiveRestorer.java index 90b96c5..a49c827 100644 --- a/mailbox/backup/src/main/java/org/apache/james/mailbox/backup/ZipMailArchiveRestorer.java +++ b/mailbox/backup/src/main/java/org/apache/james/mailbox/backup/ZipMailArchiveRestorer.java @@ -81,6 +81,9 @@ public class ZipMailArchiveRestorer implements MailArchiveRestorer { case MAILBOX: mailboxes.add((MailboxWithAnnotationsArchiveEntry) entry); break; + case MESSAGE: + //Ignore for know, TODO: implementation + break; case UNKNOWN: String entryName = ((UnknownArchiveEntry) entry).getEntryName(); LOGGER.warn("unknown entry found in zip :" + entryName); diff --git a/mailbox/backup/src/main/java/org/apache/james/mailbox/backup/zip/ZippedMailAccountIterator.java b/mailbox/backup/src/main/java/org/apache/james/mailbox/backup/zip/ZippedMailAccountIterator.java index 1b690f1..1688045 100644 --- a/mailbox/backup/src/main/java/org/apache/james/mailbox/backup/zip/ZippedMailAccountIterator.java +++ b/mailbox/backup/src/main/java/org/apache/james/mailbox/backup/zip/ZippedMailAccountIterator.java @@ -42,7 +42,6 @@ public class ZippedMailAccountIterator implements MailArchiveIterator { private static final Logger LOGGER = LoggerFactory.getLogger(ZippedMailAccountIterator.class); private static final List<MailboxAnnotation> NO_ANNOTATION = ImmutableList.of(); private final ZipEntryIterator zipEntryIterator; - private Optional<MailboxWithAnnotationsArchiveEntry> currentMailBox; private Optional<ZipEntry> next; public ZippedMailAccountIterator(ZipEntryIterator zipEntryIterator) { diff --git a/mailbox/backup/src/test/java/org/apache/james/mailbox/backup/DefaultMailboxBackupTest.java b/mailbox/backup/src/test/java/org/apache/james/mailbox/backup/DefaultMailboxBackupTest.java index 58f4958..533150c 100644 --- a/mailbox/backup/src/test/java/org/apache/james/mailbox/backup/DefaultMailboxBackupTest.java +++ b/mailbox/backup/src/test/java/org/apache/james/mailbox/backup/DefaultMailboxBackupTest.java @@ -239,10 +239,6 @@ class DefaultMailboxBackupTest implements MailboxMessageFixture { return MessageManager.AppendCommand.builder().withFlags(flags1).build(MESSAGE_1.getFullContent()); } - private MessageManager.AppendCommand getMessage2AppendCommand() throws IOException { - return MessageManager.AppendCommand.builder().withFlags(flags1).build(MESSAGE_2.getFullContent()); - } - private MessageManager.AppendCommand getMessage1OtherUserAppendCommand() throws IOException { return MessageManager.AppendCommand.builder().withFlags(flags1).build(MESSAGE_1_OTHER_USER.getFullContent()); } 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 92681b0..d8b1b84 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 @@ -39,6 +39,7 @@ import org.apache.commons.compress.archivers.zip.ZipExtraField; import org.apache.commons.compress.archivers.zip.ZipFile; import org.apache.commons.io.IOUtils; import org.apache.james.junit.TemporaryFolderExtension; +import org.apache.james.mailbox.backup.ZipAssert.EntryChecks; import org.apache.james.mailbox.backup.zip.SizeExtraField; import org.apache.james.mailbox.backup.zip.UidExtraField; import org.junit.jupiter.api.BeforeEach; @@ -618,7 +619,7 @@ public class ZipAssertTest { try (ZipFile assertedZipFile = zipFile(destination, firstEntry, secondEntry)) { assertThatThrownBy(() -> assertThatZip(assertedZipFile) - .allSatisfies(entry -> entry.hasName("entry 1"))) + .allSatisfies(entry -> EntryChecks.hasName("entry 1"))) .isInstanceOf(AssertionError.class); } } diff --git a/mailbox/elasticsearch/src/main/java/org/apache/james/mailbox/elasticsearch/search/ElasticSearchSearcher.java b/mailbox/elasticsearch/src/main/java/org/apache/james/mailbox/elasticsearch/search/ElasticSearchSearcher.java index 38dae35..3863302 100644 --- a/mailbox/elasticsearch/src/main/java/org/apache/james/mailbox/elasticsearch/search/ElasticSearchSearcher.java +++ b/mailbox/elasticsearch/src/main/java/org/apache/james/mailbox/elasticsearch/search/ElasticSearchSearcher.java @@ -54,7 +54,7 @@ public class ElasticSearchSearcher { private static final Logger LOGGER = LoggerFactory.getLogger(ElasticSearchSearcher.class); private static final TimeValue TIMEOUT = TimeValue.timeValueMinutes(1); - private static final ImmutableList STORED_FIELDS = ImmutableList.of(JsonMessageConstants.MAILBOX_ID, + private static final ImmutableList<String> STORED_FIELDS = ImmutableList.of(JsonMessageConstants.MAILBOX_ID, JsonMessageConstants.UID, JsonMessageConstants.MESSAGE_ID); private final RestHighLevelClient client; diff --git a/mailbox/maildir/src/test/java/org/apache/james/mailbox/maildir/DomainUserMaildirMailboxManagerTest.java b/mailbox/maildir/src/test/java/org/apache/james/mailbox/maildir/DomainUserMaildirMailboxManagerTest.java index d246b35..bdae634 100644 --- a/mailbox/maildir/src/test/java/org/apache/james/mailbox/maildir/DomainUserMaildirMailboxManagerTest.java +++ b/mailbox/maildir/src/test/java/org/apache/james/mailbox/maildir/DomainUserMaildirMailboxManagerTest.java @@ -36,10 +36,10 @@ public class DomainUserMaildirMailboxManagerTest extends MailboxManagerTest<Stor } @Nested - class BasicFeaturesTests extends MailboxManagerTest.BasicFeaturesTests { + class BasicFeaturesTests extends MailboxManagerTest<StoreMailboxManager>.BasicFeaturesTests { @Disabled("MAILBOX-389 Mailbox rename fails with Maildir") @Test - void renameMailboxShouldChangeTheMailboxPathOfAMailbox() { + protected void renameMailboxShouldChangeTheMailboxPathOfAMailbox() { } } diff --git a/mailbox/maildir/src/test/java/org/apache/james/mailbox/maildir/FullUserMaildirMailboxManagerTest.java b/mailbox/maildir/src/test/java/org/apache/james/mailbox/maildir/FullUserMaildirMailboxManagerTest.java index d4d17dc..2af38dc 100644 --- a/mailbox/maildir/src/test/java/org/apache/james/mailbox/maildir/FullUserMaildirMailboxManagerTest.java +++ b/mailbox/maildir/src/test/java/org/apache/james/mailbox/maildir/FullUserMaildirMailboxManagerTest.java @@ -36,10 +36,10 @@ public class FullUserMaildirMailboxManagerTest extends MailboxManagerTest<StoreM } @Nested - class BasicFeaturesTests extends MailboxManagerTest.BasicFeaturesTests { + class BasicFeaturesTests extends MailboxManagerTest<StoreMailboxManager>.BasicFeaturesTests { @Disabled("MAILBOX-389 Mailbox rename fails with Maildir") @Test - void renameMailboxShouldChangeTheMailboxPathOfAMailbox() { + protected void renameMailboxShouldChangeTheMailboxPathOfAMailbox() { } } diff --git a/metrics/metrics-tests/src/main/java/org/apache/james/metrics/tests/RecordingMetric.java b/metrics/metrics-tests/src/main/java/org/apache/james/metrics/tests/RecordingMetric.java index 915f81b..74b9570 100644 --- a/metrics/metrics-tests/src/main/java/org/apache/james/metrics/tests/RecordingMetric.java +++ b/metrics/metrics-tests/src/main/java/org/apache/james/metrics/tests/RecordingMetric.java @@ -25,12 +25,10 @@ import java.util.function.Consumer; import org.apache.james.metrics.api.Metric; public class RecordingMetric implements Metric { - private final String name; private final AtomicInteger value; private final Consumer<Integer> publishCallback; - public RecordingMetric(String name, Consumer<Integer> publishCallback) { - this.name = name; + public RecordingMetric(Consumer<Integer> publishCallback) { this.value = new AtomicInteger(); this.publishCallback = publishCallback; } diff --git a/metrics/metrics-tests/src/main/java/org/apache/james/metrics/tests/RecordingMetricFactory.java b/metrics/metrics-tests/src/main/java/org/apache/james/metrics/tests/RecordingMetricFactory.java index 7127816..f18b9a6 100644 --- a/metrics/metrics-tests/src/main/java/org/apache/james/metrics/tests/RecordingMetricFactory.java +++ b/metrics/metrics-tests/src/main/java/org/apache/james/metrics/tests/RecordingMetricFactory.java @@ -39,7 +39,7 @@ public class RecordingMetricFactory implements MetricFactory { @Override public Metric generate(String name) { - return new RecordingMetric(name, executionValue -> counters.put(name, executionValue)); + return new RecordingMetric(executionValue -> counters.put(name, executionValue)); } @Override diff --git a/server/blob/blob-objectstorage/src/main/java/org/apache/james/blob/objectstorage/AESPayloadCodec.java b/server/blob/blob-objectstorage/src/main/java/org/apache/james/blob/objectstorage/AESPayloadCodec.java index ca0e54d..2b0eaee 100644 --- a/server/blob/blob-objectstorage/src/main/java/org/apache/james/blob/objectstorage/AESPayloadCodec.java +++ b/server/blob/blob-objectstorage/src/main/java/org/apache/james/blob/objectstorage/AESPayloadCodec.java @@ -36,8 +36,6 @@ import org.apache.commons.io.FileUtils; import org.apache.commons.io.IOUtils; import org.apache.james.blob.objectstorage.crypto.CryptoConfig; import org.jclouds.io.Payloads; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import com.google.common.io.ByteSource; import com.google.common.io.FileBackedOutputStream; @@ -47,7 +45,6 @@ import com.google.crypto.tink.subtle.AesGcmJce; public class AESPayloadCodec implements PayloadCodec { - private static final Logger LOGGER = LoggerFactory.getLogger(AESPayloadCodec.class); private static final byte[] EMPTY_ASSOCIATED_DATA = new byte[0]; private static final int PBKDF2_ITERATIONS = 65536; private static final int KEY_SIZE = 256; diff --git a/server/blob/blob-objectstorage/src/main/java/org/apache/james/blob/objectstorage/ObjectStorageBlobsDAO.java b/server/blob/blob-objectstorage/src/main/java/org/apache/james/blob/objectstorage/ObjectStorageBlobsDAO.java index 113d6b4..94605c5 100644 --- a/server/blob/blob-objectstorage/src/main/java/org/apache/james/blob/objectstorage/ObjectStorageBlobsDAO.java +++ b/server/blob/blob-objectstorage/src/main/java/org/apache/james/blob/objectstorage/ObjectStorageBlobsDAO.java @@ -114,7 +114,6 @@ public class ObjectStorageBlobsDAO implements BlobStore { } private Mono<BlobId> save(InputStream data, BlobId id) { - String containerName = this.containerName.value(); HashingInputStream hashingInputStream = new HashingInputStream(Hashing.sha256(), data); Payload payload = payloadCodec.write(hashingInputStream); Blob blob = blobStore.blobBuilder(id.asString()) diff --git a/server/container/guice/memory-guice/src/test/java/org/apache/james/GuiceJamesServerStartUpCheckTest.java b/server/container/guice/memory-guice/src/test/java/org/apache/james/GuiceJamesServerStartUpCheckTest.java index 61101f4..1301a25 100644 --- a/server/container/guice/memory-guice/src/test/java/org/apache/james/GuiceJamesServerStartUpCheckTest.java +++ b/server/container/guice/memory-guice/src/test/java/org/apache/james/GuiceJamesServerStartUpCheckTest.java @@ -80,6 +80,7 @@ class GuiceJamesServerStartUpCheckTest { private static final String CHECK_NAME = "TestBlobExportMechanismStartUpCheck"; + @SuppressWarnings("unused") private final BlobExportImplChoice blobExportImplChoice; @Inject diff --git a/server/container/guice/protocols/jmap/src/test/java/org/apache/james/jmap/JMAPModuleTest.java b/server/container/guice/protocols/jmap/src/test/java/org/apache/james/jmap/JMAPModuleTest.java index c4f2f6d..a0398a2 100644 --- a/server/container/guice/protocols/jmap/src/test/java/org/apache/james/jmap/JMAPModuleTest.java +++ b/server/container/guice/protocols/jmap/src/test/java/org/apache/james/jmap/JMAPModuleTest.java @@ -42,6 +42,7 @@ class JMAPModuleTest { private EnumSet<MailboxManager.MessageCapabilities> mockMessageCapabilities; private EnumSet<MailboxManager.SearchCapabilities> mockSearchCapabilities; + @SuppressWarnings("unchecked") @BeforeEach void beforeEach() { mockMailboxManager = mock(MailboxManager.class); diff --git a/server/mailet/integration-testing/src/test/java/org/apache/james/smtp/SmtpRandomStoringTest.java b/server/mailet/integration-testing/src/test/java/org/apache/james/smtp/SmtpRandomStoringTest.java index d313c9b..81f8958 100644 --- a/server/mailet/integration-testing/src/test/java/org/apache/james/smtp/SmtpRandomStoringTest.java +++ b/server/mailet/integration-testing/src/test/java/org/apache/james/smtp/SmtpRandomStoringTest.java @@ -154,13 +154,17 @@ public class SmtpRandomStoringTest { awaitAtMostTenSeconds .untilAsserted(() -> checkMailboxesHaveBeenFilled(connections, numberOfMails)); + + connections.forEach(Throwing.consumer(IMAPMessageReader::close)); } private IMAPMessageReader createIMAPConnection(String username) { try { - return new IMAPMessageReader() + IMAPMessageReader reader = new IMAPMessageReader(); + reader .connect(LOCALHOST_IP, imapProbe.getImapPort()) .login(username, PASSWORD); + return reader; } catch (IOException e) { throw new RuntimeException(e); } diff --git a/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/AliasMappingTest.java b/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/AliasMappingTest.java index 0fe2f42..595f938 100644 --- a/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/AliasMappingTest.java +++ b/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/AliasMappingTest.java @@ -75,7 +75,6 @@ public class AliasMappingTest { private static final String GROUP_ALIAS = GROUP + "-alias@" + DOMAIN; private static final String MESSAGE_CONTENT = "any text"; - private static final String RRT_ERROR = "rrt-error"; private static final MailRepositoryUrl RRT_ERROR_REPOSITORY = MailRepositoryUrl.from("file://var/mail/rrt-error/"); private TemporaryJamesServer jamesServer; 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 4c05393..9c62274 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 @@ -57,6 +57,7 @@ import org.apache.james.jmap.api.access.AccessToken; import org.apache.james.jmap.categories.BasicFeature; import org.apache.james.mailbox.DefaultMailboxes; import org.apache.james.mailbox.backup.ZipAssert; +import org.apache.james.mailbox.backup.ZipAssert.EntryChecks; import org.apache.james.mailbox.model.MailboxId; import org.apache.james.mailbox.probe.MailboxProbe; import org.apache.james.modules.MailboxProbeImpl; @@ -451,7 +452,7 @@ public abstract class DeletedMessagesVaultTest { try (ZipAssert zipAssert = assertThatZip(new FileInputStream(fileLocation))) { zipAssert.hasEntriesSize(1) - .allSatisfies(entry -> entry.hasName(messageIdOfHomer + ".eml")); + .allSatisfies(entry -> EntryChecks.hasName(messageIdOfHomer + ".eml")); } } @@ -474,7 +475,7 @@ public abstract class DeletedMessagesVaultTest { try (ZipAssert zipAssert = assertThatZip(new FileInputStream(fileLocation))) { zipAssert.hasEntriesSize(1) - .allSatisfies(entry -> entry.hasName(messageIdOfHomer + ".eml")); + .allSatisfies(entry -> EntryChecks.hasName(messageIdOfHomer + ".eml")); } } @@ -499,7 +500,7 @@ public abstract class DeletedMessagesVaultTest { try (ZipAssert zipAssert = assertThatZip(new FileInputStream(fileLocation))) { zipAssert.hasEntriesSize(1) - .allSatisfies(entry -> entry.hasName(messageIdOfHomer + ".eml")); + .allSatisfies(entry -> EntryChecks.hasName(messageIdOfHomer + ".eml")); } } @@ -511,7 +512,6 @@ public abstract class DeletedMessagesVaultTest { bartSendMessageToHomerWithSubject(SECOND_SUBJECT); WAIT_TWO_MINUTES.until(() -> listMessageIdsForAccount(homerAccessToken).size() == 2); - String secondMessageIdOfHomer = listMessageIdsForAccount(homerAccessToken).get(1); homerDeletesMessages(listMessageIdsForAccount(homerAccessToken)); WAIT_TWO_MINUTES.until(() -> listMessageIdsForAccount(homerAccessToken).size() == 0); @@ -621,7 +621,7 @@ public abstract class DeletedMessagesVaultTest { String fileLocation = exportAndGetFileLocationFromLastMail(EXPORT_ALL_HOMER_MESSAGES_TO_BART, bartAccessToken); try (ZipAssert zipAssert = assertThatZip(new FileInputStream(fileLocation))) { zipAssert.hasEntriesSize(1) - .allSatisfies(entry -> entry.hasName(messageIdOfNotExpiredMessage + ".eml")); + .allSatisfies(entry -> EntryChecks.hasName(messageIdOfNotExpiredMessage + ".eml")); } } @@ -707,7 +707,7 @@ public abstract class DeletedMessagesVaultTest { String fileLocation = exportAndGetFileLocationFromLastMail(EXPORT_ALL_HOMER_MESSAGES_TO_BART, bartAccessToken); try (ZipAssert zipAssert = assertThatZip(new FileInputStream(fileLocation))) { zipAssert.hasEntriesSize(1) - .allSatisfies(entry -> entry.hasName(messageIdOfHomer + ".eml")); + .allSatisfies(entry -> EntryChecks.hasName(messageIdOfHomer + ".eml")); } } diff --git a/server/protocols/webadmin/webadmin-data/src/main/java/org/apache/james/webadmin/routes/GroupsRoutes.java b/server/protocols/webadmin/webadmin-data/src/main/java/org/apache/james/webadmin/routes/GroupsRoutes.java index 0247dd3..756bd2c 100644 --- a/server/protocols/webadmin/webadmin-data/src/main/java/org/apache/james/webadmin/routes/GroupsRoutes.java +++ b/server/protocols/webadmin/webadmin-data/src/main/java/org/apache/james/webadmin/routes/GroupsRoutes.java @@ -34,7 +34,6 @@ import javax.ws.rs.Produces; import org.apache.james.core.Domain; import org.apache.james.core.MailAddress; import org.apache.james.core.User; -import org.apache.james.domainlist.api.DomainList; import org.apache.james.domainlist.api.DomainListException; import org.apache.james.rrt.api.MappingAlreadyExistsException; import org.apache.james.rrt.api.RecipientRewriteTable; @@ -84,16 +83,14 @@ public class GroupsRoutes implements Routes { private static final String ADDRESS_TYPE = "group"; private final UsersRepository usersRepository; - private final DomainList domainList; private final JsonTransformer jsonTransformer; private final RecipientRewriteTable recipientRewriteTable; @Inject @VisibleForTesting GroupsRoutes(RecipientRewriteTable recipientRewriteTable, UsersRepository usersRepository, - DomainList domainList, JsonTransformer jsonTransformer) { + JsonTransformer jsonTransformer) { this.usersRepository = usersRepository; - this.domainList = domainList; this.jsonTransformer = jsonTransformer; this.recipientRewriteTable = recipientRewriteTable; } diff --git a/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/GroupsRoutesTest.java b/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/GroupsRoutesTest.java index ffc42f6..cd9f6e7 100644 --- a/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/GroupsRoutesTest.java +++ b/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/GroupsRoutesTest.java @@ -115,7 +115,7 @@ class GroupsRoutesTest { usersRepository = MemoryUsersRepository.withVirtualHosting(); usersRepository.setDomainList(domainList); MappingSourceModule mappingSourceModule = new MappingSourceModule(); - createServer(new GroupsRoutes(memoryRecipientRewriteTable, usersRepository, domainList, new JsonTransformer(mappingSourceModule))); + createServer(new GroupsRoutes(memoryRecipientRewriteTable, usersRepository, new JsonTransformer(mappingSourceModule))); } @Test @@ -452,7 +452,7 @@ class GroupsRoutesTest { domainList = mock(DomainList.class); memoryRecipientRewriteTable.setDomainList(domainList); Mockito.when(domainList.containsDomain(any())).thenReturn(true); - createServer(new GroupsRoutes(memoryRecipientRewriteTable, userRepository, domainList, new JsonTransformer())); + createServer(new GroupsRoutes(memoryRecipientRewriteTable, userRepository, new JsonTransformer())); } @Test diff --git a/third-party/linshare/src/test/java/org/apache/james/linshare/Linshare.java b/third-party/linshare/src/test/java/org/apache/james/linshare/Linshare.java index 6f33518..ad30a50 100644 --- a/third-party/linshare/src/test/java/org/apache/james/linshare/Linshare.java +++ b/third-party/linshare/src/test/java/org/apache/james/linshare/Linshare.java @@ -49,7 +49,6 @@ public class Linshare { private Network network; - @SuppressWarnings("resource") public Linshare() { network = Network.newNetwork(); linshareDatabase = createDockerDatabase(); @@ -90,7 +89,8 @@ public class Linshare { return "http://"; + getIp() + ":" + getPort(); } - private GenericContainer createDockerDatabase() { + @SuppressWarnings("resource") + private GenericContainer<?> createDockerDatabase() { return new GenericContainer<>("linagora/linshare-database:2.2") .withNetworkAliases("database", "linshare_database") .withEnv("PGDATA", "/var/lib/postgresql/data/pgdata") @@ -99,26 +99,30 @@ public class Linshare { .withNetwork(network); } - private GenericContainer createDockerMongodb() { + @SuppressWarnings("resource") + private GenericContainer<?> createDockerMongodb() { return new GenericContainer<>("mongo:3.2") .withNetworkAliases("mongodb", "linshare_mongodb") .withCommand("mongod --smallfiles") .withNetwork(network); } - private GenericContainer createDockerLdap() { + @SuppressWarnings("resource") + private GenericContainer<?> createDockerLdap() { return new GenericContainer<>("linagora/linshare-ldap-for-tests:1.0") .withNetworkAliases("ldap") .withNetwork(network); } - private GenericContainer createDockerSmtp() { + @SuppressWarnings("resource") + private GenericContainer<?> createDockerSmtp() { return new GenericContainer<>(Images.FAKE_SMTP) .withNetworkAliases("smtp", "linshare_smtp") .withNetwork(network); } - private GenericContainer createDockerBackend() { + @SuppressWarnings("resource") + private GenericContainer<?> createDockerBackend() { return new GenericContainer<>( new ImageFromDockerfile() .withFileFromClasspath("conf/log4j.properties", "backend/conf/log4j.properties") @@ -142,7 +146,8 @@ public class Linshare { .withNetwork(network); } - private GenericContainer createLinshareBackendInit() { + @SuppressWarnings("resource") + private GenericContainer<?> createLinshareBackendInit() { return new GenericContainer<>("linagora/linshare-init:2.2") .withNetworkAliases("init") .withEnv("LS_HOST", "backend") diff --git a/third-party/linshare/src/test/java/org/apache/james/linshare/client/LinshareAPITest.java b/third-party/linshare/src/test/java/org/apache/james/linshare/client/LinshareAPITest.java index 85bc8d9..b93e4b8 100644 --- a/third-party/linshare/src/test/java/org/apache/james/linshare/client/LinshareAPITest.java +++ b/third-party/linshare/src/test/java/org/apache/james/linshare/client/LinshareAPITest.java @@ -255,7 +255,8 @@ class LinshareAPITest { return Files.createTempFile("linshare-api-test", ".temp").toFile(); } - private List<Document> sharedDocs(List<ReceivedShare>...shares) { + @SafeVarargs + private final List<Document> sharedDocs(List<ReceivedShare>... shares) { return ImmutableList.copyOf(shares).stream() .flatMap(Collection::stream) .map(ReceivedShare::getDocument) --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
