JAMES-2124 Fix more eclipse warnings
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/c147f0a0 Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/c147f0a0 Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/c147f0a0 Branch: refs/heads/master Commit: c147f0a09c3d734d381e87698cdbc5129db271c7 Parents: 4ba8102 Author: Raphael Ouazana <[email protected]> Authored: Thu Aug 24 15:25:59 2017 +0200 Committer: benwa <[email protected]> Committed: Fri Aug 25 18:18:24 2017 +0700 ---------------------------------------------------------------------- .../main/java/org/apache/james/mailbox/MailboxListener.java | 1 - .../java/org/apache/james/mailbox/mock/MockMailboxSession.java | 2 -- .../java/org/apache/james/mailbox/jcr/JCRMailboxManager.java | 5 ----- .../java/org/apache/james/mailbox/jcr/JCRMessageManager.java | 6 +----- .../org/apache/james/mailbox/store/search/MessageSearches.java | 5 +---- .../james/mailbox/store/search/SimpleMessageSearchIndex.java | 2 +- .../apache/james/mailbox/store/GroupFolderResolverTest.java | 2 -- .../java/org/apache/james/mpt/protocol/ProtocolSession.java | 1 - .../java/org/apache/james/imap/processor/EnableProcessor.java | 2 -- .../apache/james/protocols/lmtp/AbstractLMTPServerTest.java | 4 ---- .../apache/james/protocols/pop3/AbstractPOP3ServerTest.java | 3 --- .../james/protocols/pop3/AbstractStartTlsPOP3ServerTest.java | 3 --- .../apache/james/protocols/smtp/AbstractSMTPServerTest.java | 3 --- .../protocols/smtp/netty/NettyStartTlsSMTPServerTest.java | 3 --- .../org/apache/james/utils/InMemoryMailRepositoryStore.java | 4 ---- .../org/apache/james/modules/data/JPADomainListModule.java | 4 ---- .../apache/james/adapter/mailbox/MailboxManagementTest.java | 3 --- .../mailrepositorystore/MailRepositoryStoreBeanFactory.java | 5 ----- .../lifecycle/osgi/OsgiLifecycleBeanFactoryPostProcessor.java | 1 + .../src/test/java/org/apache/james/util/MDCBuilderTest.java | 1 + .../apache/james/mailrepository/api/MailRepositoryStore.java | 1 - .../apache/james/mailrepository/jdbc/MessageInputStream.java | 1 - .../james/dnsservice/api/TemporaryResolutionException.java | 1 - .../james/mailetcontainer/impl/JamesMailetContextTest.java | 4 ---- .../apache/james/samples/mailets/InstrumentationMailet.java | 2 -- .../james/transport/mailets/remoteDelivery/BouncerTest.java | 3 --- .../transport/mailets/remoteDelivery/DeliveryRunnableTest.java | 3 --- .../apache/james/jmap/AccessTokenAuthenticationStrategy.java | 4 ---- .../james/imapserver/netty/NettyImapRequestLineReader.java | 1 - .../lib/jmx/AbstractCommandHandlerResultJMXMonitor.java | 2 +- .../lib/jmx/AbstractConnectHandlerResultJMXMonitor.java | 1 + .../protocols/lib/jmx/AbstractLineHandlerResultJMXMonitor.java | 1 + .../org/apache/james/pop3server/POP3TestConfiguration.java | 1 - .../src/main/java/org/apache/james/smtpserver/TLDLookup.java | 3 --- .../org/apache/james/smtpserver/SMTPTestConfiguration.java | 1 - .../org/apache/james/queue/activemq/ActiveMQMailQueueTest.java | 4 ---- .../src/main/java/org/apache/james/queue/api/MailQueue.java | 1 - .../org/apache/james/queue/jms/AbstractJMSMailQueueTest.java | 3 --- 38 files changed, 8 insertions(+), 89 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/james-project/blob/c147f0a0/mailbox/api/src/main/java/org/apache/james/mailbox/MailboxListener.java ---------------------------------------------------------------------- diff --git a/mailbox/api/src/main/java/org/apache/james/mailbox/MailboxListener.java b/mailbox/api/src/main/java/org/apache/james/mailbox/MailboxListener.java index 32afb9c..2b074a1 100644 --- a/mailbox/api/src/main/java/org/apache/james/mailbox/MailboxListener.java +++ b/mailbox/api/src/main/java/org/apache/james/mailbox/MailboxListener.java @@ -60,7 +60,6 @@ public interface MailboxListener { /** * A mailbox event. */ - @SuppressWarnings("serial") abstract class Event implements Serializable { private final MailboxSession session; private final MailboxPath path; http://git-wip-us.apache.org/repos/asf/james-project/blob/c147f0a0/mailbox/api/src/test/java/org/apache/james/mailbox/mock/MockMailboxSession.java ---------------------------------------------------------------------- diff --git a/mailbox/api/src/test/java/org/apache/james/mailbox/mock/MockMailboxSession.java b/mailbox/api/src/test/java/org/apache/james/mailbox/mock/MockMailboxSession.java index 0a01ab5..1035687 100644 --- a/mailbox/api/src/test/java/org/apache/james/mailbox/mock/MockMailboxSession.java +++ b/mailbox/api/src/test/java/org/apache/james/mailbox/mock/MockMailboxSession.java @@ -27,8 +27,6 @@ import java.util.Map; import java.util.Random; import org.apache.james.mailbox.MailboxSession; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; public class MockMailboxSession implements MailboxSession{ http://git-wip-us.apache.org/repos/asf/james-project/blob/c147f0a0/mailbox/jcr/src/main/java/org/apache/james/mailbox/jcr/JCRMailboxManager.java ---------------------------------------------------------------------- diff --git a/mailbox/jcr/src/main/java/org/apache/james/mailbox/jcr/JCRMailboxManager.java b/mailbox/jcr/src/main/java/org/apache/james/mailbox/jcr/JCRMailboxManager.java index c330140..7ab1b4f 100644 --- a/mailbox/jcr/src/main/java/org/apache/james/mailbox/jcr/JCRMailboxManager.java +++ b/mailbox/jcr/src/main/java/org/apache/james/mailbox/jcr/JCRMailboxManager.java @@ -35,8 +35,6 @@ import org.apache.james.mailbox.store.StoreMailboxManager; import org.apache.james.mailbox.store.StoreMessageManager; import org.apache.james.mailbox.store.mail.model.Mailbox; import org.apache.james.mailbox.store.mail.model.impl.MessageParser; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; /** * JCR implementation of a MailboxManager @@ -44,8 +42,6 @@ import org.slf4j.LoggerFactory; */ public class JCRMailboxManager extends StoreMailboxManager implements JCRImapConstants { - private final Logger logger = LoggerFactory.getLogger(JCRMailboxManager.class); - public JCRMailboxManager(JCRMailboxSessionMapperFactory mapperFactory, Authenticator authenticator, Authorizator authorizator, MailboxACLResolver aclResolver, GroupMembershipResolver groupMembershipResolver, MessageParser messageParser, MessageId.Factory messageIdFactory) { @@ -72,7 +68,6 @@ public class JCRMailboxManager extends StoreMailboxManager implements JCRImapCon (JCRMailbox) mailboxEntity, getAclResolver(), getGroupMembershipResolver(), - logger, getQuotaManager(), getQuotaRootResolver(), getMessageParser(), http://git-wip-us.apache.org/repos/asf/james-project/blob/c147f0a0/mailbox/jcr/src/main/java/org/apache/james/mailbox/jcr/JCRMessageManager.java ---------------------------------------------------------------------- diff --git a/mailbox/jcr/src/main/java/org/apache/james/mailbox/jcr/JCRMessageManager.java b/mailbox/jcr/src/main/java/org/apache/james/mailbox/jcr/JCRMessageManager.java index 7307087..08b4688 100644 --- a/mailbox/jcr/src/main/java/org/apache/james/mailbox/jcr/JCRMessageManager.java +++ b/mailbox/jcr/src/main/java/org/apache/james/mailbox/jcr/JCRMessageManager.java @@ -44,7 +44,6 @@ import org.apache.james.mailbox.store.mail.model.MailboxMessage; import org.apache.james.mailbox.store.mail.model.impl.MessageParser; import org.apache.james.mailbox.store.mail.model.impl.PropertyBuilder; import org.apache.james.mailbox.store.search.MessageSearchIndex; -import org.slf4j.Logger; /** * JCR implementation of a {@link org.apache.james.mailbox.MessageManager} @@ -52,16 +51,13 @@ import org.slf4j.Logger; */ public class JCRMessageManager extends StoreMessageManager { - private final Logger log; - public JCRMessageManager(MailboxSessionMapperFactory mapperFactory, MessageSearchIndex index, final MailboxEventDispatcher dispatcher, MailboxPathLocker locker, JCRMailbox mailbox, - MailboxACLResolver aclResolver, GroupMembershipResolver groupMembershipResolver, Logger log, + MailboxACLResolver aclResolver, GroupMembershipResolver groupMembershipResolver, QuotaManager quotaManager, QuotaRootResolver quotaRootResolver, MessageParser messageParser, MessageId.Factory messageIdFactory, BatchSizes batchSizes, ImmutableMailboxMessage.Factory immutableMailboxMessageFactory) throws MailboxException { super(mapperFactory, index, dispatcher, locker, mailbox, aclResolver, groupMembershipResolver, quotaManager, quotaRootResolver, messageParser, messageIdFactory, batchSizes, immutableMailboxMessageFactory); - this.log = log; } http://git-wip-us.apache.org/repos/asf/james-project/blob/c147f0a0/mailbox/store/src/main/java/org/apache/james/mailbox/store/search/MessageSearches.java ---------------------------------------------------------------------- diff --git a/mailbox/store/src/main/java/org/apache/james/mailbox/store/search/MessageSearches.java b/mailbox/store/src/main/java/org/apache/james/mailbox/store/search/MessageSearches.java index 5625a31..7f99d34 100644 --- a/mailbox/store/src/main/java/org/apache/james/mailbox/store/search/MessageSearches.java +++ b/mailbox/store/src/main/java/org/apache/james/mailbox/store/search/MessageSearches.java @@ -37,7 +37,6 @@ import java.util.TimeZone; import javax.mail.Flags; -import org.apache.james.mailbox.MailboxSession; import org.apache.james.mailbox.MessageUid; import org.apache.james.mailbox.exception.MailboxException; import org.apache.james.mailbox.exception.UnsupportedSearchException; @@ -95,12 +94,10 @@ public class MessageSearches implements Iterable<SimpleMessageSearchIndex.Search private Iterator<MailboxMessage> messages; private SearchQuery query; - private MailboxSession session; - public MessageSearches(Iterator<MailboxMessage> messages, SearchQuery query, MailboxSession session) { + public MessageSearches(Iterator<MailboxMessage> messages, SearchQuery query) { this.messages = messages; this.query = query; - this.session = session; } /** http://git-wip-us.apache.org/repos/asf/james-project/blob/c147f0a0/mailbox/store/src/main/java/org/apache/james/mailbox/store/search/SimpleMessageSearchIndex.java ---------------------------------------------------------------------- diff --git a/mailbox/store/src/main/java/org/apache/james/mailbox/store/search/SimpleMessageSearchIndex.java b/mailbox/store/src/main/java/org/apache/james/mailbox/store/search/SimpleMessageSearchIndex.java index 60f98a8..a716105 100644 --- a/mailbox/store/src/main/java/org/apache/james/mailbox/store/search/SimpleMessageSearchIndex.java +++ b/mailbox/store/src/main/java/org/apache/james/mailbox/store/search/SimpleMessageSearchIndex.java @@ -140,7 +140,7 @@ public class SimpleMessageSearchIndex implements MessageSearchIndex { hitSet.add(m); } } - return ImmutableList.copyOf(new MessageSearches(hitSet.iterator(), query, session).iterator()); + return ImmutableList.copyOf(new MessageSearches(hitSet.iterator(), query).iterator()); } private boolean isMatchingUser(MailboxSession session, Mailbox mailbox) { http://git-wip-us.apache.org/repos/asf/james-project/blob/c147f0a0/mailbox/store/src/test/java/org/apache/james/mailbox/store/GroupFolderResolverTest.java ---------------------------------------------------------------------- diff --git a/mailbox/store/src/test/java/org/apache/james/mailbox/store/GroupFolderResolverTest.java b/mailbox/store/src/test/java/org/apache/james/mailbox/store/GroupFolderResolverTest.java index be87636..6f0cee6 100644 --- a/mailbox/store/src/test/java/org/apache/james/mailbox/store/GroupFolderResolverTest.java +++ b/mailbox/store/src/test/java/org/apache/james/mailbox/store/GroupFolderResolverTest.java @@ -28,12 +28,10 @@ import org.apache.james.mailbox.model.MailboxConstants; import org.apache.james.mailbox.model.MailboxPath; import org.apache.james.mailbox.store.mail.model.impl.SimpleMailbox; import org.junit.Test; -import org.slf4j.Logger; public class GroupFolderResolverTest { private static final long UID_VALIDITY = 9999; - private Logger log = null; private List<Locale> localePreferences = null; private List<String> sharedSpaces = null; private char pathSeparator = ' '; http://git-wip-us.apache.org/repos/asf/james-project/blob/c147f0a0/mpt/core/src/main/java/org/apache/james/mpt/protocol/ProtocolSession.java ---------------------------------------------------------------------- diff --git a/mpt/core/src/main/java/org/apache/james/mpt/protocol/ProtocolSession.java b/mpt/core/src/main/java/org/apache/james/mpt/protocol/ProtocolSession.java index 0581e2e..1f7c4ce 100644 --- a/mpt/core/src/main/java/org/apache/james/mpt/protocol/ProtocolSession.java +++ b/mpt/core/src/main/java/org/apache/james/mpt/protocol/ProtocolSession.java @@ -679,7 +679,6 @@ public class ProtocolSession implements ProtocolInteractor { * An exception which is thrown when the actual response from a server is * different from that expected. */ - @SuppressWarnings("serial") public static class InvalidServerResponseException extends Exception { public InvalidServerResponseException(String message) { super(message); http://git-wip-us.apache.org/repos/asf/james-project/blob/c147f0a0/protocols/imap/src/main/java/org/apache/james/imap/processor/EnableProcessor.java ---------------------------------------------------------------------- diff --git a/protocols/imap/src/main/java/org/apache/james/imap/processor/EnableProcessor.java b/protocols/imap/src/main/java/org/apache/james/imap/processor/EnableProcessor.java index edce42d..6d630ae 100644 --- a/protocols/imap/src/main/java/org/apache/james/imap/processor/EnableProcessor.java +++ b/protocols/imap/src/main/java/org/apache/james/imap/processor/EnableProcessor.java @@ -45,8 +45,6 @@ import org.slf4j.LoggerFactory; import com.google.common.collect.ImmutableList; -import com.google.common.collect.ImmutableList; - public class EnableProcessor extends AbstractMailboxProcessor<EnableRequest> implements CapabilityImplementingProcessor { private static final Logger LOGGER = LoggerFactory.getLogger(EnableProcessor.class); http://git-wip-us.apache.org/repos/asf/james-project/blob/c147f0a0/protocols/lmtp/src/test/java/org/apache/james/protocols/lmtp/AbstractLMTPServerTest.java ---------------------------------------------------------------------- diff --git a/protocols/lmtp/src/test/java/org/apache/james/protocols/lmtp/AbstractLMTPServerTest.java b/protocols/lmtp/src/test/java/org/apache/james/protocols/lmtp/AbstractLMTPServerTest.java index f2badab..dee82d3 100644 --- a/protocols/lmtp/src/test/java/org/apache/james/protocols/lmtp/AbstractLMTPServerTest.java +++ b/protocols/lmtp/src/test/java/org/apache/james/protocols/lmtp/AbstractLMTPServerTest.java @@ -51,13 +51,9 @@ import org.apache.james.protocols.smtp.hook.MessageHook; import org.apache.james.protocols.smtp.utils.TestMessageHook; import org.junit.Ignore; import org.junit.Test; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; public abstract class AbstractLMTPServerTest extends AbstractSMTPServerTest{ - private static final Logger LOGGER = LoggerFactory.getLogger(AbstractLMTPServerTest.class); - @Override protected Protocol createProtocol(ProtocolHandler... handlers) throws WiringException { LMTPProtocolHandlerChain chain = new LMTPProtocolHandlerChain(); http://git-wip-us.apache.org/repos/asf/james-project/blob/c147f0a0/protocols/pop3/src/test/java/org/apache/james/protocols/pop3/AbstractPOP3ServerTest.java ---------------------------------------------------------------------- diff --git a/protocols/pop3/src/test/java/org/apache/james/protocols/pop3/AbstractPOP3ServerTest.java b/protocols/pop3/src/test/java/org/apache/james/protocols/pop3/AbstractPOP3ServerTest.java index dda1f7f..595a938 100644 --- a/protocols/pop3/src/test/java/org/apache/james/protocols/pop3/AbstractPOP3ServerTest.java +++ b/protocols/pop3/src/test/java/org/apache/james/protocols/pop3/AbstractPOP3ServerTest.java @@ -42,14 +42,11 @@ import org.apache.james.protocols.pop3.utils.MockMailbox; import org.apache.james.protocols.pop3.utils.MockMailbox.Message; import org.apache.james.protocols.pop3.utils.TestPassCmdHandler; import org.junit.Test; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; public abstract class AbstractPOP3ServerTest { private static final Message MESSAGE1 = new Message("Subject: test\r\nX-Header: value\r\n", "My Body\r\n"); private static final Message MESSAGE2 = new Message("Subject: test2\r\nX-Header: value2\r\n", "My Body with a DOT.\r\n.\r\n"); - private static final Logger LOGGER = LoggerFactory.getLogger(AbstractPOP3ServerTest.class); private POP3Protocol createProtocol(AbstractPassCmdHandler handler) throws WiringException { return new POP3Protocol(new POP3ProtocolHandlerChain(handler), new POP3Configuration()); http://git-wip-us.apache.org/repos/asf/james-project/blob/c147f0a0/protocols/pop3/src/test/java/org/apache/james/protocols/pop3/AbstractStartTlsPOP3ServerTest.java ---------------------------------------------------------------------- diff --git a/protocols/pop3/src/test/java/org/apache/james/protocols/pop3/AbstractStartTlsPOP3ServerTest.java b/protocols/pop3/src/test/java/org/apache/james/protocols/pop3/AbstractStartTlsPOP3ServerTest.java index 418f749..eae5020 100644 --- a/protocols/pop3/src/test/java/org/apache/james/protocols/pop3/AbstractStartTlsPOP3ServerTest.java +++ b/protocols/pop3/src/test/java/org/apache/james/protocols/pop3/AbstractStartTlsPOP3ServerTest.java @@ -37,14 +37,11 @@ import org.apache.james.protocols.pop3.core.AbstractPassCmdHandler; import org.apache.james.protocols.pop3.utils.MockMailbox; import org.apache.james.protocols.pop3.utils.TestPassCmdHandler; import org.junit.Test; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; public abstract class AbstractStartTlsPOP3ServerTest { private static final String LOCALHOST_IP = "127.0.0.1"; private static final int RANDOM_PORT = 0; - private static final Logger LOGGER = LoggerFactory.getLogger(AbstractStartTlsPOP3ServerTest.class); private POP3Protocol createProtocol(AbstractPassCmdHandler handler) throws WiringException { return new POP3Protocol(new POP3ProtocolHandlerChain(handler), new POP3Configuration()); http://git-wip-us.apache.org/repos/asf/james-project/blob/c147f0a0/protocols/smtp/src/test/java/org/apache/james/protocols/smtp/AbstractSMTPServerTest.java ---------------------------------------------------------------------- diff --git a/protocols/smtp/src/test/java/org/apache/james/protocols/smtp/AbstractSMTPServerTest.java b/protocols/smtp/src/test/java/org/apache/james/protocols/smtp/AbstractSMTPServerTest.java index b29b329..bae1991 100644 --- a/protocols/smtp/src/test/java/org/apache/james/protocols/smtp/AbstractSMTPServerTest.java +++ b/protocols/smtp/src/test/java/org/apache/james/protocols/smtp/AbstractSMTPServerTest.java @@ -53,8 +53,6 @@ import org.apache.james.protocols.smtp.hook.RcptHook; import org.apache.james.protocols.smtp.utils.TestMessageHook; import org.apache.james.util.concurrency.ConcurrentTestRunner; import org.junit.Test; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import com.google.common.base.Charsets; import com.google.common.io.CharStreams; @@ -65,7 +63,6 @@ public abstract class AbstractSMTPServerTest { protected final static String SENDER = "me@sender"; protected final static String RCPT1 ="rpct1@domain"; protected final static String RCPT2 ="rpct2@domain"; - private static final Logger LOGGER = LoggerFactory.getLogger(AbstractSMTPServerTest.class); @Test public void testSimpleDelivery() throws Exception { http://git-wip-us.apache.org/repos/asf/james-project/blob/c147f0a0/protocols/smtp/src/test/java/org/apache/james/protocols/smtp/netty/NettyStartTlsSMTPServerTest.java ---------------------------------------------------------------------- diff --git a/protocols/smtp/src/test/java/org/apache/james/protocols/smtp/netty/NettyStartTlsSMTPServerTest.java b/protocols/smtp/src/test/java/org/apache/james/protocols/smtp/netty/NettyStartTlsSMTPServerTest.java index 624b2dc..5c4750e 100644 --- a/protocols/smtp/src/test/java/org/apache/james/protocols/smtp/netty/NettyStartTlsSMTPServerTest.java +++ b/protocols/smtp/src/test/java/org/apache/james/protocols/smtp/netty/NettyStartTlsSMTPServerTest.java @@ -53,8 +53,6 @@ import org.apache.james.protocols.smtp.utils.TestMessageHook; import org.assertj.core.api.AssertDelegateTarget; import org.junit.After; import org.junit.Test; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import com.google.common.base.Optional; import com.sun.mail.smtp.SMTPTransport; @@ -63,7 +61,6 @@ public class NettyStartTlsSMTPServerTest { private static final String LOCALHOST_IP = "127.0.0.1"; private static final int RANDOM_PORT = 0; - private static final Logger LOGGER = LoggerFactory.getLogger(NettyStartTlsSMTPServerTest.class); private SMTPSClient smtpsClient = null; private ProtocolServer server = null; http://git-wip-us.apache.org/repos/asf/james-project/blob/c147f0a0/server/container/guice/guice-common/src/main/java/org/apache/james/utils/InMemoryMailRepositoryStore.java ---------------------------------------------------------------------- diff --git a/server/container/guice/guice-common/src/main/java/org/apache/james/utils/InMemoryMailRepositoryStore.java b/server/container/guice/guice-common/src/main/java/org/apache/james/utils/InMemoryMailRepositoryStore.java index 1c11f3b..17b87a2 100644 --- a/server/container/guice/guice-common/src/main/java/org/apache/james/utils/InMemoryMailRepositoryStore.java +++ b/server/container/guice/guice-common/src/main/java/org/apache/james/utils/InMemoryMailRepositoryStore.java @@ -31,7 +31,6 @@ import org.apache.commons.configuration.ConfigurationException; import org.apache.commons.configuration.DefaultConfigurationBuilder; import org.apache.commons.configuration.HierarchicalConfiguration; import org.apache.james.lifecycle.api.Configurable; -import org.apache.james.lifecycle.api.LogEnabled; import org.apache.james.mailrepository.api.MailRepository; import org.apache.james.mailrepository.api.MailRepositoryStore; import org.apache.james.repository.api.Initializable; @@ -135,9 +134,6 @@ public class InMemoryMailRepositoryStore implements MailRepositoryStore, Configu private MailRepository initialiseNewRepository(MailRepository mailRepository, CombinedConfiguration config) throws MailRepositoryStoreException { try { - if (mailRepository instanceof LogEnabled) { - ((LogEnabled) mailRepository).setLog(LOGGER); - } if (mailRepository instanceof Configurable) { ((Configurable) mailRepository).configure(config); } http://git-wip-us.apache.org/repos/asf/james-project/blob/c147f0a0/server/container/guice/jpa-common-guice/src/main/java/org/apache/james/modules/data/JPADomainListModule.java ---------------------------------------------------------------------- diff --git a/server/container/guice/jpa-common-guice/src/main/java/org/apache/james/modules/data/JPADomainListModule.java b/server/container/guice/jpa-common-guice/src/main/java/org/apache/james/modules/data/JPADomainListModule.java index 7f2be3d..1761e3a 100644 --- a/server/container/guice/jpa-common-guice/src/main/java/org/apache/james/modules/data/JPADomainListModule.java +++ b/server/container/guice/jpa-common-guice/src/main/java/org/apache/james/modules/data/JPADomainListModule.java @@ -26,8 +26,6 @@ import org.apache.james.domainlist.jpa.JPADomainList; import org.apache.james.lifecycle.api.Configurable; import org.apache.james.utils.ConfigurationPerformer; import org.apache.james.utils.ConfigurationProvider; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import com.google.common.base.Throwables; import com.google.common.collect.ImmutableList; @@ -39,8 +37,6 @@ import com.google.inject.multibindings.Multibinder; public class JPADomainListModule extends AbstractModule { - private static final Logger LOGGER = LoggerFactory.getLogger(DomainList.class); - @Override public void configure() { bind(JPADomainList.class).in(Scopes.SINGLETON); http://git-wip-us.apache.org/repos/asf/james-project/blob/c147f0a0/server/container/mailbox-adapter/src/test/java/org/apache/james/adapter/mailbox/MailboxManagementTest.java ---------------------------------------------------------------------- diff --git a/server/container/mailbox-adapter/src/test/java/org/apache/james/adapter/mailbox/MailboxManagementTest.java b/server/container/mailbox-adapter/src/test/java/org/apache/james/adapter/mailbox/MailboxManagementTest.java index 5a19e55..c5f2410 100644 --- a/server/container/mailbox-adapter/src/test/java/org/apache/james/adapter/mailbox/MailboxManagementTest.java +++ b/server/container/mailbox-adapter/src/test/java/org/apache/james/adapter/mailbox/MailboxManagementTest.java @@ -45,14 +45,11 @@ import org.apache.james.mailbox.store.mail.model.impl.MessageParser; import org.apache.james.mailbox.store.mail.model.impl.SimpleMailbox; import org.junit.Before; import org.junit.Test; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import com.google.common.base.Charsets; public class MailboxManagementTest { - private static final Logger LOGGER = LoggerFactory.getLogger(MailboxManagementTest.class); public static final String USER = "user"; public static final int UID_VALIDITY = 10; public static final int LIMIT = 1; http://git-wip-us.apache.org/repos/asf/james-project/blob/c147f0a0/server/container/spring/src/main/java/org/apache/james/container/spring/bean/factory/mailrepositorystore/MailRepositoryStoreBeanFactory.java ---------------------------------------------------------------------- diff --git a/server/container/spring/src/main/java/org/apache/james/container/spring/bean/factory/mailrepositorystore/MailRepositoryStoreBeanFactory.java b/server/container/spring/src/main/java/org/apache/james/container/spring/bean/factory/mailrepositorystore/MailRepositoryStoreBeanFactory.java index 4c93944..53a7b7d 100644 --- a/server/container/spring/src/main/java/org/apache/james/container/spring/bean/factory/mailrepositorystore/MailRepositoryStoreBeanFactory.java +++ b/server/container/spring/src/main/java/org/apache/james/container/spring/bean/factory/mailrepositorystore/MailRepositoryStoreBeanFactory.java @@ -32,7 +32,6 @@ import org.apache.commons.configuration.DefaultConfigurationBuilder; import org.apache.commons.configuration.HierarchicalConfiguration; import org.apache.james.container.spring.bean.factory.AbstractBeanFactory; import org.apache.james.lifecycle.api.Configurable; -import org.apache.james.lifecycle.api.LogEnabled; import org.apache.james.mailrepository.api.MailRepository; import org.apache.james.mailrepository.api.MailRepositoryStore; import org.slf4j.Logger; @@ -194,10 +193,6 @@ public class MailRepositoryStoreBeanFactory extends AbstractBeanFactory implemen Class<MailRepository> clazz = (Class<MailRepository>) getBeanFactory().getBeanClassLoader().loadClass(repClass); reply = (MailRepository) getBeanFactory().autowire(clazz, ConfigurableListableBeanFactory.AUTOWIRE_AUTODETECT, false); - if (reply instanceof LogEnabled) { - ((LogEnabled) reply).setLog(LOGGER); - } - if (reply instanceof Configurable) { ((Configurable) reply).configure(config); } http://git-wip-us.apache.org/repos/asf/james-project/blob/c147f0a0/server/container/spring/src/main/java/org/apache/james/container/spring/lifecycle/osgi/OsgiLifecycleBeanFactoryPostProcessor.java ---------------------------------------------------------------------- diff --git a/server/container/spring/src/main/java/org/apache/james/container/spring/lifecycle/osgi/OsgiLifecycleBeanFactoryPostProcessor.java b/server/container/spring/src/main/java/org/apache/james/container/spring/lifecycle/osgi/OsgiLifecycleBeanFactoryPostProcessor.java index 6c33289..7fd8dca 100644 --- a/server/container/spring/src/main/java/org/apache/james/container/spring/lifecycle/osgi/OsgiLifecycleBeanFactoryPostProcessor.java +++ b/server/container/spring/src/main/java/org/apache/james/container/spring/lifecycle/osgi/OsgiLifecycleBeanFactoryPostProcessor.java @@ -34,6 +34,7 @@ import org.springframework.beans.factory.config.ConfigurableListableBeanFactory; import org.springframework.osgi.extender.OsgiBeanFactoryPostProcessor; +@SuppressWarnings("deprecation") public class OsgiLifecycleBeanFactoryPostProcessor implements OsgiBeanFactoryPostProcessor { http://git-wip-us.apache.org/repos/asf/james-project/blob/c147f0a0/server/container/util-java8/src/test/java/org/apache/james/util/MDCBuilderTest.java ---------------------------------------------------------------------- diff --git a/server/container/util-java8/src/test/java/org/apache/james/util/MDCBuilderTest.java b/server/container/util-java8/src/test/java/org/apache/james/util/MDCBuilderTest.java index 8e4d4f1..d8ac33c 100644 --- a/server/container/util-java8/src/test/java/org/apache/james/util/MDCBuilderTest.java +++ b/server/container/util-java8/src/test/java/org/apache/james/util/MDCBuilderTest.java @@ -87,6 +87,7 @@ public class MDCBuilderTest { .containsEntry(KEY_2, VALUE_2); } + @SuppressWarnings("resource") @Test public void closeablesConstructorShouldThrowOnNullList() { expectedException.expect(NullPointerException.class); http://git-wip-us.apache.org/repos/asf/james-project/blob/c147f0a0/server/data/data-api/src/main/java/org/apache/james/mailrepository/api/MailRepositoryStore.java ---------------------------------------------------------------------- diff --git a/server/data/data-api/src/main/java/org/apache/james/mailrepository/api/MailRepositoryStore.java b/server/data/data-api/src/main/java/org/apache/james/mailrepository/api/MailRepositoryStore.java index 33ac902..d44d669 100644 --- a/server/data/data-api/src/main/java/org/apache/james/mailrepository/api/MailRepositoryStore.java +++ b/server/data/data-api/src/main/java/org/apache/james/mailrepository/api/MailRepositoryStore.java @@ -40,7 +40,6 @@ public interface MailRepositoryStore { */ List<String> getUrls(); - @SuppressWarnings("serial") class MailRepositoryStoreException extends Exception { public MailRepositoryStoreException(String msg, Throwable t) { super(msg, t); http://git-wip-us.apache.org/repos/asf/james-project/blob/c147f0a0/server/data/data-jdbc/src/main/java/org/apache/james/mailrepository/jdbc/MessageInputStream.java ---------------------------------------------------------------------- diff --git a/server/data/data-jdbc/src/main/java/org/apache/james/mailrepository/jdbc/MessageInputStream.java b/server/data/data-jdbc/src/main/java/org/apache/james/mailrepository/jdbc/MessageInputStream.java index acd16de..1474431 100644 --- a/server/data/data-jdbc/src/main/java/org/apache/james/mailrepository/jdbc/MessageInputStream.java +++ b/server/data/data-jdbc/src/main/java/org/apache/james/mailrepository/jdbc/MessageInputStream.java @@ -187,7 +187,6 @@ final class MessageInputStream extends InputStream { } } - @SuppressWarnings("serial") private void throwException() throws IOException { try { if (wrapped == null) { http://git-wip-us.apache.org/repos/asf/james-project/blob/c147f0a0/server/dns-service/dnsservice-api/src/main/java/org/apache/james/dnsservice/api/TemporaryResolutionException.java ---------------------------------------------------------------------- diff --git a/server/dns-service/dnsservice-api/src/main/java/org/apache/james/dnsservice/api/TemporaryResolutionException.java b/server/dns-service/dnsservice-api/src/main/java/org/apache/james/dnsservice/api/TemporaryResolutionException.java index 529d6d4..c6f99cd 100644 --- a/server/dns-service/dnsservice-api/src/main/java/org/apache/james/dnsservice/api/TemporaryResolutionException.java +++ b/server/dns-service/dnsservice-api/src/main/java/org/apache/james/dnsservice/api/TemporaryResolutionException.java @@ -23,7 +23,6 @@ import java.io.IOException; /** * Exception to throw when a temporary DNS resolution problem occurs. */ -@SuppressWarnings("serial") public class TemporaryResolutionException extends IOException { public TemporaryResolutionException() { http://git-wip-us.apache.org/repos/asf/james-project/blob/c147f0a0/server/mailet/mailetcontainer-camel/src/test/java/org/apache/james/mailetcontainer/impl/JamesMailetContextTest.java ---------------------------------------------------------------------- diff --git a/server/mailet/mailetcontainer-camel/src/test/java/org/apache/james/mailetcontainer/impl/JamesMailetContextTest.java b/server/mailet/mailetcontainer-camel/src/test/java/org/apache/james/mailetcontainer/impl/JamesMailetContextTest.java index 01c9bf0..b1f88ac 100644 --- a/server/mailet/mailetcontainer-camel/src/test/java/org/apache/james/mailetcontainer/impl/JamesMailetContextTest.java +++ b/server/mailet/mailetcontainer-camel/src/test/java/org/apache/james/mailetcontainer/impl/JamesMailetContextTest.java @@ -33,12 +33,8 @@ import org.apache.james.user.memory.MemoryUsersRepository; import org.apache.mailet.MailAddress; import org.junit.Before; import org.junit.Test; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; public class JamesMailetContextTest { - private static final Logger LOGGER = LoggerFactory.getLogger(JamesMailetContextTest.class); - public static final String DOMAIN_COM = "domain.com"; public static final String USERNAME = "user"; public static final String USERMAIL = USERNAME + "@" + DOMAIN_COM; http://git-wip-us.apache.org/repos/asf/james-project/blob/c147f0a0/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 266e3b2..557f101 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 @@ -38,7 +38,6 @@ import org.apache.mailet.Mail; import org.apache.mailet.MailAddress; import org.apache.mailet.Mailet; import org.apache.mailet.MailetConfig; -import org.apache.mailet.MailetContext; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -148,7 +147,6 @@ public class InstrumentationMailet implements Mailet { } private void printAddresses(Address[] addresses, String prefix) { - MailetContext context = config.getMailetContext(); for (Address address1 : addresses) { if (address1 instanceof InternetAddress) { InternetAddress address = (InternetAddress) address1; http://git-wip-us.apache.org/repos/asf/james-project/blob/c147f0a0/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/remoteDelivery/BouncerTest.java ---------------------------------------------------------------------- diff --git a/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/remoteDelivery/BouncerTest.java b/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/remoteDelivery/BouncerTest.java index c69cdff..b2b325b 100644 --- a/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/remoteDelivery/BouncerTest.java +++ b/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/remoteDelivery/BouncerTest.java @@ -39,13 +39,10 @@ import org.apache.mailet.base.test.FakeMailContext; import org.apache.mailet.base.test.FakeMailetConfig; import org.junit.Before; import org.junit.Test; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import com.google.common.base.Optional; public class BouncerTest { - private static final Logger LOGGER = LoggerFactory.getLogger(BouncerTest.class); public static final String HELLO_NAME = "hello_name"; public static final String BOUNCE_PROCESSOR = "bounce_processor"; http://git-wip-us.apache.org/repos/asf/james-project/blob/c147f0a0/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/remoteDelivery/DeliveryRunnableTest.java ---------------------------------------------------------------------- diff --git a/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/remoteDelivery/DeliveryRunnableTest.java b/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/remoteDelivery/DeliveryRunnableTest.java index 4147bff..daad6e8 100644 --- a/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/remoteDelivery/DeliveryRunnableTest.java +++ b/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/remoteDelivery/DeliveryRunnableTest.java @@ -42,14 +42,11 @@ import org.junit.Before; import org.junit.Rule; import org.junit.Test; import org.junit.rules.ExpectedException; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import com.google.common.base.Supplier; public class DeliveryRunnableTest { - private static final Logger LOGGER = LoggerFactory.getLogger(DeliveryRunnableTest.class); public static final Date FIXED_DATE = new Date(1159599194961L); public static final Supplier<Date> FIXED_DATE_SUPPLIER = () -> FIXED_DATE; http://git-wip-us.apache.org/repos/asf/james-project/blob/c147f0a0/server/protocols/jmap/src/main/java/org/apache/james/jmap/AccessTokenAuthenticationStrategy.java ---------------------------------------------------------------------- diff --git a/server/protocols/jmap/src/main/java/org/apache/james/jmap/AccessTokenAuthenticationStrategy.java b/server/protocols/jmap/src/main/java/org/apache/james/jmap/AccessTokenAuthenticationStrategy.java index 17598ca..9227662 100644 --- a/server/protocols/jmap/src/main/java/org/apache/james/jmap/AccessTokenAuthenticationStrategy.java +++ b/server/protocols/jmap/src/main/java/org/apache/james/jmap/AccessTokenAuthenticationStrategy.java @@ -31,15 +31,11 @@ import org.apache.james.jmap.utils.HeadersAuthenticationExtractor; import org.apache.james.mailbox.MailboxManager; import org.apache.james.mailbox.MailboxSession; import org.apache.james.mailbox.exception.MailboxException; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import com.google.common.annotations.VisibleForTesting; public class AccessTokenAuthenticationStrategy implements AuthenticationStrategy { - private static final Logger LOG = LoggerFactory.getLogger(AccessTokenAuthenticationStrategy.class); - private final AccessTokenManager accessTokenManager; private final MailboxManager mailboxManager; private final HeadersAuthenticationExtractor authenticationExtractor; http://git-wip-us.apache.org/repos/asf/james-project/blob/c147f0a0/server/protocols/protocols-imap4/src/main/java/org/apache/james/imapserver/netty/NettyImapRequestLineReader.java ---------------------------------------------------------------------- diff --git a/server/protocols/protocols-imap4/src/main/java/org/apache/james/imapserver/netty/NettyImapRequestLineReader.java b/server/protocols/protocols-imap4/src/main/java/org/apache/james/imapserver/netty/NettyImapRequestLineReader.java index 8420693..63646b4 100644 --- a/server/protocols/protocols-imap4/src/main/java/org/apache/james/imapserver/netty/NettyImapRequestLineReader.java +++ b/server/protocols/protocols-imap4/src/main/java/org/apache/james/imapserver/netty/NettyImapRequestLineReader.java @@ -113,7 +113,6 @@ public class NettyImapRequestLineReader extends AbstractNettyImapRequestLineRead * {@link NettyImapRequestLineReader#read(int, boolean)} if not enough data is * readable in the underlying {@link ChannelBuffer} */ - @SuppressWarnings("serial") public final class NotEnoughDataException extends RuntimeException { public final static int UNKNOWN_SIZE = -1; http://git-wip-us.apache.org/repos/asf/james-project/blob/c147f0a0/server/protocols/protocols-library/src/main/java/org/apache/james/protocols/lib/jmx/AbstractCommandHandlerResultJMXMonitor.java ---------------------------------------------------------------------- diff --git a/server/protocols/protocols-library/src/main/java/org/apache/james/protocols/lib/jmx/AbstractCommandHandlerResultJMXMonitor.java b/server/protocols/protocols-library/src/main/java/org/apache/james/protocols/lib/jmx/AbstractCommandHandlerResultJMXMonitor.java index 422eed8..4631990 100644 --- a/server/protocols/protocols-library/src/main/java/org/apache/james/protocols/lib/jmx/AbstractCommandHandlerResultJMXMonitor.java +++ b/server/protocols/protocols-library/src/main/java/org/apache/james/protocols/lib/jmx/AbstractCommandHandlerResultJMXMonitor.java @@ -73,7 +73,7 @@ public abstract class AbstractCommandHandlerResultJMXMonitor<S extends ProtocolS * @see * org.apache.james.protocols.api.handler.ExtensibleHandler#wireExtensions(java.lang.Class, java.util.List) */ - @SuppressWarnings({ "unchecked", "rawtypes" }) + @SuppressWarnings({ "unchecked", "rawtypes", "unlikely-arg-type" }) public void wireExtensions(Class<?> interfaceName, List<?> extension) throws WiringException { if (interfaceName.equals(CommandHandler.class)) { // add stats for all hooks http://git-wip-us.apache.org/repos/asf/james-project/blob/c147f0a0/server/protocols/protocols-library/src/main/java/org/apache/james/protocols/lib/jmx/AbstractConnectHandlerResultJMXMonitor.java ---------------------------------------------------------------------- diff --git a/server/protocols/protocols-library/src/main/java/org/apache/james/protocols/lib/jmx/AbstractConnectHandlerResultJMXMonitor.java b/server/protocols/protocols-library/src/main/java/org/apache/james/protocols/lib/jmx/AbstractConnectHandlerResultJMXMonitor.java index d9551e8..4021606 100644 --- a/server/protocols/protocols-library/src/main/java/org/apache/james/protocols/lib/jmx/AbstractConnectHandlerResultJMXMonitor.java +++ b/server/protocols/protocols-library/src/main/java/org/apache/james/protocols/lib/jmx/AbstractConnectHandlerResultJMXMonitor.java @@ -85,6 +85,7 @@ public abstract class AbstractConnectHandlerResultJMXMonitor<R extends Response, * @see * org.apache.james.protocols.api.handler.ExtensibleHandler#wireExtensions(java.lang.Class, java.util.List) */ + @SuppressWarnings("unlikely-arg-type") public void wireExtensions(Class<?> interfaceName, List<?> extension) throws WiringException { if (interfaceName.equals(ConnectHandler.class)) { // add stats for all hooks http://git-wip-us.apache.org/repos/asf/james-project/blob/c147f0a0/server/protocols/protocols-library/src/main/java/org/apache/james/protocols/lib/jmx/AbstractLineHandlerResultJMXMonitor.java ---------------------------------------------------------------------- diff --git a/server/protocols/protocols-library/src/main/java/org/apache/james/protocols/lib/jmx/AbstractLineHandlerResultJMXMonitor.java b/server/protocols/protocols-library/src/main/java/org/apache/james/protocols/lib/jmx/AbstractLineHandlerResultJMXMonitor.java index 5a6cd17..9d93d16 100644 --- a/server/protocols/protocols-library/src/main/java/org/apache/james/protocols/lib/jmx/AbstractLineHandlerResultJMXMonitor.java +++ b/server/protocols/protocols-library/src/main/java/org/apache/james/protocols/lib/jmx/AbstractLineHandlerResultJMXMonitor.java @@ -70,6 +70,7 @@ public abstract class AbstractLineHandlerResultJMXMonitor<R extends Response, S * @see * org.apache.james.protocols.api.handler.ExtensibleHandler#wireExtensions(java.lang.Class, java.util.List) */ + @SuppressWarnings("unlikely-arg-type") public void wireExtensions(Class<?> interfaceName, List<?> extension) throws WiringException { if (interfaceName.equals(LineHandler.class)) { http://git-wip-us.apache.org/repos/asf/james-project/blob/c147f0a0/server/protocols/protocols-pop3/src/test/java/org/apache/james/pop3server/POP3TestConfiguration.java ---------------------------------------------------------------------- diff --git a/server/protocols/protocols-pop3/src/test/java/org/apache/james/pop3server/POP3TestConfiguration.java b/server/protocols/protocols-pop3/src/test/java/org/apache/james/pop3server/POP3TestConfiguration.java index 64c9e39..4128280 100644 --- a/server/protocols/protocols-pop3/src/test/java/org/apache/james/pop3server/POP3TestConfiguration.java +++ b/server/protocols/protocols-pop3/src/test/java/org/apache/james/pop3server/POP3TestConfiguration.java @@ -22,7 +22,6 @@ package org.apache.james.pop3server; import org.apache.commons.configuration.DefaultConfigurationBuilder; import org.apache.james.pop3server.core.CoreCmdHandlerLoader; -@SuppressWarnings("serial") public class POP3TestConfiguration extends DefaultConfigurationBuilder { public void init() { http://git-wip-us.apache.org/repos/asf/james-project/blob/c147f0a0/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/TLDLookup.java ---------------------------------------------------------------------- diff --git a/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/TLDLookup.java b/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/TLDLookup.java index 53b976b..0db5feb 100644 --- a/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/TLDLookup.java +++ b/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/TLDLookup.java @@ -54,9 +54,6 @@ public class TLDLookup { /** A set of all known three-part TLDs */ static private final HashSet<String> threePartTLDs = initThreePartTLDs(); - /** controls testing/debug output */ - static private final boolean testing = false; - /** * Determines if a two-part domain string (xxx.xxx) is contained in the * cache of known two-part TLDs. http://git-wip-us.apache.org/repos/asf/james-project/blob/c147f0a0/server/protocols/protocols-smtp/src/test/java/org/apache/james/smtpserver/SMTPTestConfiguration.java ---------------------------------------------------------------------- diff --git a/server/protocols/protocols-smtp/src/test/java/org/apache/james/smtpserver/SMTPTestConfiguration.java b/server/protocols/protocols-smtp/src/test/java/org/apache/james/smtpserver/SMTPTestConfiguration.java index 6662885..e7124c3 100644 --- a/server/protocols/protocols-smtp/src/test/java/org/apache/james/smtpserver/SMTPTestConfiguration.java +++ b/server/protocols/protocols-smtp/src/test/java/org/apache/james/smtpserver/SMTPTestConfiguration.java @@ -26,7 +26,6 @@ import org.apache.james.smtpserver.fastfail.ResolvableEhloHeloHandler; import org.apache.james.smtpserver.fastfail.ReverseEqualsEhloHeloHandler; import org.apache.james.smtpserver.fastfail.ValidSenderDomainHandler; -@SuppressWarnings("serial") public class SMTPTestConfiguration extends DefaultConfigurationBuilder { private int m_maxMessageSizeKB = 0; http://git-wip-us.apache.org/repos/asf/james-project/blob/c147f0a0/server/queue/queue-activemq/src/test/java/org/apache/james/queue/activemq/ActiveMQMailQueueTest.java ---------------------------------------------------------------------- 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 db3d0af..981b949 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 @@ -33,8 +33,6 @@ import org.apache.james.queue.jms.AbstractJMSMailQueueTest; import org.apache.james.queue.jms.JMSMailQueue; import org.junit.AfterClass; import org.junit.BeforeClass; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; public abstract class ActiveMQMailQueueTest extends AbstractJMSMailQueueTest { @@ -75,8 +73,6 @@ public abstract class ActiveMQMailQueueTest extends AbstractJMSMailQueueTest { @Override protected JMSMailQueue createQueue(ConnectionFactory factory, MailQueueItemDecoratorFactory mailQueueItemDecoratorFactory, String queueName) { - Logger log = LoggerFactory.getLogger(ActiveMQMailQueueTest.class); - return new ActiveMQMailQueue(factory, mailQueueItemDecoratorFactory, queueName, useBlobMessages(), new NoopMetricFactory()); } http://git-wip-us.apache.org/repos/asf/james-project/blob/c147f0a0/server/queue/queue-api/src/main/java/org/apache/james/queue/api/MailQueue.java ---------------------------------------------------------------------- diff --git a/server/queue/queue-api/src/main/java/org/apache/james/queue/api/MailQueue.java b/server/queue/queue-api/src/main/java/org/apache/james/queue/api/MailQueue.java index ff76968..f78835f 100644 --- a/server/queue/queue-api/src/main/java/org/apache/james/queue/api/MailQueue.java +++ b/server/queue/queue-api/src/main/java/org/apache/james/queue/api/MailQueue.java @@ -93,7 +93,6 @@ public interface MailQueue { * Exception which will get thrown if any problems occur while working the * {@link MailQueue} */ - @SuppressWarnings("serial") class MailQueueException extends MessagingException { public MailQueueException(String msg, Exception e) { super(msg, e); http://git-wip-us.apache.org/repos/asf/james-project/blob/c147f0a0/server/queue/queue-jms/src/test/java/org/apache/james/queue/jms/AbstractJMSMailQueueTest.java ---------------------------------------------------------------------- diff --git a/server/queue/queue-jms/src/test/java/org/apache/james/queue/jms/AbstractJMSMailQueueTest.java b/server/queue/queue-jms/src/test/java/org/apache/james/queue/jms/AbstractJMSMailQueueTest.java index 6ecd43b..1e2af52 100644 --- a/server/queue/queue-jms/src/test/java/org/apache/james/queue/jms/AbstractJMSMailQueueTest.java +++ b/server/queue/queue-jms/src/test/java/org/apache/james/queue/jms/AbstractJMSMailQueueTest.java @@ -50,8 +50,6 @@ import org.apache.mailet.Mail; import org.apache.mailet.MailAddress; import org.junit.Before; import org.junit.Test; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; /** * Basic JMS test class. Extend this class and start the JMS broker in the super class, @@ -68,7 +66,6 @@ public abstract class AbstractJMSMailQueueTest { } protected JMSMailQueue createQueue(ConnectionFactory factory, MailQueueItemDecoratorFactory mailQueueItemDecoratorFactory, String queueName) { - Logger log = LoggerFactory.getLogger(AbstractJMSMailQueueTest.class); return new JMSMailQueue(factory, mailQueueItemDecoratorFactory, queueName, new NoopMetricFactory()); } --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
