http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/protocols/pop3/src/test/java/org/apache/james/protocols/pop3/utils/MockMailbox.java ---------------------------------------------------------------------- diff --git a/protocols/pop3/src/test/java/org/apache/james/protocols/pop3/utils/MockMailbox.java b/protocols/pop3/src/test/java/org/apache/james/protocols/pop3/utils/MockMailbox.java index 2aa8add..bc6a846 100644 --- a/protocols/pop3/src/test/java/org/apache/james/protocols/pop3/utils/MockMailbox.java +++ b/protocols/pop3/src/test/java/org/apache/james/protocols/pop3/utils/MockMailbox.java @@ -50,6 +50,7 @@ public class MockMailbox extends ImapMailbox { this(identifier, new Message[0]); } + @Override public InputStream getMessageBody(long uid) throws IOException { Message m = messages.get(uid); if (m == null) { @@ -58,6 +59,7 @@ public class MockMailbox extends ImapMailbox { return new ByteArrayInputStream(m.body.getBytes("US-ASCII")); } + @Override public InputStream getMessageHeaders(long uid) throws IOException { Message m = messages.get(uid); if (m == null) { @@ -66,6 +68,7 @@ public class MockMailbox extends ImapMailbox { return new ByteArrayInputStream((m.headers + "\r\n").getBytes("US-ASCII")); } + @Override public InputStream getMessage(long uid) throws IOException { InputStream body = getMessageBody(uid); InputStream headers = getMessageHeaders(uid); @@ -75,6 +78,7 @@ public class MockMailbox extends ImapMailbox { return new SequenceInputStream(headers, body); } + @Override public List<MessageMetaData> getMessages() throws IOException { return messages.values() .stream() @@ -82,16 +86,19 @@ public class MockMailbox extends ImapMailbox { .collect(Guavate.toImmutableList()); } + @Override public void remove(long... uids) throws IOException { for (long uid: uids) { messages.remove(uid); } } + @Override public String getIdentifier() throws IOException { return identifier; } + @Override public void close() throws IOException { // nothing }
http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/protocols/pop3/src/test/java/org/apache/james/protocols/pop3/utils/TestPassCmdHandler.java ---------------------------------------------------------------------- diff --git a/protocols/pop3/src/test/java/org/apache/james/protocols/pop3/utils/TestPassCmdHandler.java b/protocols/pop3/src/test/java/org/apache/james/protocols/pop3/utils/TestPassCmdHandler.java index f272aa6..b3cf2b7 100644 --- a/protocols/pop3/src/test/java/org/apache/james/protocols/pop3/utils/TestPassCmdHandler.java +++ b/protocols/pop3/src/test/java/org/apache/james/protocols/pop3/utils/TestPassCmdHandler.java @@ -32,6 +32,7 @@ public class TestPassCmdHandler extends AbstractPassCmdHandler { mailboxes.put(username, mailbox); } + @Override protected Mailbox auth(POP3Session session, String username, String password) throws Exception { return mailboxes.get(username); } http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/MailEnvelopeImpl.java ---------------------------------------------------------------------- diff --git a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/MailEnvelopeImpl.java b/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/MailEnvelopeImpl.java index 02e0cc6..59dbe97 100644 --- a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/MailEnvelopeImpl.java +++ b/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/MailEnvelopeImpl.java @@ -41,9 +41,7 @@ public class MailEnvelopeImpl implements MailEnvelope { private ByteArrayOutputStream outputStream; - /** - * @see org.apache.james.protocols.smtp.MailEnvelope#getSize() - */ + @Override public long getSize() { if (outputStream == null) { return -1; @@ -51,16 +49,12 @@ public class MailEnvelopeImpl implements MailEnvelope { return outputStream.size(); } - /** - * @see org.apache.james.protocols.smtp.MailEnvelope#getRecipients() - */ + @Override public List<MailAddress> getRecipients() { return recipients; } - /** - * @see org.apache.james.protocols.smtp.MailEnvelope#getSender() - */ + @Override public MailAddress getSender() { return sender; } @@ -83,9 +77,7 @@ public class MailEnvelopeImpl implements MailEnvelope { this.sender = sender; } - /** - * @see org.apache.james.protocols.smtp.MailEnvelope#getMessageOutputStream() - */ + @Override public OutputStream getMessageOutputStream() { if (outputStream == null) { // use 100kb as default which should be enough for most emails @@ -94,9 +86,7 @@ public class MailEnvelopeImpl implements MailEnvelope { return outputStream; } - /** - * @see org.apache.james.protocols.smtp.MailEnvelope#getMessageInputStream() - */ + @Override public InputStream getMessageInputStream() { return new ByteArrayInputStream(outputStream.toByteArray()); } http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/SMTPConfigurationImpl.java ---------------------------------------------------------------------- diff --git a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/SMTPConfigurationImpl.java b/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/SMTPConfigurationImpl.java index 70a7656..1e278a6 100644 --- a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/SMTPConfigurationImpl.java +++ b/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/SMTPConfigurationImpl.java @@ -39,10 +39,7 @@ public class SMTPConfigurationImpl extends ProtocolConfigurationImpl implements setSoftwareName("JAMES SMTP Protocols Server"); } - /* - * (non-Javadoc) - * @see org.apache.james.protocols.smtp.SMTPConfiguration#getMaxMessageSize() - */ + @Override public long getMaxMessageSize() { return maxMessageSize; } @@ -50,6 +47,7 @@ public class SMTPConfigurationImpl extends ProtocolConfigurationImpl implements /** * Return <code>false</code> */ + @Override public boolean isRelayingAllowed(String remoteIP) { return false; } @@ -57,6 +55,7 @@ public class SMTPConfigurationImpl extends ProtocolConfigurationImpl implements /** * Return <code>false</code> */ + @Override public boolean isAuthRequired(String remoteIP) { return false; } @@ -66,19 +65,13 @@ public class SMTPConfigurationImpl extends ProtocolConfigurationImpl implements } - /* - * (non-Javadoc) - * @see org.apache.james.protocols.smtp.SMTPConfiguration#useHeloEhloEnforcement() - */ + @Override public boolean useHeloEhloEnforcement() { return enforceHeloEhlo; } - /* - * (non-Javadoc) - * @see org.apache.james.protocols.smtp.SMTPConfiguration#useAddressBracketsEnforcement() - */ + @Override public boolean useAddressBracketsEnforcement() { return bracketsEnforcement; } http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/SMTPProtocolHandlerChain.java ---------------------------------------------------------------------- diff --git a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/SMTPProtocolHandlerChain.java b/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/SMTPProtocolHandlerChain.java index 2571665..6c869c2 100644 --- a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/SMTPProtocolHandlerChain.java +++ b/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/SMTPProtocolHandlerChain.java @@ -132,6 +132,7 @@ public class SMTPProtocolHandlerChain extends ProtocolHandlerChainImpl { return true; } + @Override public boolean add(ProtocolHandler handler) { checkForAuth(handler); return super.add(handler); http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/SMTPResponse.java ---------------------------------------------------------------------- diff --git a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/SMTPResponse.java b/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/SMTPResponse.java index 50928d5..a9b3f08 100644 --- a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/SMTPResponse.java +++ b/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/SMTPResponse.java @@ -81,9 +81,7 @@ public class SMTPResponse extends AbstractResponse { } } - /** - * @see org.apache.james.protocols.api.Response#getLines() - */ + @Override public List<CharSequence> getLines() { List<CharSequence> responseList = new ArrayList<>(); http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/SMTPSession.java ---------------------------------------------------------------------- diff --git a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/SMTPSession.java b/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/SMTPSession.java index 932acb2..21bda43 100644 --- a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/SMTPSession.java +++ b/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/SMTPSession.java @@ -42,6 +42,7 @@ public interface SMTPSession extends ProtocolSession { * * @return the configuration */ + @Override SMTPConfiguration getConfiguration(); http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/SMTPSessionImpl.java ---------------------------------------------------------------------- diff --git a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/SMTPSessionImpl.java b/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/SMTPSessionImpl.java index 570075b..91cde64 100644 --- a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/SMTPSessionImpl.java +++ b/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/SMTPSessionImpl.java @@ -57,9 +57,7 @@ public class SMTPSessionImpl extends ProtocolSessionImpl implements SMTPSession needsCommandInjectionDetection = false; } - /** - * @see org.apache.james.protocols.smtp.SMTPSession#isRelayingAllowed() - */ + @Override public boolean isRelayingAllowed() { return relayingAllowed; } @@ -77,10 +75,7 @@ public class SMTPSessionImpl extends ProtocolSessionImpl implements SMTPSession } } - /** - /** - * @see org.apache.james.protocols.smtp.SMTPSession#getRcptCount() - */ + @Override @SuppressWarnings("unchecked") public int getRcptCount() { int count = 0; @@ -93,16 +88,12 @@ public class SMTPSessionImpl extends ProtocolSessionImpl implements SMTPSession return count; } - /** - * @see org.apache.james.protocols.smtp.SMTPSession#isAuthSupported() - */ + @Override public boolean isAuthSupported() { return getConfiguration().isAuthRequired(getRemoteAddress().getAddress().getHostAddress()); } - /** - * @see org.apache.james.protocols.smtp.SMTPSession#setRelayingAllowed(boolean) - */ + @Override public void setRelayingAllowed(boolean relayingAllowed) { this.relayingAllowed = relayingAllowed; } http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/SMTPStartTlsResponse.java ---------------------------------------------------------------------- diff --git a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/SMTPStartTlsResponse.java b/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/SMTPStartTlsResponse.java index 922883d..5c0da2a 100644 --- a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/SMTPStartTlsResponse.java +++ b/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/SMTPStartTlsResponse.java @@ -48,14 +48,17 @@ public class SMTPStartTlsResponse extends SMTPResponse implements StartTlsRespon // We need to override this and return a StartTlsResponse. See ROTOCOLS-89 return new StartTlsResponse() { + @Override public boolean isEndSession() { return SMTPStartTlsResponse.this.isEndSession(); } + @Override public String getRetCode() { return SMTPStartTlsResponse.this.getRetCode(); } + @Override public List<CharSequence> getLines() { return SMTPStartTlsResponse.this.getLines(); } http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/AbstractAuthRequiredToRelayRcptHook.java ---------------------------------------------------------------------- diff --git a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/AbstractAuthRequiredToRelayRcptHook.java b/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/AbstractAuthRequiredToRelayRcptHook.java index 57dde32..b0e1165 100644 --- a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/AbstractAuthRequiredToRelayRcptHook.java +++ b/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/AbstractAuthRequiredToRelayRcptHook.java @@ -45,12 +45,9 @@ public abstract class AbstractAuthRequiredToRelayRcptHook implements RcptHook { DSNStatus.SECURITY_AUTH) + " Requested action not taken: relaying denied"); - /** - * @see org.apache.james.protocols.smtp.hook.RcptHook#doRcpt(org.apache.james.protocols.smtp.SMTPSession, - * org.apache.mailet.MailAddress, org.apache.mailet.MailAddress) - */ + @Override public HookResult doRcpt(SMTPSession session, MailAddress sender, - MailAddress rcpt) { + MailAddress rcpt) { if (!session.isRelayingAllowed()) { String toDomain = rcpt.getDomain(); if (isLocalDomain(toDomain) == false) { http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/AbstractHookableCmdHandler.java ---------------------------------------------------------------------- diff --git a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/AbstractHookableCmdHandler.java b/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/AbstractHookableCmdHandler.java index 4a6cfc5..9e6d96c 100644 --- a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/AbstractHookableCmdHandler.java +++ b/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/AbstractHookableCmdHandler.java @@ -61,12 +61,7 @@ public abstract class AbstractHookableCmdHandler<HookT extends org.apache.james. this.metricFactory = metricFactory; } - /** - * Handle command processing - * - * @see org.apache.james.protocols.api.handler.CommandHandler - * #onCommand(org.apache.james.protocols.api.ProtocolSession, Request) - */ + @Override public Response onCommand(SMTPSession session, Request request) { TimeMetric timeMetric = metricFactory.timer("SMTP-" + request.getCommand().toLowerCase(Locale.US)); String command = request.getCommand(); @@ -138,6 +133,7 @@ public abstract class AbstractHookableCmdHandler<HookT extends org.apache.james. * (non-Javadoc) * @see org.apache.james.protocols.api.Response#isEndSession() */ + @Override public boolean isEndSession() { return true; } @@ -146,6 +142,7 @@ public abstract class AbstractHookableCmdHandler<HookT extends org.apache.james. * (non-Javadoc) * @see org.apache.james.protocols.api.Response#getRetCode() */ + @Override public String getRetCode() { return response.getRetCode(); } @@ -154,6 +151,7 @@ public abstract class AbstractHookableCmdHandler<HookT extends org.apache.james. * (non-Javadoc) * @see org.apache.james.protocols.api.Response#getLines() */ + @Override public List<CharSequence> getLines() { return response.getLines(); } @@ -277,9 +275,7 @@ public abstract class AbstractHookableCmdHandler<HookT extends org.apache.james. String command, String parameters); - /** - * @see org.apache.james.protocols.api.handler.ExtensibleHandler#getMarkerInterfaces() - */ + @Override public List<Class<?>> getMarkerInterfaces() { List<Class<?>> classes = new ArrayList<>(2); classes.add(getHookInterface()); @@ -294,10 +290,7 @@ public abstract class AbstractHookableCmdHandler<HookT extends org.apache.james. */ protected abstract Class<HookT> getHookInterface(); - /** - * @see org.apache.james.protocols.api.handler.ExtensibleHandler#wireExtensions(java.lang.Class, - * java.util.List) - */ + @Override @SuppressWarnings("unchecked") public void wireExtensions(Class<?> interfaceName, List<?> extension) { if (getHookInterface().equals(interfaceName)) { http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/AbstractSenderAuthIdentifyVerificationRcptHook.java ---------------------------------------------------------------------- diff --git a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/AbstractSenderAuthIdentifyVerificationRcptHook.java b/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/AbstractSenderAuthIdentifyVerificationRcptHook.java index 6294a9a..579c2fe 100644 --- a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/AbstractSenderAuthIdentifyVerificationRcptHook.java +++ b/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/AbstractSenderAuthIdentifyVerificationRcptHook.java @@ -39,12 +39,9 @@ public abstract class AbstractSenderAuthIdentifyVerificationRcptHook implements DSNStatus.SECURITY_AUTH) + " Incorrect Authentication for Specified Email Address"); - /** - * @see org.apache.james.protocols.smtp.hook.RcptHook#doRcpt(org.apache.james.protocols.smtp.SMTPSession, - * org.apache.mailet.MailAddress, org.apache.mailet.MailAddress) - */ + @Override public HookResult doRcpt(SMTPSession session, MailAddress sender, - MailAddress rcpt) { + MailAddress rcpt) { if (session.getUser() != null) { String authUser = (session.getUser()).toLowerCase(Locale.US); MailAddress senderAddress = (MailAddress) session.getAttachment( http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/AcceptRecipientIfRelayingIsAllowed.java ---------------------------------------------------------------------- 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 70289bf..a0ce730 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 @@ -30,12 +30,9 @@ import org.apache.james.protocols.smtp.hook.RcptHook; */ public class AcceptRecipientIfRelayingIsAllowed implements RcptHook { - /** - * @see org.apache.james.protocols.smtp.hook.RcptHook#doRcpt(org.apache.james.protocols.smtp.SMTPSession, - * org.apache.mailet.MailAddress, org.apache.mailet.MailAddress) - */ + @Override public HookResult doRcpt(SMTPSession session, MailAddress sender, - MailAddress rcpt) { + MailAddress rcpt) { if (session.isRelayingAllowed()) { return HookResult.ok(); } http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/DataCmdHandler.java ---------------------------------------------------------------------- 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 9b83ac6..081acd2 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 @@ -65,6 +65,7 @@ public class DataCmdHandler implements CommandHandler<SMTPSession>, ExtensibleHa public static final class DataConsumerLineHandler implements LineHandler<SMTPSession> { + @Override public SMTPResponse onLine(SMTPSession session, ByteBuffer line) { // Discard everything until the end of DATA session if (line.remaining() == 3 && line.get() == 46) { @@ -99,6 +100,7 @@ public class DataCmdHandler implements CommandHandler<SMTPSession>, ExtensibleHa * (non-Javadoc) * @see org.apache.james.protocols.api.handler.LineHandler#onLine(org.apache.james.protocols.api.ProtocolSession, java.nio.ByteBuffer) */ + @Override public Response onLine(SMTPSession session, ByteBuffer line) { line.rewind(); return filter.onLine(session, line, next); @@ -140,6 +142,7 @@ public class DataCmdHandler implements CommandHandler<SMTPSession>, ExtensibleHa * process DATA command * */ + @Override public Response onCommand(SMTPSession session, Request request) { TimeMetric timeMetric = metricFactory.timer("SMTP-" + request.getCommand()); session.stopDetectingCommandInjection(); @@ -188,18 +191,12 @@ public class DataCmdHandler implements CommandHandler<SMTPSession>, ExtensibleHa return env; } - - /** - * @see org.apache.james.protocols.api.handler.CommandHandler#getImplCommands() - */ + @Override public Collection<String> getImplCommands() { return COMMANDS; } - - /** - * @see org.apache.james.protocols.api.handler.ExtensibleHandler#getMarkerInterfaces() - */ + @Override @SuppressWarnings({ "unchecked", "rawtypes" }) public List getMarkerInterfaces() { List classes = new LinkedList(); @@ -208,9 +205,7 @@ public class DataCmdHandler implements CommandHandler<SMTPSession>, ExtensibleHa } - /** - * @see org.apache.james.protocols.api.handler.ExtensibleHandler#wireExtensions(java.lang.Class, java.util.List) - */ + @Override @SuppressWarnings("rawtypes") public void wireExtensions(Class interfaceName, List extension) throws WiringException { if (DataLineFilter.class.equals(interfaceName)) { http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/DataLineMessageHookHandler.java ---------------------------------------------------------------------- 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 a4712e4..a69c40a 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 @@ -71,10 +71,7 @@ public class DataLineMessageHookHandler implements DataLineFilter, ExtensibleHan } - /* - * (non-Javadoc) - * @see org.apache.james.protocols.smtp.core.DataLineFilter#onLine(org.apache.james.protocols.smtp.SMTPSession, java.nio.ByteBuffer, org.apache.james.protocols.api.handler.LineHandler) - */ + @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(); @@ -162,9 +159,7 @@ public class DataLineMessageHookHandler implements DataLineFilter, ExtensibleHan return null; } - /** - * @see org.apache.james.protocols.api.handler.ExtensibleHandler#wireExtensions(java.lang.Class, java.util.List) - */ + @Override @SuppressWarnings("rawtypes") public void wireExtensions(Class interfaceName, List extension) throws WiringException { if (MessageHook.class.equals(interfaceName)) { @@ -181,6 +176,7 @@ public class DataLineMessageHookHandler implements DataLineFilter, ExtensibleHan } } + @Override public List<Class<?>> getMarkerInterfaces() { List<Class<?>> classes = new LinkedList<>(); classes.add(MessageHook.class); http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/ExpnCmdHandler.java ---------------------------------------------------------------------- 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 307ad2e..3a0cb57 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 @@ -52,13 +52,12 @@ public class ExpnCmdHandler implements CommandHandler<SMTPSession> { * not implemented. * */ + @Override public Response onCommand(SMTPSession session, Request request) { return NOT_SUPPORTED; } - /** - * @see org.apache.james.protocols.api.handler.CommandHandler#getImplCommands() - */ + @Override public Collection<String> getImplCommands() { return COMMANDS; } http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/HeloCmdHandler.java ---------------------------------------------------------------------- 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 f314e6d..894fdc5 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 @@ -69,19 +69,14 @@ public class HeloCmdHandler extends AbstractHookableCmdHandler<HeloHook> { } - /** - * @see org.apache.james.protocols.api.handler.CommandHandler#getImplCommands() - */ + @Override public Collection<String> getImplCommands() { return COMMANDS; } - /** - * @see org.apache.james.protocols.smtp.core.AbstractHookableCmdHandler#doCoreCmd(org.apache.james.protocols.smtp.SMTPSession, - * java.lang.String, java.lang.String) - */ + @Override protected Response doCoreCmd(SMTPSession session, String command, - String parameters) { + String parameters) { session.setAttachment(SMTPSession.CURRENT_HELO_MODE, COMMAND_NAME, ProtocolSession.State.Connection); StringBuilder response = new StringBuilder(); response.append(session.getConfiguration().getHelloName()).append( @@ -90,12 +85,9 @@ public class HeloCmdHandler extends AbstractHookableCmdHandler<HeloHook> { return new SMTPResponse(SMTPRetCode.MAIL_OK, response); } - /** - * @see org.apache.james.protocols.smtp.core.AbstractHookableCmdHandler#doFilterChecks(org.apache.james.protocols.smtp.SMTPSession, - * java.lang.String, java.lang.String) - */ + @Override protected Response doFilterChecks(SMTPSession session, String command, - String parameters) { + String parameters) { session.resetState(); if (parameters == null) { @@ -107,17 +99,13 @@ public class HeloCmdHandler extends AbstractHookableCmdHandler<HeloHook> { } } - /** - * {@inheritDoc} - */ + @Override protected Class<HeloHook> getHookInterface() { return HeloHook.class; } - /** - * {@inheritDoc} - */ + @Override protected HookResult callHook(HeloHook rawHook, SMTPSession session, String parameters) { return rawHook.doHelo(session, parameters); } http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/HelpCmdHandler.java ---------------------------------------------------------------------- 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 d299d2a..5a6351d 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 @@ -50,13 +50,12 @@ public class HelpCmdHandler implements CommandHandler<SMTPSession> { * handles HELP command * **/ + @Override public Response onCommand(SMTPSession session, Request request) { return NOT_SUPPORTED; } - /** - * @see org.apache.james.protocols.api.handler.CommandHandler#getImplCommands() - */ + @Override public Collection<String> getImplCommands() { return COMMANDS; } http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/MailCmdHandler.java ---------------------------------------------------------------------- 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 f3d03de..3afe738 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 @@ -91,11 +91,7 @@ public class MailCmdHandler extends AbstractHookableCmdHandler<MailHook> { } - /** - * @see - * org.apache.james.protocols.smtp.core.AbstractHookableCmdHandler - * #onCommand(SMTPSession, Request) - */ + @Override public Response onCommand(SMTPSession session, Request request) { Response response = super.onCommand(session, request); // Check if the response was not ok @@ -130,28 +126,20 @@ public class MailCmdHandler extends AbstractHookableCmdHandler<MailHook> { return new SMTPResponse(SMTPRetCode.MAIL_OK, responseBuffer); } - /** - * @see org.apache.james.protocols.api.handler.CommandHandler#getImplCommands() - */ + @Override public Collection<String> getImplCommands() { return COMMANDS; } - /** - * @see org.apache.james.protocols.smtp.core.AbstractHookableCmdHandler#doCoreCmd(org.apache.james.protocols.smtp.SMTPSession, - * java.lang.String, java.lang.String) - */ + @Override protected Response doCoreCmd(SMTPSession session, String command, - String parameters) { + String parameters) { return doMAIL(session, parameters); } - /** - * @see org.apache.james.protocols.smtp.core.AbstractHookableCmdHandler#doFilterChecks(org.apache.james.protocols.smtp.SMTPSession, - * java.lang.String, java.lang.String) - */ + @Override protected Response doFilterChecks(SMTPSession session, String command, - String parameters) { + String parameters) { return doMAILFilter(session, parameters); } @@ -260,14 +248,13 @@ public class MailCmdHandler extends AbstractHookableCmdHandler<MailHook> { return null; } + @Override protected Class<MailHook> getHookInterface() { return MailHook.class; } - /** - * {@inheritDoc} - */ + @Override protected HookResult callHook(MailHook rawHook, SMTPSession session, String parameters) { MailAddress sender = (MailAddress) session.getAttachment(SMTPSession.SENDER, State.Transaction); if (sender.isNullSender()) { @@ -277,18 +264,14 @@ public class MailCmdHandler extends AbstractHookableCmdHandler<MailHook> { } - /** - * @see org.apache.james.protocols.smtp.core.AbstractHookableCmdHandler#getMarkerInterfaces() - */ + @Override public List<Class<?>> getMarkerInterfaces() { List<Class<?>> l = super.getMarkerInterfaces(); l.add(MailParametersHook.class); return l; } - /** - * @see org.apache.james.protocols.smtp.core.AbstractHookableCmdHandler#wireExtensions(java.lang.Class, java.util.List) - */ + @Override @SuppressWarnings({ "unchecked", "rawtypes" }) public void wireExtensions(Class interfaceName, List extension) { if (MailParametersHook.class.equals(interfaceName)) { http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/NoopCmdHandler.java ---------------------------------------------------------------------- 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 141a6ee..306d62d 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 @@ -52,13 +52,12 @@ public class NoopCmdHandler implements CommandHandler<SMTPSession> { * Just sends back an OK and logs the command. * */ + @Override public Response onCommand(SMTPSession session, Request request) { return NOOP; } - /** - * @see org.apache.james.protocols.api.handler.CommandHandler#getImplCommands() - */ + @Override public Collection<String> getImplCommands() { return COMMANDS; } http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/PostmasterAbuseRcptHook.java ---------------------------------------------------------------------- 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 dcc9151..0b14614 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 @@ -33,9 +33,7 @@ import org.slf4j.LoggerFactory; public class PostmasterAbuseRcptHook implements RcptHook { private static final Logger LOGGER = LoggerFactory.getLogger(PostmasterAbuseRcptHook.class); - /** - * @see org.apache.james.protocols.smtp.hook.RcptHook#doRcpt(org.apache.james.protocols.smtp.SMTPSession, org.apache.mailet.MailAddress, org.apache.mailet.MailAddress) - */ + @Override public HookResult doRcpt(SMTPSession session, MailAddress sender, MailAddress rcpt) { if (rcpt.getLocalPart().equalsIgnoreCase("postmaster") || rcpt.getLocalPart().equalsIgnoreCase("abuse")) { LOGGER.debug("Sender allowed"); http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/QuitCmdHandler.java ---------------------------------------------------------------------- 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 d2248cd..35d3b35 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 @@ -99,41 +99,29 @@ public class QuitCmdHandler extends AbstractHookableCmdHandler<QuitHook> { } } - /** - * @see org.apache.james.protocols.api.handler.CommandHandler#getImplCommands() - */ + @Override public Collection<String> getImplCommands() { return COMMANDS; } - /** - * @see org.apache.james.protocols.smtp.core.AbstractHookableCmdHandler#doCoreCmd(org.apache.james.protocols.smtp.SMTPSession, - * java.lang.String, java.lang.String) - */ + @Override protected Response doCoreCmd(SMTPSession session, String command, - String parameters) { + String parameters) { return doQUIT(session, parameters); } - /** - * @see org.apache.james.protocols.smtp.core.AbstractHookableCmdHandler#doFilterChecks(org.apache.james.protocols.smtp.SMTPSession, - * java.lang.String, java.lang.String) - */ + @Override protected Response doFilterChecks(SMTPSession session, String command, - String parameters) { + String parameters) { return null; } - /** - * @see org.apache.james.protocols.smtp.core.AbstractHookableCmdHandler#getHookInterface() - */ + @Override protected Class<QuitHook> getHookInterface() { return QuitHook.class; } - /** - * {@inheritDoc} - */ + @Override protected HookResult callHook(QuitHook rawHook, SMTPSession session, String parameters) { return rawHook.doQuit(session); } http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/RcptCmdHandler.java ---------------------------------------------------------------------- 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 5544d77..c7b17ca 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 @@ -84,6 +84,7 @@ public class RcptCmdHandler extends AbstractHookableCmdHandler<RcptHook> impleme * @param parameters * parameters passed in with the command by the SMTP client */ + @Override @SuppressWarnings("unchecked") protected Response doCoreCmd(SMTPSession session, String command, String parameters) { @@ -112,8 +113,9 @@ public class RcptCmdHandler extends AbstractHookableCmdHandler<RcptHook> impleme * @param argument * the argument passed in with the command by the SMTP client */ + @Override protected Response doFilterChecks(SMTPSession session, String command, - String argument) { + String argument) { String recipient = null; if ((argument != null) && (argument.indexOf(":") > 0)) { int colonIndex = argument.indexOf(":"); @@ -215,25 +217,19 @@ public class RcptCmdHandler extends AbstractHookableCmdHandler<RcptHook> impleme return sb.toString(); } - /** - * @see org.apache.james.protocols.api.handler.CommandHandler#getImplCommands() - */ + @Override public Collection<String> getImplCommands() { return COMMANDS; } - /** - * @see org.apache.james.protocols.smtp.core.AbstractHookableCmdHandler#getHookInterface() - */ + @Override protected Class<RcptHook> getHookInterface() { return RcptHook.class; } - /** - * {@inheritDoc} - */ + @Override protected HookResult callHook(RcptHook rawHook, SMTPSession session, - String parameters) { + String parameters) { return rawHook.doRcpt(session, (MailAddress) session.getAttachment(SMTPSession.SENDER, State.Transaction), (MailAddress) session.getAttachment(CURRENT_RECIPIENT, State.Transaction)); http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/RsetCmdHandler.java ---------------------------------------------------------------------- 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 9932524..7fe5a3a 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 @@ -46,6 +46,7 @@ public class RsetCmdHandler implements CommandHandler<SMTPSession> { private static final Response OK = new SMTPResponse(SMTPRetCode.MAIL_OK, DSNStatus.getStatus(DSNStatus.SUCCESS,DSNStatus.UNDEFINED_STATUS) + " OK").immutable(); private static final Response SYNTAX_ERROR = new SMTPResponse(SMTPRetCode.SYNTAX_ERROR_COMMAND_UNRECOGNIZED, DSNStatus.getStatus(DSNStatus.PERMANENT,DSNStatus.DELIVERY_INVALID_ARG) + " Unexpected argument provided with RSET command").immutable(); + @Override public Response onCommand(SMTPSession session, Request request) { return doRSET(session, request.getArgument()); } @@ -68,9 +69,7 @@ public class RsetCmdHandler implements CommandHandler<SMTPSession> { } } - /** - * @see org.apache.james.protocols.api.handler.CommandHandler#getImplCommands() - */ + @Override public Collection<String> getImplCommands() { return COMMANDS; } http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/SeparatingDataLineFilter.java ---------------------------------------------------------------------- diff --git a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/SeparatingDataLineFilter.java b/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/SeparatingDataLineFilter.java index c6131e2..4e03460 100644 --- a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/SeparatingDataLineFilter.java +++ b/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/SeparatingDataLineFilter.java @@ -48,10 +48,7 @@ public abstract class SeparatingDataLineFilter implements DataLineFilter { private static final String HEADERS_COMPLETE = "HEADERS_COMPLETE"; - /* - * (non-Javadoc) - * @see org.apache.james.protocols.smtp.core.DataLineFilter#onLine(org.apache.james.protocols.smtp.SMTPSession, java.nio.ByteBuffer, org.apache.james.protocols.api.handler.LineHandler) - */ + @Override public final Response onLine(SMTPSession session, ByteBuffer line, LineHandler<SMTPSession> next) { if (session.getAttachment(HEADERS_COMPLETE, State.Transaction) == null) { if (line.remaining() == 2) { http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/UnknownCmdHandler.java ---------------------------------------------------------------------- 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 84ae076..56bcd10 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 @@ -65,9 +65,7 @@ public class UnknownCmdHandler extends AbstractHookableCmdHandler<UnknownHook> { } - /** - * @see org.apache.james.protocols.api.handler.CommandHandler#getImplCommands() - */ + @Override public Collection<String> getImplCommands() { return COMMANDS; } http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/VrfyCmdHandler.java ---------------------------------------------------------------------- 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 d189c9f..41bc72e 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 @@ -50,13 +50,12 @@ public class VrfyCmdHandler implements CommandHandler<SMTPSession> { * not implemented. * */ + @Override public Response onCommand(SMTPSession session, Request request) { return NOT_SUPPORTED; } - /** - * @see org.apache.james.protocols.api.handler.CommandHandler#getImplCommands() - */ + @Override public Collection<String> getImplCommands() { return COMMANDS; } http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/WelcomeMessageHandler.java ---------------------------------------------------------------------- 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 52966c2..df6f3be 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 @@ -35,9 +35,7 @@ public class WelcomeMessageHandler implements ConnectHandler<SMTPSession> { private static final String SERVICE_TYPE = "SMTP"; - /** - * @see org.apache.james.protocols.api.handler.ConnectHandler#onConnect(org.apache.james.protocols.api.ProtocolSession) - */ + @Override public Response onConnect(SMTPSession session) { String smtpGreeting = session.getConfiguration().getGreeting(); http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/esmtp/AuthCmdHandler.java ---------------------------------------------------------------------- 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 a9d75f8..450020c 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 @@ -82,6 +82,7 @@ public class AuthCmdHandler private abstract class AbstractSMTPLineHandler implements LineHandler<SMTPSession> { + @Override public Response onLine(SMTPSession session, ByteBuffer line) { String charset = session.getCharset().name(); try { @@ -149,6 +150,7 @@ public class AuthCmdHandler * handles AUTH command * */ + @Override public Response onCommand(SMTPSession session, Request request) { return doAUTH(session, request.getArgument()); } @@ -178,6 +180,7 @@ public class AuthCmdHandler String userpass; if (initialResponse == null) { session.pushLineHandler(new AbstractSMTPLineHandler() { + @Override protected Response onCommand(SMTPSession session, String l) { return doPlainAuthPass(session, l); } @@ -201,6 +204,7 @@ public class AuthCmdHandler if (initialResponse == null) { session.pushLineHandler(new AbstractSMTPLineHandler() { + @Override protected Response onCommand(SMTPSession session, String l) { return doLoginAuthPass(session, l); } @@ -329,6 +333,7 @@ public class AuthCmdHandler return this; } + @Override protected Response onCommand(SMTPSession session, String l) { return doLoginAuthPassCheck(session, user, l); } @@ -498,16 +503,12 @@ public class AuthCmdHandler - /** - * @see org.apache.james.protocols.api.handler.CommandHandler#getImplCommands() - */ + @Override public Collection<String> getImplCommands() { return COMMANDS; } - /** - * @see org.apache.james.protocols.smtp.core.esmtp.EhloExtension#getImplementedEsmtpFeatures(org.apache.james.protocols.smtp.SMTPSession) - */ + @Override @SuppressWarnings("unchecked") public List<String> getImplementedEsmtpFeatures(SMTPSession session) { if (session.isAuthSupported()) { @@ -517,9 +518,7 @@ public class AuthCmdHandler } } - /** - * @see org.apache.james.protocols.api.handler.ExtensibleHandler#getMarkerInterfaces() - */ + @Override public List<Class<?>> getMarkerInterfaces() { List<Class<?>> classes = new ArrayList<>(1); classes.add(AuthHook.class); @@ -527,9 +526,7 @@ public class AuthCmdHandler } - /** - * @see org.apache.james.protocols.api.handler.ExtensibleHandler#wireExtensions(java.lang.Class, java.util.List) - */ + @Override @SuppressWarnings("unchecked") public void wireExtensions(Class<?> interfaceName, List<?> extension) throws WiringException { if (AuthHook.class.equals(interfaceName)) { @@ -553,18 +550,14 @@ public class AuthCmdHandler return hooks; } - /** - * @see org.apache.james.protocols.smtp.hook.MailParametersHook#doMailParameter(org.apache.james.protocols.smtp.SMTPSession, java.lang.String, java.lang.String) - */ + @Override public HookResult doMailParameter(SMTPSession session, String paramName, String paramValue) { // Ignore the AUTH command. // TODO we should at least check for correct syntax and put the result in session return HookResult.declined(); } - /** - * @see org.apache.james.protocols.smtp.hook.MailParametersHook#getMailParamNames() - */ + @Override public String[] getMailParamNames() { return MAIL_PARAMS; } http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/esmtp/EhloCmdHandler.java ---------------------------------------------------------------------- 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 9737d83..7a8ed7e 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 @@ -97,26 +97,19 @@ public class EhloCmdHandler extends AbstractHookableCmdHandler<HeloHook> impleme } - /** - * @see org.apache.james.protocols.api.handler.CommandHandler#getImplCommands() - */ + @Override public Collection<String> getImplCommands() { return COMMANDS; } - /** - * @see org.apache.james.protocols.api.handler.ExtensibleHandler#getMarkerInterfaces() - */ + @Override public List<Class<?>> getMarkerInterfaces() { List<Class<?>> classes = super.getMarkerInterfaces(); classes.add(EhloExtension.class); return classes; } - /** - * @see org.apache.james.protocols.api.handler.ExtensibleHandler#wireExtensions(java.lang.Class, - * java.util.List) - */ + @Override @SuppressWarnings("unchecked") public void wireExtensions(Class<?> interfaceName, List<?> extension) { super.wireExtensions(interfaceName, extension); @@ -144,21 +137,15 @@ public class EhloCmdHandler extends AbstractHookableCmdHandler<HeloHook> impleme } } - /** - * @see org.apache.james.protocols.smtp.core.AbstractHookableCmdHandler#doCoreCmd(org.apache.james.protocols.smtp.SMTPSession, - * java.lang.String, java.lang.String) - */ + @Override protected Response doCoreCmd(SMTPSession session, String command, - String parameters) { + String parameters) { return doEHLO(session, parameters); } - /** - * @see org.apache.james.protocols.smtp.core.AbstractHookableCmdHandler#doFilterChecks(org.apache.james.protocols.smtp.SMTPSession, - * java.lang.String, java.lang.String) - */ + @Override protected Response doFilterChecks(SMTPSession session, String command, - String parameters) { + String parameters) { session.resetState(); if (parameters == null) { @@ -170,25 +157,19 @@ public class EhloCmdHandler extends AbstractHookableCmdHandler<HeloHook> impleme } } - /** - * @see org.apache.james.protocols.smtp.core.AbstractHookableCmdHandler#getHookInterface() - */ + @Override protected Class<HeloHook> getHookInterface() { return HeloHook.class; } - /** - * {@inheritDoc} - */ + @Override protected HookResult callHook(HeloHook rawHook, SMTPSession session, String parameters) { return rawHook.doHelo(session, parameters); } - /** - * @see org.apache.james.protocols.smtp.core.esmtp.EhloExtension#getImplementedEsmtpFeatures(org.apache.james.protocols.smtp.SMTPSession) - */ + @Override public List<String> getImplementedEsmtpFeatures(SMTPSession session) { return ESMTP_FEATURES; } http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/esmtp/MailSizeEsmtpExtension.java ---------------------------------------------------------------------- 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 1b8423d..b150bb8 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 @@ -68,25 +68,19 @@ public class MailSizeEsmtpExtension implements MailParametersHook, EhloExtension } - /** - * @see org.apache.james.protocols.smtp.hook.MailParametersHook#doMailParameter(org.apache.james.protocols.smtp.SMTPSession, java.lang.String, java.lang.String) - */ + @Override public HookResult doMailParameter(SMTPSession session, String paramName, - String paramValue) { + String paramValue) { return doMailSize(session, paramValue, (String) session.getAttachment(SMTPSession.SENDER, State.Transaction)); } - /** - * @see org.apache.james.protocols.smtp.hook.MailParametersHook#getMailParamNames() - */ + @Override public String[] getMailParamNames() { return MAIL_PARAMS; } - /** - * @see org.apache.james.protocols.smtp.core.esmtp.EhloExtension#getImplementedEsmtpFeatures(org.apache.james.protocols.smtp.SMTPSession) - */ + @Override @SuppressWarnings("unchecked") public List<String> getImplementedEsmtpFeatures(SMTPSession session) { // Extension defined in RFC 1870 @@ -138,9 +132,7 @@ public class MailSizeEsmtpExtension implements MailParametersHook, EhloExtension } - /** - * @see org.apache.james.protocols.smtp.core.DataLineFilter#onLine(SMTPSession, byte[], LineHandler) - */ + @Override public Response onLine(SMTPSession session, ByteBuffer line, LineHandler<SMTPSession> next) { Boolean failed = (Boolean) session.getAttachment(MESG_FAILED, State.Transaction); // If we already defined we failed and sent a reply we should simply @@ -189,9 +181,7 @@ public class MailSizeEsmtpExtension implements MailParametersHook, EhloExtension return line.remaining() == SINGLE_CHARACTER_LINE && line.get() == DOT_BYTE; } - /** - * @see org.apache.james.protocols.smtp.hook.MessageHook#onMessage(SMTPSession, MailEnvelope) - */ + @Override public HookResult onMessage(SMTPSession session, MailEnvelope mail) { Boolean failed = (Boolean) session.getAttachment(MESG_FAILED, State.Transaction); if (failed != null && failed.booleanValue()) { http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/esmtp/StartTlsCmdHandler.java ---------------------------------------------------------------------- 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 11ebcfd..3de08b3 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 @@ -53,6 +53,7 @@ public class StartTlsCmdHandler implements CommandHandler<SMTPSession>, EhloExte private static final Response SYNTAX_ERROR = new SMTPResponse("501 " + DSNStatus.getStatus(DSNStatus.PERMANENT, DSNStatus.DELIVERY_INVALID_ARG) + " Syntax error (no parameters allowed) with STARTTLS command").immutable(); private static final Response NOT_SUPPORTED = new SMTPResponse(SMTPRetCode.SYNTAX_ERROR_COMMAND_UNRECOGNIZED, DSNStatus.getStatus(DSNStatus.PERMANENT, DSNStatus.DELIVERY_INVALID_CMD) + " Command " + COMMAND_NAME + " unrecognized.").immutable(); + @Override public Collection<String> getImplCommands() { return COMMANDS; } @@ -72,6 +73,7 @@ public class StartTlsCmdHandler implements CommandHandler<SMTPSession>, EhloExte * message-specific, but not authenticated user, state. * */ + @Override public Response onCommand(SMTPSession session, Request request) { if (session.isStartTLSSupported()) { if (session.isTLSStarted()) { @@ -90,9 +92,7 @@ public class StartTlsCmdHandler implements CommandHandler<SMTPSession>, EhloExte } } - /** - * @see org.apache.james.protocols.smtp.core.esmtp.EhloExtension#getImplementedEsmtpFeatures(org.apache.james.protocols.smtp.SMTPSession) - */ + @Override @SuppressWarnings("unchecked") public List<String> getImplementedEsmtpFeatures(SMTPSession session) { // SMTP STARTTLS http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/fastfail/AbstractGreylistHandler.java ---------------------------------------------------------------------- diff --git a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/fastfail/AbstractGreylistHandler.java b/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/fastfail/AbstractGreylistHandler.java index cce3891..8df48c8 100644 --- a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/fastfail/AbstractGreylistHandler.java +++ b/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/fastfail/AbstractGreylistHandler.java @@ -210,9 +210,7 @@ public abstract class AbstractGreylistHandler implements RcptHook { - /** - * @see org.apache.james.protocols.smtp.hook.RcptHook#doRcpt(org.apache.james.protocols.smtp.SMTPSession, org.apache.mailet.MailAddress, org.apache.mailet.MailAddress) - */ + @Override public HookResult doRcpt(SMTPSession session, MailAddress sender, MailAddress rcpt) { if (!session.isRelayingAllowed()) { return doGreyListCheck(session, sender,rcpt); http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/fastfail/AbstractValidRcptHandler.java ---------------------------------------------------------------------- diff --git a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/fastfail/AbstractValidRcptHandler.java b/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/fastfail/AbstractValidRcptHandler.java index 4200220..79246e0 100644 --- a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/fastfail/AbstractValidRcptHandler.java +++ b/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/fastfail/AbstractValidRcptHandler.java @@ -36,9 +36,7 @@ import org.slf4j.LoggerFactory; public abstract class AbstractValidRcptHandler implements RcptHook { private static final Logger LOGGER = LoggerFactory.getLogger(AbstractValidRcptHandler.class); - /** - * @see org.apache.james.protocols.smtp.hook.RcptHook#doRcpt(org.apache.james.protocols.smtp.SMTPSession, org.apache.mailet.MailAddress, org.apache.mailet.MailAddress) - */ + @Override public HookResult doRcpt(SMTPSession session, MailAddress sender, MailAddress rcpt) { boolean reject = false; http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/fastfail/DNSRBLHandler.java ---------------------------------------------------------------------- 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 5b6ef06..55a811c 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 @@ -177,9 +177,7 @@ public class DNSRBLHandler implements RcptHook { } } - /** - * @see org.apache.james.protocols.smtp.hook.RcptHook#doRcpt(org.apache.james.protocols.smtp.SMTPSession, org.apache.mailet.MailAddress, org.apache.mailet.MailAddress) - */ + @Override public HookResult doRcpt(SMTPSession session, MailAddress sender, MailAddress rcpt) { checkDNSRBL(session, session.getRemoteAddress().getAddress().getHostAddress()); http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/fastfail/MaxRcptHandler.java ---------------------------------------------------------------------- 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 0390761..3b084b8 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 @@ -51,9 +51,7 @@ public class MaxRcptHandler implements RcptHook { this.maxRcpt = maxRcpt; } - /** - * @see org.apache.james.protocols.smtp.hook.RcptHook#doRcpt(org.apache.james.protocols.smtp.SMTPSession, org.apache.mailet.MailAddress, org.apache.mailet.MailAddress) - */ + @Override public HookResult doRcpt(SMTPSession session, MailAddress sender, MailAddress rcpt) { if ((session.getRcptCount() + 1) > maxRcpt) { LOGGER.info("Maximum recipients of {} reached", maxRcpt); http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/fastfail/MaxUnknownCmdHandler.java ---------------------------------------------------------------------- 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 5e27ded..efd063b 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 @@ -54,10 +54,7 @@ public class MaxUnknownCmdHandler implements UnknownHook { this.maxUnknown = maxUnknown; } - /* - * (non-Javadoc) - * @see org.apache.james.protocols.smtp.hook.UnknownHook#doUnknown(org.apache.james.protocols.smtp.SMTPSession, java.lang.String) - */ + @Override public HookResult doUnknown(SMTPSession session, String command) { Integer count = (Integer) session.getAttachment(UNKOWN_COMMAND_COUNT, State.Transaction); if (count == null) { http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/fastfail/ResolvableEhloHeloHandler.java ---------------------------------------------------------------------- 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 cda61f8..c31ab73 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 @@ -92,9 +92,7 @@ public class ResolvableEhloHeloHandler implements RcptHook, HeloHook { return true; } - /** - * @see org.apache.james.protocols.smtp.hook.RcptHook#doRcpt(org.apache.james.protocols.smtp.SMTPSession, org.apache.mailet.MailAddress, org.apache.mailet.MailAddress) - */ + @Override public HookResult doRcpt(SMTPSession session, MailAddress sender, MailAddress rcpt) { if (check(session,rcpt)) { return new HookResult(HookReturnCode.DENY,SMTPRetCode.SYNTAX_ERROR_ARGUMENTS,DSNStatus.getStatus(DSNStatus.PERMANENT, DSNStatus.DELIVERY_INVALID_ARG) @@ -104,9 +102,7 @@ public class ResolvableEhloHeloHandler implements RcptHook, HeloHook { } } - /** - * @see org.apache.james.protocols.smtp.hook.HeloHook#doHelo(org.apache.james.protocols.smtp.SMTPSession, java.lang.String) - */ + @Override public HookResult doHelo(SMTPSession session, String helo) { checkEhloHelo(session, helo); return HookResult.declined(); http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/fastfail/ReverseEqualsEhloHeloHandler.java ---------------------------------------------------------------------- diff --git a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/fastfail/ReverseEqualsEhloHeloHandler.java b/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/fastfail/ReverseEqualsEhloHeloHandler.java index bf22da5..b43bc44 100644 --- a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/fastfail/ReverseEqualsEhloHeloHandler.java +++ b/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/fastfail/ReverseEqualsEhloHeloHandler.java @@ -25,9 +25,6 @@ import org.apache.james.protocols.smtp.SMTPSession; public class ReverseEqualsEhloHeloHandler extends ResolvableEhloHeloHandler { - /** - * @see org.apache.james.protocols.smtp.core.fastfail.ResolvableEhloHeloHandler#isBadHelo(org.apache.james.protocols.smtp.SMTPSession, java.lang.String) - */ @Override protected boolean isBadHelo(SMTPSession session, String argument) { try { http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/fastfail/SpamTrapHandler.java ---------------------------------------------------------------------- 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 45bfcb6..1b93046 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 @@ -68,9 +68,7 @@ public class SpamTrapHandler implements RcptHook { this.blockTime = blockTime; } - /** - * @see org.apache.james.protocols.smtp.hook.RcptHook#doRcpt(org.apache.james.protocols.smtp.SMTPSession, org.apache.mailet.MailAddress, org.apache.mailet.MailAddress) - */ + @Override public HookResult doRcpt(SMTPSession session, MailAddress sender, MailAddress rcpt) { String address = session.getRemoteAddress().getAddress().getHostAddress(); if (isBlocked(address, session)) { http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/fastfail/SupressDuplicateRcptHandler.java ---------------------------------------------------------------------- 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 531ff6e..305aefd 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 @@ -50,9 +50,7 @@ public class SupressDuplicateRcptHandler implements RcptHook { } - /** - * @see org.apache.james.protocols.smtp.hook.RcptHook#doRcpt(org.apache.james.protocols.smtp.SMTPSession, org.apache.mailet.MailAddress, org.apache.mailet.MailAddress) - */ + @Override @SuppressWarnings("unchecked") public HookResult doRcpt(SMTPSession session, MailAddress sender, MailAddress rcpt) { Collection<MailAddress> rcptList = (Collection<MailAddress>) session.getAttachment(SMTPSession.RCPT_LIST, State.Transaction); http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/fastfail/ValidSenderDomainHandler.java ---------------------------------------------------------------------- diff --git a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/fastfail/ValidSenderDomainHandler.java b/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/fastfail/ValidSenderDomainHandler.java index 94d5aba..58d1042 100644 --- a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/fastfail/ValidSenderDomainHandler.java +++ b/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/fastfail/ValidSenderDomainHandler.java @@ -33,9 +33,7 @@ import org.apache.james.protocols.smtp.hook.MailHook; public abstract class ValidSenderDomainHandler implements MailHook { - /** - * @see org.apache.james.protocols.smtp.hook.MailHook#doMail(org.apache.james.protocols.smtp.SMTPSession, org.apache.mailet.MailAddress) - */ + @Override public HookResult doMail(SMTPSession session, MailAddress sender) { if (sender != null && !hasMXRecord(session,sender.getDomain())) { return new HookResult(HookReturnCode.DENY,SMTPRetCode.SYNTAX_ERROR_ARGUMENTS,DSNStatus.getStatus(DSNStatus.PERMANENT,DSNStatus.ADDRESS_SYNTAX_SENDER) + " sender " + sender + " contains a domain with no valid MX records"); http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/log/HookResultLogger.java ---------------------------------------------------------------------- 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 1c96646..88d274d 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 @@ -47,6 +47,7 @@ public class HookResultLogger implements HookResultHook { } + @Override public HookResult onHookResult(SMTPSession session, HookResult hResult, long executionTime, Hook hook) { boolean match = false; boolean info = false; http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/hook/SimpleHook.java ---------------------------------------------------------------------- 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 fd43d40..6962209 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 @@ -47,6 +47,7 @@ public class SimpleHook implements HeloHook, MailHook, RcptHook, MessageHook { /** * Return {@link HookResult} with {@link HookReturnCode#OK} */ + @Override public HookResult onMessage(SMTPSession session, MailEnvelope mail) { return new HookResult(HookReturnCode.OK); } @@ -54,6 +55,7 @@ public class SimpleHook implements HeloHook, MailHook, RcptHook, MessageHook { /** * Return {@link HookResult} with {@link HookReturnCode#DECLINED} */ + @Override public HookResult doRcpt(SMTPSession session, MailAddress sender, MailAddress rcpt) { return new HookResult(HookReturnCode.DECLINED); @@ -62,6 +64,7 @@ public class SimpleHook implements HeloHook, MailHook, RcptHook, MessageHook { /** * Return {@link HookResult} with {@link HookReturnCode#DECLINED} */ + @Override public HookResult doMail(SMTPSession session, MailAddress sender) { return new HookResult(HookReturnCode.DECLINED); @@ -70,6 +73,7 @@ public class SimpleHook implements HeloHook, MailHook, RcptHook, MessageHook { /** * Return {@link HookResult} with {@link HookReturnCode#DECLINED} */ + @Override public HookResult doHelo(SMTPSession session, String helo) { return new HookResult(HookReturnCode.DECLINED); } http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/protocols/smtp/src/test/java/org/apache/james/protocols/smtp/AbstractSMTPServerTest.java ---------------------------------------------------------------------- diff --git a/protocols/smtp/src/test/java/org/apache/james/protocols/smtp/AbstractSMTPServerTest.java b/protocols/smtp/src/test/java/org/apache/james/protocols/smtp/AbstractSMTPServerTest.java index b98efab..ce1f25e 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 @@ -499,6 +499,7 @@ public abstract class AbstractSMTPServerTest { } + @Override public HookResult doHelo(SMTPSession session, String helo) { return new HookResult(HookReturnCode.DENY); } @@ -546,6 +547,7 @@ public abstract class AbstractSMTPServerTest { } + @Override public HookResult doHelo(SMTPSession session, String helo) { return new HookResult(HookReturnCode.DENYSOFT); } @@ -592,6 +594,7 @@ public abstract class AbstractSMTPServerTest { } + @Override public HookResult doMail(SMTPSession session, MailAddress sender) { return new HookResult(HookReturnCode.DENY); } @@ -641,6 +644,7 @@ public abstract class AbstractSMTPServerTest { } + @Override public HookResult doMail(SMTPSession session, MailAddress sender) { return new HookResult(HookReturnCode.DENYSOFT); } @@ -691,6 +695,7 @@ public abstract class AbstractSMTPServerTest { } + @Override public HookResult doRcpt(SMTPSession session, MailAddress sender, MailAddress rcpt) { if (RCPT1.equals(rcpt.toString())) { return new HookResult(HookReturnCode.DENY); @@ -754,6 +759,7 @@ public abstract class AbstractSMTPServerTest { } + @Override public HookResult doRcpt(SMTPSession session, MailAddress sender, MailAddress rcpt) { if (RCPT1.equals(rcpt.toString())) { return new HookResult(HookReturnCode.DENYSOFT); @@ -852,6 +858,7 @@ public abstract class AbstractSMTPServerTest { } + @Override public HookResult onMessage(SMTPSession session, MailEnvelope mail) { return new HookResult(HookReturnCode.DENY); } @@ -915,6 +922,7 @@ public abstract class AbstractSMTPServerTest { } + @Override public HookResult onMessage(SMTPSession session, MailEnvelope mail) { return new HookResult(HookReturnCode.DENYSOFT); } @@ -977,6 +985,7 @@ public abstract class AbstractSMTPServerTest { } + @Override public Response onConnect(SMTPSession session) { return new SMTPResponse("554", "Bye Bye"); } @@ -1019,6 +1028,7 @@ public abstract class AbstractSMTPServerTest { } + @Override public Response onConnect(SMTPSession session) { return new SMTPResponse("451", "Bye Bye"); } @@ -1061,6 +1071,7 @@ public abstract class AbstractSMTPServerTest { } + @Override public void onDisconnect(SMTPSession session) { called.set(true); } http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/protocols/smtp/src/test/java/org/apache/james/protocols/smtp/core/fastfail/DNSRBLHandlerTest.java ---------------------------------------------------------------------- diff --git a/protocols/smtp/src/test/java/org/apache/james/protocols/smtp/core/fastfail/DNSRBLHandlerTest.java b/protocols/smtp/src/test/java/org/apache/james/protocols/smtp/core/fastfail/DNSRBLHandlerTest.java index 16529aa..f0322ac 100644 --- a/protocols/smtp/src/test/java/org/apache/james/protocols/smtp/core/fastfail/DNSRBLHandlerTest.java +++ b/protocols/smtp/src/test/java/org/apache/james/protocols/smtp/core/fastfail/DNSRBLHandlerTest.java @@ -126,22 +126,27 @@ public class DNSRBLHandlerTest { return remoteIp; } + @Override public Map<String,Object> getState() { return sessionState; } + @Override public boolean isRelayingAllowed() { return relaying; } + @Override public boolean isAuthSupported() { return false; } + @Override public int getRcptCount() { return 0; } + @Override public Object setAttachment(String key, Object value, State state) { if (state == State.Connection) { if (value == null) { @@ -158,6 +163,7 @@ public class DNSRBLHandlerTest { } } + @Override public Object getAttachment(String key, State state) { if (state == State.Connection) { return connectionState.get(key); http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/protocols/smtp/src/test/java/org/apache/james/protocols/smtp/core/fastfail/MaxRcptHandlerTest.java ---------------------------------------------------------------------- diff --git a/protocols/smtp/src/test/java/org/apache/james/protocols/smtp/core/fastfail/MaxRcptHandlerTest.java b/protocols/smtp/src/test/java/org/apache/james/protocols/smtp/core/fastfail/MaxRcptHandlerTest.java index b715049..6c28e54 100644 --- a/protocols/smtp/src/test/java/org/apache/james/protocols/smtp/core/fastfail/MaxRcptHandlerTest.java +++ b/protocols/smtp/src/test/java/org/apache/james/protocols/smtp/core/fastfail/MaxRcptHandlerTest.java @@ -36,14 +36,17 @@ public class MaxRcptHandlerTest { return new BaseFakeSMTPSession() { HashMap<String,Object> state = new HashMap<>(); + @Override public Map<String,Object> getState() { return state; } + @Override public boolean isRelayingAllowed() { return false; } + @Override public int getRcptCount() { return rcptCount; } http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/protocols/smtp/src/test/java/org/apache/james/protocols/smtp/core/fastfail/MaxUnknownCmdHandlerTest.java ---------------------------------------------------------------------- diff --git a/protocols/smtp/src/test/java/org/apache/james/protocols/smtp/core/fastfail/MaxUnknownCmdHandlerTest.java b/protocols/smtp/src/test/java/org/apache/james/protocols/smtp/core/fastfail/MaxUnknownCmdHandlerTest.java index b436b58..321d65c 100644 --- a/protocols/smtp/src/test/java/org/apache/james/protocols/smtp/core/fastfail/MaxUnknownCmdHandlerTest.java +++ b/protocols/smtp/src/test/java/org/apache/james/protocols/smtp/core/fastfail/MaxUnknownCmdHandlerTest.java @@ -38,10 +38,12 @@ public class MaxUnknownCmdHandlerTest { SMTPSession session = new BaseFakeSMTPSession() { private final HashMap<String,Object> map = new HashMap<>(); + @Override public Map<String,Object> getState() { return map; } + @Override public Object setAttachment(String key, Object value, State state) { if (state == State.Connection) { throw new UnsupportedOperationException(); @@ -59,6 +61,7 @@ public class MaxUnknownCmdHandlerTest { * (non-Javadoc) * @see org.apache.james.protocols.api.ProtocolSession#getAttachment(java.lang.String, org.apache.james.protocols.api.ProtocolSession.State) */ + @Override public Object getAttachment(String key, State state) { if (state == State.Connection) { throw new UnsupportedOperationException(); http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/protocols/smtp/src/test/java/org/apache/james/protocols/smtp/core/fastfail/ResolvableEhloHeloHandlerTest.java ---------------------------------------------------------------------- diff --git a/protocols/smtp/src/test/java/org/apache/james/protocols/smtp/core/fastfail/ResolvableEhloHeloHandlerTest.java b/protocols/smtp/src/test/java/org/apache/james/protocols/smtp/core/fastfail/ResolvableEhloHeloHandlerTest.java index 5d77318..d633bf8 100644 --- a/protocols/smtp/src/test/java/org/apache/james/protocols/smtp/core/fastfail/ResolvableEhloHeloHandlerTest.java +++ b/protocols/smtp/src/test/java/org/apache/james/protocols/smtp/core/fastfail/ResolvableEhloHeloHandlerTest.java @@ -50,22 +50,27 @@ public class ResolvableEhloHeloHandlerTest { HashMap<String,Object> connectionMap = new HashMap<>(); HashMap<String,Object> map = new HashMap<>(); + @Override public boolean isAuthSupported() { return authRequired; } + @Override public String getUser() { return user; } + @Override public Map<String,Object> getConnectionState() { return connectionMap; } + @Override public boolean isRelayingAllowed() { return relaying; } + @Override public Map<String,Object> getState() { return map; } @@ -74,6 +79,7 @@ public class ResolvableEhloHeloHandlerTest { * (non-Javadoc) * @see org.apache.james.protocols.api.ProtocolSession#setAttachment(java.lang.String, java.lang.Object, org.apache.james.protocols.api.ProtocolSession.State) */ + @Override public Object setAttachment(String key, Object value, State state) { if (state == State.Connection) { if (value == null) { @@ -94,6 +100,7 @@ public class ResolvableEhloHeloHandlerTest { * (non-Javadoc) * @see org.apache.james.protocols.api.ProtocolSession#getAttachment(java.lang.String, org.apache.james.protocols.api.ProtocolSession.State) */ + @Override public Object getAttachment(String key, State state) { if (state == State.Connection) { return connectionMap.get(key); --------------------------------------------------------------------- To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org For additional commands, e-mail: server-dev-h...@james.apache.org
