JAMES-2285 Fix Eclipse warning
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/25f691f2 Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/25f691f2 Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/25f691f2 Branch: refs/heads/master Commit: 25f691f2f098adf17c20706633c8d7ef2c8811b5 Parents: d51b5b6 Author: Antoine Duprat <[email protected]> Authored: Thu Jan 11 15:48:25 2018 +0100 Committer: benwa <[email protected]> Committed: Tue Jan 16 09:04:29 2018 +0700 ---------------------------------------------------------------------- .../cassandra/mail/task/MailboxMergingTask.java | 1 - .../mail/CassandraMailboxMapperTest.java | 3 - .../james/transport/mailets/ClassifyBounce.java | 3 - .../repository/file/AbstractFileRepository.java | 2 +- .../james/transport/mailets/SpamAssassin.java | 3 - .../samples/mailets/InstrumentationMailet.java | 1 - .../redirect/NotifyMailetsMessageTest.java | 2 +- .../cassandra/cucumber/CassandraStepdefs.java | 8 ++- .../integration/SetMessagesMethodTest.java | 6 +- .../integration/cucumber/ImapStepdefs.java | 62 +++++++++++--------- .../jmap/memory/cucumber/MemoryStepdefs.java | 6 +- .../apache/james/task/MemoryTaskManager.java | 2 +- 12 files changed, 52 insertions(+), 47 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/james-project/blob/25f691f2/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/task/MailboxMergingTask.java ---------------------------------------------------------------------- diff --git a/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/task/MailboxMergingTask.java b/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/task/MailboxMergingTask.java index c0849f9..7d0f48a 100644 --- a/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/task/MailboxMergingTask.java +++ b/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/task/MailboxMergingTask.java @@ -23,7 +23,6 @@ import java.util.Optional; import java.util.concurrent.atomic.AtomicLong; import org.apache.james.mailbox.cassandra.ids.CassandraId; -import org.apache.james.mailbox.cassandra.mail.CassandraMailboxCounterDAO; import org.apache.james.task.Task; import org.apache.james.task.TaskExecutionDetails; http://git-wip-us.apache.org/repos/asf/james-project/blob/25f691f2/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraMailboxMapperTest.java ---------------------------------------------------------------------- diff --git a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraMailboxMapperTest.java b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraMailboxMapperTest.java index b316a99..e761b7e 100644 --- a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraMailboxMapperTest.java +++ b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraMailboxMapperTest.java @@ -38,12 +38,9 @@ import org.junit.After; import org.junit.Before; import org.junit.ClassRule; import org.junit.Test; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; public class CassandraMailboxMapperTest { - private static final Logger LOGGER = LoggerFactory.getLogger(CassandraMailboxMapperTest.class); private static final int UID_VALIDITY = 52; private static final MailboxPath MAILBOX_PATH = MailboxPath.forUser("user", "name"); http://git-wip-us.apache.org/repos/asf/james-project/blob/25f691f2/mailet/standard/src/main/java/org/apache/james/transport/mailets/ClassifyBounce.java ---------------------------------------------------------------------- diff --git a/mailet/standard/src/main/java/org/apache/james/transport/mailets/ClassifyBounce.java b/mailet/standard/src/main/java/org/apache/james/transport/mailets/ClassifyBounce.java index bd1d2ab..fd500df 100644 --- a/mailet/standard/src/main/java/org/apache/james/transport/mailets/ClassifyBounce.java +++ b/mailet/standard/src/main/java/org/apache/james/transport/mailets/ClassifyBounce.java @@ -33,8 +33,6 @@ import javax.mail.internet.MimeMessage; import org.apache.mailet.Experimental; import org.apache.mailet.Mail; import org.apache.mailet.base.GenericMailet; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; /** @@ -48,7 +46,6 @@ import org.slf4j.LoggerFactory; */ @Experimental public class ClassifyBounce extends GenericMailet { - private static final Logger LOGGER = LoggerFactory.getLogger(ClassifyBounce.class); /** * The name of the header to be added. http://git-wip-us.apache.org/repos/asf/james-project/blob/25f691f2/server/data/data-library/src/main/java/org/apache/james/repository/file/AbstractFileRepository.java ---------------------------------------------------------------------- diff --git a/server/data/data-library/src/main/java/org/apache/james/repository/file/AbstractFileRepository.java b/server/data/data-library/src/main/java/org/apache/james/repository/file/AbstractFileRepository.java index bd2dfa1..8dab01f 100644 --- a/server/data/data-library/src/main/java/org/apache/james/repository/file/AbstractFileRepository.java +++ b/server/data/data-library/src/main/java/org/apache/james/repository/file/AbstractFileRepository.java @@ -188,7 +188,7 @@ public abstract class AbstractFileRepository implements Repository, Configurable throw new RuntimeException("Cannot initialize child " + "repository " + childName + " : " + e); } - if (DEBUG && LOGGER.isDebugEnabled()) { + if (LOGGER.isDebugEnabled()) { LOGGER.debug("Child repository of " + name + " created in " + baseDirectory + File.pathSeparatorChar + childName + File.pathSeparator); } http://git-wip-us.apache.org/repos/asf/james-project/blob/25f691f2/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/SpamAssassin.java ---------------------------------------------------------------------- diff --git a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/SpamAssassin.java b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/SpamAssassin.java index fbcb3f6..82b4817 100644 --- a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/SpamAssassin.java +++ b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/SpamAssassin.java @@ -29,8 +29,6 @@ import org.apache.james.util.scanner.SpamAssassinInvoker; import org.apache.mailet.Mail; import org.apache.mailet.base.GenericMailet; import org.apache.mailet.base.MailetUtil; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import com.google.common.annotations.VisibleForTesting; import com.google.common.base.Strings; @@ -60,7 +58,6 @@ import com.google.common.base.Strings; * </pre> */ public class SpamAssassin extends GenericMailet { - private static final Logger LOGGER = LoggerFactory.getLogger(SpamAssassin.class); public static final String SPAMD_HOST = "spamdHost"; public static final String SPAMD_PORT = "spamdPort"; public static final String DEFAULT_HOST = "127.0.0.1"; http://git-wip-us.apache.org/repos/asf/james-project/blob/25f691f2/server/mailet/mailets/src/test/java/org/apache/james/samples/mailets/InstrumentationMailet.java ---------------------------------------------------------------------- diff --git a/server/mailet/mailets/src/test/java/org/apache/james/samples/mailets/InstrumentationMailet.java b/server/mailet/mailets/src/test/java/org/apache/james/samples/mailets/InstrumentationMailet.java index f43c22e..c4d890f 100644 --- a/server/mailet/mailets/src/test/java/org/apache/james/samples/mailets/InstrumentationMailet.java +++ b/server/mailet/mailets/src/test/java/org/apache/james/samples/mailets/InstrumentationMailet.java @@ -148,7 +148,6 @@ public class InstrumentationMailet implements Mailet { LOGGER.info("######## MAIL ENDS"); } - @SuppressWarnings("Slf4jStringConcat") private void printAddresses(Address[] addresses, String prefix) { for (Address address1 : addresses) { if (address1 instanceof InternetAddress) { http://git-wip-us.apache.org/repos/asf/james-project/blob/25f691f2/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/redirect/NotifyMailetsMessageTest.java ---------------------------------------------------------------------- diff --git a/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/redirect/NotifyMailetsMessageTest.java b/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/redirect/NotifyMailetsMessageTest.java index ed73a91..a2fcb53 100644 --- a/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/redirect/NotifyMailetsMessageTest.java +++ b/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/redirect/NotifyMailetsMessageTest.java @@ -198,7 +198,7 @@ public class NotifyMailetsMessageTest { @Test public void getMessageInternalSizeShouldTransformMessagingErrorIntoEmpty() throws MessagingException { Mail mail = mock(Mail.class); - when(mail.getMessageSize()).thenThrow(MessagingException.class); + when(mail.getMessageSize()).thenThrow(new MessagingException()); assertThat(NotifyMailetsMessage.getMessageSizeEstimation(mail)) .isEqualTo(Optional.empty()); http://git-wip-us.apache.org/repos/asf/james-project/blob/25f691f2/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/src/test/java/org/apache/james/jmap/cassandra/cucumber/CassandraStepdefs.java ---------------------------------------------------------------------- diff --git a/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/src/test/java/org/apache/james/jmap/cassandra/cucumber/CassandraStepdefs.java b/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/src/test/java/org/apache/james/jmap/cassandra/cucumber/CassandraStepdefs.java index 1e86126..020bf99 100644 --- a/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/src/test/java/org/apache/james/jmap/cassandra/cucumber/CassandraStepdefs.java +++ b/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/src/test/java/org/apache/james/jmap/cassandra/cucumber/CassandraStepdefs.java @@ -29,6 +29,7 @@ import org.apache.james.CassandraJamesServerMain; import org.apache.james.GuiceJamesServer; import org.apache.james.backends.cassandra.DockerCassandraRule; import org.apache.james.backends.es.EmbeddedElasticSearch; +import org.apache.james.jmap.methods.integration.cucumber.ImapStepdefs; import org.apache.james.jmap.methods.integration.cucumber.MainStepdefs; import org.apache.james.mailbox.cassandra.ids.CassandraMessageId; import org.apache.james.mailbox.elasticsearch.MailboxElasticSearchConstants; @@ -45,13 +46,15 @@ import cucumber.runtime.java.guice.ScenarioScoped; public class CassandraStepdefs { private final MainStepdefs mainStepdefs; + private final ImapStepdefs imapStepdefs; private TemporaryFolder temporaryFolder = new TemporaryFolder(); private EmbeddedElasticSearch embeddedElasticSearch = new EmbeddedElasticSearch(temporaryFolder, MailboxElasticSearchConstants.DEFAULT_MAILBOX_INDEX); private DockerCassandraRule cassandraServer = CucumberCassandraSingleton.cassandraServer; @Inject - private CassandraStepdefs(MainStepdefs mainStepdefs) { + private CassandraStepdefs(MainStepdefs mainStepdefs, ImapStepdefs imapStepdefs) { this.mainStepdefs = mainStepdefs; + this.imapStepdefs = imapStepdefs; } @Before @@ -69,7 +72,8 @@ public class CassandraStepdefs { @After public void tearDown() { - ignoreFailures(mainStepdefs::tearDown, + ignoreFailures(imapStepdefs::closeConnections, + mainStepdefs::tearDown, () -> embeddedElasticSearch.after(), () -> temporaryFolder.delete()); } http://git-wip-us.apache.org/repos/asf/james-project/blob/25f691f2/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/SetMessagesMethodTest.java ---------------------------------------------------------------------- diff --git a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/SetMessagesMethodTest.java b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/SetMessagesMethodTest.java index 0aabe9f..979973f 100644 --- a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/SetMessagesMethodTest.java +++ b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/SetMessagesMethodTest.java @@ -4530,10 +4530,10 @@ public abstract class SetMessagesMethodTest { calmlyAwait.atMost(30, TimeUnit.SECONDS).until(() -> isAnyMessageFoundInInbox(accessToken)); - try (IMAPMessageReader imapMessageReader = new IMAPMessageReader() - .connect(LOCALHOST_IP, IMAP_PORT) + try (IMAPMessageReader imapMessageReader = new IMAPMessageReader()) { + imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT) .login(USERNAME, PASSWORD) - .select(MailboxConstants.INBOX)) { + .select(MailboxConstants.INBOX); assertThat(imapMessageReader.readFirstMessage()) .contains("X-MY-MULTIVALUATED-HEADER: first value") .contains("X-MY-MULTIVALUATED-HEADER: second value"); http://git-wip-us.apache.org/repos/asf/james-project/blob/25f691f2/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/cucumber/ImapStepdefs.java ---------------------------------------------------------------------- diff --git a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/cucumber/ImapStepdefs.java b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/cucumber/ImapStepdefs.java index 048e469..0b28b97 100644 --- a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/cucumber/ImapStepdefs.java +++ b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/cucumber/ImapStepdefs.java @@ -27,6 +27,7 @@ import javax.inject.Inject; import org.apache.james.utils.IMAPMessageReader; +import com.github.fge.lambdas.Throwing; import com.google.common.collect.Maps; import cucumber.api.java.en.Given; @@ -51,24 +52,29 @@ public class ImapStepdefs { this.imapConnections = Maps.newHashMap(); } + public void closeConnections() { + imapConnections.values().stream() + .forEach(Throwing.consumer(IMAPMessageReader::close)); + } + @Then("^the user has a IMAP message in mailbox \"([^\"]*)\"$") public void hasMessageInMailbox(String mailbox) throws Throwable { - try (IMAPMessageReader imapMessageReader = new IMAPMessageReader() - .connect(LOCALHOST, IMAP_PORT) - .login(userStepdefs.getConnectedUser(), - userStepdefs.getUserPassword(userStepdefs.getConnectedUser())) - .select(mailbox)) { + try (IMAPMessageReader imapMessageReader = new IMAPMessageReader()) { + imapMessageReader.connect(LOCALHOST, IMAP_PORT) + .login(userStepdefs.getConnectedUser(), + userStepdefs.getUserPassword(userStepdefs.getConnectedUser())) + .select(mailbox); assertThat(imapMessageReader.hasAMessage()).isTrue(); } } @Then("^the message has IMAP flag \"([^\"]*)\" in mailbox \"([^\"]*)\" for \"([^\"]*)\"$") public void hasMessageWithFlagInMailbox(String flags, String mailbox, String username) throws Throwable { - try (IMAPMessageReader imapMessageReader = new IMAPMessageReader() - .connect(LOCALHOST, IMAP_PORT) - .login(userStepdefs.getConnectedUser(), - userStepdefs.getUserPassword(username)) - .select(mailbox)) { + try (IMAPMessageReader imapMessageReader = new IMAPMessageReader()) { + imapMessageReader.connect(LOCALHOST, IMAP_PORT) + .login(userStepdefs.getConnectedUser(), + userStepdefs.getUserPassword(username)) + .select(mailbox); assertThat(imapMessageReader.hasAMessageWithFlags(flags)) .isTrue(); } @@ -76,11 +82,11 @@ public class ImapStepdefs { @Then("^the user has a IMAP notification about (\\d+) new message when selecting mailbox \"([^\"]*)\"$") public void hasANotificationAboutNewMessagesInMailbox(int numOfNewMessage, String mailbox) throws Throwable { - try (IMAPMessageReader imapMessageReader = new IMAPMessageReader() - .connect(LOCALHOST, IMAP_PORT) - .login(userStepdefs.getConnectedUser(), - userStepdefs.getUserPassword(userStepdefs.getConnectedUser())) - .select(mailbox)) { + try (IMAPMessageReader imapMessageReader = new IMAPMessageReader()) { + imapMessageReader.connect(LOCALHOST, IMAP_PORT) + .login(userStepdefs.getConnectedUser(), + userStepdefs.getUserPassword(userStepdefs.getConnectedUser())) + .select(mailbox); assertThat( imapMessageReader.userGetNotifiedForNewMessagesWhenSelectingMailbox(numOfNewMessage)) .isTrue(); @@ -89,16 +95,17 @@ public class ImapStepdefs { @Then("^the user does not have a IMAP message in mailbox \"([^\"]*)\"$") public void hasNoMessageInMailbox(String mailbox) throws Throwable { - try (IMAPMessageReader imapMessageReader = new IMAPMessageReader() - .connect(LOCALHOST, IMAP_PORT) - .login(userStepdefs.getConnectedUser(), - userStepdefs.getUserPassword(userStepdefs.getConnectedUser())) - .select(mailbox)) { + try (IMAPMessageReader imapMessageReader = new IMAPMessageReader()) { + imapMessageReader.connect(LOCALHOST, IMAP_PORT) + .login(userStepdefs.getConnectedUser(), + userStepdefs.getUserPassword(userStepdefs.getConnectedUser())) + .select(mailbox); assertThat(imapMessageReader.userDoesNotReceiveMessage()) .isTrue(); } } + @SuppressWarnings("resource") @Given("^the user has an open IMAP connection with mailbox \"([^\"]*)\" selected") public void openImapConnectionAndSelectMailbox(String mailbox) throws Throwable { String login = userStepdefs.getConnectedUser(); @@ -129,13 +136,14 @@ public class ImapStepdefs { String login = userStepdefs.getConnectedUser(); String password = userStepdefs.getUserPassword(login); - IMAPMessageReader imapMessageReader = new IMAPMessageReader() - .connect(LOCALHOST, IMAP_PORT) - .login(login, password) - .select(srcMailbox); - assertThat(imapMessageReader).isNotNull(); - imapMessageReader.copyFirstMessage(destMailbox); - mainStepdefs.awaitMethod.run(); + try (IMAPMessageReader imapMessageReader = new IMAPMessageReader()) { + imapMessageReader.connect(LOCALHOST, IMAP_PORT) + .login(login, password) + .select(srcMailbox); + assertThat(imapMessageReader).isNotNull(); + imapMessageReader.copyFirstMessage(destMailbox); + mainStepdefs.awaitMethod.run(); + } } @Then("^the user has IMAP EXPUNGE and a notification for (\\d+) message sequence number on connection for mailbox \"([^\"]*)\"$") http://git-wip-us.apache.org/repos/asf/james-project/blob/25f691f2/server/protocols/jmap-integration-testing/memory-jmap-integration-testing/src/test/java/org/apache/james/jmap/memory/cucumber/MemoryStepdefs.java ---------------------------------------------------------------------- diff --git a/server/protocols/jmap-integration-testing/memory-jmap-integration-testing/src/test/java/org/apache/james/jmap/memory/cucumber/MemoryStepdefs.java b/server/protocols/jmap-integration-testing/memory-jmap-integration-testing/src/test/java/org/apache/james/jmap/memory/cucumber/MemoryStepdefs.java index 36ba443..2fcbabe 100644 --- a/server/protocols/jmap-integration-testing/memory-jmap-integration-testing/src/test/java/org/apache/james/jmap/memory/cucumber/MemoryStepdefs.java +++ b/server/protocols/jmap-integration-testing/memory-jmap-integration-testing/src/test/java/org/apache/james/jmap/memory/cucumber/MemoryStepdefs.java @@ -25,6 +25,7 @@ import org.apache.activemq.store.PersistenceAdapter; import org.apache.activemq.store.memory.MemoryPersistenceAdapter; import org.apache.james.GuiceJamesServer; import org.apache.james.MemoryJamesServerMain; +import org.apache.james.jmap.methods.integration.cucumber.ImapStepdefs; import org.apache.james.jmap.methods.integration.cucumber.MainStepdefs; import org.apache.james.jmap.servers.MemoryJmapServerModule; import org.apache.james.mailbox.inmemory.InMemoryMessageId; @@ -39,11 +40,13 @@ import cucumber.runtime.java.guice.ScenarioScoped; public class MemoryStepdefs { private final MainStepdefs mainStepdefs; + private final ImapStepdefs imapStepdefs; private final TemporaryFolder temporaryFolder; @Inject - private MemoryStepdefs(MainStepdefs mainStepdefs) { + private MemoryStepdefs(MainStepdefs mainStepdefs, ImapStepdefs imapStepdefs) { this.mainStepdefs = mainStepdefs; + this.imapStepdefs = imapStepdefs; this.temporaryFolder = new TemporaryFolder(); } @@ -61,6 +64,7 @@ public class MemoryStepdefs { @After public void tearDown() { + imapStepdefs.closeConnections(); mainStepdefs.tearDown(); temporaryFolder.delete(); } http://git-wip-us.apache.org/repos/asf/james-project/blob/25f691f2/server/task/src/main/java/org/apache/james/task/MemoryTaskManager.java ---------------------------------------------------------------------- diff --git a/server/task/src/main/java/org/apache/james/task/MemoryTaskManager.java b/server/task/src/main/java/org/apache/james/task/MemoryTaskManager.java index 3475b02..e0cbcc2 100644 --- a/server/task/src/main/java/org/apache/james/task/MemoryTaskManager.java +++ b/server/task/src/main/java/org/apache/james/task/MemoryTaskManager.java @@ -43,7 +43,7 @@ public class MemoryTaskManager implements TaskManager { private static final Logger LOGGER = LoggerFactory.getLogger(MemoryTaskManager.class); private final ConcurrentHashMap<TaskId, TaskExecutionDetails> idToExecutionDetails; - private final ConcurrentHashMap<TaskId, Future> idToFuture; + private final ConcurrentHashMap<TaskId, Future<?>> idToFuture; private final ExecutorService executor; public MemoryTaskManager() { --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
