http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/server/protocols/protocols-imap4/src/main/java/org/apache/james/imapserver/netty/NettyStreamImapRequestLineReader.java ---------------------------------------------------------------------- diff --git a/server/protocols/protocols-imap4/src/main/java/org/apache/james/imapserver/netty/NettyStreamImapRequestLineReader.java b/server/protocols/protocols-imap4/src/main/java/org/apache/james/imapserver/netty/NettyStreamImapRequestLineReader.java index 3c7e0d7..bda86b0 100644 --- a/server/protocols/protocols-imap4/src/main/java/org/apache/james/imapserver/netty/NettyStreamImapRequestLineReader.java +++ b/server/protocols/protocols-imap4/src/main/java/org/apache/james/imapserver/netty/NettyStreamImapRequestLineReader.java @@ -47,6 +47,7 @@ public class NettyStreamImapRequestLineReader extends AbstractNettyImapRequestLi * @throws DecodingException * If the end-of-stream is reached. */ + @Override public char nextChar() throws DecodingException { if (!nextSeen) { @@ -79,6 +80,7 @@ public class NettyStreamImapRequestLineReader extends AbstractNettyImapRequestLi * @throws DecodingException * If a char can't be read into each array element. */ + @Override public InputStream read(int size, boolean extraCRLF) throws DecodingException { // Unset the next char.
http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/server/protocols/protocols-library/src/main/java/org/apache/james/protocols/lib/jmx/AbstractCommandHandlerResultJMXMonitor.java ---------------------------------------------------------------------- diff --git a/server/protocols/protocols-library/src/main/java/org/apache/james/protocols/lib/jmx/AbstractCommandHandlerResultJMXMonitor.java b/server/protocols/protocols-library/src/main/java/org/apache/james/protocols/lib/jmx/AbstractCommandHandlerResultJMXMonitor.java index 8d4492f..a6e7b54 100644 --- a/server/protocols/protocols-library/src/main/java/org/apache/james/protocols/lib/jmx/AbstractCommandHandlerResultJMXMonitor.java +++ b/server/protocols/protocols-library/src/main/java/org/apache/james/protocols/lib/jmx/AbstractCommandHandlerResultJMXMonitor.java @@ -41,13 +41,7 @@ public abstract class AbstractCommandHandlerResultJMXMonitor<S extends ProtocolS private final Map<String, AbstractCommandHandlerStats> cStats = new HashMap<>(); private String jmxName; - /** - * @see - * org.apache.james.protocols.api.handler.ProtocolHandlerResultHandler#onResponse( - * org.apache.james.protocols.api.ProtocolSession, - * org.apache.james.protocols.api.Response, long, - * org.apache.james.protocols.api.handler.ProtocolHandler) - */ + @Override public Response onResponse(ProtocolSession session, Response response, long executionTime, ProtocolHandler handler) { if (handler instanceof CommandHandler) { String name = handler.getClass().getName(); @@ -59,20 +53,14 @@ public abstract class AbstractCommandHandlerResultJMXMonitor<S extends ProtocolS return response; } - /** - * @see - * org.apache.james.protocols.api.handler.ExtensibleHandler#getMarkerInterfaces() - */ + @Override public List<Class<?>> getMarkerInterfaces() { List<Class<?>> marker = new ArrayList<>(); marker.add(CommandHandler.class); return marker; } - /** - * @see - * org.apache.james.protocols.api.handler.ExtensibleHandler#wireExtensions(java.lang.Class, java.util.List) - */ + @Override @SuppressWarnings({ "unchecked", "rawtypes", "unlikely-arg-type" }) public void wireExtensions(Class<?> interfaceName, List<?> extension) throws WiringException { if (interfaceName.equals(CommandHandler.class)) { http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/server/protocols/protocols-library/src/main/java/org/apache/james/protocols/lib/jmx/AbstractCommandHandlerStats.java ---------------------------------------------------------------------- diff --git a/server/protocols/protocols-library/src/main/java/org/apache/james/protocols/lib/jmx/AbstractCommandHandlerStats.java b/server/protocols/protocols-library/src/main/java/org/apache/james/protocols/lib/jmx/AbstractCommandHandlerStats.java index 477525b..1ae62d8 100644 --- a/server/protocols/protocols-library/src/main/java/org/apache/james/protocols/lib/jmx/AbstractCommandHandlerStats.java +++ b/server/protocols/protocols-library/src/main/java/org/apache/james/protocols/lib/jmx/AbstractCommandHandlerStats.java @@ -78,23 +78,17 @@ public abstract class AbstractCommandHandlerStats extends StandardMBean implemen */ protected abstract void incrementStats(Response response); - /** - * @see org.apache.james.protocols.lib.jmx.CommandHandlerStatsMBean#getAll() - */ + @Override public long getAll() { return all.get(); } - /** - * @see org.apache.james.protocols.lib.jmx.CommandHandlerStatsMBean#getName() - */ + @Override public String getName() { return handlerName; } - /** - * @see org.apache.james.lifecycle.api.Disposable#dispose() - */ + @Override public void dispose() { try { mbeanserver.unregisterMBean(new ObjectName(name)); @@ -103,16 +97,12 @@ public abstract class AbstractCommandHandlerStats extends StandardMBean implemen } } - /** - * @see org.apache.james.protocols.lib.jmx.CommandHandlerStatsMBean#getCommands() - */ + @Override public String[] getCommands() { return commands; } - /** - * @see org.apache.james.protocols.lib.jmx.CommandHandlerStatsMBean#getDisconnect() - */ + @Override public long getDisconnect() { return disconnect.get(); } http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/server/protocols/protocols-library/src/main/java/org/apache/james/protocols/lib/jmx/AbstractConnectHandlerResultJMXMonitor.java ---------------------------------------------------------------------- diff --git a/server/protocols/protocols-library/src/main/java/org/apache/james/protocols/lib/jmx/AbstractConnectHandlerResultJMXMonitor.java b/server/protocols/protocols-library/src/main/java/org/apache/james/protocols/lib/jmx/AbstractConnectHandlerResultJMXMonitor.java index 4021606..e989df6 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 @@ -57,12 +57,7 @@ public abstract class AbstractConnectHandlerResultJMXMonitor<R extends Response, - /** - * @see - * org.apache.james.protocols.api.handler.ProtocolHandlerResultHandler - * #onResponse(org.apache.james.protocols.api.ProtocolSession, long, - * org.apache.james.protocols.api.handler.ProtocolHandler) - */ + @Override public Response onResponse(ProtocolSession session, Response response, long executionTime, ProtocolHandler handler) { if (handler instanceof ConnectHandler) { cStats.get(handler.getClass().getName()).increment(response); @@ -70,10 +65,7 @@ public abstract class AbstractConnectHandlerResultJMXMonitor<R extends Response, return response; } - /** - * @see - * org.apache.james.protocols.api.handler.ExtensibleHandler#getMarkerInterfaces() - */ + @Override public List<Class<?>> getMarkerInterfaces() { List<Class<?>> marker = new ArrayList<>(); marker.add(ConnectHandler.class); @@ -81,10 +73,7 @@ public abstract class AbstractConnectHandlerResultJMXMonitor<R extends Response, return marker; } - /** - * @see - * org.apache.james.protocols.api.handler.ExtensibleHandler#wireExtensions(java.lang.Class, java.util.List) - */ + @Override @SuppressWarnings("unlikely-arg-type") public void wireExtensions(Class<?> interfaceName, List<?> extension) throws WiringException { if (interfaceName.equals(ConnectHandler.class)) { http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/server/protocols/protocols-library/src/main/java/org/apache/james/protocols/lib/jmx/AbstractLineHandlerResultJMXMonitor.java ---------------------------------------------------------------------- diff --git a/server/protocols/protocols-library/src/main/java/org/apache/james/protocols/lib/jmx/AbstractLineHandlerResultJMXMonitor.java b/server/protocols/protocols-library/src/main/java/org/apache/james/protocols/lib/jmx/AbstractLineHandlerResultJMXMonitor.java index 9d93d16..62c84e9 100644 --- a/server/protocols/protocols-library/src/main/java/org/apache/james/protocols/lib/jmx/AbstractLineHandlerResultJMXMonitor.java +++ b/server/protocols/protocols-library/src/main/java/org/apache/james/protocols/lib/jmx/AbstractLineHandlerResultJMXMonitor.java @@ -43,12 +43,7 @@ public abstract class AbstractLineHandlerResultJMXMonitor<R extends Response, S private final Map<String, LineHandlerStats> lStats = new HashMap<>(); private String jmxName; - /** - * @see - * org.apache.james.protocols.api.handler.ProtocolHandlerResultHandler - * #onResponse(org.apache.james.protocols.api.ProtocolSession, longlong, - * org.apache.james.protocols.api.handler.ProtocolHandler) - */ + @Override public Response onResponse(ProtocolSession session, Response response, long executionTime, ProtocolHandler handler) { if (handler instanceof LineHandler) { lStats.get(handler.getClass().getName()).increment(response); @@ -56,20 +51,14 @@ public abstract class AbstractLineHandlerResultJMXMonitor<R extends Response, S return response; } - /** - * @see - * org.apache.james.protocols.api.handler.ExtensibleHandler#getMarkerInterfaces() - */ + @Override public List<Class<?>> getMarkerInterfaces() { List<Class<?>> marker = new ArrayList<>(); marker.add(LineHandler.class); return marker; } - /** - * @see - * org.apache.james.protocols.api.handler.ExtensibleHandler#wireExtensions(java.lang.Class, java.util.List) - */ + @Override @SuppressWarnings("unlikely-arg-type") public void wireExtensions(Class<?> interfaceName, List<?> extension) throws WiringException { http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/server/protocols/protocols-library/src/main/java/org/apache/james/protocols/lib/jmx/ConnectHandlerStats.java ---------------------------------------------------------------------- diff --git a/server/protocols/protocols-library/src/main/java/org/apache/james/protocols/lib/jmx/ConnectHandlerStats.java b/server/protocols/protocols-library/src/main/java/org/apache/james/protocols/lib/jmx/ConnectHandlerStats.java index 81321fd..7fe8f0f 100644 --- a/server/protocols/protocols-library/src/main/java/org/apache/james/protocols/lib/jmx/ConnectHandlerStats.java +++ b/server/protocols/protocols-library/src/main/java/org/apache/james/protocols/lib/jmx/ConnectHandlerStats.java @@ -63,30 +63,22 @@ public class ConnectHandlerStats extends StandardMBean implements HandlerStatsMB } } - /** - * @see org.apache.james.protocols.lib.jmx.HandlerStatsMBean#getAll() - */ + @Override public long getAll() { return all.get(); } - /** - * @see org.apache.james.protocols.lib.jmx.HandlerStatsMBean#getName() - */ + @Override public String getName() { return handlerName; } - /** - * @see org.apache.james.protocols.lib.jmx.HandlerStatsMBean#getDisconnect() - */ + @Override public long getDisconnect() { return disconnect.get(); } - /** - * @see org.apache.james.lifecycle.api.Disposable#dispose() - */ + @Override public void dispose() { try { mbeanserver.unregisterMBean(new ObjectName(name)); http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/server/protocols/protocols-library/src/main/java/org/apache/james/protocols/lib/jmx/LineHandlerStats.java ---------------------------------------------------------------------- diff --git a/server/protocols/protocols-library/src/main/java/org/apache/james/protocols/lib/jmx/LineHandlerStats.java b/server/protocols/protocols-library/src/main/java/org/apache/james/protocols/lib/jmx/LineHandlerStats.java index 5e8b652..aca25ec 100644 --- a/server/protocols/protocols-library/src/main/java/org/apache/james/protocols/lib/jmx/LineHandlerStats.java +++ b/server/protocols/protocols-library/src/main/java/org/apache/james/protocols/lib/jmx/LineHandlerStats.java @@ -65,30 +65,22 @@ public class LineHandlerStats extends StandardMBean implements HandlerStatsMBean } } - /** - * @see org.apache.james.protocols.lib.jmx.HandlerStatsMBean#getAll() - */ + @Override public long getAll() { return all.get(); } - /** - * @see org.apache.james.protocols.lib.jmx.HandlerStatsMBean#getName() - */ + @Override public String getName() { return handlerName; } - /** - * @see org.apache.james.protocols.lib.jmx.HandlerStatsMBean#getDisconnect() - */ + @Override public long getDisconnect() { return disconnect.get(); } - /** - * @see org.apache.james.lifecycle.api.Disposable#dispose() - */ + @Override public void dispose() { try { mbeanserver.unregisterMBean(new ObjectName(name)); http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/server/protocols/protocols-library/src/main/java/org/apache/james/protocols/lib/netty/AbstractConfigurableAsyncServer.java ---------------------------------------------------------------------- diff --git a/server/protocols/protocols-library/src/main/java/org/apache/james/protocols/lib/netty/AbstractConfigurableAsyncServer.java b/server/protocols/protocols-library/src/main/java/org/apache/james/protocols/lib/netty/AbstractConfigurableAsyncServer.java index 5eed459..a6fe7a2 100644 --- a/server/protocols/protocols-library/src/main/java/org/apache/james/protocols/lib/netty/AbstractConfigurableAsyncServer.java +++ b/server/protocols/protocols-library/src/main/java/org/apache/james/protocols/lib/netty/AbstractConfigurableAsyncServer.java @@ -153,11 +153,7 @@ public abstract class AbstractConfigurableAsyncServer extends AbstractAsyncServe return "org.apache.james:type=server,name=" + jmxName; } - /** - * @see - * org.apache.james.lifecycle.api.Configurable - * #configure(org.apache.commons.configuration.HierarchicalConfiguration) - */ + @Override public final void configure(HierarchicalConfiguration config) throws ConfigurationException { enabled = config.getBoolean("[@enabled]", true); @@ -360,6 +356,7 @@ public abstract class AbstractConfigurableAsyncServer extends AbstractAsyncServe * * @return enabled */ + @Override public boolean isEnabled() { return enabled; } @@ -425,6 +422,7 @@ public abstract class AbstractConfigurableAsyncServer extends AbstractAsyncServe * * @return the socket type ('plain' or 'secure') */ + @Override public String getSocketType() { if (encryption != null && !encryption.isStartTLS()) { return "secure"; @@ -432,17 +430,12 @@ public abstract class AbstractConfigurableAsyncServer extends AbstractAsyncServe return "plain"; } - /** - * @see org.apache.james.protocols.lib.jmx.ServerMBean#getStartTLSSupported() - */ + @Override public boolean getStartTLSSupported() { return encryption != null && encryption.isStartTLS(); } - /** - * @see - * org.apache.james.protocols.lib.jmx.ServerMBean#getMaximumConcurrentConnections() - */ + @Override public int getMaximumConcurrentConnections() { return connectionLimit; } @@ -473,16 +466,12 @@ public abstract class AbstractConfigurableAsyncServer extends AbstractAsyncServe return enabledCipherSuites; } - /** - * @see org.apache.james.protocols.lib.jmx.ServerMBean#isStarted() - */ + @Override public boolean isStarted() { return isBound(); } - /** - * @see org.apache.james.protocols.lib.jmx.ServerMBean#start() - */ + @Override public boolean start() { try { bind(); @@ -493,24 +482,18 @@ public abstract class AbstractConfigurableAsyncServer extends AbstractAsyncServe return true; } - /** - * @see org.apache.james.protocols.lib.jmx.ServerMBean#stop() - */ + @Override public boolean stop() { unbind(); return true; } - /** - * @see org.apache.james.protocols.lib.jmx.ServerMBean#getHandledConnections() - */ + @Override public long getHandledConnections() { return countHandler.getConnectionsTillStartup(); } - /** - * @see org.apache.james.protocols.lib.jmx.ServerMBean#getCurrentConnections() - */ + @Override public int getCurrentConnections() { return countHandler.getCurrentConnectionCount(); } @@ -519,9 +502,7 @@ public abstract class AbstractConfigurableAsyncServer extends AbstractAsyncServe return countHandler; } - /** - * @see org.apache.james.protocols.lib.jmx.ServerMBean#getBoundAddresses() - */ + @Override public String[] getBoundAddresses() { List<InetSocketAddress> addresses = getListenAddresses(); http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/server/protocols/protocols-library/src/main/java/org/apache/james/protocols/lib/netty/JMXEnabledOrderedMemoryAwareThreadPoolExecutor.java ---------------------------------------------------------------------- diff --git a/server/protocols/protocols-library/src/main/java/org/apache/james/protocols/lib/netty/JMXEnabledOrderedMemoryAwareThreadPoolExecutor.java b/server/protocols/protocols-library/src/main/java/org/apache/james/protocols/lib/netty/JMXEnabledOrderedMemoryAwareThreadPoolExecutor.java index 594aa71..e59a8fb 100644 --- a/server/protocols/protocols-library/src/main/java/org/apache/james/protocols/lib/netty/JMXEnabledOrderedMemoryAwareThreadPoolExecutor.java +++ b/server/protocols/protocols-library/src/main/java/org/apache/james/protocols/lib/netty/JMXEnabledOrderedMemoryAwareThreadPoolExecutor.java @@ -118,44 +118,32 @@ public class JMXEnabledOrderedMemoryAwareThreadPoolExecutor extends OrderedMemor return super.shutdownNow(); } - /** - * @see org.apache.james.util.concurrent.JMXEnabledThreadPoolExecutorMBean#getTotalTasks() - */ + @Override public synchronized int getTotalTasks() { return totalTasks; } - /** - * @see org.apache.james.util.concurrent.JMXEnabledThreadPoolExecutorMBean#getAverageTaskTime() - */ + @Override public synchronized double getAverageTaskTime() { return (totalTasks == 0) ? 0 : totalTime / totalTasks; } - /** - * @see org.apache.james.util.concurrent.JMXEnabledThreadPoolExecutorMBean#getActiveThreads() - */ + @Override public int getActiveThreads() { return getPoolSize(); } - /** - * @see org.apache.james.util.concurrent.JMXEnabledThreadPoolExecutorMBean#getActiveTasks() - */ + @Override public int getActiveTasks() { return getActiveCount(); } - /** - * @see org.apache.james.util.concurrent.JMXEnabledThreadPoolExecutorMBean#getQueuedTasks() - */ + @Override public int getQueuedTasks() { return getQueue().size(); } - /** - * @see org.apache.james.util.concurrent.JMXEnabledThreadPoolExecutorMBean#getMaximalThreads() - */ + @Override public int getMaximalThreads() { return getMaximumPoolSize(); } http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/server/protocols/protocols-lmtp/src/main/java/org/apache/james/lmtpserver/CoreCmdHandlerLoader.java ---------------------------------------------------------------------- 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 962d114..cea3dfe 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 @@ -79,9 +79,7 @@ public class CoreCmdHandlerLoader implements HandlersPackage { .forEachOrdered(commands::add); } - /** - * @see HandlersPackage#getHandlers() - */ + @Override public List<String> getHandlers() { return commands; } http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/server/protocols/protocols-lmtp/src/main/java/org/apache/james/lmtpserver/jmx/JMXHandlersLoader.java ---------------------------------------------------------------------- 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 5001404..66512bd 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 @@ -35,9 +35,7 @@ public class JMXHandlersLoader implements HandlersPackage { handlers.add(LineHandlerResultJMXMonitor.class.getName()); } - /** - * @see HandlersPackage#getHandlers() - */ + @Override public List<String> getHandlers() { return handlers; } http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/server/protocols/protocols-lmtp/src/main/java/org/apache/james/lmtpserver/netty/LMTPServer.java ---------------------------------------------------------------------- diff --git a/server/protocols/protocols-lmtp/src/main/java/org/apache/james/lmtpserver/netty/LMTPServer.java b/server/protocols/protocols-lmtp/src/main/java/org/apache/james/lmtpserver/netty/LMTPServer.java index 178e80d..89f3f1a 100644 --- a/server/protocols/protocols-lmtp/src/main/java/org/apache/james/lmtpserver/netty/LMTPServer.java +++ b/server/protocols/protocols-lmtp/src/main/java/org/apache/james/lmtpserver/netty/LMTPServer.java @@ -50,21 +50,17 @@ public class LMTPServer extends AbstractProtocolAsyncServer implements LMTPServe this.lmtpMetrics = lmtpMetrics; } - /** - * @see - * org.apache.james.protocols.lib.netty.AbstractConfigurableAsyncServer#getDefaultPort() - */ + @Override public int getDefaultPort() { return 24; } - /** - * @see org.apache.james.protocols.lib.jmx.ServerMBean#getServiceType() - */ + @Override public String getServiceType() { return "LMTP Service"; } + @Override public void doConfigure(HierarchicalConfiguration configuration) throws ConfigurationException { super.doConfigure(configuration); if (isEnabled()) { @@ -92,6 +88,7 @@ public class LMTPServer extends AbstractProtocolAsyncServer implements LMTPServe /** * @see org.apache.james.protocols.smtp.SMTPConfiguration#getHelloName() */ + @Override public String getHelloName() { return LMTPServer.this.getHelloName(); } @@ -101,6 +98,7 @@ public class LMTPServer extends AbstractProtocolAsyncServer implements LMTPServe /** * @see org.apache.james.protocols.smtp.SMTPConfiguration#getMaxMessageSize() */ + @Override public long getMaxMessageSize() { return LMTPServer.this.maxMessageSize; } @@ -113,32 +111,22 @@ public class LMTPServer extends AbstractProtocolAsyncServer implements LMTPServe } - /** - * @see LMTPServerMBean#getMaximalMessageSize() - */ + @Override public long getMaximalMessageSize() { return lmtpConfig.getMaxMessageSize(); } - /** - * @see - * org.apache.james.protocols.lib.netty.AbstractConfigurableAsyncServer#getDefaultJMXName() - */ + @Override protected String getDefaultJMXName() { return "lmtpserver"; } - /** - * @see - * org.apache.james.smtpserver.netty.SMTPServerMBean#setMaximalMessageSize(long) - */ + @Override public void setMaximalMessageSize(long maxSize) { maxMessageSize = maxSize; } - /** - * @see org.apache.james.lmtpserver.netty.LMTPServerMBean#getHeloName() - */ + @Override public String getHeloName() { return lmtpConfig.getHelloName(); } http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/server/protocols/protocols-managesieve/src/main/java/org/apache/james/managesieveserver/netty/ManageSieveServer.java ---------------------------------------------------------------------- diff --git a/server/protocols/protocols-managesieve/src/main/java/org/apache/james/managesieveserver/netty/ManageSieveServer.java b/server/protocols/protocols-managesieve/src/main/java/org/apache/james/managesieveserver/netty/ManageSieveServer.java index 9f5f87c..8d89aa2 100644 --- a/server/protocols/protocols-managesieve/src/main/java/org/apache/james/managesieveserver/netty/ManageSieveServer.java +++ b/server/protocols/protocols-managesieve/src/main/java/org/apache/james/managesieveserver/netty/ManageSieveServer.java @@ -97,6 +97,7 @@ public class ManageSieveServer extends AbstractConfigurableAsyncServer implement private final ChannelGroupHandler groupHandler = new ChannelGroupHandler(group); + @Override public ChannelPipeline getPipeline() throws Exception { ChannelPipeline pipeline = pipeline(); Encryption secure = getEncryption(); http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/server/protocols/protocols-managesieve/src/main/java/org/apache/james/managesieveserver/netty/ManageSieveServerFactory.java ---------------------------------------------------------------------- diff --git a/server/protocols/protocols-managesieve/src/main/java/org/apache/james/managesieveserver/netty/ManageSieveServerFactory.java b/server/protocols/protocols-managesieve/src/main/java/org/apache/james/managesieveserver/netty/ManageSieveServerFactory.java index f77934f..5b96f6f 100644 --- a/server/protocols/protocols-managesieve/src/main/java/org/apache/james/managesieveserver/netty/ManageSieveServerFactory.java +++ b/server/protocols/protocols-managesieve/src/main/java/org/apache/james/managesieveserver/netty/ManageSieveServerFactory.java @@ -72,6 +72,7 @@ public class ManageSieveServerFactory extends AbstractServerFactory { } + @Override @PostConstruct public void init() throws Exception { manageSieveProcessor = new ManageSieveProcessor(new ArgumentParser(new CoreProcessor(sieveRepository, usersRepository, sieveParser))); http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/server/protocols/protocols-pop3/src/main/java/org/apache/james/pop3server/core/CoreCmdHandlerLoader.java ---------------------------------------------------------------------- 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 162153b..4abdf26 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 @@ -92,8 +92,7 @@ public class CoreCmdHandlerLoader implements HandlersPackage { commands.add(COMMANDHANDLERRESULTLOGGER); } - /** - */ + @Override public List<String> getHandlers() { return commands; } http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/server/protocols/protocols-pop3/src/main/java/org/apache/james/pop3server/jmx/CommandHandlerResultJMXMonitor.java ---------------------------------------------------------------------- diff --git a/server/protocols/protocols-pop3/src/main/java/org/apache/james/pop3server/jmx/CommandHandlerResultJMXMonitor.java b/server/protocols/protocols-pop3/src/main/java/org/apache/james/pop3server/jmx/CommandHandlerResultJMXMonitor.java index e888af1..4358455 100644 --- a/server/protocols/protocols-pop3/src/main/java/org/apache/james/pop3server/jmx/CommandHandlerResultJMXMonitor.java +++ b/server/protocols/protocols-pop3/src/main/java/org/apache/james/pop3server/jmx/CommandHandlerResultJMXMonitor.java @@ -31,10 +31,7 @@ import org.apache.james.protocols.pop3.POP3Session; */ public class CommandHandlerResultJMXMonitor extends AbstractCommandHandlerResultJMXMonitor<POP3Session> implements ProtocolHandler { - /** - * @see org.apache.james.protocols.lib.jmx.AbstractCommandHandlerResultJMXMonitor - * #createCommandHandlerStats(org.apache.james.protocols.api.CommandHandler) - */ + @Override protected AbstractCommandHandlerStats createCommandHandlerStats(CommandHandler<POP3Session> handler) throws Exception { Collection<String> col = handler.getImplCommands(); String cName = handler.getClass().getName(); http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/server/protocols/protocols-pop3/src/main/java/org/apache/james/pop3server/jmx/ConnectHandlerResultJMXMonitor.java ---------------------------------------------------------------------- diff --git a/server/protocols/protocols-pop3/src/main/java/org/apache/james/pop3server/jmx/ConnectHandlerResultJMXMonitor.java b/server/protocols/protocols-pop3/src/main/java/org/apache/james/pop3server/jmx/ConnectHandlerResultJMXMonitor.java index f2cc333..92713ce 100644 --- a/server/protocols/protocols-pop3/src/main/java/org/apache/james/pop3server/jmx/ConnectHandlerResultJMXMonitor.java +++ b/server/protocols/protocols-pop3/src/main/java/org/apache/james/pop3server/jmx/ConnectHandlerResultJMXMonitor.java @@ -24,10 +24,7 @@ import org.apache.james.protocols.pop3.POP3Session; public class ConnectHandlerResultJMXMonitor extends AbstractConnectHandlerResultJMXMonitor<POP3Response, POP3Session> { - /** - * @see org.apache.james.protocols.lib.jmx.AbstractConnectHandlerResultJMXMonitor - * #getDefaultJMXName() - */ + @Override protected String getDefaultJMXName() { return "pop3server"; } http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/server/protocols/protocols-pop3/src/main/java/org/apache/james/pop3server/jmx/JMXHandlersLoader.java ---------------------------------------------------------------------- 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 f5182c1..90eb223 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 @@ -35,8 +35,7 @@ public class JMXHandlersLoader implements HandlersPackage { handlers.add(LineHandlerResultJMXMonitor.class.getName()); } - /** - */ + @Override public List<String> getHandlers() { return handlers; } http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/server/protocols/protocols-pop3/src/main/java/org/apache/james/pop3server/jmx/LineHandlerResultJMXMonitor.java ---------------------------------------------------------------------- diff --git a/server/protocols/protocols-pop3/src/main/java/org/apache/james/pop3server/jmx/LineHandlerResultJMXMonitor.java b/server/protocols/protocols-pop3/src/main/java/org/apache/james/pop3server/jmx/LineHandlerResultJMXMonitor.java index b7d3205..d570e65 100644 --- a/server/protocols/protocols-pop3/src/main/java/org/apache/james/pop3server/jmx/LineHandlerResultJMXMonitor.java +++ b/server/protocols/protocols-pop3/src/main/java/org/apache/james/pop3server/jmx/LineHandlerResultJMXMonitor.java @@ -24,10 +24,7 @@ import org.apache.james.protocols.pop3.POP3Session; public class LineHandlerResultJMXMonitor extends AbstractLineHandlerResultJMXMonitor<POP3Response, POP3Session> { - /** - * @see - * org.apache.james.protocols.lib.jmx.AbstractLineHandlerResultJMXMonitor#getDefaultJMXName() - */ + @Override protected String getDefaultJMXName() { return "pop3server"; } http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/server/protocols/protocols-pop3/src/main/java/org/apache/james/pop3server/jmx/POP3CommandHandlerStats.java ---------------------------------------------------------------------- diff --git a/server/protocols/protocols-pop3/src/main/java/org/apache/james/pop3server/jmx/POP3CommandHandlerStats.java b/server/protocols/protocols-pop3/src/main/java/org/apache/james/pop3server/jmx/POP3CommandHandlerStats.java index e94cd83..b1cd557 100644 --- a/server/protocols/protocols-pop3/src/main/java/org/apache/james/pop3server/jmx/POP3CommandHandlerStats.java +++ b/server/protocols/protocols-pop3/src/main/java/org/apache/james/pop3server/jmx/POP3CommandHandlerStats.java @@ -38,11 +38,7 @@ public class POP3CommandHandlerStats extends AbstractCommandHandlerStats impleme super(POP3CommandHandlerStatsMBean.class, jmxPath, handlerName, commands); } - /** - * @see - * org.apache.james.protocols.lib.jmx.AbstractCommandHandlerStats - * #increment(org.apache.james.protocols.api.Response) - */ + @Override protected void incrementStats(Response response) { String code = response.getRetCode(); if (POP3Response.OK_RESPONSE.equals(code)) { @@ -52,17 +48,12 @@ public class POP3CommandHandlerStats extends AbstractCommandHandlerStats impleme } } - /** - * @see - * org.apache.james.pop3server.jmx.POP3CommandHandlerStatsMBean#getError() - */ + @Override public long getError() { return error.get(); } - /** - * @see org.apache.james.pop3server.jmx.POP3CommandHandlerStatsMBean#getOk() - */ + @Override public long getOk() { return ok.get(); } http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/server/protocols/protocols-pop3/src/main/java/org/apache/james/pop3server/netty/POP3Server.java ---------------------------------------------------------------------- diff --git a/server/protocols/protocols-pop3/src/main/java/org/apache/james/pop3server/netty/POP3Server.java b/server/protocols/protocols-pop3/src/main/java/org/apache/james/pop3server/netty/POP3Server.java index 6edf0a1..f00db57 100644 --- a/server/protocols/protocols-pop3/src/main/java/org/apache/james/pop3server/netty/POP3Server.java +++ b/server/protocols/protocols-pop3/src/main/java/org/apache/james/pop3server/netty/POP3Server.java @@ -46,9 +46,7 @@ public class POP3Server extends AbstractProtocolAsyncServer implements POP3Serve return 110; } - /** - * @see POP3ServerMBean#getServiceType() - */ + @Override public String getServiceType() { return "POP3 Service"; } @@ -60,6 +58,7 @@ public class POP3Server extends AbstractProtocolAsyncServer implements POP3Serve /** */ + @Override public String getHelloName() { return POP3Server.this.getHelloName(); } http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/AddDefaultAttributesMessageHook.java ---------------------------------------------------------------------- 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 04aa165..6044be0 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 @@ -46,6 +46,7 @@ public class AddDefaultAttributesMessageHook implements JamesMessageHook { } + @Override public HookResult onMessage(SMTPSession session, Mail mail) { if (mail instanceof MailImpl) { http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/AuthRequiredToRelayRcptHook.java ---------------------------------------------------------------------- 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 7a9e661..4186e33 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 @@ -31,7 +31,7 @@ public class AuthRequiredToRelayRcptHook extends AbstractAuthRequiredToRelayRcpt private DomainList domains; @Inject - public void setDomainList(DomainList domains) { + public void setDomainList(DomainList domains) { this.domains = domains; } @@ -45,9 +45,7 @@ public class AuthRequiredToRelayRcptHook extends AbstractAuthRequiredToRelayRcpt } - /** - * @see org.apache.james.protocols.smtp.core.AbstractAuthRequiredToRelayRcptHook#isLocalDomain(java.lang.String) - */ + @Override protected boolean isLocalDomain(String domain) { try { return domains.containsDomain(domain); http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/CoreCmdHandlerLoader.java ---------------------------------------------------------------------- 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 4d6376f..a2d8bf3 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 @@ -86,8 +86,7 @@ public class CoreCmdHandlerLoader implements HandlersPackage { .forEachOrdered(commands::add); } - /** - */ + @Override public List<String> getHandlers() { return commands; } http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/DataLineJamesMessageHookHandler.java ---------------------------------------------------------------------- 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 ec32246..5fc9825 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 @@ -80,6 +80,7 @@ public class DataLineJamesMessageHookHandler implements DataLineFilter, Extensib } + @Override public Response onLine(SMTPSession session, ByteBuffer lineByteBuffer, LineHandler<SMTPSession> next) { byte[] line = new byte[lineByteBuffer.remaining()]; http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/JamesDataCmdHandler.java ---------------------------------------------------------------------- diff --git a/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/JamesDataCmdHandler.java b/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/JamesDataCmdHandler.java index b9c0078..b7e538d 100644 --- a/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/JamesDataCmdHandler.java +++ b/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/JamesDataCmdHandler.java @@ -49,6 +49,7 @@ public class JamesDataCmdHandler extends DataCmdHandler { * @param session SMTP session object * @param argument the argument passed in with the command by the SMTP client */ + @Override protected SMTPResponse doDATA(SMTPSession session, String argument) { try { MimeMessageInputStreamSource mmiss = new MimeMessageInputStreamSource(MailImpl.getId()); http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/JamesMailCmdHandler.java ---------------------------------------------------------------------- diff --git a/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/JamesMailCmdHandler.java b/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/JamesMailCmdHandler.java index 64f1b34..87ad536 100644 --- a/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/JamesMailCmdHandler.java +++ b/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/JamesMailCmdHandler.java @@ -39,9 +39,7 @@ public class JamesMailCmdHandler extends MailCmdHandler { this.domainList = domainList; } - /** - * @see org.apache.james.protocols.smtp.core.MailCmdHandler#getDefaultDomain() - */ + @Override public String getDefaultDomain() { try { return domainList.getDefaultDomain(); http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/JamesRcptCmdHandler.java ---------------------------------------------------------------------- diff --git a/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/JamesRcptCmdHandler.java b/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/JamesRcptCmdHandler.java index 551f93c..70abba4 100644 --- a/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/JamesRcptCmdHandler.java +++ b/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/JamesRcptCmdHandler.java @@ -40,9 +40,7 @@ public class JamesRcptCmdHandler extends RcptCmdHandler { this.domainList = domainList; } - /** - * @see org.apache.james.protocols.smtp.core.MailCmdHandler#getDefaultDomain() - */ + @Override public String getDefaultDomain() { try { return domainList.getDefaultDomain(); http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/MailPriorityHandler.java ---------------------------------------------------------------------- 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 8bd57bc..61b986b 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 @@ -45,11 +45,7 @@ public class MailPriorityHandler implements JamesMessageHook, ProtocolHandler { private final Map<String, Integer> prioMap = new HashMap<>(); - /** - * @see - * org.apache.james.smtpserver.JamesMessageHook#onMessage(org.apache.james.protocols.smtp.SMTPSession, - * org.apache.mailet.Mail) - */ + @Override public HookResult onMessage(SMTPSession session, Mail mail) { Iterator<MailAddress> rcpts = mail.getRecipients().iterator(); http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/POP3BeforeSMTPHandler.java ---------------------------------------------------------------------- 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 7320419..89aea40 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 @@ -37,9 +37,7 @@ public class POP3BeforeSMTPHandler implements ConnectHandler<SMTPSession>, Confi /** The time after which ipAddresses should be handled as expired */ private long expireTime = POP3BeforeSMTPHelper.EXPIRE_TIME; - /* - * - */ + @Override public void configure(HierarchicalConfiguration config) throws ConfigurationException { try { setExpireTime(config.getString("expireTime", null)); @@ -60,9 +58,7 @@ public class POP3BeforeSMTPHandler implements ConnectHandler<SMTPSession>, Confi } } - /** - * @see org.apache.james.protocols.api.handler.ConnectHandler#onConnect(org.apache.james.protocols.api.ProtocolSession) - */ + @Override public Response onConnect(SMTPSession session) { // some kind of random cleanup process http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/SendMailHandler.java ---------------------------------------------------------------------- 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 54e0a4d..3f01474 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 @@ -62,6 +62,7 @@ public class SendMailHandler implements JamesMessageHook { * Adds header to the message * */ + @Override public HookResult onMessage(SMTPSession session, Mail mail) { LOGGER.debug("sending mail"); http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/SenderAuthIdentifyVerificationRcptHook.java ---------------------------------------------------------------------- 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 60173c0..d261810 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 @@ -72,9 +72,7 @@ public class SenderAuthIdentifyVerificationRcptHook extends AbstractSenderAuthId } } - /** - * @see org.apache.james.protocols.smtp.core.AbstractSenderAuthIdentifyVerificationRcptHook#isLocalDomain(java.lang.String) - */ + @Override protected boolean isLocalDomain(String domain) { try { return domains.containsDomain(domain); @@ -83,9 +81,7 @@ public class SenderAuthIdentifyVerificationRcptHook extends AbstractSenderAuthId } } - /** - * @see org.apache.james.protocols.smtp.core.AbstractSenderAuthIdentifyVerificationRcptHook#useVirtualHosting() - */ + @Override protected boolean useVirtualHosting() { try { return users.supportVirtualHosting(); http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/SetMimeHeaderHandler.java ---------------------------------------------------------------------- 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 9268568..1fd96a9 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 @@ -69,6 +69,7 @@ public class SetMimeHeaderHandler implements JamesMessageHook, ProtocolHandler { * @see org.apache.james.smtpserver.JamesMessageHook#onMessage(org.apache.james.protocols.smtp.SMTPSession, * org.apache.mailet.Mail) */ + @Override public HookResult onMessage(SMTPSession session, Mail mail) { try { MimeMessage message = mail.getMessage(); http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/UsersRepositoryAuthHook.java ---------------------------------------------------------------------- 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 f96496a..9fbf77f 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 @@ -59,10 +59,7 @@ public class UsersRepositoryAuthHook implements AuthHook { this.users = users; } - /** - * @see org.apache.james.protocols.smtp.hook.AuthHook#doAuth(org.apache.james.protocols.smtp.SMTPSession, - * java.lang.String, java.lang.String) - */ + @Override public HookResult doAuth(SMTPSession session, String username, String password) { try { if (users.test(username, password)) { http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/JDBCGreylistHandler.java ---------------------------------------------------------------------- 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 f1441c5..3b69a7e 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 @@ -169,10 +169,7 @@ public class JDBCGreylistHandler extends AbstractGreylistHandler implements Prot return wNetworks; } - /** - * @see org.apache.james.protocols.smtp.core.fastfail.AbstractGreylistHandler#getGreyListData(java.lang.String, - * java.lang.String, java.lang.String) - */ + @Override protected Iterator<String> getGreyListData(String ipAddress, String sender, String recip) throws SQLException { Collection<String> data = new ArrayList<>(2); PreparedStatement mappingStmt = null; @@ -200,10 +197,7 @@ public class JDBCGreylistHandler extends AbstractGreylistHandler implements Prot return data.iterator(); } - /** - * @see org.apache.james.protocols.smtp.core.fastfail.AbstractGreylistHandler#insertTriplet(java.lang.String, - * java.lang.String, java.lang.String, int, long) - */ + @Override protected void insertTriplet(String ipAddress, String sender, String recip, int count, long createTime) throws SQLException { Connection conn = datasource.getConnection(); @@ -224,10 +218,7 @@ public class JDBCGreylistHandler extends AbstractGreylistHandler implements Prot } } - /** - * @see org.apache.james.protocols.smtp.core.fastfail.AbstractGreylistHandler#updateTriplet(java.lang.String, - * java.lang.String, java.lang.String, int, long) - */ + @Override protected void updateTriplet(String ipAddress, String sender, String recip, int count, long time) throws SQLException { Connection conn = datasource.getConnection(); PreparedStatement mappingStmt = null; @@ -246,9 +237,7 @@ public class JDBCGreylistHandler extends AbstractGreylistHandler implements Prot } } - /** - * @see org.apache.james.protocols.smtp.core.fastfail.AbstractGreylistHandler#cleanupAutoWhiteListGreyList(long) - */ + @Override protected void cleanupAutoWhiteListGreyList(long time) throws SQLException { PreparedStatement mappingStmt = null; Connection conn = datasource.getConnection(); @@ -265,9 +254,7 @@ public class JDBCGreylistHandler extends AbstractGreylistHandler implements Prot } } - /** - * @see org.apache.james.protocols.smtp.core.fastfail.AbstractGreylistHandler#cleanupGreyList(long) - */ + @Override protected void cleanupGreyList(long time) throws SQLException { Connection conn = datasource.getConnection(); @@ -366,8 +353,7 @@ public class JDBCGreylistHandler extends AbstractGreylistHandler implements Prot } } - /** - */ + @Override public HookResult doRcpt(SMTPSession session, MailAddress sender, MailAddress rcpt) { if ((wNetworks == null) || (!wNetworks.matchInetNetwork(session.getRemoteAddress().getAddress().getHostAddress()))) { return super.doRcpt(session, sender, rcpt); http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/SPFHandler.java ---------------------------------------------------------------------- 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 dce1959..e36f562 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 @@ -147,8 +147,7 @@ public class SPFHandler implements JamesMessageHook, MailHook, RcptHook, Protoco } - /** - */ + @Override public HookResult doRcpt(SMTPSession session, MailAddress sender, MailAddress rcpt) { if (!session.isRelayingAllowed()) { // Check if session is blocklisted @@ -161,8 +160,7 @@ public class SPFHandler implements JamesMessageHook, MailHook, RcptHook, Protoco return new HookResult(HookReturnCode.DECLINED); } - /** - */ + @Override public HookResult doMail(SMTPSession session, MailAddress sender) { doSPFCheck(session, sender); return new HookResult(HookReturnCode.DECLINED); @@ -186,6 +184,7 @@ public class SPFHandler implements JamesMessageHook, MailHook, RcptHook, Protoco /** * @see org.apache.james.jspf.core.Logger#debug(String) */ + @Override public void debug(String message) { serviceLog.debug(message); } @@ -193,6 +192,7 @@ public class SPFHandler implements JamesMessageHook, MailHook, RcptHook, Protoco /** * @see org.apache.james.jspf.core.Logger#debug(String, Throwable) */ + @Override public void debug(String message, Throwable t) { serviceLog.debug(message, t); } @@ -200,6 +200,7 @@ public class SPFHandler implements JamesMessageHook, MailHook, RcptHook, Protoco /** * @see org.apache.james.jspf.core.Logger#error(String) */ + @Override public void error(String message) { serviceLog.error(message); } @@ -207,6 +208,7 @@ public class SPFHandler implements JamesMessageHook, MailHook, RcptHook, Protoco /** * @see org.apache.james.jspf.core.Logger#error(String, Throwable) */ + @Override public void error(String message, Throwable t) { serviceLog.error(message, t); } @@ -214,6 +216,7 @@ public class SPFHandler implements JamesMessageHook, MailHook, RcptHook, Protoco /** * @see org.apache.james.jspf.core.Logger#fatalError(String) */ + @Override public void fatalError(String message) { serviceLog.error(message); } @@ -221,6 +224,7 @@ public class SPFHandler implements JamesMessageHook, MailHook, RcptHook, Protoco /** * @see org.apache.james.jspf.core.Logger#fatalError(String, Throwable) */ + @Override public void fatalError(String message, Throwable t) { serviceLog.error(message, t); } @@ -228,6 +232,7 @@ public class SPFHandler implements JamesMessageHook, MailHook, RcptHook, Protoco /** * @see org.apache.james.jspf.core.Logger#info(String) */ + @Override public void info(String message) { serviceLog.info(message); } @@ -235,6 +240,7 @@ public class SPFHandler implements JamesMessageHook, MailHook, RcptHook, Protoco /** * @see org.apache.james.jspf.core.Logger#info(String, Throwable) */ + @Override public void info(String message, Throwable t) { serviceLog.info(message, t); } @@ -242,6 +248,7 @@ public class SPFHandler implements JamesMessageHook, MailHook, RcptHook, Protoco /** * @see org.apache.james.jspf.core.Logger#isDebugEnabled() */ + @Override public boolean isDebugEnabled() { return serviceLog.isDebugEnabled(); } @@ -249,6 +256,7 @@ public class SPFHandler implements JamesMessageHook, MailHook, RcptHook, Protoco /** * @see org.apache.james.jspf.core.Logger#isErrorEnabled() */ + @Override public boolean isErrorEnabled() { return serviceLog.isErrorEnabled(); } @@ -256,6 +264,7 @@ public class SPFHandler implements JamesMessageHook, MailHook, RcptHook, Protoco /** * @see org.apache.james.jspf.core.Logger#isFatalErrorEnabled() */ + @Override public boolean isFatalErrorEnabled() { return serviceLog.isErrorEnabled(); } @@ -263,6 +272,7 @@ public class SPFHandler implements JamesMessageHook, MailHook, RcptHook, Protoco /** * @see org.apache.james.jspf.core.Logger#isInfoEnabled() */ + @Override public boolean isInfoEnabled() { return serviceLog.isInfoEnabled(); } @@ -270,6 +280,7 @@ public class SPFHandler implements JamesMessageHook, MailHook, RcptHook, Protoco /** * @see org.apache.james.jspf.core.Logger#isWarnEnabled() */ + @Override public boolean isWarnEnabled() { return serviceLog.isWarnEnabled(); } @@ -277,6 +288,7 @@ public class SPFHandler implements JamesMessageHook, MailHook, RcptHook, Protoco /** * @see org.apache.james.jspf.core.Logger#warn(String) */ + @Override public void warn(String message) { serviceLog.warn(message); } @@ -284,6 +296,7 @@ public class SPFHandler implements JamesMessageHook, MailHook, RcptHook, Protoco /** * @see org.apache.james.jspf.core.Logger#warn(String, Throwable) */ + @Override public void warn(String message, Throwable t) { serviceLog.warn(message, t); } @@ -291,15 +304,13 @@ public class SPFHandler implements JamesMessageHook, MailHook, RcptHook, Protoco /** * @see org.apache.james.jspf.core.Logger#getChildLogger(String) */ + @Override public org.apache.james.jspf.core.Logger getChildLogger(String name) { return this; } } - /** - * @see org.apache.james.smtpserver.JamesMessageHook#onMessage(org.apache.james.protocols.smtp.SMTPSession, - * org.apache.mailet.Mail) - */ + @Override public HookResult onMessage(SMTPSession session, Mail mail) { // Store the spf header as attribute for later using mail.setAttribute(SPF_HEADER_MAIL_ATTRIBUTE_NAME, (String) session.getAttachment(SPF_HEADER, State.Transaction)); http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/SpamAssassinHandler.java ---------------------------------------------------------------------- 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 3ef7774..14e6095 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 @@ -109,10 +109,7 @@ public class SpamAssassinHandler implements JamesMessageHook, ProtocolHandler { } - /** - * @see org.apache.james.smtpserver.JamesMessageHook#onMessage(org.apache.james.protocols.smtp.SMTPSession, - * org.apache.mailet.Mail) - */ + @Override public HookResult onMessage(SMTPSession session, Mail mail) { try { http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/URIRBLHandler.java ---------------------------------------------------------------------- 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 c8b6e9c..f400763 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 @@ -105,10 +105,7 @@ public class URIRBLHandler implements JamesMessageHook, ProtocolHandler { this.getDetail = getDetail; } - /** - * @see org.apache.james.smtpserver.JamesMessageHook#onMessage(org.apache.james.protocols.smtp.SMTPSession, - * org.apache.mailet.Mail) - */ + @Override public HookResult onMessage(SMTPSession session, Mail mail) { if (check(session, mail)) { String uRblServer = (String) session.getAttachment(URBLSERVER, State.Transaction); http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/ValidRcptHandler.java ---------------------------------------------------------------------- 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 c218eee..e348c6d 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 @@ -133,12 +133,7 @@ public class ValidRcptHandler extends AbstractValidRcptHandler implements Protoc } } - /** - * @see - * org.apache.james.protocols.smtp.core.fastfail.AbstractValidRcptHandler - * #isLocalDomain(org.apache.james.protocols.smtp.SMTPSession, - * java.lang.String) - */ + @Override protected boolean isLocalDomain(SMTPSession session, String domain) { try { return domains.containsDomain(domain); http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/ValidRcptMX.java ---------------------------------------------------------------------- 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 18c4fb8..04a2600 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 @@ -87,6 +87,7 @@ public class ValidRcptMX implements RcptHook, ProtocolHandler { bNetwork = new NetMatcher(networks, dnsServer); } + @Override public HookResult doRcpt(SMTPSession session, MailAddress sender, MailAddress rcpt) { String domain = rcpt.getDomain(); http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/jmx/CommandHandlerResultJMXMonitor.java ---------------------------------------------------------------------- diff --git a/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/jmx/CommandHandlerResultJMXMonitor.java b/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/jmx/CommandHandlerResultJMXMonitor.java index 409ee93..61d8df8 100644 --- a/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/jmx/CommandHandlerResultJMXMonitor.java +++ b/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/jmx/CommandHandlerResultJMXMonitor.java @@ -30,10 +30,7 @@ import org.apache.james.protocols.smtp.SMTPSession; */ public class CommandHandlerResultJMXMonitor extends AbstractCommandHandlerResultJMXMonitor<SMTPSession> { - /** - * @see org.apache.james.protocols.lib.jmx.AbstractCommandHandlerResultJMXMonitor - * #createCommandHandlerStats(org.apache.james.protocols.api.handler.CommandHandler) - */ + @Override protected AbstractCommandHandlerStats createCommandHandlerStats(CommandHandler<SMTPSession> handler) throws Exception { Collection<String> col = handler.getImplCommands(); String cName = handler.getClass().getName(); @@ -41,6 +38,7 @@ public class CommandHandlerResultJMXMonitor extends AbstractCommandHandlerResult return new SMTPCommandHandlerStats(getJMXName(), cName, col.toArray(new String[col.size()])); } + @Override protected String getDefaultJMXName() { return "smtpserver"; } http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/jmx/ConnectHandlerResultJMXMonitor.java ---------------------------------------------------------------------- diff --git a/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/jmx/ConnectHandlerResultJMXMonitor.java b/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/jmx/ConnectHandlerResultJMXMonitor.java index 14e7790..cb14c61 100644 --- a/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/jmx/ConnectHandlerResultJMXMonitor.java +++ b/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/jmx/ConnectHandlerResultJMXMonitor.java @@ -24,9 +24,7 @@ import org.apache.james.protocols.smtp.SMTPSession; public class ConnectHandlerResultJMXMonitor extends AbstractConnectHandlerResultJMXMonitor<Response, SMTPSession> { - /** - * @see org.apache.james.protocols.lib.jmx.AbstractConnectHandlerResultJMXMonitor#getDefaultJMXName() - */ + @Override protected String getDefaultJMXName() { return "smtpserver"; } http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/jmx/HookResultJMXMonitor.java ---------------------------------------------------------------------- diff --git a/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/jmx/HookResultJMXMonitor.java b/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/jmx/HookResultJMXMonitor.java index 2d8c353..1163e21 100644 --- a/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/jmx/HookResultJMXMonitor.java +++ b/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/jmx/HookResultJMXMonitor.java @@ -42,13 +42,7 @@ public class HookResultJMXMonitor implements HookResultHook, ExtensibleHandler, private final Map<String, HookStats> hookStats = new HashMap<>(); private String jmxPath; - /** - * @see - * org.apache.james.protocols.smtp.hook.HookResultHook - * #onHookResult(org.apache.james.protocols.smtp.SMTPSession, - * org.apache.james.protocols.smtp.hook.HookResult, long, - * org.apache.james.protocols.smtp.hook.Hook) - */ + @Override public HookResult onHookResult(SMTPSession session, HookResult result, long executionTime, Hook hook) { String hookName = hook.getClass().getName(); HookStats stats = hookStats.get(hookName); @@ -58,20 +52,14 @@ public class HookResultJMXMonitor implements HookResultHook, ExtensibleHandler, return result; } - /** - * @see - * org.apache.james.protocols.api.handler.ExtensibleHandler#getMarkerInterfaces() - */ + @Override public List<Class<?>> getMarkerInterfaces() { List<Class<?>> marker = new ArrayList<>(); marker.add(Hook.class); return marker; } - /** - * @see - * org.apache.james.protocols.api.handler.ExtensibleHandler#wireExtensions(java.lang.Class, java.util.List) - */ + @Override public void wireExtensions(Class<?> interfaceName, List<?> extension) throws WiringException { if (interfaceName.equals(Hook.class)) { http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/jmx/HookStats.java ---------------------------------------------------------------------- diff --git a/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/jmx/HookStats.java b/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/jmx/HookStats.java index 81c80fe..6636bc7 100644 --- a/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/jmx/HookStats.java +++ b/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/jmx/HookStats.java @@ -73,37 +73,27 @@ public class HookStats extends StandardMBean implements HookStatsMBean, Disposab all.incrementAndGet(); } - /** - * @see org.apache.james.smtpserver.jmx.HookStatsMBean#getOk() - */ + @Override public long getOk() { return ok.get(); } - /** - * @see org.apache.james.smtpserver.jmx.HookStatsMBean#getDeclined() - */ + @Override public long getDeclined() { return declined.get(); } - /** - * @see org.apache.james.smtpserver.jmx.HookStatsMBean#getDeny() - */ + @Override public long getDeny() { return deny.get(); } - /** - * @see org.apache.james.smtpserver.jmx.HookStatsMBean#getDenysoft() - */ + @Override public long getDenysoft() { return denysoft.get(); } - /** - * @see org.apache.james.lifecycle.api.Disposable#dispose() - */ + @Override public void dispose() { try { mbeanserver.unregisterMBean(new ObjectName(name)); @@ -112,16 +102,12 @@ public class HookStats extends StandardMBean implements HookStatsMBean, Disposab } } - /** - * @see org.apache.james.smtpserver.jmx.HookStatsMBean#getName() - */ + @Override public String getName() { return hookname; } - /** - * @see org.apache.james.smtpserver.jmx.HookStatsMBean#getAll() - */ + @Override public long getAll() { return all.get(); } http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/jmx/JMXHandlersLoader.java ---------------------------------------------------------------------- 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 49984f5..316c29d 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 @@ -36,8 +36,7 @@ public class JMXHandlersLoader implements HandlersPackage { handlers.add(HookResultJMXMonitor.class.getName()); } - /** - */ + @Override public List<String> getHandlers() { return handlers; } http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/jmx/LineHandlerResultJMXMonitor.java ---------------------------------------------------------------------- diff --git a/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/jmx/LineHandlerResultJMXMonitor.java b/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/jmx/LineHandlerResultJMXMonitor.java index d41b321..4718b4c 100644 --- a/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/jmx/LineHandlerResultJMXMonitor.java +++ b/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/jmx/LineHandlerResultJMXMonitor.java @@ -24,10 +24,7 @@ import org.apache.james.protocols.smtp.SMTPSession; public class LineHandlerResultJMXMonitor extends AbstractLineHandlerResultJMXMonitor<SMTPResponse, SMTPSession> { - /** - * @see - * org.apache.james.protocols.lib.jmx.AbstractLineHandlerResultJMXMonitor#getDefaultJMXName() - */ + @Override protected String getDefaultJMXName() { return "smtpserver"; } http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/jmx/SMTPCommandHandlerStats.java ---------------------------------------------------------------------- diff --git a/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/jmx/SMTPCommandHandlerStats.java b/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/jmx/SMTPCommandHandlerStats.java index 2d85eea..0cf4a9d 100644 --- a/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/jmx/SMTPCommandHandlerStats.java +++ b/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/jmx/SMTPCommandHandlerStats.java @@ -47,33 +47,22 @@ public class SMTPCommandHandlerStats extends AbstractCommandHandlerStats impleme super(SMTPCommandHandlerStatsMBean.class, jmxPath, handlerName, commands); } - /** - * @see - * org.apache.james.smtpserver.jmx.SMTPCommandHandlerStatsMBean#getTemporaryError() - */ + @Override public long getTemporaryError() { return temp.get(); } - /** - * @see - * org.apache.james.smtpserver.jmx.SMTPCommandHandlerStatsMBean#getPermantError() - */ + @Override public long getPermantError() { return perm.get(); } - /** - * @see org.apache.james.smtpserver.jmx.SMTPCommandHandlerStatsMBean#getOk() - */ + @Override public long getOk() { return ok.get(); } - /** - * @see - * org.apache.james.protocols.lib.jmx.AbstractCommandHandlerStats#incrementStats(org.apache.james.protocols.api.Response) - */ + @Override protected void incrementStats(Response response) { try { String code = response.getRetCode(); http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/netty/SMTPChannelUpstreamHandler.java ---------------------------------------------------------------------- diff --git a/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/netty/SMTPChannelUpstreamHandler.java b/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/netty/SMTPChannelUpstreamHandler.java index 9c35bef..653b66d 100644 --- a/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/netty/SMTPChannelUpstreamHandler.java +++ b/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/netty/SMTPChannelUpstreamHandler.java @@ -72,6 +72,7 @@ public class SMTPChannelUpstreamHandler extends BasicChannelUpstreamHandler { * * @param ctx */ + @Override protected void cleanup(ChannelHandlerContext ctx) { // Make sure we dispose everything on exit on session close SMTPSession smtpSession = (SMTPSession) ctx.getAttachment(); http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/netty/SMTPServer.java ---------------------------------------------------------------------- diff --git a/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/netty/SMTPServer.java b/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/netty/SMTPServer.java index 78e1fe2..c35e778 100644 --- a/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/netty/SMTPServer.java +++ b/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/netty/SMTPServer.java @@ -197,13 +197,12 @@ public class SMTPServer extends AbstractProtocolAsyncServer implements SMTPServe * * @return port */ + @Override protected int getDefaultPort() { return 25; } - /** - * @see org.apache.james.smtpserver.netty.SMTPServerMBean#getServiceType() - */ + @Override public String getServiceType() { return "SMTP Service"; } @@ -216,6 +215,7 @@ public class SMTPServer extends AbstractProtocolAsyncServer implements SMTPServe /** * @see org.apache.james.protocols.smtp.SMTPConfiguration#getHelloName() */ + @Override public String getHelloName() { return SMTPServer.this.getHelloName(); } @@ -223,6 +223,7 @@ public class SMTPServer extends AbstractProtocolAsyncServer implements SMTPServe /** * @see org.apache.james.protocols.smtp.SMTPConfiguration#getMaxMessageSize() */ + @Override public long getMaxMessageSize() { return SMTPServer.this.maxMessageSize; } @@ -230,6 +231,7 @@ public class SMTPServer extends AbstractProtocolAsyncServer implements SMTPServe /** * @see org.apache.james.protocols.smtp.SMTPConfiguration#isRelayingAllowed(String) */ + @Override public boolean isRelayingAllowed(String remoteIP) { boolean relayingAllowed = false; if (authorizedNetworks != null) { @@ -241,6 +243,7 @@ public class SMTPServer extends AbstractProtocolAsyncServer implements SMTPServe /** * @see org.apache.james.protocols.smtp.SMTPConfiguration#useHeloEhloEnforcement() */ + @Override public boolean useHeloEhloEnforcement() { return SMTPServer.this.heloEhloEnforcement; } @@ -254,6 +257,7 @@ public class SMTPServer extends AbstractProtocolAsyncServer implements SMTPServe /** * @see org.apache.james.protocols.smtp.SMTPConfiguration#useAddressBracketsEnforcement() */ + @Override public boolean useAddressBracketsEnforcement() { return SMTPServer.this.addressBracketsEnforcement; } @@ -261,6 +265,7 @@ public class SMTPServer extends AbstractProtocolAsyncServer implements SMTPServe /** * @see org.apache.james.protocols.smtp.SMTPConfiguration#isAuthRequired(java.lang.String) */ + @Override public boolean isAuthRequired(String remoteIP) { if (SMTPServer.this.authRequired == AUTH_ANNOUNCE) { return true; @@ -294,62 +299,42 @@ public class SMTPServer extends AbstractProtocolAsyncServer implements SMTPServe } - /** - * @see org.apache.james.smtpserver.netty.SMTPServerMBean#getMaximalMessageSize() - */ + @Override public long getMaximalMessageSize() { return maxMessageSize; } - /** - * @see - * org.apache.james.smtpserver.netty.SMTPServerMBean#getAddressBracketsEnforcement() - */ + @Override public boolean getAddressBracketsEnforcement() { return addressBracketsEnforcement; } - /** - * @see org.apache.james.smtpserver.netty.SMTPServerMBean#getHeloEhloEnforcement() - */ + @Override public boolean getHeloEhloEnforcement() { return heloEhloEnforcement; } - /** - * @see - * org.apache.james.protocols.lib.netty.AbstractConfigurableAsyncServer#getDefaultJMXName() - */ + @Override protected String getDefaultJMXName() { return "smtpserver"; } - /** - * @see - * org.apache.james.smtpserver.netty.SMTPServerMBean#setMaximalMessageSize(long) - */ + @Override public void setMaximalMessageSize(long maxSize) { this.maxMessageSize = maxSize; } - /** - * @see org.apache.james.smtpserver.netty.SMTPServerMBean#setAddressBracketsEnforcement(boolean) - */ + @Override public void setAddressBracketsEnforcement(boolean enforceAddressBrackets) { this.addressBracketsEnforcement = enforceAddressBrackets; } - /** - * @see - * org.apache.james.smtpserver.netty.SMTPServerMBean#setHeloEhloEnforcement(boolean) - */ + @Override public void setHeloEhloEnforcement(boolean enforceHeloEHlo) { this.heloEhloEnforcement = enforceHeloEHlo; } - /** - * @see org.apache.james.smtpserver.netty.SMTPServerMBean#getHeloName() - */ + @Override public String getHeloName() { return theConfigData.getHelloName(); } http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/server/queue/queue-activemq/src/main/java/org/apache/james/queue/activemq/ActiveMQMailQueue.java ---------------------------------------------------------------------- diff --git a/server/queue/queue-activemq/src/main/java/org/apache/james/queue/activemq/ActiveMQMailQueue.java b/server/queue/queue-activemq/src/main/java/org/apache/james/queue/activemq/ActiveMQMailQueue.java index 7a887c1..7dc053d 100644 --- a/server/queue/queue-activemq/src/main/java/org/apache/james/queue/activemq/ActiveMQMailQueue.java +++ b/server/queue/queue-activemq/src/main/java/org/apache/james/queue/activemq/ActiveMQMailQueue.java @@ -109,10 +109,7 @@ public class ActiveMQMailQueue extends JMSMailQueue implements ActiveMQSupport { this.useBlob = useBlob; } - /** - * @see - * org.apache.james.queue.jms.JMSMailQueue#populateMailMimeMessage(javax.jms.Message, org.apache.mailet.Mail) - */ + @Override protected void populateMailMimeMessage(Message message, Mail mail) throws MessagingException, JMSException { if (message instanceof BlobMessage) { try { http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/server/queue/queue-activemq/src/main/java/org/apache/james/queue/activemq/ActiveMQMailQueueItem.java ---------------------------------------------------------------------- diff --git a/server/queue/queue-activemq/src/main/java/org/apache/james/queue/activemq/ActiveMQMailQueueItem.java b/server/queue/queue-activemq/src/main/java/org/apache/james/queue/activemq/ActiveMQMailQueueItem.java index cb8f5ce..e9d0e98 100644 --- a/server/queue/queue-activemq/src/main/java/org/apache/james/queue/activemq/ActiveMQMailQueueItem.java +++ b/server/queue/queue-activemq/src/main/java/org/apache/james/queue/activemq/ActiveMQMailQueueItem.java @@ -48,9 +48,7 @@ public class ActiveMQMailQueueItem extends JMSMailQueueItem implements ActiveMQS this.message = message; } - /** - * @see org.apache.james.queue.jms.JMSMailQueueItem#done(boolean) - */ + @Override public void done(boolean success) throws MailQueueException { super.done(success); if (success) { http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/server/queue/queue-activemq/src/main/java/org/apache/james/queue/activemq/MimeMessageBlobMessageSource.java ---------------------------------------------------------------------- diff --git a/server/queue/queue-activemq/src/main/java/org/apache/james/queue/activemq/MimeMessageBlobMessageSource.java b/server/queue/queue-activemq/src/main/java/org/apache/james/queue/activemq/MimeMessageBlobMessageSource.java index e8153ec..26faa1a 100644 --- a/server/queue/queue-activemq/src/main/java/org/apache/james/queue/activemq/MimeMessageBlobMessageSource.java +++ b/server/queue/queue-activemq/src/main/java/org/apache/james/queue/activemq/MimeMessageBlobMessageSource.java @@ -39,9 +39,7 @@ public class MimeMessageBlobMessageSource extends MimeMessageSource implements A this.sourceId = message.getJMSMessageID(); } - /** - * @see org.apache.james.server.core.MimeMessageSource#getInputStream() - */ + @Override public InputStream getInputStream() throws IOException { try { return message.getInputStream(); @@ -50,9 +48,7 @@ public class MimeMessageBlobMessageSource extends MimeMessageSource implements A } } - /** - * @see org.apache.james.server.core.MimeMessageSource#getSourceId() - */ + @Override public String getSourceId() { return sourceId; } http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/server/queue/queue-api/src/test/java/org/apache/james/queue/api/DelayedManageableMailQueueContract.java ---------------------------------------------------------------------- diff --git a/server/queue/queue-api/src/test/java/org/apache/james/queue/api/DelayedManageableMailQueueContract.java b/server/queue/queue-api/src/test/java/org/apache/james/queue/api/DelayedManageableMailQueueContract.java index 3eb9090..5aa9238 100644 --- a/server/queue/queue-api/src/test/java/org/apache/james/queue/api/DelayedManageableMailQueueContract.java +++ b/server/queue/queue-api/src/test/java/org/apache/james/queue/api/DelayedManageableMailQueueContract.java @@ -34,6 +34,7 @@ import org.junit.jupiter.api.extension.ExtendWith; @ExtendWith(ExecutorExtension.class) public interface DelayedManageableMailQueueContract extends DelayedMailQueueContract, ManageableMailQueueContract { + @Override ManageableMailQueue getManageableMailQueue(); @Test http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/server/queue/queue-api/src/test/java/org/apache/james/queue/api/DelayedPriorityMailQueueContract.java ---------------------------------------------------------------------- diff --git a/server/queue/queue-api/src/test/java/org/apache/james/queue/api/DelayedPriorityMailQueueContract.java b/server/queue/queue-api/src/test/java/org/apache/james/queue/api/DelayedPriorityMailQueueContract.java index a3fa18d..895aa88 100644 --- a/server/queue/queue-api/src/test/java/org/apache/james/queue/api/DelayedPriorityMailQueueContract.java +++ b/server/queue/queue-api/src/test/java/org/apache/james/queue/api/DelayedPriorityMailQueueContract.java @@ -28,6 +28,7 @@ import org.junit.jupiter.api.Test; public interface DelayedPriorityMailQueueContract extends DelayedMailQueueContract, PriorityMailQueueContract { + @Override MailQueue getMailQueue(); @Test --------------------------------------------------------------------- To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org For additional commands, e-mail: server-dev-h...@james.apache.org
