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 94108cfb5ba3a2e907a0d510a5eb4dbbefcfe9b3 Author: Benoit Tellier <[email protected]> AuthorDate: Thu Sep 26 11:01:13 2019 +0700 JAMES-2902 Remove ProtocolHandlers default implementation for destroy/init This is already defined in the API as default methods. Classes that reproduce the exact noop behaviour defined in the API can thus be simplified. --- .../protocols/api/handler/CommandDispatcher.java | 12 -- .../api/handler/CommandHandlerResultLogger.java | 12 -- .../protocols/imap/core/IMAPCommandDispatcher.java | 12 -- .../protocols/lmtp/AbstractLMTPServerTest.java | 22 --- .../james/protocols/pop3/core/CapaCmdHandler.java | 12 -- .../james/protocols/pop3/core/DeleCmdHandler.java | 12 -- .../james/protocols/pop3/core/ListCmdHandler.java | 12 -- .../james/protocols/pop3/core/NoopCmdHandler.java | 12 -- .../james/protocols/pop3/core/QuitCmdHandler.java | 12 -- .../james/protocols/pop3/core/RetrCmdHandler.java | 12 -- .../james/protocols/pop3/core/RsetCmdHandler.java | 12 -- .../james/protocols/pop3/core/StatCmdHandler.java | 12 -- .../james/protocols/pop3/core/StlsCmdHandler.java | 12 -- .../james/protocols/pop3/core/UidlCmdHandler.java | 12 -- .../protocols/pop3/core/UnknownCmdHandler.java | 12 -- .../james/protocols/pop3/core/UserCmdHandler.java | 12 -- .../protocols/pop3/core/WelcomeMessageHandler.java | 13 -- .../core/AcceptRecipientIfRelayingIsAllowed.java | 12 -- .../james/protocols/smtp/core/DataCmdHandler.java | 10 -- .../smtp/core/DataLineMessageHookHandler.java | 12 -- .../james/protocols/smtp/core/ExpnCmdHandler.java | 12 -- .../james/protocols/smtp/core/HeloCmdHandler.java | 12 -- .../james/protocols/smtp/core/HelpCmdHandler.java | 14 -- .../james/protocols/smtp/core/MailCmdHandler.java | 12 -- .../james/protocols/smtp/core/NoopCmdHandler.java | 12 -- .../smtp/core/PostmasterAbuseRcptHook.java | 12 -- .../james/protocols/smtp/core/QuitCmdHandler.java | 13 -- .../james/protocols/smtp/core/RcptCmdHandler.java | 12 -- .../smtp/core/ReceivedDataLineFilter.java | 12 -- .../james/protocols/smtp/core/RsetCmdHandler.java | 14 -- .../protocols/smtp/core/UnknownCmdHandler.java | 12 -- .../james/protocols/smtp/core/VrfyCmdHandler.java | 14 -- .../protocols/smtp/core/WelcomeMessageHandler.java | 12 -- .../protocols/smtp/core/esmtp/AuthCmdHandler.java | 42 ----- .../protocols/smtp/core/esmtp/EhloCmdHandler.java | 12 -- .../smtp/core/esmtp/MailSizeEsmtpExtension.java | 12 -- .../smtp/core/esmtp/StartTlsCmdHandler.java | 12 -- .../smtp/core/fastfail/DNSRBLHandler.java | 12 -- .../smtp/core/fastfail/MaxRcptHandler.java | 12 -- .../smtp/core/fastfail/MaxUnknownCmdHandler.java | 12 -- .../core/fastfail/ResolvableEhloHeloHandler.java | 12 -- .../smtp/core/fastfail/SpamTrapHandler.java | 12 -- .../core/fastfail/SupressDuplicateRcptHandler.java | 12 -- .../protocols/smtp/core/log/HookResultLogger.java | 14 +- .../james/protocols/smtp/hook/SimpleHook.java | 20 +-- .../protocols/smtp/AbstractSMTPServerTest.java | 177 +-------------------- .../fastfail/ValidSenderDomainHandlerTest.java | 12 -- .../protocols/smtp/utils/TestMessageHook.java | 12 -- .../AbstractConnectHandlerResultJMXMonitor.java | 2 - .../james/lmtpserver/CoreCmdHandlerLoader.java | 12 -- .../hook/MailboxDeliverToRecipientHandler.java | 12 -- .../james/lmtpserver/jmx/JMXHandlersLoader.java | 12 -- .../pop3server/core/CoreCmdHandlerLoader.java | 12 -- .../james/pop3server/jmx/JMXHandlersLoader.java | 12 -- .../AddDefaultAttributesMessageHook.java | 12 -- .../smtpserver/AuthRequiredToRelayRcptHook.java | 12 -- .../james/smtpserver/CoreCmdHandlerLoader.java | 12 -- .../DataLineJamesMessageHookHandler.java | 12 -- .../james/smtpserver/MailPriorityHandler.java | 6 - .../james/smtpserver/POP3BeforeSMTPHandler.java | 11 -- .../apache/james/smtpserver/SendMailHandler.java | 5 - .../SenderAuthIdentifyVerificationRcptHook.java | 12 -- .../james/smtpserver/SetMimeHeaderHandler.java | 6 - .../james/smtpserver/UsersRepositoryAuthHook.java | 12 -- .../james/smtpserver/fastfail/DNSRBLHandler.java | 5 - .../smtpserver/fastfail/JDBCGreylistHandler.java | 5 - .../james/smtpserver/fastfail/MaxRcptHandler.java | 6 - .../smtpserver/fastfail/MaxUnknownCmdHandler.java | 6 - .../james/smtpserver/fastfail/SPFHandler.java | 6 - .../smtpserver/fastfail/SpamAssassinHandler.java | 5 - .../james/smtpserver/fastfail/SpamTrapHandler.java | 5 - .../james/smtpserver/fastfail/URIRBLHandler.java | 5 - .../smtpserver/fastfail/ValidRcptHandler.java | 5 - .../james/smtpserver/fastfail/ValidRcptMX.java | 5 - .../fastfail/ValidSenderDomainHandler.java | 12 -- .../james/smtpserver/jmx/JMXHandlersLoader.java | 12 -- 76 files changed, 12 insertions(+), 1024 deletions(-) diff --git a/protocols/api/src/main/java/org/apache/james/protocols/api/handler/CommandDispatcher.java b/protocols/api/src/main/java/org/apache/james/protocols/api/handler/CommandDispatcher.java index 4629d12..1c83cfa 100644 --- a/protocols/api/src/main/java/org/apache/james/protocols/api/handler/CommandDispatcher.java +++ b/protocols/api/src/main/java/org/apache/james/protocols/api/handler/CommandDispatcher.java @@ -29,8 +29,6 @@ import java.util.LinkedList; import java.util.List; import java.util.Locale; -import org.apache.commons.configuration2.Configuration; -import org.apache.commons.configuration2.ex.ConfigurationException; import org.apache.james.protocols.api.BaseRequest; import org.apache.james.protocols.api.ProtocolSession; import org.apache.james.protocols.api.Request; @@ -64,16 +62,6 @@ public class CommandDispatcher<SessionT extends ProtocolSession> implements Exte this(Collections.<String>emptyList()); } - @Override - public void init(Configuration config) throws ConfigurationException { - - } - - @Override - public void destroy() { - - } - /** * Add it to map (key as command name, value is an array list of CommandHandlers) * diff --git a/protocols/api/src/main/java/org/apache/james/protocols/api/handler/CommandHandlerResultLogger.java b/protocols/api/src/main/java/org/apache/james/protocols/api/handler/CommandHandlerResultLogger.java index 92faecf..06cdac4 100644 --- a/protocols/api/src/main/java/org/apache/james/protocols/api/handler/CommandHandlerResultLogger.java +++ b/protocols/api/src/main/java/org/apache/james/protocols/api/handler/CommandHandlerResultLogger.java @@ -18,8 +18,6 @@ ****************************************************************/ package org.apache.james.protocols.api.handler; -import org.apache.commons.configuration2.Configuration; -import org.apache.commons.configuration2.ex.ConfigurationException; import org.apache.james.protocols.api.ProtocolSession; import org.apache.james.protocols.api.Response; import org.slf4j.Logger; @@ -41,14 +39,4 @@ public class CommandHandlerResultLogger implements ProtocolHandlerResultHandler< } return response; } - - @Override - public void init(Configuration config) throws ConfigurationException { - - } - - @Override - public void destroy() { - - } } diff --git a/protocols/imap/src/main/java/org/apache/james/protocols/imap/core/IMAPCommandDispatcher.java b/protocols/imap/src/main/java/org/apache/james/protocols/imap/core/IMAPCommandDispatcher.java index ec76e6b..aac46b4 100644 --- a/protocols/imap/src/main/java/org/apache/james/protocols/imap/core/IMAPCommandDispatcher.java +++ b/protocols/imap/src/main/java/org/apache/james/protocols/imap/core/IMAPCommandDispatcher.java @@ -23,8 +23,6 @@ import java.util.Collection; import java.util.regex.Matcher; import java.util.regex.Pattern; -import org.apache.commons.configuration2.Configuration; -import org.apache.commons.configuration2.ex.ConfigurationException; import org.apache.james.protocols.api.ProtocolSession.State; import org.apache.james.protocols.api.Request; import org.apache.james.protocols.api.Response; @@ -48,16 +46,6 @@ public class IMAPCommandDispatcher extends CommandDispatcher<IMAPSession> { private static final String BYTES_READ = "BYTES_READ"; @Override - public void init(Configuration config) throws ConfigurationException { - - } - - @Override - public void destroy() { - - } - - @Override protected boolean isReady(IMAPSession session, ByteBuffer line) { long bytesRead = (Long) session.setAttachment(BYTES_READ, null, State.Transaction); bytesRead += line.remaining(); 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 c1dbf7f..f717fda 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 @@ -27,8 +27,6 @@ import java.util.Arrays; import java.util.Iterator; import java.util.List; -import org.apache.commons.configuration2.Configuration; -import org.apache.commons.configuration2.ex.ConfigurationException; import org.apache.commons.net.smtp.RelayPath; import org.apache.commons.net.smtp.SMTPClient; import org.apache.commons.net.smtp.SMTPReply; @@ -322,16 +320,6 @@ public abstract class AbstractLMTPServerTest extends AbstractSMTPServerTest { } return result; } - - @Override - public void init(Configuration config) throws ConfigurationException { - - } - - @Override - public void destroy() { - - } } private final class TestDeliverHook implements DeliverToRecipientHook { @@ -351,16 +339,6 @@ public abstract class AbstractLMTPServerTest extends AbstractSMTPServerTest { public List<MailEnvelope> getDelivered() { return delivered; } - - @Override - public void init(Configuration config) throws ConfigurationException { - - } - - @Override - public void destroy() { - - } } } diff --git a/protocols/pop3/src/main/java/org/apache/james/protocols/pop3/core/CapaCmdHandler.java b/protocols/pop3/src/main/java/org/apache/james/protocols/pop3/core/CapaCmdHandler.java index 7f1b1b8..fe6a335 100644 --- a/protocols/pop3/src/main/java/org/apache/james/protocols/pop3/core/CapaCmdHandler.java +++ b/protocols/pop3/src/main/java/org/apache/james/protocols/pop3/core/CapaCmdHandler.java @@ -24,8 +24,6 @@ import java.util.Collection; import java.util.List; import java.util.Set; -import org.apache.commons.configuration2.Configuration; -import org.apache.commons.configuration2.ex.ConfigurationException; import org.apache.james.protocols.api.Request; import org.apache.james.protocols.api.Response; import org.apache.james.protocols.api.handler.CommandHandler; @@ -45,16 +43,6 @@ public class CapaCmdHandler implements CommandHandler<POP3Session>, ExtensibleHa private static final Set<String> CAPS = ImmutableSet.of("PIPELINING"); @Override - public void init(Configuration config) throws ConfigurationException { - - } - - @Override - public void destroy() { - - } - - @Override public Response onCommand(POP3Session session, Request request) { POP3Response response = new POP3Response(POP3Response.OK_RESPONSE, "Capability list follows"); diff --git a/protocols/pop3/src/main/java/org/apache/james/protocols/pop3/core/DeleCmdHandler.java b/protocols/pop3/src/main/java/org/apache/james/protocols/pop3/core/DeleCmdHandler.java index 8d0893e..93263aa 100644 --- a/protocols/pop3/src/main/java/org/apache/james/protocols/pop3/core/DeleCmdHandler.java +++ b/protocols/pop3/src/main/java/org/apache/james/protocols/pop3/core/DeleCmdHandler.java @@ -22,8 +22,6 @@ package org.apache.james.protocols.pop3.core; import java.util.Collection; import java.util.List; -import org.apache.commons.configuration2.Configuration; -import org.apache.commons.configuration2.ex.ConfigurationException; import org.apache.james.protocols.api.ProtocolSession.State; import org.apache.james.protocols.api.Request; import org.apache.james.protocols.api.Response; @@ -43,16 +41,6 @@ public class DeleCmdHandler implements CommandHandler<POP3Session> { private static final Response SYNTAX_ERROR = new POP3Response(POP3Response.ERR_RESPONSE, "Usage: DELE [mail number]").immutable(); private static final Response DELETED = new POP3Response(POP3Response.OK_RESPONSE, "Message deleted").immutable(); - @Override - public void init(Configuration config) throws ConfigurationException { - - } - - @Override - public void destroy() { - - } - /** * Handler method called upon receipt of a DELE command. This command * deletes a particular mail message from the mailbox. diff --git a/protocols/pop3/src/main/java/org/apache/james/protocols/pop3/core/ListCmdHandler.java b/protocols/pop3/src/main/java/org/apache/james/protocols/pop3/core/ListCmdHandler.java index 2ad6336..7cfeaf9 100644 --- a/protocols/pop3/src/main/java/org/apache/james/protocols/pop3/core/ListCmdHandler.java +++ b/protocols/pop3/src/main/java/org/apache/james/protocols/pop3/core/ListCmdHandler.java @@ -23,8 +23,6 @@ import java.util.ArrayList; import java.util.Collection; import java.util.List; -import org.apache.commons.configuration2.Configuration; -import org.apache.commons.configuration2.ex.ConfigurationException; import org.apache.james.protocols.api.ProtocolSession.State; import org.apache.james.protocols.api.Request; import org.apache.james.protocols.api.Response; @@ -42,16 +40,6 @@ public class ListCmdHandler implements CommandHandler<POP3Session> { private static final Collection<String> COMMANDS = ImmutableSet.of("LIST"); - @Override - public void init(Configuration config) throws ConfigurationException { - - } - - @Override - public void destroy() { - - } - /** * Handler method called upon receipt of a LIST command. Returns the number * of messages in the mailbox and its aggregate size, or optionally, the diff --git a/protocols/pop3/src/main/java/org/apache/james/protocols/pop3/core/NoopCmdHandler.java b/protocols/pop3/src/main/java/org/apache/james/protocols/pop3/core/NoopCmdHandler.java index 3fe6d1e..11012c6 100644 --- a/protocols/pop3/src/main/java/org/apache/james/protocols/pop3/core/NoopCmdHandler.java +++ b/protocols/pop3/src/main/java/org/apache/james/protocols/pop3/core/NoopCmdHandler.java @@ -21,8 +21,6 @@ package org.apache.james.protocols.pop3.core; import java.util.Collection; -import org.apache.commons.configuration2.Configuration; -import org.apache.commons.configuration2.ex.ConfigurationException; import org.apache.james.protocols.api.Request; import org.apache.james.protocols.api.Response; import org.apache.james.protocols.api.handler.CommandHandler; @@ -38,16 +36,6 @@ public class NoopCmdHandler implements CommandHandler<POP3Session> { private static final Collection<String> COMMANDS = ImmutableSet.of("NOOP"); - @Override - public void init(Configuration config) throws ConfigurationException { - - } - - @Override - public void destroy() { - - } - /** * Handler method called upon receipt of a NOOP command. Like all good * NOOPs, does nothing much. diff --git a/protocols/pop3/src/main/java/org/apache/james/protocols/pop3/core/QuitCmdHandler.java b/protocols/pop3/src/main/java/org/apache/james/protocols/pop3/core/QuitCmdHandler.java index dec0bf8..791c062 100644 --- a/protocols/pop3/src/main/java/org/apache/james/protocols/pop3/core/QuitCmdHandler.java +++ b/protocols/pop3/src/main/java/org/apache/james/protocols/pop3/core/QuitCmdHandler.java @@ -23,8 +23,6 @@ import java.io.IOException; import java.util.Collection; import java.util.List; -import org.apache.commons.configuration2.Configuration; -import org.apache.commons.configuration2.ex.ConfigurationException; import org.apache.james.protocols.api.ProtocolSession.State; import org.apache.james.protocols.api.Request; import org.apache.james.protocols.api.Response; @@ -56,16 +54,6 @@ public class QuitCmdHandler implements CommandHandler<POP3Session> { SIGN_OFF_NOT_CLEAN = response.immutable(); } - @Override - public void init(Configuration config) throws ConfigurationException { - - } - - @Override - public void destroy() { - - } - /** * Handler method called upon receipt of a QUIT command. This method handles * cleanup of the POP3Handler state. diff --git a/protocols/pop3/src/main/java/org/apache/james/protocols/pop3/core/RetrCmdHandler.java b/protocols/pop3/src/main/java/org/apache/james/protocols/pop3/core/RetrCmdHandler.java index 2454b0c..f87d604 100644 --- a/protocols/pop3/src/main/java/org/apache/james/protocols/pop3/core/RetrCmdHandler.java +++ b/protocols/pop3/src/main/java/org/apache/james/protocols/pop3/core/RetrCmdHandler.java @@ -24,8 +24,6 @@ import java.io.InputStream; import java.util.Collection; import java.util.List; -import org.apache.commons.configuration2.Configuration; -import org.apache.commons.configuration2.ex.ConfigurationException; import org.apache.james.protocols.api.ProtocolSession.State; import org.apache.james.protocols.api.Request; import org.apache.james.protocols.api.Response; @@ -48,16 +46,6 @@ public class RetrCmdHandler implements CommandHandler<POP3Session> { static final Response SYNTAX_ERROR = new POP3Response(POP3Response.ERR_RESPONSE, "Usage: RETR [mail number]").immutable(); private static final Response ERROR_MESSAGE_RETRIEVE = new POP3Response(POP3Response.ERR_RESPONSE, "Error while retrieving message.").immutable(); - @Override - public void init(Configuration config) throws ConfigurationException { - - } - - @Override - public void destroy() { - - } - /** * Handler method called upon receipt of a RETR command. This command * retrieves a particular mail message from the mailbox. diff --git a/protocols/pop3/src/main/java/org/apache/james/protocols/pop3/core/RsetCmdHandler.java b/protocols/pop3/src/main/java/org/apache/james/protocols/pop3/core/RsetCmdHandler.java index 37465a5..74601ad 100644 --- a/protocols/pop3/src/main/java/org/apache/james/protocols/pop3/core/RsetCmdHandler.java +++ b/protocols/pop3/src/main/java/org/apache/james/protocols/pop3/core/RsetCmdHandler.java @@ -24,8 +24,6 @@ import java.util.ArrayList; import java.util.Collection; import java.util.List; -import org.apache.commons.configuration2.Configuration; -import org.apache.commons.configuration2.ex.ConfigurationException; import org.apache.james.protocols.api.ProtocolSession.State; import org.apache.james.protocols.api.Request; import org.apache.james.protocols.api.Response; @@ -45,16 +43,6 @@ public class RsetCmdHandler implements CommandHandler<POP3Session> { private static final Collection<String> COMMANDS = ImmutableSet.of("RSET"); private static final Logger LOGGER = LoggerFactory.getLogger(RsetCmdHandler.class); - @Override - public void init(Configuration config) throws ConfigurationException { - - } - - @Override - public void destroy() { - - } - /** * Handler method called upon receipt of a RSET command. Calls stat() to * reset the mailbox. diff --git a/protocols/pop3/src/main/java/org/apache/james/protocols/pop3/core/StatCmdHandler.java b/protocols/pop3/src/main/java/org/apache/james/protocols/pop3/core/StatCmdHandler.java index 529b3ac..89105f9 100644 --- a/protocols/pop3/src/main/java/org/apache/james/protocols/pop3/core/StatCmdHandler.java +++ b/protocols/pop3/src/main/java/org/apache/james/protocols/pop3/core/StatCmdHandler.java @@ -23,8 +23,6 @@ import java.util.ArrayList; import java.util.Collection; import java.util.List; -import org.apache.commons.configuration2.Configuration; -import org.apache.commons.configuration2.ex.ConfigurationException; import org.apache.james.protocols.api.ProtocolSession.State; import org.apache.james.protocols.api.Request; import org.apache.james.protocols.api.Response; @@ -41,16 +39,6 @@ import com.google.common.collect.ImmutableSet; public class StatCmdHandler implements CommandHandler<POP3Session> { private static final Collection<String> COMMANDS = ImmutableSet.of("STAT"); - @Override - public void init(Configuration config) throws ConfigurationException { - - } - - @Override - public void destroy() { - - } - /** * Handler method called upon receipt of a STAT command. Returns the number * of messages in the mailbox and its aggregate size. diff --git a/protocols/pop3/src/main/java/org/apache/james/protocols/pop3/core/StlsCmdHandler.java b/protocols/pop3/src/main/java/org/apache/james/protocols/pop3/core/StlsCmdHandler.java index 6597c98..28c03180 100644 --- a/protocols/pop3/src/main/java/org/apache/james/protocols/pop3/core/StlsCmdHandler.java +++ b/protocols/pop3/src/main/java/org/apache/james/protocols/pop3/core/StlsCmdHandler.java @@ -23,8 +23,6 @@ import java.util.Collection; import java.util.Collections; import java.util.Set; -import org.apache.commons.configuration2.Configuration; -import org.apache.commons.configuration2.ex.ConfigurationException; import org.apache.james.protocols.api.Request; import org.apache.james.protocols.api.Response; import org.apache.james.protocols.api.handler.CommandHandler; @@ -46,16 +44,6 @@ public class StlsCmdHandler implements CommandHandler<POP3Session>, CapaCapabili private static final Response BEGIN_TLS = new POP3StartTlsResponse(POP3Response.OK_RESPONSE, "Begin TLS negotiation").immutable(); @Override - public void init(Configuration config) throws ConfigurationException { - - } - - @Override - public void destroy() { - - } - - @Override public Response onCommand(POP3Session session, Request request) { // check if starttls is supported, the state is the right one and it was // not started before diff --git a/protocols/pop3/src/main/java/org/apache/james/protocols/pop3/core/UidlCmdHandler.java b/protocols/pop3/src/main/java/org/apache/james/protocols/pop3/core/UidlCmdHandler.java index 69f0e43..7f33832 100644 --- a/protocols/pop3/src/main/java/org/apache/james/protocols/pop3/core/UidlCmdHandler.java +++ b/protocols/pop3/src/main/java/org/apache/james/protocols/pop3/core/UidlCmdHandler.java @@ -25,8 +25,6 @@ import java.util.Collections; import java.util.List; import java.util.Set; -import org.apache.commons.configuration2.Configuration; -import org.apache.commons.configuration2.ex.ConfigurationException; import org.apache.james.protocols.api.ProtocolSession.State; import org.apache.james.protocols.api.Request; import org.apache.james.protocols.api.Response; @@ -44,16 +42,6 @@ public class UidlCmdHandler implements CommandHandler<POP3Session>, CapaCapabili private static final Collection<String> COMMANDS = ImmutableSet.of("UIDL"); private static final Set<String> CAPS = ImmutableSet.of("UIDL"); - @Override - public void init(Configuration config) throws ConfigurationException { - - } - - @Override - public void destroy() { - - } - /** * Handler method called upon receipt of a UIDL command. Returns a listing * of message ids to the client. diff --git a/protocols/pop3/src/main/java/org/apache/james/protocols/pop3/core/UnknownCmdHandler.java b/protocols/pop3/src/main/java/org/apache/james/protocols/pop3/core/UnknownCmdHandler.java index c5c6ca5..6193a31 100644 --- a/protocols/pop3/src/main/java/org/apache/james/protocols/pop3/core/UnknownCmdHandler.java +++ b/protocols/pop3/src/main/java/org/apache/james/protocols/pop3/core/UnknownCmdHandler.java @@ -19,8 +19,6 @@ package org.apache.james.protocols.pop3.core; -import org.apache.commons.configuration2.Configuration; -import org.apache.commons.configuration2.ex.ConfigurationException; import org.apache.james.protocols.api.Request; import org.apache.james.protocols.api.Response; import org.apache.james.protocols.api.handler.UnknownCommandHandler; @@ -39,14 +37,4 @@ public class UnknownCmdHandler extends UnknownCommandHandler<POP3Session> { public Response onCommand(POP3Session session, Request request) { return POP3Response.ERR; } - - @Override - public void init(Configuration config) throws ConfigurationException { - - } - - @Override - public void destroy() { - - } } diff --git a/protocols/pop3/src/main/java/org/apache/james/protocols/pop3/core/UserCmdHandler.java b/protocols/pop3/src/main/java/org/apache/james/protocols/pop3/core/UserCmdHandler.java index 102c5ab..427ba96 100644 --- a/protocols/pop3/src/main/java/org/apache/james/protocols/pop3/core/UserCmdHandler.java +++ b/protocols/pop3/src/main/java/org/apache/james/protocols/pop3/core/UserCmdHandler.java @@ -22,8 +22,6 @@ package org.apache.james.protocols.pop3.core; import java.util.Collection; import java.util.Set; -import org.apache.commons.configuration2.Configuration; -import org.apache.commons.configuration2.ex.ConfigurationException; import org.apache.james.protocols.api.Request; import org.apache.james.protocols.api.Response; import org.apache.james.protocols.api.handler.CommandHandler; @@ -40,16 +38,6 @@ public class UserCmdHandler implements CommandHandler<POP3Session>, CapaCapabili private static final Collection<String> COMMANDS = ImmutableSet.of("USER"); private static final Set<String> CAPS = ImmutableSet.of("USER"); - @Override - public void init(Configuration config) throws ConfigurationException { - - } - - @Override - public void destroy() { - - } - /** * Handler method called upon receipt of a USER command. Reads in the user * id. diff --git a/protocols/pop3/src/main/java/org/apache/james/protocols/pop3/core/WelcomeMessageHandler.java b/protocols/pop3/src/main/java/org/apache/james/protocols/pop3/core/WelcomeMessageHandler.java index e47d2d8..afdf3d1 100644 --- a/protocols/pop3/src/main/java/org/apache/james/protocols/pop3/core/WelcomeMessageHandler.java +++ b/protocols/pop3/src/main/java/org/apache/james/protocols/pop3/core/WelcomeMessageHandler.java @@ -19,8 +19,6 @@ package org.apache.james.protocols.pop3.core; -import org.apache.commons.configuration2.Configuration; -import org.apache.commons.configuration2.ex.ConfigurationException; import org.apache.james.protocols.api.ProtocolSession.State; import org.apache.james.protocols.api.Response; import org.apache.james.protocols.api.handler.ConnectHandler; @@ -28,17 +26,6 @@ import org.apache.james.protocols.pop3.POP3Response; import org.apache.james.protocols.pop3.POP3Session; public class WelcomeMessageHandler implements ConnectHandler<POP3Session> { - - @Override - public void init(Configuration config) throws ConfigurationException { - - } - - @Override - public void destroy() { - - } - @Override public Response onConnect(POP3Session session) { StringBuilder responseBuffer = new StringBuilder(); diff --git a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/AcceptRecipientIfRelayingIsAllowed.java b/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/AcceptRecipientIfRelayingIsAllowed.java index 3685e2f..73edc8a 100644 --- a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/AcceptRecipientIfRelayingIsAllowed.java +++ b/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/AcceptRecipientIfRelayingIsAllowed.java @@ -18,8 +18,6 @@ ****************************************************************/ package org.apache.james.protocols.smtp.core; -import org.apache.commons.configuration2.Configuration; -import org.apache.commons.configuration2.ex.ConfigurationException; import org.apache.james.core.MailAddress; import org.apache.james.core.MaybeSender; import org.apache.james.protocols.smtp.SMTPSession; @@ -38,14 +36,4 @@ public class AcceptRecipientIfRelayingIsAllowed implements RcptHook { } return HookResult.DECLINED; } - - @Override - public void init(Configuration config) throws ConfigurationException { - - } - - @Override - public void destroy() { - - } } diff --git a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/DataCmdHandler.java b/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/DataCmdHandler.java index c454a57..2aa7f05 100644 --- a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/DataCmdHandler.java +++ b/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/DataCmdHandler.java @@ -123,16 +123,6 @@ public class DataCmdHandler implements CommandHandler<SMTPSession>, ExtensibleHa private LineHandler<SMTPSession> lineHandler; - @Override - public void init(Configuration config) throws ConfigurationException { - - } - - @Override - public void destroy() { - - } - /** * process DATA command * diff --git a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/DataLineMessageHookHandler.java b/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/DataLineMessageHookHandler.java index 9543e17..d2e7711 100644 --- a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/DataLineMessageHookHandler.java +++ b/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/DataLineMessageHookHandler.java @@ -27,8 +27,6 @@ import java.nio.ByteBuffer; import java.util.LinkedList; import java.util.List; -import org.apache.commons.configuration2.Configuration; -import org.apache.commons.configuration2.ex.ConfigurationException; import org.apache.james.protocols.api.ProtocolSession; import org.apache.james.protocols.api.Response; import org.apache.james.protocols.api.handler.ExtensibleHandler; @@ -61,16 +59,6 @@ public class DataLineMessageHookHandler implements DataLineFilter, ExtensibleHan private List<?> rHooks; @Override - public void init(Configuration config) throws ConfigurationException { - - } - - @Override - public void destroy() { - - } - - @Override public Response onLine(SMTPSession session, ByteBuffer line, LineHandler<SMTPSession> next) { MailEnvelopeImpl env = (MailEnvelopeImpl) session.getAttachment(DataCmdHandler.MAILENV, ProtocolSession.State.Transaction); OutputStream out = env.getMessageOutputStream(); diff --git a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/ExpnCmdHandler.java b/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/ExpnCmdHandler.java index 9203628..604b1c0 100644 --- a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/ExpnCmdHandler.java +++ b/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/ExpnCmdHandler.java @@ -23,8 +23,6 @@ package org.apache.james.protocols.smtp.core; import java.util.Collection; -import org.apache.commons.configuration2.Configuration; -import org.apache.commons.configuration2.ex.ConfigurationException; import org.apache.james.protocols.api.Request; import org.apache.james.protocols.api.Response; import org.apache.james.protocols.api.handler.CommandHandler; @@ -61,14 +59,4 @@ public class ExpnCmdHandler implements CommandHandler<SMTPSession> { public Collection<String> getImplCommands() { return COMMANDS; } - - @Override - public void init(Configuration config) throws ConfigurationException { - - } - - @Override - public void destroy() { - - } } diff --git a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/HeloCmdHandler.java b/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/HeloCmdHandler.java index 595c155..00458dd 100644 --- a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/HeloCmdHandler.java +++ b/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/HeloCmdHandler.java @@ -23,8 +23,6 @@ import java.util.Collection; import javax.inject.Inject; -import org.apache.commons.configuration2.Configuration; -import org.apache.commons.configuration2.ex.ConfigurationException; import org.apache.james.metrics.api.MetricFactory; import org.apache.james.protocols.api.ProtocolSession; import org.apache.james.protocols.api.ProtocolSession.State; @@ -60,16 +58,6 @@ public class HeloCmdHandler extends AbstractHookableCmdHandler<HeloHook> { } @Override - public void init(Configuration config) throws ConfigurationException { - - } - - @Override - public void destroy() { - - } - - @Override public Collection<String> getImplCommands() { return COMMANDS; } diff --git a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/HelpCmdHandler.java b/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/HelpCmdHandler.java index edfb73c..9fb5530 100644 --- a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/HelpCmdHandler.java +++ b/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/HelpCmdHandler.java @@ -17,14 +17,10 @@ * under the License. * ****************************************************************/ - - package org.apache.james.protocols.smtp.core; import java.util.Collection; -import org.apache.commons.configuration2.Configuration; -import org.apache.commons.configuration2.ex.ConfigurationException; import org.apache.james.protocols.api.Request; import org.apache.james.protocols.api.Response; import org.apache.james.protocols.api.handler.CommandHandler; @@ -59,14 +55,4 @@ public class HelpCmdHandler implements CommandHandler<SMTPSession> { public Collection<String> getImplCommands() { return COMMANDS; } - - @Override - public void init(Configuration config) throws ConfigurationException { - - } - - @Override - public void destroy() { - - } } diff --git a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/MailCmdHandler.java b/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/MailCmdHandler.java index 4ef46d6..a9853e4 100644 --- a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/MailCmdHandler.java +++ b/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/MailCmdHandler.java @@ -29,8 +29,6 @@ import java.util.StringTokenizer; import javax.inject.Inject; import javax.mail.internet.AddressException; -import org.apache.commons.configuration2.Configuration; -import org.apache.commons.configuration2.ex.ConfigurationException; import org.apache.james.core.MailAddress; import org.apache.james.core.MaybeSender; import org.apache.james.metrics.api.MetricFactory; @@ -84,16 +82,6 @@ public class MailCmdHandler extends AbstractHookableCmdHandler<MailHook> { } @Override - public void init(Configuration config) throws ConfigurationException { - - } - - @Override - public void destroy() { - - } - - @Override public Response onCommand(SMTPSession session, Request request) { Response response = super.onCommand(session, request); // Check if the response was not ok diff --git a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/NoopCmdHandler.java b/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/NoopCmdHandler.java index fe68d24..5b7e47d 100644 --- a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/NoopCmdHandler.java +++ b/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/NoopCmdHandler.java @@ -23,8 +23,6 @@ package org.apache.james.protocols.smtp.core; import java.util.Collection; -import org.apache.commons.configuration2.Configuration; -import org.apache.commons.configuration2.ex.ConfigurationException; import org.apache.james.protocols.api.Request; import org.apache.james.protocols.api.Response; import org.apache.james.protocols.api.handler.CommandHandler; @@ -61,14 +59,4 @@ public class NoopCmdHandler implements CommandHandler<SMTPSession> { public Collection<String> getImplCommands() { return COMMANDS; } - - @Override - public void init(Configuration config) throws ConfigurationException { - - } - - @Override - public void destroy() { - - } } diff --git a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/PostmasterAbuseRcptHook.java b/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/PostmasterAbuseRcptHook.java index 4f93f29..98d4507 100644 --- a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/PostmasterAbuseRcptHook.java +++ b/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/PostmasterAbuseRcptHook.java @@ -18,8 +18,6 @@ ****************************************************************/ package org.apache.james.protocols.smtp.core; -import org.apache.commons.configuration2.Configuration; -import org.apache.commons.configuration2.ex.ConfigurationException; import org.apache.james.core.MailAddress; import org.apache.james.core.MaybeSender; import org.apache.james.protocols.smtp.SMTPSession; @@ -43,14 +41,4 @@ public class PostmasterAbuseRcptHook implements RcptHook { return HookResult.DECLINED; } } - - @Override - public void init(Configuration config) throws ConfigurationException { - - } - - @Override - public void destroy() { - - } } diff --git a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/QuitCmdHandler.java b/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/QuitCmdHandler.java index d16bc21..f831660 100644 --- a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/QuitCmdHandler.java +++ b/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/QuitCmdHandler.java @@ -23,8 +23,6 @@ import java.util.Collection; import javax.inject.Inject; -import org.apache.commons.configuration2.Configuration; -import org.apache.commons.configuration2.ex.ConfigurationException; import org.apache.james.metrics.api.MetricFactory; import org.apache.james.protocols.api.Response; import org.apache.james.protocols.smtp.SMTPResponse; @@ -63,17 +61,6 @@ public class QuitCmdHandler extends AbstractHookableCmdHandler<QuitHook> { super(metricFactory); } - - @Override - public void init(Configuration config) throws ConfigurationException { - - } - - @Override - public void destroy() { - - } - /** * Handler method called upon receipt of a QUIT command. This method informs * the client that the connection is closing. diff --git a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/RcptCmdHandler.java b/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/RcptCmdHandler.java index 07551a9..c5e8815 100644 --- a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/RcptCmdHandler.java +++ b/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/RcptCmdHandler.java @@ -26,8 +26,6 @@ import java.util.StringTokenizer; import javax.inject.Inject; -import org.apache.commons.configuration2.Configuration; -import org.apache.commons.configuration2.ex.ConfigurationException; import org.apache.james.core.MailAddress; import org.apache.james.core.MaybeSender; import org.apache.james.metrics.api.MetricFactory; @@ -63,16 +61,6 @@ public class RcptCmdHandler extends AbstractHookableCmdHandler<RcptHook> impleme super(metricFactory); } - @Override - public void init(Configuration config) throws ConfigurationException { - - } - - @Override - public void destroy() { - - } - /** * Handler method called upon receipt of a RCPT command. Reads recipient. * Does some connection validation. diff --git a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/ReceivedDataLineFilter.java b/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/ReceivedDataLineFilter.java index 67b7ec2..fe06546 100644 --- a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/ReceivedDataLineFilter.java +++ b/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/ReceivedDataLineFilter.java @@ -26,8 +26,6 @@ import java.util.Date; import java.util.List; import java.util.Locale; -import org.apache.commons.configuration2.Configuration; -import org.apache.commons.configuration2.ex.ConfigurationException; import org.apache.james.core.MailAddress; import org.apache.james.protocols.api.ProtocolSession.State; import org.apache.james.protocols.smtp.SMTPSession; @@ -46,16 +44,6 @@ public class ReceivedDataLineFilter extends AbstractAddHeadersFilter { return new SimpleDateFormat("EEE, dd MMM yyyy HH:mm:ss Z (zzz)", Locale.US); }); - @Override - public void init(Configuration config) throws ConfigurationException { - - } - - @Override - public void destroy() { - - } - /** * Return the service type which will be used in the Received headers. * diff --git a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/RsetCmdHandler.java b/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/RsetCmdHandler.java index 9d4932e..8b0edf3 100644 --- a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/RsetCmdHandler.java +++ b/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/RsetCmdHandler.java @@ -17,14 +17,10 @@ * under the License. * ****************************************************************/ - - package org.apache.james.protocols.smtp.core; import java.util.Collection; -import org.apache.commons.configuration2.Configuration; -import org.apache.commons.configuration2.ex.ConfigurationException; import org.apache.james.protocols.api.Request; import org.apache.james.protocols.api.Response; import org.apache.james.protocols.api.handler.CommandHandler; @@ -73,14 +69,4 @@ public class RsetCmdHandler implements CommandHandler<SMTPSession> { public Collection<String> getImplCommands() { return COMMANDS; } - - @Override - public void init(Configuration config) throws ConfigurationException { - - } - - @Override - public void destroy() { - - } } diff --git a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/UnknownCmdHandler.java b/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/UnknownCmdHandler.java index d3c0084..bc0c414 100644 --- a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/UnknownCmdHandler.java +++ b/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/UnknownCmdHandler.java @@ -25,8 +25,6 @@ import java.util.Collection; import javax.inject.Inject; -import org.apache.commons.configuration2.Configuration; -import org.apache.commons.configuration2.ex.ConfigurationException; import org.apache.james.metrics.api.MetricFactory; import org.apache.james.protocols.api.ProtocolSession.State; import org.apache.james.protocols.api.Response; @@ -56,16 +54,6 @@ public class UnknownCmdHandler extends AbstractHookableCmdHandler<UnknownHook> { } @Override - public void init(Configuration config) throws ConfigurationException { - - } - - @Override - public void destroy() { - - } - - @Override public Collection<String> getImplCommands() { return COMMANDS; } diff --git a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/VrfyCmdHandler.java b/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/VrfyCmdHandler.java index 26c5354..ab42862 100644 --- a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/VrfyCmdHandler.java +++ b/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/VrfyCmdHandler.java @@ -17,14 +17,10 @@ * under the License. * ****************************************************************/ - - package org.apache.james.protocols.smtp.core; import java.util.Collection; -import org.apache.commons.configuration2.Configuration; -import org.apache.commons.configuration2.ex.ConfigurationException; import org.apache.james.protocols.api.Request; import org.apache.james.protocols.api.Response; import org.apache.james.protocols.api.handler.CommandHandler; @@ -59,14 +55,4 @@ public class VrfyCmdHandler implements CommandHandler<SMTPSession> { public Collection<String> getImplCommands() { return COMMANDS; } - - @Override - public void init(Configuration config) throws ConfigurationException { - - } - - @Override - public void destroy() { - - } } diff --git a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/WelcomeMessageHandler.java b/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/WelcomeMessageHandler.java index 7683f9c5..e5ecf35 100644 --- a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/WelcomeMessageHandler.java +++ b/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/WelcomeMessageHandler.java @@ -20,8 +20,6 @@ package org.apache.james.protocols.smtp.core; -import org.apache.commons.configuration2.Configuration; -import org.apache.commons.configuration2.ex.ConfigurationException; import org.apache.james.protocols.api.Response; import org.apache.james.protocols.api.handler.ConnectHandler; import org.apache.james.protocols.smtp.SMTPResponse; @@ -58,14 +56,4 @@ public class WelcomeMessageHandler implements ConnectHandler<SMTPSession> { protected String getServiceType(SMTPSession session) { return SERVICE_TYPE; } - - @Override - public void init(Configuration config) throws ConfigurationException { - - } - - @Override - public void destroy() { - - } } diff --git a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/esmtp/AuthCmdHandler.java b/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/esmtp/AuthCmdHandler.java index 11b3825..a62abd9 100644 --- a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/esmtp/AuthCmdHandler.java +++ b/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/esmtp/AuthCmdHandler.java @@ -33,8 +33,6 @@ import java.util.Locale; import java.util.Optional; import java.util.StringTokenizer; -import org.apache.commons.configuration2.Configuration; -import org.apache.commons.configuration2.ex.ConfigurationException; import org.apache.james.protocols.api.Request; import org.apache.james.protocols.api.Response; import org.apache.james.protocols.api.handler.CommandHandler; @@ -139,16 +137,6 @@ public class AuthCmdHandler private List<HookResultHook> rHooks; - @Override - public void init(Configuration config) throws ConfigurationException { - - } - - @Override - public void destroy() { - - } - /** * handles AUTH command * @@ -187,16 +175,6 @@ public class AuthCmdHandler protected Response onCommand(SMTPSession session, String l) { return doPlainAuthPass(session, l); } - - @Override - public void init(Configuration config) throws ConfigurationException { - - } - - @Override - public void destroy() { - - } }); return AUTH_READY_PLAIN; } else { @@ -211,16 +189,6 @@ public class AuthCmdHandler protected Response onCommand(SMTPSession session, String l) { return doLoginAuthPass(session, l); } - - @Override - public void init(Configuration config) throws ConfigurationException { - - } - - @Override - public void destroy() { - - } }); return AUTH_READY_USERNAME_LOGIN; } else { @@ -346,16 +314,6 @@ public class AuthCmdHandler protected Response onCommand(SMTPSession session, String l) { return doLoginAuthPassCheck(session, user, l); } - - @Override - public void init(Configuration config) throws ConfigurationException { - - } - - @Override - public void destroy() { - - } }.setUser(user)); return AUTH_READY_PASSWORD_LOGIN; } diff --git a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/esmtp/EhloCmdHandler.java b/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/esmtp/EhloCmdHandler.java index 6e6ca38..ecbf0d4 100644 --- a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/esmtp/EhloCmdHandler.java +++ b/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/esmtp/EhloCmdHandler.java @@ -24,8 +24,6 @@ import java.util.List; import javax.inject.Inject; -import org.apache.commons.configuration2.Configuration; -import org.apache.commons.configuration2.ex.ConfigurationException; import org.apache.james.metrics.api.MetricFactory; import org.apache.james.protocols.api.ProtocolSession.State; import org.apache.james.protocols.api.Response; @@ -61,16 +59,6 @@ public class EhloCmdHandler extends AbstractHookableCmdHandler<HeloHook> impleme super(metricFactory); } - @Override - public void init(Configuration config) throws ConfigurationException { - - } - - @Override - public void destroy() { - - } - /** * Handler method called upon receipt of a EHLO command. Responds with a * greeting and informs the client whether client authentication is diff --git a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/esmtp/MailSizeEsmtpExtension.java b/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/esmtp/MailSizeEsmtpExtension.java index ed05ef7..e951d71 100644 --- a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/esmtp/MailSizeEsmtpExtension.java +++ b/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/esmtp/MailSizeEsmtpExtension.java @@ -24,8 +24,6 @@ import java.util.Arrays; import java.util.Collections; import java.util.List; -import org.apache.commons.configuration2.Configuration; -import org.apache.commons.configuration2.ex.ConfigurationException; import org.apache.james.core.MaybeSender; import org.apache.james.protocols.api.ProtocolSession.State; import org.apache.james.protocols.api.Response; @@ -68,16 +66,6 @@ public class MailSizeEsmtpExtension implements MailParametersHook, EhloExtension public static final int DOT_BYTE = 46; @Override - public void init(Configuration config) throws ConfigurationException { - - } - - @Override - public void destroy() { - - } - - @Override public HookResult doMailParameter(SMTPSession session, String paramName, String paramValue) { MaybeSender tempSender = (MaybeSender) session.getAttachment(SMTPSession.SENDER, State.Transaction); diff --git a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/esmtp/StartTlsCmdHandler.java b/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/esmtp/StartTlsCmdHandler.java index 43936de..b13870f 100644 --- a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/esmtp/StartTlsCmdHandler.java +++ b/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/esmtp/StartTlsCmdHandler.java @@ -23,8 +23,6 @@ import java.util.Collection; import java.util.Collections; import java.util.List; -import org.apache.commons.configuration2.Configuration; -import org.apache.commons.configuration2.ex.ConfigurationException; import org.apache.james.protocols.api.Request; import org.apache.james.protocols.api.Response; import org.apache.james.protocols.api.handler.CommandHandler; @@ -58,16 +56,6 @@ public class StartTlsCmdHandler implements CommandHandler<SMTPSession>, EhloExte return COMMANDS; } - @Override - public void init(Configuration config) throws ConfigurationException { - - } - - @Override - public void destroy() { - - } - /** * Handler method called upon receipt of a STARTTLS command. Resets * message-specific, but not authenticated user, state. diff --git a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/fastfail/DNSRBLHandler.java b/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/fastfail/DNSRBLHandler.java index 2117f27..dc90d37 100644 --- a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/fastfail/DNSRBLHandler.java +++ b/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/fastfail/DNSRBLHandler.java @@ -24,8 +24,6 @@ import java.util.Collection; import java.util.Collections; import java.util.StringTokenizer; -import org.apache.commons.configuration2.Configuration; -import org.apache.commons.configuration2.ex.ConfigurationException; import org.apache.james.core.MailAddress; import org.apache.james.core.MaybeSender; import org.apache.james.protocols.api.ProtocolSession.State; @@ -57,16 +55,6 @@ public class DNSRBLHandler implements RcptHook { public static final String RBL_DETAIL_MAIL_ATTRIBUTE_NAME = "org.apache.james.smtpserver.rbl.detail"; - @Override - public void init(Configuration config) throws ConfigurationException { - - } - - @Override - public void destroy() { - - } - /** * Set the whitelist array * diff --git a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/fastfail/MaxRcptHandler.java b/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/fastfail/MaxRcptHandler.java index 6ca7f22..c3ae9b4 100644 --- a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/fastfail/MaxRcptHandler.java +++ b/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/fastfail/MaxRcptHandler.java @@ -21,8 +21,6 @@ package org.apache.james.protocols.smtp.core.fastfail; -import org.apache.commons.configuration2.Configuration; -import org.apache.commons.configuration2.ex.ConfigurationException; import org.apache.james.core.MailAddress; import org.apache.james.core.MaybeSender; import org.apache.james.protocols.smtp.SMTPRetCode; @@ -66,14 +64,4 @@ public class MaxRcptHandler implements RcptHook { return HookResult.DECLINED; } } - - @Override - public void init(Configuration config) throws ConfigurationException { - - } - - @Override - public void destroy() { - - } } diff --git a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/fastfail/MaxUnknownCmdHandler.java b/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/fastfail/MaxUnknownCmdHandler.java index 3d4a173..1461a8f 100644 --- a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/fastfail/MaxUnknownCmdHandler.java +++ b/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/fastfail/MaxUnknownCmdHandler.java @@ -20,8 +20,6 @@ package org.apache.james.protocols.smtp.core.fastfail; -import org.apache.commons.configuration2.Configuration; -import org.apache.commons.configuration2.ex.ConfigurationException; import org.apache.james.protocols.api.ProtocolSession.State; import org.apache.james.protocols.smtp.SMTPSession; import org.apache.james.protocols.smtp.hook.HookResult; @@ -38,16 +36,6 @@ public class MaxUnknownCmdHandler implements UnknownHook { private static final String UNKOWN_COMMAND_COUNT = "UNKNOWN_COMMAND_COUNT"; private int maxUnknown = DEFAULT_MAX_UNKOWN; - @Override - public void init(Configuration config) throws ConfigurationException { - - } - - @Override - public void destroy() { - - } - public void setMaxUnknownCmdCount(int maxUnknown) { this.maxUnknown = maxUnknown; } diff --git a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/fastfail/ResolvableEhloHeloHandler.java b/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/fastfail/ResolvableEhloHeloHandler.java index 147cf98..403490a 100644 --- a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/fastfail/ResolvableEhloHeloHandler.java +++ b/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/fastfail/ResolvableEhloHeloHandler.java @@ -22,8 +22,6 @@ package org.apache.james.protocols.smtp.core.fastfail; import java.net.InetAddress; import java.net.UnknownHostException; -import org.apache.commons.configuration2.Configuration; -import org.apache.commons.configuration2.ex.ConfigurationException; import org.apache.james.core.MailAddress; import org.apache.james.core.MaybeSender; import org.apache.james.protocols.api.ProtocolSession.State; @@ -43,16 +41,6 @@ public class ResolvableEhloHeloHandler implements RcptHook, HeloHook { public static final String BAD_EHLO_HELO = "BAD_EHLO_HELO"; - @Override - public void init(Configuration config) throws ConfigurationException { - - } - - @Override - public void destroy() { - - } - /** * Check if EHLO/HELO is resolvable * diff --git a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/fastfail/SpamTrapHandler.java b/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/fastfail/SpamTrapHandler.java index f0afce0..1d9fe40 100644 --- a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/fastfail/SpamTrapHandler.java +++ b/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/fastfail/SpamTrapHandler.java @@ -26,8 +26,6 @@ import java.util.HashMap; import java.util.Locale; import java.util.Map; -import org.apache.commons.configuration2.Configuration; -import org.apache.commons.configuration2.ex.ConfigurationException; import org.apache.james.core.MailAddress; import org.apache.james.core.MaybeSender; import org.apache.james.protocols.smtp.SMTPSession; @@ -51,16 +49,6 @@ public class SpamTrapHandler implements RcptHook { /** Default blocktime 12 hours */ protected long blockTime = 4320000; - @Override - public void init(Configuration config) throws ConfigurationException { - - } - - @Override - public void destroy() { - - } - public void setSpamTrapRecipients(Collection<String> spamTrapRecips) { this.spamTrapRecips = spamTrapRecips; } diff --git a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/fastfail/SupressDuplicateRcptHandler.java b/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/fastfail/SupressDuplicateRcptHandler.java index 4703228..bd4cf71 100644 --- a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/fastfail/SupressDuplicateRcptHandler.java +++ b/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/fastfail/SupressDuplicateRcptHandler.java @@ -21,8 +21,6 @@ package org.apache.james.protocols.smtp.core.fastfail; import java.util.Collection; -import org.apache.commons.configuration2.Configuration; -import org.apache.commons.configuration2.ex.ConfigurationException; import org.apache.james.core.MailAddress; import org.apache.james.core.MaybeSender; import org.apache.james.protocols.api.ProtocolSession.State; @@ -42,16 +40,6 @@ public class SupressDuplicateRcptHandler implements RcptHook { private static final Logger LOGGER = LoggerFactory.getLogger(SupressDuplicateRcptHandler.class); @Override - public void init(Configuration config) throws ConfigurationException { - - } - - @Override - public void destroy() { - - } - - @Override @SuppressWarnings("unchecked") public HookResult doRcpt(SMTPSession session, MaybeSender sender, MailAddress rcpt) { Collection<MailAddress> rcptList = (Collection<MailAddress>) session.getAttachment(SMTPSession.RCPT_LIST, State.Transaction); diff --git a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/log/HookResultLogger.java b/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/log/HookResultLogger.java index 0aec58c..8253e63 100644 --- a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/log/HookResultLogger.java +++ b/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/log/HookResultLogger.java @@ -18,8 +18,6 @@ ****************************************************************/ package org.apache.james.protocols.smtp.core.log; -import org.apache.commons.configuration2.Configuration; -import org.apache.commons.configuration2.ex.ConfigurationException; import org.apache.james.protocols.smtp.SMTPSession; import org.apache.james.protocols.smtp.hook.Hook; import org.apache.james.protocols.smtp.hook.HookResult; @@ -30,7 +28,7 @@ import org.slf4j.LoggerFactory; /** * - * Log the {@link HookResult}. If {@link HookReturnCode#DENY}, {@link HookReturnCode#DENYSOFT} or {@link HookReturnCode#DISCONNECT} was used it will get + * Log the {@link HookResult}. If {@link HookReturnCode.Action#DENY}, {@link HookReturnCode.Action#DENYSOFT} or {@link HookReturnCode#isDisconnected()} was used it will get * logged to INFO. If not to DEBUG * */ @@ -38,16 +36,6 @@ public class HookResultLogger implements HookResultHook { private static final Logger LOGGER = LoggerFactory.getLogger(HookResultLogger.class); @Override - public void init(Configuration config) throws ConfigurationException { - - } - - @Override - public void destroy() { - - } - - @Override public HookResult onHookResult(SMTPSession session, HookResult hResult, long executionTime, Hook hook) { HookReturnCode result = hResult.getResult(); diff --git a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/hook/SimpleHook.java b/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/hook/SimpleHook.java index a671312..50a3371 100644 --- a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/hook/SimpleHook.java +++ b/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/hook/SimpleHook.java @@ -19,8 +19,6 @@ package org.apache.james.protocols.smtp.hook; -import org.apache.commons.configuration2.Configuration; -import org.apache.commons.configuration2.ex.ConfigurationException; import org.apache.james.core.MailAddress; import org.apache.james.core.MaybeSender; import org.apache.james.protocols.smtp.MailEnvelope; @@ -35,18 +33,8 @@ import org.apache.james.protocols.smtp.SMTPSession; */ public class SimpleHook implements HeloHook, MailHook, RcptHook, MessageHook { - @Override - public void init(Configuration config) throws ConfigurationException { - - } - - @Override - public void destroy() { - - } - /** - * Return {@link HookResult} with {@link HookReturnCode#OK} + * Return {@link HookResult} with {@link HookReturnCode.Action#OK} */ @Override public HookResult onMessage(SMTPSession session, MailEnvelope mail) { @@ -54,7 +42,7 @@ public class SimpleHook implements HeloHook, MailHook, RcptHook, MessageHook { } /** - * Return {@link HookResult} with {@link HookReturnCode#DECLINED} + * Return {@link HookResult} with {@link HookReturnCode.Action#DECLINED} */ @Override public HookResult doRcpt(SMTPSession session, MaybeSender sender, MailAddress rcpt) { @@ -63,7 +51,7 @@ public class SimpleHook implements HeloHook, MailHook, RcptHook, MessageHook { } /** - * Return {@link HookResult} with {@link HookReturnCode#DECLINED} + * Return {@link HookResult} with {@link HookReturnCode.Action#DECLINED} */ @Override public HookResult doMail(SMTPSession session, MaybeSender sender) { @@ -72,7 +60,7 @@ public class SimpleHook implements HeloHook, MailHook, RcptHook, MessageHook { } /** - * Return {@link HookResult} with {@link HookReturnCode#DECLINED} + * Return {@link HookResult} with {@link HookReturnCode.Action#DECLINED} */ @Override public HookResult doHelo(SMTPSession session, String helo) { 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 cdd1a98..1fb15da 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 @@ -32,8 +32,6 @@ import java.util.Iterator; import java.util.List; import java.util.concurrent.atomic.AtomicBoolean; -import org.apache.commons.configuration2.Configuration; -import org.apache.commons.configuration2.ex.ConfigurationException; import org.apache.commons.net.smtp.SMTPClient; import org.apache.commons.net.smtp.SMTPReply; import org.apache.james.core.MailAddress; @@ -41,7 +39,6 @@ import org.apache.james.core.MaybeSender; import org.apache.james.metrics.api.NoopMetricFactory; import org.apache.james.protocols.api.Protocol; import org.apache.james.protocols.api.ProtocolServer; -import org.apache.james.protocols.api.Response; import org.apache.james.protocols.api.handler.ConnectHandler; import org.apache.james.protocols.api.handler.DisconnectHandler; import org.apache.james.protocols.api.handler.ProtocolHandler; @@ -486,23 +483,7 @@ public abstract class AbstractSMTPServerTest { @Test public void testHeloHookPermanentError() throws Exception { - HeloHook hook = new HeloHook() { - - @Override - public void init(Configuration config) throws ConfigurationException { - - } - - @Override - public void destroy() { - - } - - @Override - public HookResult doHelo(SMTPSession session, String helo) { - return HookResult.DENY; - } - }; + HeloHook hook = (session, helo) -> HookResult.DENY; ProtocolServer server = null; try { @@ -534,23 +515,7 @@ public abstract class AbstractSMTPServerTest { @Test public void testHeloHookTempraryError() throws Exception { - HeloHook hook = new HeloHook() { - - @Override - public void init(Configuration config) throws ConfigurationException { - - } - - @Override - public void destroy() { - - } - - @Override - public HookResult doHelo(SMTPSession session, String helo) { - return HookResult.DENYSOFT; - } - }; + HeloHook hook = (session, helo) -> HookResult.DENYSOFT; ProtocolServer server = null; try { @@ -582,17 +547,6 @@ public abstract class AbstractSMTPServerTest { @Test public void testMailHookPermanentError() throws Exception { MailHook hook = new MailHook() { - - @Override - public void init(Configuration config) throws ConfigurationException { - - } - - @Override - public void destroy() { - - } - @Override public HookResult doMail(SMTPSession session, MaybeSender sender) { return HookResult.DENY; @@ -632,17 +586,6 @@ public abstract class AbstractSMTPServerTest { @Test public void testMailHookTemporaryError() throws Exception { MailHook hook = new MailHook() { - - @Override - public void init(Configuration config) throws ConfigurationException { - - } - - @Override - public void destroy() { - - } - @Override public HookResult doMail(SMTPSession session, MaybeSender sender) { return HookResult.DENYSOFT; @@ -683,17 +626,6 @@ public abstract class AbstractSMTPServerTest { @Test public void testRcptHookPermanentError() throws Exception { RcptHook hook = new RcptHook() { - - @Override - public void init(Configuration config) throws ConfigurationException { - - } - - @Override - public void destroy() { - - } - @Override public HookResult doRcpt(SMTPSession session, MaybeSender sender, MailAddress rcpt) { if (RCPT1.equals(rcpt.toString())) { @@ -747,17 +679,6 @@ public abstract class AbstractSMTPServerTest { @Test public void testRcptHookTemporaryError() throws Exception { RcptHook hook = new RcptHook() { - - @Override - public void init(Configuration config) throws ConfigurationException { - - } - - @Override - public void destroy() { - - } - @Override public HookResult doRcpt(SMTPSession session, MaybeSender sender, MailAddress rcpt) { if (RCPT1.equals(rcpt.toString())) { @@ -845,25 +766,7 @@ public abstract class AbstractSMTPServerTest { public void testMessageHookPermanentError() throws Exception { TestMessageHook testHook = new TestMessageHook(); - MessageHook hook = new MessageHook() { - - @Override - public void init(Configuration config) throws ConfigurationException { - - } - - @Override - public void destroy() { - - } - - @Override - public HookResult onMessage(SMTPSession session, MailEnvelope mail) { - return HookResult.DENY; - } - - - }; + MessageHook hook = (session, mail) -> HookResult.DENY; ProtocolServer server = null; try { @@ -909,25 +812,7 @@ public abstract class AbstractSMTPServerTest { public void testMessageHookTemporaryError() throws Exception { TestMessageHook testHook = new TestMessageHook(); - MessageHook hook = new MessageHook() { - - @Override - public void init(Configuration config) throws ConfigurationException { - - } - - @Override - public void destroy() { - - } - - @Override - public HookResult onMessage(SMTPSession session, MailEnvelope mail) { - return HookResult.DENYSOFT; - } - - - }; + MessageHook hook = (session, mail) -> HookResult.DENYSOFT; ProtocolServer server = null; try { @@ -972,23 +857,7 @@ public abstract class AbstractSMTPServerTest { @Test public void testConnectHandlerPermananet() throws Exception { - ConnectHandler<SMTPSession> connectHandler = new ConnectHandler<SMTPSession>() { - - @Override - public void init(Configuration config) throws ConfigurationException { - - } - - @Override - public void destroy() { - - } - - @Override - public Response onConnect(SMTPSession session) { - return new SMTPResponse("554", "Bye Bye"); - } - }; + ConnectHandler<SMTPSession> connectHandler = session -> new SMTPResponse("554", "Bye Bye"); ProtocolServer server = null; try { @@ -1015,23 +884,7 @@ public abstract class AbstractSMTPServerTest { @Test public void testConnectHandlerTemporary() throws Exception { - ConnectHandler<SMTPSession> connectHandler = new ConnectHandler<SMTPSession>() { - - @Override - public void init(Configuration config) throws ConfigurationException { - - } - - @Override - public void destroy() { - - } - - @Override - public Response onConnect(SMTPSession session) { - return new SMTPResponse("451", "Bye Bye"); - } - }; + ConnectHandler<SMTPSession> connectHandler = session -> new SMTPResponse("451", "Bye Bye"); ProtocolServer server = null; try { @@ -1058,23 +911,7 @@ public abstract class AbstractSMTPServerTest { public void testDisconnectHandler() throws Exception { final AtomicBoolean called = new AtomicBoolean(false); - DisconnectHandler<SMTPSession> handler = new DisconnectHandler<SMTPSession>() { - - @Override - public void init(Configuration config) throws ConfigurationException { - - } - - @Override - public void destroy() { - - } - - @Override - public void onDisconnect(SMTPSession session) { - called.set(true); - } - }; + DisconnectHandler<SMTPSession> handler = session -> called.set(true); ProtocolServer server = null; try { diff --git a/protocols/smtp/src/test/java/org/apache/james/protocols/smtp/core/fastfail/ValidSenderDomainHandlerTest.java b/protocols/smtp/src/test/java/org/apache/james/protocols/smtp/core/fastfail/ValidSenderDomainHandlerTest.java index 09c35b5..407f1ca 100644 --- a/protocols/smtp/src/test/java/org/apache/james/protocols/smtp/core/fastfail/ValidSenderDomainHandlerTest.java +++ b/protocols/smtp/src/test/java/org/apache/james/protocols/smtp/core/fastfail/ValidSenderDomainHandlerTest.java @@ -24,7 +24,6 @@ import static org.assertj.core.api.Assertions.assertThat; import java.util.HashMap; import java.util.Map; -import org.apache.commons.configuration2.Configuration; import org.apache.james.core.MailAddress; import org.apache.james.core.MaybeSender; import org.apache.james.protocols.api.ProtocolSession.State; @@ -37,17 +36,6 @@ public class ValidSenderDomainHandlerTest { private ValidSenderDomainHandler createHandler() { return new ValidSenderDomainHandler() { - - @Override - public void init(Configuration config) { - - } - - @Override - public void destroy() { - - } - @Override protected boolean hasMXRecord(SMTPSession session, String domain) { if (domain.equals("test.james.apache.org")) { diff --git a/protocols/smtp/src/test/java/org/apache/james/protocols/smtp/utils/TestMessageHook.java b/protocols/smtp/src/test/java/org/apache/james/protocols/smtp/utils/TestMessageHook.java index 536f2d1..02c3860 100644 --- a/protocols/smtp/src/test/java/org/apache/james/protocols/smtp/utils/TestMessageHook.java +++ b/protocols/smtp/src/test/java/org/apache/james/protocols/smtp/utils/TestMessageHook.java @@ -21,8 +21,6 @@ package org.apache.james.protocols.smtp.utils; import java.util.List; import java.util.concurrent.CopyOnWriteArrayList; -import org.apache.commons.configuration2.Configuration; -import org.apache.commons.configuration2.ex.ConfigurationException; import org.apache.james.protocols.smtp.MailEnvelope; import org.apache.james.protocols.smtp.SMTPSession; import org.apache.james.protocols.smtp.hook.HookResult; @@ -41,14 +39,4 @@ public class TestMessageHook implements MessageHook { public List<MailEnvelope> getQueued() { return queued; } - - @Override - public void init(Configuration config) throws ConfigurationException { - - } - - @Override - public void destroy() { - - } } 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 bf36b36..c75b2d0 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 @@ -55,8 +55,6 @@ public abstract class AbstractConnectHandlerResultJMXMonitor<R extends Response, } } - - @Override public Response onResponse(ProtocolSession session, Response response, long executionTime, ProtocolHandler handler) { if (handler instanceof ConnectHandler) { diff --git a/server/protocols/protocols-lmtp/src/main/java/org/apache/james/lmtpserver/CoreCmdHandlerLoader.java b/server/protocols/protocols-lmtp/src/main/java/org/apache/james/lmtpserver/CoreCmdHandlerLoader.java index bf5e3f3..bc26b22 100644 --- a/server/protocols/protocols-lmtp/src/main/java/org/apache/james/lmtpserver/CoreCmdHandlerLoader.java +++ b/server/protocols/protocols-lmtp/src/main/java/org/apache/james/lmtpserver/CoreCmdHandlerLoader.java @@ -23,8 +23,6 @@ import java.util.LinkedList; import java.util.List; import java.util.stream.Stream; -import org.apache.commons.configuration2.Configuration; -import org.apache.commons.configuration2.ex.ConfigurationException; import org.apache.james.lmtpserver.hook.MailboxDeliverToRecipientHandler; import org.apache.james.protocols.api.handler.CommandDispatcher; import org.apache.james.protocols.api.handler.CommandHandlerResultLogger; @@ -83,14 +81,4 @@ public class CoreCmdHandlerLoader implements HandlersPackage { public List<String> getHandlers() { return commands; } - - @Override - public void init(Configuration config) throws ConfigurationException { - - } - - @Override - public void destroy() { - - } } diff --git a/server/protocols/protocols-lmtp/src/main/java/org/apache/james/lmtpserver/hook/MailboxDeliverToRecipientHandler.java b/server/protocols/protocols-lmtp/src/main/java/org/apache/james/lmtpserver/hook/MailboxDeliverToRecipientHandler.java index 3ca8a10..bfdbc9f 100644 --- a/server/protocols/protocols-lmtp/src/main/java/org/apache/james/lmtpserver/hook/MailboxDeliverToRecipientHandler.java +++ b/server/protocols/protocols-lmtp/src/main/java/org/apache/james/lmtpserver/hook/MailboxDeliverToRecipientHandler.java @@ -25,8 +25,6 @@ import java.util.Optional; import javax.inject.Inject; import javax.inject.Named; -import org.apache.commons.configuration2.Configuration; -import org.apache.commons.configuration2.ex.ConfigurationException; import org.apache.james.core.MailAddress; import org.apache.james.mailbox.MailboxManager; import org.apache.james.mailbox.MailboxSession; @@ -101,14 +99,4 @@ public class MailboxDeliverToRecipientHandler implements DeliverToRecipientHook .build(); } } - - @Override - public void init(Configuration config) throws ConfigurationException { - - } - - @Override - public void destroy() { - - } } diff --git a/server/protocols/protocols-lmtp/src/main/java/org/apache/james/lmtpserver/jmx/JMXHandlersLoader.java b/server/protocols/protocols-lmtp/src/main/java/org/apache/james/lmtpserver/jmx/JMXHandlersLoader.java index aa4084f..d4be40e 100644 --- a/server/protocols/protocols-lmtp/src/main/java/org/apache/james/lmtpserver/jmx/JMXHandlersLoader.java +++ b/server/protocols/protocols-lmtp/src/main/java/org/apache/james/lmtpserver/jmx/JMXHandlersLoader.java @@ -21,8 +21,6 @@ package org.apache.james.lmtpserver.jmx; import java.util.ArrayList; import java.util.List; -import org.apache.commons.configuration2.Configuration; -import org.apache.commons.configuration2.ex.ConfigurationException; import org.apache.james.protocols.lib.handler.HandlersPackage; public class JMXHandlersLoader implements HandlersPackage { @@ -39,14 +37,4 @@ public class JMXHandlersLoader implements HandlersPackage { public List<String> getHandlers() { return handlers; } - - @Override - public void init(Configuration config) throws ConfigurationException { - - } - - @Override - public void destroy() { - - } } diff --git a/server/protocols/protocols-pop3/src/main/java/org/apache/james/pop3server/core/CoreCmdHandlerLoader.java b/server/protocols/protocols-pop3/src/main/java/org/apache/james/pop3server/core/CoreCmdHandlerLoader.java index a9b6dea..504c62e 100644 --- a/server/protocols/protocols-pop3/src/main/java/org/apache/james/pop3server/core/CoreCmdHandlerLoader.java +++ b/server/protocols/protocols-pop3/src/main/java/org/apache/james/pop3server/core/CoreCmdHandlerLoader.java @@ -22,8 +22,6 @@ package org.apache.james.pop3server.core; import java.util.LinkedList; import java.util.List; -import org.apache.commons.configuration2.Configuration; -import org.apache.commons.configuration2.ex.ConfigurationException; import org.apache.james.protocols.api.handler.CommandDispatcher; import org.apache.james.protocols.api.handler.CommandHandlerResultLogger; import org.apache.james.protocols.lib.handler.HandlersPackage; @@ -96,14 +94,4 @@ public class CoreCmdHandlerLoader implements HandlersPackage { public List<String> getHandlers() { return commands; } - - @Override - public void init(Configuration config) throws ConfigurationException { - - } - - @Override - public void destroy() { - - } } diff --git a/server/protocols/protocols-pop3/src/main/java/org/apache/james/pop3server/jmx/JMXHandlersLoader.java b/server/protocols/protocols-pop3/src/main/java/org/apache/james/pop3server/jmx/JMXHandlersLoader.java index b21902e..d812dea 100644 --- a/server/protocols/protocols-pop3/src/main/java/org/apache/james/pop3server/jmx/JMXHandlersLoader.java +++ b/server/protocols/protocols-pop3/src/main/java/org/apache/james/pop3server/jmx/JMXHandlersLoader.java @@ -21,8 +21,6 @@ package org.apache.james.pop3server.jmx; import java.util.ArrayList; import java.util.List; -import org.apache.commons.configuration2.Configuration; -import org.apache.commons.configuration2.ex.ConfigurationException; import org.apache.james.protocols.lib.handler.HandlersPackage; public class JMXHandlersLoader implements HandlersPackage { @@ -39,14 +37,4 @@ public class JMXHandlersLoader implements HandlersPackage { public List<String> getHandlers() { return handlers; } - - @Override - public void init(Configuration config) throws ConfigurationException { - - } - - @Override - public void destroy() { - - } } diff --git a/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/AddDefaultAttributesMessageHook.java b/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/AddDefaultAttributesMessageHook.java index 0639b38..2329162 100644 --- a/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/AddDefaultAttributesMessageHook.java +++ b/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/AddDefaultAttributesMessageHook.java @@ -18,8 +18,6 @@ ****************************************************************/ package org.apache.james.smtpserver; -import org.apache.commons.configuration2.Configuration; -import org.apache.commons.configuration2.ex.ConfigurationException; import org.apache.james.protocols.smtp.SMTPSession; import org.apache.james.protocols.smtp.hook.HookResult; import org.apache.james.server.core.MailImpl; @@ -38,16 +36,6 @@ public class AddDefaultAttributesMessageHook implements JamesMessageHook { public static final String SMTP_AUTH_NETWORK_NAME = "org.apache.james.SMTPIsAuthNetwork"; @Override - public void init(Configuration config) throws ConfigurationException { - - } - - @Override - public void destroy() { - - } - - @Override public HookResult onMessage(SMTPSession session, Mail mail) { if (mail instanceof MailImpl) { diff --git a/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/AuthRequiredToRelayRcptHook.java b/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/AuthRequiredToRelayRcptHook.java index 463f845..5a17e0b 100644 --- a/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/AuthRequiredToRelayRcptHook.java +++ b/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/AuthRequiredToRelayRcptHook.java @@ -20,8 +20,6 @@ package org.apache.james.smtpserver; import javax.inject.Inject; -import org.apache.commons.configuration2.Configuration; -import org.apache.commons.configuration2.ex.ConfigurationException; import org.apache.james.core.Domain; import org.apache.james.domainlist.api.DomainList; import org.apache.james.domainlist.api.DomainListException; @@ -37,16 +35,6 @@ public class AuthRequiredToRelayRcptHook extends AbstractAuthRequiredToRelayRcpt } @Override - public void init(Configuration config) throws ConfigurationException { - - } - - @Override - public void destroy() { - - } - - @Override protected boolean isLocalDomain(Domain domain) { try { return domains.containsDomain(domain); diff --git a/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/CoreCmdHandlerLoader.java b/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/CoreCmdHandlerLoader.java index 07edbd3..ce2626c 100644 --- a/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/CoreCmdHandlerLoader.java +++ b/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/CoreCmdHandlerLoader.java @@ -23,8 +23,6 @@ import java.util.LinkedList; import java.util.List; import java.util.stream.Stream; -import org.apache.commons.configuration2.Configuration; -import org.apache.commons.configuration2.ex.ConfigurationException; import org.apache.james.protocols.api.handler.CommandDispatcher; import org.apache.james.protocols.api.handler.CommandHandlerResultLogger; import org.apache.james.protocols.lib.handler.HandlersPackage; @@ -90,14 +88,4 @@ public class CoreCmdHandlerLoader implements HandlersPackage { public List<String> getHandlers() { return commands; } - - @Override - public void init(Configuration config) throws ConfigurationException { - - } - - @Override - public void destroy() { - - } } diff --git a/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/DataLineJamesMessageHookHandler.java b/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/DataLineJamesMessageHookHandler.java index 2f5bc85..8c692e7 100644 --- a/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/DataLineJamesMessageHookHandler.java +++ b/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/DataLineJamesMessageHookHandler.java @@ -28,8 +28,6 @@ import java.util.List; import javax.mail.MessagingException; -import org.apache.commons.configuration2.Configuration; -import org.apache.commons.configuration2.ex.ConfigurationException; import org.apache.james.core.MailAddress; import org.apache.james.core.MaybeSender; import org.apache.james.lifecycle.api.LifecycleUtil; @@ -71,16 +69,6 @@ public class DataLineJamesMessageHookHandler implements DataLineFilter, Extensib private List<MessageHook> mHandlers; @Override - public void init(Configuration config) throws ConfigurationException { - - } - - @Override - public void destroy() { - - } - - @Override public Response onLine(SMTPSession session, ByteBuffer lineByteBuffer, LineHandler<SMTPSession> next) { byte[] line = new byte[lineByteBuffer.remaining()]; diff --git a/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/MailPriorityHandler.java b/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/MailPriorityHandler.java index 0b50686..0456921 100644 --- a/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/MailPriorityHandler.java +++ b/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/MailPriorityHandler.java @@ -91,10 +91,4 @@ public class MailPriorityHandler implements JamesMessageHook, ProtocolHandler { prioMap.put(domain, prio); } } - - @Override - public void destroy() { - // nothing to do - } - } diff --git a/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/POP3BeforeSMTPHandler.java b/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/POP3BeforeSMTPHandler.java index 39818f0..7bcdbe4 100644 --- a/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/POP3BeforeSMTPHandler.java +++ b/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/POP3BeforeSMTPHandler.java @@ -21,7 +21,6 @@ package org.apache.james.smtpserver; import java.time.Duration; -import org.apache.commons.configuration2.Configuration; import org.apache.commons.configuration2.HierarchicalConfiguration; import org.apache.commons.configuration2.ex.ConfigurationException; import org.apache.commons.configuration2.tree.ImmutableNode; @@ -75,14 +74,4 @@ public class POP3BeforeSMTPHandler implements ConnectHandler<SMTPSession>, Confi } return null; } - - @Override - public void init(Configuration config) throws ConfigurationException { - - } - - @Override - public void destroy() { - - } } diff --git a/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/SendMailHandler.java b/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/SendMailHandler.java index d3882a4..90ddd4f 100644 --- a/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/SendMailHandler.java +++ b/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/SendMailHandler.java @@ -53,11 +53,6 @@ public class SendMailHandler implements JamesMessageHook { queue = queueFactory.createQueue(MailQueueFactory.SPOOL); } - @Override - public void destroy() { - - } - /** * Adds header to the message * diff --git a/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/SenderAuthIdentifyVerificationRcptHook.java b/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/SenderAuthIdentifyVerificationRcptHook.java index 4d520ca..0de9ccf 100644 --- a/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/SenderAuthIdentifyVerificationRcptHook.java +++ b/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/SenderAuthIdentifyVerificationRcptHook.java @@ -20,8 +20,6 @@ package org.apache.james.smtpserver; import javax.inject.Inject; -import org.apache.commons.configuration2.Configuration; -import org.apache.commons.configuration2.ex.ConfigurationException; import org.apache.james.core.Domain; import org.apache.james.core.MailAddress; import org.apache.james.core.MaybeSender; @@ -52,16 +50,6 @@ public class SenderAuthIdentifyVerificationRcptHook extends AbstractSenderAuthId } @Override - public void init(Configuration config) throws ConfigurationException { - - } - - @Override - public void destroy() { - - } - - @Override public HookResult doRcpt(SMTPSession session, MaybeSender sender, MailAddress rcpt) { ExtendedSMTPSession nSession = (ExtendedSMTPSession) session; if (nSession.verifyIdentity()) { diff --git a/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/SetMimeHeaderHandler.java b/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/SetMimeHeaderHandler.java index b6e6de5..4c577a8 100644 --- a/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/SetMimeHeaderHandler.java +++ b/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/SetMimeHeaderHandler.java @@ -88,10 +88,4 @@ public class SetMimeHeaderHandler implements JamesMessageHook, ProtocolHandler { setHeaderName(config.getString("headername")); setHeaderValue(config.getString("headervalue")); } - - @Override - public void destroy() { - // nothing to do - } - } diff --git a/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/UsersRepositoryAuthHook.java b/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/UsersRepositoryAuthHook.java index d8df7b6..15cf6e8 100644 --- a/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/UsersRepositoryAuthHook.java +++ b/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/UsersRepositoryAuthHook.java @@ -20,8 +20,6 @@ package org.apache.james.smtpserver; import javax.inject.Inject; -import org.apache.commons.configuration2.Configuration; -import org.apache.commons.configuration2.ex.ConfigurationException; import org.apache.james.protocols.smtp.SMTPSession; import org.apache.james.protocols.smtp.hook.AuthHook; import org.apache.james.protocols.smtp.hook.HookResult; @@ -75,14 +73,4 @@ public class UsersRepositoryAuthHook implements AuthHook { } return HookResult.DECLINED; } - - @Override - public void init(Configuration config) throws ConfigurationException { - - } - - @Override - public void destroy() { - - } } diff --git a/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/DNSRBLHandler.java b/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/DNSRBLHandler.java index 6d95cdb..a3dd178 100644 --- a/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/DNSRBLHandler.java +++ b/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/DNSRBLHandler.java @@ -69,11 +69,6 @@ public class DNSRBLHandler extends org.apache.james.protocols.smtp.core.fastfail } @Override - public void destroy() { - // Do nothing - } - - @Override protected boolean resolve(String ip) { try { dns.getByName(ip); diff --git a/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/JDBCGreylistHandler.java b/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/JDBCGreylistHandler.java index 1a90814..267bb04 100644 --- a/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/JDBCGreylistHandler.java +++ b/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/JDBCGreylistHandler.java @@ -415,9 +415,4 @@ public class JDBCGreylistHandler extends AbstractGreylistHandler implements Prot throw new RuntimeException("Unable to init datasource", e); } } - - @Override - public void destroy() { - // nothing to do - } } diff --git a/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/MaxRcptHandler.java b/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/MaxRcptHandler.java index 4357d8e..8c95760 100644 --- a/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/MaxRcptHandler.java +++ b/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/MaxRcptHandler.java @@ -24,15 +24,9 @@ import org.apache.commons.configuration2.ex.ConfigurationException; import org.apache.james.protocols.api.handler.ProtocolHandler; public class MaxRcptHandler extends org.apache.james.protocols.smtp.core.fastfail.MaxRcptHandler implements ProtocolHandler { - @Override public void init(Configuration config) throws ConfigurationException { int maxRcpt = config.getInt("maxRcpt", 0); setMaxRcpt(maxRcpt); } - - @Override - public void destroy() { - // nothing to do - } } diff --git a/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/MaxUnknownCmdHandler.java b/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/MaxUnknownCmdHandler.java index 08ed5b6..614aee0 100644 --- a/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/MaxUnknownCmdHandler.java +++ b/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/MaxUnknownCmdHandler.java @@ -24,16 +24,10 @@ import org.apache.commons.configuration2.ex.ConfigurationException; import org.apache.james.protocols.api.handler.ProtocolHandler; public class MaxUnknownCmdHandler extends org.apache.james.protocols.smtp.core.fastfail.MaxUnknownCmdHandler implements ProtocolHandler { - @Override public void init(Configuration config) throws ConfigurationException { int maxUnknown = config.getInt("maxUnknownCmdCount", DEFAULT_MAX_UNKOWN); setMaxUnknownCmdCount(maxUnknown); } - - @Override - public void destroy() { - // nothing to do - } } diff --git a/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/SPFHandler.java b/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/SPFHandler.java index 5e4ca19..ee4edf9 100644 --- a/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/SPFHandler.java +++ b/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/SPFHandler.java @@ -287,10 +287,4 @@ public class SPFHandler implements JamesMessageHook, MailHook, RcptHook, Protoco setBlockSoftFail(config.getBoolean("blockSoftFail", false)); setBlockPermError(config.getBoolean("blockPermError", true)); } - - @Override - public void destroy() { - // nothing to-do - } - } diff --git a/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/SpamAssassinHandler.java b/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/SpamAssassinHandler.java index d299901..b8ee0a5 100644 --- a/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/SpamAssassinHandler.java +++ b/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/SpamAssassinHandler.java @@ -163,9 +163,4 @@ public class SpamAssassinHandler implements JamesMessageHook, ProtocolHandler { setSpamdPort(config.getInt("spamdPort", 783)); setSpamdRejectionHits(config.getDouble("spamdRejectionHits", 0.0)); } - - @Override - public void destroy() { - // nothing to-do - } } diff --git a/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/SpamTrapHandler.java b/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/SpamTrapHandler.java index 103aa62..39bb315 100644 --- a/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/SpamTrapHandler.java +++ b/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/SpamTrapHandler.java @@ -39,9 +39,4 @@ public class SpamTrapHandler extends org.apache.james.protocols.smtp.core.fastfa setBlockTime(config.getLong("blockTime", blockTime)); } - - @Override - public void destroy() { - // nothing to-do - } } diff --git a/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/URIRBLHandler.java b/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/URIRBLHandler.java index d5e622b..87873bf 100644 --- a/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/URIRBLHandler.java +++ b/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/URIRBLHandler.java @@ -240,9 +240,4 @@ public class URIRBLHandler implements JamesMessageHook, ProtocolHandler { setGetDetail(config.getBoolean("getDetail", false)); } - - @Override - public void destroy() { - - } } diff --git a/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/ValidRcptHandler.java b/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/ValidRcptHandler.java index c3fd812..42cd8c8 100644 --- a/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/ValidRcptHandler.java +++ b/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/ValidRcptHandler.java @@ -109,9 +109,4 @@ public class ValidRcptHandler extends AbstractValidRcptHandler implements Protoc public void init(Configuration config) throws ConfigurationException { setSupportsRecipientRewriteTable(config.getBoolean("enableRecipientRewriteTable", true)); } - - @Override - public void destroy() { - // nothing to-do - } } diff --git a/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/ValidRcptMX.java b/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/ValidRcptMX.java index 191f4d2..e0684e1 100644 --- a/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/ValidRcptMX.java +++ b/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/ValidRcptMX.java @@ -145,9 +145,4 @@ public class ValidRcptMX implements RcptHook, ProtocolHandler { throw new ConfigurationException("Please configure at least on invalid MX network"); } } - - @Override - public void destroy() { - // nothing to-do - } } diff --git a/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/ValidSenderDomainHandler.java b/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/ValidSenderDomainHandler.java index ea4974a..c3e2236 100644 --- a/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/ValidSenderDomainHandler.java +++ b/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/ValidSenderDomainHandler.java @@ -22,8 +22,6 @@ import java.util.Collection; import javax.inject.Inject; -import org.apache.commons.configuration2.Configuration; -import org.apache.commons.configuration2.ex.ConfigurationException; import org.apache.james.dnsservice.api.DNSService; import org.apache.james.protocols.smtp.SMTPSession; @@ -55,14 +53,4 @@ public class ValidSenderDomainHandler extends org.apache.james.protocols.smtp.co return !(records == null || records.size() == 0); } - - @Override - public void init(Configuration config) throws ConfigurationException { - - } - - @Override - public void destroy() { - - } } diff --git a/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/jmx/JMXHandlersLoader.java b/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/jmx/JMXHandlersLoader.java index a317c20..f5647ac 100644 --- a/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/jmx/JMXHandlersLoader.java +++ b/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/jmx/JMXHandlersLoader.java @@ -21,8 +21,6 @@ package org.apache.james.smtpserver.jmx; import java.util.ArrayList; import java.util.List; -import org.apache.commons.configuration2.Configuration; -import org.apache.commons.configuration2.ex.ConfigurationException; import org.apache.james.protocols.lib.handler.HandlersPackage; public class JMXHandlersLoader implements HandlersPackage { @@ -40,14 +38,4 @@ public class JMXHandlersLoader implements HandlersPackage { public List<String> getHandlers() { return handlers; } - - @Override - public void init(Configuration config) throws ConfigurationException { - - } - - @Override - public void destroy() { - - } } --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
